diff --git a/ydb/core/kqp/ut/federated_query/s3/kqp_s3_plan_ut.cpp b/ydb/core/kqp/ut/federated_query/s3/kqp_s3_plan_ut.cpp index 3b66d3c89ef6..5c38627e0a62 100644 --- a/ydb/core/kqp/ut/federated_query/s3/kqp_s3_plan_ut.cpp +++ b/ydb/core/kqp/ut/federated_query/s3/kqp_s3_plan_ut.cpp @@ -167,7 +167,10 @@ Y_UNIT_TEST_SUITE(KqpS3PlanTest) { UploadObject("test_ctas_read", "test_ctas_read2", TEST_CONTENT, s3Client); } - auto kikimr = NTestUtils::MakeKikimrRunner(); + NKikimrConfig::TAppConfig appConfig; + appConfig.MutableTableServiceConfig()->SetEnableOlapSink(true); + appConfig.MutableTableServiceConfig()->SetEnableCreateTableAs(true); + auto kikimr = NTestUtils::MakeKikimrRunner(appConfig); auto tc = kikimr->GetTableClient(); auto session = tc.CreateSession().GetValueSync().GetSession(); diff --git a/ydb/core/kqp/ut/olap/kqp_olap_ut.cpp b/ydb/core/kqp/ut/olap/kqp_olap_ut.cpp index aee2c5520964..db29505f48dc 100644 --- a/ydb/core/kqp/ut/olap/kqp_olap_ut.cpp +++ b/ydb/core/kqp/ut/olap/kqp_olap_ut.cpp @@ -3130,6 +3130,7 @@ Y_UNIT_TEST_SUITE(KqpOlap) { Y_UNIT_TEST(InsertIntoNullablePK) { NKikimrConfig::TAppConfig appConfig; + appConfig.MutableTableServiceConfig()->SetEnableOlapSink(true); appConfig.MutableColumnShardConfig()->SetAllowNullableColumnsInPK(true); auto settings = TKikimrSettings().SetAppConfig(appConfig).SetWithSampleTables(false); TTestHelper testHelper(settings); @@ -3178,6 +3179,7 @@ Y_UNIT_TEST_SUITE(KqpOlap) { Y_UNIT_TEST(InsertEmptyString) { NKikimrConfig::TAppConfig appConfig; + appConfig.MutableTableServiceConfig()->SetEnableOlapSink(true); appConfig.MutableColumnShardConfig()->SetAllowNullableColumnsInPK(true); auto settings = TKikimrSettings().SetAppConfig(appConfig).SetWithSampleTables(false); TTestHelper testHelper(settings); diff --git a/ydb/core/kqp/ut/olap/locks_ut.cpp b/ydb/core/kqp/ut/olap/locks_ut.cpp index 5c89d2abae31..5c476dd71f2a 100644 --- a/ydb/core/kqp/ut/olap/locks_ut.cpp +++ b/ydb/core/kqp/ut/olap/locks_ut.cpp @@ -105,6 +105,7 @@ Y_UNIT_TEST_SUITE(KqpOlapLocks) { auto csController = NYDBTest::TControllers::RegisterCSControllerGuard(); NKikimrConfig::TAppConfig appConfig; + appConfig.MutableTableServiceConfig()->SetEnableOlapSink(true); auto settings = TKikimrSettings().SetAppConfig(appConfig).SetWithSampleTables(false); TTestHelper testHelper(settings); diff --git a/ydb/core/kqp/ut/scheme/kqp_acl_ut.cpp b/ydb/core/kqp/ut/scheme/kqp_acl_ut.cpp index 7a39a4be9c90..15f954355ca6 100644 --- a/ydb/core/kqp/ut/scheme/kqp_acl_ut.cpp +++ b/ydb/core/kqp/ut/scheme/kqp_acl_ut.cpp @@ -217,8 +217,10 @@ Y_UNIT_TEST_SUITE(KqpAcl) { primary key (id) ) WITH (STORE=%s); )", isOlap ? "COLUMN" : "ROW"); - - TKikimrRunner kikimr; + NKikimrConfig::TAppConfig appConfig; + appConfig.MutableTableServiceConfig()->SetEnableOlapSink(true); + auto settings = NKqp::TKikimrSettings().SetAppConfig(appConfig); + TKikimrRunner kikimr(appConfig); { auto driverConfig = TDriverConfig() diff --git a/ydb/core/protos/table_service_config.proto b/ydb/core/protos/table_service_config.proto index 6aab3ffd0839..f631f2fd9187 100644 --- a/ydb/core/protos/table_service_config.proto +++ b/ydb/core/protos/table_service_config.proto @@ -285,10 +285,10 @@ message TTableServiceConfig { optional uint64 ExtractPredicateRangesLimit = 54 [default = 10000]; - optional bool EnableOlapSink = 55 [default = true]; + optional bool EnableOlapSink = 55 [default = false]; optional bool EnablePerStatementQueryExecution = 56 [default = false]; - optional bool EnableCreateTableAs = 57 [default = true]; + optional bool EnableCreateTableAs = 57 [default = false]; optional uint64 IdxLookupJoinPointsLimit = 58 [default = 3]; reserved 59; //optional bool OldLookupJoinBehaviour = 59 [default = false]; @@ -310,9 +310,9 @@ message TTableServiceConfig { optional bool EnableConstantFolding = 65 [ default = true ]; - optional bool EnableImplicitQueryParameterTypes = 66 [ default = true ]; + optional bool EnableImplicitQueryParameterTypes = 66 [ default = false ]; - optional string EnableSpillingNodes = 67 [ default = "All" ]; + optional string EnableSpillingNodes = 67 [ default = "None" ]; message TComputeSchedulerSettings { optional uint64 AdvanceTimeIntervalUsec = 1 [default = 500000]; @@ -325,7 +325,7 @@ message TTableServiceConfig { optional bool EnableRowsDuplicationCheck = 69 [ default = false ]; - optional bool EnableHtapTx = 71 [default = true]; + optional bool EnableHtapTx = 71 [default = false]; message TWriteActorSettings { optional uint64 InFlightMemoryLimitPerActorBytes = 1 [ default = 67108864 ]; diff --git a/ydb/tests/library/harness/kikimr_config.py b/ydb/tests/library/harness/kikimr_config.py index 62632b92bf56..3d58060ec6d7 100644 --- a/ydb/tests/library/harness/kikimr_config.py +++ b/ydb/tests/library/harness/kikimr_config.py @@ -85,6 +85,9 @@ def _load_default_yaml(default_tablet_node_ids, ydb_domain_name, static_erasure, yaml_dict["log_config"]["entry"].append({"component": log, "level": int(level)}) if os.getenv("YDB_ENABLE_COLUMN_TABLES", "") == "true": yaml_dict |= {"column_shard_config": {"disabled_on_scheme_shard": False}} + yaml_dict["table_service_config"]["enable_htap_tx"] = True + yaml_dict["table_service_config"]["enable_olap_sink"] = True + yaml_dict["table_service_config"]["enable_create_table_as"] = True return yaml_dict diff --git a/ydb/tests/olap/ya.make b/ydb/tests/olap/ya.make index 48b98888ac28..1689defbcf07 100644 --- a/ydb/tests/olap/ya.make +++ b/ydb/tests/olap/ya.make @@ -1,6 +1,7 @@ PY3TEST() ENV(YDB_DRIVER_BINARY="ydb/apps/ydbd/ydbd") ENV(YDB_CLI_BINARY="ydb/apps/ydb/ydb") + ENV(YDB_ENABLE_COLUMN_TABLES="true") TEST_SRCS( test_quota_exhaustion.py diff --git a/ydb/tests/sql/ya.make b/ydb/tests/sql/ya.make index 0814437a954a..a563a1bda68a 100644 --- a/ydb/tests/sql/ya.make +++ b/ydb/tests/sql/ya.make @@ -1,5 +1,6 @@ PY3TEST() ENV(YDB_DRIVER_BINARY="ydb/apps/ydbd/ydbd") +ENV(YDB_ENABLE_COLUMN_TABLES="true") TEST_SRCS( test_kv.py diff --git a/ydb/tests/stress/olap_workload/tests/ya.make b/ydb/tests/stress/olap_workload/tests/ya.make index 73cf8d439be6..a5a43c632de8 100644 --- a/ydb/tests/stress/olap_workload/tests/ya.make +++ b/ydb/tests/stress/olap_workload/tests/ya.make @@ -1,5 +1,6 @@ PY3TEST() ENV(YDB_DRIVER_BINARY="ydb/apps/ydbd/ydbd") +ENV(YDB_ENABLE_COLUMN_TABLES="true") TEST_SRCS( test_workload.py