EmmyMiao87 commented on a change in pull request #7357:
URL: https://github.com/apache/incubator-doris/pull/7357#discussion_r769374855
##########
File path:
fe/fe-core/src/main/java/org/apache/doris/rewrite/InferFiltersRule.java
##########
@@ -51,9 +54,11 @@
public class InferFiltersRule implements ExprRewriteRule {
private final static Logger LOG =
LogManager.getLogger(InferFiltersRule.class);
public static InferFiltersRule INSTANCE = new InferFiltersRule();
+ private static int indexNum = 0;
@Override
public Expr apply(Expr expr, Analyzer analyzer) throws AnalysisException {
+ clearIndexNum();
if (expr == null) {
return null;
} else if (!analyzer.enableInferPredicate()) {
Review comment:
else if (analyzer.enableInferPredicate()) {
##########
File path:
fe/fe-core/src/main/java/org/apache/doris/rewrite/InferFiltersRule.java
##########
@@ -63,202 +68,307 @@ public Expr apply(Expr expr, Analyzer analyzer) throws
AnalysisException {
Set<Pair<Expr, Expr>> slotEqSlotPredicatesSet = Sets.newHashSet();
ArrayList<Expr> slotToLiteralPredicatesList = new ArrayList<>();
Set<Pair<Expr, Expr>> slotToLiteralPredicatesSet =
Sets.newHashSet();
- ArrayList<Expr> newPredicatesList = new ArrayList<>();
+ ArrayList<Pair<Expr, Boolean>> newPredicatesList = new
ArrayList<>();
ArrayList<Expr> isNullPredicatesList = new ArrayList<>();
Set<Expr> isNullPredicatesSet = Sets.newHashSet();
+ Map<Expr, Integer> exprIntegerMap = new HashMap<>();
+ Map<Integer, Expr> integerExprMap = new HashMap<>();
+
initAllStructure(expr, slotEqSlotPredicatesList,
slotEqSlotPredicatesSet,
slotToLiteralPredicatesList, slotToLiteralPredicatesSet,
isNullPredicatesList, isNullPredicatesSet);
+ genNewSlotEqSlotArray(slotEqSlotPredicatesList,
slotEqSlotPredicatesSet, exprIntegerMap, integerExprMap);
+
inferSlotPredicates(slotEqSlotPredicatesList,
slotToLiteralPredicatesSet,
- slotToLiteralPredicatesList, newPredicatesList, analyzer);
+ slotToLiteralPredicatesList, newPredicatesList);
inferIsNullPredicates(slotEqSlotPredicatesList,
isNullPredicatesList,
- isNullPredicatesSet, newPredicatesList, analyzer);
+ isNullPredicatesSet, newPredicatesList);
if (!newPredicatesList.isEmpty()) {
- Expr rewriteExpr = new
CompoundPredicate(CompoundPredicate.Operator.AND, expr,
newPredicatesList.get(0));
- for (int index = 1; index < newPredicatesList.size(); index++)
{
- rewriteExpr = new
CompoundPredicate(CompoundPredicate.Operator.AND, rewriteExpr,
newPredicatesList.get(index));
+ Expr rewriteExpr = expr;
+ for (int index = 0; index < newPredicatesList.size(); index++)
{
+ if (newPredicatesList.get(index).second) {
+ rewriteExpr = new
CompoundPredicate(CompoundPredicate.Operator.AND,
+ rewriteExpr,
newPredicatesList.get(index).first);
+ }
}
return rewriteExpr;
}
}
return expr;
}
+ private void clearIndexNum() { indexNum = 0; }
+ private void addIndexNum() { indexNum++; }
+ private int getIndexNum() { return indexNum; }
+
+ /**
+ * Initialize all data structures, count and connect compound predicates.
+ * @param slotEqSlotPredicatesList: Expr is BinaryPredicate. Left expr is
slot and right expr is slot;
+ * @param slotToLiteralPredicatesList: Expr is BinaryPredicate. Left expr
is slot and right expr is Literal;
+ * @param isNullPredicatesList: Expr is isNullPredicate;
+ */
private void initAllStructure(Expr conjunct,
ArrayList<Expr> slotEqSlotPredicatesList,
Set<Pair<Expr, Expr>>
slotEqSlotPredicatesSet,
ArrayList<Expr> slotToLiteralPredicatesList,
Set<Pair<Expr, Expr>>
slotToLiteralPredicatesSet,
ArrayList<Expr> isNullPredicatesList,
Set<Expr> isNullPredicatesSet) {
- if (conjunct instanceof CompoundPredicate) {
+ if (conjunct instanceof CompoundPredicate
+ && ((CompoundPredicate) conjunct).getOp() ==
CompoundPredicate.Operator.AND) {
for (int index = 0; index < conjunct.getChildren().size();
++index) {
initAllStructure(conjunct.getChild(index),
slotEqSlotPredicatesList,
slotEqSlotPredicatesSet, slotToLiteralPredicatesList,
slotToLiteralPredicatesSet, isNullPredicatesList,
isNullPredicatesSet);
}
}
+
if (conjunct instanceof BinaryPredicate) {
- Pair<Expr, Expr> pair = new Pair<>(conjunct.getChild(0),
conjunct.getChild(1));
- Pair<Expr, Expr> eqPair = new Pair<>(conjunct.getChild(1),
conjunct.getChild(0));
- if (conjunct.getChild(0) instanceof SlotRef
+ if (conjunct.getChild(0).unwrapSlotRef() instanceof SlotRef
&& conjunct.getChild(1) instanceof LiteralExpr) {
- if (!slotToLiteralPredicatesSet.contains(pair)
- && !slotToLiteralPredicatesSet.contains(eqPair)) {
+ Pair<Expr, Expr> pair = new
Pair<>(conjunct.getChild(0).unwrapSlotRef(), conjunct.getChild(1));
+ if (!slotToLiteralPredicatesSet.contains(pair)) {
slotToLiteralPredicatesSet.add(pair);
slotToLiteralPredicatesList.add(conjunct);
}
- } else if (conjunct.getChild(0) instanceof SlotRef
- && conjunct.getChild(1) instanceof SlotRef) {
+ } else if (conjunct.getChild(0).unwrapSlotRef() instanceof SlotRef
+ && conjunct.getChild(1).unwrapSlotRef() instanceof
SlotRef) {
+ Pair<Expr, Expr> pair = new
Pair<>(conjunct.getChild(0).unwrapSlotRef(),
+
conjunct.getChild(1).unwrapSlotRef());
+ Pair<Expr, Expr> eqPair = new
Pair<>(conjunct.getChild(1).unwrapSlotRef(),
+
conjunct.getChild(0).unwrapSlotRef());
if (!slotEqSlotPredicatesSet.contains(pair)
&& !slotEqSlotPredicatesSet.contains(eqPair)) {
slotEqSlotPredicatesSet.add(pair);
slotEqSlotPredicatesList.add(conjunct);
}
}
} else if (conjunct instanceof IsNullPredicate) {
- if (!isNullPredicatesSet.contains(conjunct.getChild(0))) {
- isNullPredicatesSet.add(conjunct.getChild(0));
+ if
(!isNullPredicatesSet.contains(conjunct.getChild(0).unwrapSlotRef())) {
+ isNullPredicatesSet.add(conjunct.getChild(0).unwrapSlotRef());
isNullPredicatesList.add(conjunct);
}
}
}
- private void inferSlotPredicates(ArrayList<Expr> slotEqSlotPredicatesList,
- Set<Pair<Expr, Expr>>
slotToLiteralPredicatesSet,
- ArrayList<Expr>
slotToLiteralPredicatesList,
- ArrayList<Expr> newPredicatesList,
- Analyzer analyzer) {
- ArrayList<Expr> tmpSlotToLiteralPredicatesList = new ArrayList<>();
- for (Expr slotToLiteral : slotToLiteralPredicatesList) {
- buildNewBinaryPredicate(slotToLiteral, slotEqSlotPredicatesList,
slotToLiteralPredicatesSet,
- newPredicatesList, tmpSlotToLiteralPredicatesList,
analyzer);
+ /**
Review comment:
Function description needs to be more specific instead of listing
parameters
For example:
https://github.com/apache/incubator-doris/pull/7255/files
##########
File path:
fe/fe-core/src/main/java/org/apache/doris/rewrite/InferFiltersRule.java
##########
@@ -0,0 +1,302 @@
+// 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.BinaryPredicate;
+import org.apache.doris.analysis.CompoundPredicate;
+import org.apache.doris.analysis.Expr;
+import org.apache.doris.analysis.IsNullPredicate;
+import org.apache.doris.analysis.JoinOperator;
+import org.apache.doris.analysis.LiteralExpr;
+import org.apache.doris.analysis.SlotRef;
+import org.apache.doris.common.AnalysisException;
+import org.apache.doris.common.Pair;
+
+import com.google.common.collect.Sets;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.util.ArrayList;
+import java.util.Set;
+
+/**
+ * The function of this rule is to derive a new predicate based on the current
predicate.
+ * eg.
+ * t1.id = t2.id and t2.id = t3.id and t3.id = 100;
+ * -->
+ * t1.id = 100 and t2.id = 100 and t3.id = 100;
+ *
+ * 1. Register a new rule InferFiltersRule and add it to GlobalState.
+ * 2. Traverse Conjunct to construct on/where equivalence connection,
numerical connection and isNullPredicate.
+ * 3. Use Warshall to infer all equivalence connections
+ * 4. Construct additional numerical connections and isNullPredicate
+ */
+public class InferFiltersRule implements ExprRewriteRule {
+ private final static Logger LOG =
LogManager.getLogger(InferFiltersRule.class);
+ public static InferFiltersRule INSTANCE = new InferFiltersRule();
+
+ @Override
+ public Expr apply(Expr expr, Analyzer analyzer) throws AnalysisException {
+ if (expr == null) {
+ return null;
+ } else if (!analyzer.enableInferPredicate()) {
+ return expr;
+ } else {
+ ArrayList<Expr> slotEqSlotPredicatesList = new ArrayList<>();
+ Set<Pair<Expr, Expr>> slotEqSlotPredicatesSet = Sets.newHashSet();
+ ArrayList<Expr> slotToLiteralPredicatesList = new ArrayList<>();
+ Set<Pair<Expr, Expr>> slotToLiteralPredicatesSet =
Sets.newHashSet();
+ ArrayList<Expr> newPredicatesList = new ArrayList<>();
+ ArrayList<Expr> isNullPredicatesList = new ArrayList<>();
+ Set<Expr> isNullPredicatesSet = Sets.newHashSet();
+
+ initAllStructure(expr, slotEqSlotPredicatesList,
slotEqSlotPredicatesSet,
+ slotToLiteralPredicatesList, slotToLiteralPredicatesSet,
+ isNullPredicatesList, isNullPredicatesSet);
+
+ inferSlotPredicates(slotEqSlotPredicatesList,
slotToLiteralPredicatesSet,
+ slotToLiteralPredicatesList, newPredicatesList, analyzer);
+
+ inferIsNullPredicates(slotEqSlotPredicatesList,
isNullPredicatesList,
+ isNullPredicatesSet, newPredicatesList, analyzer);
+
+ if (!newPredicatesList.isEmpty()) {
+ Expr rewriteExpr = new
CompoundPredicate(CompoundPredicate.Operator.AND, expr,
newPredicatesList.get(0));
+ for (int index = 1; index < newPredicatesList.size(); index++)
{
+ rewriteExpr = new
CompoundPredicate(CompoundPredicate.Operator.AND, rewriteExpr,
newPredicatesList.get(index));
+ }
+ return rewriteExpr;
+ }
+ }
+ return expr;
+ }
+
+ private void initAllStructure(Expr conjunct,
+ ArrayList<Expr> slotEqSlotPredicatesList,
+ Set<Pair<Expr, Expr>>
slotEqSlotPredicatesSet,
+ ArrayList<Expr> slotToLiteralPredicatesList,
+ Set<Pair<Expr, Expr>>
slotToLiteralPredicatesSet,
+ ArrayList<Expr> isNullPredicatesList,
+ Set<Expr> isNullPredicatesSet) {
+ if (conjunct instanceof CompoundPredicate) {
+ for (int index = 0; index < conjunct.getChildren().size();
++index) {
Review comment:
else return ?
--
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
