Rename TableCommit(Node|Operator) to TableFinish(Node|Operator)

presto-main/src/main/java/com/facebook/presto/operator/TableCommitOperator.java → presto-main/src/main/java/com/facebook/presto/operator/TableFinishOperator.java

@@ -28,22 +28,22 @@
 import static com.google.common.base.Preconditions.checkState;
 import static java.util.Objects.requireNonNull;
 
-public class TableCommitOperator
+public class TableFinishOperator
         implements Operator
 {
     public static final List<Type> TYPES = ImmutableList.<Type>of(BIGINT);
 
-    public static class TableCommitOperatorFactory
+    public static class TableFinishOperatorFactory
             implements OperatorFactory
     {
         private final int operatorId;
-        private final TableCommitter tableCommitter;
+        private final TableFinisher tableFinisher;
         private boolean closed;
 
-        public TableCommitOperatorFactory(int operatorId, TableCommitter tableCommitter)
+        public TableFinishOperatorFactory(int operatorId, TableFinisher tableFinisher)
         {
             this.operatorId = operatorId;
-            this.tableCommitter = requireNonNull(tableCommitter, "tableCommitter is null");
+            this.tableFinisher = requireNonNull(tableFinisher, "tableCommitter is null");
         }
 
         @Override
@@ -56,8 +56,8 @@ public List<Type> getTypes()
         public Operator createOperator(DriverContext driverContext)
         {
             checkState(!closed, "Factory is already closed");
-            OperatorContext context = driverContext.addOperatorContext(operatorId, TableCommitOperator.class.getSimpleName());
-            return new TableCommitOperator(context, tableCommitter);
+            OperatorContext context = driverContext.addOperatorContext(operatorId, TableFinishOperator.class.getSimpleName());
+            return new TableFinishOperator(context, tableFinisher);
         }
 
         @Override
@@ -69,7 +69,7 @@ public void close()
         @Override
         public OperatorFactory duplicate()
         {
-            return new TableCommitOperatorFactory(operatorId, tableCommitter);
+            return new TableFinishOperatorFactory(operatorId, tableFinisher);
         }
     }
 
@@ -79,18 +79,18 @@ private enum State
     }
 
     private final OperatorContext operatorContext;
-    private final TableCommitter tableCommitter;
+    private final TableFinisher tableFinisher;
 
     private State state = State.RUNNING;
     private long rowCount;
     private boolean committed;
     private boolean closed;
     private final ImmutableList.Builder<Slice> fragmentBuilder = ImmutableList.builder();
 
-    public TableCommitOperator(OperatorContext operatorContext, TableCommitter tableCommitter)
+    public TableFinishOperator(OperatorContext operatorContext, TableFinisher tableFinisher)
     {
         this.operatorContext = requireNonNull(operatorContext, "operatorContext is null");
-        this.tableCommitter = requireNonNull(tableCommitter, "tableCommitter is null");
+        this.tableFinisher = requireNonNull(tableFinisher, "tableCommitter is null");
     }
 
     @Override
@@ -151,7 +151,7 @@ public Page getOutput()
         }
         state = State.FINISHED;
 
-        tableCommitter.commitTable(fragmentBuilder.build());
+        tableFinisher.finishTable(fragmentBuilder.build());
         committed = true;
 
         PageBuilder page = new PageBuilder(getTypes());
@@ -167,14 +167,14 @@ public void close()
         if (!closed) {
             closed = true;
             if (!committed) {
-                tableCommitter.rollbackTable();
+                tableFinisher.abortTable();
             }
         }
     }
 
-    public interface TableCommitter
+    public interface TableFinisher
     {
-        void commitTable(Collection<Slice> fragments);
-        void rollbackTable();
+        void finishTable(Collection<Slice> fragments);
+        void abortTable();
     }
 }

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

@@ -35,7 +35,7 @@
 import com.facebook.presto.sql.planner.plan.SampleNode;
 import com.facebook.presto.sql.planner.plan.SemiJoinNode;
 import com.facebook.presto.sql.planner.plan.SortNode;
-import com.facebook.presto.sql.planner.plan.TableCommitNode;
+import com.facebook.presto.sql.planner.plan.TableFinishNode;
 import com.facebook.presto.sql.planner.plan.TableScanNode;
 import com.facebook.presto.sql.planner.plan.TableWriterNode;
 import com.facebook.presto.sql.planner.plan.TopNNode;
