From 2fa3ffda7b805f793a9643db22ca5e59a28ec353 Mon Sep 17 00:00:00 2001 From: Zhengguo Yang Date: Sat, 24 Oct 2020 17:36:06 +0800 Subject: [PATCH] change code style (#4776) --- .../apache/doris/planner/OlapScanNode.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) 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 e7e6213434..9de8643c2a 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 @@ -280,15 +280,8 @@ public class OlapScanNode extends ScanNode { @Override public void init(Analyzer analyzer) throws UserException { super.init(analyzer); - if (!Util.showHiddenColumns() && olapTable.hasDeleteSign()) { - SlotRef deleteSignSlot = new SlotRef(desc.getAliasAsName(), Column.DELETE_SIGN); - deleteSignSlot.analyze(analyzer); - deleteSignSlot.getDesc().setIsMaterialized(true); - Expr conjunct = new BinaryPredicate(BinaryPredicate.Operator.EQ, deleteSignSlot, new IntLiteral(0)); - conjunct.analyze(analyzer); - conjuncts.add(conjunct); - } + filterDeletedRows(analyzer); computePartitionInfo(); } @@ -764,4 +757,15 @@ public class OlapScanNode extends ScanNode { } return expr instanceof SlotRef; } + + private void filterDeletedRows(Analyzer analyzer) throws AnalysisException{ + if (!Util.showHiddenColumns() && olapTable.hasDeleteSign()) { + SlotRef deleteSignSlot = new SlotRef(desc.getAliasAsName(), Column.DELETE_SIGN); + deleteSignSlot.analyze(analyzer); + deleteSignSlot.getDesc().setIsMaterialized(true); + Expr conjunct = new BinaryPredicate(BinaryPredicate.Operator.EQ, deleteSignSlot, new IntLiteral(0)); + conjunct.analyze(analyzer); + conjuncts.add(conjunct); + } + } }