DQ-8 no KQP in common code

ref:944cdf749c23a8764fffe744752d432a78e4509d

9 files changed, 91 insertions, 89 deletions

diff --git a/CMakeLists.darwin.txt b/CMakeLists.darwin.txt
index db48450b479..c37321ca8ee 100644
--- a/CMakeLists.darwin.txt
+++ b/CMakeLists.darwin.txt
@@ -645,49 +645,13 @@ add_subdirectory(ydb/library/yql/providers/common/token_accessor/client)
 add_subdirectory(ydb/library/yql/providers/common/structured_token)
 add_subdirectory(ydb/library/yql/providers/common/token_accessor/grpc)
 add_subdirectory(ydb/library/yql/providers/solomon/proto)
+add_subdirectory(ydb/library/yql/utils/actor_log)
 add_subdirectory(ydb/library/yql/utils/failure_injector)
 add_subdirectory(ydb/library/yql/providers/dq/counters)
 add_subdirectory(ydb/library/yql/providers/dq/task_runner)
 add_subdirectory(ydb/library/yql/providers/dq/task_runner_actor)
 add_subdirectory(ydb/library/yql/dq/actors/task_runner)
 add_subdirectory(ydb/library/yql/providers/dq/worker_manager)
-add_subdirectory(ydb/core/kqp)
-add_subdirectory(ydb/core/kqp/compute_actor)
-add_subdirectory(ydb/core/tx/scheme_cache)
-add_subdirectory(ydb/core/kqp/counters)
-add_subdirectory(ydb/core/kqp/executer)
-add_subdirectory(ydb/core/kqp/compile)
-add_subdirectory(ydb/core/kqp/rm)
-add_subdirectory(ydb/core/cms/console)
-add_subdirectory(library/cpp/actors/http)
-add_subdirectory(library/cpp/dns)
-add_subdirectory(ydb/core/cms/console/validators)
-add_subdirectory(ydb/core/mind)
-add_subdirectory(ydb/core/blobstorage/dsproxy/mock)
-add_subdirectory(ydb/core/mind/bscontroller)
-add_subdirectory(ydb/core/sys_view/processor)
-add_subdirectory(ydb/core/test_tablet)
-add_subdirectory(ydb/core/tx/replication/controller)
-add_subdirectory(ydb/core/tx/replication/ydb_proxy)
-add_subdirectory(ydb/public/sdk/cpp/client/ydb_scheme)
-add_subdirectory(ydb/public/sdk/cpp/client/ydb_common_client/impl)
-add_subdirectory(ydb/core/tx/scheme_board)
-add_subdirectory(ydb/core/tx/schemeshard)
-add_subdirectory(ydb/core/blockstore/core)
-add_subdirectory(ydb/core/filestore/core)
-add_subdirectory(ydb/core/tx/tx_allocator_client)
-add_subdirectory(ydb/core/tx/tx_allocator)
-add_subdirectory(ydb/core/kqp/host)
-add_subdirectory(ydb/core/kqp/opt)
-add_subdirectory(ydb/core/kqp/opt/logical)
-add_subdirectory(ydb/core/kqp/opt/peephole)
-add_subdirectory(ydb/library/naming_conventions)
-add_subdirectory(ydb/core/kqp/opt/physical)
-add_subdirectory(ydb/core/kqp/opt/physical/effects)
-add_subdirectory(ydb/core/kqp/prepare)
-add_subdirectory(ydb/core/kqp/node)
-add_subdirectory(ydb/core/kqp/proxy)
-add_subdirectory(ydb/library/yql/utils/actor_log)
 add_subdirectory(ydb/library/yql/providers/dq/runtime)
 add_subdirectory(ydb/library/yql/providers/dq/worker_manager/interface)
 add_subdirectory(ydb/core/yq/libs/common)
@@ -701,6 +665,8 @@ add_subdirectory(ydb/core/yq/libs/ydb)
 add_subdirectory(library/cpp/retry)
 add_subdirectory(library/cpp/retry/protos)
 add_subdirectory(ydb/library/security)
