dcherednik 1 год назад
Родитель
Сommit
10fd58d056

+ 37 - 19
.mapping.json

@@ -2673,25 +2673,6 @@
   "library/cpp/getopt/small/CMakeLists.linux-x86_64.txt":"",
   "library/cpp/getopt/small/CMakeLists.txt":"",
   "library/cpp/getopt/small/CMakeLists.windows-x86_64.txt":"",
-  "library/cpp/grpc/CMakeLists.txt":"",
-  "library/cpp/grpc/client/CMakeLists.darwin-arm64.txt":"",
-  "library/cpp/grpc/client/CMakeLists.darwin-x86_64.txt":"",
-  "library/cpp/grpc/client/CMakeLists.linux-aarch64.txt":"",
-  "library/cpp/grpc/client/CMakeLists.linux-x86_64.txt":"",
-  "library/cpp/grpc/client/CMakeLists.txt":"",
-  "library/cpp/grpc/client/CMakeLists.windows-x86_64.txt":"",
-  "library/cpp/grpc/server/CMakeLists.darwin-arm64.txt":"",
-  "library/cpp/grpc/server/CMakeLists.darwin-x86_64.txt":"",
-  "library/cpp/grpc/server/CMakeLists.linux-aarch64.txt":"",
-  "library/cpp/grpc/server/CMakeLists.linux-x86_64.txt":"",
-  "library/cpp/grpc/server/CMakeLists.txt":"",
-  "library/cpp/grpc/server/CMakeLists.windows-x86_64.txt":"",
-  "library/cpp/grpc/server/actors/CMakeLists.darwin-arm64.txt":"",
-  "library/cpp/grpc/server/actors/CMakeLists.darwin-x86_64.txt":"",
-  "library/cpp/grpc/server/actors/CMakeLists.linux-aarch64.txt":"",
-  "library/cpp/grpc/server/actors/CMakeLists.linux-x86_64.txt":"",
-  "library/cpp/grpc/server/actors/CMakeLists.txt":"",
-  "library/cpp/grpc/server/actors/CMakeLists.windows-x86_64.txt":"",
   "library/cpp/histogram/CMakeLists.txt":"",
   "library/cpp/histogram/adaptive/CMakeLists.darwin-arm64.txt":"",
   "library/cpp/histogram/adaptive/CMakeLists.darwin-x86_64.txt":"",
@@ -7785,6 +7766,43 @@
   "ydb/library/folder_service/proto/CMakeLists.linux-x86_64.txt":"",
   "ydb/library/folder_service/proto/CMakeLists.txt":"",
   "ydb/library/folder_service/proto/CMakeLists.windows-x86_64.txt":"",
+  "ydb/library/grpc/CMakeLists.txt":"",
+  "ydb/library/grpc/client/CMakeLists.darwin-arm64.txt":"",
+  "ydb/library/grpc/client/CMakeLists.darwin-x86_64.txt":"",
+  "ydb/library/grpc/client/CMakeLists.linux-aarch64.txt":"",
+  "ydb/library/grpc/client/CMakeLists.linux-x86_64.txt":"",
+  "ydb/library/grpc/client/CMakeLists.txt":"",
+  "ydb/library/grpc/client/CMakeLists.windows-x86_64.txt":"",
+  "ydb/library/grpc/client/ut/CMakeLists.darwin-arm64.txt":"",
+  "ydb/library/grpc/client/ut/CMakeLists.darwin-x86_64.txt":"",
+  "ydb/library/grpc/client/ut/CMakeLists.linux-aarch64.txt":"",
+  "ydb/library/grpc/client/ut/CMakeLists.linux-x86_64.txt":"",
+  "ydb/library/grpc/client/ut/CMakeLists.txt":"",
+  "ydb/library/grpc/client/ut/CMakeLists.windows-x86_64.txt":"",
+  "ydb/library/grpc/common/CMakeLists.darwin-arm64.txt":"",
+  "ydb/library/grpc/common/CMakeLists.darwin-x86_64.txt":"",
+  "ydb/library/grpc/common/CMakeLists.linux-aarch64.txt":"",
+  "ydb/library/grpc/common/CMakeLists.linux-x86_64.txt":"",
+  "ydb/library/grpc/common/CMakeLists.txt":"",
+  "ydb/library/grpc/common/CMakeLists.windows-x86_64.txt":"",
+  "ydb/library/grpc/server/CMakeLists.darwin-arm64.txt":"",
+  "ydb/library/grpc/server/CMakeLists.darwin-x86_64.txt":"",
+  "ydb/library/grpc/server/CMakeLists.linux-aarch64.txt":"",
+  "ydb/library/grpc/server/CMakeLists.linux-x86_64.txt":"",
+  "ydb/library/grpc/server/CMakeLists.txt":"",
+  "ydb/library/grpc/server/CMakeLists.windows-x86_64.txt":"",
+  "ydb/library/grpc/server/actors/CMakeLists.darwin-arm64.txt":"",
+  "ydb/library/grpc/server/actors/CMakeLists.darwin-x86_64.txt":"",
+  "ydb/library/grpc/server/actors/CMakeLists.linux-aarch64.txt":"",
+  "ydb/library/grpc/server/actors/CMakeLists.linux-x86_64.txt":"",
+  "ydb/library/grpc/server/actors/CMakeLists.txt":"",
+  "ydb/library/grpc/server/actors/CMakeLists.windows-x86_64.txt":"",
+  "ydb/library/grpc/server/ut/CMakeLists.darwin-arm64.txt":"",
+  "ydb/library/grpc/server/ut/CMakeLists.darwin-x86_64.txt":"",
+  "ydb/library/grpc/server/ut/CMakeLists.linux-aarch64.txt":"",
+  "ydb/library/grpc/server/ut/CMakeLists.linux-x86_64.txt":"",
+  "ydb/library/grpc/server/ut/CMakeLists.txt":"",
+  "ydb/library/grpc/server/ut/CMakeLists.windows-x86_64.txt":"",
   "ydb/library/http_proxy/CMakeLists.txt":"",
   "ydb/library/http_proxy/authorization/CMakeLists.darwin-arm64.txt":"",
   "ydb/library/http_proxy/authorization/CMakeLists.darwin-x86_64.txt":"",

