Skip to content

Commit c62cf67

Browse files
gridnevvvitKamil Khamitov
gridnevvvit
authored and
Kamil Khamitov
committed
remove some portion of stream lookup tests (ydb-platform#15202)
1 parent 7752a8e commit c62cf67

24 files changed

+149
-346
lines changed

‎ydb/core/kqp/ut/cost/kqp_cost_ut.cpp‎

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@ namespace NKqp {
1212
using namespace NYdb;
1313
using namespace NYdb::NTable;
1414

15-
static NKikimrConfig::TAppConfig GetAppConfig(bool scanSourceRead = false, bool streamLookup = true, bool streamLookupJoin = false, bool enableOltpSink = false) {
15+
static NKikimrConfig::TAppConfig GetAppConfig(bool scanSourceRead = false, bool streamLookupJoin = false, bool enableOltpSink = false) {
1616
auto app = NKikimrConfig::TAppConfig();
1717
app.MutableTableServiceConfig()->SetEnableKqpScanQuerySourceRead(scanSourceRead);
18-
app.MutableTableServiceConfig()->SetEnableKqpDataQueryStreamLookup(streamLookup);
1918
app.MutableTableServiceConfig()->SetEnableKqpDataQueryStreamIdxLookupJoin(streamLookupJoin);
2019
app.MutableTableServiceConfig()->SetEnableOlapSink(true);
2120
app.MutableTableServiceConfig()->SetEnableOltpSink(enableOltpSink);
@@ -110,11 +109,8 @@ Y_UNIT_TEST_SUITE(KqpCost) {
110109
//runtime->SetLogPriority(NKikimrServices::GRPC_SERVER, NActors::NLog::PRI_DEBUG);
111110
}
112111

113-
Y_UNIT_TEST_QUAD(IndexLookup, StreamLookup, useSink) {
114-
if (useSink && !StreamLookup) {
115-
return;
116-
}
117-
TKikimrRunner kikimr(GetAppConfig(true, StreamLookup, false, useSink));
112+
Y_UNIT_TEST_TWIN(IndexLookup, useSink) {
113+
TKikimrRunner kikimr(GetAppConfig(true, false, useSink));
118114
auto db = kikimr.GetTableClient();
119115
auto session = db.CreateSession().GetValueSync().GetSession();
120116

@@ -178,11 +174,8 @@ Y_UNIT_TEST_SUITE(KqpCost) {
178174
UNIT_ASSERT_VALUES_EQUAL(readsByTable.at("/Root/SecondaryKeys/Index/indexImplTable").second, 8);
179175
}
180176

181-
Y_UNIT_TEST_QUAD(IndexLookupAtLeast8BytesInStorage, StreamLookup, useSink) {
182-
if (useSink && !StreamLookup) {
183-
return;
184-
}
185-
TKikimrRunner kikimr(GetAppConfig(true, StreamLookup, false, useSink));
177+
Y_UNIT_TEST_TWIN(IndexLookupAtLeast8BytesInStorage, useSink) {
178+
TKikimrRunner kikimr(GetAppConfig(true, false, useSink));
186179
auto db = kikimr.GetTableClient();
187180
auto session = db.CreateSession().GetValueSync().GetSession();
188181

@@ -247,11 +240,8 @@ Y_UNIT_TEST_SUITE(KqpCost) {
247240
UNIT_ASSERT_VALUES_EQUAL(readsByTable.at("/Root/SecondaryKeys/Index/indexImplTable").second, 8);
248241
}
249242

250-
Y_UNIT_TEST_QUAD(IndexLookupAndTake, StreamLookup, useSink) {
251-
if (useSink && !StreamLookup) {
252-
return;
253-
}
254-
TKikimrRunner kikimr(GetAppConfig(true, StreamLookup, false, useSink));
243+
Y_UNIT_TEST_TWIN(IndexLookupAndTake, useSink) {
244+
TKikimrRunner kikimr(GetAppConfig(true, false, useSink));
255245
auto db = kikimr.GetTableClient();
256246
auto session = db.CreateSession().GetValueSync().GetSession();
257247

@@ -370,7 +360,7 @@ Y_UNIT_TEST_SUITE(KqpCost) {
370360
}
371361

372362
Y_UNIT_TEST_TWIN(IndexLookupJoin, StreamLookupJoin) {
373-
TKikimrRunner kikimr(GetAppConfig(true, true, StreamLookupJoin, false));
363+
TKikimrRunner kikimr(GetAppConfig(true, StreamLookupJoin, false));
374364
auto db = kikimr.GetTableClient();
375365
auto session = db.CreateSession().GetValueSync().GetSession();
376366

@@ -532,7 +522,7 @@ Y_UNIT_TEST_SUITE(KqpCost) {
532522
}
533523

534524
Y_UNIT_TEST(OlapPointLookup) {
535-
TKikimrRunner kikimr(GetAppConfig(false, false));
525+
TKikimrRunner kikimr(GetAppConfig(false));
536526
auto db = kikimr.GetQueryClient();
537527
auto session = db.GetSession().GetValueSync().GetSession();
538528

@@ -622,7 +612,7 @@ Y_UNIT_TEST_SUITE(KqpCost) {
622612
}
623613

624614
Y_UNIT_TEST(OlapWriteRow) {
625-
TKikimrRunner kikimr(GetAppConfig(false, false, false, true));
615+
TKikimrRunner kikimr(GetAppConfig(false, false, true));
626616
auto db = kikimr.GetQueryClient();
627617
auto session = db.GetSession().GetValueSync().GetSession();
628618

@@ -676,7 +666,7 @@ Y_UNIT_TEST_SUITE(KqpCost) {
676666
auto result = session.ExecuteQuery(query, txControl, GetQuerySettings()).ExtractValueSync();
677667
// TODO: fix status?
678668
UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::BAD_REQUEST);
679-
669+
680670
auto stats = NYdb::TProtoAccessor::GetProto(*result.GetStats());
681671

682672
Cerr << stats.DebugString() << Endl;
@@ -789,7 +779,7 @@ Y_UNIT_TEST_SUITE(KqpCost) {
789779
}
790780

791781
Y_UNIT_TEST_TWIN(OltpWriteRow, isSink) {
792-
TKikimrRunner kikimr(GetAppConfig(false, false, false, isSink));
782+
TKikimrRunner kikimr(GetAppConfig(false, false, isSink));
793783
auto db = kikimr.GetQueryClient();
794784
auto session = db.GetSession().GetValueSync().GetSession();
795785

‎ydb/core/kqp/ut/effects/kqp_inplace_update_ut.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ void Test(
6969

7070
// source read and stream lookup use iterator interface, that doesn't use datashard transactions
7171
NKikimrConfig::TAppConfig appConfig;
72-
appConfig.MutableTableServiceConfig()->SetEnableKqpDataQueryStreamLookup(false);
7372

7473
auto settings = TKikimrSettings()
7574
.SetAppConfig(appConfig)
@@ -370,7 +369,6 @@ Y_UNIT_TEST(BigRow) {
370369

371370
// source read use iterator interface, that doesn't use datashard transactions
372371
NKikimrConfig::TAppConfig appConfig;
373-
appConfig.MutableTableServiceConfig()->SetEnableKqpDataQueryStreamLookup(false);
374372

375373
auto settings = TKikimrSettings()
376374
.SetAppConfig(appConfig)

‎ydb/core/kqp/ut/indexes/kqp_indexes_multishard_ut.cpp‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1641,10 +1641,8 @@ Y_UNIT_TEST_SUITE(KqpMultishardIndex) {
16411641
}
16421642
}
16431643

1644-
Y_UNIT_TEST_TWIN(DataColumnUpsertMixedSemantic, StreamLookup) {
1644+
Y_UNIT_TEST(DataColumnUpsertMixedSemantic) {
16451645
NKikimrConfig::TAppConfig appConfig;
1646-
appConfig.MutableTableServiceConfig()->SetEnableKqpDataQueryStreamLookup(StreamLookup);
1647-
16481646
auto setting = NKikimrKqp::TKqpSetting();
16491647
auto serverSettings = TKikimrSettings()
16501648
.SetAppConfig(appConfig)
@@ -1689,10 +1687,8 @@ Y_UNIT_TEST_SUITE(KqpMultishardIndex) {
16891687
}
16901688
}
16911689

1692-
Y_UNIT_TEST_TWIN(DataColumnWriteNull, StreamLookup) {
1690+
Y_UNIT_TEST(DataColumnWriteNull) {
16931691
NKikimrConfig::TAppConfig appConfig;
1694-
appConfig.MutableTableServiceConfig()->SetEnableKqpDataQueryStreamLookup(StreamLookup);
1695-
16961692
auto setting = NKikimrKqp::TKqpSetting();
16971693
auto serverSettings = TKikimrSettings()
16981694
.SetAppConfig(appConfig)
@@ -1771,9 +1767,8 @@ Y_UNIT_TEST_SUITE(KqpMultishardIndex) {
17711767
}
17721768
}
17731769

1774-
Y_UNIT_TEST_TWIN(DataColumnWrite, StreamLookup) {
1770+
Y_UNIT_TEST(DataColumnWrite) {
17751771
NKikimrConfig::TAppConfig appConfig;
1776-
appConfig.MutableTableServiceConfig()->SetEnableKqpDataQueryStreamLookup(StreamLookup);
17771772

17781773
auto setting = NKikimrKqp::TKqpSetting();
17791774
auto serverSettings = TKikimrSettings()
@@ -2171,9 +2166,8 @@ Y_UNIT_TEST_SUITE(KqpMultishardIndex) {
21712166
}
21722167
}
21732168

2174-
Y_UNIT_TEST_TWIN(DataColumnSelect, StreamLookup) {
2169+
Y_UNIT_TEST(DataColumnSelect) {
21752170
NKikimrConfig::TAppConfig appConfig;
2176-
appConfig.MutableTableServiceConfig()->SetEnableKqpDataQueryStreamLookup(StreamLookup);
21772171

21782172
auto setting = NKikimrKqp::TKqpSetting();
21792173
auto serverSettings = TKikimrSettings()
@@ -2268,9 +2262,8 @@ Y_UNIT_TEST_SUITE(KqpMultishardIndex) {
22682262
}
22692263
}
22702264

2271-
Y_UNIT_TEST_TWIN(DuplicateUpsert, StreamLookup) {
2265+
Y_UNIT_TEST(DuplicateUpsert) {
22722266
NKikimrConfig::TAppConfig appConfig;
2273-
appConfig.MutableTableServiceConfig()->SetEnableKqpDataQueryStreamLookup(StreamLookup);
22742267

22752268
auto setting = NKikimrKqp::TKqpSetting();
22762269
auto serverSettings = TKikimrSettings()
@@ -2304,10 +2297,8 @@ Y_UNIT_TEST_SUITE(KqpMultishardIndex) {
23042297
}
23052298
}
23062299

2307-
Y_UNIT_TEST_TWIN(SortByPk, StreamLookup) {
2300+
Y_UNIT_TEST(SortByPk) {
23082301
NKikimrConfig::TAppConfig appConfig;
2309-
appConfig.MutableTableServiceConfig()->SetEnableKqpDataQueryStreamLookup(StreamLookup);
2310-
23112302
auto serverSettings = TKikimrSettings()
23122303
.SetAppConfig(appConfig);
23132304

‎ydb/core/kqp/ut/indexes/kqp_indexes_ut.cpp‎

Lines changed: 16 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -2796,24 +2796,11 @@ Y_UNIT_TEST_SUITE(KqpIndexes) {
27962796

27972797
auto& stats = NYdb::TProtoAccessor::GetProto(*result.GetStats());
27982798

2799-
if (serverSettings.AppConfig.GetTableServiceConfig().GetEnableKqpDataQueryStreamLookup()) {
2800-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access().size(), 2);
2801-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(0).name(), "/Root/TestTable");
2802-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(0).reads().rows(), 3);
2803-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(1).name(), "/Root/TestTable/ix_cust/indexImplTable");
2804-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(1).reads().rows(), 3);
2805-
} else {
2806-
int indexPhaseId = 0;
2807-
int tablePhaseId = 1;
2808-
2809-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(tablePhaseId).table_access().size(), 1);
2810-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(tablePhaseId).table_access(0).name(), "/Root/TestTable");
2811-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(tablePhaseId).table_access(0).reads().rows(), 3);
2812-
2813-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(indexPhaseId).table_access().size(), 1);
2814-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(indexPhaseId).table_access(0).name(), "/Root/TestTable/ix_cust/indexImplTable");
2815-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(indexPhaseId).table_access(0).reads().rows(), 3);
2816-
}
2799+
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access().size(), 2);
2800+
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(0).name(), "/Root/TestTable");
2801+
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(0).reads().rows(), 3);
2802+
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(1).name(), "/Root/TestTable/ix_cust/indexImplTable");
2803+
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(1).reads().rows(), 3);
28172804
}
28182805
}
28192806

@@ -2844,24 +2831,11 @@ Y_UNIT_TEST_SUITE(KqpIndexes) {
28442831

28452832
auto& stats = NYdb::TProtoAccessor::GetProto(*result.GetStats());
28462833

2847-
if (serverSettings.AppConfig.GetTableServiceConfig().GetEnableKqpDataQueryStreamLookup()) {
2848-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access().size(), 2);
2849-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(0).name(), "/Root/TestTable");
2850-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(0).reads().rows(), 2);
2851-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(1).name(), "/Root/TestTable/ix_cust2/indexImplTable");
2852-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(1).reads().rows(), 2);
2853-
} else {
2854-
int indexPhaseId = 0;
2855-
int tablePhaseId = 1;
2856-
2857-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(tablePhaseId).table_access().size(), 1);
2858-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(tablePhaseId).table_access(0).name(), "/Root/TestTable");
2859-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(tablePhaseId).table_access(0).reads().rows(), 2);
2860-
2861-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(indexPhaseId).table_access().size(), 1);
2862-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(indexPhaseId).table_access(0).name(), "/Root/TestTable/ix_cust2/indexImplTable");
2863-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(indexPhaseId).table_access(0).reads().rows(), 2);
2864-
}
2834+
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access().size(), 2);
2835+
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(0).name(), "/Root/TestTable");
2836+
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(0).reads().rows(), 2);
2837+
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(1).name(), "/Root/TestTable/ix_cust2/indexImplTable");
2838+
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(1).reads().rows(), 2);
28652839
}
28662840
}
28672841