+add_subdirectory(ydb/public/sdk/cpp/client/ydb_scheme)
+add_subdirectory(ydb/public/sdk/cpp/client/ydb_common_client/impl)
 add_subdirectory(ydb/core/yq/libs/db_schema)
 add_subdirectory(ydb/core/yq/libs/shared_resources)
 add_subdirectory(ydb/core/yq/libs/shared_resources/interface)
@@ -739,6 +705,25 @@ add_subdirectory(ydb/library/persqueue/counter_time_keeper)
 add_subdirectory(ydb/core/ymq/actor)
 add_subdirectory(library/cpp/scheme)
 add_subdirectory(ydb/core/mind/address_classification)
+add_subdirectory(ydb/core/cms/console)
+add_subdirectory(library/cpp/actors/http)
+add_subdirectory(library/cpp/dns)
+add_subdirectory(ydb/core/cms/console/validators)
+add_subdirectory(ydb/core/mind)
+add_subdirectory(ydb/core/blobstorage/dsproxy/mock)
+add_subdirectory(ydb/core/mind/bscontroller)
+add_subdirectory(ydb/core/sys_view/processor)
+add_subdirectory(ydb/core/kqp/counters)
+add_subdirectory(ydb/core/tx/scheme_cache)
+add_subdirectory(ydb/core/test_tablet)
+add_subdirectory(ydb/core/tx/replication/controller)
+add_subdirectory(ydb/core/tx/replication/ydb_proxy)
+add_subdirectory(ydb/core/tx/scheme_board)
+add_subdirectory(ydb/core/tx/schemeshard)
+add_subdirectory(ydb/core/blockstore/core)
+add_subdirectory(ydb/core/filestore/core)
+add_subdirectory(ydb/core/tx/tx_allocator_client)
+add_subdirectory(ydb/core/tx/tx_allocator)
 add_subdirectory(ydb/core/tx/tx_proxy)
 add_subdirectory(ydb/core/tx/balance_coverage)
 add_subdirectory(ydb/core/ymq/base)
@@ -750,6 +735,21 @@ add_subdirectory(ydb/core/ymq/queues/common)
 add_subdirectory(ydb/core/ymq/queues/fifo)
 add_subdirectory(ydb/core/ymq/queues/std)
 add_subdirectory(ydb/services/persqueue_v1)
+add_subdirectory(ydb/core/kqp)
+add_subdirectory(ydb/core/kqp/compute_actor)
+add_subdirectory(ydb/core/kqp/executer)
+add_subdirectory(ydb/core/kqp/compile)
+add_subdirectory(ydb/core/kqp/rm)
+add_subdirectory(ydb/core/kqp/host)
+add_subdirectory(ydb/core/kqp/opt)
+add_subdirectory(ydb/core/kqp/opt/logical)
+add_subdirectory(ydb/core/kqp/opt/peephole)
+add_subdirectory(ydb/library/naming_conventions)
+add_subdirectory(ydb/core/kqp/opt/physical)
+add_subdirectory(ydb/core/kqp/opt/physical/effects)
+add_subdirectory(ydb/core/kqp/prepare)
+add_subdirectory(ydb/core/kqp/node)
+add_subdirectory(ydb/core/kqp/proxy)
 add_subdirectory(ydb/library/persqueue/tests)
 add_subdirectory(ydb/services/lib/actors)
 add_subdirectory(ydb/public/lib/jwt)
@@ -1127,6 +1127,11 @@ add_subdirectory(ydb/core/blobstorage/vdisk/hulldb/generic/ut)
 add_subdirectory(ydb/core/sys_view/partition_stats/ut)
 add_subdirectory(ydb/core/sys_view/query_stats/ut)
 add_subdirectory(ydb/core/sys_view/service/ut)