@@ -250,7 +250,7 @@ public Optional<SplitSource> visitTableWriter(TableWriterNode node, Void context
         }
 
         @Override
-        public Optional<SplitSource> visitTableCommit(TableCommitNode node, Void context)
+        public Optional<SplitSource> visitTableFinish(TableFinishNode node, Void context)
         {
             return node.getSource().accept(this, context);
         }

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

@@ -109,7 +109,7 @@
 import com.facebook.presto.sql.planner.plan.SampleNode;
 import com.facebook.presto.sql.planner.plan.SemiJoinNode;
 import com.facebook.presto.sql.planner.plan.SortNode;
-import com.facebook.presto.sql.planner.plan.TableCommitNode;
+import com.facebook.presto.sql.planner.plan.TableFinishNode;
 import com.facebook.presto.sql.planner.plan.TableScanNode;
 import com.facebook.presto.sql.planner.plan.TableWriterNode;
 import com.facebook.presto.sql.planner.plan.TableWriterNode.DeleteHandle;
@@ -170,8 +170,8 @@
 import static com.facebook.presto.operator.InMemoryExchangeSourceOperator.InMemoryExchangeSourceOperatorFactory.createRandomDistribution;
 import static com.facebook.presto.operator.NestedLoopBuildOperator.NestedLoopBuildOperatorFactory;
 import static com.facebook.presto.operator.NestedLoopJoinOperator.NestedLoopJoinOperatorFactory;
-import static com.facebook.presto.operator.TableCommitOperator.TableCommitOperatorFactory;
-import static com.facebook.presto.operator.TableCommitOperator.TableCommitter;
+import static com.facebook.presto.operator.TableFinishOperator.TableFinishOperatorFactory;
+import static com.facebook.presto.operator.TableFinishOperator.TableFinisher;
 import static com.facebook.presto.operator.TableWriterOperator.TableWriterOperatorFactory;
 import static com.facebook.presto.operator.UnnestOperator.UnnestOperatorFactory;
 import static com.facebook.presto.operator.WindowFunctionDefinition.window;
@@ -1709,11 +1709,11 @@ private PhysicalOperation addInMemoryExchange(LocalExecutionPlanContext context,
         }
 
         @Override
-        public PhysicalOperation visitTableCommit(TableCommitNode node, LocalExecutionPlanContext context)
+        public PhysicalOperation visitTableFinish(TableFinishNode node, LocalExecutionPlanContext context)
         {
             PhysicalOperation source = node.getSource().accept(this, context);
 
-            OperatorFactory operatorFactory = new TableCommitOperatorFactory(context.getNextOperatorId(), createTableCommitter(session, node, metadata));
+            OperatorFactory operatorFactory = new TableFinishOperatorFactory(context.getNextOperatorId(), createTableFinisher(session, node, metadata));
             Map<Symbol, Integer> layout = ImmutableMap.of(node.getOutputSymbols().get(0), 0);
 
             return new PhysicalOperation(operatorFactory, layout, source);
@@ -1920,13 +1920,13 @@ public static List<Type> toTypes(List<ProjectionFunction> projections)
         return builder.build();
     }
 
