Rename TableWriterNode#partitioningScheme to tablePartitioningScheme

presto-main/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java

@@ -2195,7 +2195,7 @@ public PhysicalOperation visitSemiJoin(SemiJoinNode node, LocalExecutionPlanCont
         public PhysicalOperation visitTableWriter(TableWriterNode node, LocalExecutionPlanContext context)
         {
             // Set table writer count
-            if (node.getPartitioningScheme().isPresent()) {
+            if (node.getTablePartitioningScheme().isPresent()) {
                 context.setDriverInstanceCount(getTaskPartitionedWriterCount(session));
             }
             else {

presto-main/src/main/java/com/facebook/presto/sql/planner/PlanFragmenter.java

@@ -447,8 +447,8 @@ public PlanNode visitTableScan(TableScanNode node, RewriteContext<FragmentProper
         @Override
         public PlanNode visitTableWriter(TableWriterNode node, RewriteContext<FragmentProperties> context)
         {
-            if (node.getPartitioningScheme().isPresent()) {
-                context.get().setDistribution(node.getPartitioningScheme().get().getPartitioning().getHandle(), metadata, session);
+            if (node.getTablePartitioningScheme().isPresent()) {
+                context.get().setDistribution(node.getTablePartitioningScheme().get().getPartitioning().getHandle(), metadata, session);
             }
             return context.defaultRewrite(node, context.get());
         }

presto-main/src/main/java/com/facebook/presto/sql/planner/iterative/rule/PushTableWriteThroughUnion.java

@@ -51,7 +51,7 @@ public class PushTableWriteThroughUnion
             // guaranteed regardless of this optimizer. The level of local parallelism will be
             // determined by LocalExecutionPlanner separately, and shouldn't be a concern of
             // this optimizer.
-            .matching(tableWriter -> !tableWriter.getPartitioningScheme().isPresent())
+            .matching(tableWriter -> !tableWriter.getTablePartitioningScheme().isPresent())
             .with(source().matching(union().capturedAs(CHILD)));
 
     @Override

presto-main/src/main/java/com/facebook/presto/sql/planner/iterative/rule/RowExpressionRewriteRuleSet.java

@@ -497,7 +497,7 @@ public Result apply(TableWriterNode node, Captures captures, Context context)
                         node.getTableCommitContextVariable(),
                         node.getColumns(),
                         node.getColumnNames(),
-                        node.getPartitioningScheme(),
+                        node.getTablePartitioningScheme(),
                         rewrittenStatisticsAggregation));
             }
             return Result.empty();

presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/AddExchanges.java

@@ -575,7 +575,7 @@ public PlanWithProperties visitTableWriter(TableWriterNode node, PreferredProper
         {
             PlanWithProperties source = node.getSource().accept(this, preferredProperties);
 
-            Optional<PartitioningScheme> partitioningScheme = node.getPartitioningScheme();
+            Optional<PartitioningScheme> partitioningScheme = node.getTablePartitioningScheme();
             if (!partitioningScheme.isPresent()) {
                 if (scaleWriters) {
                     partitioningScheme = Optional.of(new PartitioningScheme(Partitioning.create(SCALED_WRITER_DISTRIBUTION, ImmutableList.of()), source.getNode().getOutputVariables()));

presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/AddLocalExchanges.java

@@ -486,11 +486,11 @@ public PlanWithProperties visitTopNRowNumber(TopNRowNumberNode node, StreamPrefe
         @Override
         public PlanWithProperties visitTableWriter(TableWriterNode originalTableWriterNode, StreamPreferredProperties parentPreferences)
         {
-            if (originalTableWriterNode.getPartitioningScheme().isPresent() && getTaskPartitionedWriterCount(session) == 1) {
+            if (originalTableWriterNode.getTablePartitioningScheme().isPresent() && getTaskPartitionedWriterCount(session) == 1) {
                 return planAndEnforceChildren(originalTableWriterNode, singleStream(), defaultParallelism(session));
             }
 
-            if (!originalTableWriterNode.getPartitioningScheme().isPresent() && getTaskWriterCount(session) == 1) {
+            if (!originalTableWriterNode.getTablePartitioningScheme().isPresent() && getTaskWriterCount(session) == 1) {
                 return planAndEnforceChildren(originalTableWriterNode, singleStream(), defaultParallelism(session));
             }
 
@@ -506,7 +506,7 @@ public PlanWithProperties visitTableWriter(TableWriterNode originalTableWriterNo
 
             PlanWithProperties tableWriter;
 
-            if (!originalTableWriterNode.getPartitioningScheme().isPresent()) {
+            if (!originalTableWriterNode.getTablePartitioningScheme().isPresent()) {
                 tableWriter = planAndEnforceChildren(
                         new TableWriterNode(
                                 originalTableWriterNode.getId(),
@@ -517,7 +517,7 @@ public PlanWithProperties visitTableWriter(TableWriterNode originalTableWriterNo
                                 variableAllocator.newVariable("partialcontext", VARBINARY),
                                 originalTableWriterNode.getColumns(),
                                 originalTableWriterNode.getColumnNames(),
-                                originalTableWriterNode.getPartitioningScheme(),
+                                originalTableWriterNode.getTablePartitioningScheme(),
                                 statisticAggregations.map(StatisticAggregations.Parts::getPartialAggregation)),
                         fixedParallelism(),
                         fixedParallelism());
@@ -529,7 +529,7 @@ public PlanWithProperties visitTableWriter(TableWriterNode originalTableWriterNo
                                 idAllocator.getNextId(),
                                 LOCAL,
                                 source.getNode(),
-                                originalTableWriterNode.getPartitioningScheme().get()),
+                                originalTableWriterNode.getTablePartitioningScheme().get()),
                         source.getProperties());
                 tableWriter = deriveProperties(
                         new TableWriterNode(
@@ -541,7 +541,7 @@ public PlanWithProperties visitTableWriter(TableWriterNode originalTableWriterNo
                                 variableAllocator.newVariable("partialcontext", VARBINARY),
                                 originalTableWriterNode.getColumns(),
                                 originalTableWriterNode.getColumnNames(),
-                                originalTableWriterNode.getPartitioningScheme(),
+                                originalTableWriterNode.getTablePartitioningScheme(),
                                 statisticAggregations.map(StatisticAggregations.Parts::getPartialAggregation)),
                         exchange.getProperties());
             }

presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PruneUnreferencedOutputs.java

@@ -669,8 +669,8 @@ public PlanNode visitTableWriter(TableWriterNode node, RewriteContext<Set<Variab
         {
             ImmutableSet.Builder<VariableReferenceExpression> expectedInputs = ImmutableSet.<VariableReferenceExpression>builder()
                     .addAll(node.getColumns());
-            if (node.getPartitioningScheme().isPresent()) {
-                PartitioningScheme partitioningScheme = node.getPartitioningScheme().get();
+            if (node.getTablePartitioningScheme().isPresent()) {
+                PartitioningScheme partitioningScheme = node.getTablePartitioningScheme().get();
                 partitioningScheme.getPartitioning().getVariableReferences().forEach(expectedInputs::add);
                 partitioningScheme.getHashColumn().ifPresent(expectedInputs::add);
             }
@@ -691,7 +691,7 @@ public PlanNode visitTableWriter(TableWriterNode node, RewriteContext<Set<Variab
                     node.getTableCommitContextVariable(),
                     node.getColumns(),
                     node.getColumnNames(),
-                    node.getPartitioningScheme(),
+                    node.getTablePartitioningScheme(),
                     node.getStatisticsAggregation());
         }
 

presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/SymbolMapper.java

@@ -235,7 +235,7 @@ public TableWriterNode map(TableWriterNode node, PlanNode source, PlanNodeId new
                 map(node.getTableCommitContextVariable()),
                 columns,
                 node.getColumnNames(),
-                node.getPartitioningScheme().map(partitioningScheme -> canonicalize(partitioningScheme, source)),
+                node.getTablePartitioningScheme().map(partitioningScheme -> canonicalize(partitioningScheme, source)),
                 node.getStatisticsAggregation().map(this::map));
     }
 

presto-main/src/main/java/com/facebook/presto/sql/planner/plan/TableWriterNode.java

@@ -47,7 +47,7 @@ public class TableWriterNode
     private final VariableReferenceExpression tableCommitContextVariable;
     private final List<VariableReferenceExpression> columns;
     private final List<String> columnNames;
-    private final Optional<PartitioningScheme> partitioningScheme;
+    private final Optional<PartitioningScheme> tablePartitioningScheme;
     private final Optional<StatisticAggregations> statisticsAggregation;
     private final List<VariableReferenceExpression> outputs;
 
@@ -61,7 +61,7 @@ public TableWriterNode(
             @JsonProperty("tableCommitContextVariable") VariableReferenceExpression tableCommitContextVariable,
             @JsonProperty("columns") List<VariableReferenceExpression> columns,
             @JsonProperty("columnNames") List<String> columnNames,
-            @JsonProperty("partitioningScheme") Optional<PartitioningScheme> partitioningScheme,
+            @JsonProperty("partitioningScheme") Optional<PartitioningScheme> tablePartitioningScheme,
             @JsonProperty("statisticsAggregation") Optional<StatisticAggregations> statisticsAggregation)
     {
         super(id);
@@ -77,7 +77,7 @@ public TableWriterNode(
         this.tableCommitContextVariable = requireNonNull(tableCommitContextVariable, "tableCommitContextVariable is null");
         this.columns = ImmutableList.copyOf(columns);
         this.columnNames = ImmutableList.copyOf(columnNames);
-        this.partitioningScheme = requireNonNull(partitioningScheme, "partitioningScheme is null");
+        this.tablePartitioningScheme = requireNonNull(tablePartitioningScheme, "partitioningScheme is null");
         this.statisticsAggregation = requireNonNull(statisticsAggregation, "statisticsAggregation is null");
 
         ImmutableList.Builder<VariableReferenceExpression> outputs = ImmutableList.<VariableReferenceExpression>builder()
@@ -134,9 +134,9 @@ public List<String> getColumnNames()
     }
 
     @JsonProperty
-    public Optional<PartitioningScheme> getPartitioningScheme()
+    public Optional<PartitioningScheme> getTablePartitioningScheme()
     {
-        return partitioningScheme;
+        return tablePartitioningScheme;
     }
 
     @JsonProperty
@@ -166,7 +166,7 @@ public <R, C> R accept(InternalPlanVisitor<R, C> visitor, C context)
     @Override
     public PlanNode replaceChildren(List<PlanNode> newChildren)
     {
-        return new TableWriterNode(getId(), Iterables.getOnlyElement(newChildren), target, rowCountVariable, fragmentVariable, tableCommitContextVariable, columns, columnNames, partitioningScheme, statisticsAggregation);
+        return new TableWriterNode(getId(), Iterables.getOnlyElement(newChildren), target, rowCountVariable, fragmentVariable, tableCommitContextVariable, columns, columnNames, tablePartitioningScheme, statisticsAggregation);
     }
 
     // only used during planning -- will not be serialized