Move ut using idx_test in to kqp tests

.mapping.json

@@ -4762,6 +4762,11 @@
   "ydb/core/kqp/ut/federated_query/s3/CMakeLists.linux-x86_64.txt":"",
   "ydb/core/kqp/ut/federated_query/s3/CMakeLists.txt":"",
   "ydb/core/kqp/ut/federated_query/s3/CMakeLists.windows-x86_64.txt":"",
+  "ydb/core/kqp/ut/idx_test/CMakeLists.darwin-x86_64.txt":"",
+  "ydb/core/kqp/ut/idx_test/CMakeLists.linux-aarch64.txt":"",
+  "ydb/core/kqp/ut/idx_test/CMakeLists.linux-x86_64.txt":"",
+  "ydb/core/kqp/ut/idx_test/CMakeLists.txt":"",
+  "ydb/core/kqp/ut/idx_test/CMakeLists.windows-x86_64.txt":"",
   "ydb/core/kqp/ut/indexes/CMakeLists.darwin-x86_64.txt":"",
   "ydb/core/kqp/ut/indexes/CMakeLists.linux-aarch64.txt":"",
   "ydb/core/kqp/ut/indexes/CMakeLists.linux-x86_64.txt":"",
@@ -9593,11 +9598,6 @@
   "ydb/services/ydb/CMakeLists.linux-x86_64.txt":"",
   "ydb/services/ydb/CMakeLists.txt":"",
   "ydb/services/ydb/CMakeLists.windows-x86_64.txt":"",
-  "ydb/services/ydb/index_ut/CMakeLists.darwin-x86_64.txt":"",
-  "ydb/services/ydb/index_ut/CMakeLists.linux-aarch64.txt":"",
-  "ydb/services/ydb/index_ut/CMakeLists.linux-x86_64.txt":"",
-  "ydb/services/ydb/index_ut/CMakeLists.txt":"",
-  "ydb/services/ydb/index_ut/CMakeLists.windows-x86_64.txt":"",
   "ydb/services/ydb/sdk_credprovider_ut/CMakeLists.darwin-x86_64.txt":"",
   "ydb/services/ydb/sdk_credprovider_ut/CMakeLists.linux-aarch64.txt":"",
   "ydb/services/ydb/sdk_credprovider_ut/CMakeLists.linux-x86_64.txt":"",

ydb/core/kqp/ut/CMakeLists.txt

@@ -11,6 +11,7 @@ add_subdirectory(common)
 add_subdirectory(cost)
 add_subdirectory(effects)
 add_subdirectory(federated_query)
+add_subdirectory(idx_test)
 add_subdirectory(indexes)
 add_subdirectory(join)
 add_subdirectory(olap)

ydb/services/ydb/index_ut/CMakeLists.darwin-x86_64.txt → ydb/core/kqp/ut/idx_test/CMakeLists.darwin-x86_64.txt

@@ -7,47 +7,48 @@
 
 
 
