Fix bug about wrong part size number in CopyObjectHelper (#4049)

Fix bug about wrong part sze number in CopyObjectHelper

Author: L-Applin

.changes/next-release/bugfix-AWSSDKforJavav2-5d8e168.json

@@ -0,0 +1,6 @@
+{
+    "type": "bugfix",
+    "category": "AWS SDK for Java v2",
+    "contributor": "",
+    "description": "Fix an issue where the optimal number of parts calculated could be higher than 10,000"
+}

services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/crt/CopyObjectHelper.java

@@ -130,7 +130,7 @@ private void doCopyInParts(CopyObjectRequest copyObjectRequest,
                                Long contentLength,
                                CompletableFuture<CopyObjectResponse> returnFuture,
                                String uploadId) {
-        long optimalPartSize = calculateOptimalPartSizeForCopy(partSizeInBytes);
+        long optimalPartSize = calculateOptimalPartSizeForCopy(contentLength);
 
         int partCount = determinePartCount(contentLength, optimalPartSize);
 

services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/crt/CopyObjectHelperTest.java

@@ -221,6 +221,41 @@ void multiPartCopy_completeMultipartFailed_shouldFailAndAbort() {
         assertThat(actualRequest.uploadId()).isEqualTo(MULTIPART_ID);
     }
 
+    @Test
+    void multiPartCopy_contentSizeExceeds10000Parts_shouldAdjustPartSize() {
+        long contentLength = 1024L * 10_000 * 2; // twice too many parts with configures part size
+
+        stubSuccessfulHeadObjectCall(contentLength);
+        stubSuccessfulCreateMulipartCall();
+        stubSuccessfulUploadPartCopyCalls();
+        stubSuccessfulCompleteMultipartCall();
+
+        CopyObjectRequest copyObjectRequest = copyObjectRequest();
+
+        CompletableFuture<CopyObjectResponse> future = copyHelper.copyObject(copyObjectRequest);
+
+        CopyObjectResponse actualResponse = future.join();
+        assertThat(actualResponse.copyObjectResult()).isNotNull();
+
+        ArgumentCaptor<UploadPartCopyRequest> argumentCaptor = ArgumentCaptor.forClass(UploadPartCopyRequest.class);
+        verify(s3AsyncClient, times(10_000)).uploadPartCopy(argumentCaptor.capture());
+        List<UploadPartCopyRequest> actualUploadPartCopyRequests = argumentCaptor.getAllValues();
+        assertThat(actualUploadPartCopyRequests).allSatisfy(d -> {
+            assertThat(d.sourceBucket()).isEqualTo(SOURCE_BUCKET);
+            assertThat(d.sourceKey()).isEqualTo(SOURCE_KEY);
+            assertThat(d.destinationBucket()).isEqualTo(DESTINATION_BUCKET);
+            assertThat(d.destinationKey()).isEqualTo(DESTINATION_KEY);
+        });
+
+        long expectedPartSize = 2048L;
+        for (int i = 0; i < actualUploadPartCopyRequests.size(); i++) {
+            int rangeStart = (int) expectedPartSize * i;
+            int rangeEnd = (int) (rangeStart + (expectedPartSize - 1));
+            assertThat(actualUploadPartCopyRequests.get(i).copySourceRange()).isEqualTo(
+                String.format("bytes=%d-%d", rangeStart, rangeEnd));
+        }
+    }
+
     @Test
     void copy_cancelResponseFuture_shouldPropagate() {
         CopyObjectRequest copyObjectRequest = copyObjectRequest();