Skip to content

Replace invalid Lookup.resolveGroup usage with resolve #14595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raunaqmorarka merged 3 commits into from
Oct 14, 2022
Merged

Replace invalid Lookup.resolveGroup usage with resolve #14595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1cf8af8
Replace invalid resolveGroup usage with resolve
lukasz-stec Oct 12, 2022
c9f88a7
Deduplicate Lookup.resolve copies
lukasz-stec Oct 13, 2022
f7401d7
Use toImmutableList() instead of toList()
lukasz-stec Oct 12, 2022
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
14 changes: 2 additions & 12 deletions core/trino-main/src/main/java/io/trino/cost/FilterProjectAggregationStatsRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import io.trino.Session;
import io.trino.matching.Pattern;
import io.trino.sql.planner.TypeProvider;
import io.trino.sql.planner.iterative.GroupReference;
import io.trino.sql.planner.iterative.Lookup;
import io.trino.sql.planner.plan.AggregationNode;
import io.trino.sql.planner.plan.FilterNode;
Expand All @@ -25,7 +24,6 @@

import java.util.Optional;

import static com.google.common.collect.MoreCollectors.onlyElement;
import static io.trino.SystemSessionProperties.isNonEstimatablePredicateApproximationEnabled;
import static io.trino.cost.FilterStatsCalculator.UNKNOWN_FILTER_COEFFICIENT;
import static io.trino.sql.planner.plan.Patterns.filter;
Expand Down Expand Up @@ -61,7 +59,7 @@ protected Optional<PlanNodeStatsEstimate> doCalculate(FilterNode node, StatsProv
if (!isNonEstimatablePredicateApproximationEnabled(session)) {
return Optional.empty();
}
PlanNode nodeSource = resolveGroup(lookup, node.getSource());
PlanNode nodeSource = lookup.resolve(node.getSource());
AggregationNode aggregationNode;
// TODO match the required source nodes through separate patterns when
// ComposableStatsCalculator allows patterns other than TypeOfPattern
Expand All @@ -70,7 +68,7 @@ protected Optional<PlanNodeStatsEstimate> doCalculate(FilterNode node, StatsProv
if (!projectNode.isIdentity()) {
return Optional.empty();
}
PlanNode projectNodeSource = resolveGroup(lookup, projectNode.getSource());
PlanNode projectNodeSource = lookup.resolve(projectNode.getSource());
Copy link
Copy Markdown
Member

@findepi findepi Oct 13, 2022

Choose a reason for hiding this comment

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

Separate this from "Replace invalid resolveGroup usage with resolve" commit.

This place wasn't incorrect.
it was actually correct, and just working around the (premature) deprecation of resolveGroup, doing same logic as resolve, but with a local (non deprecated) helper method

Copy link
Copy Markdown
Member Author

@lukasz-stec lukasz-stec Oct 13, 2022

Choose a reason for hiding this comment

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

Moved to "Deduplicate Lookup.resolve copies" commit

if (!(projectNodeSource instanceof AggregationNode)) {
return Optional.empty();
}
Expand Down Expand Up @@ -99,12 +97,4 @@ private Optional<PlanNodeStatsEstimate> calculate(FilterNode filterNode, Aggrega
}
return Optional.of(filteredStats);
}

private static PlanNode resolveGroup(Lookup lookup, PlanNode node)
{
if (node instanceof GroupReference) {
return lookup.resolveGroup(node).collect(onlyElement());
}
return node;
}
}
8 changes: 1 addition & 7 deletions ...main/src/main/java/io/trino/sql/planner/iterative/rule/DetermineJoinDistributionType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import io.trino.matching.Pattern;
import io.trino.sql.planner.OptimizerConfig.JoinDistributionType;
import io.trino.sql.planner.TypeProvider;
import io.trino.sql.planner.iterative.GroupReference;
import io.trino.sql.planner.iterative.Lookup;
import io.trino.sql.planner.iterative.Rule;
import io.trino.sql.planner.optimizations.PlanNodeSearcher;
Expand Down Expand Up @@ -145,12 +144,7 @@ private static double getFirstKnownOutputSizeInBytes(PlanNode node, Context cont
static double getFirstKnownOutputSizeInBytes(PlanNode node, Lookup lookup, StatsProvider statsProvider, TypeProvider typeProvider)
{
return Stream.of(node)
.flatMap(planNode -> {
if (planNode instanceof GroupReference) {
return lookup.resolveGroup(node);
}
return Stream.of(planNode);
})
.map(lookup::resolve)
.mapToDouble(resolvedNode -> {
double outputSizeInBytes = statsProvider.getStats(resolvedNode).getOutputSizeInBytes(
resolvedNode.getOutputSymbols(),
Expand Down
15 changes: 7 additions & 8 deletions ...rino-main/src/main/java/io/trino/sql/planner/iterative/rule/PruneDistinctAggregation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@
import io.trino.sql.planner.plan.UnionNode;

import java.util.List;
import java.util.stream.Collectors;

import static com.google.common.collect.Iterables.getOnlyElement;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static io.trino.sql.planner.plan.ChildReplacer.replaceChildren;
import static io.trino.sql.planner.plan.Patterns.aggregation;

Expand All @@ -51,9 +50,9 @@ public Result apply(AggregationNode node, Captures captures, Context context)
DistinctAggregationRewriter rewriter = new DistinctAggregationRewriter(lookup);

List<PlanNode> newSources = node.getSources().stream()
.flatMap(lookup::resolveGroup)
.map(lookup::resolve)
Comment thread
lukasz-stec marked this conversation as resolved.
Outdated
.map(source -> source.accept(rewriter, true))
.collect(Collectors.toList());
.collect(toImmutableList());

if (rewriter.isRewritten()) {
return Result.ofPlanNode(replaceChildren(node, newSources));
Expand Down Expand Up @@ -86,8 +85,9 @@ public boolean isRewritten()
private PlanNode rewriteChildren(PlanNode node, Boolean context)
{
List<PlanNode> newSources = node.getSources().stream()
.flatMap(lookup::resolveGroup)
.map(source -> source.accept(this, context)).collect(Collectors.toList());
.map(lookup::resolve)
.map(source -> source.accept(this, context))
.collect(toImmutableList());

return replaceChildren(node, newSources);
}
Expand Down Expand Up @@ -128,8 +128,7 @@ public PlanNode visitAggregation(AggregationNode node, Boolean context)
{
boolean distinct = isDistinctOperator(node);

PlanNode rewrittenNode = getOnlyElement(lookup.resolveGroup(node.getSource())
.map(source -> source.accept(this, distinct)).collect(Collectors.toList()));
PlanNode rewrittenNode = lookup.resolve(node.getSource()).accept(this, distinct);
Copy link
Copy Markdown
Member

@findepi findepi Oct 13, 2022

Choose a reason for hiding this comment

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

Separate this from "Replace invalid resolveGroup usage with resolve" commit.

This wasn't incorrect. That was just overly verbose, i.e. using resolveGroup without real group capability

Copy link
Copy Markdown
Member Author

@lukasz-stec lukasz-stec Oct 13, 2022

Choose a reason for hiding this comment

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

Moved to "Deduplicate Lookup.resolve copies" commit


if (context && distinct) {
this.rewritten = true;
Expand Down
10 changes: 5 additions & 5 deletions core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/SetOperationMerge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;

import static com.google.common.base.Preconditions.checkState;
import static com.google.common.collect.ImmutableList.toImmutableList;

class SetOperationMerge
{
Expand All @@ -56,8 +56,8 @@ public Optional<SetOperationNode> mergeFirstSource()
{
Lookup lookup = context.getLookup();
List<PlanNode> sources = node.getSources().stream()
.flatMap(lookup::resolveGroup)
.collect(Collectors.toList());
.map(lookup::resolve)
.collect(toImmutableList());

PlanNode child = sources.get(0);

Expand Down Expand Up @@ -101,8 +101,8 @@ public Optional<SetOperationNode> merge()

Lookup lookup = context.getLookup();
List<PlanNode> sources = node.getSources().stream()
.flatMap(lookup::resolveGroup)
.collect(Collectors.toList());
.map(lookup::resolve)
.collect(toImmutableList());

ImmutableListMultimap.Builder<Symbol, Symbol> newMappingsBuilder = ImmutableListMultimap.builder();
boolean resultIsDistinct = false;
Expand Down