optimize resume upload get data logic

Author: YangSen-qn

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

@@ -229,7 +229,8 @@ public void testHttpV2(){
                 .chunkSize(4*1024*1024)
                 .useHttps(false)
                 .build();
-        int[] sizeArray = {500, 1000, 3000, 4000, 5000, 8000, 10000, 20000};
+//        int[] sizeArray = {500, 1000, 3000, 4000, 5000, 8000, 10000, 20000};
+        int[] sizeArray = {200000};
         long timestamp = new Date().getTime();
         for (int size : sizeArray) {
             String key = "android_concurrent_resume_http_v2_" + timestamp + "_" + size + "k";

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

@@ -71,7 +71,7 @@ void uploadNextData(final PartsUploadPerformerDataCompleteHandler completeHandle
             return;
         }
 
-        chunk.data = getDataWithChunk(chunk, block);
+        chunk.data = getChunkDataWithRetry(chunk, block);
         if (chunk.data == null) {
             LogUtil.i("key:" + StringUtils.toNonnullString(key) + " no chunk left");
 
@@ -184,21 +184,42 @@ public void complete(ResponseInfo responseInfo, UploadRegionRequestMetrics reque
 
     }
 
-    private synchronized byte[] getDataWithChunk(UploadData chunk, UploadBlock block) {
+    private byte[] getChunkDataWithRetry(UploadData chunk, UploadBlock block) {
+        byte[] uploadData = null;
+
+        int maxTime = 3;
+        int index = 0;
+        while (index < maxTime) {
+            uploadData = getChunkData(chunk, block);
+            if (uploadData != null) {
+                break;
+            }
+            index ++;
+        }
+
+        return uploadData;
+    }
+
+    private synchronized byte[] getChunkData(UploadData chunk, UploadBlock block) {
         if (randomAccessFile == null || chunk == null || block == null) {
             return null;
         }
         int readSize = 0;
-        byte[] data = new byte[(int) chunk.size];
+        byte[] data = new byte[chunk.size];
         try {
             randomAccessFile.seek((chunk.offset + block.offset));
             while (readSize < chunk.size) {
-                int ret = randomAccessFile.read(data, readSize, (int) (chunk.size - readSize));
+                int ret = randomAccessFile.read(data, readSize, (chunk.size - readSize));
                 if (ret < 0) {
                     break;
                 }
                 readSize += ret;
             }
+
+            // 读数据非预期
+            if (readSize != chunk.size) {
+                data = null;
+            }
         } catch (IOException e) {
             data = null;
         }

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

@@ -98,7 +98,7 @@ void uploadNextData(final PartsUploadPerformerDataCompleteHandler completeHandle
             return;
         }
 
-        data.data = getUploadData(data);
+        data.data = getUploadDataWithRetry(data);
         if (data.data == null) {
             LogUtil.i("key:" + StringUtils.toNonnullString(key) + " get data error");
 
@@ -168,22 +168,42 @@ public void complete(ResponseInfo responseInfo, UploadRegionRequestMetrics reque
         });
     }
 
+    private byte[] getUploadDataWithRetry(UploadData data) {
+        byte[] uploadData = null;
+
+        int maxTime = 3;
+        int index = 0;
+        while (index < maxTime) {
+            uploadData = getUploadData(data);
+            if (uploadData != null) {
+                break;
+            }
+            index ++;
+        }
+
+        return uploadData;
+    }
+
     private synchronized byte[] getUploadData(UploadData data) {
         if (randomAccessFile == null || data == null) {
             return null;
         }
 
         int readSize = 0;
-        byte[] uploadData = new byte[(int) data.size];
+        byte[] uploadData = new byte[data.size];
         try {
             randomAccessFile.seek(data.offset);
             while (readSize < data.size) {
-                int ret = randomAccessFile.read(uploadData, readSize, (int) (data.size - readSize));
+                int ret = randomAccessFile.read(uploadData, readSize, data.size - readSize);
                 if (ret < 0) {
                     break;
                 }
                 readSize += ret;
             }
+            // 读数据非预期
+            if (readSize != data.size) {
+                uploadData = null;
+            }
         } catch (IOException e) {
             uploadData = null;
         }