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.
[feature](Nereids): add ExtractFilterFromJoin rule to support more (a…
- Loading branch information
Showing
5 changed files
with
133 additions
and
1 deletion.
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
51 changes: 51 additions & 0 deletions
51
.../main/java/org/apache/doris/nereids/rules/rewrite/logical/ExtractFilterFromCrossJoin.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,51 @@ | ||
| // 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.rewrite.logical; | ||
|
|
||
| import org.apache.doris.nereids.rules.Rule; | ||
| import org.apache.doris.nereids.rules.RuleType; | ||
| import org.apache.doris.nereids.rules.rewrite.OneRewriteRuleFactory; | ||
| import org.apache.doris.nereids.trees.expressions.Expression; | ||
| import org.apache.doris.nereids.trees.plans.GroupPlan; | ||
| import org.apache.doris.nereids.trees.plans.JoinType; | ||
| import org.apache.doris.nereids.trees.plans.logical.LogicalJoin; | ||
| import org.apache.doris.nereids.util.ExpressionUtils; | ||
| import org.apache.doris.nereids.util.PlanUtils; | ||
|
|
||
| import java.util.Set; | ||
| import java.util.stream.Collectors; | ||
| import java.util.stream.Stream; | ||
|
|
||
| /** | ||
| * Extract All condition From CrossJoin. | ||
| */ | ||
| public class ExtractFilterFromCrossJoin extends OneRewriteRuleFactory { | ||
| @Override | ||
| public Rule build() { | ||
| return crossLogicalJoin() | ||
| .then(join -> { | ||
| LogicalJoin<GroupPlan, GroupPlan> newJoin = new LogicalJoin<>(JoinType.CROSS_JOIN, | ||
| ExpressionUtils.EMPTY_CONDITION, ExpressionUtils.EMPTY_CONDITION, join.getHint(), | ||
| join.left(), join.right()); | ||
| Set<Expression> predicates = Stream.concat(join.getHashJoinConjuncts().stream(), | ||
| join.getOtherJoinConjuncts().stream()) | ||
| .collect(Collectors.toSet()); | ||
| return PlanUtils.filterOrSelf(predicates, newJoin); | ||
| }).toRule(RuleType.EXTRACT_FILTER_FROM_JOIN); | ||
| } | ||
| } |
50 changes: 50 additions & 0 deletions
50
...t/java/org/apache/doris/nereids/rules/rewrite/logical/ExtractFilterFromCrossJoinTest.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,50 @@ | ||
| // 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.rewrite.logical; | ||
|
|
||
| import org.apache.doris.common.Pair; | ||
| import org.apache.doris.nereids.trees.plans.JoinType; | ||
| import org.apache.doris.nereids.trees.plans.logical.LogicalOlapScan; | ||
| import org.apache.doris.nereids.trees.plans.logical.LogicalPlan; | ||
| import org.apache.doris.nereids.util.LogicalPlanBuilder; | ||
| import org.apache.doris.nereids.util.MemoTestUtils; | ||
| import org.apache.doris.nereids.util.PatternMatchSupported; | ||
| import org.apache.doris.nereids.util.PlanChecker; | ||
| import org.apache.doris.nereids.util.PlanConstructor; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| class ExtractFilterFromCrossJoinTest implements PatternMatchSupported { | ||
| private final LogicalOlapScan scan1 = PlanConstructor.newLogicalOlapScan(0, "t1", 0); | ||
| private final LogicalOlapScan scan2 = PlanConstructor.newLogicalOlapScan(1, "t2", 0); | ||
|
|
||
| @Test | ||
| void testExtract() { | ||
| LogicalPlan plan = new LogicalPlanBuilder(scan1) | ||
| .hashJoinUsing(scan2, JoinType.CROSS_JOIN, Pair.of(0, 0)) | ||
| .build(); | ||
|
|
||
| PlanChecker.from(MemoTestUtils.createConnectContext(), plan) | ||
| .applyTopDown(new ExtractFilterFromCrossJoin()) | ||
| .matches( | ||
| logicalFilter( | ||
| logicalJoin() | ||
| ) | ||
| ); | ||
| } | ||
| } |
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