Skip to content

Revert greedy fetch in GraceJoinCore and use of GraceJoinCore for Map-Broadcast #15454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hor911 merged 2 commits into from
Mar 8, 2025
Merged

Revert greedy fetch in GraceJoinCore and use of GraceJoinCore for Map-Broadcast #15454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb15ad0
Revert use of GraceJoinCore for map/broadcast by default (#14974)
Hor911 Feb 25, 2025
f4d08be
Revert commit rXXXXXX, Fix grace join tpc-ds 10 hanging
Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions ydb/core/kqp/kqp_default_settings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,3 @@ DefaultSettings {
Name: "_KqpDisableLlvmForUdfStages"
Value: "false"
}

DefaultSettings {
Name: "UseGraceJoinCoreForMap"
Value: "true"
}
10 changes: 5 additions & 5 deletions ydb/core/kqp/ut/query/kqp_explain_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
NJson::ReadJsonTree(*res.PlanJson, &plan, true);
UNIT_ASSERT(ValidatePlanNodeIds(plan));

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

auto join = FindPlanNodeByKv(plan, "Node Type", "Aggregate-InnerJoin (MapJoin)-Filter-TableFullScan-Filter");
auto join = FindPlanNodeByKv(plan, "Node Type", "Aggregate-InnerJoin (MapJoin)-Filter-TableFullScan");
UNIT_ASSERT(join.IsDefined());
auto left = FindPlanNodeByKv(join, "Table", "EightShard");
UNIT_ASSERT(left.IsDefined());
Expand Down Expand Up @@ -203,7 +203,7 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
auto join = FindPlanNodeByKv(
plan,
"Node Type",
"Aggregate-InnerJoin (MapJoin)-Filter-TableFullScan-Filter"
"Aggregate-InnerJoin (MapJoin)-Filter-TableFullScan"
);

UNIT_ASSERT(join.IsDefined());
Expand Down Expand Up @@ -366,9 +366,9 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
NJson::ReadJsonTree(*res.PlanJson, &plan, true);
UNIT_ASSERT(ValidatePlanNodeIds(plan));

auto join1 = FindPlanNodeByKv(plan, "Node Type", "Sort-InnerJoin (MapJoin)-Filter-Filter");
auto join1 = FindPlanNodeByKv(plan, "Node Type", "Sort-InnerJoin (MapJoin)-Filter");
UNIT_ASSERT(join1.IsDefined());
auto join2 = FindPlanNodeByKv(plan, "Node Type", "Aggregate-InnerJoin (MapJoin)-Filter-Filter");
auto join2 = FindPlanNodeByKv(plan, "Node Type", "Aggregate-InnerJoin (MapJoin)-Filter");
UNIT_ASSERT(join2.IsDefined());
}

