This is an automated email from the ASF dual-hosted git repository. kkloudas pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit 153ca54fd16a71d7f52812442a6d2bc3e024a838 Author: Kostas Kloudas <[email protected]> AuthorDate: Thu Nov 22 10:54:05 2018 +0100 [hotfix] Method renaming in the RecoverableMultiPartUploadImpl. --- .../s3/common/writer/RecoverableMultiPartUploadImpl.java | 14 +++++++------- .../fs/s3/common/writer/IncompletePartPrefixTest.java | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/flink-filesystems/flink-s3-fs-base/src/main/java/org/apache/flink/fs/s3/common/writer/RecoverableMultiPartUploadImpl.java b/flink-filesystems/flink-s3-fs-base/src/main/java/org/apache/flink/fs/s3/common/writer/RecoverableMultiPartUploadImpl.java index 9f0a811..787f286 100644 --- a/flink-filesystems/flink-s3-fs-base/src/main/java/org/apache/flink/fs/s3/common/writer/RecoverableMultiPartUploadImpl.java +++ b/flink-filesystems/flink-s3-fs-base/src/main/java/org/apache/flink/fs/s3/common/writer/RecoverableMultiPartUploadImpl.java @@ -84,7 +84,7 @@ final class RecoverableMultiPartUploadImpl implements RecoverableMultiPartUpload this.s3AccessHelper = checkNotNull(s3AccessHelper); this.uploadThreadPool = checkNotNull(uploadThreadPool); this.currentUploadInfo = new MultiPartUploadInfo(objectName, uploadId, partsSoFar, numBytes, incompletePart); - this.namePrefixForTempObjects = incompleteObjectNamePrefix(objectName); + this.namePrefixForTempObjects = createIncompletePartObjectNamePrefix(objectName); this.uploadsInProgress = new ArrayDeque<>(); } @@ -171,7 +171,7 @@ final class RecoverableMultiPartUploadImpl implements RecoverableMultiPartUpload } // first, upload the trailing data file. during that time, other in-progress uploads may complete. - final String incompletePartObjectName = createTmpObjectName(); + final String incompletePartObjectName = createIncompletePartObjectName(); file.retain(); try (InputStream inputStream = file.getInputStream()) { @@ -192,7 +192,7 @@ final class RecoverableMultiPartUploadImpl implements RecoverableMultiPartUpload // ------------------------------------------------------------------------ @VisibleForTesting - static String incompleteObjectNamePrefix(String objectName) { + static String createIncompletePartObjectNamePrefix(String objectName) { checkNotNull(objectName); final int lastSlash = objectName.lastIndexOf('/'); @@ -209,6 +209,10 @@ final class RecoverableMultiPartUploadImpl implements RecoverableMultiPartUpload return parent + (child.isEmpty() ? "" : '_') + child + "_tmp_"; } + private String createIncompletePartObjectName() { + return namePrefixForTempObjects + UUID.randomUUID().toString(); + } + private void awaitPendingPartsUpload() throws IOException { checkState(currentUploadInfo.getRemainingParts() == uploadsInProgress.size()); @@ -235,10 +239,6 @@ final class RecoverableMultiPartUploadImpl implements RecoverableMultiPartUpload return completedUploadEtag; } - private String createTmpObjectName() { - return namePrefixForTempObjects + UUID.randomUUID().toString(); - } - // ------------------------------------------------------------------------ // factory methods // ------------------------------------------------------------------------ diff --git a/flink-filesystems/flink-s3-fs-base/src/test/java/org/apache/flink/fs/s3/common/writer/IncompletePartPrefixTest.java b/flink-filesystems/flink-s3-fs-base/src/test/java/org/apache/flink/fs/s3/common/writer/IncompletePartPrefixTest.java index a3164f1..9cee040 100644 --- a/flink-filesystems/flink-s3-fs-base/src/test/java/org/apache/flink/fs/s3/common/writer/IncompletePartPrefixTest.java +++ b/flink-filesystems/flink-s3-fs-base/src/test/java/org/apache/flink/fs/s3/common/writer/IncompletePartPrefixTest.java @@ -22,36 +22,36 @@ import org.junit.Assert; import org.junit.Test; /** - * Tests for the {@link RecoverableMultiPartUploadImpl#incompleteObjectNamePrefix(String)}. + * Tests for the {@link RecoverableMultiPartUploadImpl#createIncompletePartObjectNamePrefix(String)}. */ public class IncompletePartPrefixTest { @Test(expected = NullPointerException.class) public void nullObjectNameShouldThroughException() { - RecoverableMultiPartUploadImpl.incompleteObjectNamePrefix(null); + RecoverableMultiPartUploadImpl.createIncompletePartObjectNamePrefix(null); } @Test public void emptyInitialNameShouldSucceed() { - String objectNamePrefix = RecoverableMultiPartUploadImpl.incompleteObjectNamePrefix(""); + String objectNamePrefix = RecoverableMultiPartUploadImpl.createIncompletePartObjectNamePrefix(""); Assert.assertEquals("_tmp_", objectNamePrefix); } @Test public void nameWithoutSlashShouldSucceed() { - String objectNamePrefix = RecoverableMultiPartUploadImpl.incompleteObjectNamePrefix("no_slash_path"); + String objectNamePrefix = RecoverableMultiPartUploadImpl.createIncompletePartObjectNamePrefix("no_slash_path"); Assert.assertEquals("_no_slash_path_tmp_", objectNamePrefix); } @Test public void nameWithOnlySlashShouldSucceed() { - String objectNamePrefix = RecoverableMultiPartUploadImpl.incompleteObjectNamePrefix("/"); + String objectNamePrefix = RecoverableMultiPartUploadImpl.createIncompletePartObjectNamePrefix("/"); Assert.assertEquals("/_tmp_", objectNamePrefix); } @Test public void normalPathShouldSucceed() { - String objectNamePrefix = RecoverableMultiPartUploadImpl.incompleteObjectNamePrefix("/root/home/test-file"); + String objectNamePrefix = RecoverableMultiPartUploadImpl.createIncompletePartObjectNamePrefix("/root/home/test-file"); Assert.assertEquals("/root/home/_test-file_tmp_", objectNamePrefix); } }