+ 0 - 1
library/cpp/CMakeLists.darwin-arm64.txt

@@ -38,7 +38,6 @@ add_subdirectory(dwarf_backtrace)
 add_subdirectory(enumbitset)
 add_subdirectory(execprofile)
 add_subdirectory(getopt)
-add_subdirectory(grpc)
 add_subdirectory(histogram)
 add_subdirectory(html)
 add_subdirectory(http)

+ 0 - 1
library/cpp/CMakeLists.darwin-x86_64.txt

@@ -39,7 +39,6 @@ add_subdirectory(dwarf_backtrace)
 add_subdirectory(enumbitset)
 add_subdirectory(execprofile)
 add_subdirectory(getopt)
-add_subdirectory(grpc)
 add_subdirectory(histogram)
 add_subdirectory(html)
 add_subdirectory(http)

+ 0 - 1
library/cpp/CMakeLists.linux-aarch64.txt

@@ -38,7 +38,6 @@ add_subdirectory(dwarf_backtrace)
 add_subdirectory(enumbitset)
 add_subdirectory(execprofile)
 add_subdirectory(getopt)
-add_subdirectory(grpc)
 add_subdirectory(histogram)
 add_subdirectory(html)
 add_subdirectory(http)

+ 0 - 1
library/cpp/CMakeLists.linux-x86_64.txt

@@ -39,7 +39,6 @@ add_subdirectory(dwarf_backtrace)
 add_subdirectory(enumbitset)
 add_subdirectory(execprofile)
 add_subdirectory(getopt)
-add_subdirectory(grpc)
 add_subdirectory(histogram)
 add_subdirectory(html)
 add_subdirectory(http)

+ 0 - 1
library/cpp/CMakeLists.windows-x86_64.txt

@@ -37,7 +37,6 @@ add_subdirectory(dns)
 add_subdirectory(enumbitset)
 add_subdirectory(execprofile)
 add_subdirectory(getopt)
-add_subdirectory(grpc)
 add_subdirectory(histogram)
 add_subdirectory(html)
 add_subdirectory(http)

+ 2 - 2
ydb/core/base/grpc_service_factory.h

@@ -1,13 +1,13 @@
 #pragma once
 
-#include <library/cpp/grpc/server/grpc_server.h>
+#include <ydb/library/grpc/server/grpc_server.h>
 
 namespace NKikimr {
 
 // Parameterize YDB binary with grpc services registry
 class TGrpcServiceFactory {
 private:
-    using TServicePtr = TIntrusivePtr<NGrpc::IGRpcService>;
+    using TServicePtr = TIntrusivePtr<NYdbGrpc::IGRpcService>;
     using TFactoryMethod = std::function<
             TServicePtr(
                 NActors::TActorSystem*,

+ 1 - 1
ydb/core/client/CMakeLists.darwin-arm64.txt

@@ -17,7 +17,7 @@ add_library(ydb-core-client INTERFACE)
 target_link_libraries(ydb-core-client INTERFACE
   contrib-libs-cxxsupp
   yutil
-  cpp-grpc-server
+  library-grpc-server
   ydb-core-base
   core-client-scheme_cache_lib
   core-client-server

+ 1 - 1
ydb/core/client/CMakeLists.darwin-x86_64.txt

@@ -17,7 +17,7 @@ add_library(ydb-core-client INTERFACE)
 target_link_libraries(ydb-core-client INTERFACE
   contrib-libs-cxxsupp
   yutil
-  cpp-grpc-server
+  library-grpc-server
   ydb-core-base
   core-client-scheme_cache_lib
   core-client-server

+ 1 - 1
ydb/core/client/CMakeLists.linux-aarch64.txt

@@ -18,7 +18,7 @@ target_link_libraries(ydb-core-client INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-grpc-server
+  library-grpc-server
   ydb-core-base
   core-client-scheme_cache_lib
   core-client-server

Некоторые файлы не были показаны из-за большого количества измененных файлов