Skip to content

[fix](nereids)keep equal predicate as join conjunct even if it can be fold to null literal #35811

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
morrySnow merged 1 commit into from
Jun 4, 2024
Merged

[fix](nereids)keep equal predicate as join conjunct even if it can be fold to null literal #35811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/ExpressionRewrite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.apache.doris.nereids.rules.RuleType;
import org.apache.doris.nereids.rules.rewrite.OneRewriteRuleFactory;
import org.apache.doris.nereids.rules.rewrite.RewriteRuleFactory;
import org.apache.doris.nereids.trees.expressions.EqualPredicate;
import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.expressions.NamedExpression;
import org.apache.doris.nereids.trees.expressions.functions.Function;
Expand Down Expand Up @@ -206,6 +207,10 @@ private Pair<Boolean, List<Expression>> rewriteConjuncts(List<Expression> conjun
ImmutableList.Builder<Expression> rewrittenConjuncts = new ImmutableList.Builder<>();
for (Expression expr : conjuncts) {
Expression newExpr = rewriter.rewrite(expr, context);
newExpr = newExpr.isNullLiteral() && expr instanceof EqualPredicate
? expr.withChildren(rewriter.rewrite(expr.child(0), context),
rewriter.rewrite(expr.child(1), context))
: newExpr;
isChanged = isChanged || !newExpr.equals(expr);
rewrittenConjuncts.addAll(ExpressionUtils.extractConjunction(newExpr));
}
Expand Down
3 changes: 3 additions & 0 deletions regression-test/data/nereids_p0/join/test_mark_join.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,6 @@
2 q 5
0 6

-- !mark_join_null_conjunct --
\N

2 changes: 2 additions & 0 deletions regression-test/suites/nereids_p0/join/test_mark_join.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,4 +140,6 @@ suite("test_mark_join", "nereids_p0") {
WHERE EXISTS ( SELECT MIN(`pk`) FROM table_7_undef_partitions2_keys3_properties4_distributed_by5 AS t2 WHERE t1.pk = 6 )
OR EXISTS ( SELECT `pk` FROM table_7_undef_partitions2_keys3_properties4_distributed_by5 AS t2 WHERE t1.pk = 5 ) order by pk ;
"""

qt_mark_join_null_conjunct """select null in ( select k1 from test_mark_join_t1);"""
}