refactor s3 chunked upload

utopia-php · Nov 25, 2024 · 93ce8a4 · 93ce8a4
1 parent 39cf3e8
commit 93ce8a4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/src/Storage/Device/S3.php b/src/Storage/Device/S3.php
@@ -317,7 +317,7 @@ public function uploadData(string $data, string $path, string $contentType, int
 
         $etag = $this->uploadPart($data, $path, $contentType, $chunk, $uploadId);
         $metadata['parts'] ??= [];
-        $metadata['parts'][] = ['partNumber' => $chunk, 'etag' => $etag];
+        $metadata['parts'][$chunk] = $etag;
         $metadata['chunksUploaded'] ??= [];
         $metadata['chunks'] ??= 0;
         // skip incrementing if the chunk was re-uploaded
@@ -435,8 +435,8 @@ protected function completeMultipartUpload(string $path, string $uploadId, array
         $uri = $path !== '' ? '/'.\str_replace(['%2F', '%3F'], ['/', '?'], \rawurlencode($path)) : '/';
 
         $body = '<CompleteMultipartUpload>';
-        foreach ($parts as $part) {
-            $body .= "<Part><ETag>{$part['etag']}</ETag><PartNumber>{$part['partNumber']}</PartNumber></Part>";
+        foreach ($parts as $key => $etag) {
+            $body .= "<Part><ETag>{$etag}</ETag><PartNumber>{$key}</PartNumber></Part>";
         }
         $body .= '</CompleteMultipartUpload>';
 

diff --git a/tests/Storage/S3Base.php b/tests/Storage/S3Base.php
@@ -274,8 +274,7 @@ public function testPartUpload()
             $cc = fopen($op, 'wb');
             fwrite($cc, $contents);
             fclose($cc);
-            $etag = $this->object->upload($op, $dest, $chunk, $chunks, $metadata);
-            $parts[] = ['partNumber' => $chunk, 'etag' => $etag];
+            $this->object->upload($op, $dest, $chunk, $chunks, $metadata);
             $start += strlen($contents);
             $chunk++;
             fseek($handle, $start);
@@ -322,8 +321,7 @@ public function testPartUploadRetry()
             $cc = fopen($op, 'wb');
             fwrite($cc, $contents);
             fclose($cc);
-            $etag = $this->object->upload($op, $dest, $chunk, $chunks, $metadata);
-            $parts[] = ['partNumber' => $chunk, 'etag' => $etag];
+            $this->object->upload($op, $dest, $chunk, $chunks, $metadata);
             $start += strlen($contents);
             $chunk++;
             if ($chunk == 2) {
@@ -345,8 +343,7 @@ public function testPartUploadRetry()
             $cc = fopen($op, 'wb');
             fwrite($cc, $contents);
             fclose($cc);
-            $etag = $this->object->upload($op, $dest, $chunk, $chunks, $metadata);
-            $parts[] = ['partNumber' => $chunk, 'etag' => $etag];
+            $this->object->upload($op, $dest, $chunk, $chunks, $metadata);
             $start += strlen($contents);
             $chunk++;
             fseek($handle, $start);