Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ydb/core/kqp/ut/federated_query/s3/kqp_s3_plan_ut.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 2 additions & 0 deletions ydb/core/kqp/ut/olap/kqp_olap_ut.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions ydb/core/kqp/ut/olap/locks_ut.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ Y_UNIT_TEST_SUITE(KqpOlapLocks) {
auto csController = NYDBTest::TControllers::RegisterCSControllerGuard<NYDBTest::NColumnShard::TController>();

NKikimrConfig::TAppConfig appConfig;
appConfig.MutableTableServiceConfig()->SetEnableOlapSink(true);
auto settings = TKikimrSettings().SetAppConfig(appConfig).SetWithSampleTables(false);
TTestHelper testHelper(settings);

Expand Down
6 changes: 4 additions & 2 deletions ydb/core/kqp/ut/scheme/kqp_acl_ut.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
10 changes: 5 additions & 5 deletions ydb/core/protos/table_service_config.proto
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand All @@ -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];
Expand All @@ -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 ];
Expand Down
3 changes: 3 additions & 0 deletions ydb/tests/library/harness/kikimr_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
1 change: 1 addition & 0 deletions ydb/tests/olap/ya.make
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions ydb/tests/sql/ya.make
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
PY3TEST()
ENV(YDB_DRIVER_BINARY="ydb/apps/ydbd/ydbd")
ENV(YDB_ENABLE_COLUMN_TABLES="true")

TEST_SRCS(
test_kv.py
Expand Down
1 change: 1 addition & 0 deletions ydb/tests/stress/olap_workload/tests/ya.make
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
PY3TEST()
ENV(YDB_DRIVER_BINARY="ydb/apps/ydbd/ydbd")
ENV(YDB_ENABLE_COLUMN_TABLES="true")

TEST_SRCS(
test_workload.py
Expand Down
Loading