Skip to content

Commit 291842d

Browse files
siarheivesialousiarheivesialou
authored
Merge cf94ddb into 6191791 
2 parents 6191791 + cf94ddb commit 291842d

File tree

9 files changed

+21
-250
lines changed

9 files changed

+21
-250
lines changed

‎ydb/core/http_proxy/http_req.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
#include <ydb/services/datastreams/shard_iterator.h>
4646
#include <ydb/services/lib/sharding/sharding.h>
4747

48-
#include <ydb/public/sdk/cpp/client/ydb_ymq/ymq.h>
48+
#include <ydb/services/ymq/grpc_service.h>
4949
#include <ydb/services/ymq/ymq_proxy.h>
5050

5151

@@ -1056,16 +1056,16 @@ namespace NKikimr::NHttpProxy {
10561056

10571057

10581058
#define DECLARE_YMQ_PROCESSOR_QUEUE_UNKNOWN(name) Name2YmqProcessor[#name] = MakeHolder<TYmqHttpRequestProcessor<Ydb::Ymq::V1::YmqService, Ydb::Ymq::V1::name##Request, Ydb::Ymq::V1::name##Response, Ydb::Ymq::V1::name##Result,\
1059-
decltype(&Ydb::Ymq::V1::YmqService::Stub::Async##name), NKikimr::NGRpcService::TEvYmq##name##Request>> \
1060-
(#name, &Ydb::Ymq::V1::YmqService::Stub::Async##name, [](Ydb::Ymq::V1::name##Request&){return "";});
1059+
decltype(&Ydb::Ymq::V1::YmqService::Stub::AsyncYmq##name), NKikimr::NGRpcService::TEvYmq##name##Request>> \
1060+
(#name, &Ydb::Ymq::V1::YmqService::Stub::AsyncYmq##name, [](Ydb::Ymq::V1::name##Request&){return "";});
10611061
DECLARE_YMQ_PROCESSOR_QUEUE_UNKNOWN(GetQueueUrl);
10621062
DECLARE_YMQ_PROCESSOR_QUEUE_UNKNOWN(CreateQueue);
10631063
DECLARE_YMQ_PROCESSOR_QUEUE_UNKNOWN(ListQueues);
10641064
#undef DECLARE_YMQ_PROCESSOR_QUEUE_UNKNOWN
10651065

10661066
#define DECLARE_YMQ_PROCESSOR_QUEUE_KNOWN(name) Name2YmqProcessor[#name] = MakeHolder<TYmqHttpRequestProcessor<Ydb::Ymq::V1::YmqService, Ydb::Ymq::V1::name##Request, Ydb::Ymq::V1::name##Response, Ydb::Ymq::V1::name##Result,\
1067-
decltype(&Ydb::Ymq::V1::YmqService::Stub::Async##name), NKikimr::NGRpcService::TEvYmq##name##Request>> \
1068-
(#name, &Ydb::Ymq::V1::YmqService::Stub::Async##name, [](Ydb::Ymq::V1::name##Request& request){return request.Getqueue_url();});
1067+
decltype(&Ydb::Ymq::V1::YmqService::Stub::AsyncYmq##name), NKikimr::NGRpcService::TEvYmq##name##Request>> \
1068+
(#name, &Ydb::Ymq::V1::YmqService::Stub::AsyncYmq##name, [](Ydb::Ymq::V1::name##Request& request){return request.Getqueue_url();});
10691069
DECLARE_YMQ_PROCESSOR_QUEUE_KNOWN(SendMessage);
10701070
DECLARE_YMQ_PROCESSOR_QUEUE_KNOWN(ReceiveMessage);
10711071
DECLARE_YMQ_PROCESSOR_QUEUE_KNOWN(GetQueueAttributes);

‎ydb/core/http_proxy/ya.make‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ PEERDIR(
3939
ydb/public/sdk/cpp/client/ydb_datastreams
4040
ydb/public/sdk/cpp/client/ydb_persqueue_core
4141
ydb/public/sdk/cpp/client/ydb_topic/codecs
42-
ydb/public/sdk/cpp/client/ydb_ymq
4342
ydb/public/sdk/cpp/client/iam_private
4443
ydb/services/datastreams
4544
ydb/services/persqueue_v1/actors

‎ydb/core/testlib/test_client.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,6 @@ namespace Tests {
427427
GRpcServer->AddService(new NGRpcService::TGRpcYdbObjectStorageService(system, counters, grpcRequestProxies[0], true));
428428
GRpcServer->AddService(new NQuoter::TRateLimiterGRpcService(system, counters, grpcRequestProxies[0]));
429429
GRpcServer->AddService(new NGRpcService::TGRpcDataStreamsService(system, counters, grpcRequestProxies[0], true));
430-
GRpcServer->AddService(new NGRpcService::TGRpcYmqService(system, counters, grpcRequestProxies[0], true));
431430
GRpcServer->AddService(new NGRpcService::TGRpcMonitoringService(system, counters, grpcRequestProxies[0], true));
432431
GRpcServer->AddService(new NGRpcService::TGRpcYdbQueryService(system, counters, grpcRequestProxies, true, 1));
433432
GRpcServer->AddService(new NGRpcService::TGRpcYdbTabletService(system, counters, grpcRequestProxies, true, 1));

‎ydb/public/api/grpc/draft/ydb_ymq_v1.proto‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ option java_package = "com.yandex.ydb.ymq.v1";
1010

1111

1212
service YmqService {
13-
rpc GetQueueUrl(GetQueueUrlRequest) returns (GetQueueUrlResponse);
14-
rpc CreateQueue(CreateQueueRequest) returns (CreateQueueResponse);
15-
rpc SendMessage(SendMessageRequest) returns (SendMessageResponse);
16-
rpc ReceiveMessage(ReceiveMessageRequest) returns (ReceiveMessageResponse);
17-
rpc GetQueueAttributes(GetQueueAttributesRequest) returns (GetQueueAttributesResponse);
18-
rpc ListQueues(ListQueuesRequest) returns (ListQueuesResponse);
19-
rpc DeleteMessage(DeleteMessageRequest) returns (DeleteMessageResponse);
20-
rpc PurgeQueue(PurgeQueueRequest) returns (PurgeQueueResponse);
21-
rpc DeleteQueue(DeleteQueueRequest) returns (DeleteQueueResponse);
22-
rpc ChangeMessageVisibility(ChangeMessageVisibilityRequest) returns (ChangeMessageVisibilityResponse);
23-
rpc SetQueueAttributes(SetQueueAttributesRequest) returns (SetQueueAttributesResponse);
24-
rpc SendMessageBatch(SendMessageBatchRequest) returns (SendMessageBatchResponse);
25-
rpc DeleteMessageBatch(DeleteMessageBatchRequest) returns (DeleteMessageBatchResponse);
26-
rpc ChangeMessageVisibilityBatch(ChangeMessageVisibilityBatchRequest) returns (ChangeMessageVisibilityBatchResponse);
27-
rpc ListDeadLetterSourceQueues(ListDeadLetterSourceQueuesRequest) returns (ListDeadLetterSourceQueuesResponse);
13+
rpc YmqGetQueueUrl(GetQueueUrlRequest) returns (GetQueueUrlResponse);
14+
rpc YmqCreateQueue(CreateQueueRequest) returns (CreateQueueResponse);
15+
rpc YmqSendMessage(SendMessageRequest) returns (SendMessageResponse);
16+
rpc YmqReceiveMessage(ReceiveMessageRequest) returns (ReceiveMessageResponse);
17+
rpc YmqGetQueueAttributes(GetQueueAttributesRequest) returns (GetQueueAttributesResponse);
18+
rpc YmqListQueues(ListQueuesRequest) returns (ListQueuesResponse);
19+
rpc YmqDeleteMessage(DeleteMessageRequest) returns (DeleteMessageResponse);
20+
rpc YmqPurgeQueue(PurgeQueueRequest) returns (PurgeQueueResponse);
21+
rpc YmqDeleteQueue(DeleteQueueRequest) returns (DeleteQueueResponse);
22+
rpc YmqChangeMessageVisibility(ChangeMessageVisibilityRequest) returns (ChangeMessageVisibilityResponse);
23+
rpc YmqSetQueueAttributes(SetQueueAttributesRequest) returns (SetQueueAttributesResponse);
24+
rpc YmqSendMessageBatch(SendMessageBatchRequest) returns (SendMessageBatchResponse);
25+
rpc YmqDeleteMessageBatch(DeleteMessageBatchRequest) returns (DeleteMessageBatchResponse);
26+
rpc YmqChangeMessageVisibilityBatch(ChangeMessageVisibilityBatchRequest) returns (ChangeMessageVisibilityBatchResponse);
27+
rpc YmqListDeadLetterSourceQueues(ListDeadLetterSourceQueuesRequest) returns (ListDeadLetterSourceQueuesResponse);
2828
}

‎ydb/public/sdk/cpp/client/ydb_ymq/ya.make‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎ydb/public/sdk/cpp/client/ydb_ymq/ymq.cpp‎

Lines changed: 0 additions & 136 deletions
This file was deleted.

‎ydb/public/sdk/cpp/client/ydb_ymq/ymq.h‎

Lines changed: 0 additions & 74 deletions
This file was deleted.

‎ydb/services/ymq/grpc_service.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ void TGRpcYmqService::SetupIncomingRequests(NYdbGrpc::TLoggerPtr logger)
2929
ActorSystem_->Send(GRpcRequestProxyId_, \
3030
new TGrpcRequestOperationCall<Ydb::Ymq::V1::NAME##Request, Ydb::Ymq::V1::NAME##Response> \
3131
(ctx, CB, TRequestAuxSettings{RLSWITCH(TRateLimiterMode::LIMIT_TYPE), ATTR})); \
32-
}, &Ydb::Ymq::V1::YmqService::AsyncService::Request ## NAME, \
32+
}, &Ydb::Ymq::V1::YmqService::AsyncService::RequestYmq ## NAME, \
3333
#NAME, logger, getCounterBlock("ymq", #NAME))->Run();
3434

3535
ADD_REQUEST(GetQueueUrl, DoYmqGetQueueUrlRequest, nullptr, Off)

‎ydb/services/ymq/ya.make‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ PEERDIR(
1515
ydb/public/api/grpc/draft
1616
ydb/public/lib/operation_id
1717
ydb/public/sdk/cpp/client/resources
18-
ydb/public/sdk/cpp/client/ydb_ymq
1918
ydb/services/lib/actors
2019
ydb/services/lib/sharding
2120
ydb/services/persqueue_v1

0 commit comments

Comments
 (0)