+add_subdirectory(ydb/core/mind/address_classification/ut)
+add_subdirectory(ydb/core/mind/bscontroller/ut)
+add_subdirectory(ydb/core/mind/bscontroller/ut_bscontroller)
+add_subdirectory(ydb/core/mind/bscontroller/ut_selfheal)
+add_subdirectory(ydb/core/mind/hive/ut)
 add_subdirectory(ydb/core/kqp/ut/fat)
 add_subdirectory(ydb/core/kqp/rm/ut)
 add_subdirectory(ydb/core/kqp/proxy/ut)
@@ -1134,11 +1139,6 @@ add_subdirectory(ydb/core/kqp/runtime/ut)
 add_subdirectory(ydb/core/kqp/executer/ut)
 add_subdirectory(ydb/core/kqp/node/ut)
 add_subdirectory(ydb/core/kqp/provider/ut)
-add_subdirectory(ydb/core/mind/address_classification/ut)
-add_subdirectory(ydb/core/mind/bscontroller/ut)
-add_subdirectory(ydb/core/mind/bscontroller/ut_bscontroller)
-add_subdirectory(ydb/core/mind/bscontroller/ut_selfheal)
-add_subdirectory(ydb/core/mind/hive/ut)
 add_subdirectory(ydb/core/cms/console/ut)
 add_subdirectory(ydb/core/cms/console/validators/ut)
 add_subdirectory(ydb/core/tx/columnshard/engines/ut)
diff --git a/CMakeLists.linux.txt b/CMakeLists.linux.txt
index b74a5ddf126..c6a8efbb3e5 100644
--- a/CMakeLists.linux.txt
+++ b/CMakeLists.linux.txt
@@ -725,49 +725,13 @@ add_subdirectory(ydb/library/yql/providers/common/token_accessor/client)
 add_subdirectory(ydb/library/yql/providers/common/structured_token)
 add_subdirectory(ydb/library/yql/providers/common/token_accessor/grpc)
 add_subdirectory(ydb/library/yql/providers/solomon/proto)
+add_subdirectory(ydb/library/yql/utils/actor_log)
 add_subdirectory(ydb/library/yql/utils/failure_injector)
 add_subdirectory(ydb/library/yql/providers/dq/counters)
 add_subdirectory(ydb/library/yql/providers/dq/task_runner)
 add_subdirectory(ydb/library/yql/providers/dq/task_runner_actor)
 add_subdirectory(ydb/library/yql/dq/actors/task_runner)
 add_subdirectory(ydb/library/yql/providers/dq/worker_manager)
-add_subdirectory(ydb/core/kqp)
-add_subdirectory(ydb/core/kqp/compute_actor)
-add_subdirectory(ydb/core/tx/scheme_cache)
-add_subdirectory(ydb/core/kqp/counters)
-add_subdirectory(ydb/core/kqp/executer)
-add_subdirectory(ydb/core/kqp/compile)
-add_subdirectory(ydb/core/kqp/rm)
-add_subdirectory(ydb/core/cms/console)
-add_subdirectory(library/cpp/actors/http)
-add_subdirectory(library/cpp/dns)
-add_subdirectory(ydb/core/cms/console/validators)
-add_subdirectory(ydb/core/mind)
-add_subdirectory(ydb/core/blobstorage/dsproxy/mock)
-add_subdirectory(ydb/core/mind/bscontroller)
-add_subdirectory(ydb/core/sys_view/processor)
-add_subdirectory(ydb/core/test_tablet)
-add_subdirectory(ydb/core/tx/replication/controller)
-add_subdirectory(ydb/core/tx/replication/ydb_proxy)
-add_subdirectory(ydb/public/sdk/cpp/client/ydb_scheme)
-add_subdirectory(ydb/public/sdk/cpp/client/ydb_common_client/impl)
-add_subdirectory(ydb/core/tx/scheme_board)
-add_subdirectory(ydb/core/tx/schemeshard)
-add_subdirectory(ydb/core/blockstore/core)
-add_subdirectory(ydb/core/filestore/core)
-add_subdirectory(ydb/core/tx/tx_allocator_client)
-add_subdirectory(ydb/core/tx/tx_allocator)
-add_subdirectory(ydb/core/kqp/host)
-add_subdirectory(ydb/core/kqp/opt)
-add_subdirectory(ydb/core/kqp/opt/logical)
-add_subdirectory(ydb/core/kqp/opt/peephole)
-add_subdirectory(ydb/library/naming_conventions)
-add_subdirectory(ydb/core/kqp/opt/physical)
-add_subdirectory(ydb/core/kqp/opt/physical/effects)
-add_subdirectory(ydb/core/kqp/prepare)
-add_subdirectory(ydb/core/kqp/node)
-add_subdirectory(ydb/core/kqp/proxy)
-add_subdirectory(ydb/library/yql/utils/actor_log)
 add_subdirectory(ydb/library/yql/providers/dq/runtime)
 add_subdirectory(ydb/library/yql/providers/dq/worker_manager/interface)
 add_subdirectory(ydb/core/yq/libs/common)
