You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by ya...@apache.org on 2020/10/24 09:38:16 UTC
[incubator-doris] branch master updated: change code style (#4776)
This is an automated email from the ASF dual-hosted git repository.
yangzhg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 2fa3ffd change code style (#4776)
2fa3ffd is described below
commit 2fa3ffda7b805f793a9643db22ca5e59a28ec353
Author: Zhengguo Yang <ya...@gmail.com>
AuthorDate: Sat Oct 24 17:36:06 2020 +0800
change code style (#4776)
---
.../java/org/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 e7e6213..9de8643 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);
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org