|
28 | 28 | import org.apache.doris.nereids.trees.expressions.Expression; |
29 | 29 | import org.apache.doris.nereids.trees.expressions.InPredicate; |
30 | 30 | import org.apache.doris.nereids.trees.expressions.Like; |
31 | | -import org.apache.doris.nereids.trees.expressions.Match; |
32 | 31 | import org.apache.doris.nereids.trees.expressions.Not; |
33 | 32 | import org.apache.doris.nereids.trees.expressions.Or; |
34 | | -import org.apache.doris.nereids.trees.expressions.SearchExpression; |
35 | 33 | import org.apache.doris.nereids.trees.expressions.Slot; |
| 34 | +import org.apache.doris.nereids.trees.expressions.functions.DependsOnColumnIndex; |
36 | 35 | import org.apache.doris.nereids.trees.expressions.functions.ExpressionTrait; |
37 | 36 | import org.apache.doris.nereids.trees.expressions.functions.NoneMovableFunction; |
38 | | -import org.apache.doris.nereids.trees.expressions.functions.scalar.Search; |
39 | 37 | import org.apache.doris.nereids.trees.expressions.literal.Literal; |
40 | 38 | import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor; |
41 | 39 | import org.apache.doris.nereids.trees.plans.Plan; |
@@ -134,11 +132,6 @@ public Void visitLike(Like like, Map<Expression, Set<Expression>> context) { |
134 | 132 |
|
135 | 133 | @Override |
136 | 134 | public Void visitOr(Or or, Map<Expression, Set<Expression>> context) { |
137 | | - // MATCH and SEARCH depend on the inverted index of their column, so they can differ on an equal |
138 | | - // column, and a copy would also add to score(). |
139 | | - if (or.containsType(Match.class, Search.class, SearchExpression.class)) { |
140 | | - return null; |
141 | | - } |
142 | 135 | for (Expression expr : getAllSubExpressions(or)) { |
143 | 136 | context.computeIfAbsent(expr, k -> new LinkedHashSet<>()).add(or); |
144 | 137 | } |
@@ -244,8 +237,9 @@ public static Set<Expression> infer(Set<Expression> inputs) { |
244 | 237 | } |
245 | 238 | Map<Expression, Set<Expression>> exprPredicates = new HashMap<>(); |
246 | 239 | for (Expression input : inputs) { |
247 | | - // Inference can evaluate a predicate on rows that never reach its original filter. |
248 | | - if (input.anyMatch(expr -> expr instanceof NoneMovableFunction |
| 240 | + // Inference can evaluate a predicate on rows that never reach its original filter, |
| 241 | + // and it replaces the column of the predicate with an equal one. |
| 242 | + if (input.anyMatch(expr -> expr instanceof NoneMovableFunction || expr instanceof DependsOnColumnIndex |
249 | 243 | || !((ExpressionTrait) expr).isDeterministic()) |
250 | 244 | || input.getInputSlots().size() != 1) { |
251 | 245 | continue; |
|
0 commit comments