Move YQ Private API out of YDB Public API

ref:781c9faf295a9665e56e0a3e5a03e5e82e387a48

13 files changed, 49 insertions, 8 deletions

diff --git a/CMakeLists.darwin.txt b/CMakeLists.darwin.txt
index faf2b71f893..59df4cb4fff 100644
--- a/CMakeLists.darwin.txt
+++ b/CMakeLists.darwin.txt
@@ -496,6 +496,7 @@ add_subdirectory(ydb/public/lib/operation_id)
 add_subdirectory(ydb/public/lib/operation_id/protos)
 add_subdirectory(ydb/public/sdk/cpp/client/ydb_proto)
 add_subdirectory(ydb/public/api/grpc/draft)
+add_subdirectory(ydb/core/yq/libs/protos)
 add_subdirectory(ydb/core/blobstorage/vdisk)
 add_subdirectory(ydb/core/blobstorage/vdisk/anubis_osiris)
 add_subdirectory(ydb/core/blobstorage/vdisk/hulldb/barriers)
diff --git a/CMakeLists.linux.txt b/CMakeLists.linux.txt
index 01483346951..a2a907626d6 100644
--- a/CMakeLists.linux.txt
+++ b/CMakeLists.linux.txt
@@ -576,6 +576,7 @@ add_subdirectory(ydb/public/lib/operation_id)
 add_subdirectory(ydb/public/lib/operation_id/protos)
 add_subdirectory(ydb/public/sdk/cpp/client/ydb_proto)
 add_subdirectory(ydb/public/api/grpc/draft)
+add_subdirectory(ydb/core/yq/libs/protos)
 add_subdirectory(ydb/core/blobstorage/vdisk)
 add_subdirectory(ydb/core/blobstorage/vdisk/anubis_osiris)
 add_subdirectory(ydb/core/blobstorage/vdisk/hulldb/barriers)
diff --git a/ydb/core/grpc_services/rpc_analytics_internal.cpp b/ydb/core/grpc_services/rpc_analytics_internal.cpp
index 4068b951b29..09b0ca48dff 100644
--- a/ydb/core/grpc_services/rpc_analytics_internal.cpp
+++ b/ydb/core/grpc_services/rpc_analytics_internal.cpp
@@ -8,7 +8,7 @@
 #include <library/cpp/actors/core/hfunc.h>
 
 #include <ydb/core/grpc_services/base/base.h>
