Renamed ydb_extension dir to extension_common (#256)

Gazizonoki · web-flow · commit 4944918191d3 · 2024-07-03T15:22:31.000+03:00
diff --git a/include/ydb-cpp-sdk/client/extension_common/extension.h b/include/ydb-cpp-sdk/client/extension_common/extension.h
diff --git a/include/ydb-cpp-sdk/client/extensions/discovery_mutator/discovery_mutator.h b/include/ydb-cpp-sdk/client/extensions/discovery_mutator/discovery_mutator.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ydb-cpp-sdk/client/ydb_extension/extension.h>
+#include <ydb-cpp-sdk/client/extension_common/extension.h>
 
 namespace NDiscoveryMutator {
 
diff --git a/include/ydb-cpp-sdk/client/extensions/solomon_stats/pull_client.h b/include/ydb-cpp-sdk/client/extensions/solomon_stats/pull_client.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ydb-cpp-sdk/client/ydb_extension/extension.h>
+#include <ydb-cpp-sdk/client/extension_common/extension.h>
 
 #include <ydb-cpp-sdk/library/http/server/response.h>
 #include <ydb-cpp-sdk/library/monlib/metrics/metric_consumer.h>
diff --git a/include/ydb-cpp-sdk/client/extensions/solomon_stats/pull_connector.h b/include/ydb-cpp-sdk/client/extensions/solomon_stats/pull_connector.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ydb-cpp-sdk/client/ydb_extension/extension.h>
+#include <ydb-cpp-sdk/client/extension_common/extension.h>
 
 #include <ydb-cpp-sdk/library/monlib/metrics/metric_registry.h>
 
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
@@ -1,5 +1,4 @@
 add_subdirectory(draft)
-add_subdirectory(extensions)
 add_subdirectory(helpers)
 add_subdirectory(iam)
 add_subdirectory(iam_private)
@@ -11,7 +10,8 @@ add_subdirectory(datastreams)
 add_subdirectory(discovery)
 add_subdirectory(driver)
 add_subdirectory(export)
-add_subdirectory(ydb_extension)
+add_subdirectory(extension_common)
+add_subdirectory(extensions)
 add_subdirectory(federated_topic)
 add_subdirectory(import)
 add_subdirectory(monitoring)
diff --git a/src/client/extension_common/CMakeLists.txt b/src/client/extension_common/CMakeLists.txt
@@ -0,0 +1,13 @@
+add_library(client-extension_common)
+
+target_link_libraries(client-extension_common PUBLIC
+  yutil
+  monlib-metrics
+  client-ydb_driver
+)
+
+target_sources(client-extension_common PRIVATE
+  extension.cpp
+)
+
+_ydb_sdk_make_client_component(Extension client-extension_common)
diff --git a/src/client/extension_common/extension.cpp b/src/client/extension_common/extension.cpp
@@ -1,4 +1,4 @@
-#include <ydb-cpp-sdk/client/ydb_extension/extension.h>
+#include <ydb-cpp-sdk/client/extension_common/extension.h>
 
 #define INCLUDE_YDB_INTERNAL_H
 #include <src/client/impl/ydb_internal/grpc_connections/grpc_connections.h>
diff --git a/src/client/extensions/discovery_mutator/CMakeLists.txt b/src/client/extensions/discovery_mutator/CMakeLists.txt
@@ -2,7 +2,7 @@ add_library(client-extensions-discovery_mutator)
 
 target_link_libraries(client-extensions-discovery_mutator PUBLIC
   yutil
-  client-ydb_extension
+  client-extension_common
 )
 
 target_sources(client-extensions-discovery_mutator PRIVATE
diff --git a/src/client/extensions/solomon_stats/CMakeLists.txt b/src/client/extensions/solomon_stats/CMakeLists.txt
@@ -6,7 +6,7 @@ target_link_libraries(client-extensions-solomon_stats PUBLIC
   monlib-metrics
   monlib-service
   monlib-service-pages
-  client-ydb_extension
+  client-extension_common
 )
 
 target_sources(client-extensions-solomon_stats PRIVATE
diff --git a/src/client/impl/ydb_internal/grpc_connections/grpc_connections.h b/src/client/impl/ydb_internal/grpc_connections/grpc_connections.h
@@ -12,7 +12,7 @@
 #include <src/client/impl/ydb_internal/rpc_request_settings/settings.h>
 #include <src/client/impl/ydb_internal/thread_pool/pool.h>
 #include <ydb-cpp-sdk/client/resources/ydb_resources.h>
-#include <ydb-cpp-sdk/client/ydb_extension/extension.h>
+#include <ydb-cpp-sdk/client/extension_common/extension.h>
 
 #include <src/library/yql/public/issue/yql_issue_message.h>
 
diff --git a/src/client/impl/ydb_internal/stats_extractor/extractor.h b/src/client/impl/ydb_internal/stats_extractor/extractor.h
@@ -4,7 +4,7 @@
 
 #include <src/client/impl/ydb_internal/internal_client/client.h>
 
-#include <ydb-cpp-sdk/client/ydb_extension/extension.h>
+#include <ydb-cpp-sdk/client/extension_common/extension.h>
 
 #include <ydb-cpp-sdk/library/monlib/metrics/metric_registry.h>
 
diff --git a/src/client/ydb_extension/CMakeLists.txt b/src/client/ydb_extension/CMakeLists.txt
diff --git a/tests/client/discovery_mutator_ut.cpp b/tests/client/discovery_mutator_ut.cpp
@@ -1,7 +1,7 @@
 #include <ydb-cpp-sdk/client/extensions/discovery_mutator/discovery_mutator.h>
 
 #include <src/api/grpc/ydb_discovery_v1.grpc.pb.h>
-#include <ydb-cpp-sdk/client/ydb_extension/extension.h>
+#include <ydb-cpp-sdk/client/extension_common/extension.h>
 #include <ydb-cpp-sdk/client/table/table.h>
 
 #include <src/library/testing/unittest/registar.h>
diff --git a/tests/library/json/CMakeLists.txt b/tests/library/json/CMakeLists.txt
@@ -9,7 +9,7 @@ INCLUDE_DIRS
 LINK_LIBRARIES
     yutil
     cpp-testing-unittest_main
-    library-cpp-json
+    library-json
 )
 
 add_ydb_test(NAME json-ut-json_reader_fast_ut
@@ -24,7 +24,7 @@ INCLUDE_DIRS
 LINK_LIBRARIES
     yutil
     cpp-testing-unittest_main
-    library-cpp-json
+    library-json
 )
 
 add_ydb_test(NAME json-ut-json_reader_ut
@@ -38,7 +38,7 @@ INCLUDE_DIRS
 LINK_LIBRARIES
     yutil
     cpp-testing-unittest_main
-    library-cpp-json
+    library-json
 )
 
 add_ydb_test(NAME json-ut-json_saveload_ut
@@ -52,7 +52,7 @@ INCLUDE_DIRS
 LINK_LIBRARIES
     yutil
     cpp-testing-unittest_main
-    library-cpp-json
+    library-json
 )
 
 add_ydb_test(NAME json-ut-json_writer_ut
@@ -65,5 +65,5 @@ INCLUDE_DIRS
 LINK_LIBRARIES
     yutil
     cpp-testing-unittest_main
-    library-cpp-json
+    library-json
 )
diff --git a/tests/library/json/writer/CMakeLists.txt b/tests/library/json/writer/CMakeLists.txt
@@ -8,7 +8,7 @@ INCLUDE_DIRS
     ${YDB_SDK_SOURCE_DIR}/src/util/system
 LINK_LIBRARIES
     yutil
-    cpp-json-writer
+    library-json-writer
     cpp-testing-unittest_main
 )
 
@@ -21,6 +21,6 @@ INCLUDE_DIRS
     ${YDB_SDK_SOURCE_DIR}/src/library/testing/unittest
 LINK_LIBRARIES
     yutil
-    cpp-json-writer
+    library-json-writer
     cpp-testing-unittest_main
 )

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include <ydb-cpp-sdk/client/ydb_extension/extension.h>`
	`1`	`+#include <ydb-cpp-sdk/client/extension_common/extension.h>`
`2`	`2`
`3`	`3`	`#define INCLUDE_YDB_INTERNAL_H`
`4`	`4`	`#include <src/client/impl/ydb_internal/grpc_connections/grpc_connections.h>`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ add_library(client-extensions-discovery_mutator)`
`2`	`2`
`3`	`3`	`target_link_libraries(client-extensions-discovery_mutator PUBLIC`
`4`	`4`	`yutil`
`5`		`- client-ydb_extension`
	`5`	`+ client-extension_common`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`target_sources(client-extensions-discovery_mutator PRIVATE`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ target_link_libraries(client-extensions-solomon_stats PUBLIC`
`6`	`6`	`monlib-metrics`
`7`	`7`	`monlib-service`
`8`	`8`	`monlib-service-pages`
`9`		`- client-ydb_extension`
	`9`	`+ client-extension_common`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`target_sources(client-extensions-solomon_stats PRIVATE`