-
Notifications
You must be signed in to change notification settings - Fork 3.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into fix-dead-lock-tablet-stat
- Loading branch information
Showing
125 changed files
with
550 additions
and
233 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
74 changes: 74 additions & 0 deletions
74
...src/main/java/org/apache/doris/nereids/rules/expression/rules/SimplifySelfComparison.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| // 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.rules; | ||
|
|
||
| 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.ComparisonPredicate; | ||
| import org.apache.doris.nereids.trees.expressions.EqualTo; | ||
| import org.apache.doris.nereids.trees.expressions.Expression; | ||
| import org.apache.doris.nereids.trees.expressions.GreaterThan; | ||
| import org.apache.doris.nereids.trees.expressions.GreaterThanEqual; | ||
| import org.apache.doris.nereids.trees.expressions.LessThan; | ||
| import org.apache.doris.nereids.trees.expressions.LessThanEqual; | ||
| import org.apache.doris.nereids.trees.expressions.NullSafeEqual; | ||
| import org.apache.doris.nereids.trees.expressions.literal.BooleanLiteral; | ||
| import org.apache.doris.nereids.util.ExpressionUtils; | ||
|
|
||
| import com.google.common.collect.ImmutableList; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| /** | ||
| * simplify with self comparison | ||
| * such as: a = a --> TRUE | ||
| * a + b > a + b --> FALSE | ||
| */ | ||
| public class SimplifySelfComparison implements ExpressionPatternRuleFactory { | ||
| public static SimplifySelfComparison INSTANCE = new SimplifySelfComparison(); | ||
|
|
||
| @Override | ||
| public List<ExpressionPatternMatcher<? extends Expression>> buildRules() { | ||
| return ImmutableList.of( | ||
| matchesType(ComparisonPredicate.class) | ||
| .then(this::rewrite) | ||
| .toRule(ExpressionRuleType.SIMPLIFY_SELF_COMPARISON) | ||
| ); | ||
| } | ||
|
|
||
| private Expression rewrite(ComparisonPredicate comparison) { | ||
| Expression left = comparison.left(); | ||
| if (left.equals(comparison.right())) { | ||
| if (comparison instanceof EqualTo | ||
| || comparison instanceof GreaterThanEqual | ||
| || comparison instanceof LessThanEqual) { | ||
| return ExpressionUtils.trueOrNull(left); | ||
| } | ||
| if (comparison instanceof NullSafeEqual) { | ||
| return BooleanLiteral.TRUE; | ||
| } | ||
| if (comparison instanceof GreaterThan || comparison instanceof LessThan) { | ||
| return ExpressionUtils.falseOrNull(left); | ||
| } | ||
| } | ||
|
|
||
| return comparison; | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
...test/java/org/apache/doris/nereids/rules/expression/rules/SimplifySelfComparisonTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| // 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.rules; | ||
|
|
||
| import org.apache.doris.nereids.rules.expression.ExpressionRewrite; | ||
| import org.apache.doris.nereids.rules.expression.ExpressionRewriteTestHelper; | ||
| import org.apache.doris.nereids.rules.expression.ExpressionRuleExecutor; | ||
|
|
||
| import com.google.common.collect.ImmutableList; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| class SimplifySelfComparisonTest extends ExpressionRewriteTestHelper { | ||
|
|
||
| @Test | ||
| void testRewrite() { | ||
| executor = new ExpressionRuleExecutor(ImmutableList.of( | ||
| ExpressionRewrite.bottomUp(SimplifySelfComparison.INSTANCE) | ||
| )); | ||
|
|
||
| assertRewriteAfterTypeCoercion("TA + TB = TA + TB", "NOT ((TA + TB) IS NULL) OR NULL"); | ||
| assertRewriteAfterTypeCoercion("TA + TB >= TA + TB", "NOT ((TA + TB) IS NULL) OR NULL"); | ||
| assertRewriteAfterTypeCoercion("TA + TB <= TA + TB", "NOT ((TA + TB) IS NULL) OR NULL"); | ||
| assertRewriteAfterTypeCoercion("TA + TB <=> TA + TB", "TRUE"); | ||
| assertRewriteAfterTypeCoercion("TA + TB > TA + TB", "(TA + TB) IS NULL AND NULL"); | ||
| assertRewriteAfterTypeCoercion("TA + TB < TA + TB", "(TA + TB) IS NULL AND NULL"); | ||
| } | ||
|
|
||
| } |
File renamed without changes.
Oops, something went wrong.