-add_executable(ydb-services-ydb-index_ut)
-target_compile_options(ydb-services-ydb-index_ut PRIVATE
+add_executable(ydb-core-kqp-ut-idx_test)
+target_compile_options(ydb-core-kqp-ut-idx_test PRIVATE
   -DUSE_CURRENT_UDF_ABI_VERSION
 )
-target_include_directories(ydb-services-ydb-index_ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/services/ydb
+target_include_directories(ydb-core-kqp-ut-idx_test PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
 )
-target_link_libraries(ydb-services-ydb-index_ut PUBLIC
+target_link_libraries(ydb-core-kqp-ut-idx_test PUBLIC
   contrib-libs-cxxsupp
   yutil
   library-cpp-cpuid_check
   cpp-testing-unittest_main
-  ydb-services-ydb
-  core-testlib-default
+  ydb-core-kqp
+  kqp-ut-common
   public-lib-idx_test
   public-lib-yson_value
   cpp-client-ydb_scheme
   cpp-client-ydb_table
+  yql-sql-pg_dummy
 )
-target_link_options(ydb-services-ydb-index_ut PRIVATE
+target_link_options(ydb-core-kqp-ut-idx_test PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
   -fPIC
   -fPIC
   -framework
   CoreFoundation
 )
-target_sources(ydb-services-ydb-index_ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/services/ydb/ydb_index_ut.cpp
+target_sources(ydb-core-kqp-ut-idx_test PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/idx_test/ydb_index_ut.cpp
 )
 set_property(
   TARGET
-  ydb-services-ydb-index_ut
+  ydb-core-kqp-ut-idx_test
   PROPERTY
   SPLIT_FACTOR
   5
 )
 add_yunittest(
   NAME
-  ydb-services-ydb-index_ut
+  ydb-core-kqp-ut-idx_test
   TEST_TARGET
-  ydb-services-ydb-index_ut
+  ydb-core-kqp-ut-idx_test
   TEST_ARG
   --print-before-suite
   --print-before-test
@@ -57,26 +58,26 @@ add_yunittest(
 )
 set_yunittest_property(
   TEST
-  ydb-services-ydb-index_ut
+  ydb-core-kqp-ut-idx_test
   PROPERTY
   LABELS
   MEDIUM
 )
 set_yunittest_property(
   TEST
-  ydb-services-ydb-index_ut
+  ydb-core-kqp-ut-idx_test
   PROPERTY
   PROCESSORS
   1
 )
 set_yunittest_property(
   TEST
-  ydb-services-ydb-index_ut
+  ydb-core-kqp-ut-idx_test
   PROPERTY
   TIMEOUT
   600
 )
-target_allocator(ydb-services-ydb-index_ut
+target_allocator(ydb-core-kqp-ut-idx_test
   system_allocator
 )
-vcs_info(ydb-services-ydb-index_ut)
+vcs_info(ydb-core-kqp-ut-idx_test)

ydb/services/ydb/index_ut/CMakeLists.linux-aarch64.txt → ydb/core/kqp/ut/idx_test/CMakeLists.linux-aarch64.txt

@@ -7,26 +7,27 @@
 
 
 
-add_executable(ydb-services-ydb-index_ut)
-target_compile_options(ydb-services-ydb-index_ut PRIVATE
+add_executable(ydb-core-kqp-ut-idx_test)
+target_compile_options(ydb-core-kqp-ut-idx_test PRIVATE
   -DUSE_CURRENT_UDF_ABI_VERSION
 )
-target_include_directories(ydb-services-ydb-index_ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/services/ydb
+target_include_directories(ydb-core-kqp-ut-idx_test PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
 )
-target_link_libraries(ydb-services-ydb-index_ut PUBLIC
+target_link_libraries(ydb-core-kqp-ut-idx_test PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
   cpp-testing-unittest_main
-  ydb-services-ydb
-  core-testlib-default
+  ydb-core-kqp
+  kqp-ut-common
   public-lib-idx_test
   public-lib-yson_value
   cpp-client-ydb_scheme
   cpp-client-ydb_table
+  yql-sql-pg_dummy
 )
-target_link_options(ydb-services-ydb-index_ut PRIVATE
+target_link_options(ydb-core-kqp-ut-idx_test PRIVATE
   -ldl
   -lrt
   -Wl,--no-as-needed
@@ -36,21 +37,21 @@ target_link_options(ydb-services-ydb-index_ut PRIVATE
   -lrt
   -ldl
 )
-target_sources(ydb-services-ydb-index_ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/services/ydb/ydb_index_ut.cpp
+target_sources(ydb-core-kqp-ut-idx_test PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/idx_test/ydb_index_ut.cpp
 )
 set_property(
   TARGET
-  ydb-services-ydb-index_ut
+  ydb-core-kqp-ut-idx_test
   PROPERTY
   SPLIT_FACTOR
   5
 )
 add_yunittest(
   NAME
-  ydb-services-ydb-index_ut
+  ydb-core-kqp-ut-idx_test
   TEST_TARGET
-  ydb-services-ydb-index_ut
+  ydb-core-kqp-ut-idx_test
   TEST_ARG
   --print-before-suite
   --print-before-test
@@ -60,26 +61,26 @@ add_yunittest(
 )
 set_yunittest_property(
   TEST
-  ydb-services-ydb-index_ut
+  ydb-core-kqp-ut-idx_test
   PROPERTY
   LABELS
   MEDIUM
 )
 set_yunittest_property(
   TEST
-  ydb-services-ydb-index_ut
+  ydb-core-kqp-ut-idx_test
   PROPERTY
   PROCESSORS
   1
 )
 set_yunittest_property(
   TEST
-  ydb-services-ydb-index_ut
+  ydb-core-kqp-ut-idx_test
   PROPERTY
   TIMEOUT
   600
 )
-target_allocator(ydb-services-ydb-index_ut
+target_allocator(ydb-core-kqp-ut-idx_test
   cpp-malloc-jemalloc
 )
-vcs_info(ydb-services-ydb-index_ut)
+vcs_info(ydb-core-kqp-ut-idx_test)

ydb/services/ydb/index_ut/CMakeLists.linux-x86_64.txt → ydb/core/kqp/ut/idx_test/CMakeLists.linux-x86_64.txt

@@ -7,27 +7,28 @@
 
 
 
-add_executable(ydb-services-ydb-index_ut)
-target_compile_options(ydb-services-ydb-index_ut PRIVATE
+add_executable(ydb-core-kqp-ut-idx_test)
+target_compile_options(ydb-core-kqp-ut-idx_test PRIVATE
   -DUSE_CURRENT_UDF_ABI_VERSION
 )
-target_include_directories(ydb-services-ydb-index_ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/services/ydb
+target_include_directories(ydb-core-kqp-ut-idx_test PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
 )
-target_link_libraries(ydb-services-ydb-index_ut PUBLIC
+target_link_libraries(ydb-core-kqp-ut-idx_test PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
   library-cpp-cpuid_check
   cpp-testing-unittest_main
-  ydb-services-ydb
-  core-testlib-default
+  ydb-core-kqp
+  kqp-ut-common
   public-lib-idx_test
   public-lib-yson_value
   cpp-client-ydb_scheme
   cpp-client-ydb_table
+  yql-sql-pg_dummy
 )
-target_link_options(ydb-services-ydb-index_ut PRIVATE
+target_link_options(ydb-core-kqp-ut-idx_test PRIVATE
   -ldl
   -lrt
   -Wl,--no-as-needed
@@ -37,21 +38,21 @@ target_link_options(ydb-services-ydb-index_ut PRIVATE
   -lrt
   -ldl
 )
-target_sources(ydb-services-ydb-index_ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/services/ydb/ydb_index_ut.cpp
+target_sources(ydb-core-kqp-ut-idx_test PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/idx_test/ydb_index_ut.cpp
 )
 set_property(
   TARGET
-  ydb-services-ydb-index_ut
+  ydb-core-kqp-ut-idx_test
   PROPERTY
   SPLIT_FACTOR
   5
 )
 add_yunittest(
   NAME
-  ydb-services-ydb-index_ut
+  ydb-core-kqp-ut-idx_test
   TEST_TARGET
-  ydb-services-ydb-index_ut
+  ydb-core-kqp-ut-idx_test
   TEST_ARG
   --print-before-suite
   --print-before-test
@@ -61,27 +62,27 @@ add_yunittest(
 )
 set_yunittest_property(
   TEST
-  ydb-services-ydb-index_ut
+  ydb-core-kqp-ut-idx_test
   PROPERTY
   LABELS
   MEDIUM
 )
 set_yunittest_property(
   TEST
-  ydb-services-ydb-index_ut
+  ydb-core-kqp-ut-idx_test
   PROPERTY
   PROCESSORS
   1
 )
 set_yunittest_property(
   TEST
-  ydb-services-ydb-index_ut
+  ydb-core-kqp-ut-idx_test
   PROPERTY
   TIMEOUT
   600
 )
-target_allocator(ydb-services-ydb-index_ut
+target_allocator(ydb-core-kqp-ut-idx_test
   cpp-malloc-tcmalloc
   libs-tcmalloc-no_percpu_cache
 )
-vcs_info(ydb-services-ydb-index_ut)
+vcs_info(ydb-core-kqp-ut-idx_test)

ydb/services/ydb/index_ut/CMakeLists.windows-x86_64.txt → ydb/core/kqp/ut/idx_test/CMakeLists.windows-x86_64.txt

@@ -7,40 +7,41 @@
 
 
 
-add_executable(ydb-services-ydb-index_ut)
-target_compile_options(ydb-services-ydb-index_ut PRIVATE
+add_executable(ydb-core-kqp-ut-idx_test)
+target_compile_options(ydb-core-kqp-ut-idx_test PRIVATE
   -DUSE_CURRENT_UDF_ABI_VERSION
 )
-target_include_directories(ydb-services-ydb-index_ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/services/ydb
+target_include_directories(ydb-core-kqp-ut-idx_test PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
 )
-target_link_libraries(ydb-services-ydb-index_ut PUBLIC
+target_link_libraries(ydb-core-kqp-ut-idx_test PUBLIC
   contrib-libs-cxxsupp
   yutil
   library-cpp-cpuid_check
   cpp-testing-unittest_main
-  ydb-services-ydb
-  core-testlib-default
+  ydb-core-kqp
+  kqp-ut-common
   public-lib-idx_test
   public-lib-yson_value
   cpp-client-ydb_scheme
   cpp-client-ydb_table
+  yql-sql-pg_dummy
 )
-target_sources(ydb-services-ydb-index_ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/services/ydb/ydb_index_ut.cpp
+target_sources(ydb-core-kqp-ut-idx_test PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/idx_test/ydb_index_ut.cpp
 )
 set_property(
   TARGET
-  ydb-services-ydb-index_ut
+  ydb-core-kqp-ut-idx_test
   PROPERTY
   SPLIT_FACTOR
   5
 )
 add_yunittest(
   NAME
-  ydb-services-ydb-index_ut
+  ydb-core-kqp-ut-idx_test
   TEST_TARGET
-  ydb-services-ydb-index_ut
+  ydb-core-kqp-ut-idx_test
   TEST_ARG
   --print-before-suite
   --print-before-test
@@ -50,26 +51,26 @@ add_yunittest(
 )
 set_yunittest_property(
   TEST
-  ydb-services-ydb-index_ut
+  ydb-core-kqp-ut-idx_test
   PROPERTY
   LABELS
   MEDIUM
 )
 set_yunittest_property(
   TEST
-  ydb-services-ydb-index_ut
+  ydb-core-kqp-ut-idx_test
   PROPERTY
   PROCESSORS
   1
 )
 set_yunittest_property(
   TEST
-  ydb-services-ydb-index_ut
+  ydb-core-kqp-ut-idx_test
   PROPERTY
   TIMEOUT
   600
 )
-target_allocator(ydb-services-ydb-index_ut
+target_allocator(ydb-core-kqp-ut-idx_test
   system_allocator
 )
-vcs_info(ydb-services-ydb-index_ut)
+vcs_info(ydb-core-kqp-ut-idx_test)

ydb/services/ydb/index_ut/ya.make → ydb/core/kqp/ut/idx_test/ya.make

@@ -1,4 +1,4 @@
-UNITTEST_FOR(ydb/services/ydb)
+UNITTEST_FOR(ydb/core/kqp)
 
 FORK_SUBTESTS()
 
@@ -22,11 +22,12 @@ SRCS(
 )
 
 PEERDIR(
-    ydb/core/testlib/default
+    ydb/core/kqp/ut/common
     ydb/public/lib/idx_test
     ydb/public/lib/yson_value
     ydb/public/sdk/cpp/client/ydb_scheme
     ydb/public/sdk/cpp/client/ydb_table
+    ydb/library/yql/sql/pg_dummy
 )
 
 YQL_LAST_ABI_VERSION()

ydb/services/ydb/ydb_index_ut.cpp → ydb/core/kqp/ut/idx_test/ydb_index_ut.cpp

@@ -1,9 +1,9 @@
 #include <ydb/public/lib/idx_test/idx_test.h>
-
-#include "ydb_common_ut.h"
+#include <ydb/core/kqp/ut/common/kqp_ut_common.h>
 
 using namespace NYdb;
 using namespace NYdb::NTable;
+using namespace NKikimr::NKqp;
 using namespace NIdxTest;
 
 struct TRunSettings {
@@ -12,23 +12,22 @@ struct TRunSettings {
     const bool WithDataColumn;
 };
 
+static const TString TABLE_PATH = "Root/TestIdx";
+
 static void RunTest(ui32 shardsCount, ui32 rowsCount, ui32 indexCount, const TRunSettings& settings) {
     bool pkOverlap = settings.PkOverlap;
     bool indexOverlap = settings.IndexOverlap;
     bool withDataColumn = settings.WithDataColumn;
 
-    TKikimrWithGrpcAndRootSchema server;
-    ui16 grpc = server.GetPort();
-
-    TString location = TStringBuilder() << "localhost:" << grpc;
+    TKikimrRunner kikimr(SyntaxV1Settings());
 
     auto driver = NYdb::TDriver(
         TDriverConfig()
-            .SetEndpoint(location));
+            .SetEndpoint(kikimr.GetEndpoint()));
 
-    auto uploader = CreateUploader(driver, "Root/Test", TUploaderParams{shardsCount});
+    auto uploader = CreateUploader(driver, TABLE_PATH, TUploaderParams{shardsCount});
 
-    const TString& keyColumnName = "key";
+    static const TString keyColumnName = "key";
     auto builder = TTableBuilder()
         .AddNullableColumn(keyColumnName, EPrimitiveType::Uint64);
 
@@ -67,9 +66,9 @@ static void RunTest(ui32 shardsCount, ui32 rowsCount, ui32 indexCount, const TRu
         IWorkLoader::LC_UPDATE_ON |
         IWorkLoader::LC_DELETE_ON |
         IWorkLoader::LC_DELETE;
-    workLoader->Run("Root/Test", stms, IWorkLoader::TRunSettings{rowsCount, 5, 1});
+    workLoader->Run(TABLE_PATH, stms, IWorkLoader::TRunSettings{rowsCount, 5, 1});
     auto checker = CreateChecker(driver);
-    checker->Run("Root/Test");
+    checker->Run(TABLE_PATH);
     driver.Stop(true);
 }
 
@@ -123,19 +122,15 @@ Y_UNIT_TEST_SUITE(YdbIndexTable) {
     }
 
     void RunOnlineBuildTest(bool withDataColumn) {
-
-        TKikimrWithGrpcAndRootSchema server;
-        ui16 grpc = server.GetPort();
-
-        TString location = TStringBuilder() << "localhost:" << grpc;
+        TKikimrRunner kikimr(SyntaxV1Settings());
 
         auto driver = NYdb::TDriver(
             TDriverConfig()
-                .SetEndpoint(location));
+                .SetEndpoint(kikimr.GetEndpoint()));
 
-        auto uploader = CreateUploader(driver, "Root/Test", TUploaderParams{1});
+        auto uploader = CreateUploader(driver, TABLE_PATH, TUploaderParams{1});
 
-        const TString& keyColumnName = "key";
+        static const TString keyColumnName = "key";
         auto builder = TTableBuilder()
             .AddNullableColumn(keyColumnName, EPrimitiveType::Uint64)
             .AddNullableColumn("value", EPrimitiveType::Utf8)
@@ -153,9 +148,9 @@ Y_UNIT_TEST_SUITE(YdbIndexTable) {
             ui32 stms =
                 IWorkLoader::LC_UPSERT |
                 (withDataColumn ? IWorkLoader::LC_ALTER_ADD_INDEX_WITH_DATA_COLUMN : IWorkLoader::LC_ALTER_ADD_INDEX);
-            workLoader->Run("Root/Test", stms, IWorkLoader::TRunSettings{2000, 1, 1});
+            workLoader->Run(TABLE_PATH, stms, IWorkLoader::TRunSettings{2000, 1, 1});
             auto checker = CreateChecker(driver);
-            checker->Run("Root/Test");
+            checker->Run(TABLE_PATH);
             driver.Stop(true);
         } catch (const std::exception& ex) {
             Cerr << ex.what() << Endl;

ydb/core/kqp/ut/ya.make

@@ -4,6 +4,7 @@ RECURSE_FOR_TESTS(
     effects
     federated_query
     indexes
+    idx_test
     join
     olap
     opt