Skip to content

Minor code cleanup toPredicatePushDown #13744

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
martint merged 2 commits into from
Aug 23, 2022
Merged

Minor code cleanup toPredicatePushDown #13744

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
038c311
Fix typo in PredicatePushDown
tangjiangling Aug 19, 2022
325a3e0
Replace `Stream#allMatch` with `Collection#containsAll` in PredicateP…
tangjiangling Aug 19, 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
10 changes: 4 additions & 6 deletions core/trino-main/src/main/java/io/trino/sql/planner/optimizations/PredicatePushDown.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,7 @@ public PlanNode visitWindow(WindowNode node, RewriteContext<Expression> context)
// pre-projected symbols.
Predicate<Expression> isSupported = conjunct ->
isDeterministic(conjunct, metadata) &&
extractUnique(conjunct).stream()
.allMatch(partitionSymbols::contains);
partitionSymbols.containsAll(extractUnique(conjunct));

Map<Boolean, List<Expression>> conjuncts = extractConjuncts(context.get()).stream().collect(Collectors.partitioningBy(isSupported));

Expand All @@ -280,8 +279,7 @@ public PlanNode visitProject(ProjectNode node, RewriteContext<Expression> contex
.map(Map.Entry::getKey)
.collect(Collectors.toSet());

Predicate<Expression> deterministic = conjunct -> extractUnique(conjunct).stream()
.allMatch(deterministicSymbols::contains);
Predicate<Expression> deterministic = conjunct -> deterministicSymbols.containsAll(extractUnique(conjunct));

Map<Boolean, List<Expression>> conjuncts = extractConjuncts(context.get()).stream().collect(Collectors.partitioningBy(deterministic));

Expand Down Expand Up @@ -363,7 +361,7 @@ public PlanNode visitMarkDistinct(MarkDistinctNode node, RewriteContext<Expressi
{
Set<Symbol> pushDownableSymbols = ImmutableSet.copyOf(node.getDistinctSymbols());
Map<Boolean, List<Expression>> conjuncts = extractConjuncts(context.get()).stream()
.collect(Collectors.partitioningBy(conjunct -> extractUnique(conjunct).stream().allMatch(pushDownableSymbols::contains)));
.collect(Collectors.partitioningBy(conjunct -> pushDownableSymbols.containsAll(extractUnique(conjunct))));

PlanNode rewrittenNode = context.defaultRewrite(node, combineConjuncts(metadata, conjuncts.get(true)));

Expand Down Expand Up @@ -1410,7 +1408,7 @@ private PlanNode visitFilteringSemiJoin(SemiJoinNode node, RewriteContext<Expres
.filter(Objects::nonNull)
.forEach(sourceConjuncts::add);

// See if we can push the source effective predicate to the filtering soruce side
// See if we can push the source effective predicate to the filtering source side
EqualityInference.nonInferrableConjuncts(metadata, sourceEffectivePredicate)
.map(conjunct -> allInference.rewrite(conjunct, filterScope))
.filter(Objects::nonNull)
Expand Down