wangshuo128 commented on a change in pull request #6518: URL: https://github.com/apache/incubator-doris/pull/6518#discussion_r701540731
########## File path: fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java ########## @@ -407,6 +407,16 @@ public static void beforeClass() throws Exception { createView("create view test.tbl_null_column_view AS SELECT *,NULL as add_column FROM test.test1;"); + createTable("CREATE TABLE test.table_or(" + Review comment: There is no need to create a new table for every test. We could reuse the existing table in the test class, e.g, `test.test1`. ########## File path: fe/fe-core/src/main/java/org/apache/doris/rewrite/CompoundPredicateWriteRule.java ########## @@ -0,0 +1,102 @@ +// 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; + +/** + * add Rewrite CompoundPredicates 'OR' 'AND' 'NOT' Rule + * 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 + */ + +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; + + List<Expr> children = cp.getChildren(); + if (children.size() != 2) { + return expr; + } + + /* + * 'OR' 'AND' rewrite rule + * case true AND expr ==> expr Review comment: Typo. It's better to unify the style, a.k.a. use uppercase or lowercase for all the keywords `and` and `or`, rather than uppercase `AND` and camelcase `Or`. Maybe just use lowercase `and` and `or` is enough. -- 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-unsubscr...@doris.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org