wuyunfeng commented on a change in pull request #3597: URL: https://github.com/apache/incubator-doris/pull/3597#discussion_r425539095
########## File path: fe/src/main/java/org/apache/doris/analysis/SelectStmt.java ########## @@ -618,16 +618,33 @@ private Expr processDuplicateOrs(List<List<Expr>> exprs) { temp.add(makeCompound(cloneExprs, CompoundPredicate.Operator.AND)); } + Expr result; + boolean isReturnCommonFactorExpr = false; for (List<Expr> exprList : clearExprs) { exprList.removeAll(cloneExprs); + if (exprList.size() == 0) { + // For example, the sql is "where (a = 1) or (a = 1 and B = 2)" + // if "(a = 1)" is extracted as a common factor expression, then the first expression "(a = 1)" has no expression + // other than a common factor expression, and the second expression "(a = 1 and B = 2)" has an expression of "(B = 2)" + // + // In this case, the common factor expression ("a = 1") can be directly used to replace the whole CompoundOrPredicate. + // In Fact, the common factor expression is actually the parent set of expression "(a = 1)" and expression "(a = 1 and B = 2)" + // + // exprList.size() == 0 means one child of CompoundOrPredicate has no expression other than a common factor expression. + isReturnCommonFactorExpr = true; + break; + } temp.add(makeCompound(exprList, CompoundPredicate.Operator.AND)); } - - // rebuild CompoundPredicate if found duplicate predicate will build (predcate) and (.. or ..) predicate in - // step 1: will build (.. or ..) - Expr result = CollectionUtils.isNotEmpty(cloneExprs) ? new CompoundPredicate(CompoundPredicate.Operator.AND, - temp.get(0), makeCompound(temp.subList(1, temp.size()), CompoundPredicate.Operator.OR)) - : makeCompound(temp, CompoundPredicate.Operator.OR); + if (isReturnCommonFactorExpr) { + result = temp.get(0); + } else { + // rebuild CompoundPredicate if found duplicate predicate will build (predcate) and (.. or ..) predicate in + // step 1: will build (.. or ..) + result = CollectionUtils.isNotEmpty(cloneExprs) ? new CompoundPredicate(CompoundPredicate.Operator.AND, + temp.get(0), makeCompound(temp.subList(1, temp.size()), CompoundPredicate.Operator.OR)) + : makeCompound(temp, CompoundPredicate.Operator.OR); + } LOG.debug("rewrite ors: " + result.toSql()); Review comment: ```suggestion if (LOG.isDebugEnabled) { LOG.debug("rewrite ors: " + result.toSql()); } ``` ---------------------------------------------------------------- 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. 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