-#include <ydb/public/api/protos/draft/yq_private.pb.h>
+#include <ydb/core/yq/libs/protos/yq_private.pb.h>
 
 namespace NKikimr {
 namespace NGRpcService {
diff --git a/ydb/core/yq/libs/control_plane_storage/events/events.h b/ydb/core/yq/libs/control_plane_storage/events/events.h
index c678ee2cd42..578d859405f 100644
--- a/ydb/core/yq/libs/control_plane_storage/events/events.h
+++ b/ydb/core/yq/libs/control_plane_storage/events/events.h
@@ -8,7 +8,7 @@
 #include <library/cpp/actors/core/events.h>
 #include <library/cpp/actors/interconnect/events_local.h>
 
-#include <ydb/public/api/protos/draft/yq_private.pb.h>
+#include <ydb/core/yq/libs/protos/yq_private.pb.h>
 #include <ydb/public/api/protos/yq.pb.h>
 #include <ydb/public/sdk/cpp/client/ydb_params/params.h>
 
diff --git a/ydb/core/yq/libs/control_plane_storage/proto/CMakeLists.txt b/ydb/core/yq/libs/control_plane_storage/proto/CMakeLists.txt
index 06e1283377a..a27d9773766 100644
--- a/ydb/core/yq/libs/control_plane_storage/proto/CMakeLists.txt
+++ b/ydb/core/yq/libs/control_plane_storage/proto/CMakeLists.txt
@@ -11,6 +11,7 @@ add_library(libs-control_plane_storage-proto)
 target_link_libraries(libs-control_plane_storage-proto PUBLIC
   contrib-libs-cxxsupp
   yutil
+  yq-libs-protos
   api-protos
   yql-dq-proto
   dq-api-protos
diff --git a/ydb/core/yq/libs/control_plane_storage/proto/yq_internal.proto b/ydb/core/yq/libs/control_plane_storage/proto/yq_internal.proto
index e6ebff0c847..0ad35e82283 100644
--- a/ydb/core/yq/libs/control_plane_storage/proto/yq_internal.proto
+++ b/ydb/core/yq/libs/control_plane_storage/proto/yq_internal.proto
@@ -8,7 +8,7 @@ option java_outer_classname = "YandexQueryInternalProtos";
 import "ydb/library/yql/providers/dq/api/protos/service.proto";
 import "ydb/library/yql/dq/proto/dq_tasks.proto";
 import "ydb/public/api/protos/yq.proto";
-import "ydb/public/api/protos/draft/yq_private.proto";
+import "ydb/core/yq/libs/protos/yq_private.proto";
 
 message Consumer {
     string name = 1;
diff --git a/ydb/core/yq/libs/events/events.h b/ydb/core/yq/libs/events/events.h
index 119ef5a4ae9..cc2013d827f 100644
--- a/ydb/core/yq/libs/events/events.h
+++ b/ydb/core/yq/libs/events/events.h
@@ -7,7 +7,7 @@
 #include <ydb/library/yql/public/issue/yql_issue.h>
 
 #include <ydb/core/yq/libs/graph_params/proto/graph_params.pb.h>
-#include <ydb/public/api/protos/draft/yq_private.pb.h>
+#include <ydb/core/yq/libs/protos/yq_private.pb.h>
 #include <ydb/public/sdk/cpp/client/ydb_table/table.h>
 #include <ydb/public/lib/yq/scope.h>
 
diff --git a/ydb/core/yq/libs/protos/CMakeLists.txt b/ydb/core/yq/libs/protos/CMakeLists.txt
new file mode 100644
index 00000000000..034ae98e25b
--- /dev/null
+++ b/ydb/core/yq/libs/protos/CMakeLists.txt
@@ -0,0 +1,36 @@
+
+# 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(yq-libs-protos)
+target_link_libraries(yq-libs-protos PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  api-protos
+  dq-actors-protos
+  contrib-libs-protobuf
+)
+target_proto_messages(yq-libs-protos PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/yq/libs/protos/yq_private.proto
+)
+target_sources(yq-libs-protos PRIVATE
+  ${CMAKE_BINARY_DIR}/ydb/core/yq/libs/protos/yq_private.pb.cc
+)
+target_proto_addincls(yq-libs-protos
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(yq-libs-protos
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
diff --git a/ydb/public/api/protos/draft/yq_private.proto b/ydb/core/yq/libs/protos/yq_private.proto
index ad480d6cf0d..28cc1ad20ed 100644
--- a/ydb/public/api/protos/draft/yq_private.proto
+++ b/ydb/core/yq/libs/protos/yq_private.proto
@@ -3,6 +3,8 @@ option cc_enable_arenas = true;
 
 package Yq.Private;
 
+import "ydb/library/yql/dq/actors/protos/dq_status_codes.proto";
+
 import "ydb/public/api/protos/ydb_operation.proto";
 import "ydb/public/api/protos/ydb_value.proto";
 import "ydb/public/api/protos/ydb_issue_message.proto";
@@ -82,6 +84,7 @@ message PingTaskRequest {
     SignedIdentity job_id = 3;
     SignedIdentity result_id = 4;
     YandexQuery.QueryMeta.ComputeStatus status = 5;
+    NYql.NDqProto.StatusIds.StatusCode StatusCode = 21;
     repeated Ydb.Issue.IssueMessage issues = 6;
     repeated Ydb.Issue.IssueMessage transient_issues = 16;
     uint32 result_set_count = 7;
diff --git a/ydb/core/yq/libs/read_rule/read_rule_deleter.h b/ydb/core/yq/libs/read_rule/read_rule_deleter.h
index b3a92745a04..c704109ac41 100644
--- a/ydb/core/yq/libs/read_rule/read_rule_deleter.h
+++ b/ydb/core/yq/libs/read_rule/read_rule_deleter.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <ydb/public/api/protos/draft/yq_private.pb.h>
+#include <ydb/core/yq/libs/protos/yq_private.pb.h>
 
 #include <ydb/public/sdk/cpp/client/ydb_driver/driver.h>
 
diff --git a/ydb/public/api/grpc/draft/CMakeLists.txt b/ydb/public/api/grpc/draft/CMakeLists.txt
index df2574e64f4..c13563b0f72 100644
--- a/ydb/public/api/grpc/draft/CMakeLists.txt
+++ b/ydb/public/api/grpc/draft/CMakeLists.txt
@@ -16,6 +16,7 @@ target_link_libraries(api-grpc-draft PUBLIC
   yutil
   contrib-libs-grpc
   api-protos
+  yq-libs-protos
   contrib-libs-protobuf
 )
 target_proto_messages(api-grpc-draft PRIVATE
diff --git a/ydb/public/api/grpc/draft/yql_db_v1.proto b/ydb/public/api/grpc/draft/yql_db_v1.proto
index 12b061eca36..3173fe53ad0 100644
--- a/ydb/public/api/grpc/draft/yql_db_v1.proto
+++ b/ydb/public/api/grpc/draft/yql_db_v1.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package Yq.Private.V1;
 
-import "ydb/public/api/protos/draft/yq_private.proto";
+import "ydb/core/yq/libs/protos/yq_private.proto";
 
 service YqPrivateTaskService {
     // gets new task
diff --git a/ydb/public/api/protos/CMakeLists.txt b/ydb/public/api/protos/CMakeLists.txt
index 2d7e3fef14b..8fd0553a14d 100644
--- a/ydb/public/api/protos/CMakeLists.txt
+++ b/ydb/public/api/protos/CMakeLists.txt
@@ -21,7 +21,6 @@ target_proto_messages(api-protos PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/public/api/protos/draft/persqueue_error_codes.proto
   ${CMAKE_SOURCE_DIR}/ydb/public/api/protos/draft/ydb_long_tx.proto
   ${CMAKE_SOURCE_DIR}/ydb/public/api/protos/draft/ydb_logstore.proto
-  ${CMAKE_SOURCE_DIR}/ydb/public/api/protos/draft/yq_private.proto
   ${CMAKE_SOURCE_DIR}/ydb/public/api/protos/persqueue_error_codes_v1.proto
   ${CMAKE_SOURCE_DIR}/ydb/public/api/protos/ydb_auth.proto
   ${CMAKE_SOURCE_DIR}/ydb/public/api/protos/ydb_persqueue_v1.proto
@@ -54,7 +53,6 @@ target_sources(api-protos PRIVATE
   ${CMAKE_BINARY_DIR}/ydb/public/api/protos/draft/persqueue_error_codes.pb.cc
   ${CMAKE_BINARY_DIR}/ydb/public/api/protos/draft/ydb_long_tx.pb.cc
   ${CMAKE_BINARY_DIR}/ydb/public/api/protos/draft/ydb_logstore.pb.cc
-  ${CMAKE_BINARY_DIR}/ydb/public/api/protos/draft/yq_private.pb.cc
   ${CMAKE_BINARY_DIR}/ydb/public/api/protos/persqueue_error_codes_v1.pb.cc
   ${CMAKE_BINARY_DIR}/ydb/public/api/protos/ydb_auth.pb.cc
   ${CMAKE_BINARY_DIR}/ydb/public/api/protos/ydb_persqueue_v1.pb.cc