Remove unused code for pre-computed hashes in TableFunctionProcessorNode

raunaqmorarka · raunaqmorarka · commit 187d53eb2737 · 2025-06-16T13:20:46.000+05:30
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ImplementTableFunctionSource.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/ImplementTableFunctionSource.java
@@ -165,7 +165,6 @@ public Result apply(TableFunctionNode node, Captures captures, Context context)
                     Optional.empty(),
                     ImmutableSet.of(),
                     0,
-                    Optional.empty(),
                     node.getHandle()));
         }
 
@@ -187,7 +186,6 @@ public Result apply(TableFunctionNode node, Captures captures, Context context)
                     sourceProperties.specification(),
                     ImmutableSet.of(),
                     0,
-                    Optional.empty(),
                     node.getHandle()));
         }
         Map<String, SourceWithProperties> sources = mapSourcesByName(node.getSources(), node.getTableArgumentProperties());
@@ -282,7 +280,6 @@ public Result apply(TableFunctionNode node, Captures captures, Context context)
                 Optional.of(new DataOrganizationSpecification(finalPartitionBy, finalOrderBy)),
                 ImmutableSet.of(),
                 0,
-                Optional.empty(),
                 node.getHandle()));
     }
 
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PruneTableFunctionProcessorColumns.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PruneTableFunctionProcessorColumns.java
@@ -81,7 +81,6 @@ protected Optional<PlanNode> pushDownProjectOff(Context context, TableFunctionPr
                 node.getSpecification(),
                 node.getPrePartitioned(),
                 node.getPreSorted(),
-                node.getHashSymbol(),
                 node.getHandle()));
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java
@@ -77,8 +77,6 @@ public Result apply(TableFunctionProcessorNode node, Captures captures, Context
             specification.orderingScheme().ifPresent(orderingScheme -> requiredInputs.addAll(orderingScheme.orderBy()));
         });
 
-        node.getHashSymbol().ifPresent(requiredInputs::add);
-
         Optional<Map<Symbol, Symbol>> updatedMarkerSymbols = node.getMarkerSymbols()
                 .map(mapping -> filterKeys(mapping, requiredInputs.build()::contains));
 
@@ -97,7 +95,6 @@ public Result apply(TableFunctionProcessorNode node, Captures captures, Context
                         node.getSpecification(),
                         node.getPrePartitioned(),
                         node.getPreSorted(),
-                        node.getHashSymbol(),
                         node.getHandle())))
                 .orElse(Result.empty());
     }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/AddExchanges.java b/core/trino-main/src/main/java/io/trino/sql/planner/optimizations/AddExchanges.java
@@ -472,7 +472,7 @@ else if (!isNodePartitionedOn(child.getProperties(), partitionBy)) {
                 }
                 else {
                     child = withDerivedProperties(
-                            partitionedExchange(idAllocator.getNextId(), REMOTE, child.getNode(), partitionBy, node.getHashSymbol()),
+                            partitionedExchange(idAllocator.getNextId(), REMOTE, child.getNode(), partitionBy, Optional.empty()),
                             child.getProperties());
                 }
             }
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
@@ -546,7 +546,6 @@ public PlanWithProperties visitTableFunctionProcessor(TableFunctionProcessorNode
                     node.getSpecification(),
                     prePartitionedInputs,
                     preSortedOrderPrefix,
-                    node.getHashSymbol(),
                     node.getHandle());
 
             return deriveProperties(result, child.getProperties());
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
@@ -436,7 +436,6 @@ public TableFunctionProcessorNode map(TableFunctionProcessorNode node, PlanNode
                         .map(this::map)
                         .collect(toImmutableSet()),
                 newSpecification.map(SpecificationWithPreSortedPrefix::preSorted).orElse(node.getPreSorted()),
-                node.getHashSymbol().map(this::map),
                 node.getHandle());
     }
 
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
@@ -365,7 +365,6 @@ public PlanAndMappings visitTableFunctionProcessor(TableFunctionProcessorNode no
                                 Optional.empty(),
                                 ImmutableSet.of(),
                                 0,
-                                node.getHashSymbol().map(mapper::map),
                                 node.getHandle()),
                         mapping);
             }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/TableFunctionProcessorNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/TableFunctionProcessorNode.java
