Skip to content

Rename new YMQ grpc method names to Ymq* to fix failing default-win-x… #8615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 4, 2024
Merged

Rename new YMQ grpc method names to Ymq* to fix failing default-win-x… #8615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a64d4e
Rename new YMQ grpc method names to Ymq* to fix failing default-win-x…
siarheivesialou Sep 2, 2024
cf94ddb
remove TGRpcYmqService from test_client.cpp
siarheivesialou Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ydb/core/http_proxy/http_req.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
#include <ydb/services/datastreams/shard_iterator.h>
#include <ydb/services/lib/sharding/sharding.h>

#include <ydb/public/sdk/cpp/client/ydb_ymq/ymq.h>
#include <ydb/services/ymq/grpc_service.h>
#include <ydb/services/ymq/ymq_proxy.h>


Expand Down Expand Up @@ -1056,16 +1056,16 @@ namespace NKikimr::NHttpProxy {


#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,\
decltype(&Ydb::Ymq::V1::YmqService::Stub::Async##name), NKikimr::NGRpcService::TEvYmq##name##Request>> \
(#name, &Ydb::Ymq::V1::YmqService::Stub::Async##name, [](Ydb::Ymq::V1::name##Request&){return "";});
decltype(&Ydb::Ymq::V1::YmqService::Stub::AsyncYmq##name), NKikimr::NGRpcService::TEvYmq##name##Request>> \
(#name, &Ydb::Ymq::V1::YmqService::Stub::AsyncYmq##name, [](Ydb::Ymq::V1::name##Request&){return "";});
DECLARE_YMQ_PROCESSOR_QUEUE_UNKNOWN(GetQueueUrl);
DECLARE_YMQ_PROCESSOR_QUEUE_UNKNOWN(CreateQueue);
DECLARE_YMQ_PROCESSOR_QUEUE_UNKNOWN(ListQueues);
#undef DECLARE_YMQ_PROCESSOR_QUEUE_UNKNOWN

#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,\
decltype(&Ydb::Ymq::V1::YmqService::Stub::Async##name), NKikimr::NGRpcService::TEvYmq##name##Request>> \
(#name, &Ydb::Ymq::V1::YmqService::Stub::Async##name, [](Ydb::Ymq::V1::name##Request& request){return request.Getqueue_url();});
decltype(&Ydb::Ymq::V1::YmqService::Stub::AsyncYmq##name), NKikimr::NGRpcService::TEvYmq##name##Request>> \
(#name, &Ydb::Ymq::V1::YmqService::Stub::AsyncYmq##name, [](Ydb::Ymq::V1::name##Request& request){return request.Getqueue_url();});
DECLARE_YMQ_PROCESSOR_QUEUE_KNOWN(SendMessage);
DECLARE_YMQ_PROCESSOR_QUEUE_KNOWN(ReceiveMessage);
DECLARE_YMQ_PROCESSOR_QUEUE_KNOWN(GetQueueAttributes);
Expand Down
1 change: 0 additions & 1 deletion ydb/core/http_proxy/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ PEERDIR(
ydb/public/sdk/cpp/client/ydb_datastreams
ydb/public/sdk/cpp/client/ydb_persqueue_core
ydb/public/sdk/cpp/client/ydb_topic/codecs
ydb/public/sdk/cpp/client/ydb_ymq
ydb/public/sdk/cpp/client/iam_private
ydb/services/datastreams
ydb/services/persqueue_v1/actors
Expand Down
1 change: 0 additions & 1 deletion ydb/core/testlib/test_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,6 @@ namespace Tests {
GRpcServer->AddService(new NGRpcService::TGRpcYdbObjectStorageService(system, counters, grpcRequestProxies[0], true));
GRpcServer->AddService(new NQuoter::TRateLimiterGRpcService(system, counters, grpcRequestProxies[0]));
GRpcServer->AddService(new NGRpcService::TGRpcDataStreamsService(system, counters, grpcRequestProxies[0], true));
GRpcServer->AddService(new NGRpcService::TGRpcYmqService(system, counters, grpcRequestProxies[0], true));
GRpcServer->AddService(new NGRpcService::TGRpcMonitoringService(system, counters, grpcRequestProxies[0], true));
GRpcServer->AddService(new NGRpcService::TGRpcYdbQueryService(system, counters, grpcRequestProxies, true, 1));
GRpcServer->AddService(new NGRpcService::TGRpcYdbTabletService(system, counters, grpcRequestProxies, true, 1));
Expand Down
30 changes: 15 additions & 15 deletions ydb/public/api/grpc/draft/ydb_ymq_v1.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ option java_package = "com.yandex.ydb.ymq.v1";


service YmqService {
rpc GetQueueUrl(GetQueueUrlRequest) returns (GetQueueUrlResponse);
rpc CreateQueue(CreateQueueRequest) returns (CreateQueueResponse);
rpc SendMessage(SendMessageRequest) returns (SendMessageResponse);
rpc ReceiveMessage(ReceiveMessageRequest) returns (ReceiveMessageResponse);
rpc GetQueueAttributes(GetQueueAttributesRequest) returns (GetQueueAttributesResponse);
rpc ListQueues(ListQueuesRequest) returns (ListQueuesResponse);
rpc DeleteMessage(DeleteMessageRequest) returns (DeleteMessageResponse);
rpc PurgeQueue(PurgeQueueRequest) returns (PurgeQueueResponse);
rpc DeleteQueue(DeleteQueueRequest) returns (DeleteQueueResponse);
rpc ChangeMessageVisibility(ChangeMessageVisibilityRequest) returns (ChangeMessageVisibilityResponse);
rpc SetQueueAttributes(SetQueueAttributesRequest) returns (SetQueueAttributesResponse);
rpc SendMessageBatch(SendMessageBatchRequest) returns (SendMessageBatchResponse);
rpc DeleteMessageBatch(DeleteMessageBatchRequest) returns (DeleteMessageBatchResponse);
rpc ChangeMessageVisibilityBatch(ChangeMessageVisibilityBatchRequest) returns (ChangeMessageVisibilityBatchResponse);
rpc ListDeadLetterSourceQueues(ListDeadLetterSourceQueuesRequest) returns (ListDeadLetterSourceQueuesResponse);
rpc YmqGetQueueUrl(GetQueueUrlRequest) returns (GetQueueUrlResponse);
rpc YmqCreateQueue(CreateQueueRequest) returns (CreateQueueResponse);
rpc YmqSendMessage(SendMessageRequest) returns (SendMessageResponse);
rpc YmqReceiveMessage(ReceiveMessageRequest) returns (ReceiveMessageResponse);
rpc YmqGetQueueAttributes(GetQueueAttributesRequest) returns (GetQueueAttributesResponse);
rpc YmqListQueues(ListQueuesRequest) returns (ListQueuesResponse);
rpc YmqDeleteMessage(DeleteMessageRequest) returns (DeleteMessageResponse);
rpc YmqPurgeQueue(PurgeQueueRequest) returns (PurgeQueueResponse);
rpc YmqDeleteQueue(DeleteQueueRequest) returns (DeleteQueueResponse);
rpc YmqChangeMessageVisibility(ChangeMessageVisibilityRequest) returns (ChangeMessageVisibilityResponse);
rpc YmqSetQueueAttributes(SetQueueAttributesRequest) returns (SetQueueAttributesResponse);
rpc YmqSendMessageBatch(SendMessageBatchRequest) returns (SendMessageBatchResponse);
rpc YmqDeleteMessageBatch(DeleteMessageBatchRequest) returns (DeleteMessageBatchResponse);
rpc YmqChangeMessageVisibilityBatch(ChangeMessageVisibilityBatchRequest) returns (ChangeMessageVisibilityBatchResponse);
rpc YmqListDeadLetterSourceQueues(ListDeadLetterSourceQueuesRequest) returns (ListDeadLetterSourceQueuesResponse);
}
16 changes: 0 additions & 16 deletions ydb/public/sdk/cpp/client/ydb_ymq/ya.make
View file
Open in desktop

This file was deleted.

136 changes: 0 additions & 136 deletions ydb/public/sdk/cpp/client/ydb_ymq/ymq.cpp
View file
Open in desktop

This file was deleted.

74 changes: 0 additions & 74 deletions ydb/public/sdk/cpp/client/ydb_ymq/ymq.h
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ydb/services/ymq/grpc_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ void TGRpcYmqService::SetupIncomingRequests(NYdbGrpc::TLoggerPtr logger)
ActorSystem_->Send(GRpcRequestProxyId_, \
new TGrpcRequestOperationCall<Ydb::Ymq::V1::NAME##Request, Ydb::Ymq::V1::NAME##Response> \
(ctx, CB, TRequestAuxSettings{RLSWITCH(TRateLimiterMode::LIMIT_TYPE), ATTR})); \
}, &Ydb::Ymq::V1::YmqService::AsyncService::Request ## NAME, \
}, &Ydb::Ymq::V1::YmqService::AsyncService::RequestYmq ## NAME, \
#NAME, logger, getCounterBlock("ymq", #NAME))->Run();

ADD_REQUEST(GetQueueUrl, DoYmqGetQueueUrlRequest, nullptr, Off)
Expand Down
1 change: 0 additions & 1 deletion ydb/services/ymq/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ PEERDIR(
ydb/public/api/grpc/draft
ydb/public/lib/operation_id
ydb/public/sdk/cpp/client/resources
ydb/public/sdk/cpp/client/ydb_ymq
ydb/services/lib/actors
ydb/services/lib/sharding
ydb/services/persqueue_v1
Expand Down