Change Symbol to VariableReferenceExpression in PlanNode

presto-benchmark/src/main/java/com/facebook/presto/benchmark/AbstractOperatorBenchmark.java

@@ -43,6 +43,7 @@
 import com.facebook.presto.spi.memory.MemoryPoolId;
 import com.facebook.presto.spi.plan.PlanNodeId;
 import com.facebook.presto.spi.relation.RowExpression;
+import com.facebook.presto.spi.relation.VariableReferenceExpression;
 import com.facebook.presto.spi.type.Type;
 import com.facebook.presto.spiller.SpillSpaceTracker;
 import com.facebook.presto.split.SplitSource;
@@ -215,16 +216,18 @@ private static List<Split> getNextBatch(SplitSource splitSource)
     protected final OperatorFactory createHashProjectOperator(int operatorId, PlanNodeId planNodeId, List<Type> types)
     {
         ImmutableMap.Builder<Symbol, Type> symbolTypes = ImmutableMap.builder();
-        ImmutableMap.Builder<Symbol, Integer> symbolToInputMapping = ImmutableMap.builder();
+        ImmutableList.Builder<VariableReferenceExpression> variables = ImmutableList.builder();
+        ImmutableMap.Builder<VariableReferenceExpression, Integer> variableToInputMapping = ImmutableMap.builder();
         ImmutableList.Builder<PageProjection> projections = ImmutableList.builder();
         for (int channel = 0; channel < types.size(); channel++) {
-            Symbol symbol = new Symbol("h" + channel);
-            symbolTypes.put(symbol, types.get(channel));
-            symbolToInputMapping.put(symbol, channel);
+            VariableReferenceExpression variable = new VariableReferenceExpression("h" + channel, types.get(channel));
+            symbolTypes.put(new Symbol(variable.getName()), types.get(channel));
+            variables.add(variable);
+            variableToInputMapping.put(variable, channel);
             projections.add(new InputPageProjection(channel, types.get(channel)));
         }
 
-        Optional<Expression> hashExpression = HashGenerationOptimizer.getHashExpression(ImmutableList.copyOf(symbolTypes.build().keySet()));
+        Optional<Expression> hashExpression = HashGenerationOptimizer.getHashExpression(variables.build());
         verify(hashExpression.isPresent());
         Map<NodeRef<Expression>, Type> expressionTypes = getExpressionTypes(
                 session,
@@ -234,7 +237,7 @@ protected final OperatorFactory createHashProjectOperator(int operatorId, PlanNo
                 hashExpression.get(),
                 ImmutableList.of(),
                 WarningCollector.NOOP);
-        RowExpression translated = translate(hashExpression.get(), expressionTypes, symbolToInputMapping.build(), localQueryRunner.getMetadata().getFunctionManager(), localQueryRunner.getTypeManager(), session, false);
+        RowExpression translated = translate(hashExpression.get(), expressionTypes, variableToInputMapping.build(), localQueryRunner.getMetadata().getFunctionManager(), localQueryRunner.getTypeManager(), session, false);
 
         PageFunctionCompiler functionCompiler = new PageFunctionCompiler(localQueryRunner.getMetadata(), 0);
         projections.add(functionCompiler.compileProjection(translated, Optional.empty()).get());

presto-benchto-benchmarks/src/test/resources/sql/presto/tpcds/q31.plan.txt

@@ -18,7 +18,7 @@ remote exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan customer_address
                         local exchange (GATHER, SINGLE, [])
-                            remote exchange (REPARTITION, HASH, ["ca_county_173", NullableValue{type=integer, value=2000}, NullableValue{type=integer, value=2}])
+                            remote exchange (REPARTITION, HASH, ["ca_county_173", 2, 2000])
                                 final aggregation over (ca_county_173, d_qoy_148, d_year_144)
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ca_county_173", "d_qoy_148", "d_year_144"])
@@ -47,7 +47,7 @@ remote exchange (GATHER, SINGLE, [])
                                                 remote exchange (REPLICATE, BROADCAST, [])
                                                     scan customer_address
                         local exchange (GATHER, SINGLE, [])
-                            remote exchange (REPARTITION, HASH, ["ca_county_448", NullableValue{type=integer, value=2000}, NullableValue{type=integer, value=2}])
+                            remote exchange (REPARTITION, HASH, ["ca_county_448", 2, 2000])
                                 final aggregation over (ca_county_448, d_qoy_423, d_year_419)
                                     local exchange (GATHER, SINGLE, [])
                                         remote exchange (REPARTITION, HASH, ["ca_county_448", "d_qoy_423", "d_year_419"])
@@ -62,7 +62,7 @@ remote exchange (GATHER, SINGLE, [])
                                                         remote exchange (REPLICATE, BROADCAST, [])
                                                             scan customer_address
                 local exchange (GATHER, SINGLE, [])
-                    remote exchange (REPARTITION, HASH, ["ca_county", NullableValue{type=integer, value=2000}, NullableValue{type=integer, value=2}])
+                    remote exchange (REPARTITION, HASH, ["ca_county", 2, 2000])
                         join (INNER, PARTITIONED):
                             final aggregation over (ca_county, d_qoy, d_year)
                                 local exchange (GATHER, SINGLE, [])