@@ -781,6 +745,8 @@ add_subdirectory(ydb/core/yq/libs/ydb)
 add_subdirectory(library/cpp/retry)
 add_subdirectory(library/cpp/retry/protos)
 add_subdirectory(ydb/library/security)
+add_subdirectory(ydb/public/sdk/cpp/client/ydb_scheme)
+add_subdirectory(ydb/public/sdk/cpp/client/ydb_common_client/impl)
 add_subdirectory(ydb/core/yq/libs/db_schema)
 add_subdirectory(ydb/core/yq/libs/shared_resources)
 add_subdirectory(ydb/core/yq/libs/shared_resources/interface)
@@ -819,6 +785,25 @@ add_subdirectory(ydb/library/persqueue/counter_time_keeper)
 add_subdirectory(ydb/core/ymq/actor)
 add_subdirectory(library/cpp/scheme)
 add_subdirectory(ydb/core/mind/address_classification)
+add_subdirectory(ydb/core/cms/console)
+add_subdirectory(library/cpp/actors/http)
+add_subdirectory(library/cpp/dns)
+add_subdirectory(ydb/core/cms/console/validators)
+add_subdirectory(ydb/core/mind)
+add_subdirectory(ydb/core/blobstorage/dsproxy/mock)
+add_subdirectory(ydb/core/mind/bscontroller)
+add_subdirectory(ydb/core/sys_view/processor)
+add_subdirectory(ydb/core/kqp/counters)
+add_subdirectory(ydb/core/tx/scheme_cache)
+add_subdirectory(ydb/core/test_tablet)
+add_subdirectory(ydb/core/tx/replication/controller)
+add_subdirectory(ydb/core/tx/replication/ydb_proxy)
+add_subdirectory(ydb/core/tx/scheme_board)
+add_subdirectory(ydb/core/tx/schemeshard)
+add_subdirectory(ydb/core/blockstore/core)
+add_subdirectory(ydb/core/filestore/core)
+add_subdirectory(ydb/core/tx/tx_allocator_client)
+add_subdirectory(ydb/core/tx/tx_allocator)
 add_subdirectory(ydb/core/tx/tx_proxy)
 add_subdirectory(ydb/core/tx/balance_coverage)
 add_subdirectory(ydb/core/ymq/base)
@@ -830,6 +815,21 @@ add_subdirectory(ydb/core/ymq/queues/common)
 add_subdirectory(ydb/core/ymq/queues/fifo)
 add_subdirectory(ydb/core/ymq/queues/std)
 add_subdirectory(ydb/services/persqueue_v1)