@@ -66,7 +66,6 @@ public class TableFunctionProcessorNode
     private final Optional<DataOrganizationSpecification> specification;
     private final Set<Symbol> prePartitioned;
     private final int preSorted;
-    private final Optional<Symbol> hashSymbol;
 
     private final TableFunctionHandle handle;
 
@@ -83,7 +82,6 @@ public TableFunctionProcessorNode(
             @JsonProperty("specification") Optional<DataOrganizationSpecification> specification,
             @JsonProperty("prePartitioned") Set<Symbol> prePartitioned,
             @JsonProperty("preSorted") int preSorted,
-            @JsonProperty("hashSymbol") Optional<Symbol> hashSymbol,
             @JsonProperty("handle") TableFunctionHandle handle)
     {
         super(id);
@@ -112,7 +110,6 @@ public TableFunctionProcessorNode(
                         .orElse(0) >= preSorted,
                 "the number of pre-sorted symbols cannot be greater than the number of all ordering symbols");
         checkArgument(preSorted == 0 || partitionBy.equals(prePartitioned), "to specify pre-sorted symbols, it is required that all partitioning symbols are pre-partitioned");
-        this.hashSymbol = requireNonNull(hashSymbol, "hashSymbol is null");
         this.handle = requireNonNull(handle, "handle is null");
     }
 
@@ -176,12 +173,6 @@ public int getPreSorted()
         return preSorted;
     }
 
-    @JsonProperty
-    public Optional<Symbol> getHashSymbol()
-    {
-        return hashSymbol;
-    }
-
     @JsonProperty
     public TableFunctionHandle getHandle()
     {
@@ -233,7 +224,6 @@ public PlanNode replaceChildren(List<PlanNode> newSources)
                 specification,
                 prePartitioned,
                 preSorted,
-                hashSymbol,
                 handle);
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/PlanPrinter.java b/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/PlanPrinter.java
@@ -1967,7 +1967,7 @@ public Void visitTableFunctionProcessor(TableFunctionProcessorNode node, Context
                 specification.orderingScheme().ifPresent(orderingScheme -> descriptor.put("orderBy", formatOrderingScheme(orderingScheme, node.getPreSorted())));
             });
 
-            addNode(node, "TableFunctionProcessor", descriptor.put("hash", formatHash(node.getHashSymbol())).buildOrThrow(), context);
+            addNode(node, "TableFunctionProcessor", descriptor.buildOrThrow(), context);
 
             return processChildren(node, new Context(context.isInitialPlan()));
         }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/TableFunctionProcessorMatcher.java b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/TableFunctionProcessorMatcher.java
@@ -48,16 +48,14 @@ public class TableFunctionProcessorMatcher
     private final List<List<String>> requiredSymbols;
     private final Optional<Map<String, String>> markerSymbols;
     private final Optional<ExpectedValueProvider<DataOrganizationSpecification>> specification;
-    private final Optional<String> hashSymbol;
 
     private TableFunctionProcessorMatcher(
             String name,
             List<String> properOutputs,
             List<List<String>> passThroughSymbols,
             List<List<String>> requiredSymbols,
             Optional<Map<String, String>> markerSymbols,
-            Optional<ExpectedValueProvider<DataOrganizationSpecification>> specification,
-            Optional<String> hashSymbol)
+            Optional<ExpectedValueProvider<DataOrganizationSpecification>> specification)
     {
         this.name = requireNonNull(name, "name is null");
         this.properOutputs = ImmutableList.copyOf(properOutputs);
@@ -69,7 +67,6 @@ private TableFunctionProcessorMatcher(
                 .collect(toImmutableList());
         this.markerSymbols = markerSymbols.map(ImmutableMap::copyOf);
         this.specification = requireNonNull(specification, "specification is null");
-        this.hashSymbol = requireNonNull(hashSymbol, "hashSymbol is null");
     }
 
     @Override
@@ -145,12 +142,6 @@ public MatchResult detailMatches(PlanNode node, StatsProvider stats, Session ses
             }
         }
 
