Add part size support in UploadObject() api. (#1208)

Signed-off-by: Bala.FA <bala.gluster@gmail.com>

Author: balamurugana

api/src/main/java/io/minio/PutObjectArgs.java

@@ -50,65 +50,6 @@ protected void validate(PutObjectArgs args) {
       validateNotNull(args.stream, "stream");
     }
 
-    private void validateSizes(long objectSize, long partSize) {
-      if (partSize > 0) {
-        if (partSize < MIN_MULTIPART_SIZE) {
-          throw new IllegalArgumentException(
-              "part size " + partSize + " is not supported; minimum allowed 5MiB");
-        }
-
-        if (partSize > MAX_PART_SIZE) {
-          throw new IllegalArgumentException(
-              "part size " + partSize + " is not supported; maximum allowed 5GiB");
-        }
-      }
-
-      if (objectSize >= 0) {
-        if (objectSize > MAX_OBJECT_SIZE) {
-          throw new IllegalArgumentException(
-              "object size " + objectSize + " is not supported; maximum allowed 5TiB");
-        }
-      } else if (partSize <= 0) {
-        throw new IllegalArgumentException(
-            "valid part size must be provided when object size is unknown");
-      }
-    }
-
-    private void validatePartCount(int partCount, long objectSize, long partSize) {
-      if (partCount > MAX_MULTIPART_COUNT) {
-        throw new IllegalArgumentException(
-            "object size "
-                + objectSize
-                + " and part size "
-                + partSize
-                + " make more than "
-                + MAX_MULTIPART_COUNT
-                + "parts for upload");
-      }
-    }
-
-    private long[] partInfo(long objectSize, long partSize) {
-      if (objectSize < 0) {
-        return new long[] {partSize, -1};
-      }
-
-      if (partSize > 0) {
-        if (partSize > objectSize) partSize = objectSize;
-        long partCount = partSize > 0 ? (long) Math.ceil((double) objectSize / partSize) : 1;
-        return new long[] {partSize, partCount == 0 ? 1 : partCount};
-      }
-
-      double pSize = Math.ceil((double) objectSize / MAX_MULTIPART_COUNT);
-      pSize = Math.ceil(pSize / MIN_MULTIPART_SIZE) * MIN_MULTIPART_SIZE;
-      partSize = (long) pSize;
-      long partCount = 1;
-      if (pSize > 0) {
-        partCount = (long) Math.ceil(objectSize / pSize);
-      }
-
-      return new long[] {partSize, partCount};
-    }
-
     /**
      * Sets stream to upload. Two ways to provide object/part sizes.
      *
@@ -123,12 +64,10 @@ private long[] partInfo(long objectSize, long partSize) {
      */
     public Builder stream(InputStream stream, long objectSize, long partSize) {
       validateNotNull(stream, "stream");
-      validateSizes(objectSize, partSize);
 
-      long[] partinfo = partInfo(objectSize, partSize);
+      long[] partinfo = getPartInfo(objectSize, partSize);
       long pSize = partinfo[0];
       int pCount = (int) partinfo[1];
-      validatePartCount(pCount, objectSize, partSize);
 
       final BufferedInputStream bis =
           (stream instanceof BufferedInputStream)

api/src/main/java/io/minio/PutObjectBaseArgs.java

@@ -60,6 +60,58 @@ public boolean preloadData() {
   @SuppressWarnings("unchecked") // Its safe to type cast to B as B is inherited by this class
   public abstract static class Builder<B extends Builder<B, A>, A extends PutObjectBaseArgs>
       extends ObjectWriteArgs.Builder<B, A> {
+    private void validateSizes(long objectSize, long partSize) {
+      if (partSize > 0) {
+        if (partSize < MIN_MULTIPART_SIZE) {
+          throw new IllegalArgumentException(
+              "part size " + partSize + " is not supported; minimum allowed 5MiB");
+        }
+
+        if (partSize > MAX_PART_SIZE) {
+          throw new IllegalArgumentException(
+              "part size " + partSize + " is not supported; maximum allowed 5GiB");
+        }
+      }
+
+      if (objectSize >= 0) {
+        if (objectSize > MAX_OBJECT_SIZE) {
+          throw new IllegalArgumentException(
+              "object size " + objectSize + " is not supported; maximum allowed 5TiB");
+        }
+      } else if (partSize <= 0) {
+        throw new IllegalArgumentException(
+            "valid part size must be provided when object size is unknown");
+      }
+    }
+
+    protected long[] getPartInfo(long objectSize, long partSize) {
+      validateSizes(objectSize, partSize);
+
+      if (objectSize < 0) return new long[] {partSize, -1};
+
+      if (partSize <= 0) {
+        // Calculate part size by multiple of MIN_MULTIPART_SIZE.
+        double dPartSize = Math.ceil((double) objectSize / MAX_MULTIPART_COUNT);
+        dPartSize = Math.ceil(dPartSize / MIN_MULTIPART_SIZE) * MIN_MULTIPART_SIZE;
+        partSize = (long) dPartSize;
+      }
+
+      if (partSize > objectSize) partSize = objectSize;
+      long partCount = partSize > 0 ? (long) Math.ceil((double) objectSize / partSize) : 1;
+      if (partCount > MAX_MULTIPART_COUNT) {
+        throw new IllegalArgumentException(
+            "object size "
+                + objectSize
+                + " and part size "
+                + partSize
+                + " make more than "
+                + MAX_MULTIPART_COUNT
+                + "parts for upload");
+      }
+
+      return new long[] {partSize, partCount};
+    }
+
     /**
      * Sets flag to control data preload of stream/file. When this flag is enabled, entire
      * part/object data is loaded into memory to enable connection retry on network failure in the

api/src/main/java/io/minio/UploadObjectArgs.java

@@ -64,27 +64,25 @@ private void validateFilename(String filename) {
       }
     }
 
-    public Builder filename(String filename) throws IOException {
+    public Builder filename(String filename, long partSize) throws IOException {
       validateFilename(filename);
       final long objectSize = Files.size(Paths.get(filename));
-      if (objectSize > MAX_OBJECT_SIZE) {
-        throw new IllegalArgumentException(
-            "object size " + objectSize + " is not supported; maximum allowed 5TiB");
-      }
-
-      double pSize = Math.ceil((double) objectSize / MAX_MULTIPART_COUNT);
-      pSize = Math.ceil(pSize / MIN_MULTIPART_SIZE) * MIN_MULTIPART_SIZE;
 
-      final long partSize = (long) pSize;
-      final int partCount = (pSize > 0) ? (int) Math.ceil(objectSize / pSize) : 1;
+      long[] partinfo = getPartInfo(objectSize, partSize);
+      final long pSize = partinfo[0];
+      final int partCount = (int) partinfo[1];
 
       operations.add(args -> args.filename = filename);
       operations.add(args -> args.objectSize = objectSize);
-      operations.add(args -> args.partSize = partSize);
+      operations.add(args -> args.partSize = pSize);
       operations.add(args -> args.partCount = partCount);
       return this;
     }
 
+    public Builder filename(String filename) throws IOException {
+      return this.filename(filename, 0);
+    }
+
     public Builder contentType(String contentType) {
       validateNotEmptyString(contentType, "content type");
       operations.add(args -> args.contentType = contentType);