You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by GitBox <gi...@apache.org> on 2021/09/02 04:48:47 UTC
[GitHub] [incubator-doris] wangshuo128 commented on a change in pull request #6518: [Enhance] Add a rewrite rule of compoundPredicate 'OR' 'AND' to hit prefix index
wangshuo128 commented on a change in pull request #6518:
URL: https://github.com/apache/incubator-doris/pull/6518#discussion_r696724744
##########
File path: fe/fe-core/src/main/java/org/apache/doris/rewrite/CompoundPredicateWriteRule.java
##########
@@ -0,0 +1,134 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.rewrite;
+
+import org.apache.doris.analysis.Analyzer;
+import org.apache.doris.analysis.BoolLiteral;
+import org.apache.doris.analysis.CompoundPredicate;
+import org.apache.doris.analysis.Expr;
+import org.apache.doris.common.AnalysisException;
+import java.util.List;
+
+/**
+ * Rewrites CompoundPredicates 'OR' 'AND' 'NOT'
+ * CompoundPredicate.
+ * It can be applied to pre-analysis expr trees and therefore does not reanalyze
+ * the transformation output itself.
+ *
+ * Examples:
+ * OR:
+ * (-2==2 OR city_id=2) ==> city_id=2
+ * (city_id=2 OR -2==2) ==> city_id=2
+ * -5!=-5 OR citycode=0 ==> citycode=0
+ * AND:
+ * (citycode=0 AND 1=1) ==> citycode=0
+ * -5=-5 AND citycode=0 AND 2=2 ==> citycode=0
+ *
+ * Support complex 'AND' 'OR' mixed use
+ * (-2=2 or citycode=2) and (-2=2 or siteid=2) ==> citycode=2 and siteid=2
+ * (-5=-5 AND citycode=0) OR (3=2 AND siteid=2) ==> citycode=0
+ * more test case,please refer to doris#issue6499
+ */
+public class CompoundPredicateWriteRule implements ExprRewriteRule {
+ public static ExprRewriteRule INSTANCE = new CompoundPredicateWriteRule();
+ @Override
+ public Expr apply(Expr expr, Analyzer analyzer) throws AnalysisException {
+
+ if (!(expr instanceof CompoundPredicate)) return expr;
+ CompoundPredicate cp = (CompoundPredicate) expr;
+ Expr result = expr;
+
+ List<Expr> children = cp.getChildren();
+ if (children.size() != 2) {
+ return expr;
+ }
+ //rewrite OR
+ if(cp.getOp() == CompoundPredicate.Operator.OR) {
+
+ Expr leftChild=cp.getChild(0);
+ Expr rightChild=cp.getChild(1);
+
+ //leftChild
+ // true OR expr ==> true
+ // false AND expr ==> expr
+ if(leftChild instanceof BoolLiteral){
Review comment:
`if (leftChild instanceof BoolLiteral) {`
Code style, add space before `(` and `{`. Please check all the code.
##########
File path: fe/fe-common/pom.xml
##########
@@ -54,6 +54,11 @@ under the License.
</profiles>
<dependencies>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
Review comment:
Do you really need this?
##########
File path: fe/fe-core/src/main/java/org/apache/doris/rewrite/CompoundPredicateWriteRule.java
##########
@@ -0,0 +1,134 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.rewrite;
+
+import org.apache.doris.analysis.Analyzer;
+import org.apache.doris.analysis.BoolLiteral;
+import org.apache.doris.analysis.CompoundPredicate;
+import org.apache.doris.analysis.Expr;
+import org.apache.doris.common.AnalysisException;
+import java.util.List;
+
+/**
+ * Rewrites CompoundPredicates 'OR' 'AND' 'NOT'
+ * CompoundPredicate.
+ * It can be applied to pre-analysis expr trees and therefore does not reanalyze
+ * the transformation output itself.
+ *
+ * Examples:
+ * OR:
+ * (-2==2 OR city_id=2) ==> city_id=2
+ * (city_id=2 OR -2==2) ==> city_id=2
+ * -5!=-5 OR citycode=0 ==> citycode=0
+ * AND:
+ * (citycode=0 AND 1=1) ==> citycode=0
+ * -5=-5 AND citycode=0 AND 2=2 ==> citycode=0
+ *
+ * Support complex 'AND' 'OR' mixed use
+ * (-2=2 or citycode=2) and (-2=2 or siteid=2) ==> citycode=2 and siteid=2
+ * (-5=-5 AND citycode=0) OR (3=2 AND siteid=2) ==> citycode=0
+ * more test case,please refer to doris#issue6499
+ */
+public class CompoundPredicateWriteRule implements ExprRewriteRule {
+ public static ExprRewriteRule INSTANCE = new CompoundPredicateWriteRule();
+ @Override
+ public Expr apply(Expr expr, Analyzer analyzer) throws AnalysisException {
+
+ if (!(expr instanceof CompoundPredicate)) return expr;
+ CompoundPredicate cp = (CompoundPredicate) expr;
+ Expr result = expr;
+
+ List<Expr> children = cp.getChildren();
+ if (children.size() != 2) {
+ return expr;
+ }
+ //rewrite OR
+ if(cp.getOp() == CompoundPredicate.Operator.OR) {
Review comment:
Code style, space after `if`.
##########
File path: fe/fe-core/src/main/java/org/apache/doris/rewrite/CompoundPredicateWriteRule.java
##########
@@ -0,0 +1,134 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.rewrite;
+
+import org.apache.doris.analysis.Analyzer;
+import org.apache.doris.analysis.BoolLiteral;
+import org.apache.doris.analysis.CompoundPredicate;
+import org.apache.doris.analysis.Expr;
+import org.apache.doris.common.AnalysisException;
+import java.util.List;
+
+/**
+ * Rewrites CompoundPredicates 'OR' 'AND' 'NOT'
+ * CompoundPredicate.
+ * It can be applied to pre-analysis expr trees and therefore does not reanalyze
+ * the transformation output itself.
+ *
+ * Examples:
+ * OR:
+ * (-2==2 OR city_id=2) ==> city_id=2
+ * (city_id=2 OR -2==2) ==> city_id=2
+ * -5!=-5 OR citycode=0 ==> citycode=0
+ * AND:
+ * (citycode=0 AND 1=1) ==> citycode=0
+ * -5=-5 AND citycode=0 AND 2=2 ==> citycode=0
+ *
+ * Support complex 'AND' 'OR' mixed use
+ * (-2=2 or citycode=2) and (-2=2 or siteid=2) ==> citycode=2 and siteid=2
+ * (-5=-5 AND citycode=0) OR (3=2 AND siteid=2) ==> citycode=0
+ * more test case,please refer to doris#issue6499
+ */
+public class CompoundPredicateWriteRule implements ExprRewriteRule {
+ public static ExprRewriteRule INSTANCE = new CompoundPredicateWriteRule();
+ @Override
+ public Expr apply(Expr expr, Analyzer analyzer) throws AnalysisException {
+
+ if (!(expr instanceof CompoundPredicate)) return expr;
+ CompoundPredicate cp = (CompoundPredicate) expr;
+ Expr result = expr;
+
+ List<Expr> children = cp.getChildren();
+ if (children.size() != 2) {
+ return expr;
+ }
+ //rewrite OR
+ if(cp.getOp() == CompoundPredicate.Operator.OR) {
+
+ Expr leftChild=cp.getChild(0);
+ Expr rightChild=cp.getChild(1);
+
+ //leftChild
+ // true OR expr ==> true
+ // false AND expr ==> expr
+ if(leftChild instanceof BoolLiteral){
+ BoolLiteral boolLiteralLeftChild = (BoolLiteral) leftChild;
+
+ if(boolLiteralLeftChild.getValue()){
+ return new BoolLiteral(true);
+ }else if(!boolLiteralLeftChild.getValue()){
+ leftChild = new BoolLiteral(false);
+ result= rightChild;
+ }
+
+ }
+
+ //rightChild
Review comment:
`// rightChild`
Add space after `//`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org