@@ -4855,7 +4829,6 @@ R"([[#;#;["Primary1"];[41u]];[["Secondary2"];[2u];["Primary2"];[42u]];[["Seconda
48554829
.SetKqpSettings({setting});
48564830

48574831
NKikimrConfig::TAppConfig appConfig;
4858-
appConfig.MutableTableServiceConfig()->SetEnableKqpDataQueryStreamLookup(true);
48594832
appConfig.MutableTableServiceConfig()->SetEnableKqpDataQueryStreamIdxLookupJoin(true);
48604833
// setting channel buffer size so small to make sure that we will be able to transfer at least
48614834
// one row in stream lookup.
@@ -4998,30 +4971,13 @@ R"([[#;#;["Primary1"];[41u]];[["Secondary2"];[2u];["Primary2"];[42u]];[["Seconda
49984971

49994972
auto& stats = NYdb::TProtoAccessor::GetProto(*result2.GetStats());
50004973

5001-
int readPhase = 0;
5002-
if (serverSettings.AppConfig.GetTableServiceConfig().GetEnableKqpDataQueryStreamLookup()) {
5003-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases().size(), 1);
5004-
5005-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(readPhase).table_access().size(), 2);
5006-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(readPhase).table_access(0).name(), "/Root/SecondaryComplexKeys");
5007-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(readPhase).table_access(0).reads().rows(), 1);
5008-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(readPhase).table_access(1).name(), "/Root/SecondaryComplexKeys/Index/indexImplTable");
5009-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(readPhase).table_access(1).reads().rows(), 1);
5010-
} else {
5011-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases().size(), 3);
5012-
5013-
readPhase++;
5014-
5015-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(readPhase).table_access().size(), 1);
5016-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(readPhase).table_access(0).name(), "/Root/SecondaryComplexKeys/Index/indexImplTable");
5017-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(readPhase).table_access(0).reads().rows(), 1);
5018-
5019-
readPhase++;
4974+
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases().size(), 1);
50204975

5021-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(readPhase).table_access().size(), 1);
5022-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(readPhase).table_access(0).name(), "/Root/SecondaryComplexKeys");
5023-
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(readPhase).table_access(0).reads().rows(), 1);
5024-
}
4976+
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access().size(), 2);
4977+
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(0).name(), "/Root/SecondaryComplexKeys");
4978+
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(0).reads().rows(), 1);
4979+
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(1).name(), "/Root/SecondaryComplexKeys/Index/indexImplTable");
4980+
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(1).reads().rows(), 1);
50254981
}
50264982
}
50274983

0 commit comments

Comments
 (0)