Split KQP UTs to several targets to avoid test timeouts. ()

101 files changed, 2428 insertions, 315 deletions

diff --git a/ydb/core/kqp/provider/yql_kikimr_opt_build.cpp b/ydb/core/kqp/provider/yql_kikimr_opt_build.cpp
index 177a7c88c27..86d4aab7436 100644
--- a/ydb/core/kqp/provider/yql_kikimr_opt_build.cpp
+++ b/ydb/core/kqp/provider/yql_kikimr_opt_build.cpp
@@ -67,7 +67,7 @@ struct TKiExploreTxResults {
     struct TKiQueryBlock {
         TVector<TExprBase> Results;
         TVector<TExprBase> Effects;
-        THashMap<std::string_view, TYdbOperations> TableOperations;
+        THashMap<TString, TYdbOperations> TableOperations;
         bool HasUncommittedChangesRead = false;
     };
 
diff --git a/ydb/core/kqp/ut/CMakeLists.darwin.txt b/ydb/core/kqp/ut/CMakeLists.darwin.txt
deleted file mode 100644
index 1d4f8d472eb..00000000000
--- a/ydb/core/kqp/ut/CMakeLists.darwin.txt
+++ /dev/null
@@ -1,100 +0,0 @@
-
-# This file was gererated 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(common)
-add_subdirectory(pg)
-add_subdirectory(spilling)
-
-add_executable(ydb-core-kqp-ut)
-target_compile_options(ydb-core-kqp-ut PRIVATE
-  -DUSE_CURRENT_UDF_ABI_VERSION
-)
-target_include_directories(ydb-core-kqp-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
-)
-target_link_libraries(ydb-core-kqp-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  ydb-core-kqp
-  cpp-threading-local_executor
-  core-client-minikql_compile
-  core-kqp-counters
-  core-kqp-host
-  core-kqp-provider
-  kqp-ut-common
-  cpp-client-draft
-  cpp-client-ydb_proto
-  cpp-client-ydb_scheme
-  cpp-client-ydb_topic
-  yql-sql-pg_dummy
-  re2_udf
-  digest_udf
-)
-target_link_options(ydb-core-kqp-ut PRIVATE
-  -Wl,-no_deduplicate
-  -Wl,-sdk_version,10.15
-  -fPIC
-  -fPIC
-  -framework
-  CoreFoundation
-)
-target_sources(ydb-core-kqp-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_acl_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_arrow_in_channels_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_document_api_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_effects_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_explain_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_flip_join_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_flowcontrol_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_immediate_effects.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_index_lookup_join_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_indexes_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_indexes_multishard_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_inplace_update_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_join_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_limits_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_locks_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_merge_connection_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_mvcc_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_ne_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_not_null_columns_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_olap_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_params_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_pragma_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_query_perf_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_query_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_scan_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_scheme_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_scripting_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_service_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_sort_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_stats_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_sqlin_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_sys_view_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_sys_col_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_table_predicate_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_tx_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_types_arrow_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_workload_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_write_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_yql_ut.cpp
-)
-add_test(
-  NAME
-  ydb-core-kqp-ut
-  COMMAND
-  ydb-core-kqp-ut
-  --print-before-suite
-  --print-before-test
-  --fork-tests
-  --print-times
-  --show-fails
-)
-vcs_info(ydb-core-kqp-ut)
diff --git a/ydb/core/kqp/ut/CMakeLists.linux-aarch64.txt b/ydb/core/kqp/ut/CMakeLists.linux-aarch64.txt
deleted file mode 100644
index b44461174d8..00000000000
--- a/ydb/core/kqp/ut/CMakeLists.linux-aarch64.txt
+++ /dev/null
@@ -1,102 +0,0 @@
-
-# This file was gererated 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(common)
-add_subdirectory(pg)
-add_subdirectory(spilling)
-
-add_executable(ydb-core-kqp-ut)
-target_compile_options(ydb-core-kqp-ut PRIVATE
-  -DUSE_CURRENT_UDF_ABI_VERSION
-)
-target_include_directories(ydb-core-kqp-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
-)
-target_link_libraries(ydb-core-kqp-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-lfalloc
-  cpp-testing-unittest_main
-  ydb-core-kqp
-  cpp-threading-local_executor
-  core-client-minikql_compile
-  core-kqp-counters
-  core-kqp-host
-  core-kqp-provider
-  kqp-ut-common
-  cpp-client-draft
-  cpp-client-ydb_proto
-  cpp-client-ydb_scheme
-  cpp-client-ydb_topic
-  yql-sql-pg_dummy
-  re2_udf
-  digest_udf
-)
-target_link_options(ydb-core-kqp-ut PRIVATE
-  -ldl
-  -lrt
-  -Wl,--no-as-needed
-  -fPIC
-  -fPIC
-  -lpthread
-  -lrt
-  -ldl
-)
-target_sources(ydb-core-kqp-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_acl_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_arrow_in_channels_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_document_api_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_effects_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_explain_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_flip_join_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_flowcontrol_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_immediate_effects.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_index_lookup_join_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_indexes_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_indexes_multishard_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_inplace_update_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_join_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_limits_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_locks_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_merge_connection_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_mvcc_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_ne_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_not_null_columns_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_olap_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_params_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_pragma_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_query_perf_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_query_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_scan_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_scheme_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_scripting_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_service_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_sort_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_stats_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_sqlin_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_sys_view_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_sys_col_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_table_predicate_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_tx_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_types_arrow_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_workload_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_write_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_yql_ut.cpp
-)
-add_test(
-  NAME
-  ydb-core-kqp-ut
-  COMMAND
-  ydb-core-kqp-ut
-  --print-before-suite
-  --print-before-test
-  --fork-tests
-  --print-times
-  --show-fails
-)
-vcs_info(ydb-core-kqp-ut)
diff --git a/ydb/core/kqp/ut/CMakeLists.linux.txt b/ydb/core/kqp/ut/CMakeLists.linux.txt
deleted file mode 100644
index e8f9dc55eab..00000000000
--- a/ydb/core/kqp/ut/CMakeLists.linux.txt
+++ /dev/null
@@ -1,104 +0,0 @@
-
-# This file was gererated 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(common)
-add_subdirectory(pg)
-add_subdirectory(spilling)
-
-add_executable(ydb-core-kqp-ut)
-target_compile_options(ydb-core-kqp-ut PRIVATE
-  -DUSE_CURRENT_UDF_ABI_VERSION
-)
-target_include_directories(ydb-core-kqp-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
-)
-target_link_libraries(ydb-core-kqp-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  cpp-malloc-tcmalloc
-  libs-tcmalloc-no_percpu_cache
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  ydb-core-kqp
-  cpp-threading-local_executor
-  core-client-minikql_compile
-  core-kqp-counters
-  core-kqp-host
-  core-kqp-provider
-  kqp-ut-common
-  cpp-client-draft
-  cpp-client-ydb_proto
-  cpp-client-ydb_scheme
-  cpp-client-ydb_topic
-  yql-sql-pg_dummy
-  re2_udf
-  digest_udf
-)
-target_link_options(ydb-core-kqp-ut PRIVATE
-  -ldl
-  -lrt
-  -Wl,--no-as-needed
-  -fPIC
-  -fPIC
-  -lpthread
-  -lrt
-  -ldl
-)
-target_sources(ydb-core-kqp-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_acl_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_arrow_in_channels_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_document_api_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_effects_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_explain_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_flip_join_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_flowcontrol_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_immediate_effects.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_index_lookup_join_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_indexes_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_indexes_multishard_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_inplace_update_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_join_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_limits_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_locks_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_merge_connection_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_mvcc_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_ne_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_not_null_columns_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_olap_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_params_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_pragma_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_query_perf_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_query_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_scan_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_scheme_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_scripting_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_service_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_sort_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_stats_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_sqlin_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_sys_view_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_sys_col_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_table_predicate_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_tx_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_types_arrow_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_workload_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_write_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_yql_ut.cpp
-)
-add_test(
-  NAME
-  ydb-core-kqp-ut
-  COMMAND
-  ydb-core-kqp-ut
-  --print-before-suite
-  --print-before-test
-  --fork-tests
-  --print-times
-  --show-fails
-)
-vcs_info(ydb-core-kqp-ut)
diff --git a/ydb/core/kqp/ut/CMakeLists.txt b/ydb/core/kqp/ut/CMakeLists.txt
index 3e0811fb22e..656d7c7b6e6 100644
--- a/ydb/core/kqp/ut/CMakeLists.txt
+++ b/ydb/core/kqp/ut/CMakeLists.txt
@@ -6,10 +6,20 @@
 # original buildsystem will not be accepted.
 
 
-if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
-  include(CMakeLists.linux-aarch64.txt)
-elseif (APPLE)
-  include(CMakeLists.darwin.txt)
-elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID)
-  include(CMakeLists.linux.txt)
-endif()
+add_subdirectory(arrow)
+add_subdirectory(common)
+add_subdirectory(effects)
+add_subdirectory(indexes)
+add_subdirectory(join)
+add_subdirectory(olap)
+add_subdirectory(opt)
+add_subdirectory(perf)
+add_subdirectory(pg)
+add_subdirectory(query)
+add_subdirectory(scan)
+add_subdirectory(scheme)
+add_subdirectory(service)
+add_subdirectory(spilling)
+add_subdirectory(sysview)
+add_subdirectory(tx)
+add_subdirectory(yql)
diff --git a/ydb/core/kqp/ut/arrow/CMakeLists.darwin.txt b/ydb/core/kqp/ut/arrow/CMakeLists.darwin.txt
new file mode 100644
index 00000000000..f491d04941d
--- /dev/null
+++ b/ydb/core/kqp/ut/arrow/CMakeLists.darwin.txt
@@ -0,0 +1,49 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-arrow)
+target_compile_options(ydb-core-kqp-ut-arrow PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-arrow PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-arrow PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-arrow PRIVATE
+  -Wl,-no_deduplicate
+  -Wl,-sdk_version,10.15
+  -fPIC
+  -fPIC
+  -framework
+  CoreFoundation
+)
+target_sources(ydb-core-kqp-ut-arrow PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/arrow/kqp_arrow_in_channels_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/arrow/kqp_types_arrow_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-arrow
+  COMMAND
+  ydb-core-kqp-ut-arrow
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-arrow)
diff --git a/ydb/core/kqp/ut/arrow/CMakeLists.linux-aarch64.txt b/ydb/core/kqp/ut/arrow/CMakeLists.linux-aarch64.txt
new file mode 100644
index 00000000000..437cf5d979a
--- /dev/null
+++ b/ydb/core/kqp/ut/arrow/CMakeLists.linux-aarch64.txt
@@ -0,0 +1,51 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-arrow)
+target_compile_options(ydb-core-kqp-ut-arrow PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-arrow PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-arrow PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-lfalloc
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-arrow PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-core-kqp-ut-arrow PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/arrow/kqp_arrow_in_channels_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/arrow/kqp_types_arrow_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-arrow
+  COMMAND
+  ydb-core-kqp-ut-arrow
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-arrow)
diff --git a/ydb/core/kqp/ut/arrow/CMakeLists.linux.txt b/ydb/core/kqp/ut/arrow/CMakeLists.linux.txt
new file mode 100644
index 00000000000..8a794800b42
--- /dev/null
+++ b/ydb/core/kqp/ut/arrow/CMakeLists.linux.txt
@@ -0,0 +1,53 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-arrow)
+target_compile_options(ydb-core-kqp-ut-arrow PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-arrow PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-arrow PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-arrow PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-core-kqp-ut-arrow PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/arrow/kqp_arrow_in_channels_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/arrow/kqp_types_arrow_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-arrow
+  COMMAND
+  ydb-core-kqp-ut-arrow
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-arrow)
diff --git a/ydb/core/kqp/ut/arrow/CMakeLists.txt b/ydb/core/kqp/ut/arrow/CMakeLists.txt
new file mode 100644
index 00000000000..3e0811fb22e
--- /dev/null
+++ b/ydb/core/kqp/ut/arrow/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+# This file was gererated 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.
+
+
+if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux-aarch64.txt)
+elseif (APPLE)
+  include(CMakeLists.darwin.txt)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux.txt)
+endif()
diff --git a/ydb/core/kqp/ut/kqp_arrow_in_channels_ut.cpp b/ydb/core/kqp/ut/arrow/kqp_arrow_in_channels_ut.cpp
index 4209f59e66c..4209f59e66c 100644
--- a/ydb/core/kqp/ut/kqp_arrow_in_channels_ut.cpp
+++ b/ydb/core/kqp/ut/arrow/kqp_arrow_in_channels_ut.cpp
diff --git a/ydb/core/kqp/ut/kqp_types_arrow_ut.cpp b/ydb/core/kqp/ut/arrow/kqp_types_arrow_ut.cpp
index 443655e3c3b..443655e3c3b 100644
--- a/ydb/core/kqp/ut/kqp_types_arrow_ut.cpp
+++ b/ydb/core/kqp/ut/arrow/kqp_types_arrow_ut.cpp
diff --git a/ydb/core/kqp/ut/common/CMakeLists.txt b/ydb/core/kqp/ut/common/CMakeLists.txt
index af1d72d9baf..5b3d6bc3d81 100644
--- a/ydb/core/kqp/ut/common/CMakeLists.txt
+++ b/ydb/core/kqp/ut/common/CMakeLists.txt
@@ -22,6 +22,7 @@ target_link_libraries(kqp-ut-common PUBLIC
   cpp-client-ydb_proto
   cpp-client-ydb_scheme
   cpp-client-ydb_table
+  cpp-client-ydb_topic
 )
 target_sources(kqp-ut-common PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/common/kqp_ut_common.cpp
diff --git a/ydb/core/kqp/ut/effects/CMakeLists.darwin.txt b/ydb/core/kqp/ut/effects/CMakeLists.darwin.txt
new file mode 100644
index 00000000000..7928cdf0c4f
--- /dev/null
+++ b/ydb/core/kqp/ut/effects/CMakeLists.darwin.txt
@@ -0,0 +1,51 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-effects)
+target_compile_options(ydb-core-kqp-ut-effects PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-effects PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-effects PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-effects PRIVATE
+  -Wl,-no_deduplicate
+  -Wl,-sdk_version,10.15
+  -fPIC
+  -fPIC
+  -framework
+  CoreFoundation
+)
+target_sources(ydb-core-kqp-ut-effects PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/effects/kqp_effects_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/effects/kqp_immediate_effects_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/effects/kqp_inplace_update_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/effects/kqp_write_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-effects
+  COMMAND
+  ydb-core-kqp-ut-effects
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-effects)
diff --git a/ydb/core/kqp/ut/effects/CMakeLists.linux-aarch64.txt b/ydb/core/kqp/ut/effects/CMakeLists.linux-aarch64.txt
new file mode 100644
index 00000000000..22c7e2c3248
--- /dev/null
+++ b/ydb/core/kqp/ut/effects/CMakeLists.linux-aarch64.txt
@@ -0,0 +1,53 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-effects)
+target_compile_options(ydb-core-kqp-ut-effects PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-effects PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-effects PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-lfalloc
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-effects PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-core-kqp-ut-effects PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/effects/kqp_effects_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/effects/kqp_immediate_effects_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/effects/kqp_inplace_update_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/effects/kqp_write_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-effects
+  COMMAND
+  ydb-core-kqp-ut-effects
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-effects)
diff --git a/ydb/core/kqp/ut/effects/CMakeLists.linux.txt b/ydb/core/kqp/ut/effects/CMakeLists.linux.txt
new file mode 100644
index 00000000000..23f5ee99e61
--- /dev/null
+++ b/ydb/core/kqp/ut/effects/CMakeLists.linux.txt
@@ -0,0 +1,55 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-effects)
+target_compile_options(ydb-core-kqp-ut-effects PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-effects PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-effects PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-effects PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-core-kqp-ut-effects PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/effects/kqp_effects_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/effects/kqp_immediate_effects_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/effects/kqp_inplace_update_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/effects/kqp_write_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-effects
+  COMMAND
+  ydb-core-kqp-ut-effects
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-effects)
diff --git a/ydb/core/kqp/ut/effects/CMakeLists.txt b/ydb/core/kqp/ut/effects/CMakeLists.txt
new file mode 100644
index 00000000000..3e0811fb22e
--- /dev/null
+++ b/ydb/core/kqp/ut/effects/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+# This file was gererated 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.
+
+
+if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux-aarch64.txt)
+elseif (APPLE)
+  include(CMakeLists.darwin.txt)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux.txt)
+endif()
diff --git a/ydb/core/kqp/ut/kqp_effects_ut.cpp b/ydb/core/kqp/ut/effects/kqp_effects_ut.cpp
index 445136b7014..445136b7014 100644
--- a/ydb/core/kqp/ut/kqp_effects_ut.cpp
+++ b/ydb/core/kqp/ut/effects/kqp_effects_ut.cpp
diff --git a/ydb/core/kqp/ut/kqp_immediate_effects.cpp b/ydb/core/kqp/ut/effects/kqp_immediate_effects_ut.cpp
index 5f39fefbe3e..5f39fefbe3e 100644
--- a/ydb/core/kqp/ut/kqp_immediate_effects.cpp
+++ b/ydb/core/kqp/ut/effects/kqp_immediate_effects_ut.cpp
diff --git a/ydb/core/kqp/ut/kqp_inplace_update_ut.cpp b/ydb/core/kqp/ut/effects/kqp_inplace_update_ut.cpp
index 3a1bde48682..3a1bde48682 100644
--- a/ydb/core/kqp/ut/kqp_inplace_update_ut.cpp
+++ b/ydb/core/kqp/ut/effects/kqp_inplace_update_ut.cpp
diff --git a/ydb/core/kqp/ut/kqp_write_ut.cpp b/ydb/core/kqp/ut/effects/kqp_write_ut.cpp
index 4d4f0e0700f..4d4f0e0700f 100644
--- a/ydb/core/kqp/ut/kqp_write_ut.cpp
+++ b/ydb/core/kqp/ut/effects/kqp_write_ut.cpp
diff --git a/ydb/core/kqp/ut/indexes/CMakeLists.darwin.txt b/ydb/core/kqp/ut/indexes/CMakeLists.darwin.txt
new file mode 100644
index 00000000000..f9f72bc869c
--- /dev/null
+++ b/ydb/core/kqp/ut/indexes/CMakeLists.darwin.txt
@@ -0,0 +1,50 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-indexes)
+target_compile_options(ydb-core-kqp-ut-indexes PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-indexes PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-indexes PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  cpp-threading-local_executor
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-indexes PRIVATE
+  -Wl,-no_deduplicate
+  -Wl,-sdk_version,10.15
+  -fPIC
+  -fPIC
+  -framework
+  CoreFoundation
+)
+target_sources(ydb-core-kqp-ut-indexes PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/indexes/kqp_indexes_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/indexes/kqp_indexes_multishard_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-indexes
+  COMMAND
+  ydb-core-kqp-ut-indexes
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-indexes)
diff --git a/ydb/core/kqp/ut/indexes/CMakeLists.linux-aarch64.txt b/ydb/core/kqp/ut/indexes/CMakeLists.linux-aarch64.txt
new file mode 100644
index 00000000000..695bf5eb07f
--- /dev/null
+++ b/ydb/core/kqp/ut/indexes/CMakeLists.linux-aarch64.txt
@@ -0,0 +1,52 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-indexes)
+target_compile_options(ydb-core-kqp-ut-indexes PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-indexes PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-indexes PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-lfalloc
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  cpp-threading-local_executor
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-indexes PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-core-kqp-ut-indexes PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/indexes/kqp_indexes_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/indexes/kqp_indexes_multishard_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-indexes
+  COMMAND
+  ydb-core-kqp-ut-indexes
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-indexes)
diff --git a/ydb/core/kqp/ut/indexes/CMakeLists.linux.txt b/ydb/core/kqp/ut/indexes/CMakeLists.linux.txt
new file mode 100644
index 00000000000..4da90512d42
--- /dev/null
+++ b/ydb/core/kqp/ut/indexes/CMakeLists.linux.txt
@@ -0,0 +1,54 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-indexes)
+target_compile_options(ydb-core-kqp-ut-indexes PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-indexes PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-indexes PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  cpp-threading-local_executor
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-indexes PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-core-kqp-ut-indexes PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/indexes/kqp_indexes_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/indexes/kqp_indexes_multishard_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-indexes
+  COMMAND
+  ydb-core-kqp-ut-indexes
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-indexes)
diff --git a/ydb/core/kqp/ut/indexes/CMakeLists.txt b/ydb/core/kqp/ut/indexes/CMakeLists.txt
new file mode 100644
index 00000000000..3e0811fb22e
--- /dev/null
+++ b/ydb/core/kqp/ut/indexes/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+# This file was gererated 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.
+
+
+if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux-aarch64.txt)
+elseif (APPLE)
+  include(CMakeLists.darwin.txt)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux.txt)
+endif()
diff --git a/ydb/core/kqp/ut/kqp_indexes_multishard_ut.cpp b/ydb/core/kqp/ut/indexes/kqp_indexes_multishard_ut.cpp
index 4a026cadeac..4a026cadeac 100644
--- a/ydb/core/kqp/ut/kqp_indexes_multishard_ut.cpp
+++ b/ydb/core/kqp/ut/indexes/kqp_indexes_multishard_ut.cpp
diff --git a/ydb/core/kqp/ut/kqp_indexes_ut.cpp b/ydb/core/kqp/ut/indexes/kqp_indexes_ut.cpp
index ac8bf282d42..ac8bf282d42 100644
--- a/ydb/core/kqp/ut/kqp_indexes_ut.cpp
+++ b/ydb/core/kqp/ut/indexes/kqp_indexes_ut.cpp
diff --git a/ydb/core/kqp/ut/join/CMakeLists.darwin.txt b/ydb/core/kqp/ut/join/CMakeLists.darwin.txt
new file mode 100644
index 00000000000..cb2b0f8fdd8
--- /dev/null
+++ b/ydb/core/kqp/ut/join/CMakeLists.darwin.txt
@@ -0,0 +1,51 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-join)
+target_compile_options(ydb-core-kqp-ut-join PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-join PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-join PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+  digest_udf
+)
+target_link_options(ydb-core-kqp-ut-join PRIVATE
+  -Wl,-no_deduplicate
+  -Wl,-sdk_version,10.15
+  -fPIC
+  -fPIC
+  -framework
+  CoreFoundation
+)
+target_sources(ydb-core-kqp-ut-join PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/join/kqp_flip_join_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/join/kqp_index_lookup_join_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/join/kqp_join_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-join
+  COMMAND
+  ydb-core-kqp-ut-join
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-join)
diff --git a/ydb/core/kqp/ut/join/CMakeLists.linux-aarch64.txt b/ydb/core/kqp/ut/join/CMakeLists.linux-aarch64.txt
new file mode 100644
index 00000000000..62e75c8a69e
--- /dev/null
+++ b/ydb/core/kqp/ut/join/CMakeLists.linux-aarch64.txt
@@ -0,0 +1,53 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-join)
+target_compile_options(ydb-core-kqp-ut-join PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-join PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-join PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-lfalloc
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+  digest_udf
+)
+target_link_options(ydb-core-kqp-ut-join PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-core-kqp-ut-join PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/join/kqp_flip_join_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/join/kqp_index_lookup_join_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/join/kqp_join_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-join
+  COMMAND
+  ydb-core-kqp-ut-join
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-join)
diff --git a/ydb/core/kqp/ut/join/CMakeLists.linux.txt b/ydb/core/kqp/ut/join/CMakeLists.linux.txt
new file mode 100644
index 00000000000..b2d3ae5c0f6
--- /dev/null
+++ b/ydb/core/kqp/ut/join/CMakeLists.linux.txt
@@ -0,0 +1,55 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-join)
+target_compile_options(ydb-core-kqp-ut-join PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-join PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-join PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+  digest_udf
+)
+target_link_options(ydb-core-kqp-ut-join PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-core-kqp-ut-join PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/join/kqp_flip_join_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/join/kqp_index_lookup_join_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/join/kqp_join_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-join
+  COMMAND
+  ydb-core-kqp-ut-join
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-join)
diff --git a/ydb/core/kqp/ut/join/CMakeLists.txt b/ydb/core/kqp/ut/join/CMakeLists.txt
new file mode 100644
index 00000000000..3e0811fb22e
--- /dev/null
+++ b/ydb/core/kqp/ut/join/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+# This file was gererated 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.
+
+
+if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux-aarch64.txt)
+elseif (APPLE)
+  include(CMakeLists.darwin.txt)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux.txt)
+endif()
diff --git a/ydb/core/kqp/ut/kqp_flip_join_ut.cpp b/ydb/core/kqp/ut/join/kqp_flip_join_ut.cpp
index 6ff608b19bb..6ff608b19bb 100644
--- a/ydb/core/kqp/ut/kqp_flip_join_ut.cpp
+++ b/ydb/core/kqp/ut/join/kqp_flip_join_ut.cpp
diff --git a/ydb/core/kqp/ut/kqp_index_lookup_join_ut.cpp b/ydb/core/kqp/ut/join/kqp_index_lookup_join_ut.cpp
index da4fcf51491..da4fcf51491 100644
--- a/ydb/core/kqp/ut/kqp_index_lookup_join_ut.cpp
+++ b/ydb/core/kqp/ut/join/kqp_index_lookup_join_ut.cpp
diff --git a/ydb/core/kqp/ut/kqp_join_ut.cpp b/ydb/core/kqp/ut/join/kqp_join_ut.cpp
index ce6747869cb..ce6747869cb 100644
--- a/ydb/core/kqp/ut/kqp_join_ut.cpp
+++ b/ydb/core/kqp/ut/join/kqp_join_ut.cpp
diff --git a/ydb/core/kqp/ut/olap/CMakeLists.darwin.txt b/ydb/core/kqp/ut/olap/CMakeLists.darwin.txt
new file mode 100644
index 00000000000..49a561121e4
--- /dev/null
+++ b/ydb/core/kqp/ut/olap/CMakeLists.darwin.txt
@@ -0,0 +1,48 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-olap)
+target_compile_options(ydb-core-kqp-ut-olap PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-olap PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-olap PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-olap PRIVATE
+  -Wl,-no_deduplicate
+  -Wl,-sdk_version,10.15
+  -fPIC
+  -fPIC
+  -framework
+  CoreFoundation
+)
+target_sources(ydb-core-kqp-ut-olap PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/olap/kqp_olap_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-olap
+  COMMAND
+  ydb-core-kqp-ut-olap
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-olap)
diff --git a/ydb/core/kqp/ut/olap/CMakeLists.linux-aarch64.txt b/ydb/core/kqp/ut/olap/CMakeLists.linux-aarch64.txt
new file mode 100644
index 00000000000..c5c63a15a42
--- /dev/null
+++ b/ydb/core/kqp/ut/olap/CMakeLists.linux-aarch64.txt
@@ -0,0 +1,50 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-olap)
+target_compile_options(ydb-core-kqp-ut-olap PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-olap PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-olap PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-lfalloc
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-olap PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-core-kqp-ut-olap PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/olap/kqp_olap_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-olap
+  COMMAND
+  ydb-core-kqp-ut-olap
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-olap)
diff --git a/ydb/core/kqp/ut/olap/CMakeLists.linux.txt b/ydb/core/kqp/ut/olap/CMakeLists.linux.txt
new file mode 100644
index 00000000000..98a24b5f4c8
--- /dev/null
+++ b/ydb/core/kqp/ut/olap/CMakeLists.linux.txt
@@ -0,0 +1,52 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-olap)
+target_compile_options(ydb-core-kqp-ut-olap PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-olap PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-olap PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-olap PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-core-kqp-ut-olap PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/olap/kqp_olap_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-olap
+  COMMAND
+  ydb-core-kqp-ut-olap
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-olap)
diff --git a/ydb/core/kqp/ut/olap/CMakeLists.txt b/ydb/core/kqp/ut/olap/CMakeLists.txt
new file mode 100644
index 00000000000..3e0811fb22e
--- /dev/null
+++ b/ydb/core/kqp/ut/olap/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+# This file was gererated 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.
+
+
+if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux-aarch64.txt)
+elseif (APPLE)
+  include(CMakeLists.darwin.txt)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux.txt)
+endif()
diff --git a/ydb/core/kqp/ut/kqp_olap_ut.cpp b/ydb/core/kqp/ut/olap/kqp_olap_ut.cpp
index 471791d7d6d..471791d7d6d 100644
--- a/ydb/core/kqp/ut/kqp_olap_ut.cpp
+++ b/ydb/core/kqp/ut/olap/kqp_olap_ut.cpp
diff --git a/ydb/core/kqp/ut/opt/CMakeLists.darwin.txt b/ydb/core/kqp/ut/opt/CMakeLists.darwin.txt
new file mode 100644
index 00000000000..3b0df221abf
--- /dev/null
+++ b/ydb/core/kqp/ut/opt/CMakeLists.darwin.txt
@@ -0,0 +1,54 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-opt)
+target_compile_options(ydb-core-kqp-ut-opt PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-opt PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-opt PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+  re2_udf
+)
+target_link_options(ydb-core-kqp-ut-opt PRIVATE
+  -Wl,-no_deduplicate
+  -Wl,-sdk_version,10.15
+  -fPIC
+  -fPIC
+  -framework
+  CoreFoundation
+)
+target_sources(ydb-core-kqp-ut-opt PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/opt/kqp_merge_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/opt/kqp_ne_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/opt/kqp_not_null_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/opt/kqp_ranges_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/opt/kqp_sort_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/opt/kqp_sqlin_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-opt
+  COMMAND
+  ydb-core-kqp-ut-opt
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-opt)
diff --git a/ydb/core/kqp/ut/opt/CMakeLists.linux-aarch64.txt b/ydb/core/kqp/ut/opt/CMakeLists.linux-aarch64.txt
new file mode 100644
index 00000000000..2f082c69b4b
--- /dev/null
+++ b/ydb/core/kqp/ut/opt/CMakeLists.linux-aarch64.txt
@@ -0,0 +1,56 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-opt)
+target_compile_options(ydb-core-kqp-ut-opt PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-opt PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-opt PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-lfalloc
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+  re2_udf
+)
+target_link_options(ydb-core-kqp-ut-opt PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-core-kqp-ut-opt PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/opt/kqp_merge_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/opt/kqp_ne_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/opt/kqp_not_null_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/opt/kqp_ranges_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/opt/kqp_sort_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/opt/kqp_sqlin_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-opt
+  COMMAND
+  ydb-core-kqp-ut-opt
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-opt)
diff --git a/ydb/core/kqp/ut/opt/CMakeLists.linux.txt b/ydb/core/kqp/ut/opt/CMakeLists.linux.txt
new file mode 100644
index 00000000000..8887b39f1bf
--- /dev/null
+++ b/ydb/core/kqp/ut/opt/CMakeLists.linux.txt
@@ -0,0 +1,58 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-opt)
+target_compile_options(ydb-core-kqp-ut-opt PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-opt PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-opt PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+  re2_udf
+)
+target_link_options(ydb-core-kqp-ut-opt PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-core-kqp-ut-opt PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/opt/kqp_merge_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/opt/kqp_ne_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/opt/kqp_not_null_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/opt/kqp_ranges_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/opt/kqp_sort_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/opt/kqp_sqlin_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-opt
+  COMMAND
+  ydb-core-kqp-ut-opt
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-opt)
diff --git a/ydb/core/kqp/ut/opt/CMakeLists.txt b/ydb/core/kqp/ut/opt/CMakeLists.txt
new file mode 100644
index 00000000000..3e0811fb22e
--- /dev/null
+++ b/ydb/core/kqp/ut/opt/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+# This file was gererated 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.
+
+
+if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux-aarch64.txt)
+elseif (APPLE)
+  include(CMakeLists.darwin.txt)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux.txt)
+endif()
diff --git a/ydb/core/kqp/ut/kqp_merge_connection_ut.cpp b/ydb/core/kqp/ut/opt/kqp_merge_ut.cpp
index 5ad531a8d71..5ad531a8d71 100644
--- a/ydb/core/kqp/ut/kqp_merge_connection_ut.cpp
+++ b/ydb/core/kqp/ut/opt/kqp_merge_ut.cpp
diff --git a/ydb/core/kqp/ut/kqp_ne_ut.cpp b/ydb/core/kqp/ut/opt/kqp_ne_ut.cpp
index f8fa2ef0179..f8fa2ef0179 100644
--- a/ydb/core/kqp/ut/kqp_ne_ut.cpp
+++ b/ydb/core/kqp/ut/opt/kqp_ne_ut.cpp
diff --git a/ydb/core/kqp/ut/kqp_not_null_columns_ut.cpp b/ydb/core/kqp/ut/opt/kqp_not_null_ut.cpp
index b7ee6f8dd24..b7ee6f8dd24 100644
--- a/ydb/core/kqp/ut/kqp_not_null_columns_ut.cpp
+++ b/ydb/core/kqp/ut/opt/kqp_not_null_ut.cpp
diff --git a/ydb/core/kqp/ut/kqp_table_predicate_ut.cpp b/ydb/core/kqp/ut/opt/kqp_ranges_ut.cpp
index d772a4af766..c8baea4fba2 100644
--- a/ydb/core/kqp/ut/kqp_table_predicate_ut.cpp
+++ b/ydb/core/kqp/ut/opt/kqp_ranges_ut.cpp
@@ -337,7 +337,7 @@ void RunPredicateTest(const std::vector<TString>& predicates, bool withNulls) {
 
 } // anonymous namespace end
 
