Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.apache.logging.log4j.Logger;

import java.lang.reflect.Field;
import java.util.BitSet;
import java.util.List;
import java.util.Optional;
import java.util.Set;
Expand All @@ -48,10 +49,13 @@ public Optional<Expression> matchesAndApply(Expression expr, ExpressionRewriteCo
List<ExpressionPatternMatchRule> rules = singleMappings.get(expr.getClass());
ExpressionMatchingContext<Expression> matchingContext
= new ExpressionMatchingContext<>(expr, parent, context);
BitSet disableRules = context.cascadesContext.getConnectContext().getSessionVariable()
.getDisableNereidsExpressionRules();
switch (rules.size()) {
case 0: {
for (ExpressionPatternMatchRule multiMatchRule : multiMappings) {
if (multiMatchRule.matchesTypeAndPredicates(matchingContext)) {
if (!disableRules.get(multiMatchRule.getExpressionRuleType().type())
&& multiMatchRule.matchesTypeAndPredicates(matchingContext)) {
Expression newExpr = multiMatchRule.apply(matchingContext);
if (!newExpr.equals(expr)) {
if (context.cascadesContext.isEnableExprTrace()) {
Expand All @@ -65,7 +69,8 @@ public Optional<Expression> matchesAndApply(Expression expr, ExpressionRewriteCo
}
case 1: {
ExpressionPatternMatchRule rule = rules.get(0);
if (rule.matchesPredicates(matchingContext)) {
if (!disableRules.get(rule.getExpressionRuleType().type())
&& rule.matchesPredicates(matchingContext)) {
Expression newExpr = rule.apply(matchingContext);
if (!newExpr.equals(expr)) {
if (context.cascadesContext.isEnableExprTrace()) {
Expand All @@ -78,7 +83,8 @@ public Optional<Expression> matchesAndApply(Expression expr, ExpressionRewriteCo
}
default: {
for (ExpressionPatternMatchRule rule : rules) {
if (rule.matchesPredicates(matchingContext)) {
if (!disableRules.get(rule.getExpressionRuleType().type())
&& rule.matchesPredicates(matchingContext)) {
Expression newExpr = rule.apply(matchingContext);
if (!expr.equals(newExpr)) {
if (context.cascadesContext.isEnableExprTrace()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,13 @@

/** ExpressionPatternMatcherRule */
public class ExpressionPatternMatchRule implements TypeMapping<Expression> {
public final ExpressionRuleType expressionRuleType;
public final Class<? extends Expression> typePattern;
public final List<Predicate<ExpressionMatchingContext<Expression>>> predicates;
public final ExpressionMatchingAction<Expression> matchingAction;

public ExpressionPatternMatchRule(ExpressionPatternMatcher patternMatcher) {
this.expressionRuleType = patternMatcher.expressionRuleType;
this.typePattern = patternMatcher.typePattern;
this.predicates = patternMatcher.predicates;
this.matchingAction = patternMatcher.matchingAction;
Expand Down Expand Up @@ -61,4 +63,8 @@ public Expression apply(ExpressionMatchingContext<Expression> context) {
public Class<? extends Expression> getType() {
return typePattern;
}

public ExpressionRuleType getExpressionRuleType() {
return expressionRuleType;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,16 @@

/** ExpressionPattern */
public class ExpressionPatternMatcher<E extends Expression> {

public final ExpressionRuleType expressionRuleType;
public final Class<E> typePattern;
public final List<Predicate<ExpressionMatchingContext<E>>> predicates;
public final ExpressionMatchingAction<E> matchingAction;

public ExpressionPatternMatcher(Class<E> typePattern,
public ExpressionPatternMatcher(ExpressionRuleType expressionRuleType, Class<E> typePattern,
List<Predicate<ExpressionMatchingContext<E>>> predicates,
ExpressionMatchingAction<E> matchingAction) {
this.expressionRuleType = Objects.requireNonNull(expressionRuleType, "expressionRuleType can not be null");
this.typePattern = Objects.requireNonNull(typePattern, "typePattern can not be null");
this.predicates = predicates == null ? ImmutableList.of() : predicates;
this.matchingAction = Objects.requireNonNull(matchingAction, "matchingAction can not be null");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,18 @@ default <E extends Expression> ExpressionPatternDescriptor<E> matchesTopType(Cla
class ExpressionPatternDescriptor<E extends Expression> {
private final Class<E> typePattern;
private final ImmutableList<Predicate<ExpressionMatchingContext<E>>> predicates;
private final ExpressionMatchingAction<E> matchingAction;

public ExpressionPatternDescriptor(Class<E> typePattern) {
this(typePattern, ImmutableList.of());
this(typePattern, ImmutableList.of(), ctx -> ctx.expr);
}

public ExpressionPatternDescriptor(
Class<E> typePattern, ImmutableList<Predicate<ExpressionMatchingContext<E>>> predicates) {
Class<E> typePattern, ImmutableList<Predicate<ExpressionMatchingContext<E>>> predicates,
ExpressionMatchingAction<E> matchingAction) {
this.typePattern = Objects.requireNonNull(typePattern, "typePattern can not be null");
this.predicates = Objects.requireNonNull(predicates, "predicates can not be null");
this.matchingAction = Objects.requireNonNull(matchingAction, "action can not be null");
}

public ExpressionPatternDescriptor<E> when(Predicate<E> predicate) {
Expand All @@ -68,17 +71,21 @@ public ExpressionPatternDescriptor<E> whenCtx(Predicate<ExpressionMatchingContex
= ImmutableList.builderWithExpectedSize(predicates.size() + 1);
newPredicates.addAll(predicates);
newPredicates.add(predicate);
return new ExpressionPatternDescriptor<>(typePattern, newPredicates.build());
return new ExpressionPatternDescriptor<>(typePattern, newPredicates.build(), ctx -> ctx.expr);
}

/** then */
public ExpressionPatternMatcher<E> then(Function<E, Expression> rewriter) {
return new ExpressionPatternMatcher<>(
public ExpressionPatternDescriptor<E> then(Function<E, Expression> rewriter) {
return new ExpressionPatternDescriptor<>(
typePattern, predicates, (context) -> rewriter.apply(context.expr));
}

public ExpressionPatternMatcher<E> thenApply(ExpressionMatchingAction<E> action) {
return new ExpressionPatternMatcher<>(typePattern, predicates, action);
public ExpressionPatternDescriptor<E> thenApply(ExpressionMatchingAction<E> action) {
return new ExpressionPatternDescriptor<>(typePattern, predicates, action);
}

public ExpressionPatternMatcher<E> toRule(ExpressionRuleType expressionRuleType) {
return new ExpressionPatternMatcher<>(expressionRuleType, typePattern, predicates, matchingAction);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
// 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.nereids.rules.expression;

/**
* Type of rewrite expression rules.
*/
public enum ExpressionRuleType {
ADD_MIN_MAX,
ARRAY_CONTAIN_TO_ARRAY_OVERLAP,
BETWEEN_TO_EQUAL,
CASE_WHEN_TO_IF,
CHECK_CAST,
CONVERT_AGG_STATE_CAST,
DATE_FUNCTION_REWRITE,
DIGITAL_MASKING_CONVERT,
DISTINCT_PREDICATES,
EXPR_ID_REWRITE_REPLACE,
EXTRACT_COMMON_FACTOR,
FOLD_CONSTANT_ON_BE,
FOLD_CONSTANT_ON_FE,
IN_PREDICATE_DEDUP,
IN_PREDICATE_TO_EQUAL_TO,
LIKE_TO_EQUAL,
MERGE_DATE_TRUNC,
NORMALIZE_BINARY_PREDICATES,
NULL_SAFE_EQUAL_TO_EQUAL,
OR_TO_IN,
REPLACE_VARIABLE_BY_LITERAL,
SIMPLIFY_ARITHMETIC_COMPARISON,
SIMPLIFY_ARITHMETIC,
SIMPLIFY_CAST,
SIMPLIFY_COMPARISON_PREDICATE,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

only this rule can be disabled?
how about other expression rewrite rules?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

only this rule can be disabled? how about other expression rewrite rules?

add rule type

SIMPLIFY_CONDITIONAL_FUNCTION,
SIMPLIFY_IN_PREDICATE,
SIMPLIFY_NOT_EXPR,
SIMPLIFY_RANGE,
SUPPORT_JAVA_DATE_FORMATTER,
TOPN_TO_MAX;

public int type() {
return ordinal();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.apache.doris.nereids.exceptions.AnalysisException;
import org.apache.doris.nereids.rules.expression.ExpressionPatternMatcher;
import org.apache.doris.nereids.rules.expression.ExpressionPatternRuleFactory;
import org.apache.doris.nereids.rules.expression.ExpressionRuleType;
import org.apache.doris.nereids.trees.expressions.Cast;
import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.types.ArrayType;
Expand All @@ -44,7 +45,7 @@ public class CheckCast implements ExpressionPatternRuleFactory {
@Override
public List<ExpressionPatternMatcher<? extends Expression>> buildRules() {
return ImmutableList.of(
matchesType(Cast.class).then(CheckCast::check)
matchesType(Cast.class).then(CheckCast::check).toRule(ExpressionRuleType.CHECK_CAST)
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.apache.doris.nereids.rules.expression.ExpressionPatternMatcher;
import org.apache.doris.nereids.rules.expression.ExpressionPatternRuleFactory;
import org.apache.doris.nereids.rules.expression.ExpressionRewriteContext;
import org.apache.doris.nereids.rules.expression.ExpressionRuleType;
import org.apache.doris.nereids.rules.expression.rules.RangeInference.DiscreteValue;
import org.apache.doris.nereids.rules.expression.rules.RangeInference.EmptyValue;
import org.apache.doris.nereids.rules.expression.rules.RangeInference.RangeValue;
Expand Down Expand Up @@ -69,6 +70,7 @@ public List<ExpressionPatternMatcher<? extends Expression>> buildRules() {
return ImmutableList.of(
matchesTopType(CompoundPredicate.class)
.thenApply(ctx -> rewrite(ctx.expr, ctx.rewriteContext))
.toRule(ExpressionRuleType.ADD_MIN_MAX)
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import org.apache.doris.nereids.rules.expression.ExpressionPatternMatcher;
import org.apache.doris.nereids.rules.expression.ExpressionPatternRuleFactory;
import org.apache.doris.nereids.rules.expression.ExpressionRuleType;
import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.expressions.Or;
import org.apache.doris.nereids.trees.expressions.functions.scalar.ArrayContains;
Expand Down Expand Up @@ -57,6 +58,7 @@ public class ArrayContainToArrayOverlap implements ExpressionPatternRuleFactory
public List<ExpressionPatternMatcher<? extends Expression>> buildRules() {
return ImmutableList.of(
matchesTopType(Or.class).then(ArrayContainToArrayOverlap::rewrite)
.toRule(ExpressionRuleType.ARRAY_CONTAIN_TO_ARRAY_OVERLAP)
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import org.apache.doris.nereids.rules.expression.ExpressionPatternMatcher;
import org.apache.doris.nereids.rules.expression.ExpressionPatternRuleFactory;
import org.apache.doris.nereids.rules.expression.ExpressionRuleType;
import org.apache.doris.nereids.trees.expressions.And;
import org.apache.doris.nereids.trees.expressions.ComparisonPredicate;
import org.apache.doris.nereids.trees.expressions.EqualTo;
Expand Down Expand Up @@ -47,6 +48,7 @@ public class BetweenToEqual implements ExpressionPatternRuleFactory {
public List<ExpressionPatternMatcher<? extends Expression>> buildRules() {
return ImmutableList.of(
matchesType(And.class).then(BetweenToEqual::rewriteBetweenToEqual)
.toRule(ExpressionRuleType.BETWEEN_TO_EQUAL)
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import org.apache.doris.nereids.rules.expression.ExpressionPatternMatcher;
import org.apache.doris.nereids.rules.expression.ExpressionPatternRuleFactory;
import org.apache.doris.nereids.rules.expression.ExpressionRuleType;
import org.apache.doris.nereids.trees.expressions.CaseWhen;
import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.expressions.WhenClause;
Expand All @@ -42,6 +43,7 @@ public class CaseWhenToIf implements ExpressionPatternRuleFactory {
public List<ExpressionPatternMatcher<? extends Expression>> buildRules() {
return ImmutableList.of(
matchesTopType(CaseWhen.class).then(CaseWhenToIf::rewrite)
.toRule(ExpressionRuleType.CASE_WHEN_TO_IF)
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import org.apache.doris.nereids.rules.expression.ExpressionPatternMatcher;
import org.apache.doris.nereids.rules.expression.ExpressionPatternRuleFactory;
import org.apache.doris.nereids.rules.expression.ExpressionRuleType;
import org.apache.doris.nereids.trees.expressions.Alias;
import org.apache.doris.nereids.trees.expressions.Cast;
import org.apache.doris.nereids.trees.expressions.Expression;
Expand All @@ -44,6 +45,7 @@ public class ConvertAggStateCast implements ExpressionPatternRuleFactory {
public List<ExpressionPatternMatcher<? extends Expression>> buildRules() {
return ImmutableList.of(
matchesType(Cast.class).then(ConvertAggStateCast::convert)
.toRule(ExpressionRuleType.CONVERT_AGG_STATE_CAST)
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import org.apache.doris.nereids.rules.expression.ExpressionPatternMatcher;
import org.apache.doris.nereids.rules.expression.ExpressionPatternRuleFactory;
import org.apache.doris.nereids.rules.expression.ExpressionRuleType;
import org.apache.doris.nereids.trees.expressions.And;
import org.apache.doris.nereids.trees.expressions.EqualTo;
import org.apache.doris.nereids.trees.expressions.Expression;
Expand Down Expand Up @@ -50,11 +51,16 @@ public class DateFunctionRewrite implements ExpressionPatternRuleFactory {
@Override
public List<ExpressionPatternMatcher<? extends Expression>> buildRules() {
return ImmutableList.of(
matchesType(EqualTo.class).then(DateFunctionRewrite::rewriteEqualTo),
matchesType(GreaterThan.class).then(DateFunctionRewrite::rewriteGreaterThan),
matchesType(GreaterThanEqual.class).then(DateFunctionRewrite::rewriteGreaterThanEqual),
matchesType(LessThan.class).then(DateFunctionRewrite::rewriteLessThan),
matchesType(EqualTo.class).then(DateFunctionRewrite::rewriteEqualTo)
.toRule(ExpressionRuleType.DATE_FUNCTION_REWRITE),
matchesType(GreaterThan.class).then(DateFunctionRewrite::rewriteGreaterThan)
.toRule(ExpressionRuleType.DATE_FUNCTION_REWRITE),
matchesType(GreaterThanEqual.class).then(DateFunctionRewrite::rewriteGreaterThanEqual)
.toRule(ExpressionRuleType.DATE_FUNCTION_REWRITE),
matchesType(LessThan.class).then(DateFunctionRewrite::rewriteLessThan)
.toRule(ExpressionRuleType.DATE_FUNCTION_REWRITE),
matchesType(LessThanEqual.class).then(DateFunctionRewrite::rewriteLessThanEqual)
.toRule(ExpressionRuleType.DATE_FUNCTION_REWRITE)
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import org.apache.doris.nereids.rules.expression.ExpressionPatternMatcher;
import org.apache.doris.nereids.rules.expression.ExpressionPatternRuleFactory;
import org.apache.doris.nereids.rules.expression.ExpressionRuleType;
import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Concat;
import org.apache.doris.nereids.trees.expressions.functions.scalar.DigitalMasking;
Expand All @@ -43,8 +44,8 @@ public List<ExpressionPatternMatcher<? extends Expression>> buildRules() {
new Concat(
new Left(digitalMasking.child(), Literal.of(3)),
Literal.of("****"),
new Right(digitalMasking.child(), Literal.of(4)))
)
new Right(digitalMasking.child(), Literal.of(4))))
.toRule(ExpressionRuleType.DIGITAL_MASKING_CONVERT)
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import org.apache.doris.nereids.rules.expression.ExpressionPatternMatcher;
import org.apache.doris.nereids.rules.expression.ExpressionPatternRuleFactory;
import org.apache.doris.nereids.rules.expression.ExpressionRuleType;
import org.apache.doris.nereids.trees.expressions.CompoundPredicate;
import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.util.ExpressionUtils;
Expand All @@ -43,6 +44,7 @@ public class DistinctPredicatesRule implements ExpressionPatternRuleFactory {
public List<ExpressionPatternMatcher<? extends Expression>> buildRules() {
return ImmutableList.of(
matchesTopType(CompoundPredicate.class).then(DistinctPredicatesRule::distinct)
.toRule(ExpressionRuleType.DISTINCT_PREDICATES)
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.apache.doris.nereids.annotation.Developing;
import org.apache.doris.nereids.rules.expression.ExpressionPatternMatcher;
import org.apache.doris.nereids.rules.expression.ExpressionPatternRuleFactory;
import org.apache.doris.nereids.rules.expression.ExpressionRuleType;
import org.apache.doris.nereids.trees.expressions.CompoundPredicate;
import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.expressions.literal.BooleanLiteral;
Expand Down Expand Up @@ -56,6 +57,7 @@ public class ExtractCommonFactorRule implements ExpressionPatternRuleFactory {
public List<ExpressionPatternMatcher<? extends Expression>> buildRules() {
return ImmutableList.of(
matchesTopType(CompoundPredicate.class).then(ExtractCommonFactorRule::extractCommonFactor)
.toRule(ExpressionRuleType.EXTRACT_COMMON_FACTOR)
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.apache.doris.nereids.rules.expression.ExpressionMatchingContext;
import org.apache.doris.nereids.rules.expression.ExpressionPatternMatcher;
import org.apache.doris.nereids.rules.expression.ExpressionPatternRuleFactory;
import org.apache.doris.nereids.rules.expression.ExpressionRuleType;
import org.apache.doris.nereids.trees.expressions.Alias;
import org.apache.doris.nereids.trees.expressions.ArrayItemReference;
import org.apache.doris.nereids.trees.expressions.Cast;
Expand Down Expand Up @@ -123,6 +124,7 @@ public List<ExpressionPatternMatcher<? extends Expression>> buildRules() {
.isDebugSkipFoldConstant())
.whenCtx(FoldConstantRuleOnBE::isEnableFoldByBe)
.thenApply(FoldConstantRuleOnBE::foldByBE)
.toRule(ExpressionRuleType.FOLD_CONSTANT_ON_BE)
);
}

Expand Down
Loading
Loading