Expand Down
13 changes: 2 additions & 11 deletions ...calFolder1.test_case_join_group_by_lookup.script-script_/join_group_by_lookup.script.plan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"Plans": [
{
"CTE Name": "precompute_0_0",
"Node Type": "TopSort-LeftJoin (MapJoin)-ConstantExpr-Filter",
"Node Type": "TopSort-LeftJoin (MapJoin)-ConstantExpr",
"Operators": [
{
"Inputs": [
Expand All @@ -55,7 +55,7 @@
"InternalOperatorId": 2
},
{
"InternalOperatorId": 3
"ExternalPlanNodeId": 14
}
],
"Name": "LeftJoin (MapJoin)"
Expand All @@ -64,15 +64,6 @@
"Inputs": [],
"Name": "ToFlow",
"ToFlow": "precompute_0_0"
},
{
"Inputs": [
{
"ExternalPlanNodeId": 14
}
],
"Name": "Filter",
"Predicate": "Exist(item.Group)"
}
],
"PlanNodeId": 15,
Expand Down
26 changes: 4 additions & 22 deletions ...test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_1.plan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"Plans": [
{
"CTE Name": "precompute_1_0",
"Node Type": "TopSort-LeftJoin (MapJoin)-ConstantExpr-Filter",
"Node Type": "TopSort-LeftJoin (MapJoin)-ConstantExpr",
"Operators": [
{
"Inputs": [
Expand All @@ -49,7 +49,7 @@
"InternalOperatorId": 2
},
{
"InternalOperatorId": 3
"ExternalPlanNodeId": 23
}
],
"Name": "LeftJoin (MapJoin)"
Expand All @@ -58,15 +58,6 @@
"Inputs": [],
"Name": "ToFlow",
"ToFlow": "precompute_1_0"
},
{
"Inputs": [
{
"ExternalPlanNodeId": 23
}
],
"Name": "Filter",
"Predicate": "Exist(item.x)"
}
],
"PlanNodeId": 24,
Expand Down Expand Up @@ -175,7 +166,7 @@
"Plans": [
{
"CTE Name": "precompute_0_0",
"Node Type": "LeftJoin (MapJoin)-ConstantExpr-Filter",
"Node Type": "LeftJoin (MapJoin)-ConstantExpr",
"Operators": [
{
"Condition": "a.x = qt.x",
Expand All @@ -184,7 +175,7 @@
"InternalOperatorId": 1
},
{
"InternalOperatorId": 2
"ExternalPlanNodeId": 12
}
],
"Name": "LeftJoin (MapJoin)"
Expand All @@ -193,15 +184,6 @@
"Inputs": [],
"Name": "ToFlow",
"ToFlow": "precompute_0_0"
},
{
"Inputs": [
{
"ExternalPlanNodeId": 12
}
],
"Name": "Filter",
"Predicate": "Exist(item.x)"
}
],
"PlanNodeId": 13,
Expand Down
13 changes: 2 additions & 11 deletions ...test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_2.plan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"Plans": [
{
"CTE Name": "precompute_0_0",
"Node Type": "TopSort-LeftJoin (MapJoin)-ConstantExpr-Filter",
"Node Type": "TopSort-LeftJoin (MapJoin)-ConstantExpr",
"Operators": [
{
"Inputs": [
Expand All @@ -49,7 +49,7 @@
"InternalOperatorId": 2
},
{
"InternalOperatorId": 3
"ExternalPlanNodeId": 12
}
],
"Name": "LeftJoin (MapJoin)"
Expand All @@ -58,15 +58,6 @@
"Inputs": [],
"Name": "ToFlow",
"ToFlow": "precompute_0_0"
},
{
"Inputs": [
{
"ExternalPlanNodeId": 12
}
],
"Name": "Filter",
"Predicate": "Exist(item.x)"
}
],
"PlanNodeId": 13,
Expand Down
13 changes: 2 additions & 11 deletions ...test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_3.plan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"Plans": [
{
"CTE Name": "precompute_0_0",
"Node Type": "TopSort-LeftJoin (MapJoin)-ConstantExpr-Filter",
"Node Type": "TopSort-LeftJoin (MapJoin)-ConstantExpr",
"Operators": [
{
"Inputs": [
Expand All @@ -49,7 +49,7 @@
"InternalOperatorId": 2
},
{
"InternalOperatorId": 3
"ExternalPlanNodeId": 12
}
],
"Name": "LeftJoin (MapJoin)"
Expand All @@ -58,15 +58,6 @@
"Inputs": [],
"Name": "ToFlow",
"ToFlow": "precompute_0_0"
},
{
"Inputs": [
{
"ExternalPlanNodeId": 12
}
],
"Name": "Filter",
"Predicate": "Exist(item.x)"
}
],
"PlanNodeId": 13,
Expand Down
13 changes: 2 additions & 11 deletions ...test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_4.plan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"Plans": [
{
"CTE Name": "precompute_0_0",
"Node Type": "TopSort-LeftJoin (MapJoin)-ConstantExpr-Filter",
"Node Type": "TopSort-LeftJoin (MapJoin)-ConstantExpr",
"Operators": [
{
"Inputs": [
Expand All @@ -49,7 +49,7 @@
"InternalOperatorId": 2
},
{
"InternalOperatorId": 3
"ExternalPlanNodeId": 12
}
],
"Name": "LeftJoin (MapJoin)"
Expand All @@ -58,15 +58,6 @@
"Inputs": [],
"Name": "ToFlow",
"ToFlow": "precompute_0_0"
},
{
"Inputs": [
{
"ExternalPlanNodeId": 12
}
],
"Name": "Filter",
"Predicate": "Exist(item.pkxx)"
}
],
"PlanNodeId": 13,
Expand Down
13 changes: 2 additions & 11 deletions ...ostgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_2.plan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"Plans": [
{
"CTE Name": "precompute_0_0",
"Node Type": "Aggregate-LeftJoin (MapJoin)-ConstantExpr-Filter",
"Node Type": "Aggregate-LeftJoin (MapJoin)-ConstantExpr",
"Operators": [
{
"Aggregation": "{COUNT(item.t1.q1)}",
Expand All @@ -83,7 +83,7 @@
"InternalOperatorId": 2
},
{
"InternalOperatorId": 3
"ExternalPlanNodeId": 12
}
],
"Name": "LeftJoin (MapJoin)"
Expand All @@ -92,15 +92,6 @@
"Inputs": [],
"Name": "ToFlow",
"ToFlow": "precompute_0_0"
},
{
"Inputs": [
{
"ExternalPlanNodeId": 12
}
],
"Name": "Filter",
"Predicate": "Exist(item.q1)"
}
],
"PlanNodeId": 13,
Expand Down
13 changes: 2 additions & 11 deletions ...ostgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_3.plan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"Plans": [
{
"CTE Name": "precompute_0_0",
"Node Type": "Aggregate-LeftJoin (MapJoin)-ConstantExpr-Filter",
"Node Type": "Aggregate-LeftJoin (MapJoin)-ConstantExpr",
"Operators": [
{
"Aggregation": "{COUNT(item.t2.q1)}",
Expand All @@ -83,7 +83,7 @@
"InternalOperatorId": 2
},
{
"InternalOperatorId": 3
"ExternalPlanNodeId": 12
}
],
"Name": "LeftJoin (MapJoin)"
Expand All @@ -92,15 +92,6 @@
"Inputs": [],
"Name": "ToFlow",
"ToFlow": "precompute_0_0"
},
{
"Inputs": [
{
"ExternalPlanNodeId": 12
}
],
"Name": "Filter",
"Predicate": "Exist(item.q1)"
}
],
"PlanNodeId": 13,
Expand Down
Loading
Loading