Extract datashard build index folder (#17110)

18 files changed, 34 insertions, 165 deletions

diff --git a/ydb/core/tx/datashard/kmeans_helper.cpp b/ydb/core/tx/datashard/build_index/kmeans_helper.cpp
index 2e2e6c8b40..2e2e6c8b40 100644
--- a/ydb/core/tx/datashard/kmeans_helper.cpp
+++ b/ydb/core/tx/datashard/build_index/kmeans_helper.cpp
diff --git a/ydb/core/tx/datashard/kmeans_helper.h b/ydb/core/tx/datashard/build_index/kmeans_helper.h
index b946649963..b946649963 100644
--- a/ydb/core/tx/datashard/kmeans_helper.h
+++ b/ydb/core/tx/datashard/build_index/kmeans_helper.h
diff --git a/ydb/core/tx/datashard/local_kmeans.cpp b/ydb/core/tx/datashard/build_index/local_kmeans.cpp
index f5face95a7..cca8ddc6bc 100644
--- a/ydb/core/tx/datashard/local_kmeans.cpp
+++ b/ydb/core/tx/datashard/build_index/local_kmeans.cpp
@@ -1,8 +1,8 @@
-#include "datashard_impl.h"
 #include "kmeans_helper.h"
-#include "scan_common.h"
-#include "upload_stats.h"
-#include "buffer_data.h"
+#include "../datashard_impl.h"
+#include "../scan_common.h"
+#include "../upload_stats.h"
+#include "../buffer_data.h"
 
 #include <ydb/core/base/appdata.h>
 #include <ydb/core/base/counters.h>
diff --git a/ydb/core/tx/datashard/prefix_kmeans.cpp b/ydb/core/tx/datashard/build_index/prefix_kmeans.cpp
index 87e281893b..4bdacc46d2 100644
--- a/ydb/core/tx/datashard/prefix_kmeans.cpp
+++ b/ydb/core/tx/datashard/build_index/prefix_kmeans.cpp
@@ -1,8 +1,8 @@
-#include "datashard_impl.h"
 #include "kmeans_helper.h"
-#include "scan_common.h"
-#include "upload_stats.h"
-#include "buffer_data.h"
+#include "../datashard_impl.h"
+#include "../scan_common.h"
+#include "../upload_stats.h"
+#include "../buffer_data.h"
 
 #include <ydb/core/base/appdata.h>
 #include <ydb/core/base/counters.h>
diff --git a/ydb/core/tx/datashard/reshuffle_kmeans.cpp b/ydb/core/tx/datashard/build_index/reshuffle_kmeans.cpp
index 49c3e87a74..1c1deaedf3 100644
--- a/ydb/core/tx/datashard/reshuffle_kmeans.cpp
+++ b/ydb/core/tx/datashard/build_index/reshuffle_kmeans.cpp
@@ -1,8 +1,8 @@
-#include "datashard_impl.h"
 #include "kmeans_helper.h"
-#include "scan_common.h"
-#include "upload_stats.h"
-#include "buffer_data.h"
+#include "../datashard_impl.h"
+#include "../scan_common.h"
+#include "../upload_stats.h"
+#include "../buffer_data.h"
 
 #include <ydb/core/base/appdata.h>
 #include <ydb/core/base/counters.h>
diff --git a/ydb/core/tx/datashard/sample_k.cpp b/ydb/core/tx/datashard/build_index/sample_k.cpp
index c0ae6ac7c6..4c99628975 100644
--- a/ydb/core/tx/datashard/sample_k.cpp
+++ b/ydb/core/tx/datashard/build_index/sample_k.cpp
@@ -1,8 +1,8 @@
-#include "datashard_impl.h"
 #include "kmeans_helper.h"
-#include "range_ops.h"
-#include "scan_common.h"
-#include "upload_stats.h"
+#include "../datashard_impl.h"
+#include "../range_ops.h"
+#include "../scan_common.h"
+#include "../upload_stats.h"
 
 #include <ydb/core/base/appdata.h>
 #include <ydb/core/base/counters.h>
diff --git a/ydb/core/tx/datashard/build_index.cpp b/ydb/core/tx/datashard/build_index/secondary_index.cpp
index e0fe7a9847..0b769c47d5 100644
--- a/ydb/core/tx/datashard/build_index.cpp
+++ b/ydb/core/tx/datashard/build_index/secondary_index.cpp
@@ -1,8 +1,8 @@
-#include "datashard_impl.h"
-#include "range_ops.h"
-#include "scan_common.h"
-#include "upload_stats.h"
-#include "buffer_data.h"
+#include "../datashard_impl.h"
+#include "../range_ops.h"
+#include "../scan_common.h"
+#include "../upload_stats.h"
+#include "../buffer_data.h"
 
 #include <ydb/core/base/appdata.h>
 #include <ydb/core/base/counters.h>
diff --git a/ydb/core/tx/datashard/datashard_ut_local_kmeans.cpp b/ydb/core/tx/datashard/build_index/ut/ut_local_kmeans.cpp
index b8743ac4dd..b8743ac4dd 100644
--- a/ydb/core/tx/datashard/datashard_ut_local_kmeans.cpp
+++ b/ydb/core/tx/datashard/build_index/ut/ut_local_kmeans.cpp
diff --git a/ydb/core/tx/datashard/datashard_ut_prefix_kmeans.cpp b/ydb/core/tx/datashard/build_index/ut/ut_prefix_kmeans.cpp
index 883c4c7056..883c4c7056 100644
--- a/ydb/core/tx/datashard/datashard_ut_prefix_kmeans.cpp
+++ b/ydb/core/tx/datashard/build_index/ut/ut_prefix_kmeans.cpp
diff --git a/ydb/core/tx/datashard/datashard_ut_reshuffle_kmeans.cpp b/ydb/core/tx/datashard/build_index/ut/ut_reshuffle_kmeans.cpp
index 9c8212987d..9c8212987d 100644
--- a/ydb/core/tx/datashard/datashard_ut_reshuffle_kmeans.cpp
+++ b/ydb/core/tx/datashard/build_index/ut/ut_reshuffle_kmeans.cpp
diff --git a/ydb/core/tx/datashard/datashard_ut_sample_k.cpp b/ydb/core/tx/datashard/build_index/ut/ut_sample_k.cpp
index ccae467a1b..ccae467a1b 100644
--- a/ydb/core/tx/datashard/datashard_ut_sample_k.cpp
+++ b/ydb/core/tx/datashard/build_index/ut/ut_sample_k.cpp
diff --git a/ydb/core/tx/datashard/datashard_ut_build_index.cpp b/ydb/core/tx/datashard/build_index/ut/ut_secondary_index.cpp
index 37ccc25634..37ccc25634 100644
--- a/ydb/core/tx/datashard/datashard_ut_build_index.cpp
+++ b/ydb/core/tx/datashard/build_index/ut/ut_secondary_index.cpp
diff --git a/ydb/core/tx/datashard/ut_build_index/ya.make b/ydb/core/tx/datashard/build_index/ut/ya.make
index 103577bd90..6a624f37f9 100644
--- a/ydb/core/tx/datashard/ut_build_index/ya.make
+++ b/ydb/core/tx/datashard/build_index/ut/ya.make
@@ -27,7 +27,11 @@ PEERDIR(
 YQL_LAST_ABI_VERSION()
 
 SRCS(
-    datashard_ut_build_index.cpp
+    ut_local_kmeans.cpp
+    ut_prefix_kmeans.cpp
+    ut_reshuffle_kmeans.cpp
+    ut_sample_k.cpp
+    ut_secondary_index.cpp
 )
 
 END()
diff --git a/ydb/core/tx/datashard/ut_local_kmeans/ya.make b/ydb/core/tx/datashard/ut_local_kmeans/ya.make
deleted file mode 100644
index 313a310175..0000000000
--- a/ydb/core/tx/datashard/ut_local_kmeans/ya.make
+++ /dev/null
@@ -1,33 +0,0 @@
-UNITTEST_FOR(ydb/core/tx/datashard)
-
-FORK_SUBTESTS()
-
-SPLIT_FACTOR(1)
-
-IF (SANITIZER_TYPE == "thread" OR WITH_VALGRIND)
-    SIZE(LARGE)
-    TAG(ya:fat)
-ELSE()
-    SIZE(MEDIUM)
-ENDIF()
-
-PEERDIR(
-    ydb/core/tx/datashard/ut_common
-    library/cpp/getopt
-    library/cpp/regex/pcre
-    library/cpp/svnversion
-    ydb/core/kqp/ut/common
-    ydb/core/testlib/default
-    ydb/core/tx
-    yql/essentials/public/udf/service/exception_policy
-    ydb/public/lib/yson_value
-    ydb/public/sdk/cpp/src/client/result
-)
-
-YQL_LAST_ABI_VERSION()
-
-SRCS(
-    datashard_ut_local_kmeans.cpp
-)
-
-END()
diff --git a/ydb/core/tx/datashard/ut_prefix_kmeans/ya.make b/ydb/core/tx/datashard/ut_prefix_kmeans/ya.make
deleted file mode 100644
index 8c1a7869e4..0000000000
--- a/ydb/core/tx/datashard/ut_prefix_kmeans/ya.make
+++ /dev/null
@@ -1,33 +0,0 @@
-UNITTEST_FOR(ydb/core/tx/datashard)
-
-FORK_SUBTESTS()
-
-SPLIT_FACTOR(1)
-
-IF (SANITIZER_TYPE == "thread" OR WITH_VALGRIND)
-    SIZE(LARGE)
-    TAG(ya:fat)
-ELSE()
-    SIZE(MEDIUM)
-ENDIF()
-
-PEERDIR(
-    ydb/core/tx/datashard/ut_common
-    library/cpp/getopt
-    library/cpp/regex/pcre
-    library/cpp/svnversion
-    ydb/core/kqp/ut/common
-    ydb/core/testlib/default
-    ydb/core/tx
-    yql/essentials/public/udf/service/exception_policy
-    ydb/public/lib/yson_value
-    ydb/public/sdk/cpp/src/client/result
-)
-
-YQL_LAST_ABI_VERSION()
-
-SRCS(
-    datashard_ut_prefix_kmeans.cpp
-)
-
-END()
diff --git a/ydb/core/tx/datashard/ut_reshuffle_kmeans/ya.make b/ydb/core/tx/datashard/ut_reshuffle_kmeans/ya.make
deleted file mode 100644
index 24a35f2de7..0000000000
--- a/ydb/core/tx/datashard/ut_reshuffle_kmeans/ya.make
+++ /dev/null
@@ -1,33 +0,0 @@
-UNITTEST_FOR(ydb/core/tx/datashard)
-
-FORK_SUBTESTS()
-
-SPLIT_FACTOR(1)
-
-IF (SANITIZER_TYPE == "thread" OR WITH_VALGRIND)
-    SIZE(LARGE)
-    TAG(ya:fat)
-ELSE()
-    SIZE(MEDIUM)
-ENDIF()
-
-PEERDIR(
-    ydb/core/tx/datashard/ut_common
-    library/cpp/getopt
-    library/cpp/regex/pcre
-    library/cpp/svnversion
-    ydb/core/kqp/ut/common
-    ydb/core/testlib/default
-    ydb/core/tx
-    yql/essentials/public/udf/service/exception_policy
-    ydb/public/lib/yson_value
-    ydb/public/sdk/cpp/src/client/result
-)
-
-YQL_LAST_ABI_VERSION()
-
-SRCS(
-    datashard_ut_reshuffle_kmeans.cpp
-)
-
-END()
diff --git a/ydb/core/tx/datashard/ut_sample_k/ya.make b/ydb/core/tx/datashard/ut_sample_k/ya.make
deleted file mode 100644
index 18713b07ee..0000000000
--- a/ydb/core/tx/datashard/ut_sample_k/ya.make
+++ /dev/null
@@ -1,33 +0,0 @@
-UNITTEST_FOR(ydb/core/tx/datashard)
-
-FORK_SUBTESTS()
-
-SPLIT_FACTOR(1)
-
-IF (SANITIZER_TYPE == "thread" OR WITH_VALGRIND)
-    SIZE(LARGE)
-    TAG(ya:fat)
-ELSE()
-    SIZE(MEDIUM)
-ENDIF()
-
-PEERDIR(
-    ydb/core/tx/datashard/ut_common
-    library/cpp/getopt
-    library/cpp/regex/pcre
-    library/cpp/svnversion
-    ydb/core/kqp/ut/common
-    ydb/core/testlib/default
-    ydb/core/tx
-    yql/essentials/public/udf/service/exception_policy
-    ydb/public/lib/yson_value
-    ydb/public/sdk/cpp/src/client/result
-)
-
-YQL_LAST_ABI_VERSION()
-
-SRCS(
-    datashard_ut_sample_k.cpp
-)
-
-END()
diff --git a/ydb/core/tx/datashard/ya.make b/ydb/core/tx/datashard/ya.make
index 4c70878360..9f3577b209 100644
--- a/ydb/core/tx/datashard/ya.make
+++ b/ydb/core/tx/datashard/ya.make
@@ -8,7 +8,6 @@ SRCS(
     build_and_wait_dependencies_unit.cpp
     build_data_tx_out_rs_unit.cpp
     build_distributed_erase_tx_out_rs_unit.cpp
-    build_index.cpp
     build_kqp_data_tx_out_rs_unit.cpp
     build_scheme_tx_out_rs_unit.cpp
     build_write_out_rs_unit.cpp
@@ -168,11 +167,9 @@ SRCS(
     key_conflicts.cpp
     key_conflicts.h
     key_validator.cpp
-    kmeans_helper.cpp
     load_and_wait_in_rs_unit.cpp
     load_tx_details_unit.cpp
     load_write_details_unit.cpp
-    local_kmeans.cpp
     make_scan_snapshot_unit.cpp
     make_snapshot_unit.cpp
     memory_state_migration.cpp
@@ -181,7 +178,6 @@ SRCS(
     operation.cpp
     operation.h
     plan_queue_unit.cpp
-    prefix_kmeans.cpp
     prepare_data_tx_in_rs_unit.cpp
     prepare_distributed_erase_tx_in_rs_unit.cpp
     prepare_kqp_data_tx_in_rs_unit.cpp
@@ -201,9 +197,7 @@ SRCS(
     remove_lock_change_records.cpp
     remove_locks.cpp
     remove_schema_snapshots.cpp
-    reshuffle_kmeans.cpp
     restore_unit.cpp
-    sample_k.cpp
     scan_common.cpp
     setup_sys_locks.h
     store_and_send_out_rs_unit.cpp
@@ -221,6 +215,13 @@ SRCS(
     volatile_tx_mon.cpp
     wait_for_plan_unit.cpp
     wait_for_stream_clearance_unit.cpp
+
+    build_index/prefix_kmeans.cpp
+    build_index/kmeans_helper.cpp
+    build_index/local_kmeans.cpp
+    build_index/sample_k.cpp
+    build_index/secondary_index.cpp
+    build_index/reshuffle_kmeans.cpp
 )
 
 GENERATE_ENUM_SERIALIZATION(backup_restore_traits.h)
@@ -304,8 +305,8 @@ ENDIF()
 END()
 
 RECURSE_FOR_TESTS(
+    build_index/ut
     ut_background_compaction
-    ut_build_index
     ut_change_collector
     ut_change_exchange
     ut_column_stats
@@ -321,21 +322,17 @@ RECURSE_FOR_TESTS(
     ut_kqp
     ut_kqp_errors
     ut_kqp_scan
-    ut_local_kmeans
     ut_locks
     ut_minikql
     ut_minstep
     ut_object_storage_listing
     ut_order
-    ut_prefix_kmeans
     ut_range_ops
     ut_read_iterator
     ut_read_table
     ut_reassign
     ut_replication
-    ut_reshuffle_kmeans
     ut_rs
-    ut_sample_k
     ut_sequence
     ut_snapshot
     ut_stats