-Y_UNIT_TEST_SUITE(KqpTablePredicate) {
+Y_UNIT_TEST_SUITE(KqpRanges) {
     Y_UNIT_TEST(IsNull) {
         TKikimrRunner kikimr;
         auto db = kikimr.GetTableClient();
diff --git a/ydb/core/kqp/ut/kqp_sort_ut.cpp b/ydb/core/kqp/ut/opt/kqp_sort_ut.cpp
index 25825aab105..25825aab105 100644
--- a/ydb/core/kqp/ut/kqp_sort_ut.cpp
+++ b/ydb/core/kqp/ut/opt/kqp_sort_ut.cpp
diff --git a/ydb/core/kqp/ut/kqp_sqlin_ut.cpp b/ydb/core/kqp/ut/opt/kqp_sqlin_ut.cpp
index 5ad64465984..5ad64465984 100644
--- a/ydb/core/kqp/ut/kqp_sqlin_ut.cpp
+++ b/ydb/core/kqp/ut/opt/kqp_sqlin_ut.cpp
diff --git a/ydb/core/kqp/ut/perf/CMakeLists.darwin.txt b/ydb/core/kqp/ut/perf/CMakeLists.darwin.txt
new file mode 100644
index 00000000000..aed02254ef4
--- /dev/null
+++ b/ydb/core/kqp/ut/perf/CMakeLists.darwin.txt
@@ -0,0 +1,50 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-perf)
+target_compile_options(ydb-core-kqp-ut-perf PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-perf PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-perf PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  cpp-threading-local_executor
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-perf PRIVATE
+  -Wl,-no_deduplicate
+  -Wl,-sdk_version,10.15
+  -fPIC
+  -fPIC
+  -framework
+  CoreFoundation
+)
+target_sources(ydb-core-kqp-ut-perf PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/perf/kqp_query_perf_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/perf/kqp_workload_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-perf
+  COMMAND
+  ydb-core-kqp-ut-perf
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-perf)
diff --git a/ydb/core/kqp/ut/perf/CMakeLists.linux-aarch64.txt b/ydb/core/kqp/ut/perf/CMakeLists.linux-aarch64.txt
new file mode 100644
index 00000000000..1507a7bfa76
--- /dev/null
+++ b/ydb/core/kqp/ut/perf/CMakeLists.linux-aarch64.txt
@@ -0,0 +1,52 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-perf)
+target_compile_options(ydb-core-kqp-ut-perf PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-perf PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-perf PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-lfalloc
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  cpp-threading-local_executor
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-perf PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-core-kqp-ut-perf PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/perf/kqp_query_perf_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/perf/kqp_workload_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-perf
+  COMMAND
+  ydb-core-kqp-ut-perf
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-perf)
diff --git a/ydb/core/kqp/ut/perf/CMakeLists.linux.txt b/ydb/core/kqp/ut/perf/CMakeLists.linux.txt
new file mode 100644
index 00000000000..412033af7e9
--- /dev/null
+++ b/ydb/core/kqp/ut/perf/CMakeLists.linux.txt
@@ -0,0 +1,54 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-perf)
+target_compile_options(ydb-core-kqp-ut-perf PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-perf PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-perf PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  cpp-threading-local_executor
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-perf PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-core-kqp-ut-perf PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/perf/kqp_query_perf_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/perf/kqp_workload_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-perf
+  COMMAND
+  ydb-core-kqp-ut-perf
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-perf)
diff --git a/ydb/core/kqp/ut/perf/CMakeLists.txt b/ydb/core/kqp/ut/perf/CMakeLists.txt
new file mode 100644
index 00000000000..3e0811fb22e
--- /dev/null
+++ b/ydb/core/kqp/ut/perf/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+# This file was gererated 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.
+
+
+if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux-aarch64.txt)
+elseif (APPLE)
+  include(CMakeLists.darwin.txt)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux.txt)
+endif()
diff --git a/ydb/core/kqp/ut/kqp_query_perf_ut.cpp b/ydb/core/kqp/ut/perf/kqp_query_perf_ut.cpp
index 816bcec8a28..816bcec8a28 100644
--- a/ydb/core/kqp/ut/kqp_query_perf_ut.cpp
+++ b/ydb/core/kqp/ut/perf/kqp_query_perf_ut.cpp
diff --git a/ydb/core/kqp/ut/kqp_workload_ut.cpp b/ydb/core/kqp/ut/perf/kqp_workload_ut.cpp
index 030a928ae81..030a928ae81 100644
--- a/ydb/core/kqp/ut/kqp_workload_ut.cpp
+++ b/ydb/core/kqp/ut/perf/kqp_workload_ut.cpp
diff --git a/ydb/core/kqp/ut/query/CMakeLists.darwin.txt b/ydb/core/kqp/ut/query/CMakeLists.darwin.txt
new file mode 100644
index 00000000000..74a17aa7a1b
--- /dev/null
+++ b/ydb/core/kqp/ut/query/CMakeLists.darwin.txt
@@ -0,0 +1,52 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-query)
+target_compile_options(ydb-core-kqp-ut-query PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-query PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-query PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-query PRIVATE
+  -Wl,-no_deduplicate
+  -Wl,-sdk_version,10.15
+  -fPIC
+  -fPIC
+  -framework
+  CoreFoundation
+)
+target_sources(ydb-core-kqp-ut-query PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/query/kqp_explain_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/query/kqp_limits_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/query/kqp_params_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/query/kqp_query_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/query/kqp_stats_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-query
+  COMMAND
+  ydb-core-kqp-ut-query
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-query)
diff --git a/ydb/core/kqp/ut/query/CMakeLists.linux-aarch64.txt b/ydb/core/kqp/ut/query/CMakeLists.linux-aarch64.txt
new file mode 100644
index 00000000000..6396d7735e5
--- /dev/null
+++ b/ydb/core/kqp/ut/query/CMakeLists.linux-aarch64.txt
@@ -0,0 +1,54 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-query)
+target_compile_options(ydb-core-kqp-ut-query PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-query PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-query PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-lfalloc
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-query PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-core-kqp-ut-query PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/query/kqp_explain_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/query/kqp_limits_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/query/kqp_params_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/query/kqp_query_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/query/kqp_stats_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-query
+  COMMAND
+  ydb-core-kqp-ut-query
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-query)
diff --git a/ydb/core/kqp/ut/query/CMakeLists.linux.txt b/ydb/core/kqp/ut/query/CMakeLists.linux.txt
new file mode 100644
index 00000000000..1f14debf6e8
--- /dev/null
+++ b/ydb/core/kqp/ut/query/CMakeLists.linux.txt
@@ -0,0 +1,56 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-query)
+target_compile_options(ydb-core-kqp-ut-query PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-query PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-query PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-query PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-core-kqp-ut-query PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/query/kqp_explain_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/query/kqp_limits_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/query/kqp_params_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/query/kqp_query_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/query/kqp_stats_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-query
+  COMMAND
+  ydb-core-kqp-ut-query
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-query)
diff --git a/ydb/core/kqp/ut/query/CMakeLists.txt b/ydb/core/kqp/ut/query/CMakeLists.txt
new file mode 100644
index 00000000000..3e0811fb22e
--- /dev/null
+++ b/ydb/core/kqp/ut/query/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+# This file was gererated 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.
+
+
+if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux-aarch64.txt)
+elseif (APPLE)
+  include(CMakeLists.darwin.txt)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux.txt)
+endif()
diff --git a/ydb/core/kqp/ut/kqp_explain_ut.cpp b/ydb/core/kqp/ut/query/kqp_explain_ut.cpp
index 5a4f57d4112..5a4f57d4112 100644
--- a/ydb/core/kqp/ut/kqp_explain_ut.cpp
+++ b/ydb/core/kqp/ut/query/kqp_explain_ut.cpp
diff --git a/ydb/core/kqp/ut/kqp_limits_ut.cpp b/ydb/core/kqp/ut/query/kqp_limits_ut.cpp
index b1905eb0420..b1905eb0420 100644
--- a/ydb/core/kqp/ut/kqp_limits_ut.cpp
+++ b/ydb/core/kqp/ut/query/kqp_limits_ut.cpp
diff --git a/ydb/core/kqp/ut/kqp_params_ut.cpp b/ydb/core/kqp/ut/query/kqp_params_ut.cpp
index 8e41e15aafe..8e41e15aafe 100644
--- a/ydb/core/kqp/ut/kqp_params_ut.cpp
+++ b/ydb/core/kqp/ut/query/kqp_params_ut.cpp
diff --git a/ydb/core/kqp/ut/kqp_query_ut.cpp b/ydb/core/kqp/ut/query/kqp_query_ut.cpp
index 45951e4f6a4..45951e4f6a4 100644
--- a/ydb/core/kqp/ut/kqp_query_ut.cpp
+++ b/ydb/core/kqp/ut/query/kqp_query_ut.cpp
diff --git a/ydb/core/kqp/ut/kqp_stats_ut.cpp b/ydb/core/kqp/ut/query/kqp_stats_ut.cpp
index d8253a9afca..d8253a9afca 100644
--- a/ydb/core/kqp/ut/kqp_stats_ut.cpp
+++ b/ydb/core/kqp/ut/query/kqp_stats_ut.cpp
diff --git a/ydb/core/kqp/ut/scan/CMakeLists.darwin.txt b/ydb/core/kqp/ut/scan/CMakeLists.darwin.txt
new file mode 100644
index 00000000000..51d863e82f5
--- /dev/null
+++ b/ydb/core/kqp/ut/scan/CMakeLists.darwin.txt
@@ -0,0 +1,49 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-scan)
+target_compile_options(ydb-core-kqp-ut-scan PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-scan PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-scan PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-scan PRIVATE
+  -Wl,-no_deduplicate
+  -Wl,-sdk_version,10.15
+  -fPIC
+  -fPIC
+  -framework
+  CoreFoundation
+)
+target_sources(ydb-core-kqp-ut-scan PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/scan/kqp_flowcontrol_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/scan/kqp_scan_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-scan
+  COMMAND
+  ydb-core-kqp-ut-scan
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-scan)
diff --git a/ydb/core/kqp/ut/scan/CMakeLists.linux-aarch64.txt b/ydb/core/kqp/ut/scan/CMakeLists.linux-aarch64.txt
new file mode 100644
index 00000000000..2eb750a8086
--- /dev/null
+++ b/ydb/core/kqp/ut/scan/CMakeLists.linux-aarch64.txt
@@ -0,0 +1,51 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-scan)
+target_compile_options(ydb-core-kqp-ut-scan PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-scan PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-scan PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-lfalloc
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-scan PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-core-kqp-ut-scan PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/scan/kqp_flowcontrol_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/scan/kqp_scan_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-scan
+  COMMAND
+  ydb-core-kqp-ut-scan
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-scan)
diff --git a/ydb/core/kqp/ut/scan/CMakeLists.linux.txt b/ydb/core/kqp/ut/scan/CMakeLists.linux.txt
new file mode 100644
index 00000000000..7398d0588eb
--- /dev/null
+++ b/ydb/core/kqp/ut/scan/CMakeLists.linux.txt
@@ -0,0 +1,53 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-scan)
+target_compile_options(ydb-core-kqp-ut-scan PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-scan PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-scan PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-scan PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-core-kqp-ut-scan PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/scan/kqp_flowcontrol_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/scan/kqp_scan_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-scan
+  COMMAND
+  ydb-core-kqp-ut-scan
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-scan)
diff --git a/ydb/core/kqp/ut/scan/CMakeLists.txt b/ydb/core/kqp/ut/scan/CMakeLists.txt
new file mode 100644
index 00000000000..3e0811fb22e
--- /dev/null
+++ b/ydb/core/kqp/ut/scan/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+# This file was gererated 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.
+
+
+if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux-aarch64.txt)
+elseif (APPLE)
+  include(CMakeLists.darwin.txt)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux.txt)
+endif()
diff --git a/ydb/core/kqp/ut/kqp_flowcontrol_ut.cpp b/ydb/core/kqp/ut/scan/kqp_flowcontrol_ut.cpp
index 376e55e152c..376e55e152c 100644
--- a/ydb/core/kqp/ut/kqp_flowcontrol_ut.cpp
+++ b/ydb/core/kqp/ut/scan/kqp_flowcontrol_ut.cpp
diff --git a/ydb/core/kqp/ut/kqp_scan_ut.cpp b/ydb/core/kqp/ut/scan/kqp_scan_ut.cpp
index 81441d0f0c9..81441d0f0c9 100644
--- a/ydb/core/kqp/ut/kqp_scan_ut.cpp
+++ b/ydb/core/kqp/ut/scan/kqp_scan_ut.cpp
diff --git a/ydb/core/kqp/ut/scheme/CMakeLists.darwin.txt b/ydb/core/kqp/ut/scheme/CMakeLists.darwin.txt
new file mode 100644
index 00000000000..1bbfffd6afe
--- /dev/null
+++ b/ydb/core/kqp/ut/scheme/CMakeLists.darwin.txt
@@ -0,0 +1,50 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-scheme)
+target_compile_options(ydb-core-kqp-ut-scheme PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-scheme PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-scheme PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  cpp-threading-local_executor
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-scheme PRIVATE
+  -Wl,-no_deduplicate
+  -Wl,-sdk_version,10.15
+  -fPIC
+  -fPIC
+  -framework
+  CoreFoundation
+)
+target_sources(ydb-core-kqp-ut-scheme PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/scheme/kqp_acl_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/scheme/kqp_scheme_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-scheme
+  COMMAND
+  ydb-core-kqp-ut-scheme
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-scheme)
diff --git a/ydb/core/kqp/ut/scheme/CMakeLists.linux-aarch64.txt b/ydb/core/kqp/ut/scheme/CMakeLists.linux-aarch64.txt
new file mode 100644
index 00000000000..01132530dc3
--- /dev/null
+++ b/ydb/core/kqp/ut/scheme/CMakeLists.linux-aarch64.txt
@@ -0,0 +1,52 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-scheme)
+target_compile_options(ydb-core-kqp-ut-scheme PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-scheme PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-scheme PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-lfalloc
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  cpp-threading-local_executor
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-scheme PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-core-kqp-ut-scheme PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/scheme/kqp_acl_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/scheme/kqp_scheme_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-scheme
+  COMMAND
+  ydb-core-kqp-ut-scheme
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-scheme)
diff --git a/ydb/core/kqp/ut/scheme/CMakeLists.linux.txt b/ydb/core/kqp/ut/scheme/CMakeLists.linux.txt
new file mode 100644
index 00000000000..f7930354221
--- /dev/null
+++ b/ydb/core/kqp/ut/scheme/CMakeLists.linux.txt
@@ -0,0 +1,54 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-scheme)
+target_compile_options(ydb-core-kqp-ut-scheme PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-scheme PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-scheme PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  cpp-threading-local_executor
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-scheme PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-core-kqp-ut-scheme PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/scheme/kqp_acl_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/scheme/kqp_scheme_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-scheme
+  COMMAND
+  ydb-core-kqp-ut-scheme
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-scheme)
diff --git a/ydb/core/kqp/ut/scheme/CMakeLists.txt b/ydb/core/kqp/ut/scheme/CMakeLists.txt
new file mode 100644
index 00000000000..3e0811fb22e
--- /dev/null
+++ b/ydb/core/kqp/ut/scheme/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+# This file was gererated 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.
+
+
+if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux-aarch64.txt)
+elseif (APPLE)
+  include(CMakeLists.darwin.txt)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux.txt)
+endif()
diff --git a/ydb/core/kqp/ut/kqp_acl_ut.cpp b/ydb/core/kqp/ut/scheme/kqp_acl_ut.cpp
index 1ea3da6bfe1..1ea3da6bfe1 100644
--- a/ydb/core/kqp/ut/kqp_acl_ut.cpp
+++ b/ydb/core/kqp/ut/scheme/kqp_acl_ut.cpp
diff --git a/ydb/core/kqp/ut/kqp_scheme_ut.cpp b/ydb/core/kqp/ut/scheme/kqp_scheme_ut.cpp
index 7e1d58f3693..7e1d58f3693 100644
--- a/ydb/core/kqp/ut/kqp_scheme_ut.cpp
+++ b/ydb/core/kqp/ut/scheme/kqp_scheme_ut.cpp
diff --git a/ydb/core/kqp/ut/service/CMakeLists.darwin.txt b/ydb/core/kqp/ut/service/CMakeLists.darwin.txt
new file mode 100644
index 00000000000..2072a651c42
--- /dev/null
+++ b/ydb/core/kqp/ut/service/CMakeLists.darwin.txt
@@ -0,0 +1,50 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-service)
+target_compile_options(ydb-core-kqp-ut-service PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-service PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-service PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  cpp-threading-local_executor
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-service PRIVATE
+  -Wl,-no_deduplicate
+  -Wl,-sdk_version,10.15
+  -fPIC
+  -fPIC
+  -framework
+  CoreFoundation
+)
+target_sources(ydb-core-kqp-ut-service PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/service/kqp_document_api_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/service/kqp_service_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-service
+  COMMAND
+  ydb-core-kqp-ut-service
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-service)
diff --git a/ydb/core/kqp/ut/service/CMakeLists.linux-aarch64.txt b/ydb/core/kqp/ut/service/CMakeLists.linux-aarch64.txt
new file mode 100644
index 00000000000..3f72e0c82a2
--- /dev/null
+++ b/ydb/core/kqp/ut/service/CMakeLists.linux-aarch64.txt
@@ -0,0 +1,52 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-service)
+target_compile_options(ydb-core-kqp-ut-service PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-service PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-service PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-lfalloc
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  cpp-threading-local_executor
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-service PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-core-kqp-ut-service PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/service/kqp_document_api_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/service/kqp_service_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-service
+  COMMAND
+  ydb-core-kqp-ut-service
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-service)
diff --git a/ydb/core/kqp/ut/service/CMakeLists.linux.txt b/ydb/core/kqp/ut/service/CMakeLists.linux.txt
new file mode 100644
index 00000000000..6497831c591
--- /dev/null
+++ b/ydb/core/kqp/ut/service/CMakeLists.linux.txt
@@ -0,0 +1,54 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-service)
+target_compile_options(ydb-core-kqp-ut-service PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-service PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-service PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  cpp-threading-local_executor
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-service PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-core-kqp-ut-service PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/service/kqp_document_api_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/service/kqp_service_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-service
+  COMMAND
+  ydb-core-kqp-ut-service
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-service)
diff --git a/ydb/core/kqp/ut/service/CMakeLists.txt b/ydb/core/kqp/ut/service/CMakeLists.txt
new file mode 100644
index 00000000000..3e0811fb22e
--- /dev/null
+++ b/ydb/core/kqp/ut/service/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+# This file was gererated 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.
+
+
+if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux-aarch64.txt)
+elseif (APPLE)
+  include(CMakeLists.darwin.txt)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux.txt)
+endif()
diff --git a/ydb/core/kqp/ut/kqp_document_api_ut.cpp b/ydb/core/kqp/ut/service/kqp_document_api_ut.cpp
index b08192a1a64..b08192a1a64 100644
--- a/ydb/core/kqp/ut/kqp_document_api_ut.cpp
+++ b/ydb/core/kqp/ut/service/kqp_document_api_ut.cpp
diff --git a/ydb/core/kqp/ut/kqp_service_ut.cpp b/ydb/core/kqp/ut/service/kqp_service_ut.cpp
index 3954ae0e5a9..3954ae0e5a9 100644
--- a/ydb/core/kqp/ut/kqp_service_ut.cpp
+++ b/ydb/core/kqp/ut/service/kqp_service_ut.cpp
diff --git a/ydb/core/kqp/ut/sysview/CMakeLists.darwin.txt b/ydb/core/kqp/ut/sysview/CMakeLists.darwin.txt
new file mode 100644
index 00000000000..18fd5e07412
--- /dev/null
+++ b/ydb/core/kqp/ut/sysview/CMakeLists.darwin.txt
@@ -0,0 +1,49 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-sysview)
+target_compile_options(ydb-core-kqp-ut-sysview PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-sysview PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-sysview PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-sysview PRIVATE
+  -Wl,-no_deduplicate
+  -Wl,-sdk_version,10.15
+  -fPIC
+  -fPIC
+  -framework
+  CoreFoundation
+)
+target_sources(ydb-core-kqp-ut-sysview PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/sysview/kqp_sys_col_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/sysview/kqp_sys_view_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-sysview
+  COMMAND
+  ydb-core-kqp-ut-sysview
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-sysview)
diff --git a/ydb/core/kqp/ut/sysview/CMakeLists.linux-aarch64.txt b/ydb/core/kqp/ut/sysview/CMakeLists.linux-aarch64.txt
new file mode 100644
index 00000000000..07830190854
--- /dev/null
+++ b/ydb/core/kqp/ut/sysview/CMakeLists.linux-aarch64.txt
@@ -0,0 +1,51 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-sysview)
+target_compile_options(ydb-core-kqp-ut-sysview PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-sysview PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-sysview PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-lfalloc
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-sysview PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-core-kqp-ut-sysview PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/sysview/kqp_sys_col_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/sysview/kqp_sys_view_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-sysview
+  COMMAND
+  ydb-core-kqp-ut-sysview
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-sysview)
diff --git a/ydb/core/kqp/ut/sysview/CMakeLists.linux.txt b/ydb/core/kqp/ut/sysview/CMakeLists.linux.txt
new file mode 100644
index 00000000000..ae95700d62c
--- /dev/null
+++ b/ydb/core/kqp/ut/sysview/CMakeLists.linux.txt
@@ -0,0 +1,53 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-sysview)
+target_compile_options(ydb-core-kqp-ut-sysview PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-sysview PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-sysview PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-sysview PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-core-kqp-ut-sysview PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/sysview/kqp_sys_col_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/sysview/kqp_sys_view_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-sysview
+  COMMAND
+  ydb-core-kqp-ut-sysview
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-sysview)
diff --git a/ydb/core/kqp/ut/sysview/CMakeLists.txt b/ydb/core/kqp/ut/sysview/CMakeLists.txt
new file mode 100644
index 00000000000..3e0811fb22e
--- /dev/null
+++ b/ydb/core/kqp/ut/sysview/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+# This file was gererated 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.
+
+
+if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux-aarch64.txt)
+elseif (APPLE)
+  include(CMakeLists.darwin.txt)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux.txt)
+endif()
diff --git a/ydb/core/kqp/ut/kqp_sys_col_ut.cpp b/ydb/core/kqp/ut/sysview/kqp_sys_col_ut.cpp
index e7cc5b496f8..e7cc5b496f8 100644
--- a/ydb/core/kqp/ut/kqp_sys_col_ut.cpp
+++ b/ydb/core/kqp/ut/sysview/kqp_sys_col_ut.cpp
diff --git a/ydb/core/kqp/ut/kqp_sys_view_ut.cpp b/ydb/core/kqp/ut/sysview/kqp_sys_view_ut.cpp
index 17d421c0608..17d421c0608 100644
--- a/ydb/core/kqp/ut/kqp_sys_view_ut.cpp
+++ b/ydb/core/kqp/ut/sysview/kqp_sys_view_ut.cpp
diff --git a/ydb/core/kqp/ut/tx/CMakeLists.darwin.txt b/ydb/core/kqp/ut/tx/CMakeLists.darwin.txt
new file mode 100644
index 00000000000..cc70c540d6c
--- /dev/null
+++ b/ydb/core/kqp/ut/tx/CMakeLists.darwin.txt
@@ -0,0 +1,50 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-tx)
+target_compile_options(ydb-core-kqp-ut-tx PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-tx PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-tx PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-tx PRIVATE
+  -Wl,-no_deduplicate
+  -Wl,-sdk_version,10.15
+  -fPIC
+  -fPIC
+  -framework
+  CoreFoundation
+)
+target_sources(ydb-core-kqp-ut-tx PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/tx/kqp_locks_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/tx/kqp_mvcc_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/tx/kqp_tx_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-tx
+  COMMAND
+  ydb-core-kqp-ut-tx
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-tx)
diff --git a/ydb/core/kqp/ut/tx/CMakeLists.linux-aarch64.txt b/ydb/core/kqp/ut/tx/CMakeLists.linux-aarch64.txt
new file mode 100644
index 00000000000..7d2887bdf5b
--- /dev/null
+++ b/ydb/core/kqp/ut/tx/CMakeLists.linux-aarch64.txt
@@ -0,0 +1,52 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-tx)
+target_compile_options(ydb-core-kqp-ut-tx PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-tx PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-tx PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-lfalloc
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-tx PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-core-kqp-ut-tx PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/tx/kqp_locks_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/tx/kqp_mvcc_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/tx/kqp_tx_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-tx
+  COMMAND
+  ydb-core-kqp-ut-tx
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-tx)
diff --git a/ydb/core/kqp/ut/tx/CMakeLists.linux.txt b/ydb/core/kqp/ut/tx/CMakeLists.linux.txt
new file mode 100644
index 00000000000..7cf07687a9b
--- /dev/null
+++ b/ydb/core/kqp/ut/tx/CMakeLists.linux.txt
@@ -0,0 +1,54 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-tx)
+target_compile_options(ydb-core-kqp-ut-tx PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-tx PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-tx PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-tx PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-core-kqp-ut-tx PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/tx/kqp_locks_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/tx/kqp_mvcc_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/tx/kqp_tx_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-tx
+  COMMAND
+  ydb-core-kqp-ut-tx
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-tx)
diff --git a/ydb/core/kqp/ut/tx/CMakeLists.txt b/ydb/core/kqp/ut/tx/CMakeLists.txt
new file mode 100644
index 00000000000..3e0811fb22e
--- /dev/null
+++ b/ydb/core/kqp/ut/tx/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+# This file was gererated 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.
+
+
+if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux-aarch64.txt)
+elseif (APPLE)
+  include(CMakeLists.darwin.txt)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux.txt)
+endif()
diff --git a/ydb/core/kqp/ut/kqp_locks_ut.cpp b/ydb/core/kqp/ut/tx/kqp_locks_ut.cpp
index b4b22cdbfb4..bd98361d73e 100644
--- a/ydb/core/kqp/ut/kqp_locks_ut.cpp
+++ b/ydb/core/kqp/ut/tx/kqp_locks_ut.cpp
@@ -191,10 +191,15 @@ Y_UNIT_TEST_SUITE(KqpLocks) {
         )"), TTxControl::Tx(*tx1).CommitTx()).ExtractValueSync();
         UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::ABORTED, result.GetIssues().ToString());
         result.GetIssues().PrintTo(Cerr);
