Skip to content

Commit eb15ad0

Browse files
Hor911Hor911
committed
Revert use of GraceJoinCore for map/broadcast by default (ydb-platform#14974)
1 parent 97bd83c commit eb15ad0

File tree

62 files changed

+405
-881
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+405
-881
lines changed

‎ydb/core/kqp/kqp_default_settings.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,3 @@ DefaultSettings {
7272
Name: "_KqpDisableLlvmForUdfStages"
7373
Value: "false"
7474
}
75-
76-
DefaultSettings {
77-
Name: "UseGraceJoinCoreForMap"
78-
Value: "true"
79-
}

‎ydb/core/kqp/ut/query/kqp_explain_ut.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
8585
NJson::ReadJsonTree(*res.PlanJson, &plan, true);
8686
UNIT_ASSERT(ValidatePlanNodeIds(plan));
8787

88-
auto join = FindPlanNodeByKv(plan, "Node Type", "Aggregate-InnerJoin (MapJoin)-Filter-TableFullScan-Filter");
88+
auto join = FindPlanNodeByKv(plan, "Node Type", "Aggregate-InnerJoin (MapJoin)-Filter-TableFullScan");
8989
UNIT_ASSERT(join.IsDefined());
9090
auto left = FindPlanNodeByKv(join, "Table", "EightShard");
9191
UNIT_ASSERT(left.IsDefined());
@@ -113,7 +113,7 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
113113
NJson::ReadJsonTree(*res.PlanJson, &plan, true);
114114
UNIT_ASSERT(ValidatePlanNodeIds(plan));
115115

116-
auto join = FindPlanNodeByKv(plan, "Node Type", "Aggregate-InnerJoin (MapJoin)-Filter-TableFullScan-Filter");
116+
auto join = FindPlanNodeByKv(plan, "Node Type", "Aggregate-InnerJoin (MapJoin)-Filter-TableFullScan");
117117
UNIT_ASSERT(join.IsDefined());
118118
auto left = FindPlanNodeByKv(join, "Table", "EightShard");
119119
UNIT_ASSERT(left.IsDefined());
@@ -203,7 +203,7 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
203203
auto join = FindPlanNodeByKv(
204204
plan,
205205
"Node Type",
206-
"Aggregate-InnerJoin (MapJoin)-Filter-TableFullScan-Filter"
206+
"Aggregate-InnerJoin (MapJoin)-Filter-TableFullScan"
207207
);
208208

209209
UNIT_ASSERT(join.IsDefined());
@@ -366,9 +366,9 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
366366
NJson::ReadJsonTree(*res.PlanJson, &plan, true);
367367
UNIT_ASSERT(ValidatePlanNodeIds(plan));
368368

369-
auto join1 = FindPlanNodeByKv(plan, "Node Type", "Sort-InnerJoin (MapJoin)-Filter-Filter");
369+
auto join1 = FindPlanNodeByKv(plan, "Node Type", "Sort-InnerJoin (MapJoin)-Filter");
370370
UNIT_ASSERT(join1.IsDefined());
371-
auto join2 = FindPlanNodeByKv(plan, "Node Type", "Aggregate-InnerJoin (MapJoin)-Filter-Filter");
371+
auto join2 = FindPlanNodeByKv(plan, "Node Type", "Aggregate-InnerJoin (MapJoin)-Filter");
372372
UNIT_ASSERT(join2.IsDefined());
373373
}
374374

