external hooks for columnshard

38 files changed, 103 insertions, 71 deletions

diff --git a/ydb/core/kqp/ut/olap/CMakeLists.darwin-x86_64.txt b/ydb/core/kqp/ut/olap/CMakeLists.darwin-x86_64.txt
index c524caf4cd..fd3a70534f 100644
--- a/ydb/core/kqp/ut/olap/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/kqp/ut/olap/CMakeLists.darwin-x86_64.txt
@@ -22,6 +22,7 @@ target_link_libraries(ydb-core-kqp-ut-olap PUBLIC
   ydb-core-kqp
   kqp-ut-common
   yql-sql-pg_dummy
+  columnshard-hooks-testing
 )
 target_link_options(ydb-core-kqp-ut-olap PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
diff --git a/ydb/core/kqp/ut/olap/CMakeLists.linux-aarch64.txt b/ydb/core/kqp/ut/olap/CMakeLists.linux-aarch64.txt
index 096585284b..cc48bd153e 100644
--- a/ydb/core/kqp/ut/olap/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/kqp/ut/olap/CMakeLists.linux-aarch64.txt
@@ -22,6 +22,7 @@ target_link_libraries(ydb-core-kqp-ut-olap PUBLIC
   ydb-core-kqp
   kqp-ut-common
   yql-sql-pg_dummy
+  columnshard-hooks-testing
 )
 target_link_options(ydb-core-kqp-ut-olap PRIVATE
   -ldl
diff --git a/ydb/core/kqp/ut/olap/CMakeLists.linux-x86_64.txt b/ydb/core/kqp/ut/olap/CMakeLists.linux-x86_64.txt
index 7bd95f194d..f9f07bf1cd 100644
--- a/ydb/core/kqp/ut/olap/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/kqp/ut/olap/CMakeLists.linux-x86_64.txt
@@ -23,6 +23,7 @@ target_link_libraries(ydb-core-kqp-ut-olap PUBLIC
   ydb-core-kqp
   kqp-ut-common
   yql-sql-pg_dummy
+  columnshard-hooks-testing
 )
 target_link_options(ydb-core-kqp-ut-olap PRIVATE
   -ldl
diff --git a/ydb/core/kqp/ut/olap/CMakeLists.windows-x86_64.txt b/ydb/core/kqp/ut/olap/CMakeLists.windows-x86_64.txt
index 24d8ccdadf..bff5272a38 100644
--- a/ydb/core/kqp/ut/olap/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/kqp/ut/olap/CMakeLists.windows-x86_64.txt
@@ -22,6 +22,7 @@ target_link_libraries(ydb-core-kqp-ut-olap PUBLIC
   ydb-core-kqp
   kqp-ut-common
   yql-sql-pg_dummy
+  columnshard-hooks-testing
 )
 target_sources(ydb-core-kqp-ut-olap PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/olap/kqp_olap_ut.cpp
diff --git a/ydb/core/kqp/ut/olap/kqp_olap_ut.cpp b/ydb/core/kqp/ut/olap/kqp_olap_ut.cpp
index 181a2dc7aa..b3547da2eb 100644
--- a/ydb/core/kqp/ut/olap/kqp_olap_ut.cpp
+++ b/ydb/core/kqp/ut/olap/kqp_olap_ut.cpp
@@ -13,8 +13,8 @@
 #include <ydb/core/formats/arrow/simple_builder/batch.h>
 #include <ydb/core/formats/arrow/ssa_runtime_version.h>
 #include <ydb/core/kqp/executer_actor/kqp_executer.h>
-#include <ydb/core/testlib/controllers/abstract.h>
-#include <ydb/core/tx/columnshard/testlib/controller.h>
+#include <ydb/core/tx/columnshard/hooks/abstract/abstract.h>
+#include <ydb/core/tx/columnshard/hooks/testing/controller.h>
 #include <ydb/core/tx/datashard/datashard.h>
 #include <ydb/core/tx/datashard/datashard_ut_common_kqp.h>
 #include <ydb/core/tx/datashard/datashard_ut_common.h>
@@ -77,6 +77,11 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
             }
         }
 
+        if (value.IsNull()) {
+            out << "<NULL>";
+            return;
+        }
+
         switch (value.GetPrimitiveType()) {
             case NYdb::EPrimitiveType::Uint32:
             {
@@ -162,17 +167,20 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
         return rows;
     }
 
-    TVector<THashMap<TString, NYdb::TValue>> ExecuteScanQuery(NYdb::NTable::TTableClient& tableClient, const TString& query) {
-        Cerr << "====================================\n"
-            << "QUERY:\n" << query
-            << "\n\nRESULT:\n";
+    TVector<THashMap<TString, NYdb::TValue>> ExecuteScanQuery(NYdb::NTable::TTableClient& tableClient, const TString& query, const bool verbose = true) {
+        if (verbose) {
+            Cerr << "====================================\n"
+                << "QUERY:\n" << query
+                << "\n\nRESULT:\n";
+        }
 
         TStreamExecScanQuerySettings scanSettings;
         auto it = tableClient.StreamExecuteScanQuery(query, scanSettings).GetValueSync();
         auto rows = CollectRows(it);
-
-        PrintRows(Cerr, rows);
-        Cerr << "\n";
+        if (verbose) {
+            PrintRows(Cerr, rows);
+            Cerr << "\n";
+        }
 
         return rows;
     }
@@ -277,11 +285,11 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
             }
         };
 
-        TDistribution GetDistribution() {
-            const TString selectQuery = "SELECT COUNT(*) as c, field FROM `" + TablePath + "` GROUP BY field ORDER BY field";
+        TDistribution GetDistribution(const bool verbose = false) {
+            const TString selectQuery = "PRAGMA Kikimr.OptUseFinalizeByKey='true';SELECT COUNT(*) as c, field FROM `" + TablePath + "` GROUP BY field ORDER BY field";
 
             auto tableClient = KikimrRunner.GetTableClient();
-            auto rows = ExecuteScanQuery(tableClient, selectQuery);
+            auto rows = ExecuteScanQuery(tableClient, selectQuery, verbose);
             ui32 count = 0;
             std::optional<ui32> minCount;
             std::optional<ui32> maxCount;
@@ -300,7 +308,9 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
                     } else if (c.first == "field") {
                         Y_VERIFY(groups.emplace(c.second.GetProto().DebugString()).second);
                     }
-                    Cerr << c.first << ":" << Endl << c.second.GetProto().DebugString() << Endl;
+                    if (verbose) {
+                        Cerr << c.first << ":" << Endl << c.second.GetProto().DebugString() << Endl;
+                    }
                 }
             }
             Y_VERIFY(maxCount);
@@ -347,6 +357,21 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
             Cerr << bytes << "/" << rawBytes << Endl;
         }
 