+        UNIT_ASSERT(HasIssue(result.GetIssues(), NYql::TIssuesIds::KIKIMR_LOCKS_INVALIDATED));
+
+        // TODO: Should contain table name.
+        /*
         UNIT_ASSERT(HasIssue(result.GetIssues(), NYql::TIssuesIds::KIKIMR_LOCKS_INVALIDATED,
             [] (const NYql::TIssue& issue) {
                 return issue.GetMessage().Contains("/Root/Test");
             }));
+        */
 
         result = session1.ExecuteDataQuery(Q1_(R"(
             SELECT * FROM Test WHERE Group = 11;
diff --git a/ydb/core/kqp/ut/kqp_mvcc_ut.cpp b/ydb/core/kqp/ut/tx/kqp_mvcc_ut.cpp
index 365d1ac69f7..365d1ac69f7 100644
--- a/ydb/core/kqp/ut/kqp_mvcc_ut.cpp
+++ b/ydb/core/kqp/ut/tx/kqp_mvcc_ut.cpp
diff --git a/ydb/core/kqp/ut/kqp_tx_ut.cpp b/ydb/core/kqp/ut/tx/kqp_tx_ut.cpp
index 44dcd900849..44dcd900849 100644
--- a/ydb/core/kqp/ut/kqp_tx_ut.cpp
+++ b/ydb/core/kqp/ut/tx/kqp_tx_ut.cpp
diff --git a/ydb/core/kqp/ut/yql/CMakeLists.darwin.txt b/ydb/core/kqp/ut/yql/CMakeLists.darwin.txt
new file mode 100644
index 00000000000..e523d7c3f4c
--- /dev/null
+++ b/ydb/core/kqp/ut/yql/CMakeLists.darwin.txt
@@ -0,0 +1,50 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-yql)
+target_compile_options(ydb-core-kqp-ut-yql PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-yql PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-yql PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-yql PRIVATE
+  -Wl,-no_deduplicate
+  -Wl,-sdk_version,10.15
+  -fPIC
+  -fPIC
+  -framework
+  CoreFoundation
+)
+target_sources(ydb-core-kqp-ut-yql PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/yql/kqp_pragma_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/yql/kqp_scripting_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/yql/kqp_yql_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-yql
+  COMMAND
+  ydb-core-kqp-ut-yql
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-yql)
diff --git a/ydb/core/kqp/ut/yql/CMakeLists.linux-aarch64.txt b/ydb/core/kqp/ut/yql/CMakeLists.linux-aarch64.txt
new file mode 100644
index 00000000000..ce2464912e1
--- /dev/null
+++ b/ydb/core/kqp/ut/yql/CMakeLists.linux-aarch64.txt
@@ -0,0 +1,52 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-yql)
+target_compile_options(ydb-core-kqp-ut-yql PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-yql PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-yql PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-lfalloc
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-yql PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-core-kqp-ut-yql PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/yql/kqp_pragma_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/yql/kqp_scripting_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/yql/kqp_yql_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-yql
+  COMMAND
+  ydb-core-kqp-ut-yql
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-yql)
diff --git a/ydb/core/kqp/ut/yql/CMakeLists.linux.txt b/ydb/core/kqp/ut/yql/CMakeLists.linux.txt
new file mode 100644
index 00000000000..9a25aa814f8
--- /dev/null
+++ b/ydb/core/kqp/ut/yql/CMakeLists.linux.txt
@@ -0,0 +1,54 @@
+
+# This file was gererated 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_executable(ydb-core-kqp-ut-yql)
+target_compile_options(ydb-core-kqp-ut-yql PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(ydb-core-kqp-ut-yql PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp
+)
+target_link_libraries(ydb-core-kqp-ut-yql PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  ydb-core-kqp
+  kqp-ut-common
+  yql-sql-pg_dummy
+)
+target_link_options(ydb-core-kqp-ut-yql PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(ydb-core-kqp-ut-yql PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/yql/kqp_pragma_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/yql/kqp_scripting_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/yql/kqp_yql_ut.cpp
+)
+add_test(
+  NAME
+  ydb-core-kqp-ut-yql
+  COMMAND
+  ydb-core-kqp-ut-yql
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+vcs_info(ydb-core-kqp-ut-yql)
diff --git a/ydb/core/kqp/ut/yql/CMakeLists.txt b/ydb/core/kqp/ut/yql/CMakeLists.txt
new file mode 100644
index 00000000000..3e0811fb22e
--- /dev/null
+++ b/ydb/core/kqp/ut/yql/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+# This file was gererated 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.
+
+
+if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux-aarch64.txt)
+elseif (APPLE)
+  include(CMakeLists.darwin.txt)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux.txt)
+endif()
diff --git a/ydb/core/kqp/ut/kqp_pragma_ut.cpp b/ydb/core/kqp/ut/yql/kqp_pragma_ut.cpp
index 8cd9b54a685..8cd9b54a685 100644
--- a/ydb/core/kqp/ut/kqp_pragma_ut.cpp
+++ b/ydb/core/kqp/ut/yql/kqp_pragma_ut.cpp
diff --git a/ydb/core/kqp/ut/kqp_scripting_ut.cpp b/ydb/core/kqp/ut/yql/kqp_scripting_ut.cpp
index 5de0a136067..5de0a136067 100644
--- a/ydb/core/kqp/ut/kqp_scripting_ut.cpp
+++ b/ydb/core/kqp/ut/yql/kqp_scripting_ut.cpp
diff --git a/ydb/core/kqp/ut/kqp_yql_ut.cpp b/ydb/core/kqp/ut/yql/kqp_yql_ut.cpp
index 8264f24fecf..8264f24fecf 100644
--- a/ydb/core/kqp/ut/kqp_yql_ut.cpp
+++ b/ydb/core/kqp/ut/yql/kqp_yql_ut.cpp