Fix of ymq memory leak and fix of broken default-win-x86_64 build (ydb-platform#8740)

Author: siarheivesialou

ydb/core/http_proxy/http_req.cpp

@@ -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>
 
 
@@ -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);

ydb/core/http_proxy/ya.make

@@ -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

ydb/core/testlib/test_client.cpp

@@ -386,7 +386,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));
         if (Settings->EnableYq) {

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

@@ -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);
 }

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

@@ -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)

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

@@ -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