‎ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_group_by_lookup.script-script_/join_group_by_lookup.script.plan

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"Plans": [
3737
{
3838
"CTE Name": "precompute_0_0",
39-
"Node Type": "TopSort-LeftJoin (MapJoin)-ConstantExpr-Filter",
39+
"Node Type": "TopSort-LeftJoin (MapJoin)-ConstantExpr",
4040
"Operators": [
4141
{
4242
"Inputs": [
@@ -55,7 +55,7 @@
5555
"InternalOperatorId": 2
5656
},
5757
{
58-
"InternalOperatorId": 3
58+
"ExternalPlanNodeId": 14
5959
}
6060
],
6161
"Name": "LeftJoin (MapJoin)"
@@ -64,15 +64,6 @@
6464
"Inputs": [],
6565
"Name": "ToFlow",
6666
"ToFlow": "precompute_0_0"
67-
},
68-
{
69-
"Inputs": [
70-
{
71-
"ExternalPlanNodeId": 14
72-
}
73-
],
74-
"Name": "Filter",
75-
"Predicate": "Exist(item.Group)"
7667
}
7768
],
7869
"PlanNodeId": 15,

‎ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_1.plan

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"Plans": [
3131
{
3232
"CTE Name": "precompute_1_0",
33-
"Node Type": "TopSort-LeftJoin (MapJoin)-ConstantExpr-Filter",
33+
"Node Type": "TopSort-LeftJoin (MapJoin)-ConstantExpr",
3434
"Operators": [
3535
{
3636
"Inputs": [
@@ -49,7 +49,7 @@
4949
"InternalOperatorId": 2
5050
},
5151
{
52-
"InternalOperatorId": 3
52+
"ExternalPlanNodeId": 23
5353
}
5454
],
5555
"Name": "LeftJoin (MapJoin)"
@@ -58,15 +58,6 @@
5858
"Inputs": [],
5959
"Name": "ToFlow",
6060
"ToFlow": "precompute_1_0"
61-
},
62-
{
63-
"Inputs": [
64-
{
65-
"ExternalPlanNodeId": 23
66-
}
67-
],
68-
"Name": "Filter",
69-
"Predicate": "Exist(item.x)"
7061
}
7162
],
7263
"PlanNodeId": 24,
@@ -175,7 +166,7 @@
175166
"Plans": [
176167
{
177168
"CTE Name": "precompute_0_0",
178-
"Node Type": "LeftJoin (MapJoin)-ConstantExpr-Filter",
169+
"Node Type": "LeftJoin (MapJoin)-ConstantExpr",
179170
"Operators": [
180171
{
181172
"Condition": "a.x = qt.x",
@@ -184,7 +175,7 @@
184175
"InternalOperatorId": 1
185176
},
186177
{
187-
"InternalOperatorId": 2
178+
"ExternalPlanNodeId": 12
188179
}
189180
],
190181
"Name": "LeftJoin (MapJoin)"
@@ -193,15 +184,6 @@
193184
"Inputs": [],
194185
"Name": "ToFlow",
195186
"ToFlow": "precompute_0_0"
196-
},
197-
{
198-
"Inputs": [
199-
{
200-
"ExternalPlanNodeId": 12
201-
}
202-
],
203-
"Name": "Filter",
204-
"Predicate": "Exist(item.x)"
205187
}
206188
],
207189
"PlanNodeId": 13,

‎ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_2.plan

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"Plans": [
3131
{
3232
"CTE Name": "precompute_0_0",
33-
"Node Type": "TopSort-LeftJoin (MapJoin)-ConstantExpr-Filter",
33+
"Node Type": "TopSort-LeftJoin (MapJoin)-ConstantExpr",
3434
"Operators": [
3535
{
3636
"Inputs": [
@@ -49,7 +49,7 @@
4949
"InternalOperatorId": 2
5050
},
5151
{
52-
"InternalOperatorId": 3
52+
"ExternalPlanNodeId": 12
5353
}
5454
],
5555
"Name": "LeftJoin (MapJoin)"
@@ -58,15 +58,6 @@
5858
"Inputs": [],
5959
"Name": "ToFlow",
6060
"ToFlow": "precompute_0_0"
61-
},
62-
{
63-
"Inputs": [
64-
{
65-
"ExternalPlanNodeId": 12
66-
}
67-
],
68-
"Name": "Filter",
69-
"Predicate": "Exist(item.x)"
7061
}
7162
],
7263
"PlanNodeId": 13,

‎ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_3.plan

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"Plans": [
3131
{
3232
"CTE Name": "precompute_0_0",
33-
"Node Type": "TopSort-LeftJoin (MapJoin)-ConstantExpr-Filter",
33+
"Node Type": "TopSort-LeftJoin (MapJoin)-ConstantExpr",
3434
"Operators": [
3535
{
3636
"Inputs": [
@@ -49,7 +49,7 @@
4949
"InternalOperatorId": 2
5050
},
5151
{
52-
"InternalOperatorId": 3
52+
"ExternalPlanNodeId": 12
5353
}
5454
],
5555
"Name": "LeftJoin (MapJoin)"
@@ -58,15 +58,6 @@
5858
"Inputs": [],
5959
"Name": "ToFlow",
6060
"ToFlow": "precompute_0_0"
61-
},
62-
{
63-
"Inputs": [
64-
{
65-
"ExternalPlanNodeId": 12
66-
}
67-
],
68-
"Name": "Filter",
69-
"Predicate": "Exist(item.x)"
7061
}
7162
],
7263
"PlanNodeId": 13,

‎ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_4.plan

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"Plans": [
3131
{
3232
"CTE Name": "precompute_0_0",
33-
"Node Type": "TopSort-LeftJoin (MapJoin)-ConstantExpr-Filter",
33+
"Node Type": "TopSort-LeftJoin (MapJoin)-ConstantExpr",
3434
"Operators": [
3535
{
3636
"Inputs": [
@@ -49,7 +49,7 @@
4949
"InternalOperatorId": 2
5050
},
5151
{
52-
"InternalOperatorId": 3
52+
"ExternalPlanNodeId": 12
5353
}
5454
],
5555
"Name": "LeftJoin (MapJoin)"
@@ -58,15 +58,6 @@
5858
"Inputs": [],
5959
"Name": "ToFlow",
6060
"ToFlow": "precompute_0_0"
61-
},
62-
{
63-
"Inputs": [
64-
{
65-
"ExternalPlanNodeId": 12
66-
}
67-
],
68-
"Name": "Filter",
69-
"Predicate": "Exist(item.pkxx)"
7061
}
7162
],
7263
"PlanNodeId": 13,

‎ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_2.plan

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"Plans": [
6464
{
6565
"CTE Name": "precompute_0_0",
66-
"Node Type": "Aggregate-LeftJoin (MapJoin)-ConstantExpr-Filter",
66+
"Node Type": "Aggregate-LeftJoin (MapJoin)-ConstantExpr",
6767
"Operators": [
6868
{
6969
"Aggregation": "{COUNT(item.t1.q1)}",
@@ -83,7 +83,7 @@
8383
"InternalOperatorId": 2
8484
},
8585
{
86-
"InternalOperatorId": 3
86+
"ExternalPlanNodeId": 12
8787
}
8888
],
8989
"Name": "LeftJoin (MapJoin)"
@@ -92,15 +92,6 @@
9292
"Inputs": [],
9393
"Name": "ToFlow",
9494
"ToFlow": "precompute_0_0"
95-
},
96-
{
97-
"Inputs": [
98-
{
99-
"ExternalPlanNodeId": 12
100-
}
101-
],
102-
"Name": "Filter",
103-
"Predicate": "Exist(item.q1)"
10495
}
10596
],
10697
"PlanNodeId": 13,

‎ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_3.plan

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"Plans": [
6464
{
6565
"CTE Name": "precompute_0_0",
66-
"Node Type": "Aggregate-LeftJoin (MapJoin)-ConstantExpr-Filter",
66+
"Node Type": "Aggregate-LeftJoin (MapJoin)-ConstantExpr",
6767
"Operators": [
6868
{
6969
"Aggregation": "{COUNT(item.t2.q1)}",
@@ -83,7 +83,7 @@
8383
"InternalOperatorId": 2
8484
},
8585
{
86-
"InternalOperatorId": 3
86+
"ExternalPlanNodeId": 12
8787
}
8888
],
8989
"Name": "LeftJoin (MapJoin)"
@@ -92,15 +92,6 @@
9292
"Inputs": [],
9393
"Name": "ToFlow",
9494
"ToFlow": "precompute_0_0"
95-
},
96-
{
97-
"Inputs": [
98-
{
99-
"ExternalPlanNodeId": 12
100-
}
101-
],
102-
"Name": "Filter",
103-
"Predicate": "Exist(item.q1)"
10495
}
10596
],
10697
"PlanNodeId": 13,

0 commit comments

Comments
 (0)