YQ-831 Move db_resolver folder to yql/providers/common/db_id_async_resolver

Move db_resolver

ref:c0659a5a3e97a0b38b768c7d59839f2dcf1d75af

21 files changed, 14 insertions, 14 deletions

diff --git a/ydb/core/yq/libs/actors/run_actor.cpp b/ydb/core/yq/libs/actors/run_actor.cpp
index 929381501e..ada7b0d464 100644
--- a/ydb/core/yq/libs/actors/run_actor.cpp
+++ b/ydb/core/yq/libs/actors/run_actor.cpp
@@ -68,7 +68,7 @@
 #include <ydb/core/yq/libs/checkpointing/checkpoint_coordinator.h>
 #include <ydb/core/yq/libs/checkpointing_common/defs.h>
 #include <ydb/core/yq/libs/checkpoint_storage/storage_service.h>
-#include <ydb/core/yq/libs/db_resolver/db_async_resolver_impl.h>
+#include <ydb/library/yql/providers/common/db_id_async_resolver/db_async_resolver_impl.h>
 #include <ydb/core/yq/libs/common/database_token_builder.h>
 #include <ydb/core/yq/libs/private_client/private_client.h>
 
diff --git a/ydb/core/yq/libs/actors/ya.make b/ydb/core/yq/libs/actors/ya.make
index 3638593814..78d6d09aca 100644
--- a/ydb/core/yq/libs/actors/ya.make
+++ b/ydb/core/yq/libs/actors/ya.make
@@ -39,7 +39,7 @@ PEERDIR(
     ydb/core/yq/libs/common
     ydb/core/yq/libs/control_plane_storage
     ydb/core/yq/libs/control_plane_storage/events
-    ydb/core/yq/libs/db_resolver
+    ydb/library/yql/providers/common/db_id_async_resolver
     ydb/core/yq/libs/db_schema
     ydb/core/yq/libs/events
     ydb/core/yq/libs/private_client
diff --git a/ydb/core/yq/libs/ya.make b/ydb/core/yq/libs/ya.make
index ccc88a55b6..a148ed3f14 100644
--- a/ydb/core/yq/libs/ya.make
+++ b/ydb/core/yq/libs/ya.make
@@ -10,7 +10,6 @@ RECURSE(
     config
     control_plane_proxy
     control_plane_storage
-    db_resolver
     db_schema
     events
     gateway
diff --git a/ydb/library/yql/providers/clickhouse/provider/ya.make b/ydb/library/yql/providers/clickhouse/provider/ya.make
index 05effd38eb..d775a5609d 100644
--- a/ydb/library/yql/providers/clickhouse/provider/ya.make
+++ b/ydb/library/yql/providers/clickhouse/provider/ya.make
@@ -30,7 +30,6 @@ PEERDIR(
     library/cpp/random_provider
     library/cpp/time_provider
     ydb/core/yq/libs/common
-    ydb/core/yq/libs/db_resolver
     ydb/library/yql/ast
     ydb/library/yql/minikql
     ydb/library/yql/minikql/comp_nodes
@@ -38,6 +37,7 @@ PEERDIR(
     ydb/library/yql/core
     ydb/library/yql/core/type_ann
     ydb/library/yql/dq/expr_nodes
+    ydb/library/yql/providers/common/db_id_async_resolver
     ydb/library/yql/providers/clickhouse/expr_nodes
     ydb/library/yql/providers/clickhouse/proto
     ydb/library/yql/providers/common/config
diff --git a/ydb/library/yql/providers/clickhouse/provider/yql_clickhouse_provider.h b/ydb/library/yql/providers/clickhouse/provider/yql_clickhouse_provider.h
index 7184fe1ba3..28ac8b244b 100644
--- a/ydb/library/yql/providers/clickhouse/provider/yql_clickhouse_provider.h
+++ b/ydb/library/yql/providers/clickhouse/provider/yql_clickhouse_provider.h
@@ -3,7 +3,7 @@
 #include <ydb/library/yql/core/yql_data_provider.h>
 #include <ydb/library/yql/providers/common/http_gateway/yql_http_gateway.h>
 #include "yql_clickhouse_settings.h"
-#include <ydb/core/yq/libs/db_resolver/db_async_resolver_with_meta.h>
+#include <ydb/library/yql/providers/common/db_id_async_resolver/db_async_resolver_with_meta.h>
 
 namespace NKikimr::NMiniKQL {
    class IFunctionRegistry;
diff --git a/ydb/library/yql/providers/clickhouse/provider/yql_clickhouse_settings.h b/ydb/library/yql/providers/clickhouse/provider/yql_clickhouse_settings.h
index 8d0b094af4..8f6eecf938 100644
--- a/ydb/library/yql/providers/clickhouse/provider/yql_clickhouse_settings.h
+++ b/ydb/library/yql/providers/clickhouse/provider/yql_clickhouse_settings.h
@@ -5,7 +5,7 @@
 #include <ydb/library/yql/providers/common/proto/gateways_config.pb.h>
 
 #include <ydb/core/yq/libs/events/events.h>
-#include <ydb/core/yq/libs/db_resolver/db_async_resolver_with_meta.h>
+#include <ydb/library/yql/providers/common/db_id_async_resolver/db_async_resolver_with_meta.h>
 #include <ydb/core/yq/libs/common/database_token_builder.h>
 
 namespace NYql {
diff --git a/ydb/core/yq/libs/db_resolver/db_async_resolver.h b/ydb/library/yql/providers/common/db_id_async_resolver/db_async_resolver.h
index a1e4ab18a1..a1e4ab18a1 100644
--- a/ydb/core/yq/libs/db_resolver/db_async_resolver.h
+++ b/ydb/library/yql/providers/common/db_id_async_resolver/db_async_resolver.h
diff --git a/ydb/core/yq/libs/db_resolver/db_async_resolver_impl.cpp b/ydb/library/yql/providers/common/db_id_async_resolver/db_async_resolver_impl.cpp
index d4fcc6e6dc..d4fcc6e6dc 100644
--- a/ydb/core/yq/libs/db_resolver/db_async_resolver_impl.cpp
+++ b/ydb/library/yql/providers/common/db_id_async_resolver/db_async_resolver_impl.cpp
diff --git a/ydb/core/yq/libs/db_resolver/db_async_resolver_impl.h b/ydb/library/yql/providers/common/db_id_async_resolver/db_async_resolver_impl.h
index 27b8f3a6f3..27b8f3a6f3 100644
--- a/ydb/core/yq/libs/db_resolver/db_async_resolver_impl.h
+++ b/ydb/library/yql/providers/common/db_id_async_resolver/db_async_resolver_impl.h
diff --git a/ydb/core/yq/libs/db_resolver/db_async_resolver_with_meta.cpp b/ydb/library/yql/providers/common/db_id_async_resolver/db_async_resolver_with_meta.cpp
index 027415d9d7..027415d9d7 100644
--- a/ydb/core/yq/libs/db_resolver/db_async_resolver_with_meta.cpp
+++ b/ydb/library/yql/providers/common/db_id_async_resolver/db_async_resolver_with_meta.cpp
diff --git a/ydb/core/yq/libs/db_resolver/db_async_resolver_with_meta.h b/ydb/library/yql/providers/common/db_id_async_resolver/db_async_resolver_with_meta.h
index 48fa9df041..48fa9df041 100644
--- a/ydb/core/yq/libs/db_resolver/db_async_resolver_with_meta.h
+++ b/ydb/library/yql/providers/common/db_id_async_resolver/db_async_resolver_with_meta.h
diff --git a/ydb/core/yq/libs/db_resolver/ya.make b/ydb/library/yql/providers/common/db_id_async_resolver/ya.make
index 2262759e36..2262759e36 100644
--- a/ydb/core/yq/libs/db_resolver/ya.make
+++ b/ydb/library/yql/providers/common/db_id_async_resolver/ya.make
diff --git a/ydb/library/yql/providers/common/ya.make b/ydb/library/yql/providers/common/ya.make
index 66778b0bcf..c8077af91e 100644
--- a/ydb/library/yql/providers/common/ya.make
+++ b/ydb/library/yql/providers/common/ya.make
@@ -1,6 +1,7 @@
 RECURSE(
     codec
     config
+    db_id_async_resolver
     dq
     gateway
     http_gateway
diff --git a/ydb/library/yql/providers/pq/provider/ut/ya.make b/ydb/library/yql/providers/pq/provider/ut/ya.make
index 66015a4f05..c477f74ba5 100644
--- a/ydb/library/yql/providers/pq/provider/ut/ya.make
+++ b/ydb/library/yql/providers/pq/provider/ut/ya.make
@@ -7,7 +7,6 @@ SRCS(
 )
 
 PEERDIR(
-    ydb/core/yq/libs/db_resolver
     ydb/library/yql/core/facade
     ydb/library/yql/core/file_storage
     ydb/library/yql/core/services/mounts
@@ -17,6 +16,7 @@ PEERDIR(
     ydb/public/sdk/cpp/client/ydb_persqueue_public/codecs
     ydb/library/yql/dq/comp_nodes
     ydb/library/yql/providers/common/comp_nodes
+    ydb/library/yql/providers/common/db_id_async_resolver
     ydb/library/yql/providers/dq/provider
     ydb/library/yql/providers/dq/local_gateway
     ydb/library/yql/providers/pq/gateway/dummy
diff --git a/ydb/library/yql/providers/pq/provider/ya.make b/ydb/library/yql/providers/pq/provider/ya.make
index ead04a48fc..42de863ce4 100644
--- a/ydb/library/yql/providers/pq/provider/ya.make
+++ b/ydb/library/yql/providers/pq/provider/ya.make
@@ -29,11 +29,11 @@ SRCS(
 PEERDIR(
     library/cpp/random_provider
     library/cpp/time_provider
-    ydb/core/yq/libs/db_resolver
     ydb/library/yql/ast
     ydb/library/yql/minikql
     ydb/library/yql/minikql/comp_nodes
     ydb/library/yql/minikql/computation
+    ydb/library/yql/providers/common/db_id_async_resolver
     ydb/library/yql/providers/common/structured_token
     ydb/library/yql/public/udf
     ydb/public/sdk/cpp/client/ydb_driver
diff --git a/ydb/library/yql/providers/pq/provider/yql_pq_provider.h b/ydb/library/yql/providers/pq/provider/yql_pq_provider.h
index a890e32b69..6b86fd29a6 100644
--- a/ydb/library/yql/providers/pq/provider/yql_pq_provider.h
+++ b/ydb/library/yql/providers/pq/provider/yql_pq_provider.h
@@ -5,7 +5,7 @@
 #include <ydb/library/yql/core/yql_data_provider.h>
 #include <ydb/library/yql/providers/dq/interface/yql_dq_integration.h>
 #include <ydb/library/yql/providers/pq/expr_nodes/yql_pq_expr_nodes.h>
-#include <ydb/core/yq/libs/db_resolver/db_async_resolver_with_meta.h>
+#include <ydb/library/yql/providers/common/db_id_async_resolver/db_async_resolver_with_meta.h>
 
 namespace NKikimr::NMiniKQL {
 class IFunctionRegistry;
diff --git a/ydb/library/yql/providers/pq/provider/yql_pq_settings.h b/ydb/library/yql/providers/pq/provider/yql_pq_settings.h
index 5ed40d07d9..cdf55e9d2b 100644
--- a/ydb/library/yql/providers/pq/provider/yql_pq_settings.h
+++ b/ydb/library/yql/providers/pq/provider/yql_pq_settings.h
@@ -7,7 +7,7 @@
 #include <ydb/library/yql/providers/common/proto/gateways_config.pb.h>
 
 #include <ydb/core/yq/libs/events/events.h>
-#include <ydb/core/yq/libs/db_resolver/db_async_resolver_with_meta.h>
+#include <ydb/library/yql/providers/common/db_id_async_resolver/db_async_resolver_with_meta.h>
 #include <ydb/core/yq/libs/common/database_token_builder.h>
 
 namespace NYql {
diff --git a/ydb/library/yql/providers/ydb/provider/ya.make b/ydb/library/yql/providers/ydb/provider/ya.make
index b220766ee5..c00cace7e5 100644
--- a/ydb/library/yql/providers/ydb/provider/ya.make
+++ b/ydb/library/yql/providers/ydb/provider/ya.make
@@ -25,7 +25,6 @@ PEERDIR(
     library/cpp/time_provider
     library/cpp/yson/node
     ydb/core/yq/libs/common
-    ydb/core/yq/libs/db_resolver
     ydb/library/yql/ast
     ydb/library/yql/minikql
     ydb/library/yql/minikql/comp_nodes
@@ -39,6 +38,7 @@ PEERDIR(
     ydb/library/yql/core/type_ann
     ydb/library/yql/dq/expr_nodes
     ydb/library/yql/providers/common/config
+    ydb/library/yql/providers/common/db_id_async_resolver
     ydb/library/yql/providers/common/dq
     ydb/library/yql/providers/common/mkql
     ydb/library/yql/providers/common/proto
diff --git a/ydb/library/yql/providers/ydb/provider/yql_ydb_provider.h b/ydb/library/yql/providers/ydb/provider/yql_ydb_provider.h
index ac9d00d145..41c55868f7 100644
--- a/ydb/library/yql/providers/ydb/provider/yql_ydb_provider.h
+++ b/ydb/library/yql/providers/ydb/provider/yql_ydb_provider.h
@@ -6,7 +6,7 @@
 #include <ydb/library/yql/providers/common/token_accessor/client/factory.h>
 #include <ydb/public/sdk/cpp/client/ydb_driver/driver.h>
 #include <ydb/public/lib/experimental/ydb_clickhouse_internal.h>
-#include <ydb/core/yq/libs/db_resolver/db_async_resolver_with_meta.h>
+#include <ydb/library/yql/providers/common/db_id_async_resolver/db_async_resolver_with_meta.h>
 
 namespace NKikimr::NMiniKQL {
    class IFunctionRegistry;
diff --git a/ydb/library/yql/providers/ydb/provider/yql_ydb_settings.h b/ydb/library/yql/providers/ydb/provider/yql_ydb_settings.h
index fc6fb03ced..9bb003df99 100644
--- a/ydb/library/yql/providers/ydb/provider/yql_ydb_settings.h
+++ b/ydb/library/yql/providers/ydb/provider/yql_ydb_settings.h
@@ -6,7 +6,7 @@
 #include <ydb/library/yql/providers/common/proto/gateways_config.pb.h>
 
 #include <ydb/core/yq/libs/events/events.h>
-#include <ydb/core/yq/libs/db_resolver/db_async_resolver_with_meta.h>
+#include <ydb/library/yql/providers/common/db_id_async_resolver/db_async_resolver_with_meta.h>
 #include <ydb/core/yq/libs/common/database_token_builder.h>
 
 
diff --git a/ydb/services/yq/ut_integration/ya.make b/ydb/services/yq/ut_integration/ya.make
index bc62df4563..b8c3a0f800 100644
--- a/ydb/services/yq/ut_integration/ya.make
+++ b/ydb/services/yq/ut_integration/ya.make
@@ -22,11 +22,11 @@ PEERDIR(
     library/cpp/svnversion
     ydb/core/testlib
     ydb/core/yq/libs/control_plane_storage
-    ydb/core/yq/libs/db_resolver
     ydb/core/yq/libs/db_schema
     ydb/core/yq/libs/private_client
     ydb/services/ydb
     ydb/services/yq
+    ydb/library/yql/providers/common/db_id_async_resolver
     ydb/library/yql/udfs/common/clickhouse/client
     ydb/library/yql/utils
 )