Move rpc actors for query service to separate folder. ()

6 files changed, 5 insertions, 6 deletions

diff --git a/ydb/core/grpc_services/CMakeLists.darwin.txt b/ydb/core/grpc_services/CMakeLists.darwin.txt
index 5ce37acb125..391d5a54456 100644
--- a/ydb/core/grpc_services/CMakeLists.darwin.txt
+++ b/ydb/core/grpc_services/CMakeLists.darwin.txt
@@ -87,7 +87,6 @@ target_sources(ydb-core-grpc_services PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/rpc_drop_table.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/rpc_discovery.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/rpc_execute_data_query.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/rpc_execute_query.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/rpc_execute_scheme_query.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/rpc_execute_yql_script.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/rpc_explain_yql_script.cpp
@@ -124,4 +123,5 @@ target_sources(ydb-core-grpc_services PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/rpc_whoami.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/rpc_yq.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/table_settings.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/query/rpc_execute_query.cpp
 )
diff --git a/ydb/core/grpc_services/CMakeLists.linux-aarch64.txt b/ydb/core/grpc_services/CMakeLists.linux-aarch64.txt
index c5bdf1447ce..4dae7188414 100644
--- a/ydb/core/grpc_services/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/grpc_services/CMakeLists.linux-aarch64.txt
@@ -88,7 +88,6 @@ target_sources(ydb-core-grpc_services PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/rpc_drop_table.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/rpc_discovery.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/rpc_execute_data_query.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/rpc_execute_query.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/rpc_execute_scheme_query.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/rpc_execute_yql_script.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/rpc_explain_yql_script.cpp
@@ -125,4 +124,5 @@ target_sources(ydb-core-grpc_services PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/rpc_whoami.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/rpc_yq.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/table_settings.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/query/rpc_execute_query.cpp
 )
diff --git a/ydb/core/grpc_services/CMakeLists.linux.txt b/ydb/core/grpc_services/CMakeLists.linux.txt
index c5bdf1447ce..4dae7188414 100644
--- a/ydb/core/grpc_services/CMakeLists.linux.txt
+++ b/ydb/core/grpc_services/CMakeLists.linux.txt
@@ -88,7 +88,6 @@ target_sources(ydb-core-grpc_services PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/rpc_drop_table.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/rpc_discovery.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/rpc_execute_data_query.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/rpc_execute_query.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/rpc_execute_scheme_query.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/rpc_execute_yql_script.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/rpc_explain_yql_script.cpp
@@ -125,4 +124,5 @@ target_sources(ydb-core-grpc_services PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/rpc_whoami.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/rpc_yq.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/table_settings.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/query/rpc_execute_query.cpp
 )
diff --git a/ydb/core/grpc_services/rpc_execute_query.cpp b/ydb/core/grpc_services/query/rpc_execute_query.cpp
index cf57107c118..c432aa49d7c 100644
--- a/ydb/core/grpc_services/rpc_execute_query.cpp
+++ b/ydb/core/grpc_services/query/rpc_execute_query.cpp
@@ -1,11 +1,10 @@
 #include "service_query.h"
 
-#include "rpc_kqp_base.h"
-
 #include <ydb/core/actorlib_impl/long_timer.h>
 #include <ydb/core/base/appdata.h>
 #include <ydb/core/base/kikimr_issue.h>
 #include <ydb/core/grpc_services/base/base.h>
+#include <ydb/core/grpc_services/rpc_kqp_base.h>
 #include <ydb/core/kqp/executer_actor/kqp_executer.h>
 #include <ydb/public/api/protos/draft/ydb_query.pb.h>
 
diff --git a/ydb/core/grpc_services/service_query.h b/ydb/core/grpc_services/query/service_query.h
index fb6740648f4..fb6740648f4 100644
--- a/ydb/core/grpc_services/service_query.h
+++ b/ydb/core/grpc_services/query/service_query.h
diff --git a/ydb/services/ydb/ydb_query.cpp b/ydb/services/ydb/ydb_query.cpp
index 97de31837c1..a6adc21b148 100644
--- a/ydb/services/ydb/ydb_query.cpp
+++ b/ydb/services/ydb/ydb_query.cpp
@@ -3,7 +3,7 @@
 #include <ydb/core/grpc_services/base/base.h>
 #include <ydb/core/grpc_services/counters/counters.h>
 #include <ydb/core/grpc_services/grpc_helper.h>
-#include <ydb/core/grpc_services/service_query.h>
+#include <ydb/core/grpc_services/query/service_query.h>
 
 namespace NKikimr::NGRpcService {