Revert "Pipeline buffering and upload in S3 multi-upload"

This reverts commit 7383734.
trinodb · Jan 21, 2022 · 3fab98f · 3fab98f
1 parent 5313c35
commit 3fab98f
Showing 1 changed file with 11 additions and 18 deletions.
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/TrinoS3FileSystem.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/s3/TrinoS3FileSystem.java
@@ -1571,6 +1571,15 @@ public void close()
         private void flushBuffer(boolean finished)
                 throws IOException
         {
+            try {
+                waitForPreviousUploadFinish();
+            }
+            catch (IOException e) {
+                failed = true;
+                abortUploadSuppressed(e);
+                throw e;
+            }
+
             // skip multipart upload if there would only be one part
             if (finished && uploadId.isEmpty()) {
                 InputStream in = new ByteArrayInputStream(buffer, 0, bufferSize);
@@ -1587,7 +1596,6 @@ private void flushBuffer(boolean finished)
                     return;
                 }
                 catch (AmazonServiceException e) {
-                    failed = true;
                     throw new IOException(e);
                 }
             }
@@ -1596,23 +1604,8 @@ private void flushBuffer(boolean finished)
             if (bufferSize == buffer.length || (finished && bufferSize > 0)) {
                 byte[] data = buffer;
                 int length = bufferSize;
-
-                if (finished) {
-                    this.buffer = null;
-                }
-                else {
-                    this.buffer = new byte[buffer.length];
-                    bufferSize = 0;
-                }
-
-                try {
-                    waitForPreviousUploadFinish();
-                }
-                catch (IOException e) {
-                    failed = true;
-                    abortUploadSuppressed(e);
-                    throw e;
-                }
+                this.buffer = new byte[buffer.length];
+                bufferSize = 0;
 
                 inProgressUploadFuture = uploadExecutor.submit(() -> uploadPage(data, length));
             }