Merge pull request #569 from YangSen-qn/multi-region

uc_query add gloable cache

Author: bachue

src/main/java/com/qiniu/storage/AutoRegion.java

@@ -144,7 +144,11 @@ public Configuration(Zone zone) {
 
     public Configuration clone() {
         try {
-            return (Configuration) super.clone();
+            Configuration configuration = (Configuration) super.clone();
+            if (region != null) {
+                configuration.region = (Region)region.clone();
+            }
+            return configuration;
         } catch (CloneNotSupportedException e) {
             e.printStackTrace();
         }

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

@@ -20,11 +20,8 @@ public final class FormUploader extends BaseUploader {
     private final byte[] data;
     private final String mime;
     private final boolean checkCrc;
-    private final Configuration config;
-    private final ConfigHelper configHelper;
     private StringMap params;
     private String filename;
-    private Client client;
 
     /**
      * 构建一个表单上传字节数组的对象
@@ -64,14 +61,11 @@ private FormUploader(Client client, String upToken, String key, byte[] data, Fil
                          String mime, boolean checkCrc, Configuration configuration) {
         super(client, upToken, key, configuration);
 
-        this.client = client;
         this.file = file;
         this.data = data;
         this.params = params;
         this.mime = mime;
         this.checkCrc = checkCrc;
-        this.configHelper = new ConfigHelper(configuration);
-        this.config = configuration;
     }
 
     @Override

src/main/java/com/qiniu/storage/FormUploader.java

@@ -41,6 +41,7 @@ synchronized boolean switchRegion(RegionReqInfo regionReqInfo) {
         }
     }
 
+    @Override
     String getRegion(RegionReqInfo regionReqInfo) {
         if (currentRegion == null) {
             return "";
@@ -49,6 +50,7 @@ String getRegion(RegionReqInfo regionReqInfo) {
         }
     }
 
+    @Override
     List<String> getSrcUpHost(RegionReqInfo regionReqInfo) throws QiniuException {
         if (currentRegion == null) {
             return null;
@@ -57,6 +59,7 @@ List<String> getSrcUpHost(RegionReqInfo regionReqInfo) throws QiniuException {
         }
     }
 
+    @Override
     List<String> getAccUpHost(RegionReqInfo regionReqInfo) throws QiniuException {
         if (currentRegion == null) {
             return null;
@@ -65,6 +68,7 @@ List<String> getAccUpHost(RegionReqInfo regionReqInfo) throws QiniuException {
         }
     }
 
+    @Override
     String getIovipHost(RegionReqInfo regionReqInfo) throws QiniuException {
         if (currentRegion == null) {
             return null;
@@ -73,6 +77,7 @@ String getIovipHost(RegionReqInfo regionReqInfo) throws QiniuException {
         }
     }
 
+    @Override
     String getRsHost(RegionReqInfo regionReqInfo) throws QiniuException {
         if (currentRegion == null) {
             return null;
@@ -81,6 +86,7 @@ String getRsHost(RegionReqInfo regionReqInfo) throws QiniuException {
         }
     }
 
+    @Override
     String getRsfHost(RegionReqInfo regionReqInfo) throws QiniuException {
         if (currentRegion == null) {
             return null;
@@ -89,6 +95,7 @@ String getRsfHost(RegionReqInfo regionReqInfo) throws QiniuException {
         }
     }
 
+    @Override
     String getApiHost(RegionReqInfo regionReqInfo) throws QiniuException {
         if (currentRegion == null) {
             return null;
@@ -97,6 +104,7 @@ String getApiHost(RegionReqInfo regionReqInfo) throws QiniuException {
         }
     }
 
+    @Override
     Region getCurrentRegion(RegionReqInfo regionReqInfo) {
         if (currentRegion == null) {
             return null;
@@ -109,11 +117,18 @@ Region getCurrentRegion(RegionReqInfo regionReqInfo) {
 
     @Override
     boolean isValid() {
-        if (currentRegion == null) {
+        if (regionList.size() == 0) {
             return false;
         }
-        // 只判断当前的
-        return currentRegion.isValid();
+
+        boolean valid = true;
+        for (Region region : regionList) {
+            if (region == null || !region.isValid()) {
+                valid = false;
+                break;
+            }
+        }
+        return valid;
     }
 
     private void updateCurrentRegion() {

src/main/java/com/qiniu/storage/RegionGroup.java

@@ -38,7 +38,6 @@ boolean isAllBlocksUploaded() {
         return uploadSource.isAllBlocksUploaded();
     }
 
-
     abstract boolean shouldUploadInit();
 
     abstract Response uploadInit() throws QiniuException;

src/main/java/com/qiniu/storage/ResumeUploadPerformer.java

@@ -28,9 +28,9 @@ abstract class ResumeUploadSource {
 
     ResumeUploadSource(Configuration config, String recordKey) {
         this.config = config;
+        this.resumableUploadAPIVersion = config.resumableUploadAPIVersion;
         this.blockSize = getBlockSize(config);
         this.recordKey = recordKey;
-        this.resumableUploadAPIVersion = config.resumableUploadAPIVersion;
     }
 
     // 所有块数据是否 正在上传 或者 已上传，为 true 则说明没有需要上传的数据块

src/main/java/com/qiniu/storage/ResumeUploadSource.java

@@ -25,25 +25,24 @@ static boolean shouldUploadAgain(Response response, QiniuException exception) {
     }
 
     static Boolean requestShouldRetry(Response response, QiniuException exception) {
-        if (response != null && response.needRetry()) {
-            return true;
+        if (response != null) {
+            return response.needRetry();
         }
 
         if (exception == null || exception.isUnrecoverable()) {
             return false;
         }
 
-        if (exception.response != null && exception.response.needRetry()) {
-            // 异常需可恢复
-            return true;
+        if (exception.response != null) {
+            return exception.response.needRetry();
         }
 
-        return false;
+        return true;
     }
 
     static Boolean requestShouldSwitchHost(Response response, QiniuException exception) {
-        if (response != null && response.needSwitchServer()) {
-            return true;
+        if (response != null) {
+            return response.needSwitchServer();
         }
 
         if (exception == null) {
@@ -54,12 +53,11 @@ static Boolean requestShouldSwitchHost(Response response, QiniuException excepti
             return false;
         }
 
-        if (exception.response == null || exception.response.needSwitchServer()) {
-            // 异常需可恢复
-            return true;
+        if (exception.response != null) {
+            return exception.response.needSwitchServer();
         }
 
-        return false;
+        return true;
     }
 
     static Response retryRequestAction(RequestRetryConfig config, RequestRetryAction action) throws QiniuException {

src/main/java/com/qiniu/storage/Retry.java

@@ -23,8 +23,7 @@ protected boolean removeEldestEntry(Map.Entry<String, RegionUpHost> eldest) {
     }
 
 
-    String upHost(Region region, String upToken, String lastUsedHost, boolean changeHost, boolean mustReturnUpHost)
-            throws QiniuException {
+    String upHost(Region region, String upToken, String lastUsedHost, boolean changeHost, boolean mustReturnUpHost) throws QiniuException {
         RegionReqInfo regionReqInfo = new RegionReqInfo(upToken);
 
         // auto region may failed here.

src/main/java/com/qiniu/storage/UpHostHelper.java

@@ -79,13 +79,13 @@ public void hello(UploadManager up, String bucket) {
         try {
             r = up.put("hello".getBytes(), expectKey, token, params, null, false);
         } catch (QiniuException e) {
-            fail();
+            fail(e.toString());
         }
         StringMap map = null;
         try {
             map = r.jsonToMap();
         } catch (QiniuException e) {
-            fail();
+            fail(e.toString());
         }
         assertEquals(200, r.statusCode);
         assert map != null;