diff options
| author | galaxycrab <UgnineSirdis@ydb.tech> | 2023-01-26 18:37:27 +0300 |
|---|---|---|
| committer | galaxycrab <UgnineSirdis@ydb.tech> | 2023-01-26 18:37:27 +0300 |
| commit | 63aa601686f846db5c3fc5056316a31d6aca4a4a (patch) | |
| tree | 89b27924e3ea7417debb0b45205ba711ba4eaa9c | |
| parent | daa040e0b99d0f487b6b1ee167a7079ba474f6e4 (diff) | |
| download | ydb-63aa601686f846db5c3fc5056316a31d6aca4a4a.tar.gz | |
Remove support of yq-file command line option
| -rw-r--r-- | ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp | 2 | ||||
| -rw-r--r-- | ydb/core/driver_lib/run/config_parser.cpp | 3 |
2 files changed, 0 insertions, 5 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 1757d453cd2..fdaf2f0aaf4 100644 --- a/ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp +++ b/ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp @@ -203,7 +203,6 @@ protected: config.Opts->AddLongOption("cms-file", "CMS config file").OptionalArgument("PATH"); config.Opts->AddLongOption("alloc-file", "Allocator config file").OptionalArgument("PATH"); config.Opts->AddLongOption("yql-file", "Yql Analytics config file").OptionalArgument("PATH"); - config.Opts->AddLongOption("yq-file", "Yandex Query config file (deprecated)").OptionalArgument("PATH"); config.Opts->AddLongOption("fq-file", "Federated Query config file").OptionalArgument("PATH"); config.Opts->AddLongOption("feature-flags-file", "File with feature flags to turn new features on/off").OptionalArgument("PATH"); config.Opts->AddLongOption("rb-file", "File with resource broker customizations").OptionalArgument("PATH"); @@ -448,7 +447,6 @@ protected: OPTION("kqp-file", KQPConfig); OPTION("incrhuge-file", IncrHugeConfig); OPTION("alloc-file", AllocatorConfig); - OPTION("yq-file", FederatedQueryConfig); // TODO: remove after migration (YQ-1467) OPTION("fq-file", FederatedQueryConfig); OPTION(nullptr, TracingConfig); OPTION(nullptr, FailureInjectionConfig); diff --git a/ydb/core/driver_lib/run/config_parser.cpp b/ydb/core/driver_lib/run/config_parser.cpp index 7b4a44387be..4dab446f7a7 100644 --- a/ydb/core/driver_lib/run/config_parser.cpp +++ b/ydb/core/driver_lib/run/config_parser.cpp @@ -75,7 +75,6 @@ void TRunCommandConfigParser::SetupLastGetOptForConfigFiles(NLastGetopt::TOpts& opts.AddLongOption("http-proxy-file", "Http proxy config file").OptionalArgument("PATH"); opts.AddLongOption("alloc-file", "Allocator config file").OptionalArgument("PATH"); opts.AddLongOption("yql-file", "Yql Analytics config file").OptionalArgument("PATH"); - opts.AddLongOption("yq-file", "Yandex Query config file (deprecated)").OptionalArgument("PATH"); opts.AddLongOption("fq-file", "Federated Query config file").OptionalArgument("PATH"); opts.AddLongOption("pdisk-key-file", "pdisk encryption key config file").OptionalArgument("PATH"); opts.AddLongOption("public-http-file", "Public HTTP config file").OptionalArgument("PATH"); @@ -213,8 +212,6 @@ void TRunCommandConfigParser::ParseConfigFiles(const NLastGetopt::TOptsParseResu if (res.Has("fq-file")) { Y_VERIFY(ParsePBFromFile(res.Get("fq-file"), Config.AppConfig.MutableFederatedQueryConfig())); - } else if (res.Has("yq-file")) { - Y_VERIFY(ParsePBFromFile(res.Get("yq-file"), Config.AppConfig.MutableFederatedQueryConfig())); } if (res.Has("public-http-file")) { |