Skip to content

Commit 031ecfb

Browse files
Hor911Hor911
authored
Merge 1b09bac into 389847d 
2 parents 389847d + 1b09bac commit 031ecfb

File tree

62 files changed

+432
-908
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

+432
-908
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
@@ -35,7 +35,7 @@
3535
"PlanNodeType": "Connection",
3636
"Plans": [
3737
{
38-
"Node Type": "TopSort-LeftJoin (MapJoin)-Filter",
38+
"Node Type": "TopSort-LeftJoin (MapJoin)",
3939
"Operators": [
4040
{
4141
"Inputs": [
@@ -53,20 +53,11 @@
5353
{
5454
"ExternalPlanNodeId": 17
5555
},
56-
{
57-
"InternalOperatorId": 2
58-
}
59-
],
60-
"Name": "LeftJoin (MapJoin)"
61-
},
62-
{
63-
"Inputs": [
6456
{
6557
"ExternalPlanNodeId": 15
6658
}
6759
],
68-
"Name": "Filter",
69-
"Predicate": "Exist(item.Group)"
60+
"Name": "LeftJoin (MapJoin)"
7061
}
7162
],
7263
"PlanNodeId": 18,

‎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
@@ -29,7 +29,7 @@
2929
"PlanNodeType": "Connection",
3030
"Plans": [
3131
{
32-
"Node Type": "TopSort-LeftJoin (MapJoin)-Filter",
32+
"Node Type": "TopSort-LeftJoin (MapJoin)",
3333
"Operators": [
3434
{
3535
"Inputs": [
@@ -47,20 +47,11 @@
4747
{
4848
"ExternalPlanNodeId": 29
4949
},
50-
{
51-
"InternalOperatorId": 2
52-
}
53-
],
54-
"Name": "LeftJoin (MapJoin)"
55-
},
56-
{
57-
"Inputs": [
5850
{
5951
"ExternalPlanNodeId": 27
6052
}
6153
],
62-
"Name": "Filter",
63-
"Predicate": "Exist(item.x)"
54+
"Name": "LeftJoin (MapJoin)"
6455
}
6556
],
6657
"PlanNodeId": 30,
@@ -189,28 +180,19 @@
189180
"PlanNodeType": "Connection",
190181
"Plans": [
191182
{
192-
"Node Type": "LeftJoin (MapJoin)-Filter",
183+
"Node Type": "LeftJoin (MapJoin)",
193184
"Operators": [
194185
{
195186
"Condition": "a.x = qt.x",
196187
"Inputs": [
197188
{
198189
"ExternalPlanNodeId": 15
199190
},
200-
{
201-
"InternalOperatorId": 1
202-
}
203-
],
204-
"Name": "LeftJoin (MapJoin)"
205-
},
206-
{
207-
"Inputs": [
208191
{
209192
"ExternalPlanNodeId": 13
210193
}
211194
],
212-
"Name": "Filter",
213-
"Predicate": "Exist(item.x)"
195+
"Name": "LeftJoin (MapJoin)"
214196
}
215197
],
216198
"PlanNodeId": 16,

‎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
@@ -29,7 +29,7 @@
2929
"PlanNodeType": "Connection",
3030
"Plans": [
3131
{
32-
"Node Type": "TopSort-LeftJoin (MapJoin)-Filter",
32+
"Node Type": "TopSort-LeftJoin (MapJoin)",
3333
"Operators": [
3434
{
3535
"Inputs": [
@@ -47,20 +47,11 @@
4747
{
4848
"ExternalPlanNodeId": 15
4949
},
50-
{
51-
"InternalOperatorId": 2
52-
}
53-
],
54-
"Name": "LeftJoin (MapJoin)"
55-
},
56-
{
57-
"Inputs": [
5850
{
5951
"ExternalPlanNodeId": 13
6052
}
6153
],
62-
"Name": "Filter",
63-
"Predicate": "Exist(item.x)"
54+
"Name": "LeftJoin (MapJoin)"
6455
}
6556
],
6657
"PlanNodeId": 16,

‎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
@@ -29,7 +29,7 @@
2929
"PlanNodeType": "Connection",
3030
"Plans": [
3131
{
32-
"Node Type": "TopSort-LeftJoin (MapJoin)-Filter",
32+
"Node Type": "TopSort-LeftJoin (MapJoin)",
3333
"Operators": [
3434
{
3535
"Inputs": [
@@ -47,20 +47,11 @@
4747
{
4848
"ExternalPlanNodeId": 15
4949
},
50-
{
51-
"InternalOperatorId": 2
52-
}
53-
],
54-
"Name": "LeftJoin (MapJoin)"
55-
},
56-
{
57-
"Inputs": [
5850
{
5951
"ExternalPlanNodeId": 13
6052
}
6153
],
62-
"Name": "Filter",
63-
"Predicate": "Exist(item.x)"
54+
"Name": "LeftJoin (MapJoin)"
6455
}
6556
],
6657
"PlanNodeId": 16,

‎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
@@ -29,7 +29,7 @@
2929
"PlanNodeType": "Connection",
3030
"Plans": [
3131
{
32-
"Node Type": "TopSort-LeftJoin (MapJoin)-Filter",
32+
"Node Type": "TopSort-LeftJoin (MapJoin)",
3333
"Operators": [
3434
{
3535
"Inputs": [
@@ -47,20 +47,11 @@
4747
{
4848
"ExternalPlanNodeId": 15
4949
},
50-
{
51-
"InternalOperatorId": 2
52-
}
53-
],
54-
"Name": "LeftJoin (MapJoin)"
55-
},
56-
{
57-
"Inputs": [
5850
{
5951
"ExternalPlanNodeId": 13
6052
}
6153
],
62-
"Name": "Filter",
63-
"Predicate": "Exist(item.pkxx)"
54+
"Name": "LeftJoin (MapJoin)"
6455
}
6556
],
6657
"PlanNodeId": 16,

‎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
@@ -62,7 +62,7 @@
6262
"PlanNodeType": "Connection",
6363
"Plans": [
6464
{
65-
"Node Type": "Aggregate-LeftJoin (MapJoin)-Filter",
65+
"Node Type": "Aggregate-LeftJoin (MapJoin)",
6666
"Operators": [
6767
{
6868
"Aggregation": "{COUNT(item.t1.q1)}",
@@ -81,20 +81,11 @@
8181
{
8282
"ExternalPlanNodeId": 15
8383
},
84-
{
85-
"InternalOperatorId": 2
86-
}
87-
],
88-
"Name": "LeftJoin (MapJoin)"
89-
},
90-
{
91-
"Inputs": [
9284
{
9385
"ExternalPlanNodeId": 13
9486
}
9587
],
96-
"Name": "Filter",
97-
"Predicate": "Exist(item.q1)"
88+
"Name": "LeftJoin (MapJoin)"
9889
}
9990
],
10091
"PlanNodeId": 16,

‎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
@@ -62,7 +62,7 @@
6262
"PlanNodeType": "Connection",
6363
"Plans": [
6464
{
65-
"Node Type": "Aggregate-LeftJoin (MapJoin)-Filter",
65+
"Node Type": "Aggregate-LeftJoin (MapJoin)",
6666
"Operators": [
6767
{
6868
"Aggregation": "{COUNT(item.t2.q1)}",
@@ -81,20 +81,11 @@
8181
{
8282
"ExternalPlanNodeId": 15
8383
},
84-
{
85-
"InternalOperatorId": 2
86-
}
87-
],
88-
"Name": "LeftJoin (MapJoin)"
89-
},
90-
{
91-
"Inputs": [
9284
{
9385
"ExternalPlanNodeId": 13
9486
}
9587
],
96-
"Name": "Filter",
97-
"Predicate": "Exist(item.q1)"
88+
"Name": "LeftJoin (MapJoin)"
9889
}
9990
],
10091
"PlanNodeId": 16,

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"PlanNodeType": "Connection",
6363
"Plans": [
6464
{
65-
"Node Type": "Aggregate-LeftJoin (MapJoin)-Filter",
65+
"Node Type": "Aggregate-LeftJoin (MapJoin)",
6666
"Operators": [
6767
{
6868
"Aggregation": "{COUNT(item.t2.q1)}",
@@ -81,20 +81,11 @@
8181
{
8282
"ExternalPlanNodeId": 10
8383
},
84-
{
85-
"InternalOperatorId": 2
86-
}
87-
],
88-
"Name": "LeftJoin (MapJoin)"
89-
},
90-
{
91-
"Inputs": [
9284
{
9385
"ExternalPlanNodeId": 7
9486
}
9587
],
96-
"Name": "Filter",
97-
"Predicate": "Exist(item.q1)"
88+
"Name": "LeftJoin (MapJoin)"
9889
}
9990
],
10091
"PlanNodeId": 11,

0 commit comments

Comments
 (0)