+add_subdirectory(ydb/core/kqp)
+add_subdirectory(ydb/core/kqp/compute_actor)
+add_subdirectory(ydb/core/kqp/executer)
+add_subdirectory(ydb/core/kqp/compile)
+add_subdirectory(ydb/core/kqp/rm)
+add_subdirectory(ydb/core/kqp/host)
+add_subdirectory(ydb/core/kqp/opt)
+add_subdirectory(ydb/core/kqp/opt/logical)
+add_subdirectory(ydb/core/kqp/opt/peephole)
+add_subdirectory(ydb/library/naming_conventions)
+add_subdirectory(ydb/core/kqp/opt/physical)
+add_subdirectory(ydb/core/kqp/opt/physical/effects)
+add_subdirectory(ydb/core/kqp/prepare)
+add_subdirectory(ydb/core/kqp/node)
+add_subdirectory(ydb/core/kqp/proxy)
 add_subdirectory(ydb/library/persqueue/tests)
 add_subdirectory(ydb/services/lib/actors)
 add_subdirectory(ydb/public/lib/jwt)
@@ -1222,6 +1222,11 @@ add_subdirectory(ydb/core/blobstorage/vdisk/hulldb/generic/ut)
 add_subdirectory(ydb/core/sys_view/partition_stats/ut)
 add_subdirectory(ydb/core/sys_view/query_stats/ut)
 add_subdirectory(ydb/core/sys_view/service/ut)
+add_subdirectory(ydb/core/mind/address_classification/ut)
+add_subdirectory(ydb/core/mind/bscontroller/ut)
+add_subdirectory(ydb/core/mind/bscontroller/ut_bscontroller)
+add_subdirectory(ydb/core/mind/bscontroller/ut_selfheal)
+add_subdirectory(ydb/core/mind/hive/ut)
 add_subdirectory(ydb/core/kqp/ut/fat)
 add_subdirectory(ydb/core/kqp/rm/ut)
 add_subdirectory(ydb/core/kqp/proxy/ut)
@@ -1229,11 +1234,6 @@ add_subdirectory(ydb/core/kqp/runtime/ut)
 add_subdirectory(ydb/core/kqp/executer/ut)
 add_subdirectory(ydb/core/kqp/node/ut)
 add_subdirectory(ydb/core/kqp/provider/ut)
-add_subdirectory(ydb/core/mind/address_classification/ut)
-add_subdirectory(ydb/core/mind/bscontroller/ut)
-add_subdirectory(ydb/core/mind/bscontroller/ut_bscontroller)
-add_subdirectory(ydb/core/mind/bscontroller/ut_selfheal)
-add_subdirectory(ydb/core/mind/hive/ut)
 add_subdirectory(ydb/core/cms/console/ut)
 add_subdirectory(ydb/core/cms/console/validators/ut)
 add_subdirectory(ydb/core/tx/columnshard/engines/ut)
