Replace duplicated method

wendigo · wendigo · commit 34a297c91113 · 2025-10-02T09:42:53.000+02:00
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/ExpressionExtractor.java b/core/trino-main/src/main/java/io/trino/sql/planner/ExpressionExtractor.java
@@ -110,7 +110,7 @@ public Void visitFilter(FilterNode node, Void context)
         @Override
         public Void visitProject(ProjectNode node, Void context)
         {
-            node.getAssignments().getExpressions().forEach(consumer);
+            node.getAssignments().expressions().forEach(consumer);
             return super.visitProject(node, context);
         }
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/QueryPlanner.java b/core/trino-main/src/main/java/io/trino/sql/planner/QueryPlanner.java
@@ -1301,7 +1301,7 @@ private PlanBuilder planAggregation(PlanBuilder subPlan, List<List<Symbol>> grou
             }
         }
 
-        ImmutableList.Builder<Symbol> groupingKeys = ImmutableList.builder();
+        ImmutableSet.Builder<Symbol> groupingKeys = ImmutableSet.builder();
         groupingSets.stream()
                 .flatMap(List::stream)
                 .distinct()
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/DecorrelateInnerUnnestWithGlobalAggregation.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/DecorrelateInnerUnnestWithGlobalAggregation.java
@@ -261,7 +261,7 @@ private static boolean isSupportedUnnest(PlanNode node, List<Symbol> correlation
         PlanNode unnestSource = lookup.resolve(unnestNode.getSource());
         Set<Symbol> correlationSymbols = ImmutableSet.copyOf(correlation);
         boolean basedOnCorrelation = correlationSymbols.containsAll(unnestSymbols) ||
-                unnestSource instanceof ProjectNode projectNode && correlationSymbols.containsAll(SymbolsExtractor.extractUnique(projectNode.getAssignments().getExpressions()));
+                unnestSource instanceof ProjectNode projectNode && correlationSymbols.containsAll(SymbolsExtractor.extractUnique(projectNode.getAssignments().expressions()));
 
         return isScalar(unnestNode.getSource(), lookup) &&
                 unnestNode.getReplicateSymbols().isEmpty() &&
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/DecorrelateLeftUnnestWithGlobalAggregation.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/DecorrelateLeftUnnestWithGlobalAggregation.java
@@ -217,7 +217,7 @@ private static boolean isSupportedUnnest(PlanNode node, List<Symbol> correlation
                 .collect(toImmutableList());
         PlanNode unnestSource = lookup.resolve(unnestNode.getSource());
         boolean basedOnCorrelation = ImmutableSet.copyOf(correlation).containsAll(unnestSymbols) ||
-                unnestSource instanceof ProjectNode projectNode && ImmutableSet.copyOf(correlation).containsAll(SymbolsExtractor.extractUnique(projectNode.getAssignments().getExpressions()));
+                unnestSource instanceof ProjectNode projectNode && ImmutableSet.copyOf(correlation).containsAll(SymbolsExtractor.extractUnique(projectNode.getAssignments().expressions()));
 
         return isScalar(unnestNode.getSource(), lookup) &&
                 unnestNode.getReplicateSymbols().isEmpty() &&
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/DecorrelateUnnest.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/DecorrelateUnnest.java
@@ -296,7 +296,7 @@ private static boolean isSupportedUnnest(PlanNode node, List<Symbol> correlation
                 .collect(toImmutableList());
         PlanNode unnestSource = lookup.resolve(unnestNode.getSource());
         boolean basedOnCorrelation = ImmutableSet.copyOf(correlation).containsAll(unnestSymbols) ||
-                unnestSource instanceof ProjectNode projectNode && ImmutableSet.copyOf(correlation).containsAll(SymbolsExtractor.extractUnique(projectNode.getAssignments().getExpressions()));
+                unnestSource instanceof ProjectNode projectNode && ImmutableSet.copyOf(correlation).containsAll(SymbolsExtractor.extractUnique(projectNode.getAssignments().expressions()));
 
         return isScalar(unnestNode.getSource(), lookup) &&
                 unnestNode.getReplicateSymbols().isEmpty() &&
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/GatherAndMergeWindows.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/GatherAndMergeWindows.java
@@ -152,7 +152,7 @@ protected static Optional<WindowNode> pullWindowNodeAboveProjects(
                         .putIdentities(targetInputs)
                         .build();
 
-                if (!newTargetChildOutputs.containsAll(SymbolsExtractor.extractUnique(newAssignments.getExpressions()))) {
+                if (!newTargetChildOutputs.containsAll(SymbolsExtractor.extractUnique(newAssignments.expressions()))) {
                     // Projection uses an output of the target -- can't move the target above this projection.
                     return Optional.empty();
                 }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/InlineProjectIntoFilter.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/InlineProjectIntoFilter.java
@@ -159,7 +159,7 @@ public Result apply(FilterNode node, Captures captures, Context context)
             return Result.empty();
         }
 
-        Set<Symbol> postFilterSymbols = postFilterAssignments.getSymbols();
+        Set<Symbol> postFilterSymbols = postFilterAssignments.outputs();
         // Remove inlined expressions from the underlying projection.
         newAssignments.putAll(projectNode.getAssignments().filter(symbol -> !postFilterSymbols.contains(symbol)));
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/InlineProjections.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/InlineProjections.java
@@ -161,7 +161,7 @@ private static Set<Symbol> extractInliningTargets(ProjectNode parent, ProjectNod
         Set<Symbol> childOutputSet = ImmutableSet.copyOf(child.getOutputSymbols());
 
         Map<Symbol, Long> dependencies = parent.getAssignments()
-                .getExpressions().stream()
+                .expressions().stream()
                 .flatMap(expression -> SymbolsExtractor.extractAll(expression).stream())
                 .filter(childOutputSet::contains)
                 .collect(Collectors.groupingBy(Function.identity(), Collectors.counting()));
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/MergePatternRecognitionNodes.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/MergePatternRecognitionNodes.java
@@ -137,7 +137,7 @@ public Result apply(PatternRecognitionNode node, Captures captures, Context cont
                 // put prerequisite assignments in the source of merged node,
                 // and the remaining assignments on top of merged node
                 Assignments remainingAssignments = project.getAssignments()
-                        .filter(symbol -> !prerequisites.getSymbols().contains(symbol));
+                        .filter(symbol -> !prerequisites.outputs().contains(symbol));
 
                 merged = (PatternRecognitionNode) merged.replaceChildren(ImmutableList.of(new ProjectNode(
                         context.getIdAllocator().getNextId(),
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/OptimizeDuplicateInsensitiveJoins.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/OptimizeDuplicateInsensitiveJoins.java
@@ -103,7 +103,7 @@ public Optional<PlanNode> visitFilter(FilterNode node, Void context)
         @Override
         public Optional<PlanNode> visitProject(ProjectNode node, Void context)
         {
-            boolean isDeterministic = node.getAssignments().getExpressions().stream()
+            boolean isDeterministic = node.getAssignments().expressions().stream()
                     .allMatch(DeterminismEvaluator::isDeterministic);
             if (!isDeterministic) {
                 // non-deterministic projections could be used in downstream filters which could
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PreAggregateCaseAggregations.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PreAggregateCaseAggregations.java
@@ -179,7 +179,7 @@ public Result apply(AggregationNode aggregationNode, Captures captures, Context
                 context);
         AggregationNode preAggregation = createPreAggregation(
                 preProjection,
-                preGroupingExpressions.getOutputs(),
+                preGroupingExpressions.outputs(),
                 preAggregations,
                 context);
         Map<CaseAggregation, Symbol> newProjectionSymbols = getNewProjectionSymbols(aggregations, context);
@@ -247,7 +247,7 @@ private Map<CaseAggregation, Symbol> getNewProjectionSymbols(List<CaseAggregatio
 
     private AggregationNode createPreAggregation(
             PlanNode source,
-            List<Symbol> groupingKeys,
+            Set<Symbol> groupingKeys,
             Map<PreAggregationKey, PreAggregation> preAggregations,
             Context context)
     {
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ProjectOffPushDownRule.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ProjectOffPushDownRule.java
@@ -59,7 +59,7 @@ public Result apply(ProjectNode parent, Captures captures, Context context)
     {
         N targetNode = captures.get(targetCapture);
 
-        return pruneInputs(targetNode.getOutputSymbols(), parent.getAssignments().getExpressions())
+        return pruneInputs(targetNode.getOutputSymbols(), parent.getAssignments().expressions())
                 .flatMap(prunedOutputs -> this.pushDownProjectOff(context, targetNode, prunedOutputs))
                 .map(newChild -> parent.replaceChildren(ImmutableList.of(newChild)))
                 .map(Result::ofPlanNode)
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushDownDereferenceThroughFilter.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushDownDereferenceThroughFilter.java
@@ -75,7 +75,7 @@ public Result apply(ProjectNode node, Captures captures, Rule.Context context)
 
         // Pushdown superset of dereference expressions from projections and filtering predicate
         List<Expression> expressions = ImmutableList.<Expression>builder()
-                .addAll(node.getAssignments().getExpressions())
+                .addAll(node.getAssignments().expressions())
                 .add(filterNode.getPredicate())
                 .build();
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushDownDereferenceThroughJoin.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushDownDereferenceThroughJoin.java
@@ -90,7 +90,7 @@ public Result apply(ProjectNode projectNode, Captures captures, Context context)
 
         // Consider dereferences in projections and join filter for pushdown
         ImmutableList.Builder<Expression> expressionsBuilder = ImmutableList.builder();
-        expressionsBuilder.addAll(projectNode.getAssignments().getExpressions());
+        expressionsBuilder.addAll(projectNode.getAssignments().expressions());
         joinNode.getFilter().ifPresent(expressionsBuilder::add);
         Set<FieldReference> dereferences = extractRowSubscripts(expressionsBuilder.build(), false);
 
@@ -145,7 +145,7 @@ else if (joinNode.getRight().getOutputSymbols().contains(baseSymbol)) {
         PlanNode rightNode = createProjectNodeIfRequired(joinNode.getRight(), rightAssignments, context.getIdAllocator());
 
         // Prepare new output symbols for join node
-        List<Symbol> referredSymbolsInAssignments = newAssignments.getExpressions().stream()
+        List<Symbol> referredSymbolsInAssignments = newAssignments.expressions().stream()
                 .flatMap(expression -> extractAll(expression).stream())
                 .collect(toList());
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushDownDereferenceThroughProject.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushDownDereferenceThroughProject.java
@@ -66,7 +66,7 @@ public Result apply(ProjectNode node, Captures captures, Context context)
         ProjectNode child = captures.get(CHILD);
 
         // Extract dereferences from project node assignments for pushdown
-        Set<FieldReference> dereferences = extractRowSubscripts(node.getAssignments().getExpressions(), false);
+        Set<FieldReference> dereferences = extractRowSubscripts(node.getAssignments().expressions(), false);
 
         // Exclude dereferences on symbols being synthesized within child
         dereferences = dereferences.stream()
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushDownDereferenceThroughSemiJoin.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushDownDereferenceThroughSemiJoin.java
@@ -78,7 +78,7 @@ public Result apply(ProjectNode projectNode, Captures captures, Context context)
         SemiJoinNode semiJoinNode = captures.get(CHILD);
 
         // Extract dereferences from project node assignments for pushdown
-        Set<FieldReference> dereferences = extractRowSubscripts(projectNode.getAssignments().getExpressions(), false);
+        Set<FieldReference> dereferences = extractRowSubscripts(projectNode.getAssignments().expressions(), false);
 
         // All dereferences can be assumed on the symbols coming from source, since filteringSource output is not propagated,
         // and semiJoinOutput is of type boolean. We exclude pushdown of dereferences on sourceJoinSymbol.
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushDownDereferenceThroughUnnest.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushDownDereferenceThroughUnnest.java
@@ -75,7 +75,7 @@ public Result apply(ProjectNode projectNode, Captures captures, Context context)
         UnnestNode unnestNode = captures.get(CHILD);
 
         // Extract dereferences for pushdown from project node's assignments
-        Set<FieldReference> dereferences = extractRowSubscripts(projectNode.getAssignments().getExpressions(), false);
+        Set<FieldReference> dereferences = extractRowSubscripts(projectNode.getAssignments().expressions(), false);
 
         // Only retain dereferences on replicate symbols
         dereferences = dereferences.stream()
@@ -114,7 +114,7 @@ public Result apply(ProjectNode projectNode, Captures captures, Context context)
                                 source,
                                 ImmutableList.<Symbol>builder()
                                         .addAll(unnestNode.getReplicateSymbols())
-                                        .addAll(dereferenceAssignments.getSymbols())
+                                        .addAll(dereferenceAssignments.outputs())
                                         .build(),
                                 unnestNode.getMappings(),
                                 unnestNode.getOrdinalitySymbol(),
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushDownDereferencesThroughAssignUniqueId.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushDownDereferencesThroughAssignUniqueId.java
@@ -70,7 +70,7 @@ public Result apply(ProjectNode projectNode, Captures captures, Context context)
         AssignUniqueId assignUniqueId = captures.get(CHILD);
 
         // Extract dereferences from project node assignments for pushdown
-        Set<FieldReference> dereferences = extractRowSubscripts(projectNode.getAssignments().getExpressions(), false);
+        Set<FieldReference> dereferences = extractRowSubscripts(projectNode.getAssignments().expressions(), false);
 
         // We do not need to filter dereferences on idColumn symbol since it is supposed to be of BIGINT type.
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushDownDereferencesThroughLimit.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushDownDereferencesThroughLimit.java
@@ -75,7 +75,7 @@ public Result apply(ProjectNode projectNode, Captures captures, Context context)
         LimitNode limitNode = captures.get(CHILD);
 
         // Extract dereferences from project node assignments for pushdown
-        Set<FieldReference> dereferences = extractRowSubscripts(projectNode.getAssignments().getExpressions(), false);
+        Set<FieldReference> dereferences = extractRowSubscripts(projectNode.getAssignments().expressions(), false);
 
         // Exclude dereferences on symbols being used in tiesResolvingScheme and requiresPreSortedInputs
         Set<Symbol> excludedSymbols = ImmutableSet.<Symbol>builder()
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushDownDereferencesThroughMarkDistinct.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushDownDereferencesThroughMarkDistinct.java
@@ -75,7 +75,7 @@ public Result apply(ProjectNode projectNode, Captures captures, Context context)
         MarkDistinctNode markDistinctNode = captures.get(CHILD);
 
         // Extract dereferences from project node assignments for pushdown
-        Set<FieldReference> dereferences = extractRowSubscripts(projectNode.getAssignments().getExpressions(), false);
+        Set<FieldReference> dereferences = extractRowSubscripts(projectNode.getAssignments().expressions(), false);
 
         // Exclude dereferences on distinct symbols being used in markDistinctNode. We do not need to filter
         // dereferences on markerSymbol since it is supposed to be of boolean type.
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushDownDereferencesThroughRowNumber.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushDownDereferencesThroughRowNumber.java
@@ -75,7 +75,7 @@ public Result apply(ProjectNode projectNode, Captures captures, Context context)
         RowNumberNode rowNumberNode = captures.get(CHILD);
 
         // Extract dereferences from project node assignments for pushdown
-        Set<FieldReference> dereferences = extractRowSubscripts(projectNode.getAssignments().getExpressions(), false);
+        Set<FieldReference> dereferences = extractRowSubscripts(projectNode.getAssignments().expressions(), false);
 
         // Exclude dereferences on symbols being used in partitionBy
         dereferences = dereferences.stream()
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushDownDereferencesThroughSort.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushDownDereferencesThroughSort.java
@@ -75,7 +75,7 @@ public Result apply(ProjectNode projectNode, Captures captures, Context context)
         SortNode sortNode = captures.get(CHILD);
 
         // Extract dereferences from project node assignments for pushdown
-        Set<FieldReference> dereferences = extractRowSubscripts(projectNode.getAssignments().getExpressions(), false);
+        Set<FieldReference> dereferences = extractRowSubscripts(projectNode.getAssignments().expressions(), false);
 
         // Exclude dereferences on symbols used in ordering scheme to avoid replication of data
         dereferences = dereferences.stream()
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushDownDereferencesThroughTopN.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushDownDereferencesThroughTopN.java
@@ -75,7 +75,7 @@ public Result apply(ProjectNode projectNode, Captures captures, Context context)
         TopNNode topNNode = captures.get(CHILD);
 
         // Extract dereferences from project node assignments for pushdown
-        Set<FieldReference> dereferences = extractRowSubscripts(projectNode.getAssignments().getExpressions(), false);
+        Set<FieldReference> dereferences = extractRowSubscripts(projectNode.getAssignments().expressions(), false);
 
         // Exclude dereferences on symbols being used in orderBy
         dereferences = dereferences.stream()
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushDownDereferencesThroughTopNRanking.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushDownDereferencesThroughTopNRanking.java
@@ -78,7 +78,7 @@ public Result apply(ProjectNode projectNode, Captures captures, Context context)
         TopNRankingNode topNRankingNode = captures.get(CHILD);
 
         // Extract dereferences from project node assignments for pushdown
-        Set<FieldReference> dereferences = extractRowSubscripts(projectNode.getAssignments().getExpressions(), false);
+        Set<FieldReference> dereferences = extractRowSubscripts(projectNode.getAssignments().expressions(), false);
 
         // Exclude dereferences on symbols being used in partitionBy and orderBy
         DataOrganizationSpecification specification = topNRankingNode.getSpecification();
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushDownDereferencesThroughWindow.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushDownDereferencesThroughWindow.java
@@ -81,7 +81,7 @@ public Result apply(ProjectNode projectNode, Captures captures, Context context)
         // Extract dereferences for pushdown
         Set<FieldReference> dereferences = extractRowSubscripts(
                 ImmutableList.<Expression>builder()
-                        .addAll(projectNode.getAssignments().getExpressions())
+                        .addAll(projectNode.getAssignments().expressions())
                         // also include dereference projections used in window functions
                         .addAll(windowNode.getWindowFunctions().values().stream()
                                 .flatMap(function -> function.getArguments().stream())
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushLimitThroughProject.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushLimitThroughProject.java
@@ -63,7 +63,7 @@ public Result apply(LimitNode parent, Captures captures, Context context)
         // Do not push down if the projection is made up of symbol references and exclusive dereferences. This prevents
         // undoing of PushDownDereferencesThroughLimit. We still push limit in the case of overlapping dereferences since
         // it enables PushDownDereferencesThroughLimit rule to push optimal dereferences.
-        Set<Expression> projections = ImmutableSet.copyOf(projectNode.getAssignments().getExpressions());
+        Set<Expression> projections = ImmutableSet.copyOf(projectNode.getAssignments().expressions());
         if (!extractRowSubscripts(projections, false).isEmpty()
                 && exclusiveDereferences(projections)) {
             return Result.empty();
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushPredicateThroughProjectIntoRowNumber.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushPredicateThroughProjectIntoRowNumber.java
@@ -102,7 +102,7 @@ public Result apply(FilterNode filter, Captures captures, Context context)
         RowNumberNode rowNumber = captures.get(ROW_NUMBER);
 
         Symbol rowNumberSymbol = rowNumber.getRowNumberSymbol();
-        if (!project.getAssignments().getSymbols().contains(rowNumberSymbol)) {
+        if (!project.getAssignments().outputs().contains(rowNumberSymbol)) {
             return Result.empty();
         }
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushPredicateThroughProjectIntoWindow.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushPredicateThroughProjectIntoWindow.java
@@ -113,7 +113,7 @@ public Result apply(FilterNode filter, Captures captures, Context context)
         WindowNode window = captures.get(WINDOW);
 
         Symbol rankingSymbol = getOnlyElement(window.getWindowFunctions().keySet());
-        if (!project.getAssignments().getSymbols().contains(rankingSymbol)) {
+        if (!project.getAssignments().outputs().contains(rankingSymbol)) {
             return Result.empty();
         }
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushProjectionThroughExchange.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushProjectionThroughExchange.java
@@ -178,7 +178,7 @@ public Result apply(ProjectNode project, Captures captures, Context context)
 
     private static boolean isSymbolToSymbolProjection(ProjectNode project)
     {
-        return project.getAssignments().getExpressions().stream().allMatch(Reference.class::isInstance);
+        return project.getAssignments().expressions().stream().allMatch(Reference.class::isInstance);
     }
 
     private static Map<Symbol, Symbol> mapExchangeOutputToInput(ExchangeNode exchange, int sourceIndex)
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushProjectionThroughJoin.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushProjectionThroughJoin.java
@@ -48,7 +48,7 @@ public static Optional<PlanNode> pushProjectionThroughJoin(
             Lookup lookup,
             PlanNodeIdAllocator planNodeIdAllocator)
     {
-        if (!projectNode.getAssignments().getExpressions().stream().allMatch(DeterminismEvaluator::isDeterministic)) {
+        if (!projectNode.getAssignments().expressions().stream().allMatch(DeterminismEvaluator::isDeterministic)) {
             return Optional.empty();
         }
 
@@ -97,10 +97,10 @@ else if (rightChild.getOutputSymbols().containsAll(symbols)) {
 
         Assignments leftAssignments = leftAssignmentsBuilder.build();
         Assignments rightAssignments = rightAssignmentsBuilder.build();
-        List<Symbol> leftOutputSymbols = leftAssignments.getOutputs().stream()
+        List<Symbol> leftOutputSymbols = leftAssignments.outputs().stream()
                 .filter(ImmutableSet.copyOf(projectNode.getOutputSymbols())::contains)
                 .collect(toImmutableList());
-        List<Symbol> rightOutputSymbols = rightAssignments.getOutputs().stream()
+        List<Symbol> rightOutputSymbols = rightAssignments.outputs().stream()
                 .filter(ImmutableSet.copyOf(projectNode.getOutputSymbols())::contains)
                 .collect(toImmutableList());
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushProjectionThroughUnion.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushProjectionThroughUnion.java
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushTopNThroughProject.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PushTopNThroughProject.java
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/AddLocalExchanges.java b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/AddLocalExchanges.java
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/MetadataQueryOptimizer.java b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/MetadataQueryOptimizer.java
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/SymbolMapper.java b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/SymbolMapper.java
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/UnaliasSymbolReferences.java b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/UnaliasSymbolReferences.java
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/AggregationNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/AggregationNode.java
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/Assignments.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/Assignments.java
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/ProjectNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/ProjectNode.java
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/sanity/ValidateDependenciesChecker.java b/core/trino-main/src/main/java/io/trino/sql/planner/sanity/ValidateDependenciesChecker.java
diff --git a/core/trino-main/src/test/java/io/trino/cost/TestAggregationStatsRule.java b/core/trino-main/src/test/java/io/trino/cost/TestAggregationStatsRule.java
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/StrictAssignedSymbolsMatcher.java b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/StrictAssignedSymbolsMatcher.java

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public Void visitFilter(FilterNode node, Void context)`
`110`	`110`	`@Override`
`111`	`111`	`public Void visitProject(ProjectNode node, Void context)`
`112`	`112`	`{`
`113`		`- node.getAssignments().getExpressions().forEach(consumer);`
	`113`	`+ node.getAssignments().expressions().forEach(consumer);`
`114`	`114`	`return super.visitProject(node, context);`
`115`	`115`	`}`
`116`	`116`
Original file line number	Diff line number	Diff line change
`@@ -1301,7 +1301,7 @@ private PlanBuilder planAggregation(PlanBuilder subPlan, List<List<Symbol>> grou`
`1301`	`1301`	`}`
`1302`	`1302`	`}`
`1303`	`1303`
`1304`		`- ImmutableList.Builder<Symbol> groupingKeys = ImmutableList.builder();`
	`1304`	`+ ImmutableSet.Builder<Symbol> groupingKeys = ImmutableSet.builder();`
`1305`	`1305`	`groupingSets.stream()`
`1306`	`1306`	`.flatMap(List::stream)`
`1307`	`1307`	`.distinct()`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ protected static Optional<WindowNode> pullWindowNodeAboveProjects(`
`152`	`152`	`.putIdentities(targetInputs)`
`153`	`153`	`.build();`
`154`	`154`
`155`		`- if (!newTargetChildOutputs.containsAll(SymbolsExtractor.extractUnique(newAssignments.getExpressions()))) {`
	`155`	`+ if (!newTargetChildOutputs.containsAll(SymbolsExtractor.extractUnique(newAssignments.expressions()))) {`
`156`	`156`	`// Projection uses an output of the target -- can't move the target above this projection.`
`157`	`157`	`return Optional.empty();`
`158`	`158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ public Result apply(FilterNode node, Captures captures, Context context)`
`159`	`159`	`return Result.empty();`
`160`	`160`	`}`
`161`	`161`
`162`		`- Set<Symbol> postFilterSymbols = postFilterAssignments.getSymbols();`
	`162`	`+ Set<Symbol> postFilterSymbols = postFilterAssignments.outputs();`
`163`	`163`	`// Remove inlined expressions from the underlying projection.`
`164`	`164`	`newAssignments.putAll(projectNode.getAssignments().filter(symbol -> !postFilterSymbols.contains(symbol)));`
`165`	`165`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public Optional<PlanNode> visitFilter(FilterNode node, Void context)`
`103`	`103`	`@Override`
`104`	`104`	`public Optional<PlanNode> visitProject(ProjectNode node, Void context)`
`105`	`105`	`{`
`106`		`- boolean isDeterministic = node.getAssignments().getExpressions().stream()`
	`106`	`+ boolean isDeterministic = node.getAssignments().expressions().stream()`
`107`	`107`	`.allMatch(DeterminismEvaluator::isDeterministic);`
`108`	`108`	`if (!isDeterministic) {`
`109`	`109`	`// non-deterministic projections could be used in downstream filters which could`