Optimize distinct from semi join #8092
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| /* | ||
| * Licensed 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 com.facebook.presto.sql.planner.iterative.rule; | ||
|
|
||
| import com.facebook.presto.Session; | ||
| import com.facebook.presto.sql.planner.PlanNodeIdAllocator; | ||
| import com.facebook.presto.sql.planner.Symbol; | ||
| import com.facebook.presto.sql.planner.SymbolAllocator; | ||
| import com.facebook.presto.sql.planner.iterative.Lookup; | ||
| import com.facebook.presto.sql.planner.iterative.Rule; | ||
| import com.facebook.presto.sql.planner.plan.AggregationNode; | ||
| import com.facebook.presto.sql.planner.plan.PlanNode; | ||
| import com.facebook.presto.sql.planner.plan.ProjectNode; | ||
| import com.facebook.presto.sql.planner.plan.SemiJoinNode; | ||
| import com.google.common.collect.ImmutableList; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Optional; | ||
|
|
||
| import static com.facebook.presto.sql.planner.plan.AggregationNode.Step.SINGLE; | ||
|
|
||
| /** | ||
| * Remove distinct node from following path: | ||
| * <pre> | ||
| * SemiJoinNode | ||
| * - Source | ||
| * - FilteringSource | ||
| * - ProjectNode | ||
| * - AggregationNode | ||
| * </pre> | ||
| */ | ||
| public class RemoveDistinctFromSemiJoin | ||
| implements Rule | ||
| { | ||
| @Override | ||
| public Optional<PlanNode> apply(PlanNode node, Lookup lookup, PlanNodeIdAllocator idAllocator, SymbolAllocator symbolAllocator, Session session) | ||
| { | ||
| if (node instanceof SemiJoinNode) { | ||
|
There was a problem hiding this comment. implement |
||
| PlanNode filteringSource = lookup.resolve(((SemiJoinNode) node).getFilteringSource()); | ||
| Optional<PlanNode> result = rewriteUpstream(filteringSource, lookup); | ||
| if (result.isPresent()) { | ||
| return Optional.of(node.replaceChildren(ImmutableList.of(lookup.resolve(((SemiJoinNode) node).getSource()), result.get()))); | ||
| } | ||
| } | ||
| return Optional.empty(); | ||
| } | ||
|
|
||
| private Optional<PlanNode> rewriteUpstream(PlanNode node, Lookup lookup) | ||
|
There was a problem hiding this comment. Please use |
||
| { | ||
| if (node instanceof AggregationNode) { | ||
| AggregationNode aggregationNode = (AggregationNode) node; | ||
| if (isDistinctNode(aggregationNode)) { | ||
| return Optional.of(lookup.resolve(aggregationNode.getSource())); | ||
|
There was a problem hiding this comment. you do not need to resolve this node if you are not trying to cast it to actual node type |
||
| } | ||
| } | ||
| else if (node instanceof ProjectNode) { | ||
| Optional<PlanNode> result = rewriteUpstream(lookup.resolve(((ProjectNode) node).getSource()), lookup); | ||
| if (result.isPresent()) { | ||
| return Optional.of(node.replaceChildren(ImmutableList.of(result.get()))); | ||
| } | ||
| } | ||
| return Optional.empty(); | ||
| } | ||
|
|
||
| private boolean isDistinctNode(AggregationNode aggregationNode) | ||
| { | ||
| List<Symbol> outputSymbols = aggregationNode.getOutputSymbols(); | ||
| List<Symbol> groupingKeys = aggregationNode.getGroupingKeys(); | ||
| return aggregationNode.getStep() == SINGLE | ||
| && outputSymbols.size() == 1 | ||
| && groupingKeys.size() == 1 | ||
| && outputSymbols.get(0).equals(groupingKeys.get(0)); | ||
| } | ||
| } | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| /* | ||
| * Licensed 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 com.facebook.presto.sql.planner.iterative.rule.test; | ||
|
|
||
| import com.facebook.presto.connector.ConnectorId; | ||
| import com.facebook.presto.metadata.TableHandle; | ||
| import com.facebook.presto.spi.type.BigintType; | ||
| import com.facebook.presto.sql.planner.Symbol; | ||
| import com.facebook.presto.sql.planner.iterative.rule.RemoveDistinctFromSemiJoin; | ||
| import com.facebook.presto.sql.planner.plan.AggregationNode; | ||
| import com.facebook.presto.sql.planner.plan.Assignments; | ||
| import com.facebook.presto.tpch.TpchColumnHandle; | ||
| import com.facebook.presto.tpch.TpchTableHandle; | ||
| import com.google.common.collect.ImmutableList; | ||
| import com.google.common.collect.ImmutableMap; | ||
| import org.testng.annotations.Test; | ||
|
|
||
| import static com.facebook.presto.spi.type.BigintType.BIGINT; | ||
| import static com.facebook.presto.sql.planner.assertions.PlanMatchPattern.project; | ||
| import static com.facebook.presto.sql.planner.assertions.PlanMatchPattern.semiJoin; | ||
| import static com.facebook.presto.sql.planner.assertions.PlanMatchPattern.tableScan; | ||
| import static com.facebook.presto.sql.planner.iterative.rule.test.PlanBuilder.expression; | ||
| import static com.facebook.presto.tpch.TpchMetadata.TINY_SCALE_FACTOR; | ||
|
|
||
| public class TestRemoveDistinctFromSemiJoin | ||
| { | ||
| private final RuleTester tester = new RuleTester(); | ||
|
|
||
| @Test | ||
| public void test() | ||
| throws Exception | ||
| { | ||
| tester.assertThat(new RemoveDistinctFromSemiJoin()) | ||
| .on(p -> { | ||
| Symbol sourceKey = p.symbol("custkey", BigintType.BIGINT); | ||
| Symbol filteringSourceKey = p.symbol("custkey_1", BigintType.BIGINT); | ||
| Symbol outputKey = p.symbol("orderkey", BigintType.BIGINT); | ||
| return p.semiJoin( | ||
| p.tableScan( | ||
| new TableHandle( | ||
| new ConnectorId("local"), | ||
| new TpchTableHandle("local", "orders", TINY_SCALE_FACTOR)), | ||
| ImmutableList.of(sourceKey), | ||
| ImmutableMap.of(sourceKey, new TpchColumnHandle("custkey", BIGINT))), | ||
| p.project(Assignments.of(filteringSourceKey, expression("x")), | ||
| p.aggregation(ab -> ab.step(AggregationNode.Step.SINGLE) | ||
| .groupingSets(ImmutableList.of(ImmutableList.of(filteringSourceKey))) | ||
| .source( | ||
| p.tableScan( | ||
| new TableHandle( | ||
| new ConnectorId("local"), | ||
| new TpchTableHandle("local", "customer", TINY_SCALE_FACTOR)), | ||
| ImmutableList.of(filteringSourceKey), | ||
| ImmutableMap.of(filteringSourceKey, new TpchColumnHandle("custkey", BIGINT))) | ||
| ) | ||
| .build()) | ||
| ), | ||
| sourceKey, filteringSourceKey, outputKey | ||
| ); | ||
| }) | ||
| .matches( | ||
| semiJoin("Source", "Filter", "Output", | ||
| tableScan("orders", ImmutableMap.of("Source", "custkey")), | ||
| project(tableScan("customer", ImmutableMap.of("Filter", "custkey"))) | ||
|
There was a problem hiding this comment. please try to keep each plan node matcher in separate line |
||
| ) | ||
| ); | ||
| } | ||
|
|
||
| @Test | ||
| public void testDoesNotFire() | ||
|
There was a problem hiding this comment. Please put some information why it does not fire into the test name |
||
| { | ||
| tester.assertThat(new RemoveDistinctFromSemiJoin()) | ||
| .on(p -> { | ||
| Symbol sourceKey = p.symbol("custkey", BigintType.BIGINT); | ||
| Symbol filteringSourceKey = p.symbol("custkey_1", BigintType.BIGINT); | ||
| Symbol outputKey = p.symbol("orderkey", BigintType.BIGINT); | ||
| return p.semiJoin( | ||
| p.tableScan( | ||
| new TableHandle( | ||
| new ConnectorId("local"), | ||
| new TpchTableHandle("local", "orders", TINY_SCALE_FACTOR)), | ||
| ImmutableList.of(sourceKey), | ||
| ImmutableMap.of(sourceKey, new TpchColumnHandle("custkey", BIGINT))), | ||
| p.project(Assignments.of(filteringSourceKey, expression("x")), | ||
| p.aggregation(ab -> ab.step(AggregationNode.Step.SINGLE) | ||
| .groupingSets(ImmutableList.of(ImmutableList.of(filteringSourceKey))) | ||
| .addAggregation(p.symbol("max", BigintType.BIGINT), expression("max(custkey_1)"), ImmutableList.of(BIGINT)) | ||
| .source(p.tableScan( | ||
| new TableHandle( | ||
| new ConnectorId("local"), | ||
| new TpchTableHandle("local", "customer", TINY_SCALE_FACTOR)), | ||
| ImmutableList.of(filteringSourceKey), | ||
| ImmutableMap.of(filteringSourceKey, new TpchColumnHandle("custkey", BIGINT))) | ||
| ) | ||
| .build()) | ||
| ), | ||
| sourceKey, filteringSourceKey, outputKey | ||
| ); | ||
| }).doesNotFire(); | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I do not see distinct node here, do you mean it is under the aggregation?