This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.0 by this push:
new bd1b866c169 branch-4.0: [fix](subquery) eliminate null aware by
mistake #64639 (#64715)
bd1b866c169 is described below
commit bd1b866c1694548a4a59f4cfa15213d8e154366f
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Jun 24 18:07:14 2026 +0800
branch-4.0: [fix](subquery) eliminate null aware by mistake #64639 (#64715)
Cherry-picked from #64639
Co-authored-by: morrySnow <[email protected]>
---
.../nereids/rules/analysis/SubqueryToApply.java | 25 ++++++++--------------
1 file changed, 9 insertions(+), 16 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/SubqueryToApply.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/SubqueryToApply.java
index 2e41a88c62f..87e355ed894 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/SubqueryToApply.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/SubqueryToApply.java
@@ -118,22 +118,15 @@ public class SubqueryToApply implements
AnalysisRuleFactory {
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(),
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
