Explicit session support for ExecuteQuery call. KIKIMR-18968

32 files changed, 72 insertions, 33 deletions

diff --git a/ydb/core/grpc_services/query/rpc_execute_query.cpp b/ydb/core/grpc_services/query/rpc_execute_query.cpp
index 9dbe4f9aab1..e38dc79e99c 100644
--- a/ydb/core/grpc_services/query/rpc_execute_query.cpp
+++ b/ydb/core/grpc_services/query/rpc_execute_query.cpp
@@ -255,7 +255,7 @@ private:
             queryType,
             SelfId(),
             Request_,
-            "", // sessionId
+            req->session_id(),
             std::move(query),
             "", // queryId
             txControl,
diff --git a/ydb/core/kqp/ut/service/CMakeLists.darwin-x86_64.txt b/ydb/core/kqp/ut/service/CMakeLists.darwin-x86_64.txt
index ac0ed13bd79..ce01e6c4d28 100644
--- a/ydb/core/kqp/ut/service/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/kqp/ut/service/CMakeLists.darwin-x86_64.txt
@@ -24,6 +24,7 @@ target_link_libraries(ydb-core-kqp-ut-service PUBLIC
   kqp-ut-common
   yql-sql-pg
   yql-parser-pg_wrapper
+  public-lib-ut_helpers
   cpp-client-ydb_operation
   client-ydb_types-operation
 )
diff --git a/ydb/core/kqp/ut/service/CMakeLists.linux-aarch64.txt b/ydb/core/kqp/ut/service/CMakeLists.linux-aarch64.txt
index 1198c83320b..7bec8b67020 100644
--- a/ydb/core/kqp/ut/service/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/kqp/ut/service/CMakeLists.linux-aarch64.txt
@@ -24,6 +24,7 @@ target_link_libraries(ydb-core-kqp-ut-service PUBLIC
   kqp-ut-common
   yql-sql-pg
   yql-parser-pg_wrapper
+  public-lib-ut_helpers
   cpp-client-ydb_operation
   client-ydb_types-operation
 )
diff --git a/ydb/core/kqp/ut/service/CMakeLists.linux-x86_64.txt b/ydb/core/kqp/ut/service/CMakeLists.linux-x86_64.txt
index 457477a5d6d..6850a1fbd8d 100644
--- a/ydb/core/kqp/ut/service/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/kqp/ut/service/CMakeLists.linux-x86_64.txt
@@ -25,6 +25,7 @@ target_link_libraries(ydb-core-kqp-ut-service PUBLIC
   kqp-ut-common
   yql-sql-pg
   yql-parser-pg_wrapper
+  public-lib-ut_helpers
   cpp-client-ydb_operation
   client-ydb_types-operation
 )
diff --git a/ydb/core/kqp/ut/service/CMakeLists.windows-x86_64.txt b/ydb/core/kqp/ut/service/CMakeLists.windows-x86_64.txt
index 10ef8e0ce5b..e8ea424062f 100644
--- a/ydb/core/kqp/ut/service/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/kqp/ut/service/CMakeLists.windows-x86_64.txt
@@ -24,6 +24,7 @@ target_link_libraries(ydb-core-kqp-ut-service PUBLIC
   kqp-ut-common
   yql-sql-pg
   yql-parser-pg_wrapper
+  public-lib-ut_helpers
   cpp-client-ydb_operation
   client-ydb_types-operation
 )
diff --git a/ydb/core/kqp/ut/service/kqp_query_service_ut.cpp b/ydb/core/kqp/ut/service/kqp_query_service_ut.cpp
index 21d4b697352..c0ecc6d7b71 100644
--- a/ydb/core/kqp/ut/service/kqp_query_service_ut.cpp
+++ b/ydb/core/kqp/ut/service/kqp_query_service_ut.cpp
@@ -1,5 +1,6 @@
 #include <ydb/core/kqp/counters/kqp_counters.h>
 #include <ydb/core/kqp/ut/common/kqp_ut_common.h>
