upload list use ListVector

Author: YangSen-qn

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

@@ -0,0 +1,76 @@
+package com.qiniu.android;
+
+import com.qiniu.android.utils.ListVector;
+
+import junit.framework.Assert;
+
+import java.util.List;
+
+public class ListVectorTest extends BaseTest {
+
+    public void testVectorList() {
+
+        final int count = 1000;
+        final ListVector<String> v = new ListVector<>();
+
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                while (v.size() < count) {
+                    vectorAdd(v);
+                }
+            }
+        }).start();
+
+        while (v.size() < count) {
+            vectorList(v);
+        }
+
+        Assert.assertTrue("v:" + v, v.size() == count);
+    }
+
+    public void testVectorSubList() {
+
+        final int count = 1000;
+        final ListVector<String> listVector = new ListVector<>();
+
+        while (listVector.size() < count) {
+            vectorAdd(listVector);
+        }
+
+        final ListVector<String> v = listVector.subList(0, count/2);
+
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                while (v.size() < count) {
+                    vectorAdd(v);
+                }
+            }
+        }).start();
+
+
+        while (v.size() < count) {
+            vectorList(v);
+        }
+
+        Assert.assertTrue("v:" + v, v.size() == count);
+    }
+
+    private void vectorAdd(List<String> v) {
+        String e = v.size() + "";
+        v.add(e);
+        System.out.println("add e:" + e);
+    }
+
+    private void vectorList(ListVector<String> v) {
+        final int size = v.size();
+        v.enumerateObjects(new ListVector.EnumeratorHandler<String>() {
+            @Override
+            public boolean enumerate(String s) {
+                System.out.println("size:" + size + " value:" + s);
+                return false;
+            }
+        });
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.qiniu.android.storage;
 
 import com.qiniu.android.utils.BytesUtils;
+import com.qiniu.android.utils.ListVector;
 import com.qiniu.android.utils.MD5;
 import com.qiniu.android.utils.StringUtils;
 
@@ -11,7 +12,6 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Vector;
 
 class UploadInfoV1 extends UploadInfo {
 
@@ -21,12 +21,12 @@ class UploadInfoV1 extends UploadInfo {
     private static final int BlockListCapacityIncrement = 2;
 
     private final int dataSize;
-    private List<UploadBlock> blockList;
+    private ListVector<UploadBlock> blockList;
 
     private boolean isEOF = false;
     private IOException readException = null;
 
-    private UploadInfoV1(UploadSource source, int dataSize, List<UploadBlock> blockList) {
+    private UploadInfoV1(UploadSource source, int dataSize, ListVector<UploadBlock> blockList) {
         super(source);
         this.dataSize = dataSize;
         this.blockList = blockList;
@@ -39,7 +39,7 @@ private UploadInfoV1(UploadSource source, int dataSize, List<UploadBlock> blockL
         } else {
             this.dataSize = configuration.chunkSize;
         }
-        this.blockList = new Vector<>(BlockListCapacityIncrement, BlockListCapacityIncrement);
+        this.blockList = new ListVector<>(BlockListCapacityIncrement, BlockListCapacityIncrement);
     }
 
     static UploadInfoV1 infoFromJson(UploadSource source, JSONObject jsonObject) {
@@ -49,12 +49,12 @@ static UploadInfoV1 infoFromJson(UploadSource source, JSONObject jsonObject) {
 
         int dataSize = 0;
         String type = null;
-        List<UploadBlock> blockList = null;
+        ListVector<UploadBlock> blockList = null;
         try {
             type = jsonObject.optString(TypeKey);
             dataSize = jsonObject.getInt("dataSize");
             JSONArray blockJsonArray = jsonObject.getJSONArray("blockList");
-            blockList = new Vector<>(blockJsonArray.length(), BlockListCapacityIncrement);
+            blockList = new ListVector<>(blockJsonArray.length(), BlockListCapacityIncrement);
             for (int i = 0; i < blockJsonArray.length(); i++) {
                 JSONObject blockJson = blockJsonArray.getJSONObject(i);
                 try {
@@ -109,21 +109,30 @@ void clearUploadState() {
         if (blockList == null || blockList.size() == 0) {
             return;
         }
-        for (UploadBlock block : blockList) {
-            block.clearUploadState();
-        }
+
+        blockList.enumerateObjects(new ListVector.EnumeratorHandler<UploadBlock>() {
+            @Override
+            public boolean enumerate(UploadBlock block) {
+                block.clearUploadState();
+                return false;
+            }
+        });
     }
 
     @Override
     long uploadSize() {
         if (blockList == null || blockList.size() == 0) {
             return 0;
         }
-        long uploadSize = 0;
-        for (UploadBlock block : blockList) {
-            uploadSize += block.uploadSize();
-        }
-        return uploadSize;
+        final long[] uploadSize = {0};
+        blockList.enumerateObjects(new ListVector.EnumeratorHandler<UploadBlock>() {
+            @Override
+            public boolean enumerate(UploadBlock block) {
+                uploadSize[0] += block.uploadSize();
+                return false;
+            }
+        });
+        return uploadSize[0];
     }
 
     // 文件已经读取结束 & 所有块均上传
@@ -136,21 +145,30 @@ boolean isAllUploaded() {
         if (blockList == null || blockList.size() == 0) {
             return true;
         }
-        boolean isAllUploaded = true;
-        for (UploadBlock block : blockList) {
-            if (!block.isCompleted()) {
-                isAllUploaded = false;
-                break;
+        final boolean[] isAllUploaded = {true};
+        blockList.enumerateObjects(new ListVector.EnumeratorHandler<UploadBlock>() {
+            @Override
+            public boolean enumerate(UploadBlock block) {
+                if (!block.isCompleted()) {
+                    isAllUploaded[0] = false;
+                    return true;
+                } else {
+                    return false;
+                }
             }
-        }
-        return isAllUploaded;
+        });
+        return isAllUploaded[0];
     }
 
     @Override
     void checkInfoStateAndUpdate() {
-        for (UploadBlock block : blockList) {
-            block.checkInfoStateAndUpdate();
-        }
+        blockList.enumerateObjects(new ListVector.EnumeratorHandler<UploadBlock>() {
+            @Override
+            public boolean enumerate(UploadBlock block) {
+                block.checkInfoStateAndUpdate();
+                return false;
+            }
+        });
     }
 
     @Override
@@ -163,12 +181,24 @@ JSONObject toJsonObject() {
             jsonObject.put(TypeKey, TypeValue);
             jsonObject.put("dataSize", dataSize);
             if (blockList != null && blockList.size() > 0) {
-                JSONArray blockJsonArray = new JSONArray();
-                for (UploadBlock block : blockList) {
-                    JSONObject blockJson = block.toJsonObject();
-                    if (blockJson != null) {
-                        blockJsonArray.put(blockJson);
+                final JSONArray blockJsonArray = new JSONArray();
+                blockList.enumerateObjects(new ListVector.EnumeratorHandler<UploadBlock>() {
+                    @Override
+                    public boolean enumerate(UploadBlock block) {
+                        try {
+                            JSONObject blockJson = block.toJsonObject();
+                            if (blockJson != null) {
+                                blockJsonArray.put(blockJson);
+                            }
+                        } catch (Exception e) {
+                            return true;
+                        }
+                        return false;
                     }
+                });
+
+                if (blockJsonArray.length() != blockList.size()) {
+                    return null;
                 }
                 jsonObject.put("blockList", blockJsonArray);
             }
@@ -243,15 +273,20 @@ private UploadBlock nextUploadBlockFormBlockList() {
         if (blockList == null || blockList.size() == 0) {
             return null;
         }
-        UploadBlock block = null;
-        for (UploadBlock blockP : blockList) {
-            UploadData data = blockP.nextUploadDataWithoutCheckData();
-            if (data != null) {
-                block = blockP;
-                break;
+        final UploadBlock[] blocks = {null};
+        blockList.enumerateObjects(new ListVector.EnumeratorHandler<UploadBlock>() {
+            @Override
+            public boolean enumerate(UploadBlock block) {
+                UploadData data = block.nextUploadDataWithoutCheckData();
+                if (data != null) {
+                    blocks[0] = block;
+                    return true;
+                } else {
+                    return false;
+                }
             }
-        }
-        return block;
+        });
+        return blocks[0];
     }
 
 
@@ -324,13 +359,17 @@ ArrayList<String> allBlocksContexts() {
         if (blockList == null || blockList.size() == 0) {
             return null;
         }
-        ArrayList<String> contexts = new ArrayList<String>();
-        for (UploadBlock block : blockList) {
-            String ctx = block.ctx;
-            if (!StringUtils.isNullOrEmpty(ctx)) {
-                contexts.add(ctx);
+        final ArrayList<String> contexts = new ArrayList<String>();
+        blockList.enumerateObjects(new ListVector.EnumeratorHandler<UploadBlock>() {
+            @Override
+            public boolean enumerate(UploadBlock block) {
+                String ctx = block.ctx;
+                if (!StringUtils.isNullOrEmpty(ctx)) {
+                    contexts.add(ctx);
+                }
+                return false;
             }
-        }
+        });
         return contexts;
     }
 }