This is an automated email from the ASF dual-hosted git repository. morningman pushed a commit to branch dev-1.0.1 in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
commit ba0b0634dd09b81cc421227a1006a5a780f23d5e Author: HappenLee <happen...@hotmail.com> AuthorDate: Thu May 5 09:42:48 2022 +0800 [fix](vectorized) Fix bug of outer join with delete column (#9315) --- fe/fe-core/src/main/java/org/apache/doris/analysis/Analyzer.java | 4 ++++ fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java | 1 + 2 files changed, 5 insertions(+) diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/Analyzer.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/Analyzer.java index 4be8fa5308..0cf48b6afb 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/Analyzer.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/Analyzer.java @@ -1378,6 +1378,10 @@ public class Analyzer { return globalState.fullOuterJoinedTupleIds.containsKey(tid); } + public boolean isOuterMaterializedJoined(TupleId tid) { + return globalState.outerJoinedMaterializedTupleIds.contains(tid); + } + public boolean isFullOuterJoined(SlotId sid) { return isFullOuterJoined(getTupleId(sid)); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java index 0ba2e7a693..7cc79ab534 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java +++ b/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java @@ -906,6 +906,7 @@ public class OlapScanNode extends ScanNode { SlotRef deleteSignSlot = new SlotRef(desc.getAliasAsName(), Column.DELETE_SIGN); deleteSignSlot.analyze(analyzer); deleteSignSlot.getDesc().setIsMaterialized(true); + deleteSignSlot.getDesc().setIsNullable(analyzer.isOuterMaterializedJoined(desc.getId())); Expr conjunct = new BinaryPredicate(BinaryPredicate.Operator.EQ, deleteSignSlot, new IntLiteral(0)); conjunct.analyze(analyzer); conjuncts.add(conjunct); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org