aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoruzhas <uzhas@ydb.tech>2023-01-26 21:50:02 +0300
committeruzhas <uzhas@ydb.tech>2023-01-26 21:50:02 +0300
commit57a8f9a7046c4b8deea8e0acba100e1e13867105 (patch)
tree737ef89d9903cbac7d57963fb380850a07b2f02a
parent72595479fa3b61521a07f23571148f6a77e6f4ec (diff)
downloadydb-57a8f9a7046c4b8deea8e0acba100e1e13867105.tar.gz
move fq.proto to draft
-rw-r--r--ydb/core/grpc_services/rpc_fq.cpp2
-rw-r--r--ydb/core/yq/libs/control_plane_storage/message_builders.h2
-rw-r--r--ydb/public/api/grpc/CMakeLists.darwin.txt1
-rw-r--r--ydb/public/api/grpc/CMakeLists.linux-aarch64.txt1
-rw-r--r--ydb/public/api/grpc/CMakeLists.linux.txt1
-rw-r--r--ydb/public/api/grpc/draft/CMakeLists.darwin.txt1
-rw-r--r--ydb/public/api/grpc/draft/CMakeLists.linux-aarch64.txt1
-rw-r--r--ydb/public/api/grpc/draft/CMakeLists.linux.txt1
-rw-r--r--ydb/public/api/grpc/draft/fq_v1.proto (renamed from ydb/public/api/grpc/fq_v1.proto)2
-rw-r--r--ydb/public/api/protos/CMakeLists.darwin.txt2
-rw-r--r--ydb/public/api/protos/CMakeLists.linux-aarch64.txt2
-rw-r--r--ydb/public/api/protos/CMakeLists.linux.txt2
-rw-r--r--ydb/public/api/protos/draft/fq.proto (renamed from ydb/public/api/protos/fq.proto)0
-rw-r--r--ydb/public/lib/fq/fq.h2
-rw-r--r--ydb/services/fq/grpc_service.h2
15 files changed, 11 insertions, 11 deletions
diff --git a/ydb/core/grpc_services/rpc_fq.cpp b/ydb/core/grpc_services/rpc_fq.cpp
index 32fff6eecc4..bcd3dddc0d5 100644
--- a/ydb/core/grpc_services/rpc_fq.cpp
+++ b/ydb/core/grpc_services/rpc_fq.cpp
@@ -7,7 +7,7 @@
#include <ydb/core/yq/libs/control_plane_proxy/control_plane_proxy.h>
#include <ydb/core/yq/libs/control_plane_proxy/events/events.h>
#include <ydb/core/yq/libs/control_plane_proxy/utils.h>
-#include <ydb/public/api/protos/fq.pb.h>
+#include <ydb/public/api/protos/draft/fq.pb.h>
#include <ydb/library/aclib/aclib.h>
diff --git a/ydb/core/yq/libs/control_plane_storage/message_builders.h b/ydb/core/yq/libs/control_plane_storage/message_builders.h
index 27578bd843d..dd125f247ad 100644
--- a/ydb/core/yq/libs/control_plane_storage/message_builders.h
+++ b/ydb/core/yq/libs/control_plane_storage/message_builders.h
@@ -6,7 +6,7 @@
#include <ydb/library/yql/dq/actors/protos/dq_status_codes.pb.h>
#include <ydb/library/yql/public/issue/yql_issue_message.h>
-#include <ydb/public/api/protos/fq.pb.h>
+#include <ydb/public/api/protos/draft/fq.pb.h>
#include <ydb/core/yq/libs/control_plane_storage/events/events.h>
diff --git a/ydb/public/api/grpc/CMakeLists.darwin.txt b/ydb/public/api/grpc/CMakeLists.darwin.txt
index 26425806e78..7c5da85408f 100644
--- a/ydb/public/api/grpc/CMakeLists.darwin.txt
+++ b/ydb/public/api/grpc/CMakeLists.darwin.txt
@@ -20,7 +20,6 @@ target_link_libraries(api-grpc PUBLIC
contrib-libs-protobuf
)
target_proto_messages(api-grpc PRIVATE
- ${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/fq_v1.proto
${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/ydb_auth_v1.proto
${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/ydb_cms_v1.proto
${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/ydb_coordination_v1.proto
diff --git a/ydb/public/api/grpc/CMakeLists.linux-aarch64.txt b/ydb/public/api/grpc/CMakeLists.linux-aarch64.txt
index 3c8827c394e..e2f05722535 100644
--- a/ydb/public/api/grpc/CMakeLists.linux-aarch64.txt
+++ b/ydb/public/api/grpc/CMakeLists.linux-aarch64.txt
@@ -21,7 +21,6 @@ target_link_libraries(api-grpc PUBLIC
contrib-libs-protobuf
)
target_proto_messages(api-grpc PRIVATE
- ${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/fq_v1.proto
${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/ydb_auth_v1.proto
${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/ydb_cms_v1.proto
${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/ydb_coordination_v1.proto
diff --git a/ydb/public/api/grpc/CMakeLists.linux.txt b/ydb/public/api/grpc/CMakeLists.linux.txt
index 3c8827c394e..e2f05722535 100644
--- a/ydb/public/api/grpc/CMakeLists.linux.txt
+++ b/ydb/public/api/grpc/CMakeLists.linux.txt
@@ -21,7 +21,6 @@ target_link_libraries(api-grpc PUBLIC
contrib-libs-protobuf
)
target_proto_messages(api-grpc PRIVATE
- ${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/fq_v1.proto
${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/ydb_auth_v1.proto
${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/ydb_cms_v1.proto
${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/ydb_coordination_v1.proto
diff --git a/ydb/public/api/grpc/draft/CMakeLists.darwin.txt b/ydb/public/api/grpc/draft/CMakeLists.darwin.txt
index 59cb01e7148..6eadd10c9b9 100644
--- a/ydb/public/api/grpc/draft/CMakeLists.darwin.txt
+++ b/ydb/public/api/grpc/draft/CMakeLists.darwin.txt
@@ -20,6 +20,7 @@ target_link_libraries(api-grpc-draft PUBLIC
)
target_proto_messages(api-grpc-draft PRIVATE
${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/draft/dummy.proto
+ ${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/draft/fq_v1.proto
${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/draft/ydb_clickhouse_internal_v1.proto
${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/draft/ydb_persqueue_v1.proto
${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/draft/ydb_datastreams_v1.proto
diff --git a/ydb/public/api/grpc/draft/CMakeLists.linux-aarch64.txt b/ydb/public/api/grpc/draft/CMakeLists.linux-aarch64.txt
index 09e5a65e30d..a0e5a143d39 100644
--- a/ydb/public/api/grpc/draft/CMakeLists.linux-aarch64.txt
+++ b/ydb/public/api/grpc/draft/CMakeLists.linux-aarch64.txt
@@ -21,6 +21,7 @@ target_link_libraries(api-grpc-draft PUBLIC
)
target_proto_messages(api-grpc-draft PRIVATE
${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/draft/dummy.proto
+ ${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/draft/fq_v1.proto
${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/draft/ydb_clickhouse_internal_v1.proto
${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/draft/ydb_persqueue_v1.proto
${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/draft/ydb_datastreams_v1.proto
diff --git a/ydb/public/api/grpc/draft/CMakeLists.linux.txt b/ydb/public/api/grpc/draft/CMakeLists.linux.txt
index 09e5a65e30d..a0e5a143d39 100644
--- a/ydb/public/api/grpc/draft/CMakeLists.linux.txt
+++ b/ydb/public/api/grpc/draft/CMakeLists.linux.txt
@@ -21,6 +21,7 @@ target_link_libraries(api-grpc-draft PUBLIC
)
target_proto_messages(api-grpc-draft PRIVATE
${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/draft/dummy.proto
+ ${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/draft/fq_v1.proto
${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/draft/ydb_clickhouse_internal_v1.proto
${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/draft/ydb_persqueue_v1.proto
${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/draft/ydb_datastreams_v1.proto
diff --git a/ydb/public/api/grpc/fq_v1.proto b/ydb/public/api/grpc/draft/fq_v1.proto
index 0b52f8bc037..e911c5ce953 100644
--- a/ydb/public/api/grpc/fq_v1.proto
+++ b/ydb/public/api/grpc/draft/fq_v1.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
package FederatedQuery.V1;
option java_package = "com.federated.query.v1";
-import "ydb/public/api/protos/fq.proto";
+import "ydb/public/api/protos/draft/fq.proto";
service FederatedQueryService {
// Query
diff --git a/ydb/public/api/protos/CMakeLists.darwin.txt b/ydb/public/api/protos/CMakeLists.darwin.txt
index c7b262a8c97..b9fb585cb28 100644
--- a/ydb/public/api/protos/CMakeLists.darwin.txt
+++ b/ydb/public/api/protos/CMakeLists.darwin.txt
@@ -19,12 +19,12 @@ target_link_libraries(api-protos PUBLIC
)
target_proto_messages(api-protos PRIVATE
${CMAKE_SOURCE_DIR}/ydb/public/api/protos/draft/datastreams.proto
+ ${CMAKE_SOURCE_DIR}/ydb/public/api/protos/draft/fq.proto
${CMAKE_SOURCE_DIR}/ydb/public/api/protos/draft/persqueue_common.proto
${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/ydb_query.proto
- ${CMAKE_SOURCE_DIR}/ydb/public/api/protos/fq.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
diff --git a/ydb/public/api/protos/CMakeLists.linux-aarch64.txt b/ydb/public/api/protos/CMakeLists.linux-aarch64.txt
index a2527907d15..7bbf8c1b074 100644
--- a/ydb/public/api/protos/CMakeLists.linux-aarch64.txt
+++ b/ydb/public/api/protos/CMakeLists.linux-aarch64.txt
@@ -20,12 +20,12 @@ target_link_libraries(api-protos PUBLIC
)
target_proto_messages(api-protos PRIVATE
${CMAKE_SOURCE_DIR}/ydb/public/api/protos/draft/datastreams.proto
+ ${CMAKE_SOURCE_DIR}/ydb/public/api/protos/draft/fq.proto
${CMAKE_SOURCE_DIR}/ydb/public/api/protos/draft/persqueue_common.proto
${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/ydb_query.proto
- ${CMAKE_SOURCE_DIR}/ydb/public/api/protos/fq.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
diff --git a/ydb/public/api/protos/CMakeLists.linux.txt b/ydb/public/api/protos/CMakeLists.linux.txt
index a2527907d15..7bbf8c1b074 100644
--- a/ydb/public/api/protos/CMakeLists.linux.txt
+++ b/ydb/public/api/protos/CMakeLists.linux.txt
@@ -20,12 +20,12 @@ target_link_libraries(api-protos PUBLIC
)
target_proto_messages(api-protos PRIVATE
${CMAKE_SOURCE_DIR}/ydb/public/api/protos/draft/datastreams.proto
+ ${CMAKE_SOURCE_DIR}/ydb/public/api/protos/draft/fq.proto
${CMAKE_SOURCE_DIR}/ydb/public/api/protos/draft/persqueue_common.proto
${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/ydb_query.proto
- ${CMAKE_SOURCE_DIR}/ydb/public/api/protos/fq.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
diff --git a/ydb/public/api/protos/fq.proto b/ydb/public/api/protos/draft/fq.proto
index 419ca761e3e..419ca761e3e 100644
--- a/ydb/public/api/protos/fq.proto
+++ b/ydb/public/api/protos/draft/fq.proto
diff --git a/ydb/public/lib/fq/fq.h b/ydb/public/lib/fq/fq.h
index e2d3405fbb6..ec00b79371e 100644
--- a/ydb/public/lib/fq/fq.h
+++ b/ydb/public/lib/fq/fq.h
@@ -2,7 +2,7 @@
#include <ydb/public/sdk/cpp/client/ydb_table/table.h>
-#include <ydb/public/api/grpc/fq_v1.grpc.pb.h>
+#include <ydb/public/api/grpc/draft/fq_v1.grpc.pb.h>
namespace NYdb::NFq {
diff --git a/ydb/services/fq/grpc_service.h b/ydb/services/fq/grpc_service.h
index 4bc79d0e8a7..e4b6b6e8407 100644
--- a/ydb/services/fq/grpc_service.h
+++ b/ydb/services/fq/grpc_service.h
@@ -4,7 +4,7 @@
#include <library/cpp/grpc/server/grpc_server.h>
-#include <ydb/public/api/grpc/fq_v1.grpc.pb.h>
+#include <ydb/public/api/grpc/draft/fq_v1.grpc.pb.h>
namespace NKikimr {
namespace NGRpcService {