Rename ConnectorPageSink commit/rollback to finish/abort

presto-blackhole/src/main/java/com/facebook/presto/plugin/blackhole/BlackHolePageSinkProvider.java

@@ -50,13 +50,13 @@ public void appendPage(Page page, Block sampleWeightBlock)
         }
 
         @Override
-        public Collection<Slice> commit()
+        public Collection<Slice> finish()
         {
             return ImmutableList.of();
         }
 
         @Override
-        public void rollback()
+        public void abort()
         {
         }
     }

presto-hive/src/main/java/com/facebook/presto/hive/HivePageSink.java

@@ -224,7 +224,7 @@ public HivePageSink(
     }
 
     @Override
-    public Collection<Slice> commit()
+    public Collection<Slice> finish()
     {
         ImmutableList.Builder<Slice> partitionUpdates = ImmutableList.builder();
         for (HiveRecordWriter writer : writers) {
@@ -238,7 +238,7 @@ public Collection<Slice> commit()
     }
 
     @Override
-    public void rollback()
+    public void abort()
     {
         for (HiveRecordWriter writer : writers) {
             if (writer != null) {

presto-hive/src/test/java/com/facebook/presto/hive/AbstractTestHiveClient.java

@@ -1310,7 +1310,7 @@ public void testTableCreationRollback()
             // write the data
             ConnectorPageSink sink = pageSinkProvider.createPageSink(session, outputHandle);
             sink.appendPage(CREATE_TABLE_DATA.toPage(), null);
-            sink.commit();
+            sink.finish();
 
             // verify we have data files
             assertFalse(listAllDataFiles(outputHandle).isEmpty());
@@ -1531,7 +1531,7 @@ protected void doCreateSampledTable(SchemaTableName tableName)
 
         sink.appendPage(new Page(dataBlockBuilder.build()), sampleBlockBuilder.build());
 
-        Collection<Slice> fragments = sink.commit();
+        Collection<Slice> fragments = sink.finish();
 
         // commit the table
         metadata.commitCreateTable(session, outputHandle, fragments);
@@ -1594,7 +1594,7 @@ protected void doCreateTable(SchemaTableName tableName, HiveStorageFormat storag
         // write the data
         ConnectorPageSink sink = pageSinkProvider.createPageSink(session, outputHandle);
         sink.appendPage(CREATE_TABLE_DATA.toPage(), null);
-        Collection<Slice> fragments = sink.commit();
+        Collection<Slice> fragments = sink.finish();
 
         // verify all new files start with the unique prefix
         for (String filePath : listAllDataFiles(outputHandle)) {
@@ -1669,7 +1669,7 @@ private void doInsert(HiveStorageFormat storageFormat, SchemaTableName tableName
 
             // write data
             sink.appendPage(CREATE_TABLE_DATA.toPage(), null);
-            Collection<Slice> fragments = sink.commit();
+            Collection<Slice> fragments = sink.finish();
 
             // commit the insert
             metadata.commitInsert(session, insertTableHandle, fragments);
@@ -1701,7 +1701,7 @@ private void doInsert(HiveStorageFormat storageFormat, SchemaTableName tableName
         ConnectorPageSink sink = pageSinkProvider.createPageSink(session, insertTableHandle);
         sink.appendPage(CREATE_TABLE_DATA.toPage(), null);
         sink.appendPage(CREATE_TABLE_DATA.toPage(), null);
-        sink.commit();
+        sink.finish();
 
         // verify we did not modify the table directory
         assertEquals(listAllDataFiles(tableName.getSchemaName(), tableName.getTableName()), existingFiles);
@@ -1840,7 +1840,7 @@ private void doInsertIntoNewPartition(HiveStorageFormat storageFormat, SchemaTab
         ConnectorInsertTableHandle insertTableHandle = metadata.beginInsert(session, tableHandle);
         ConnectorPageSink sink = pageSinkProvider.createPageSink(session, insertTableHandle);
         sink.appendPage(CREATE_TABLE_PARTITIONED_DATA_2ND.toPage(), null);
-        sink.commit();
+        sink.finish();
 
         // verify we did not modify the table directory
         assertEquals(listAllDataFiles(tableName.getSchemaName(), tableName.getTableName()), existingFiles);
@@ -1909,7 +1909,7 @@ private void doInsertIntoExistingPartition(HiveStorageFormat storageFormat, Sche
         ConnectorPageSink sink = pageSinkProvider.createPageSink(session, insertTableHandle);
         sink.appendPage(CREATE_TABLE_PARTITIONED_DATA.toPage(), null);
         sink.appendPage(CREATE_TABLE_PARTITIONED_DATA.toPage(), null);
-        sink.commit();
+        sink.finish();
 
         // verify we did not modify the table directory
         assertEquals(listAllDataFiles(tableName.getSchemaName(), tableName.getTableName()), existingFiles);
@@ -1943,7 +1943,7 @@ private void insertData(ConnectorTableHandle tableHandle, MaterializedResult dat
 
         // write data
         sink.appendPage(data.toPage(), null);
-        Collection<Slice> fragments = sink.commit();
+        Collection<Slice> fragments = sink.finish();
 
         // commit the insert
         metadata.commitInsert(session, insertTableHandle, fragments);

presto-hive/src/test/java/com/facebook/presto/hive/AbstractTestHiveClientS3.java

@@ -319,7 +319,7 @@ private void doCreateTable(SchemaTableName tableName, HiveStorageFormat storageF
         // write the records
         ConnectorPageSink sink = pageSinkProvider.createPageSink(SESSION, outputHandle);
         sink.appendPage(data.toPage(), null);
-        Collection<Slice> fragments = sink.commit();
+        Collection<Slice> fragments = sink.finish();
 
         // commit the table
         metadata.commitCreateTable(SESSION, outputHandle, fragments);

presto-main/src/main/java/com/facebook/presto/operator/TableWriterOperator.java

@@ -191,7 +191,7 @@ public Page getOutput()
         }
         state = State.FINISHED;
 
-        Collection<Slice> fragments = pageSink.commit();
+        Collection<Slice> fragments = pageSink.finish();
         committed = true;
 
         PageBuilder page = new PageBuilder(TYPES);
@@ -220,7 +220,7 @@ public void close()
         if (!closed) {
             closed = true;
             if (!committed) {
-                pageSink.rollback();
+                pageSink.abort();
             }
         }
     }

presto-raptor/src/main/java/com/facebook/presto/raptor/RaptorPageSink.java

@@ -99,7 +99,7 @@ public void appendPage(Page page, Block sampleWeightBlock)
     }
 
     @Override
-    public Collection<Slice> commit()
+    public Collection<Slice> finish()
     {
         flushPages(pageBuffer.getPages());
         List<ShardInfo> shards = storagePageSink.commit();
@@ -112,7 +112,7 @@ public Collection<Slice> commit()
     }
 
     @Override
-    public void rollback()
+    public void abort()
     {
         storagePageSink.rollback();
     }

presto-spi/src/main/java/com/facebook/presto/spi/ConnectorPageSink.java

@@ -22,7 +22,7 @@ public interface ConnectorPageSink
 {
     void appendPage(Page page, Block sampleWeightBlock);
 
-    Collection<Slice> commit();
+    Collection<Slice> finish();
 
-    void rollback();
+    void abort();
 }

presto-spi/src/main/java/com/facebook/presto/spi/RecordPageSink.java

@@ -34,13 +34,13 @@ public RecordPageSink(RecordSink recordSink)
     }
 
     @Override
-    public Collection<Slice> commit()
+    public Collection<Slice> finish()
     {
         return recordSink.commit();
     }
 
     @Override
-    public void rollback()
+    public void abort()
     {
         recordSink.rollback();
     }

presto-spi/src/main/java/com/facebook/presto/spi/classloader/ClassLoaderSafeConnectorPageSink.java

@@ -43,18 +43,18 @@ public void appendPage(Page page, Block sampleWeightBlock)
     }
 
     @Override
-    public Collection<Slice> commit()
+    public Collection<Slice> finish()
     {
         try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
-            return delegate.commit();
+            return delegate.finish();
         }
     }
 
     @Override
-    public void rollback()
+    public void abort()
     {
         try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
-            delegate.rollback();
+            delegate.abort();
         }
     }
 }