forked from apache/doris
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[opt](Nereids) translate "between" to "equalTo" if upper equals to lo…
…wer (apache#43344) ### What problem does this PR solve? predicate "A between 1 and 10" is converted to "A<=10 and A>=1" but if the lower value equals to upper value, between predicate can be converted to a euqalTo predicate. Example: "A between 1 and 1" is converted to "A=1" <!-- You need to clearly describe your PR in this part: 1. What problem was fixed (it's best to include specific error reporting information). How it was fixed. 2. Which behaviors were modified. What was the previous behavior, what is it now, why was it modified, and what possible impacts might there be. 3. What features were added. Why this function was added. 4. Which codes were refactored and why this part of the code was refactored. 5. Which functions were optimized and what is the difference before and after the optimization. The description of the PR needs to enable reviewers to quickly and clearly understand the logic of the code modification. --> <!-- If there are related issues, please fill in the issue number. - If you want the issue to be closed after the PR is merged, please use "close apache#12345". Otherwise, use "ref apache#12345" --> Issue Number: close #xxx <!-- If this PR is followup a preivous PR, for example, fix the bug that introduced by a related PR, link the PR here --> Related PR: #xxx Problem Summary: ### Check List (For Committer) - Test <!-- At least one of them must be included. --> - [ ] Regression test - [x] Unit Test - [ ] Manual test (add detailed scripts or steps below) - [ ] No need to test or manual test. Explain why: - [ ] This is a refactor/code format and no logic has been changed. - [ ] Previous test can cover this change. - [ ] No colde files have been changed. - [ ] Other reason <!-- Add your reason? --> - Behavior changed: - [x] No. - [ ] Yes. <!-- Explain the behavior change --> - Does this need documentation? - [ ] No. - [ ] Yes. <!-- Add document PR link here. eg: apache/doris-website#1214 --> - Release note <!-- bugfix, feat, behavior changed need a release note --> <!-- Add one line release note for this PR. --> None ### Check List (For Reviewer who merge this PR) - [ ] Confirm the release note - [ ] Confirm test cases - [ ] Confirm document - [ ] Add branch pick label <!-- Add branch pick label that this PR should merge into -->
- Loading branch information
Showing
7 changed files
with
216 additions
and
5 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
115 changes: 115 additions & 0 deletions
115
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/BetweenToEqual.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,115 @@ | ||
// 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.trees.expressions.And; | ||
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.GreaterThanEqual; | ||
import org.apache.doris.nereids.trees.expressions.LessThanEqual; | ||
import org.apache.doris.nereids.trees.expressions.literal.Literal; | ||
import org.apache.doris.nereids.util.ExpressionUtils; | ||
|
||
import com.google.common.collect.ImmutableList; | ||
import com.google.common.collect.Lists; | ||
import com.google.common.collect.Maps; | ||
|
||
import java.util.List; | ||
import java.util.Map; | ||
|
||
/** | ||
* f(A, B) between 1 and 1 => f(A, B) = 1 | ||
* | ||
*/ | ||
public class BetweenToEqual implements ExpressionPatternRuleFactory { | ||
|
||
public static BetweenToEqual INSTANCE = new BetweenToEqual(); | ||
|
||
@Override | ||
public List<ExpressionPatternMatcher<? extends Expression>> buildRules() { | ||
return ImmutableList.of( | ||
matchesType(And.class).then(BetweenToEqual::rewriteBetweenToEqual) | ||
); | ||
} | ||
|
||
private static Expression rewriteBetweenToEqual(And and) { | ||
List<Expression> conjuncts = ExpressionUtils.extractConjunction(and); | ||
Map<Expression, List<ComparisonPredicate>> betweenCandidate = Maps.newHashMap(); | ||
for (Expression conj : conjuncts) { | ||
if (isCandidate(conj)) { | ||
conj = normalizeCandidate((ComparisonPredicate) conj); | ||
Expression varPart = conj.child(0); | ||
betweenCandidate.computeIfAbsent(varPart, k -> Lists.newArrayList()); | ||
betweenCandidate.get(varPart).add((ComparisonPredicate) conj); | ||
} | ||
} | ||
List<EqualTo> equals = Lists.newArrayList(); | ||
List<Expression> equalsKey = Lists.newArrayList(); | ||
for (Expression varPart : betweenCandidate.keySet()) { | ||
List<ComparisonPredicate> candidates = betweenCandidate.get(varPart); | ||
if (candidates.size() == 2 && greaterEqualAndLessEqual(candidates.get(0), candidates.get(1))) { | ||
if (candidates.get(0).child(1).equals(candidates.get(1).child(1))) { | ||
equals.add(new EqualTo(candidates.get(0).child(0), candidates.get(0).child(1))); | ||
equalsKey.add(candidates.get(0).child(0)); | ||
} | ||
} | ||
} | ||
if (equals.isEmpty()) { | ||
return null; | ||
} else { | ||
List<Expression> newConjuncts = Lists.newArrayList(equals); | ||
for (Expression conj : conjuncts) { | ||
if (isCandidate(conj)) { | ||
conj = normalizeCandidate((ComparisonPredicate) conj); | ||
if (equalsKey.contains(conj.child(0))) { | ||
continue; | ||
} | ||
} | ||
newConjuncts.add(conj); | ||
} | ||
return ExpressionUtils.and(newConjuncts); | ||
} | ||
} | ||
|
||
// A >= a | ||
// A <= a | ||
// A is expr, a is literal | ||
private static boolean isCandidate(Expression expr) { | ||
if (expr instanceof GreaterThanEqual || expr instanceof LessThanEqual) { | ||
return expr.child(0) instanceof Literal && !(expr.child(1) instanceof Literal) | ||
|| expr.child(1) instanceof Literal && !(expr.child(0) instanceof Literal); | ||
} | ||
return false; | ||
} | ||
|
||
private static Expression normalizeCandidate(ComparisonPredicate expr) { | ||
if (expr.child(1) instanceof Literal) { | ||
return expr; | ||
} else { | ||
return expr.withChildren(expr.child(1), expr.child(0)); | ||
} | ||
} | ||
|
||
private static boolean greaterEqualAndLessEqual(ComparisonPredicate cmp1, ComparisonPredicate cmp2) { | ||
return cmp1 instanceof GreaterThanEqual && cmp2 instanceof LessThanEqual | ||
|| (cmp1 instanceof LessThanEqual && cmp2 instanceof GreaterThanEqual); | ||
} | ||
} |
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
40 changes: 40 additions & 0 deletions
40
fe/fe-core/src/test/java/org/apache/doris/nereids/parser/BetweenTest.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,40 @@ | ||
// 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.parser; | ||
|
||
import org.apache.doris.nereids.trees.expressions.And; | ||
import org.apache.doris.nereids.trees.expressions.EqualTo; | ||
import org.apache.doris.nereids.trees.expressions.Expression; | ||
|
||
import org.junit.jupiter.api.Assertions; | ||
import org.junit.jupiter.api.Test; | ||
|
||
public class BetweenTest { | ||
private static final NereidsParser PARSER = new NereidsParser(); | ||
|
||
@Test | ||
public void testBetween() { | ||
String expression = "A between 1 and 1"; // | ||
Expression result = PARSER.parseExpression(expression); | ||
Assertions.assertInstanceOf(EqualTo.class, result); | ||
|
||
expression = "A between 1 and 2"; | ||
result = PARSER.parseExpression(expression); | ||
Assertions.assertInstanceOf(And.class, result); | ||
} | ||
} |
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
46 changes: 46 additions & 0 deletions
46
regression-test/suites/nereids_rules_p0/between_to_equal/betweenToEqual.groovy
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,46 @@ | ||
// 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. | ||
|
||
suite("between_to_equal") { | ||
sql """ | ||
create table datebetween ( | ||
guid int, | ||
dt DATE, | ||
first_visit_time varchar | ||
)Engine=Olap | ||
DUPLICATE KEY(guid) | ||
distributed by hash(dt) buckets 3 | ||
properties('replication_num' = '1'); | ||
insert into datebetween values (1, '2021-01-01', 'abc'); | ||
""" | ||
explain { | ||
sql " select * from datebetween where dt between '2021-01-01' and '2021-01-01 11:11:11';" | ||
contains("PREDICATES: (dt[#1] = '2021-01-01')"); | ||
} | ||
|
||
explain { | ||
sql " select * from datebetween where dt between '2021-01-01' and '2021-01-01 11:11:11' and dt < '2024-12-01';" | ||
contains("PREDICATES: (dt[#1] = '2021-01-01')") | ||
} | ||
|
||
explain { | ||
sql "select * from datebetween where dt between '2021-01-01' and '2021-01-01 11:11:11' and dt < '2024-12-01' or guid =1;" | ||
contains("PREDICATES: ((dt[#1] = '2021-01-01') OR (guid[#0] = 1))") | ||
} | ||
|
||
} |