+        void GetCount(ui64& count) {
+            const TString selectQuery = "SELECT COUNT(*) as a FROM `" + TablePath + "`";
+
+            auto tableClient = KikimrRunner.GetTableClient();
+
+            auto rows = ExecuteScanQuery(tableClient, selectQuery);
+            for (auto&& r : rows) {
+                for (auto&& c : r) {
+                    if (c.first == "a") {
+                        count = GetUint64(c.second);
+                    }
+                }
+            }
+        }
+
         template <class TFiller>
         void FillTable(const TFiller& fillPolicy, const ui32 pkKff = 0, const ui32 numRows = 800000) const {
             std::vector<NArrow::NConstruction::IArrayBuilder::TPtr> builders;
@@ -1343,6 +1368,7 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
 
         TLocalHelper(kikimr).CreateTestOlapTable();
         WriteTestData(kikimr, "/Root/olapStore/olapTable", 0, 1000000, 2000);
+//        EnableDebugLogging(kikimr);
 
         auto tableClient = kikimr.GetTableClient();
         auto selectQuery = TString(R"(
@@ -3408,7 +3434,7 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
                 UNIT_ASSERT_VALUES_EQUAL_C(alterResult.GetStatus(), EStatus::GENERIC_ERROR, alterResult.GetIssues().ToString());
             }
             Sleep(TDuration::Seconds(5));
-            helper.FillTable(sPool, 1, 800000);
+            helper.FillTable(sPool, 1, rowsCount);
             Sleep(TDuration::Seconds(5));
             {
                 helper.GetVolumes(rawBytesPackAndUnpack2PK, bytesPackAndUnpack2PK, false);
diff --git a/ydb/core/kqp/ut/olap/ya.make b/ydb/core/kqp/ut/olap/ya.make
index 78e50bf881..09b531fa4f 100644
--- a/ydb/core/kqp/ut/olap/ya.make
+++ b/ydb/core/kqp/ut/olap/ya.make
@@ -20,6 +20,7 @@ PEERDIR(
     ydb/core/kqp
     ydb/core/kqp/ut/common
     ydb/library/yql/sql/pg_dummy
+    ydb/core/tx/columnshard/hooks/testing
 )
 
 YQL_LAST_ABI_VERSION()
diff --git a/ydb/core/testlib/CMakeLists.darwin-x86_64.txt b/ydb/core/testlib/CMakeLists.darwin-x86_64.txt
index 3587ce1842..485e4984e4 100644
--- a/ydb/core/testlib/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/testlib/CMakeLists.darwin-x86_64.txt
@@ -8,7 +8,6 @@
 
 add_subdirectory(actors)
 add_subdirectory(basics)
-add_subdirectory(controllers)
 add_subdirectory(default)
 add_subdirectory(pg)
 
@@ -60,7 +59,6 @@ target_link_libraries(ydb-core-testlib PUBLIC
   core-sys_view-processor
   core-sys_view-service
   core-testlib-actors
-  core-testlib-controllers
   core-testlib-basics
   core-tx-columnshard
   core-tx-coordinator
diff --git a/ydb/core/testlib/CMakeLists.linux-aarch64.txt b/ydb/core/testlib/CMakeLists.linux-aarch64.txt
index 10ccf60904..1d8990c7e8 100644
--- a/ydb/core/testlib/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/testlib/CMakeLists.linux-aarch64.txt
@@ -8,7 +8,6 @@
 
 add_subdirectory(actors)
 add_subdirectory(basics)
-add_subdirectory(controllers)
 add_subdirectory(default)
 add_subdirectory(pg)
 
@@ -61,7 +60,6 @@ target_link_libraries(ydb-core-testlib PUBLIC
   core-sys_view-processor
   core-sys_view-service
   core-testlib-actors
-  core-testlib-controllers
   core-testlib-basics
   core-tx-columnshard
   core-tx-coordinator
diff --git a/ydb/core/testlib/CMakeLists.linux-x86_64.txt b/ydb/core/testlib/CMakeLists.linux-x86_64.txt
index 10ccf60904..1d8990c7e8 100644
--- a/ydb/core/testlib/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/testlib/CMakeLists.linux-x86_64.txt
@@ -8,7 +8,6 @@
 
 add_subdirectory(actors)
 add_subdirectory(basics)
-add_subdirectory(controllers)
 add_subdirectory(default)
 add_subdirectory(pg)
 
@@ -61,7 +60,6 @@ target_link_libraries(ydb-core-testlib PUBLIC
   core-sys_view-processor
   core-sys_view-service
   core-testlib-actors
-  core-testlib-controllers
   core-testlib-basics
   core-tx-columnshard
   core-tx-coordinator
diff --git a/ydb/core/testlib/CMakeLists.windows-x86_64.txt b/ydb/core/testlib/CMakeLists.windows-x86_64.txt
index 3587ce1842..485e4984e4 100644
--- a/ydb/core/testlib/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/testlib/CMakeLists.windows-x86_64.txt
@@ -8,7 +8,6 @@
 
 add_subdirectory(actors)
 add_subdirectory(basics)
-add_subdirectory(controllers)
 add_subdirectory(default)
 add_subdirectory(pg)
 
@@ -60,7 +59,6 @@ target_link_libraries(ydb-core-testlib PUBLIC
   core-sys_view-processor
   core-sys_view-service
   core-testlib-actors
-  core-testlib-controllers
   core-testlib-basics
   core-tx-columnshard
   core-tx-coordinator
diff --git a/ydb/core/testlib/ya.make b/ydb/core/testlib/ya.make
index ebd0cbfdd8..c08497df92 100644
--- a/ydb/core/testlib/ya.make
+++ b/ydb/core/testlib/ya.make
@@ -63,7 +63,6 @@ PEERDIR(
     ydb/core/sys_view/processor
     ydb/core/sys_view/service
     ydb/core/testlib/actors
-    ydb/core/testlib/controllers
     ydb/core/testlib/basics
     ydb/core/tx/columnshard
     ydb/core/tx/coordinator
diff --git a/ydb/core/tx/columnshard/CMakeLists.darwin-x86_64.txt b/ydb/core/tx/columnshard/CMakeLists.darwin-x86_64.txt
index 0c8e6922f2..3ca0e2b9e5 100644
--- a/ydb/core/tx/columnshard/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/tx/columnshard/CMakeLists.darwin-x86_64.txt
@@ -9,7 +9,7 @@
 add_subdirectory(common)
 add_subdirectory(counters)
 add_subdirectory(engines)
-add_subdirectory(testlib)
+add_subdirectory(hooks)
 add_subdirectory(ut_rw)
 add_subdirectory(ut_schema)
 get_built_tool_path(
diff --git a/ydb/core/tx/columnshard/CMakeLists.linux-aarch64.txt b/ydb/core/tx/columnshard/CMakeLists.linux-aarch64.txt
index e6d1912b29..b0d6296d09 100644
--- a/ydb/core/tx/columnshard/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/tx/columnshard/CMakeLists.linux-aarch64.txt
@@ -9,7 +9,7 @@
 add_subdirectory(common)
 add_subdirectory(counters)
 add_subdirectory(engines)
-add_subdirectory(testlib)
+add_subdirectory(hooks)
 add_subdirectory(ut_rw)
 add_subdirectory(ut_schema)
 get_built_tool_path(
diff --git a/ydb/core/tx/columnshard/CMakeLists.linux-x86_64.txt b/ydb/core/tx/columnshard/CMakeLists.linux-x86_64.txt
index e6d1912b29..b0d6296d09 100644
--- a/ydb/core/tx/columnshard/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/tx/columnshard/CMakeLists.linux-x86_64.txt
@@ -9,7 +9,7 @@
 add_subdirectory(common)
 add_subdirectory(counters)
 add_subdirectory(engines)
-add_subdirectory(testlib)
+add_subdirectory(hooks)
 add_subdirectory(ut_rw)
 add_subdirectory(ut_schema)
 get_built_tool_path(
diff --git a/ydb/core/tx/columnshard/CMakeLists.windows-x86_64.txt b/ydb/core/tx/columnshard/CMakeLists.windows-x86_64.txt
index 0c8e6922f2..3ca0e2b9e5 100644
--- a/ydb/core/tx/columnshard/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/tx/columnshard/CMakeLists.windows-x86_64.txt
@@ -9,7 +9,7 @@
 add_subdirectory(common)
 add_subdirectory(counters)
 add_subdirectory(engines)
-add_subdirectory(testlib)
+add_subdirectory(hooks)
 add_subdirectory(ut_rw)
 add_subdirectory(ut_schema)
 get_built_tool_path(
diff --git a/ydb/core/tx/columnshard/engines/reader/CMakeLists.darwin-x86_64.txt b/ydb/core/tx/columnshard/engines/reader/CMakeLists.darwin-x86_64.txt
index 031bae3ff8..c1a5bebf95 100644
--- a/ydb/core/tx/columnshard/engines/reader/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/tx/columnshard/engines/reader/CMakeLists.darwin-x86_64.txt
@@ -25,7 +25,7 @@ target_link_libraries(columnshard-engines-reader PUBLIC
   ydb-core-protos
   core-formats-arrow
   columnshard-engines-predicate
-  tx-columnshard-testlib
+  columnshard-hooks-abstract
   core-tx-program
   engines-reader-order_control
   tools-enum_parser-enum_serialization_runtime
diff --git a/ydb/core/tx/columnshard/engines/reader/CMakeLists.linux-aarch64.txt b/ydb/core/tx/columnshard/engines/reader/CMakeLists.linux-aarch64.txt
index 0c9c0e0942..94ab6bd38e 100644
--- a/ydb/core/tx/columnshard/engines/reader/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/tx/columnshard/engines/reader/CMakeLists.linux-aarch64.txt
@@ -26,7 +26,7 @@ target_link_libraries(columnshard-engines-reader PUBLIC
   ydb-core-protos
   core-formats-arrow
   columnshard-engines-predicate
-  tx-columnshard-testlib
+  columnshard-hooks-abstract
   core-tx-program
   engines-reader-order_control
   tools-enum_parser-enum_serialization_runtime
diff --git a/ydb/core/tx/columnshard/engines/reader/CMakeLists.linux-x86_64.txt b/ydb/core/tx/columnshard/engines/reader/CMakeLists.linux-x86_64.txt
index 0c9c0e0942..94ab6bd38e 100644
--- a/ydb/core/tx/columnshard/engines/reader/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/tx/columnshard/engines/reader/CMakeLists.linux-x86_64.txt
@@ -26,7 +26,7 @@ target_link_libraries(columnshard-engines-reader PUBLIC
   ydb-core-protos
   core-formats-arrow
   columnshard-engines-predicate
-  tx-columnshard-testlib
+  columnshard-hooks-abstract
   core-tx-program
   engines-reader-order_control
   tools-enum_parser-enum_serialization_runtime
diff --git a/ydb/core/tx/columnshard/engines/reader/CMakeLists.windows-x86_64.txt b/ydb/core/tx/columnshard/engines/reader/CMakeLists.windows-x86_64.txt
index 031bae3ff8..c1a5bebf95 100644
--- a/ydb/core/tx/columnshard/engines/reader/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/tx/columnshard/engines/reader/CMakeLists.windows-x86_64.txt
@@ -25,7 +25,7 @@ target_link_libraries(columnshard-engines-reader PUBLIC
   ydb-core-protos
   core-formats-arrow
   columnshard-engines-predicate
-  tx-columnshard-testlib
+  columnshard-hooks-abstract
   core-tx-program
   engines-reader-order_control
   tools-enum_parser-enum_serialization_runtime
diff --git a/ydb/core/tx/columnshard/engines/reader/read_metadata.cpp b/ydb/core/tx/columnshard/engines/reader/read_metadata.cpp
index 7e7220380a..4a23fbbdfd 100644
--- a/ydb/core/tx/columnshard/engines/reader/read_metadata.cpp
+++ b/ydb/core/tx/columnshard/engines/reader/read_metadata.cpp
@@ -1,7 +1,7 @@
 #include "read_metadata.h"
 #include "order_control/default.h"
 #include "order_control/pk_with_limit.h"
-#include <ydb/core/testlib/controllers/abstract.h>
+#include <ydb/core/tx/columnshard/hooks/abstract/abstract.h>
 #include <ydb/core/tx/columnshard/columnshard__index_scan.h>
 #include <ydb/core/tx/columnshard/columnshard__stats_scan.h>
 #include <util/string/join.h>
diff --git a/ydb/core/tx/columnshard/engines/reader/ya.make b/ydb/core/tx/columnshard/engines/reader/ya.make
index 30fb3d88e7..f6cf420445 100644
--- a/ydb/core/tx/columnshard/engines/reader/ya.make
+++ b/ydb/core/tx/columnshard/engines/reader/ya.make
@@ -20,7 +20,7 @@ PEERDIR(
     ydb/core/protos
     ydb/core/formats/arrow
     ydb/core/tx/columnshard/engines/predicate
-    ydb/core/tx/columnshard/testlib
+    ydb/core/tx/columnshard/hooks/abstract
     ydb/core/tx/program
     ydb/core/tx/columnshard/engines/reader/order_control
 )
diff --git a/ydb/core/tx/columnshard/hooks/CMakeLists.txt b/ydb/core/tx/columnshard/hooks/CMakeLists.txt
new file mode 100644
index 0000000000..d2bc54607c
--- /dev/null
+++ b/ydb/core/tx/columnshard/hooks/CMakeLists.txt
@@ -0,0 +1,10 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+add_subdirectory(abstract)
+add_subdirectory(testing)
diff --git a/ydb/core/testlib/controllers/CMakeLists.darwin-x86_64.txt b/ydb/core/tx/columnshard/hooks/abstract/CMakeLists.darwin-x86_64.txt
index ee443af37a..37005df7b9 100644
--- a/ydb/core/testlib/controllers/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/tx/columnshard/hooks/abstract/CMakeLists.darwin-x86_64.txt
@@ -7,11 +7,11 @@
 
 
 
-add_library(core-testlib-controllers)
-target_link_libraries(core-testlib-controllers PUBLIC
+add_library(columnshard-hooks-abstract)
+target_link_libraries(columnshard-hooks-abstract PUBLIC
   contrib-libs-cxxsupp
   yutil
 )
-target_sources(core-testlib-controllers PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/testlib/controllers/abstract.cpp
+target_sources(columnshard-hooks-abstract PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/tx/columnshard/hooks/abstract/abstract.cpp
 )
diff --git a/ydb/core/testlib/controllers/CMakeLists.linux-aarch64.txt b/ydb/core/tx/columnshard/hooks/abstract/CMakeLists.linux-aarch64.txt
index 1603104225..e2f9700cad 100644
--- a/ydb/core/testlib/controllers/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/tx/columnshard/hooks/abstract/CMakeLists.linux-aarch64.txt
@@ -7,12 +7,12 @@
 
 
 
-add_library(core-testlib-controllers)
-target_link_libraries(core-testlib-controllers PUBLIC
+add_library(columnshard-hooks-abstract)
+target_link_libraries(columnshard-hooks-abstract PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
 )
-target_sources(core-testlib-controllers PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/testlib/controllers/abstract.cpp
+target_sources(columnshard-hooks-abstract PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/tx/columnshard/hooks/abstract/abstract.cpp
 )
diff --git a/ydb/core/testlib/controllers/CMakeLists.linux-x86_64.txt b/ydb/core/tx/columnshard/hooks/abstract/CMakeLists.linux-x86_64.txt
index 1603104225..e2f9700cad 100644
--- a/ydb/core/testlib/controllers/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/tx/columnshard/hooks/abstract/CMakeLists.linux-x86_64.txt
@@ -7,12 +7,12 @@
 
 
 
-add_library(core-testlib-controllers)
-target_link_libraries(core-testlib-controllers PUBLIC
+add_library(columnshard-hooks-abstract)
+target_link_libraries(columnshard-hooks-abstract PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
 )
-target_sources(core-testlib-controllers PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/testlib/controllers/abstract.cpp
+target_sources(columnshard-hooks-abstract PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/tx/columnshard/hooks/abstract/abstract.cpp
 )
diff --git a/ydb/core/testlib/controllers/CMakeLists.txt b/ydb/core/tx/columnshard/hooks/abstract/CMakeLists.txt
index f8b31df0c1..f8b31df0c1 100644
--- a/ydb/core/testlib/controllers/CMakeLists.txt
+++ b/ydb/core/tx/columnshard/hooks/abstract/CMakeLists.txt
diff --git a/ydb/core/testlib/controllers/CMakeLists.windows-x86_64.txt b/ydb/core/tx/columnshard/hooks/abstract/CMakeLists.windows-x86_64.txt
index ee443af37a..37005df7b9 100644
--- a/ydb/core/testlib/controllers/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/tx/columnshard/hooks/abstract/CMakeLists.windows-x86_64.txt
@@ -7,11 +7,11 @@
 
 
 
-add_library(core-testlib-controllers)
-target_link_libraries(core-testlib-controllers PUBLIC
+add_library(columnshard-hooks-abstract)
+target_link_libraries(columnshard-hooks-abstract PUBLIC
   contrib-libs-cxxsupp
   yutil
 )
-target_sources(core-testlib-controllers PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/testlib/controllers/abstract.cpp
+target_sources(columnshard-hooks-abstract PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/tx/columnshard/hooks/abstract/abstract.cpp
 )
diff --git a/ydb/core/testlib/controllers/abstract.cpp b/ydb/core/tx/columnshard/hooks/abstract/abstract.cpp
index a4d916545e..a4d916545e 100644
--- a/ydb/core/testlib/controllers/abstract.cpp
+++ b/ydb/core/tx/columnshard/hooks/abstract/abstract.cpp
diff --git a/ydb/core/testlib/controllers/abstract.h b/ydb/core/tx/columnshard/hooks/abstract/abstract.h
index b0d30f67bb..b0d30f67bb 100644
--- a/ydb/core/testlib/controllers/abstract.h
+++ b/ydb/core/tx/columnshard/hooks/abstract/abstract.h
diff --git a/ydb/core/testlib/controllers/ya.make b/ydb/core/tx/columnshard/hooks/abstract/ya.make
index 954db2fb2d..954db2fb2d 100644
--- a/ydb/core/testlib/controllers/ya.make
+++ b/ydb/core/tx/columnshard/hooks/abstract/ya.make
diff --git a/ydb/core/tx/columnshard/testlib/CMakeLists.darwin-x86_64.txt b/ydb/core/tx/columnshard/hooks/testing/CMakeLists.darwin-x86_64.txt
index 0457c3e18d..d07c2a1b8e 100644
--- a/ydb/core/tx/columnshard/testlib/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/tx/columnshard/hooks/testing/CMakeLists.darwin-x86_64.txt
@@ -7,13 +7,13 @@
 
 
 
-add_library(tx-columnshard-testlib)
-target_link_libraries(tx-columnshard-testlib PUBLIC
+add_library(columnshard-hooks-testing)
+target_link_libraries(columnshard-hooks-testing PUBLIC
   contrib-libs-cxxsupp
   yutil
-  core-testlib-controllers
+  columnshard-hooks-abstract
   engines-reader-order_control
 )
-target_sources(tx-columnshard-testlib PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/tx/columnshard/testlib/controller.cpp
+target_sources(columnshard-hooks-testing PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/tx/columnshard/hooks/testing/controller.cpp
 )
diff --git a/ydb/core/tx/columnshard/testlib/CMakeLists.linux-aarch64.txt b/ydb/core/tx/columnshard/hooks/testing/CMakeLists.linux-aarch64.txt
index ad0f10a58e..eab89d03d7 100644
--- a/ydb/core/tx/columnshard/testlib/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/tx/columnshard/hooks/testing/CMakeLists.linux-aarch64.txt
@@ -7,14 +7,14 @@
 
 
 
-add_library(tx-columnshard-testlib)
-target_link_libraries(tx-columnshard-testlib PUBLIC
+add_library(columnshard-hooks-testing)
+target_link_libraries(columnshard-hooks-testing PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  core-testlib-controllers
+  columnshard-hooks-abstract
   engines-reader-order_control
 )
-target_sources(tx-columnshard-testlib PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/tx/columnshard/testlib/controller.cpp
+target_sources(columnshard-hooks-testing PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/tx/columnshard/hooks/testing/controller.cpp
 )
diff --git a/ydb/core/tx/columnshard/testlib/CMakeLists.linux-x86_64.txt b/ydb/core/tx/columnshard/hooks/testing/CMakeLists.linux-x86_64.txt
index ad0f10a58e..eab89d03d7 100644
--- a/ydb/core/tx/columnshard/testlib/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/tx/columnshard/hooks/testing/CMakeLists.linux-x86_64.txt
@@ -7,14 +7,14 @@
 
 
 
-add_library(tx-columnshard-testlib)
-target_link_libraries(tx-columnshard-testlib PUBLIC
+add_library(columnshard-hooks-testing)
+target_link_libraries(columnshard-hooks-testing PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  core-testlib-controllers
+  columnshard-hooks-abstract
   engines-reader-order_control
 )
-target_sources(tx-columnshard-testlib PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/tx/columnshard/testlib/controller.cpp
+target_sources(columnshard-hooks-testing PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/tx/columnshard/hooks/testing/controller.cpp
 )
diff --git a/ydb/core/tx/columnshard/testlib/CMakeLists.txt b/ydb/core/tx/columnshard/hooks/testing/CMakeLists.txt
index f8b31df0c1..f8b31df0c1 100644
--- a/ydb/core/tx/columnshard/testlib/CMakeLists.txt
+++ b/ydb/core/tx/columnshard/hooks/testing/CMakeLists.txt
diff --git a/ydb/core/tx/columnshard/testlib/CMakeLists.windows-x86_64.txt b/ydb/core/tx/columnshard/hooks/testing/CMakeLists.windows-x86_64.txt
index 0457c3e18d..d07c2a1b8e 100644
--- a/ydb/core/tx/columnshard/testlib/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/tx/columnshard/hooks/testing/CMakeLists.windows-x86_64.txt
@@ -7,13 +7,13 @@
 
 
 
-add_library(tx-columnshard-testlib)
-target_link_libraries(tx-columnshard-testlib PUBLIC
+add_library(columnshard-hooks-testing)
+target_link_libraries(columnshard-hooks-testing PUBLIC
   contrib-libs-cxxsupp
   yutil
-  core-testlib-controllers
+  columnshard-hooks-abstract
   engines-reader-order_control
 )
-target_sources(tx-columnshard-testlib PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/tx/columnshard/testlib/controller.cpp
+target_sources(columnshard-hooks-testing PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/tx/columnshard/hooks/testing/controller.cpp
 )
diff --git a/ydb/core/tx/columnshard/testlib/controller.cpp b/ydb/core/tx/columnshard/hooks/testing/controller.cpp
index 2ed500cae7..2ed500cae7 100644
--- a/ydb/core/tx/columnshard/testlib/controller.cpp
+++ b/ydb/core/tx/columnshard/hooks/testing/controller.cpp
diff --git a/ydb/core/tx/columnshard/testlib/controller.h b/ydb/core/tx/columnshard/hooks/testing/controller.h
index f1ea14b5a4..bbcafab436 100644
--- a/ydb/core/tx/columnshard/testlib/controller.h
+++ b/ydb/core/tx/columnshard/hooks/testing/controller.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <ydb/core/testlib/controllers/abstract.h>
+#include <ydb/core/tx/columnshard/hooks/abstract/abstract.h>
 
 namespace NKikimr::NYDBTest::NColumnShard {
 
diff --git a/ydb/core/tx/columnshard/testlib/ya.make b/ydb/core/tx/columnshard/hooks/testing/ya.make
index 3747872dee..be421974c1 100644
--- a/ydb/core/tx/columnshard/testlib/ya.make
+++ b/ydb/core/tx/columnshard/hooks/testing/ya.make
@@ -5,7 +5,7 @@ SRCS(
 )
 
 PEERDIR(
-    ydb/core/testlib/controllers
+    ydb/core/tx/columnshard/hooks/abstract
     ydb/core/tx/columnshard/engines/reader/order_control
 )