diff options
author | hcpp <hcpp@ydb.tech> | 2023-05-22 17:10:35 +0300 |
---|---|---|
committer | hcpp <hcpp@ydb.tech> | 2023-05-22 17:10:35 +0300 |
commit | 96fc286011395f6892487dc43bacf5ae889c9a8a (patch) | |
tree | a20828aa78bcfbe5ab78c9b05903e477e44dd02a | |
parent | 73a8d0a1a16e7bf73b80621cf3351b9ac75bdd9b (diff) | |
download | ydb-96fc286011395f6892487dc43bacf5ae889c9a8a.tar.gz |
compute config has been added
6 files changed, 77 insertions, 0 deletions
diff --git a/ydb/core/fq/libs/config/protos/CMakeLists.darwin-x86_64.txt b/ydb/core/fq/libs/config/protos/CMakeLists.darwin-x86_64.txt index 2af51c5a39..98a204fd31 100644 --- a/ydb/core/fq/libs/config/protos/CMakeLists.darwin-x86_64.txt +++ b/ydb/core/fq/libs/config/protos/CMakeLists.darwin-x86_64.txt @@ -270,6 +270,18 @@ get_built_tool_path( contrib/tools/protoc/plugins/cpp_styleguide cpp_styleguide ) +get_built_tool_path( + TOOL_protoc_bin + TOOL_protoc_dependency + contrib/tools/protoc/bin + protoc +) +get_built_tool_path( + TOOL_cpp_styleguide_bin + TOOL_cpp_styleguide_dependency + contrib/tools/protoc/plugins/cpp_styleguide + cpp_styleguide +) add_library(libs-config-protos) target_link_libraries(libs-config-protos PUBLIC @@ -285,6 +297,7 @@ target_proto_messages(libs-config-protos PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/fq/libs/config/protos/audit.proto ${CMAKE_SOURCE_DIR}/ydb/core/fq/libs/config/protos/checkpoint_coordinator.proto ${CMAKE_SOURCE_DIR}/ydb/core/fq/libs/config/protos/common.proto + ${CMAKE_SOURCE_DIR}/ydb/core/fq/libs/config/protos/compute.proto ${CMAKE_SOURCE_DIR}/ydb/core/fq/libs/config/protos/control_plane_proxy.proto ${CMAKE_SOURCE_DIR}/ydb/core/fq/libs/config/protos/control_plane_storage.proto ${CMAKE_SOURCE_DIR}/ydb/core/fq/libs/config/protos/db_pool.proto diff --git a/ydb/core/fq/libs/config/protos/CMakeLists.linux-aarch64.txt b/ydb/core/fq/libs/config/protos/CMakeLists.linux-aarch64.txt index cfd6512642..1ec6d5c4fa 100644 --- a/ydb/core/fq/libs/config/protos/CMakeLists.linux-aarch64.txt +++ b/ydb/core/fq/libs/config/protos/CMakeLists.linux-aarch64.txt @@ -270,6 +270,18 @@ get_built_tool_path( contrib/tools/protoc/plugins/cpp_styleguide cpp_styleguide ) +get_built_tool_path( + TOOL_protoc_bin + TOOL_protoc_dependency + contrib/tools/protoc/bin + protoc +) +get_built_tool_path( + TOOL_cpp_styleguide_bin + TOOL_cpp_styleguide_dependency + contrib/tools/protoc/plugins/cpp_styleguide + cpp_styleguide +) add_library(libs-config-protos) target_link_libraries(libs-config-protos PUBLIC @@ -286,6 +298,7 @@ target_proto_messages(libs-config-protos PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/fq/libs/config/protos/audit.proto ${CMAKE_SOURCE_DIR}/ydb/core/fq/libs/config/protos/checkpoint_coordinator.proto ${CMAKE_SOURCE_DIR}/ydb/core/fq/libs/config/protos/common.proto + ${CMAKE_SOURCE_DIR}/ydb/core/fq/libs/config/protos/compute.proto ${CMAKE_SOURCE_DIR}/ydb/core/fq/libs/config/protos/control_plane_proxy.proto ${CMAKE_SOURCE_DIR}/ydb/core/fq/libs/config/protos/control_plane_storage.proto ${CMAKE_SOURCE_DIR}/ydb/core/fq/libs/config/protos/db_pool.proto diff --git a/ydb/core/fq/libs/config/protos/CMakeLists.linux-x86_64.txt b/ydb/core/fq/libs/config/protos/CMakeLists.linux-x86_64.txt index cfd6512642..1ec6d5c4fa 100644 --- a/ydb/core/fq/libs/config/protos/CMakeLists.linux-x86_64.txt +++ b/ydb/core/fq/libs/config/protos/CMakeLists.linux-x86_64.txt @@ -270,6 +270,18 @@ get_built_tool_path( contrib/tools/protoc/plugins/cpp_styleguide cpp_styleguide ) +get_built_tool_path( + TOOL_protoc_bin + TOOL_protoc_dependency + contrib/tools/protoc/bin + protoc +) +get_built_tool_path( + TOOL_cpp_styleguide_bin + TOOL_cpp_styleguide_dependency + contrib/tools/protoc/plugins/cpp_styleguide + cpp_styleguide +) add_library(libs-config-protos) target_link_libraries(libs-config-protos PUBLIC @@ -286,6 +298,7 @@ target_proto_messages(libs-config-protos PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/fq/libs/config/protos/audit.proto ${CMAKE_SOURCE_DIR}/ydb/core/fq/libs/config/protos/checkpoint_coordinator.proto ${CMAKE_SOURCE_DIR}/ydb/core/fq/libs/config/protos/common.proto + ${CMAKE_SOURCE_DIR}/ydb/core/fq/libs/config/protos/compute.proto ${CMAKE_SOURCE_DIR}/ydb/core/fq/libs/config/protos/control_plane_proxy.proto ${CMAKE_SOURCE_DIR}/ydb/core/fq/libs/config/protos/control_plane_storage.proto ${CMAKE_SOURCE_DIR}/ydb/core/fq/libs/config/protos/db_pool.proto diff --git a/ydb/core/fq/libs/config/protos/CMakeLists.windows-x86_64.txt b/ydb/core/fq/libs/config/protos/CMakeLists.windows-x86_64.txt index 2af51c5a39..98a204fd31 100644 --- a/ydb/core/fq/libs/config/protos/CMakeLists.windows-x86_64.txt +++ b/ydb/core/fq/libs/config/protos/CMakeLists.windows-x86_64.txt @@ -270,6 +270,18 @@ get_built_tool_path( contrib/tools/protoc/plugins/cpp_styleguide cpp_styleguide ) +get_built_tool_path( + TOOL_protoc_bin + TOOL_protoc_dependency + contrib/tools/protoc/bin + protoc +) +get_built_tool_path( + TOOL_cpp_styleguide_bin + TOOL_cpp_styleguide_dependency + contrib/tools/protoc/plugins/cpp_styleguide + cpp_styleguide +) add_library(libs-config-protos) target_link_libraries(libs-config-protos PUBLIC @@ -285,6 +297,7 @@ target_proto_messages(libs-config-protos PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/fq/libs/config/protos/audit.proto ${CMAKE_SOURCE_DIR}/ydb/core/fq/libs/config/protos/checkpoint_coordinator.proto ${CMAKE_SOURCE_DIR}/ydb/core/fq/libs/config/protos/common.proto + ${CMAKE_SOURCE_DIR}/ydb/core/fq/libs/config/protos/compute.proto ${CMAKE_SOURCE_DIR}/ydb/core/fq/libs/config/protos/control_plane_proxy.proto ${CMAKE_SOURCE_DIR}/ydb/core/fq/libs/config/protos/control_plane_storage.proto ${CMAKE_SOURCE_DIR}/ydb/core/fq/libs/config/protos/db_pool.proto diff --git a/ydb/core/fq/libs/config/protos/compute.proto b/ydb/core/fq/libs/config/protos/compute.proto new file mode 100644 index 0000000000..2bed58d5d4 --- /dev/null +++ b/ydb/core/fq/libs/config/protos/compute.proto @@ -0,0 +1,23 @@ +syntax = "proto3"; +option cc_enable_arenas = true; + +package NFq.NConfig; +option java_package = "ru.yandex.kikimr.proto"; + +import "ydb/core/fq/libs/config/protos/storage.proto"; + +//////////////////////////////////////////////////////////// + +message TInPlaceCompute { +} + +message TYdbCompute { + TYdbStorageConfig Connection = 1; +} + +message TComputeConfig { + oneof type { + TInPlaceCompute InPlace = 1; + TYdbCompute Ydb = 2; + } +} diff --git a/ydb/core/fq/libs/config/protos/fq_config.proto b/ydb/core/fq/libs/config/protos/fq_config.proto index 3cd65b560b..fcca1dafe2 100644 --- a/ydb/core/fq/libs/config/protos/fq_config.proto +++ b/ydb/core/fq/libs/config/protos/fq_config.proto @@ -7,6 +7,7 @@ option java_package = "ru.yandex.kikimr.proto"; import "ydb/core/fq/libs/config/protos/audit.proto"; import "ydb/core/fq/libs/config/protos/checkpoint_coordinator.proto"; import "ydb/core/fq/libs/config/protos/common.proto"; +import "ydb/core/fq/libs/config/protos/compute.proto"; import "ydb/core/fq/libs/config/protos/control_plane_proxy.proto"; import "ydb/core/fq/libs/config/protos/control_plane_storage.proto"; import "ydb/core/fq/libs/config/protos/db_pool.proto"; @@ -51,4 +52,5 @@ message TConfig { TQuotasManagerConfig QuotasManager = 21; TRateLimiterConfig RateLimiter = 22; bool EnableTaskCounters = 23; + TComputeConfig Compute = 24; } |