Remove unused PlanNodeDecorrelator#idAllocator

trinodb · Sep 11, 2019 · 9ce1b27 · 9ce1b27
1 parent 7f9fc3e
commit 9ce1b27
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/.../src/main/java/io/prestosql/sql/planner/iterative/rule/TransformCorrelatedJoinToJoin.java b/.../src/main/java/io/prestosql/sql/planner/iterative/rule/TransformCorrelatedJoinToJoin.java
@@ -54,7 +54,7 @@ public Result apply(CorrelatedJoinNode correlatedJoinNode, Captures captures, Co
     {
         PlanNode subquery = correlatedJoinNode.getSubquery();
 
-        PlanNodeDecorrelator planNodeDecorrelator = new PlanNodeDecorrelator(context.getIdAllocator(), context.getSymbolAllocator(), context.getLookup());
+        PlanNodeDecorrelator planNodeDecorrelator = new PlanNodeDecorrelator(context.getSymbolAllocator(), context.getLookup());
         Optional<DecorrelatedNode> decorrelatedNodeOptional = planNodeDecorrelator.decorrelateFilters(subquery, correlatedJoinNode.getCorrelation());
 
         return decorrelatedNodeOptional

diff --git a/...in/java/io/prestosql/sql/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java b/...in/java/io/prestosql/sql/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java
@@ -131,7 +131,7 @@ private Optional<PlanNode> rewriteToNonDefaultAggregation(ApplyNode applyNode, C
                         false),
                 Assignments.of(subqueryTrue, TRUE_LITERAL));
 
-        PlanNodeDecorrelator decorrelator = new PlanNodeDecorrelator(context.getIdAllocator(), context.getSymbolAllocator(), context.getLookup());
+        PlanNodeDecorrelator decorrelator = new PlanNodeDecorrelator(context.getSymbolAllocator(), context.getLookup());
         if (!decorrelator.decorrelateFilters(subquery, applyNode.getCorrelation()).isPresent()) {
             return Optional.empty();
         }

diff --git a/presto-main/src/main/java/io/prestosql/sql/planner/optimizations/PlanNodeDecorrelator.java b/presto-main/src/main/java/io/prestosql/sql/planner/optimizations/PlanNodeDecorrelator.java
@@ -24,7 +24,6 @@
 import io.prestosql.spi.block.SortOrder;
 import io.prestosql.sql.ExpressionUtils;
 import io.prestosql.sql.planner.OrderingScheme;
-import io.prestosql.sql.planner.PlanNodeIdAllocator;
 import io.prestosql.sql.planner.Symbol;
 import io.prestosql.sql.planner.SymbolAllocator;
 import io.prestosql.sql.planner.SymbolsExtractor;
@@ -63,13 +62,11 @@
 
 public class PlanNodeDecorrelator
 {
-    private final PlanNodeIdAllocator idAllocator;
     private final SymbolAllocator symbolAllocator;
     private final Lookup lookup;
 
-    public PlanNodeDecorrelator(PlanNodeIdAllocator idAllocator, SymbolAllocator symbolAllocator, Lookup lookup)
+    public PlanNodeDecorrelator(SymbolAllocator symbolAllocator, Lookup lookup)
     {
-        this.idAllocator = requireNonNull(idAllocator, "idAllocator is null");
         this.symbolAllocator = requireNonNull(symbolAllocator, "symbolAllocator is null");
         this.lookup = requireNonNull(lookup, "lookup is null");
     }

diff --git a/...src/main/java/io/prestosql/sql/planner/optimizations/ScalarAggregationToJoinRewriter.java b/...src/main/java/io/prestosql/sql/planner/optimizations/ScalarAggregationToJoinRewriter.java
@@ -64,7 +64,7 @@ public ScalarAggregationToJoinRewriter(Metadata metadata, SymbolAllocator symbol
         this.symbolAllocator = requireNonNull(symbolAllocator, "symbolAllocator is null");
         this.idAllocator = requireNonNull(idAllocator, "idAllocator is null");
         this.lookup = requireNonNull(lookup, "lookup is null");
-        this.planNodeDecorrelator = new PlanNodeDecorrelator(idAllocator, symbolAllocator, lookup);
+        this.planNodeDecorrelator = new PlanNodeDecorrelator(symbolAllocator, lookup);
     }
 
     public PlanNode rewriteScalarAggregation(CorrelatedJoinNode correlatedJoinNode, AggregationNode aggregation)