morningman commented on a change in pull request #6518: URL: https://github.com/apache/incubator-doris/pull/6518#discussion_r696688746
########## 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 Review comment: ```suggestion // false OR expr ==> expr ``` ########## 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 Review comment: There is no need to specify this situation, because the rule is recursively applied to the predicate, so it must support the mix predicate ########## 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); Review comment: ```suggestion ``` ########## 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 + // expr OR true ==> true + // expr OR false ==> expr + if(rightChild instanceof BoolLiteral){ + BoolLiteral boolLiteralRightChild = (BoolLiteral) rightChild; + + if(boolLiteralRightChild.getValue()){ + return new BoolLiteral(true); + }else if(!boolLiteralRightChild.getValue()){ Review comment: ```suggestion } else { ``` ########## 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 + // expr OR true ==> true + // expr OR false ==> expr + if(rightChild instanceof BoolLiteral){ + BoolLiteral boolLiteralRightChild = (BoolLiteral) rightChild; + + if(boolLiteralRightChild.getValue()){ + return new BoolLiteral(true); + }else if(!boolLiteralRightChild.getValue()){ + result= leftChild; + } + } + + return result; + } + + //rewrite AND + if(cp.getOp() == CompoundPredicate.Operator.AND) { + + Expr leftChild=cp.getChild(0); + Expr rightChild=cp.getChild(1); + + //leftChild + // true AND expr ==> expr + // false AND expr ==> false + if(leftChild instanceof BoolLiteral){ + BoolLiteral boolLiteralLeftChild = (BoolLiteral) leftChild; + + if(boolLiteralLeftChild.getValue()){ + leftChild = new BoolLiteral(true); Review comment: ```suggestion ``` No need to assign again ########## 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 + // expr OR true ==> true + // expr OR false ==> expr + if(rightChild instanceof BoolLiteral){ + BoolLiteral boolLiteralRightChild = (BoolLiteral) rightChild; + + if(boolLiteralRightChild.getValue()){ + return new BoolLiteral(true); + }else if(!boolLiteralRightChild.getValue()){ Review comment: same as follow AND cases ########## 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()){ Review comment: ```suggestion } else { ``` -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
