chunk size set min size

Author: YangSen-qn

library/src/androidTest/java/com/qiniu/android/ComplexUploadSceneTest.java

@@ -30,17 +30,17 @@ public void testMutiUploadV1(){
         param.completeCount = 0;
         param.successCount = 0;
 
-        final int start = 30;
+        final int start = 35;
         for (int i = start; i < maxCount; i++) {
             Configuration config = new Configuration.Builder()
                     .resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V1)
                     .useConcurrentResumeUpload(true)
                     .concurrentTaskCount(3)
-                    .chunkSize(i%4 * 1024 * 1024 + i)
+                    .chunkSize((i%4 + 1) * 1024 * 1024 + i)
                     .build();
 
             int size = (i + 1) * 1024;
-            String keyUp = "complex_upload_v1_" + size + "k";
+            final String keyUp = "android_complex_upload_v1_" + size + "k";
             File file = null;
             try {
                 file = TempFile.createFile(size);
@@ -60,6 +60,7 @@ public void complete(String key, ResponseInfo info, JSONObject response) {
                             signal.countDown();
                         }
                     }
+                    Log.d("upload key:" + keyUp, "complex_upload_v1 response: " + info);
                 }
             });
         }
@@ -81,17 +82,17 @@ public void testMutiUploadV2(){
         param.completeCount = 0;
         param.successCount = 0;
 
-        final int start = 30;
+        final int start = 35;
         for (int i = start; i < maxCount; i++) {
             Configuration config = new Configuration.Builder()
                     .resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V2)
                     .useConcurrentResumeUpload(true)
                     .concurrentTaskCount(3)
-                    .chunkSize(i%4 * 1024 * 1024 + i)
+                    .chunkSize((i%4 + 1) * 1024 * 1024 + i)
                     .build();
 
             int size = (i + 1) * 1024;
-            String keyUp = "complex_upload_v2_" + size + "k";
+            final String keyUp = "android_complex_upload_v2_" + size + "k";
             File file = null;
             try {
                 file = TempFile.createFile(size);
@@ -104,13 +105,14 @@ public void testMutiUploadV2(){
                 public void complete(String key, ResponseInfo info, JSONObject response) {
                     synchronized (param){
                         param.completeCount += 1;
-                        if (info != null && info.isOK()){
+                        if (info != null && (info.isOK() || info.statusCode == 614)){
                             param.successCount += 1;
                         }
                         if (param.completeCount == (maxCount - start)){
                             signal.countDown();
                         }
                     }
+                    Log.d("upload key:" + keyUp, "complex_upload_v2 response: " + info);
                 }
             });
         }

library/src/main/java/com/qiniu/android/storage/Configuration.java

@@ -110,7 +110,21 @@ public final class Configuration {
 
 
     private Configuration(Builder builder) {
+        useConcurrentResumeUpload = builder.useConcurrentResumeUpload;
+        resumeUploadVersion = builder.resumeUploadVersion;
+        concurrentTaskCount = builder.concurrentTaskCount;
+
+        if (builder.resumeUploadVersion == RESUME_UPLOAD_VERSION_V1) {
+            if (builder.chunkSize < 1024) {
+                builder.chunkSize = 1024;
+            }
+        } else if (builder.resumeUploadVersion == RESUME_UPLOAD_VERSION_V2) {
+            if (builder.chunkSize < 1024 * 1024) {
+                builder.chunkSize = 1024 * 1024;
+            }
+        }
         chunkSize = builder.chunkSize;
+
         putThreshold = builder.putThreshold;
 
         connectTimeout = builder.connectTimeout;
@@ -130,10 +144,6 @@ private Configuration(Builder builder) {
 
         useHttps = builder.useHttps;
 
-        useConcurrentResumeUpload = builder.useConcurrentResumeUpload;
-        resumeUploadVersion = builder.resumeUploadVersion;
-        concurrentTaskCount = builder.concurrentTaskCount;
-
         zone = builder.zone != null ? builder.zone : new AutoZone();
     }