Merge branch 'region-create-by-region-id' into uc-query-disk-cache

qiniu · Nov 6, 2023 · d389e5c · d389e5c
2 parents a73fb17 + 34fbd2c
commit d389e5c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/main/java/com/qiniu/storage/Region.java b/src/main/java/com/qiniu/storage/Region.java
@@ -286,6 +286,14 @@ public static Region regionAs0() {
      * @return Region 实例
      */
     public static Region createWithRegionId(String regionId) {
+        if (regionId == null || regionId.isEmpty()) {
+            return null;
+        }
+
+        if (regionId.equals("z0")) {
+            return Region.region0();
+        }
+
         return new Builder()
                 .region(regionId)
                 .srcUpHost("up-" + regionId + ".qiniup.com")

diff --git a/src/test/java/test/com/qiniu/storage/BucketTest.java b/src/test/java/test/com/qiniu/storage/BucketTest.java
@@ -1331,7 +1331,7 @@ public void testBatchStat() throws Exception {
             public void testFile(TestConfig.TestFile file, BucketManager bucketManager) throws IOException {
                 String bucket = file.getBucketName();
                 String key = file.getKey();
-                String[] keyArray = new String[100];
+                String[] keyArray = new String[50];
                 for (int i = 0; i < keyArray.length; i++) {
                     keyArray[i] = key;
                 }