-        if (hashSymbol.isPresent()) {
-            if (!hashSymbol.map(symbolAliases::get).equals(tableFunctionProcessorNode.getHashSymbol().map(Symbol::toSymbolReference))) {
-                return NO_MATCH;
-            }
-        }
-
         ImmutableMap.Builder<String, Reference> properOutputsMapping = ImmutableMap.builder();
         for (int i = 0; i < properOutputs.size(); i++) {
             properOutputsMapping.put(properOutputs.get(i), tableFunctionProcessorNode.getProperOutputs().get(i).toSymbolReference());
@@ -173,7 +164,6 @@ public String toString()
                 .add("requiredSymbols", requiredSymbols)
                 .add("markerSymbols", markerSymbols)
                 .add("specification", specification)
-                .add("hashSymbol", hashSymbol)
                 .toString();
     }
 
@@ -186,7 +176,6 @@ public static class Builder
         private List<List<String>> requiredSymbols = ImmutableList.of();
         private Optional<Map<String, String>> markerSymbols = Optional.empty();
         private Optional<ExpectedValueProvider<DataOrganizationSpecification>> specification = Optional.empty();
-        private Optional<String> hashSymbol = Optional.empty();
 
         public Builder()
         {
@@ -234,17 +223,11 @@ public Builder specification(ExpectedValueProvider<DataOrganizationSpecification
             return this;
         }
 
-        public Builder hashSymbol(String hashSymbol)
-        {
-            this.hashSymbol = Optional.of(hashSymbol);
-            return this;
-        }
-
         public PlanMatchPattern build()
         {
             PlanMatchPattern[] sources = source.map(sourcePattern -> new PlanMatchPattern[] {sourcePattern}).orElse(new PlanMatchPattern[] {});
             return node(TableFunctionProcessorNode.class, sources)
-                    .with(new TableFunctionProcessorMatcher(name, properOutputs, passThroughSymbols, requiredSymbols, markerSymbols, specification, hashSymbol));
+                    .with(new TableFunctionProcessorMatcher(name, properOutputs, passThroughSymbols, requiredSymbols, markerSymbols, specification));
         }
     }
 }
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTableFunctionProcessorSourceColumns.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestPruneTableFunctionProcessorSourceColumns.java
@@ -50,7 +50,6 @@ public void testPruneUnreferencedSymbol()
                     Symbol c = p.symbol("c");
                     Symbol d = p.symbol("d");
                     Symbol unreferenced = p.symbol("unreferenced");
-                    Symbol hash = p.symbol("hash");
                     Symbol marker = p.symbol("marker");
                     return p.tableFunctionProcessor(
                             builder -> builder
@@ -65,8 +64,7 @@ public void testPruneUnreferencedSymbol()
                                             d, marker,
                                             unreferenced, marker))
                                     .specification(new DataOrganizationSpecification(ImmutableList.of(c), Optional.of(new OrderingScheme(ImmutableList.of(d), ImmutableMap.of(d, ASC_NULLS_FIRST)))))
-                                    .hashSymbol(hash)
-                                    .source(p.values(a, b, c, d, unreferenced, hash, marker)));
+                                    .source(p.values(a, b, c, d, unreferenced, marker)));
                 })
                 .matches(tableFunctionProcessor(builder -> builder
                                 .name("test_function")
@@ -78,17 +76,15 @@ public void testPruneUnreferencedSymbol()
                                         "b", "marker",
                                         "c", "marker",
                                         "d", "marker"))
-                                .specification(specification(ImmutableList.of("c"), ImmutableList.of("d"), ImmutableMap.of("d", ASC_NULLS_FIRST)))
-                                .hashSymbol("hash"),
+                                .specification(specification(ImmutableList.of("c"), ImmutableList.of("d"), ImmutableMap.of("d", ASC_NULLS_FIRST))),
                         project(
                                 ImmutableMap.of(
                                         "a", expression(new Reference(BIGINT, "a")),
                                         "b", expression(new Reference(BIGINT, "b")),
                                         "c", expression(new Reference(BIGINT, "c")),
                                         "d", expression(new Reference(BIGINT, "d")),
-                                        "hash", expression(new Reference(BIGINT, "hash")),
                                         "marker", expression(new Reference(BIGINT, "marker"))),
-                                values("a", "b", "c", "d", "unreferenced", "hash", "marker"))));
+                                values("a", "b", "c", "d", "unreferenced", "marker"))));
     }
 
     @Test
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/TableFunctionProcessorBuilder.java b/core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/TableFunctionProcessorBuilder.java
@@ -44,7 +44,6 @@ public class TableFunctionProcessorBuilder
     private Optional<DataOrganizationSpecification> specification = Optional.empty();
     private Set<Symbol> prePartitioned = ImmutableSet.of();
     private int preSorted;
