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

bachue · web-flow · commit 1fd37ed30d56 · 2022-12-06T19:46:58.000+08:00
uc_query add gloable cache
diff --git a/src/main/java/com/qiniu/storage/AutoRegion.java b/src/main/java/com/qiniu/storage/AutoRegion.java
diff --git a/src/main/java/com/qiniu/storage/Configuration.java b/src/main/java/com/qiniu/storage/Configuration.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();
         }
diff --git a/src/main/java/com/qiniu/storage/FormUploader.java b/src/main/java/com/qiniu/storage/FormUploader.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
diff --git a/src/main/java/com/qiniu/storage/RegionGroup.java b/src/main/java/com/qiniu/storage/RegionGroup.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() {
diff --git a/src/main/java/com/qiniu/storage/ResumeUploadPerformer.java b/src/main/java/com/qiniu/storage/ResumeUploadPerformer.java
@@ -38,7 +38,6 @@ boolean isAllBlocksUploaded() {
         return uploadSource.isAllBlocksUploaded();
     }
 
-
     abstract boolean shouldUploadInit();
 
     abstract Response uploadInit() throws QiniuException;
diff --git a/src/main/java/com/qiniu/storage/ResumeUploadSource.java b/src/main/java/com/qiniu/storage/ResumeUploadSource.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 则说明没有需要上传的数据块
diff --git a/src/main/java/com/qiniu/storage/Retry.java b/src/main/java/com/qiniu/storage/Retry.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 {
diff --git a/src/main/java/com/qiniu/storage/UpHostHelper.java b/src/main/java/com/qiniu/storage/UpHostHelper.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.
diff --git a/src/test/java/test/com/qiniu/storage/FormUploadTest.java b/src/test/java/test/com/qiniu/storage/FormUploadTest.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;

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ synchronized boolean switchRegion(RegionReqInfo regionReqInfo) {`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
	`44`	`+ @Override`
`44`	`45`	`String getRegion(RegionReqInfo regionReqInfo) {`
`45`	`46`	`if (currentRegion == null) {`
`46`	`47`	`return "";`
`@@ -49,6 +50,7 @@ String getRegion(RegionReqInfo regionReqInfo) {`
`49`	`50`	`}`
`50`	`51`	`}`
`51`	`52`
	`53`	`+ @Override`
`52`	`54`	`List<String> getSrcUpHost(RegionReqInfo regionReqInfo) throws QiniuException {`
`53`	`55`	`if (currentRegion == null) {`
`54`	`56`	`return null;`
`@@ -57,6 +59,7 @@ List<String> getSrcUpHost(RegionReqInfo regionReqInfo) throws QiniuException {`
`57`	`59`	`}`
`58`	`60`	`}`
`59`	`61`
	`62`	`+ @Override`
`60`	`63`	`List<String> getAccUpHost(RegionReqInfo regionReqInfo) throws QiniuException {`
`61`	`64`	`if (currentRegion == null) {`
`62`	`65`	`return null;`
`@@ -65,6 +68,7 @@ List<String> getAccUpHost(RegionReqInfo regionReqInfo) throws QiniuException {`
`65`	`68`	`}`
`66`	`69`	`}`
`67`	`70`
	`71`	`+ @Override`
`68`	`72`	`String getIovipHost(RegionReqInfo regionReqInfo) throws QiniuException {`
`69`	`73`	`if (currentRegion == null) {`
`70`	`74`	`return null;`
`@@ -73,6 +77,7 @@ String getIovipHost(RegionReqInfo regionReqInfo) throws QiniuException {`
`73`	`77`	`}`
`74`	`78`	`}`
`75`	`79`
	`80`	`+ @Override`
`76`	`81`	`String getRsHost(RegionReqInfo regionReqInfo) throws QiniuException {`
`77`	`82`	`if (currentRegion == null) {`
`78`	`83`	`return null;`
`@@ -81,6 +86,7 @@ String getRsHost(RegionReqInfo regionReqInfo) throws QiniuException {`
`81`	`86`	`}`
`82`	`87`	`}`
`83`	`88`
	`89`	`+ @Override`
`84`	`90`	`String getRsfHost(RegionReqInfo regionReqInfo) throws QiniuException {`
`85`	`91`	`if (currentRegion == null) {`
`86`	`92`	`return null;`
`@@ -89,6 +95,7 @@ String getRsfHost(RegionReqInfo regionReqInfo) throws QiniuException {`
`89`	`95`	`}`
`90`	`96`	`}`
`91`	`97`
	`98`	`+ @Override`
`92`	`99`	`String getApiHost(RegionReqInfo regionReqInfo) throws QiniuException {`
`93`	`100`	`if (currentRegion == null) {`
`94`	`101`	`return null;`
`@@ -97,6 +104,7 @@ String getApiHost(RegionReqInfo regionReqInfo) throws QiniuException {`
`97`	`104`	`}`
`98`	`105`	`}`
`99`	`106`
	`107`	`+ @Override`
`100`	`108`	`Region getCurrentRegion(RegionReqInfo regionReqInfo) {`
`101`	`109`	`if (currentRegion == null) {`
`102`	`110`	`return null;`
`@@ -109,11 +117,18 @@ Region getCurrentRegion(RegionReqInfo regionReqInfo) {`
`109`	`117`
`110`	`118`	`@Override`
`111`	`119`	`boolean isValid() {`
`112`		`- if (currentRegion == null) {`
	`120`	`+ if (regionList.size() == 0) {`
`113`	`121`	`return false;`
`114`	`122`	`}`
`115`		`- // 只判断当前的`
`116`		`- return currentRegion.isValid();`
	`123`	`+`
	`124`	`+ boolean valid = true;`
	`125`	`+ for (Region region : regionList) {`
	`126`	`+ if (region == null \|\| !region.isValid()) {`
	`127`	`+ valid = false;`
	`128`	`+ break;`
	`129`	`+ }`
	`130`	`+ }`
	`131`	`+ return valid;`
`117`	`132`	`}`
`118`	`133`
`119`	`134`	`private void updateCurrentRegion() {`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,6 @@ boolean isAllBlocksUploaded() {`
`38`	`38`	`return uploadSource.isAllBlocksUploaded();`
`39`	`39`	`}`
`40`	`40`
`41`		`-`
`42`	`41`	`abstract boolean shouldUploadInit();`
`43`	`42`
`44`	`43`	`abstract Response uploadInit() throws QiniuException;`
Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,9 @@ abstract class ResumeUploadSource {`
`28`	`28`
`29`	`29`	`ResumeUploadSource(Configuration config, String recordKey) {`
`30`	`30`	`this.config = config;`
	`31`	`+ this.resumableUploadAPIVersion = config.resumableUploadAPIVersion;`
`31`	`32`	`this.blockSize = getBlockSize(config);`
`32`	`33`	`this.recordKey = recordKey;`
`33`		`- this.resumableUploadAPIVersion = config.resumableUploadAPIVersion;`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`// 所有块数据是否正在上传或者已上传，为 true 则说明没有需要上传的数据块`
Original file line number	Diff line number	Diff line change
`@@ -25,25 +25,24 @@ static boolean shouldUploadAgain(Response response, QiniuException exception) {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`static Boolean requestShouldRetry(Response response, QiniuException exception) {`
`28`		`- if (response != null && response.needRetry()) {`
`29`		`- return true;`
	`28`	`+ if (response != null) {`
	`29`	`+ return response.needRetry();`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`if (exception == null \|\| exception.isUnrecoverable()) {`
`33`	`33`	`return false;`
`34`	`34`	`}`
`35`	`35`
`36`		`- if (exception.response != null && exception.response.needRetry()) {`
`37`		`- // 异常需可恢复`
`38`		`- return true;`
	`36`	`+ if (exception.response != null) {`
	`37`	`+ return exception.response.needRetry();`
`39`	`38`	`}`
`40`	`39`
`41`		`- return false;`
	`40`	`+ return true;`
`42`	`41`	`}`
`43`	`42`
`44`	`43`	`static Boolean requestShouldSwitchHost(Response response, QiniuException exception) {`
`45`		`- if (response != null && response.needSwitchServer()) {`
`46`		`- return true;`
	`44`	`+ if (response != null) {`
	`45`	`+ return response.needSwitchServer();`
`47`	`46`	`}`
`48`	`47`
`49`	`48`	`if (exception == null) {`
`@@ -54,12 +53,11 @@ static Boolean requestShouldSwitchHost(Response response, QiniuException excepti`
`54`	`53`	`return false;`
`55`	`54`	`}`
`56`	`55`
`57`		`- if (exception.response == null \|\| exception.response.needSwitchServer()) {`
`58`		`- // 异常需可恢复`
`59`		`- return true;`
	`56`	`+ if (exception.response != null) {`
	`57`	`+ return exception.response.needSwitchServer();`
`60`	`58`	`}`
`61`	`59`
`62`		`- return false;`
	`60`	`+ return true;`
`63`	`61`	`}`
`64`	`62`
`65`	`63`	`static Response retryRequestAction(RequestRetryConfig config, RequestRetryAction action) throws QiniuException {`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,7 @@ protected boolean removeEldestEntry(Map.Entry<String, RegionUpHost> eldest) {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`
`26`		`- String upHost(Region region, String upToken, String lastUsedHost, boolean changeHost, boolean mustReturnUpHost)`
`27`		`- throws QiniuException {`
	`26`	`+ String upHost(Region region, String upToken, String lastUsedHost, boolean changeHost, boolean mustReturnUpHost) throws QiniuException {`
`28`	`27`	`RegionReqInfo regionReqInfo = new RegionReqInfo(upToken);`
`29`	`28`
`30`	`29`	`// auto region may failed here.`