+#include <ydb/public/lib/ut_helpers/ut_helpers_query.h>
 #include <ydb/public/sdk/cpp/client/ydb_operation/operation.h>
 #include <ydb/public/sdk/cpp/client/ydb_proto/accessor.h>
 #include <ydb/public/sdk/cpp/client/ydb_types/operation/operation.h>
@@ -45,6 +46,42 @@ Y_UNIT_TEST_SUITE(KqpQueryService) {
         WaitForZeroSessions(counters);
     }
 
+    Y_UNIT_TEST(QueryOnClosedSession) {
+        auto kikimr = DefaultKikimrRunner();
+        auto clientConfig = NGRpcProxy::TGRpcClientConfig(kikimr.GetEndpoint());
+        NKqp::TKqpCounters counters(kikimr.GetTestServer().GetRuntime()->GetAppData().Counters);
+
+        {
+            auto db = kikimr.GetQueryClient();
+
+            TString id;
+            {
+                auto result = db.GetSession().GetValueSync();
+                UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
+                UNIT_ASSERT(result.GetSession().GetId());
+                auto session = result.GetSession();
+                id = session.GetId();
+
+                bool allDoneOk = true;
+                NTestHelpers::CheckDelete(clientConfig, id, Ydb::StatusIds::SUCCESS, allDoneOk);
+
+                UNIT_ASSERT(allDoneOk);
+
+                auto execResult = session.ExecuteQuery("SELECT 1;",
+                    NYdb::NQuery::TTxControl::BeginTx().CommitTx()).ExtractValueSync();
+
+                UNIT_ASSERT_VALUES_EQUAL(execResult.GetStatus(), EStatus::BAD_SESSION);
+            }
+            // closed session must be removed from session pool
+            {
+                auto result = db.GetSession().GetValueSync();
+                UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
+                UNIT_ASSERT(result.GetSession().GetId() != id);
+            }
+        }
+        WaitForZeroSessions(counters);
+    }
+
     Y_UNIT_TEST(StreamExecuteQueryPure) {
         auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetQueryClient();
diff --git a/ydb/core/kqp/ut/service/ya.make b/ydb/core/kqp/ut/service/ya.make
index 64135e82178..23472755bc7 100644
--- a/ydb/core/kqp/ut/service/ya.make
+++ b/ydb/core/kqp/ut/service/ya.make
@@ -24,6 +24,7 @@ PEERDIR(
     ydb/core/kqp/ut/common
     ydb/library/yql/sql/pg
     ydb/library/yql/parser/pg_wrapper
+    ydb/public/lib/ut_helpers
     ydb/public/sdk/cpp/client/ydb_operation
     ydb/public/sdk/cpp/client/ydb_types/operation
 )
diff --git a/ydb/public/lib/CMakeLists.txt b/ydb/public/lib/CMakeLists.txt
index 2a991f3fa0e..5a2d17a08c6 100644
--- a/ydb/public/lib/CMakeLists.txt
+++ b/ydb/public/lib/CMakeLists.txt
@@ -15,6 +15,7 @@ add_subdirectory(json_value)
 add_subdirectory(jwt)
 add_subdirectory(operation_id)
 add_subdirectory(scheme_types)
+add_subdirectory(ut_helpers)
 add_subdirectory(validation)
 add_subdirectory(value)
 add_subdirectory(ydb_cli)
diff --git a/ydb/services/ydb/ut_helpers/CMakeLists.darwin-x86_64.txt b/ydb/public/lib/ut_helpers/CMakeLists.darwin-x86_64.txt
index 5b672d97e57..82277a88030 100644
--- a/ydb/services/ydb/ut_helpers/CMakeLists.darwin-x86_64.txt
+++ b/ydb/public/lib/ut_helpers/CMakeLists.darwin-x86_64.txt
@@ -7,8 +7,8 @@
 
 
 
-add_library(services-ydb-ut_helpers)
-target_link_libraries(services-ydb-ut_helpers PUBLIC
+add_library(public-lib-ut_helpers)
+target_link_libraries(public-lib-ut_helpers PUBLIC
   contrib-libs-cxxsupp
   yutil
   api-grpc
@@ -17,6 +17,6 @@ target_link_libraries(services-ydb-ut_helpers PUBLIC
   api-protos-out
   cpp-grpc-client
 )
-target_sources(services-ydb-ut_helpers PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/services/ydb/ut_helpers/ut_helpers_query.cpp
+target_sources(public-lib-ut_helpers PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ut_helpers/ut_helpers_query.cpp
 )
diff --git a/ydb/services/ydb/ut_helpers/CMakeLists.linux-aarch64.txt b/ydb/public/lib/ut_helpers/CMakeLists.linux-aarch64.txt
index 51193f42857..ecb1009305a 100644
--- a/ydb/services/ydb/ut_helpers/CMakeLists.linux-aarch64.txt
+++ b/ydb/public/lib/ut_helpers/CMakeLists.linux-aarch64.txt
@@ -7,8 +7,8 @@
 
 
 
-add_library(services-ydb-ut_helpers)
-target_link_libraries(services-ydb-ut_helpers PUBLIC
+add_library(public-lib-ut_helpers)
+target_link_libraries(public-lib-ut_helpers PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
@@ -18,6 +18,6 @@ target_link_libraries(services-ydb-ut_helpers PUBLIC
   api-protos-out
   cpp-grpc-client
 )
-target_sources(services-ydb-ut_helpers PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/services/ydb/ut_helpers/ut_helpers_query.cpp
+target_sources(public-lib-ut_helpers PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ut_helpers/ut_helpers_query.cpp
 )
diff --git a/ydb/services/ydb/ut_helpers/CMakeLists.linux-x86_64.txt b/ydb/public/lib/ut_helpers/CMakeLists.linux-x86_64.txt
index 51193f42857..ecb1009305a 100644
--- a/ydb/services/ydb/ut_helpers/CMakeLists.linux-x86_64.txt
+++ b/ydb/public/lib/ut_helpers/CMakeLists.linux-x86_64.txt
@@ -7,8 +7,8 @@
 
 
 
-add_library(services-ydb-ut_helpers)
-target_link_libraries(services-ydb-ut_helpers PUBLIC
+add_library(public-lib-ut_helpers)
+target_link_libraries(public-lib-ut_helpers PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
@@ -18,6 +18,6 @@ target_link_libraries(services-ydb-ut_helpers PUBLIC
   api-protos-out
   cpp-grpc-client
 )
-target_sources(services-ydb-ut_helpers PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/services/ydb/ut_helpers/ut_helpers_query.cpp
+target_sources(public-lib-ut_helpers PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ut_helpers/ut_helpers_query.cpp
 )
diff --git a/ydb/services/ydb/ut_helpers/CMakeLists.txt b/ydb/public/lib/ut_helpers/CMakeLists.txt
index f8b31df0c11..f8b31df0c11 100644
--- a/ydb/services/ydb/ut_helpers/CMakeLists.txt
+++ b/ydb/public/lib/ut_helpers/CMakeLists.txt
diff --git a/ydb/services/ydb/ut_helpers/CMakeLists.windows-x86_64.txt b/ydb/public/lib/ut_helpers/CMakeLists.windows-x86_64.txt
index 5b672d97e57..82277a88030 100644
--- a/ydb/services/ydb/ut_helpers/CMakeLists.windows-x86_64.txt
+++ b/ydb/public/lib/ut_helpers/CMakeLists.windows-x86_64.txt
@@ -7,8 +7,8 @@
 
 
 
-add_library(services-ydb-ut_helpers)
-target_link_libraries(services-ydb-ut_helpers PUBLIC
+add_library(public-lib-ut_helpers)
+target_link_libraries(public-lib-ut_helpers PUBLIC
   contrib-libs-cxxsupp
   yutil
   api-grpc
@@ -17,6 +17,6 @@ target_link_libraries(services-ydb-ut_helpers PUBLIC
   api-protos-out
   cpp-grpc-client
 )
-target_sources(services-ydb-ut_helpers PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/services/ydb/ut_helpers/ut_helpers_query.cpp
+target_sources(public-lib-ut_helpers PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/public/lib/ut_helpers/ut_helpers_query.cpp
 )
diff --git a/ydb/services/ydb/ut_helpers/ut_helpers_query.cpp b/ydb/public/lib/ut_helpers/ut_helpers_query.cpp
index 6f45be7e08d..6f45be7e08d 100644
--- a/ydb/services/ydb/ut_helpers/ut_helpers_query.cpp
+++ b/ydb/public/lib/ut_helpers/ut_helpers_query.cpp
diff --git a/ydb/services/ydb/ut_helpers/ut_helpers_query.h b/ydb/public/lib/ut_helpers/ut_helpers_query.h
index ce78e6b24cb..ce78e6b24cb 100644
--- a/ydb/services/ydb/ut_helpers/ut_helpers_query.h
+++ b/ydb/public/lib/ut_helpers/ut_helpers_query.h
diff --git a/ydb/services/ydb/ut_helpers/ya.make b/ydb/public/lib/ut_helpers/ya.make
index 9047fbebd1b..9047fbebd1b 100644
--- a/ydb/services/ydb/ut_helpers/ya.make
+++ b/ydb/public/lib/ut_helpers/ya.make
diff --git a/ydb/services/ydb/CMakeLists.darwin-x86_64.txt b/ydb/services/ydb/CMakeLists.darwin-x86_64.txt
index 4ef25c28ab7..2077daf05e3 100644
--- a/ydb/services/ydb/CMakeLists.darwin-x86_64.txt
+++ b/ydb/services/ydb/CMakeLists.darwin-x86_64.txt
@@ -13,7 +13,6 @@ add_subdirectory(sdk_sessions_pool_ut)
 add_subdirectory(sdk_sessions_ut)
 add_subdirectory(table_split_ut)
 add_subdirectory(ut)
-add_subdirectory(ut_helpers)
 
 add_library(ydb-services-ydb)
 target_link_libraries(ydb-services-ydb PUBLIC
diff --git a/ydb/services/ydb/CMakeLists.linux-aarch64.txt b/ydb/services/ydb/CMakeLists.linux-aarch64.txt
index c634dc26935..3ab94530185 100644
--- a/ydb/services/ydb/CMakeLists.linux-aarch64.txt
+++ b/ydb/services/ydb/CMakeLists.linux-aarch64.txt
@@ -13,7 +13,6 @@ add_subdirectory(sdk_sessions_pool_ut)
 add_subdirectory(sdk_sessions_ut)
 add_subdirectory(table_split_ut)
 add_subdirectory(ut)
-add_subdirectory(ut_helpers)
 
 add_library(ydb-services-ydb)
 target_link_libraries(ydb-services-ydb PUBLIC
diff --git a/ydb/services/ydb/CMakeLists.linux-x86_64.txt b/ydb/services/ydb/CMakeLists.linux-x86_64.txt
index c634dc26935..3ab94530185 100644
--- a/ydb/services/ydb/CMakeLists.linux-x86_64.txt
+++ b/ydb/services/ydb/CMakeLists.linux-x86_64.txt
@@ -13,7 +13,6 @@ add_subdirectory(sdk_sessions_pool_ut)
 add_subdirectory(sdk_sessions_ut)
 add_subdirectory(table_split_ut)
 add_subdirectory(ut)
-add_subdirectory(ut_helpers)
 
 add_library(ydb-services-ydb)
 target_link_libraries(ydb-services-ydb PUBLIC
diff --git a/ydb/services/ydb/CMakeLists.windows-x86_64.txt b/ydb/services/ydb/CMakeLists.windows-x86_64.txt
index 4ef25c28ab7..2077daf05e3 100644
--- a/ydb/services/ydb/CMakeLists.windows-x86_64.txt
+++ b/ydb/services/ydb/CMakeLists.windows-x86_64.txt
@@ -13,7 +13,6 @@ add_subdirectory(sdk_sessions_pool_ut)
 add_subdirectory(sdk_sessions_ut)
 add_subdirectory(table_split_ut)
 add_subdirectory(ut)
-add_subdirectory(ut_helpers)
 
 add_library(ydb-services-ydb)
 target_link_libraries(ydb-services-ydb PUBLIC
diff --git a/ydb/services/ydb/ut/CMakeLists.darwin-x86_64.txt b/ydb/services/ydb/ut/CMakeLists.darwin-x86_64.txt
index 7d0164194eb..6bbaa47ebde 100644
--- a/ydb/services/ydb/ut/CMakeLists.darwin-x86_64.txt
+++ b/ydb/services/ydb/ut/CMakeLists.darwin-x86_64.txt
@@ -34,6 +34,7 @@ target_link_libraries(ydb-services-ydb-ut PUBLIC
   public-lib-experimental
   public-lib-json_value
   public-lib-yson_value
+  public-lib-ut_helpers
   cpp-client-draft
   cpp-client-ydb_coordination
   cpp-client-ydb_export
@@ -41,7 +42,6 @@ target_link_libraries(ydb-services-ydb-ut PUBLIC
   cpp-client-ydb_operation
   cpp-client-ydb_scheme
   cpp-client-ydb_monitoring
-  services-ydb-ut_helpers
 )
 target_link_options(ydb-services-ydb-ut PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
diff --git a/ydb/services/ydb/ut/CMakeLists.linux-aarch64.txt b/ydb/services/ydb/ut/CMakeLists.linux-aarch64.txt
index 44cfa20b9da..099eb30f669 100644
--- a/ydb/services/ydb/ut/CMakeLists.linux-aarch64.txt
+++ b/ydb/services/ydb/ut/CMakeLists.linux-aarch64.txt
@@ -34,6 +34,7 @@ target_link_libraries(ydb-services-ydb-ut PUBLIC
   public-lib-experimental
   public-lib-json_value
   public-lib-yson_value
+  public-lib-ut_helpers
   cpp-client-draft
   cpp-client-ydb_coordination
   cpp-client-ydb_export
@@ -41,7 +42,6 @@ target_link_libraries(ydb-services-ydb-ut PUBLIC
   cpp-client-ydb_operation
   cpp-client-ydb_scheme
   cpp-client-ydb_monitoring
-  services-ydb-ut_helpers
 )
 target_link_options(ydb-services-ydb-ut PRIVATE
   -ldl
diff --git a/ydb/services/ydb/ut/CMakeLists.linux-x86_64.txt b/ydb/services/ydb/ut/CMakeLists.linux-x86_64.txt
index 4888d5ec79f..b3e3fbb5edf 100644
--- a/ydb/services/ydb/ut/CMakeLists.linux-x86_64.txt
+++ b/ydb/services/ydb/ut/CMakeLists.linux-x86_64.txt
@@ -35,6 +35,7 @@ target_link_libraries(ydb-services-ydb-ut PUBLIC
   public-lib-experimental
   public-lib-json_value
   public-lib-yson_value
+  public-lib-ut_helpers
   cpp-client-draft
   cpp-client-ydb_coordination
   cpp-client-ydb_export
@@ -42,7 +43,6 @@ target_link_libraries(ydb-services-ydb-ut PUBLIC
   cpp-client-ydb_operation
   cpp-client-ydb_scheme
   cpp-client-ydb_monitoring
-  services-ydb-ut_helpers
 )
 target_link_options(ydb-services-ydb-ut PRIVATE
   -ldl
diff --git a/ydb/services/ydb/ut/CMakeLists.windows-x86_64.txt b/ydb/services/ydb/ut/CMakeLists.windows-x86_64.txt
index 8e34646aa85..93de9262262 100644
--- a/ydb/services/ydb/ut/CMakeLists.windows-x86_64.txt
+++ b/ydb/services/ydb/ut/CMakeLists.windows-x86_64.txt
@@ -34,6 +34,7 @@ target_link_libraries(ydb-services-ydb-ut PUBLIC
   public-lib-experimental
   public-lib-json_value
   public-lib-yson_value
+  public-lib-ut_helpers
   cpp-client-draft
   cpp-client-ydb_coordination
   cpp-client-ydb_export
@@ -41,7 +42,6 @@ target_link_libraries(ydb-services-ydb-ut PUBLIC
   cpp-client-ydb_operation
   cpp-client-ydb_scheme
   cpp-client-ydb_monitoring
-  services-ydb-ut_helpers
 )
 target_sources(ydb-services-ydb-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/services/ydb/ydb_bulk_upsert_ut.cpp
diff --git a/ydb/services/ydb/ut/ya.make b/ydb/services/ydb/ut/ya.make
index 654e30ca365..40e44afbb9e 100644
--- a/ydb/services/ydb/ut/ya.make
+++ b/ydb/services/ydb/ut/ya.make
@@ -46,6 +46,7 @@ PEERDIR(
     ydb/public/lib/experimental
     ydb/public/lib/json_value
     ydb/public/lib/yson_value
+    ydb/public/lib/ut_helpers
     ydb/public/sdk/cpp/client/draft
     ydb/public/sdk/cpp/client/ydb_coordination
     ydb/public/sdk/cpp/client/ydb_export
@@ -54,7 +55,6 @@ PEERDIR(
     ydb/public/sdk/cpp/client/ydb_scheme
     ydb/public/sdk/cpp/client/ydb_monitoring
     ydb/services/ydb
-    ydb/services/ydb/ut_helpers
 )
 
 YQL_LAST_ABI_VERSION()
diff --git a/ydb/services/ydb/ydb_query_ut.cpp b/ydb/services/ydb/ydb_query_ut.cpp
index 25c29905054..606943861dd 100644
--- a/ydb/services/ydb/ydb_query_ut.cpp
+++ b/ydb/services/ydb/ydb_query_ut.cpp
@@ -1,7 +1,7 @@
 #include "ydb_common_ut.h"
-#include "ut_helpers/ut_helpers_query.h"
 
 #include <ydb/public/api/grpc/ydb_query_v1.grpc.pb.h>
+#include <ydb/public/lib/ut_helpers/ut_helpers_query.h>
 
 #include <library/cpp/testing/unittest/tests_data.h>
 
diff --git a/ydb/tests/functional/kqp/kqp_query_session/CMakeLists.darwin-x86_64.txt b/ydb/tests/functional/kqp/kqp_query_session/CMakeLists.darwin-x86_64.txt
index 92fb4da3a1c..a30ca3f391d 100644
--- a/ydb/tests/functional/kqp/kqp_query_session/CMakeLists.darwin-x86_64.txt
+++ b/ydb/tests/functional/kqp/kqp_query_session/CMakeLists.darwin-x86_64.txt
@@ -14,9 +14,9 @@ target_link_libraries(ydb-tests-functional-kqp-kqp_query_session PUBLIC
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-threading-local_executor
+  public-lib-ut_helpers
   cpp-client-ydb_discovery
   cpp-client-draft
-  services-ydb-ut_helpers
 )
 target_link_options(ydb-tests-functional-kqp-kqp_query_session PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
diff --git a/ydb/tests/functional/kqp/kqp_query_session/CMakeLists.linux-aarch64.txt b/ydb/tests/functional/kqp/kqp_query_session/CMakeLists.linux-aarch64.txt
index 3ec96d8104c..99b3b5eee0a 100644
--- a/ydb/tests/functional/kqp/kqp_query_session/CMakeLists.linux-aarch64.txt
+++ b/ydb/tests/functional/kqp/kqp_query_session/CMakeLists.linux-aarch64.txt
@@ -14,9 +14,9 @@ target_link_libraries(ydb-tests-functional-kqp-kqp_query_session PUBLIC
   yutil
   cpp-testing-unittest_main
   cpp-threading-local_executor
+  public-lib-ut_helpers
   cpp-client-ydb_discovery
   cpp-client-draft
-  services-ydb-ut_helpers
 )
 target_link_options(ydb-tests-functional-kqp-kqp_query_session PRIVATE
   -ldl
diff --git a/ydb/tests/functional/kqp/kqp_query_session/CMakeLists.linux-x86_64.txt b/ydb/tests/functional/kqp/kqp_query_session/CMakeLists.linux-x86_64.txt
index 850bb90816e..3c53fd01ff2 100644
--- a/ydb/tests/functional/kqp/kqp_query_session/CMakeLists.linux-x86_64.txt
+++ b/ydb/tests/functional/kqp/kqp_query_session/CMakeLists.linux-x86_64.txt
@@ -15,9 +15,9 @@ target_link_libraries(ydb-tests-functional-kqp-kqp_query_session PUBLIC
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-threading-local_executor
+  public-lib-ut_helpers
   cpp-client-ydb_discovery
   cpp-client-draft
-  services-ydb-ut_helpers
 )
 target_link_options(ydb-tests-functional-kqp-kqp_query_session PRIVATE
   -ldl
diff --git a/ydb/tests/functional/kqp/kqp_query_session/CMakeLists.windows-x86_64.txt b/ydb/tests/functional/kqp/kqp_query_session/CMakeLists.windows-x86_64.txt
index 10e8236f149..b283fd04854 100644
--- a/ydb/tests/functional/kqp/kqp_query_session/CMakeLists.windows-x86_64.txt
+++ b/ydb/tests/functional/kqp/kqp_query_session/CMakeLists.windows-x86_64.txt
@@ -14,9 +14,9 @@ target_link_libraries(ydb-tests-functional-kqp-kqp_query_session PUBLIC
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-threading-local_executor
+  public-lib-ut_helpers
   cpp-client-ydb_discovery
   cpp-client-draft
-  services-ydb-ut_helpers
 )
 target_sources(ydb-tests-functional-kqp-kqp_query_session PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/tests/functional/kqp/kqp_query_session/main.cpp
diff --git a/ydb/tests/functional/kqp/kqp_query_session/main.cpp b/ydb/tests/functional/kqp/kqp_query_session/main.cpp
index 9ed753bbd7d..d2bb328ba4b 100644
--- a/ydb/tests/functional/kqp/kqp_query_session/main.cpp
+++ b/ydb/tests/functional/kqp/kqp_query_session/main.cpp
@@ -1,7 +1,7 @@
 #include <util/system/env.h>
 #include <library/cpp/testing/unittest/registar.h>
 
-#include <ydb/services/ydb/ut_helpers/ut_helpers_query.h>
+#include <ydb/public/lib/ut_helpers/ut_helpers_query.h>
 #include <ydb/public/sdk/cpp/client/ydb_driver/driver.h>
 #include <ydb/public/sdk/cpp/client/ydb_discovery/discovery.h>
 #include <ydb/public/sdk/cpp/client/draft/ydb_scripting.h>
diff --git a/ydb/tests/functional/kqp/kqp_query_session/ya.make b/ydb/tests/functional/kqp/kqp_query_session/ya.make
index b10ea5f1b21..e58077eb6ac 100644
--- a/ydb/tests/functional/kqp/kqp_query_session/ya.make
+++ b/ydb/tests/functional/kqp/kqp_query_session/ya.make
@@ -10,9 +10,9 @@ TIMEOUT(60)
 
 PEERDIR(
     library/cpp/threading/local_executor
+    ydb/public/lib/ut_helpers
     ydb/public/sdk/cpp/client/ydb_discovery
     ydb/public/sdk/cpp/client/draft
-    ydb/services/ydb/ut_helpers
 )
 
 SRCS(