-    private static TableCommitter createTableCommitter(Session session, TableCommitNode node, Metadata metadata)
+    private static TableFinisher createTableFinisher(Session session, TableFinishNode node, Metadata metadata)
     {
         WriterTarget target = node.getTarget();
-        return new TableCommitter()
+        return new TableFinisher()
         {
             @Override
-            public void commitTable(Collection<Slice> fragments)
+            public void finishTable(Collection<Slice> fragments)
             {
                 if (target instanceof CreateHandle) {
                     metadata.commitCreateTable(session, ((CreateHandle) target).getHandle(), fragments);
@@ -1943,7 +1943,7 @@ else if (target instanceof DeleteHandle) {
             }
 
             @Override
-            public void rollbackTable()
+            public void abortTable()
             {
                 if (target instanceof CreateHandle) {
                     metadata.rollbackCreateTable(session, ((CreateHandle) target).getHandle());

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

@@ -30,7 +30,7 @@
 import com.facebook.presto.sql.planner.plan.OutputNode;
 import com.facebook.presto.sql.planner.plan.PlanNode;
 import com.facebook.presto.sql.planner.plan.ProjectNode;
-import com.facebook.presto.sql.planner.plan.TableCommitNode;
+import com.facebook.presto.sql.planner.plan.TableFinishNode;
 import com.facebook.presto.sql.planner.plan.TableWriterNode;
 import com.facebook.presto.sql.tree.Expression;
 import com.facebook.presto.sql.tree.NullLiteral;
@@ -189,7 +189,7 @@ private RelationPlan createTableWriterPlan(Analysis analysis, RelationPlan plan,
                 plan.getSampleWeight());
 
         List<Symbol> outputs = ImmutableList.of(symbolAllocator.newSymbol("rows", BIGINT));
-        TableCommitNode commitNode = new TableCommitNode(
+        TableFinishNode commitNode = new TableFinishNode(
                 idAllocator.getNextId(),
                 writerNode,
                 target,
@@ -204,7 +204,7 @@ private RelationPlan createDeletePlan(Analysis analysis)
         DeleteNode deleteNode = planner.planDelete(analysis.getDelete().get());
 
         List<Symbol> outputs = ImmutableList.of(symbolAllocator.newSymbol("rows", BIGINT));
-        TableCommitNode commitNode = new TableCommitNode(idAllocator.getNextId(), deleteNode, deleteNode.getTarget(), outputs);
+        TableFinishNode commitNode = new TableFinishNode(idAllocator.getNextId(), deleteNode, deleteNode.getTarget(), outputs);
 
         return new RelationPlan(commitNode, analysis.getOutputDescriptor(), commitNode.getOutputSymbols(), Optional.empty());
     }

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

@@ -23,7 +23,7 @@
 import com.facebook.presto.sql.planner.plan.PlanNodeId;
 import com.facebook.presto.sql.planner.plan.RemoteSourceNode;
 import com.facebook.presto.sql.planner.plan.SimplePlanRewriter;
-import com.facebook.presto.sql.planner.plan.TableCommitNode;
+import com.facebook.presto.sql.planner.plan.TableFinishNode;
 import com.facebook.presto.sql.planner.plan.TableScanNode;
 import com.facebook.presto.sql.planner.plan.ValuesNode;
 import com.google.common.collect.ImmutableList;
@@ -109,7 +109,7 @@ public PlanNode visitOutput(OutputNode node, RewriteContext<FragmentProperties>
         }
 
         @Override
-        public PlanNode visitTableCommit(TableCommitNode node, RewriteContext<FragmentProperties> context)
+        public PlanNode visitTableFinish(TableFinishNode node, RewriteContext<FragmentProperties> context)
         {
             context.get().setCoordinatorOnlyDistribution();
             return context.defaultRewrite(node, context.get());

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

@@ -48,7 +48,7 @@
 import com.facebook.presto.sql.planner.plan.SampleNode;
 import com.facebook.presto.sql.planner.plan.SemiJoinNode;
 import com.facebook.presto.sql.planner.plan.SortNode;
-import com.facebook.presto.sql.planner.plan.TableCommitNode;
+import com.facebook.presto.sql.planner.plan.TableFinishNode;
 import com.facebook.presto.sql.planner.plan.TableScanNode;
 import com.facebook.presto.sql.planner.plan.TableWriterNode;
 import com.facebook.presto.sql.planner.plan.TopNNode;
@@ -556,7 +556,7 @@ public Void visitTableWriter(TableWriterNode node, Integer indent)
         }
 
         @Override
-        public Void visitTableCommit(TableCommitNode node, Integer indent)
+        public Void visitTableFinish(TableFinishNode node, Integer indent)
         {
             print(indent, "- TableCommit[%s] => [%s]", node.getTarget(), formatOutputs(node.getOutputSymbols()));
 

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

@@ -34,7 +34,7 @@
 import com.facebook.presto.sql.planner.plan.SampleNode;
 import com.facebook.presto.sql.planner.plan.SemiJoinNode;
 import com.facebook.presto.sql.planner.plan.SortNode;
-import com.facebook.presto.sql.planner.plan.TableCommitNode;
+import com.facebook.presto.sql.planner.plan.TableFinishNode;
 import com.facebook.presto.sql.planner.plan.TableScanNode;
 import com.facebook.presto.sql.planner.plan.TableWriterNode;
 import com.facebook.presto.sql.planner.plan.TopNNode;
@@ -457,7 +457,7 @@ public Void visitMetadataDelete(MetadataDeleteNode node, Void context)
         }
 
         @Override
-        public Void visitTableCommit(TableCommitNode node, Void context)
+        public Void visitTableFinish(TableFinishNode node, Void context)
         {
             node.getSource().accept(this, context); // visit child
 

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

@@ -33,7 +33,7 @@
 import com.facebook.presto.sql.planner.plan.SampleNode;
 import com.facebook.presto.sql.planner.plan.SemiJoinNode;
 import com.facebook.presto.sql.planner.plan.SortNode;
-import com.facebook.presto.sql.planner.plan.TableCommitNode;
+import com.facebook.presto.sql.planner.plan.TableFinishNode;
 import com.facebook.presto.sql.planner.plan.TableScanNode;
 import com.facebook.presto.sql.planner.plan.TableWriterNode;
 import com.facebook.presto.sql.planner.plan.TopNNode;
@@ -247,7 +247,7 @@ public Void visitTableWriter(TableWriterNode node, Void context)
         }
 
         @Override
-        public Void visitTableCommit(TableCommitNode node, Void context)
+        public Void visitTableFinish(TableFinishNode node, Void context)
         {
             node.getSource().accept(this, context);
 

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

@@ -54,7 +54,7 @@
 import com.facebook.presto.sql.planner.plan.RowNumberNode;
 import com.facebook.presto.sql.planner.plan.SemiJoinNode;
 import com.facebook.presto.sql.planner.plan.SortNode;
-import com.facebook.presto.sql.planner.plan.TableCommitNode;
+import com.facebook.presto.sql.planner.plan.TableFinishNode;
 import com.facebook.presto.sql.planner.plan.TableScanNode;
 import com.facebook.presto.sql.planner.plan.TableWriterNode;
 import com.facebook.presto.sql.planner.plan.TopNNode;
@@ -707,7 +707,7 @@ public PlanWithProperties visitValues(ValuesNode node, Context context)
         }
 
         @Override
-        public PlanWithProperties visitTableCommit(TableCommitNode node, Context context)
+        public PlanWithProperties visitTableFinish(TableFinishNode node, Context context)
         {
             PlanWithProperties child = planChild(node, context.withPreferredProperties(PreferredProperties.any()));
 

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

@@ -30,7 +30,7 @@
 import com.facebook.presto.sql.planner.plan.ProjectNode;
 import com.facebook.presto.sql.planner.plan.SemiJoinNode;
 import com.facebook.presto.sql.planner.plan.SimplePlanRewriter;
-import com.facebook.presto.sql.planner.plan.TableCommitNode;
+import com.facebook.presto.sql.planner.plan.TableFinishNode;
 import com.facebook.presto.sql.planner.plan.TableScanNode;
 import com.facebook.presto.sql.planner.plan.TableWriterNode;
 import com.facebook.presto.sql.planner.plan.UnionNode;
@@ -111,7 +111,7 @@ public PlanNode visitDelete(DeleteNode node, RewriteContext<Context> context)
         }
 
         @Override
-        public PlanNode visitTableCommit(TableCommitNode node, RewriteContext<Context> context)
+        public PlanNode visitTableFinish(TableFinishNode node, RewriteContext<Context> context)
         {
             PlanNode child = node.getSource();
 
@@ -121,7 +121,7 @@ public PlanNode visitTableCommit(TableCommitNode node, RewriteContext<Context> c
             context.get().addMaterializedHandle(originalTarget, newTarget);
             child = child.accept(this, context);
 
-            return new TableCommitNode(node.getId(), child, newTarget, node.getOutputSymbols());
+            return new TableFinishNode(node.getId(), child, newTarget, node.getOutputSymbols());
         }
 
         public TableWriterNode.WriterTarget getTarget(PlanNode node)

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

@@ -24,7 +24,7 @@
 import com.facebook.presto.sql.planner.plan.MetadataDeleteNode;
 import com.facebook.presto.sql.planner.plan.PlanNode;
 import com.facebook.presto.sql.planner.plan.SimplePlanRewriter;
-import com.facebook.presto.sql.planner.plan.TableCommitNode;
+import com.facebook.presto.sql.planner.plan.TableFinishNode;
 import com.facebook.presto.sql.planner.plan.TableScanNode;
 import com.google.common.collect.Iterables;
 
@@ -75,7 +75,7 @@ private Optimizer(Session session, Metadata metadata, PlanNodeIdAllocator idAllo
         }
 
         @Override
-        public PlanNode visitTableCommit(TableCommitNode node, RewriteContext<Void> context)
+        public PlanNode visitTableFinish(TableFinishNode node, RewriteContext<Void> context)
         {
             Optional<DeleteNode> delete = findNode(node.getSource(), DeleteNode.class);
             if (!delete.isPresent()) {

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

@@ -46,7 +46,7 @@
 import com.facebook.presto.sql.planner.plan.SampleNode;
 import com.facebook.presto.sql.planner.plan.SemiJoinNode;
 import com.facebook.presto.sql.planner.plan.SortNode;
-import com.facebook.presto.sql.planner.plan.TableCommitNode;
+import com.facebook.presto.sql.planner.plan.TableFinishNode;
 import com.facebook.presto.sql.planner.plan.TableScanNode;
 import com.facebook.presto.sql.planner.plan.TableWriterNode;
 import com.facebook.presto.sql.planner.plan.TopNNode;
@@ -249,7 +249,7 @@ public ActualProperties visitDistinctLimit(DistinctLimitNode node, List<ActualPr
         }
 
         @Override
-        public ActualProperties visitTableCommit(TableCommitNode node, List<ActualProperties> inputProperties)
+        public ActualProperties visitTableFinish(TableFinishNode node, List<ActualProperties> inputProperties)
         {
             return ActualProperties.builder()
                     .global(coordinatorOnly())

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

@@ -38,7 +38,7 @@
 import com.facebook.presto.sql.planner.plan.SemiJoinNode;
 import com.facebook.presto.sql.planner.plan.SimplePlanRewriter;
 import com.facebook.presto.sql.planner.plan.SortNode;
-import com.facebook.presto.sql.planner.plan.TableCommitNode;
+import com.facebook.presto.sql.planner.plan.TableFinishNode;
 import com.facebook.presto.sql.planner.plan.TableScanNode;
 import com.facebook.presto.sql.planner.plan.TableWriterNode;
 import com.facebook.presto.sql.planner.plan.TopNNode;
@@ -545,11 +545,11 @@ public PlanNode visitTableWriter(TableWriterNode node, RewriteContext<Set<Symbol
         }
 
         @Override
-        public PlanNode visitTableCommit(TableCommitNode node, RewriteContext<Set<Symbol>> context)
+        public PlanNode visitTableFinish(TableFinishNode node, RewriteContext<Set<Symbol>> context)
         {
             // Maintain the existing inputs needed for TableCommitNode
             PlanNode source = context.rewrite(node.getSource(), ImmutableSet.copyOf(node.getSource().getOutputSymbols()));
-            return new TableCommitNode(node.getId(), source, node.getTarget(), node.getOutputSymbols());
+            return new TableFinishNode(node.getId(), source, node.getTarget(), node.getOutputSymbols());
         }
 
         @Override

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

@@ -41,7 +41,7 @@
 import com.facebook.presto.sql.planner.plan.SemiJoinNode;
 import com.facebook.presto.sql.planner.plan.SimplePlanRewriter;
 import com.facebook.presto.sql.planner.plan.SortNode;
-import com.facebook.presto.sql.planner.plan.TableCommitNode;
+import com.facebook.presto.sql.planner.plan.TableFinishNode;
 import com.facebook.presto.sql.planner.plan.TableScanNode;
 import com.facebook.presto.sql.planner.plan.TableWriterNode;
 import com.facebook.presto.sql.planner.plan.TopNNode;
@@ -287,7 +287,7 @@ public PlanNode visitDelete(DeleteNode node, RewriteContext<Void> context)
         }
 
         @Override
-        public PlanNode visitTableCommit(TableCommitNode node, RewriteContext<Void> context)
+        public PlanNode visitTableFinish(TableFinishNode node, RewriteContext<Void> context)
         {
             return context.defaultRewrite(node);
         }