Skip to content

Commit e474364

Browse files
authored
Merge 56c9d09 into 789cd49
2 parents 789cd49 + 56c9d09 commit e474364

File tree

6 files changed

+88
-542
lines changed

6 files changed

+88
-542
lines changed

ydb/core/kqp/ut/olap/clickbench_ut.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,8 @@ Y_UNIT_TEST_SUITE(KqpOlapClickbench) {
168168
LIMIT 10
169169
)")
170170
//.SetExpectedReply("[[[\"40999\"];[4];1u];[[\"40998\"];[3];1u];[[\"40997\"];[2];1u]]")
171-
// Should be fixed in https://st.yandex-team.ru/KIKIMR-17009
172-
// .SetExpectedReadNodeType("TableFullScan");
173-
.SetExpectedReadNodeType("Aggregate-TableFullScan");
171+
.SetExpectedReadNodeType("TableFullScan");
172+
// .SetExpectedReadNodeType("Aggregate-TableFullScan");
174173
q9.FillExpectedAggregationGroupByPlanOptions();
175174

176175
TAggregationTestCase q12;
@@ -216,7 +215,7 @@ Y_UNIT_TEST_SUITE(KqpOlapClickbench) {
216215
LIMIT 10;
217216
)")
218217
.AddExpectedPlanOptions("KqpOlapFilter")
219-
.SetExpectedReadNodeType("Aggregate-TableFullScan");
218+
.SetExpectedReadNodeType("TableFullScan");
220219
q22.FillExpectedAggregationGroupByPlanOptions();
221220

222221
TAggregationTestCase q39;

ydb/core/protos/table_service_config.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ message TTableServiceConfig {
4747

4848
message TSpillingServiceConfig {
4949
message TLocalFileConfig {
50-
optional bool Enable = 1 [default = false];
50+
optional bool Enable = 1 [default = true];
5151
optional string Root = 2 [default = "/tmp/kikimr_spilling/"];
5252
optional uint64 MaxTotalSize = 3 [default = 21474836480]; // 20 GiB
5353
optional uint64 MaxFileSize = 4 [default = 5368709120]; // 5 GiB

0 commit comments

Comments
 (0)