diff --git a/ydb/library/yql/dq/actors/compute/CMakeLists.txt b/ydb/library/yql/dq/actors/compute/CMakeLists.txt
index eb9fcc28f19..259d3ff8b04 100644
--- a/ydb/library/yql/dq/actors/compute/CMakeLists.txt
+++ b/ydb/library/yql/dq/actors/compute/CMakeLists.txt
@@ -16,8 +16,6 @@ target_link_libraries(dq-actors-compute PUBLIC
   yutil
   cpp-actors-core
   ydb-core-base
-  core-kqp-common
-  core-kqp-runtime
   ydb-core-protos
   ydb-core-scheme
   ydb-core-tablet_flat
diff --git a/ydb/library/yql/dq/actors/compute/dq_compute_actor_channels.cpp b/ydb/library/yql/dq/actors/compute/dq_compute_actor_channels.cpp
index 1a1611ec81e..920c1a7d197 100644
--- a/ydb/library/yql/dq/actors/compute/dq_compute_actor_channels.cpp
+++ b/ydb/library/yql/dq/actors/compute/dq_compute_actor_channels.cpp
@@ -1,6 +1,8 @@
 #include "dq_compute_actor_channels.h"
 
 #include <util/string/join.h>
+#include <ydb/core/protos/services.pb.h>
+#include <ydb/library/yql/dq/actors/dq.h>
 
 
 #define LOG_D(s) \
diff --git a/ydb/library/yql/dq/actors/compute/dq_compute_actor_channels.h b/ydb/library/yql/dq/actors/compute/dq_compute_actor_channels.h
index 648b1d8b563..6660b6f688e 100644
--- a/ydb/library/yql/dq/actors/compute/dq_compute_actor_channels.h
+++ b/ydb/library/yql/dq/actors/compute/dq_compute_actor_channels.h
@@ -2,10 +2,9 @@
 
 #include "dq_compute_actor.h"
 
-#include <ydb/core/kqp/kqp.h>
-
 #include <library/cpp/actors/core/actor.h>
 #include <library/cpp/actors/interconnect/interconnect.h>
+#include <ydb/core/base/events.h>
 
 
 namespace NYql::NDq {
diff --git a/ydb/library/yql/dq/actors/compute/dq_compute_actor_checkpoints.cpp b/ydb/library/yql/dq/actors/compute/dq_compute_actor_checkpoints.cpp
index 4afc81a844d..84355c8734d 100644
--- a/ydb/library/yql/dq/actors/compute/dq_compute_actor_checkpoints.cpp
+++ b/ydb/library/yql/dq/actors/compute/dq_compute_actor_checkpoints.cpp
@@ -1,6 +1,7 @@
 #include "dq_compute_actor_checkpoints.h"
 #include "dq_checkpoints.h"
 #include "dq_compute_actor_impl.h"
+#include <ydb/core/protos/services.pb.h>
 
 #include <ydb/library/yql/minikql/comp_nodes/mkql_saveload.h>
 
diff --git a/ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h b/ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h
index 03dc572ac8a..f831bda122e 100644
--- a/ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h
+++ b/ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h
@@ -10,6 +10,7 @@
 #include <ydb/core/scheme/scheme_tabledefs.h> // TODO: TTableId
 #include <ydb/core/base/kikimr_issue.h>
 #include <ydb/core/tablet_flat/util_basics.h> // TODO: IDestructable
+#include <ydb/core/protos/services.pb.h>
 
 #include <ydb/library/yql/dq/actors/protos/dq_events.pb.h>
 #include <ydb/library/yql/dq/common/dq_common.h>
@@ -17,6 +18,7 @@
 #include <ydb/library/yql/core/issue/yql_issue.h>
 #include <ydb/library/yql/minikql/comp_nodes/mkql_saveload.h>
 #include <ydb/library/yql/public/issue/yql_issue_message.h>
+#include <ydb/library/yql/dq/actors/dq.h>
 
 #include <library/cpp/actors/core/interconnect.h>
 
diff --git a/ydb/library/yql/providers/dq/actors/CMakeLists.txt b/ydb/library/yql/providers/dq/actors/CMakeLists.txt
index 549efc42597..a607fb65d89 100644
--- a/ydb/library/yql/providers/dq/actors/CMakeLists.txt
+++ b/ydb/library/yql/providers/dq/actors/CMakeLists.txt
@@ -22,6 +22,7 @@ target_link_libraries(providers-dq-actors PUBLIC
   core-services-mounts
   yql-core-user_data
   yql-utils-actors
+  yql-utils-actor_log
   yql-utils-backtrace
   yql-utils-log
   api-protos
diff --git a/ydb/library/yql/providers/dq/worker_manager/CMakeLists.txt b/ydb/library/yql/providers/dq/worker_manager/CMakeLists.txt
index b115520ba0c..f20c6f88255 100644
--- a/ydb/library/yql/providers/dq/worker_manager/CMakeLists.txt
+++ b/ydb/library/yql/providers/dq/worker_manager/CMakeLists.txt
@@ -14,7 +14,6 @@ target_compile_options(providers-dq-worker_manager PRIVATE
 target_link_libraries(providers-dq-worker_manager PUBLIC
   contrib-libs-cxxsupp
   yutil
-  ydb-core-kqp
   yql-utils-failure_injector
   providers-common-config
   providers-common-gateway