Skip to content

Commit a2a011a

Browse files
committed
Fixed join order unit test, broken by bad merge (ydb-platform#9631) (ydb-platform#9685)
1 parent 35ffc15 commit a2a011a

File tree

1 file changed

+8
-23
lines changed

1 file changed

+8
-23
lines changed

ydb/core/kqp/ut/join/kqp_join_order_ut.cpp

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@ static TKikimrRunner GetKikimrWithJoinSettings(bool useStreamLookupJoin = false,
9494
return TKikimrRunner(serverSettings);
9595
}
9696

97+
void PrintPlan(const TString& plan) {
98+
Cout << plan << Endl;
99+
}
100+
97101
class TChainTester {
98102
public:
99103
TChainTester(size_t chainSize)
@@ -158,9 +162,10 @@ class TChainTester {
158162
);
159163
}
160164

161-
auto result = Session.ExecuteDataQuery(joinRequest, TTxControl::BeginTx().CommitTx()).ExtractValueSync();
165+
auto result = Session.ExplainDataQuery(joinRequest).ExtractValueSync();
162166
result.GetIssues().PrintTo(Cerr);
163167
UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::SUCCESS);
168+
PrintPlan(result.GetPlan());
164169
}
165170

166171
TKikimrRunner Kikimr;
@@ -208,28 +213,8 @@ void ExecuteJoinOrderTestDataQuery(const TString& queryPath, bool useStreamLooku
208213
}
209214

210215
Y_UNIT_TEST_SUITE(KqpJoinOrder) {
211-
//Y_UNIT_TEST(Chain65Nodes) {
212-
// TChainTester(65).Test();
213-
//}
214-
215-
TString ExecuteJoinOrderTestDataQueryWithStats(const TString& queryPath, const TString& statsPath, bool useStreamLookupJoin, bool useColumnStore) {
216-
auto kikimr = GetKikimrWithJoinSettings(useStreamLookupJoin, GetStatic(statsPath));
217-
auto db = kikimr.GetTableClient();
218-
auto session = db.CreateSession().GetValueSync().GetSession();
219-
220-
CreateSampleTable(session, useColumnStore);
221-
222-
/* join with parameters */
223-
{
224-
const TString query = GetStatic(queryPath);
225-
226-
auto execRes = db.StreamExecuteScanQuery(query, TStreamExecScanQuerySettings().Explain(true)).ExtractValueSync();
227-
execRes.GetIssues().PrintTo(Cerr);
228-
UNIT_ASSERT_VALUES_EQUAL(execRes.GetStatus(), EStatus::SUCCESS);
229-
auto plan = CollectStreamResult(execRes).PlanJson;
230-
Cerr << plan.GetRef();
231-
return plan.GetRef();
232-
}
216+
Y_UNIT_TEST(Chain65Nodes) {
217+
TChainTester(65).Test();
233218
}
234219

235220
void CheckJoinCardinality(const TString& queryPath, const TString& statsPath, const TString& joinKind, double card, bool useStreamLookupJoin, bool useColumnStore) {

0 commit comments

Comments
 (0)