optimize region request metrics

Author: YangSen-qn

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

@@ -30,7 +30,8 @@ public void testMutiUploadV1(){
         param.completeCount = 0;
         param.successCount = 0;
 
-        for (int i = 35; i < maxCount; i++) {
+        final int start = 30;
+        for (int i = start; i < maxCount; i++) {
             Configuration config = new Configuration.Builder()
                     .resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V1)
                     .useConcurrentResumeUpload(true)
@@ -55,7 +56,7 @@ public void complete(String key, ResponseInfo info, JSONObject response) {
                         if (info != null && info.isOK()){
                             param.successCount += 1;
                         }
-                        if (param.completeCount == maxCount){
+                        if (param.completeCount == (maxCount - start)){
                             signal.countDown();
                         }
                     }
@@ -80,7 +81,8 @@ public void testMutiUploadV2(){
         param.completeCount = 0;
         param.successCount = 0;
 
-        for (int i = 35; i < maxCount; i++) {
+        final int start = 30;
+        for (int i = start; i < maxCount; i++) {
             Configuration config = new Configuration.Builder()
                     .resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V2)
                     .useConcurrentResumeUpload(true)
@@ -105,7 +107,7 @@ public void complete(String key, ResponseInfo info, JSONObject response) {
                         if (info != null && info.isOK()){
                             param.successCount += 1;
                         }
-                        if (param.completeCount == maxCount){
+                        if (param.completeCount == (maxCount - start)){
                             signal.countDown();
                         }
                     }
@@ -119,7 +121,7 @@ public void complete(String key, ResponseInfo info, JSONObject response) {
         }
 
         Log.d("ComplexUploadSceneTest", "complex_upload_v2 successCount: " + param.successCount);
-        assertTrue("success count" + param.successCount, param.successCount == param.completeCount);
+        assertTrue("success count" + param.successCount, param.successCount == (param.completeCount));
     }
 
 

library/src/main/java/com/qiniu/android/http/metrics/UploadRegionRequestMetrics.java

@@ -2,12 +2,13 @@
 
 import com.qiniu.android.http.request.IUploadRegion;
 
-import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 public class UploadRegionRequestMetrics {
 
     public final IUploadRegion region;
-    private ArrayList <UploadSingleRequestMetrics> metricsList = new ArrayList<>();
+    private List<UploadSingleRequestMetrics> metricsList = new CopyOnWriteArrayList<>();
 
     public UploadRegionRequestMetrics(IUploadRegion region) {
         this.region = region;
@@ -43,7 +44,7 @@ public Long bytesSend(){
         return bytes;
     }
 
-    public void addMetricsList(ArrayList<UploadSingleRequestMetrics> metricsList){
+    public void addMetricsList(List<UploadSingleRequestMetrics> metricsList){
         if (metricsList == null || metricsList.size() == 0){
             return;
         }