Skip to content

branch-4.0: [fix](subquery) eliminate null aware by mistake #64639 #64715

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
morningman merged 1 commit into from
Jun 24, 2026
+9 −16
Merged

branch-4.0: [fix](subquery) eliminate null aware by mistake #64639 #64715

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
25 changes: 9 additions & 16 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/SubqueryToApply.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,22 +118,15 @@ public List<Rule> buildRules() {
ctx.statementContext, shouldOutputMarkJoinSlot.get(i));
SubqueryContext context = new SubqueryContext(subqueryExprs);
Expression conjunct = replaceSubquery.replace(oldConjuncts.get(i), context);
/*
* the idea is replacing each mark join slot with null and false literal
* then run FoldConstant rule, if the evaluate result are:
* 1. all true
* 2. all null and false (in logicalFilter, we discard both null and false values)
* the mark slot can be non-nullable boolean
* we pass this info to LogicalApply. And in InApplyToJoin rule
* if it's semi join with non-null mark slot
* we can safely change the mark conjunct to hash conjunct
*/
ExpressionRewriteContext rewriteContext = new ExpressionRewriteContext(ctx.cascadesContext);
boolean isMarkSlotNotNull = conjunct.containsType(MarkJoinSlotReference.class)
? ExpressionUtils.canInferNotNullForMarkSlot(
TrySimplifyPredicateWithMarkJoinSlot.INSTANCE.rewrite(conjunct,
rewriteContext), rewriteContext)
: false;
// TODO: The way to optimize null aware mark join is not right.
// remove it temporary until we refactor it.
// ExpressionRewriteContext rewriteContext = new ExpressionRewriteContext(ctx.cascadesContext);
// boolean isMarkSlotNotNull = conjunct.containsType(MarkJoinSlotReference.class)
// ? ExpressionUtils.canInferNotNullForMarkSlot(
// TrySimplifyPredicateWithMarkJoinSlot.INSTANCE.rewrite(conjunct,
// rewriteContext), rewriteContext)
// : false;
boolean isMarkSlotNotNull = false;
Pair<LogicalPlan, Optional<Expression>> result = subqueryToApply(subqueryExprs.stream()
.collect(ImmutableList.toImmutableList()), tmpPlan,
context.getSubqueryToMarkJoinSlot(),
Expand Down
Loading