Improving multipart upload semantics

lwyx2000 · Jun 14, 2015 · 8d0cf23 · 8d0cf23
1 parent 7ef81d8
commit 8d0cf23
Showing 1 changed file with 5 additions and 23 deletions.
diff --git a/src/main/java/io/minio/client/Client.java b/src/main/java/io/minio/client/Client.java
@@ -904,6 +904,7 @@ public void setBucketACL(String bucket, Acl acl) throws IOException, ClientExcep
      * @param contentType Content type to set this object to
      * @param size        Size of all the data that will be uploaded.
      * @param body        Data to upload
+     *
      * @throws IOException     upon connection error
      * @throws ClientException upon failure from server
      * @see #listAllUnfinishedUploads(String)
@@ -938,14 +939,12 @@ public void putObject(String bucket, String key, String contentType, long size,
             long objectLength = 0;
             List<Part> parts = new LinkedList<Part>();
             int partNumber = 1;
-            Iterator<Part> skipParts = listObjectParts(bucket, key, uploadID);
+            Iterator<Part> existingParts = listObjectParts(bucket, key, uploadID);
             while (true) {
                 Data data = readData(partSize, body);
-                if (iteratorSize(skipParts) > 0) {
-                    Part part = new Part();
-                    part.setPartNumber(partNumber);
-                    part.seteTag(DatatypeConverter.printHexBinary(data.getMD5()));
-                    if (isPartUploaded(part, skipParts)) {
+                if (existingParts.hasNext()) {
+                    Part existingPart = existingParts.next();
+                    if (existingPart.getPartNumber() == partNumber && existingPart.geteTag().toLowerCase().equals(Arrays.toString(data.getMD5()).toLowerCase())) {
                         partNumber++;
                         continue;
                     }
@@ -968,23 +967,6 @@ public void putObject(String bucket, String key, String contentType, long size,
         }
     }
 
-    private int iteratorSize(Iterator<?> it) {
-        if (it instanceof Collection) {
-            return ((Collection<?>)it).size();
-        }
-        return 0;
-    }
-
-    private Boolean isPartUploaded(Part part, Iterator<Part> skipParts) {
-        while (skipParts.hasNext()) {
-            Part p = skipParts.next();
-            String etag = p.geteTag().replaceAll("\"", "").toLowerCase().trim();
-            if (etag.equals(part.geteTag()) && p.getPartNumber() == part.getPartNumber()) {
-                return true;
-            }
-        }
-        return false;
-    }
     /**
      * Lists all active multipart uploads in a bucket
      *