Minor renames. ()

28 files changed, 48 insertions, 31 deletions

diff --git a/ydb/core/grpc_services/rpc_read_columns.cpp b/ydb/core/grpc_services/rpc_read_columns.cpp
index bbff1078e6b..892fe134244 100644
--- a/ydb/core/grpc_services/rpc_read_columns.cpp
+++ b/ydb/core/grpc_services/rpc_read_columns.cpp
@@ -9,7 +9,7 @@
 #include <ydb/core/base/kikimr_issue.h>
 #include <ydb/core/base/tablet_pipecache.h>
 #include <ydb/core/actorlib_impl/long_timer.h>
-#include <ydb/core/kqp/kqp_compute.h>
+#include <ydb/core/kqp/compute_actor/kqp_compute_events.h>
 #include <ydb/core/sys_view/scan.h>
 #include <ydb/core/formats/factory.h>
 #include <ydb/core/tablet_flat/tablet_flat_executed.h>
diff --git a/ydb/core/kqp/CMakeLists.txt b/ydb/core/kqp/CMakeLists.txt
index 915f85e3d4a..6102a5fe4c3 100644
--- a/ydb/core/kqp/CMakeLists.txt
+++ b/ydb/core/kqp/CMakeLists.txt
@@ -22,13 +22,11 @@ add_subdirectory(query_compiler)
 add_subdirectory(rm_service)
 add_subdirectory(runtime)
 add_subdirectory(session_actor)
+add_subdirectory(topics)
 add_subdirectory(ut)
 
