From 3afcaf9e8030ddc5fc9fa1e3dcae96ea6b5a19f1 Mon Sep 17 00:00:00 2001 From: Vitaly Isaev Date: Fri, 16 Feb 2024 17:34:56 +0300 Subject: [PATCH] Added missing settings to `query_service_config` in `local_ydb` (#2021) --- ydb/public/tools/lib/cmds/__init__.py | 2 +- ydb/tests/library/harness/kikimr_config.py | 12 +++++++++++- ydb/tests/library/ut/kikimr_config.py | 4 ++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ydb/public/tools/lib/cmds/__init__.py b/ydb/public/tools/lib/cmds/__init__.py index b23b0304ff07..666993136a22 100644 --- a/ydb/public/tools/lib/cmds/__init__.py +++ b/ydb/public/tools/lib/cmds/__init__.py @@ -271,7 +271,7 @@ def generic_connector_config(): valid_schemes = ['grpc', 'grpcs'] if parsed.scheme not in valid_schemes: - raise ValueError("Invalid schema '{}' in FQ_CONNECTOR_ENDPOINT (possible: {})".format(parsed.schema, valid_schemes)) + raise ValueError("Invalid schema '{}' in FQ_CONNECTOR_ENDPOINT (possible: {})".format(parsed.scheme, valid_schemes)) cfg = TGenericConnectorConfig() cfg.Endpoint.host = parsed.hostname diff --git a/ydb/tests/library/harness/kikimr_config.py b/ydb/tests/library/harness/kikimr_config.py index b18e8ea9dc04..17f20055b437 100644 --- a/ydb/tests/library/harness/kikimr_config.py +++ b/ydb/tests/library/harness/kikimr_config.py @@ -397,7 +397,17 @@ def __init__( "port": generic_connector_config.Endpoint.port, }, "use_ssl": generic_connector_config.UseSsl - } + }, + "default_settings": [ + { + "name": "DateTimeFormat", + "value": "string" + }, + { + "name": "UsePredicatePushdown", + "value": "true" + } + ] } self.yaml_config["feature_flags"]["enable_external_data_sources"] = True diff --git a/ydb/tests/library/ut/kikimr_config.py b/ydb/tests/library/ut/kikimr_config.py index 7f60089fc8b8..e32102107b49 100644 --- a/ydb/tests/library/ut/kikimr_config.py +++ b/ydb/tests/library/ut/kikimr_config.py @@ -15,5 +15,9 @@ def test_kikimr_config_generator_generic_connector_config(): assert yaml_config["query_service_config"]["generic"]["connector"]["endpoint"]["host"] == generic_connector_config.Endpoint.host assert yaml_config["query_service_config"]["generic"]["connector"]["endpoint"]["port"] == generic_connector_config.Endpoint.port assert yaml_config["query_service_config"]["generic"]["connector"]["use_ssl"] == generic_connector_config.UseSsl + assert yaml_config["query_service_config"]["generic"]["default_settings"] == [ + {"name": "DateTimeFormat", "value": "string"}, + {"name": "UsePredicatePushdown", "value": "true"}, + ] assert yaml_config["feature_flags"]["enable_external_data_sources"] is True assert yaml_config["feature_flags"]["enable_script_execution_operations"] is True