Skip to content
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

Jump to bottom

Remove duplicate join conditions #10235

Merged
merged 3 commits into from Jan 16, 2024
Merged

Remove duplicate join conditions #10235

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e39d09c
remove duplicate join conditions
lnkuiper Jan 15, 2024
7b65c1d
Merge branch 'main' into hash_join_duplicate_columns
lnkuiper Jan 15, 2024
2eefaa7
Merge branch 'main' into hash_join_duplicate_columns
lnkuiper Jan 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 21 additions & 0 deletions src/optimizer/remove_unused_columns.cpp
View file
Open in desktop
Expand Up @@ -319,6 +319,27 @@ void RemoveUnusedColumns::VisitOperator(LogicalOperator &op) {
}
LogicalOperatorVisitor::VisitOperatorExpressions(op);
LogicalOperatorVisitor::VisitOperatorChildren(op);

if (op.type == LogicalOperatorType::LOGICAL_ASOF_JOIN || op.type == LogicalOperatorType::LOGICAL_DELIM_JOIN ||
op.type == LogicalOperatorType::LOGICAL_COMPARISON_JOIN) {
auto &comp_join = op.Cast<LogicalComparisonJoin>();
// after removing duplicate columns we may have duplicate join conditions (if the join graph is cyclical)
vector<JoinCondition> unique_conditions;
for (auto &cond : comp_join.conditions) {
bool found = false;
for (auto &unique_cond : unique_conditions) {
if (cond.comparison == unique_cond.comparison && cond.left->Equals(*unique_cond.left) &&
cond.right->Equals(*unique_cond.right)) {
found = true;
break;
}
}
if (!found) {
unique_conditions.push_back(std::move(cond));
}
}
comp_join.conditions = std::move(unique_conditions);
}
}

unique_ptr<Expression> RemoveUnusedColumns::VisitReplace(BoundColumnRefExpression &expr,
Expand Down