-add_library(ydb-core-kqp)
-target_compile_options(ydb-core-kqp PRIVATE
-  -DUSE_CURRENT_UDF_ABI_VERSION
-)
-target_link_libraries(ydb-core-kqp PUBLIC
+add_library(ydb-core-kqp INTERFACE)
+target_link_libraries(ydb-core-kqp INTERFACE
   contrib-libs-cxxsupp
   yutil
   libs-apache-arrow
@@ -73,10 +71,6 @@ target_link_libraries(ydb-core-kqp PUBLIC
   public-lib-operation_id
   library-cpp-resource
 )
-target_sources(ydb-core-kqp PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/kqp_compute.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/kqp_shutdown_controller.cpp
-)
 
 add_global_library_for(ydb-core-kqp.global ydb-core-kqp)
 target_compile_options(ydb-core-kqp.global PRIVATE
diff --git a/ydb/core/kqp/common/CMakeLists.txt b/ydb/core/kqp/common/CMakeLists.txt
index f244a53baf5..980d4ba9385 100644
--- a/ydb/core/kqp/common/CMakeLists.txt
+++ b/ydb/core/kqp/common/CMakeLists.txt
@@ -28,14 +28,13 @@ target_link_libraries(core-kqp-common PUBLIC
   tools-enum_parser-enum_serialization_runtime
 )
 target_sources(core-kqp-common PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/common/kqp_common.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/common/kqp_resolve.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/common/kqp_ru_calc.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/common/kqp_yql.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/common/kqp_timeouts.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/common/kqp_lwtrace_probes.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/common/kqp_topic.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/common/kqp_types.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/common/kqp.cpp
 )
 generate_enum_serilization(core-kqp-common
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/common/kqp_tx_info.h
diff --git a/ydb/core/kqp/kqp_shutdown_controller.cpp b/ydb/core/kqp/common/kqp.cpp
index 0f0a414a260..040bc5f9f40 100644
--- a/ydb/core/kqp/kqp_shutdown_controller.cpp
+++ b/ydb/core/kqp/common/kqp.cpp
@@ -1,4 +1,4 @@
-#include <ydb/core/kqp/common/kqp.h>
+#include "kqp.h"
 
 #include <library/cpp/actors/core/actorsystem.h>
 
diff --git a/ydb/core/kqp/common/kqp.h b/ydb/core/kqp/common/kqp.h
index d12541f10d0..ad993bd4c78 100644
--- a/ydb/core/kqp/common/kqp.h
+++ b/ydb/core/kqp/common/kqp.h
@@ -1,7 +1,8 @@
 #pragma once
 
+#include "kqp_event_ids.h"
+
 #include <library/cpp/lwtrace/shuttle.h>
-#include <ydb/core/kqp/common/kqp_common.h>
 #include <ydb/core/kqp/counters/kqp_counters.h>
 #include <ydb/public/api/protos/ydb_status_codes.pb.h>
 
diff --git a/ydb/core/kqp/common/kqp_common.cpp b/ydb/core/kqp/common/kqp_common.cpp
deleted file mode 100644
index da61b23c660..00000000000
--- a/ydb/core/kqp/common/kqp_common.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "kqp_common.h"
diff --git a/ydb/core/kqp/common/kqp_common.h b/ydb/core/kqp/common/kqp_event_ids.h
index 76bf41bffe3..76bf41bffe3 100644
--- a/ydb/core/kqp/common/kqp_common.h
+++ b/ydb/core/kqp/common/kqp_event_ids.h
diff --git a/ydb/core/kqp/compute_actor/CMakeLists.txt b/ydb/core/kqp/compute_actor/CMakeLists.txt
index 1a2c969e6db..e0e75bb3495 100644
--- a/ydb/core/kqp/compute_actor/CMakeLists.txt
+++ b/ydb/core/kqp/compute_actor/CMakeLists.txt
@@ -26,6 +26,7 @@ target_link_libraries(core-kqp-compute_actor PUBLIC
 target_sources(core-kqp-compute_actor PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/compute_actor/kqp_compute_actor.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/compute_actor/kqp_compute_actor_helpers.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/compute_actor/kqp_compute_events.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/compute_actor/kqp_compute_state.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/compute_actor/kqp_pure_compute_actor.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/compute_actor/kqp_scan_compute_stat.cpp
diff --git a/ydb/core/kqp/compute_actor/kqp_compute_actor.h b/ydb/core/kqp/compute_actor/kqp_compute_actor.h
index 8030b56d4e3..dc68e2ab934 100644
--- a/ydb/core/kqp/compute_actor/kqp_compute_actor.h
+++ b/ydb/core/kqp/compute_actor/kqp_compute_actor.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <ydb/core/kqp/counters/kqp_counters.h>
-#include <ydb/core/kqp/kqp_compute.h>
+#include <ydb/core/kqp/compute_actor/kqp_compute_events.h>
 #include <ydb/library/yql/dq/actors/compute/dq_compute_actor.h>
 #include <ydb/library/yql/dq/actors/compute/dq_compute_actor_async_io_factory.h>
 #include <ydb/core/scheme/scheme_tabledefs.h>
diff --git a/ydb/core/kqp/kqp_compute.cpp b/ydb/core/kqp/compute_actor/kqp_compute_events.cpp
index 88a2063e96e..7491bc7935c 100644
--- a/ydb/core/kqp/kqp_compute.cpp
+++ b/ydb/core/kqp/compute_actor/kqp_compute_events.cpp
@@ -1,4 +1,4 @@
-#include "kqp_compute.h"
+#include "kqp_compute_events.h"
 
 namespace NKikimr::NKqp {
 
diff --git a/ydb/core/kqp/kqp_compute.h b/ydb/core/kqp/compute_actor/kqp_compute_events.h
index ace19f0b436..ace19f0b436 100644
--- a/ydb/core/kqp/kqp_compute.h
+++ b/ydb/core/kqp/compute_actor/kqp_compute_events.h
diff --git a/ydb/core/kqp/compute_actor/kqp_compute_state.h b/ydb/core/kqp/compute_actor/kqp_compute_state.h
index 9fb389f53fa..305c37f874c 100644
--- a/ydb/core/kqp/compute_actor/kqp_compute_state.h
+++ b/ydb/core/kqp/compute_actor/kqp_compute_state.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ydb/core/kqp/counters/kqp_counters.h>
-#include <ydb/core/kqp/kqp_compute.h>
+#include <ydb/core/kqp/compute_actor/kqp_compute_events.h>
 #include <ydb/library/yql/dq/actors/compute/dq_compute_actor.h>
 #include <ydb/core/scheme/scheme_tabledefs.h>
 
diff --git a/ydb/core/kqp/executer_actor/CMakeLists.txt b/ydb/core/kqp/executer_actor/CMakeLists.txt
index 7232bca8980..f621755b9ed 100644
--- a/ydb/core/kqp/executer_actor/CMakeLists.txt
+++ b/ydb/core/kqp/executer_actor/CMakeLists.txt
@@ -23,6 +23,7 @@ target_link_libraries(core-kqp-executer_actor PUBLIC
   core-kqp-common
   core-kqp-query_compiler
   core-kqp-rm_service
+  core-kqp-topics
   ydb-core-protos
   tx-long_tx_service-public
   ydb-core-ydb_convert
diff --git a/ydb/core/kqp/executer_actor/kqp_executer.h b/ydb/core/kqp/executer_actor/kqp_executer.h
index fb07d5cbae8..065d980b952 100644
--- a/ydb/core/kqp/executer_actor/kqp_executer.h
+++ b/ydb/core/kqp/executer_actor/kqp_executer.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <library/cpp/lwtrace/shuttle.h>
-#include <ydb/core/kqp/common/kqp_common.h>
+#include <ydb/core/kqp/common/kqp_event_ids.h>
 #include <ydb/core/kqp/gateway/kqp_gateway.h>
 #include <ydb/core/kqp/counters/kqp_counters.h>
 #include <ydb/core/tx/long_tx_service/public/lock_handle.h>
diff --git a/ydb/core/kqp/gateway/kqp_gateway.h b/ydb/core/kqp/gateway/kqp_gateway.h
index c7ca73b8772..a196860f772 100644
--- a/ydb/core/kqp/gateway/kqp_gateway.h
+++ b/ydb/core/kqp/gateway/kqp_gateway.h
@@ -5,7 +5,7 @@
 
 #include <ydb/library/yql/ast/yql_expr.h>
 #include <ydb/library/yql/dq/common/dq_value.h>
-#include <ydb/core/kqp/common/kqp_topic.h>
+#include <ydb/core/kqp/topics/kqp_topics.h>
 #include <ydb/core/kqp/counters/kqp_counters.h>
 #include <ydb/core/kqp/provider/yql_kikimr_gateway.h>
 #include <ydb/core/kqp/provider/yql_kikimr_settings.h>
diff --git a/ydb/core/kqp/host/kqp_transform.h b/ydb/core/kqp/host/kqp_transform.h
index f1080309449..084a2b76bb3 100644
--- a/ydb/core/kqp/host/kqp_transform.h
+++ b/ydb/core/kqp/host/kqp_transform.h
@@ -4,7 +4,7 @@
 
 #include <ydb/core/kqp/gateway/kqp_gateway.h>
 #include <ydb/core/kqp/common/kqp_tx_info.h>
-#include <ydb/core/kqp/common/kqp_topic.h>
+#include <ydb/core/kqp/topics/kqp_topics.h>
 
 #include <ydb/core/kqp/provider/yql_kikimr_expr_nodes.h>
 #include <ydb/core/kqp/provider/yql_kikimr_provider.h>
diff --git a/ydb/core/kqp/node_service/kqp_node_service.h b/ydb/core/kqp/node_service/kqp_node_service.h
index 0c75086fdfd..f9f4c7f1562 100644
--- a/ydb/core/kqp/node_service/kqp_node_service.h
+++ b/ydb/core/kqp/node_service/kqp_node_service.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ydb/core/kqp/common/kqp_common.h>
+#include <ydb/core/kqp/common/kqp_event_ids.h>
 #include <ydb/core/kqp/counters/kqp_counters.h>
 #include <ydb/core/protos/config.pb.h>
 
diff --git a/ydb/core/kqp/rm_service/kqp_snapshot_manager.h b/ydb/core/kqp/rm_service/kqp_snapshot_manager.h
index 7844a3fa6c0..3c63d9dce0a 100644
--- a/ydb/core/kqp/rm_service/kqp_snapshot_manager.h
+++ b/ydb/core/kqp/rm_service/kqp_snapshot_manager.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ydb/core/kqp/common/kqp_common.h>
+#include <ydb/core/kqp/common/kqp_event_ids.h>
 #include <ydb/core/kqp/gateway/kqp_gateway.h>
 
 #include <library/cpp/actors/core/actor.h>
diff --git a/ydb/core/kqp/runtime/kqp_spilling.h b/ydb/core/kqp/runtime/kqp_spilling.h
index d0290dfd15c..d489fc47186 100644
--- a/ydb/core/kqp/runtime/kqp_spilling.h
+++ b/ydb/core/kqp/runtime/kqp_spilling.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ydb/core/kqp/common/kqp_common.h>
+#include <ydb/core/kqp/common/kqp_event_ids.h>
 #include <ydb/core/protos/config.pb.h>
 
 #include <util/generic/buffer.h>
diff --git a/ydb/core/kqp/topics/CMakeLists.txt b/ydb/core/kqp/topics/CMakeLists.txt
new file mode 100644
index 00000000000..2133b6b0e39
--- /dev/null
+++ b/ydb/core/kqp/topics/CMakeLists.txt
@@ -0,0 +1,21 @@
+
+# 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_library(core-kqp-topics)
+target_compile_options(core-kqp-topics PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_link_libraries(core-kqp-topics PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  ydb-core-base
+)
+target_sources(core-kqp-topics PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/topics/kqp_topics.cpp
+)
diff --git a/ydb/core/kqp/common/kqp_topic.cpp b/ydb/core/kqp/topics/kqp_topics.cpp
index e1fc6b54877..6f9aba3419b 100644
--- a/ydb/core/kqp/common/kqp_topic.cpp
+++ b/ydb/core/kqp/topics/kqp_topics.cpp
@@ -1,4 +1,5 @@
-#include "kqp_topic.h"
+#include "kqp_topics.h"
+
 #include <ydb/core/base/path.h>
 
 #define LOG_D(msg) LOG_DEBUG_S(*TlsActivationContext, NKikimrServices::KQP_SESSION, msg)
diff --git a/ydb/core/kqp/common/kqp_topic.h b/ydb/core/kqp/topics/kqp_topics.h
index 70219893655..70219893655 100644
--- a/ydb/core/kqp/common/kqp_topic.h
+++ b/ydb/core/kqp/topics/kqp_topics.h
diff --git a/ydb/core/sys_view/common/scan_actor_base_impl.h b/ydb/core/sys_view/common/scan_actor_base_impl.h
index dd03c17dfa7..d5451b7764c 100644
--- a/ydb/core/sys_view/common/scan_actor_base_impl.h
+++ b/ydb/core/sys_view/common/scan_actor_base_impl.h
@@ -2,7 +2,7 @@
 
 #include "utils.h"
 
-#include <ydb/core/kqp/kqp_compute.h>
+#include <ydb/core/kqp/compute_actor/kqp_compute_events.h>
 #include <ydb/core/tx/scheme_cache/scheme_cache.h>
 #include <ydb/core/mind/tenant_node_enumeration.h>
 #include <ydb/core/sys_view/service/sysview_service.h>
diff --git a/ydb/core/sys_view/scan.cpp b/ydb/core/sys_view/scan.cpp
index c1140713786..7eb0e05dd97 100644
--- a/ydb/core/sys_view/scan.cpp
+++ b/ydb/core/sys_view/scan.cpp
@@ -1,6 +1,6 @@
 #include "scan.h"
 
-#include <ydb/core/kqp/kqp_compute.h>
+#include <ydb/core/kqp/compute_actor/kqp_compute_events.h>
 
 #include <ydb/core/sys_view/common/schema.h>
 #include <ydb/core/sys_view/partition_stats/partition_stats.h>
diff --git a/ydb/core/tx/columnshard/columnshard__scan.cpp b/ydb/core/tx/columnshard/columnshard__scan.cpp
index c6c17d0f19f..60f6915758d 100644
--- a/ydb/core/tx/columnshard/columnshard__scan.cpp
+++ b/ydb/core/tx/columnshard/columnshard__scan.cpp
@@ -7,7 +7,7 @@
 #include <ydb/core/tx/columnshard/columnshard_private_events.h>
 #include <ydb/core/tablet_flat/flat_row_celled.h>
 #include <ydb/library/yql/dq/actors/compute/dq_compute_actor.h>
-#include <ydb/core/kqp/kqp_compute.h>
+#include <ydb/core/kqp/compute_actor/kqp_compute_events.h>
 #include <ydb/core/actorlib_impl/long_timer.h>
 #include <ydb/library/yql/core/issue/yql_issue.h>
 #include <ydb/library/yql/public/issue/yql_issue_message.h>
diff --git a/ydb/core/tx/columnshard/ut_columnshard_read_write.cpp b/ydb/core/tx/columnshard/ut_columnshard_read_write.cpp
index 252457c1256..573b1003855 100644
--- a/ydb/core/tx/columnshard/ut_columnshard_read_write.cpp
+++ b/ydb/core/tx/columnshard/ut_columnshard_read_write.cpp
@@ -1,5 +1,5 @@
 #include "columnshard_ut_common.h"
-#include <ydb/core/kqp/kqp_compute.h>
+#include <ydb/core/kqp/compute_actor/kqp_compute_events.h>
 #include <ydb/core/base/blobstorage.h>
 #include <util/string/printf.h>
 #include <arrow/api.h>
diff --git a/ydb/core/tx/datashard/datashard__kqp_scan.cpp b/ydb/core/tx/datashard/datashard__kqp_scan.cpp
index 95f172421c3..a691ba1182f 100644
--- a/ydb/core/tx/datashard/datashard__kqp_scan.cpp
+++ b/ydb/core/tx/datashard/datashard__kqp_scan.cpp
@@ -4,7 +4,7 @@
 
 #include <ydb/core/actorlib_impl/long_timer.h>
 #include <ydb/core/formats/arrow_batch_builder.h>
-#include <ydb/core/kqp/kqp_compute.h>
+#include <ydb/core/kqp/compute_actor/kqp_compute_events.h>
 #include <ydb/core/tablet_flat/flat_row_celled.h>
 
 #include <ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h>
diff --git a/ydb/core/tx/datashard/datashard_ut_common.h b/ydb/core/tx/datashard/datashard_ut_common.h
index 759ec70a8a7..afe091b7cd9 100644
--- a/ydb/core/tx/datashard/datashard_ut_common.h
+++ b/ydb/core/tx/datashard/datashard_ut_common.h
@@ -4,7 +4,7 @@
 #include "datashard_impl.h"
 
 #include <ydb/core/engine/mkql_engine_flat.h>
-#include <ydb/core/kqp/kqp_compute.h>
+#include <ydb/core/kqp/compute_actor/kqp_compute_events.h>
 #include <ydb/core/protos/ydb_result_set_old.pb.h>
 #include <ydb/core/testlib/minikql_compile.h>
 #include <ydb/core/testlib/tablet_helpers.h>