diff options
| author | uzhas <uzhas@ydb.tech> | 2023-03-31 16:17:02 +0300 |
|---|---|---|
| committer | uzhas <uzhas@ydb.tech> | 2023-03-31 16:17:02 +0300 |
| commit | 6a960771f404ceb5b191e44a696406cb52859336 (patch) | |
| tree | f1d2f24861d1b5052346a4c7f098f1a067608ba3 | |
| parent | 74764979b85e9b1f9ed2c5380aefa17890f50e8e (diff) | |
| download | ydb-6a960771f404ceb5b191e44a696406cb52859336.tar.gz | |
,use fq config only, v2
| -rw-r--r-- | ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp | 4 | ||||
| -rw-r--r-- | ydb/core/protos/config.proto | 2 | ||||
| -rw-r--r-- | ydb/core/protos/services.proto | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp b/ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp index 6000e28d99..428e6beedd 100644 --- a/ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp +++ b/ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp @@ -796,10 +796,6 @@ protected: } } } - // TODO: remove after migration (YQ-1467) - if (AppConfig.HasYandexQueryConfig()) { - AppConfig.MutableFederatedQueryConfig()->MergeFrom(AppConfig.GetYandexQueryConfig()); - } } inline bool LoadBootstrapConfig(TConfig& config) { diff --git a/ydb/core/protos/config.proto b/ydb/core/protos/config.proto index 9b7e436622..517864cb64 100644 --- a/ydb/core/protos/config.proto +++ b/ydb/core/protos/config.proto @@ -1800,8 +1800,6 @@ message TAppConfig { optional TExternalIndexConfig ExternalIndexConfig = 63; optional bool YamlConfigEnabled = 64; - optional NFq.NConfig.TConfig YandexQueryConfig = 50; // TODO: remove after migration to FederatedQueryConfig - repeated TNamedConfig NamedConfigs = 100; optional string ClusterYamlConfig = 101; diff --git a/ydb/core/protos/services.proto b/ydb/core/protos/services.proto index 2e7e01a9f5..d1c1c54fed 100644 --- a/ydb/core/protos/services.proto +++ b/ydb/core/protos/services.proto @@ -300,7 +300,7 @@ enum EServiceKikimr { STREAMS_META_STORAGE_SERVICE = 1019; STREAMS_GRAPH_LEADER = 1020; - // YandexQuery + // FederatedQuery YQ_CONTROL_PLANE_STORAGE = 1021; YQ_CONTROL_PLANE_PROXY= 1022; YQ_TEST_CONNECTION = 1023; |