-    private Optional<Symbol> hashSymbol = Optional.empty();
     private ConnectorTableFunctionHandle connectorHandle = new ConnectorTableFunctionHandle() {};
 
     public TableFunctionProcessorBuilder() {}
@@ -109,12 +108,6 @@ public TableFunctionProcessorBuilder preSorted(int preSorted)
         return this;
     }
 
-    public TableFunctionProcessorBuilder hashSymbol(Symbol hashSymbol)
-    {
-        this.hashSymbol = Optional.of(hashSymbol);
-        return this;
-    }
-
     public TableFunctionProcessorBuilder connectorHandle(ConnectorTableFunctionHandle connectorHandle)
     {
         this.connectorHandle = connectorHandle;
@@ -135,7 +128,6 @@ public TableFunctionProcessorNode build(PlanNodeIdAllocator idAllocator)
                 specification,
                 prePartitioned,
                 preSorted,
-                hashSymbol,
                 new TableFunctionHandle(TEST_CATALOG_HANDLE, connectorHandle, TestingTransactionHandle.create()));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,6 @@ protected Optional<PlanNode> pushDownProjectOff(Context context, TableFunctionPr`
`81`	`81`	`node.getSpecification(),`
`82`	`82`	`node.getPrePartitioned(),`
`83`	`83`	`node.getPreSorted(),`
`84`		`- node.getHashSymbol(),`
`85`	`84`	`node.getHandle()));`
`86`	`85`	`}`
`87`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -472,7 +472,7 @@ else if (!isNodePartitionedOn(child.getProperties(), partitionBy)) {`
`472`	`472`	`}`
`473`	`473`	`else {`
`474`	`474`	`child = withDerivedProperties(`
`475`		`- partitionedExchange(idAllocator.getNextId(), REMOTE, child.getNode(), partitionBy, node.getHashSymbol()),`
	`475`	`+ partitionedExchange(idAllocator.getNextId(), REMOTE, child.getNode(), partitionBy, Optional.empty()),`
`476`	`476`	`child.getProperties());`
`477`	`477`	`}`
`478`	`478`	`}`
Original file line number	Diff line number	Diff line change
`@@ -436,7 +436,6 @@ public TableFunctionProcessorNode map(TableFunctionProcessorNode node, PlanNode`
`436`	`436`	`.map(this::map)`
`437`	`437`	`.collect(toImmutableSet()),`
`438`	`438`	`newSpecification.map(SpecificationWithPreSortedPrefix::preSorted).orElse(node.getPreSorted()),`
`439`		`- node.getHashSymbol().map(this::map),`
`440`	`439`	`node.getHandle());`
`441`	`440`	`}`
`442`	`441`
Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,6 @@ public PlanAndMappings visitTableFunctionProcessor(TableFunctionProcessorNode no`
`365`	`365`	`Optional.empty(),`
`366`	`366`	`ImmutableSet.of(),`
`367`	`367`	`0,`
`368`		`- node.getHashSymbol().map(mapper::map),`
`369`	`368`	`node.getHandle()),`
`370`	`369`	`mapping);`
`371`	`370`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1967,7 +1967,7 @@ public Void visitTableFunctionProcessor(TableFunctionProcessorNode node, Context`
`1967`	`1967`	`specification.orderingScheme().ifPresent(orderingScheme -> descriptor.put("orderBy", formatOrderingScheme(orderingScheme, node.getPreSorted())));`
`1968`	`1968`	`});`
`1969`	`1969`
`1970`		`- addNode(node, "TableFunctionProcessor", descriptor.put("hash", formatHash(node.getHashSymbol())).buildOrThrow(), context);`
	`1970`	`+ addNode(node, "TableFunctionProcessor", descriptor.buildOrThrow(), context);`
`1971`	`1971`
`1972`	`1972`	`return processChildren(node, new Context(context.isInitialPlan()));`
`1973`	`1973`	`}`