This is an automated email from the ASF dual-hosted git repository.

yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-2.1 by this push:
     new 1ff0f704605 branch-2.1: [case](restore) Rename repo name of 
backup-restore regression cases with suite name (#49535)
1ff0f704605 is described below

commit 1ff0f704605a51ac7f7e3ed61de2329d701e339a
Author: xy720 <[email protected]>
AuthorDate: Thu Mar 27 20:13:30 2025 +0800

    branch-2.1: [case](restore) Rename repo name of backup-restore regression 
cases with suite name (#49535)
    
    ### What problem does this PR solve?
    
    pick:https://github.com/apache/doris/pull/49237
    
    1、Rename the repo of backup restore regression cases with a suite name
    prefix.
    2、Change the maximum length of repo names from 63 to 255
    
    ### Release note
    
    None
    
    ### Check List (For Author)
    
    - Test <!-- At least one of them must be included. -->
        - [x] Regression test
        - [ ] Unit Test
        - [ ] Manual test (add detailed scripts or steps below)
        - [ ] No need to test or manual test. Explain why:
    - [ ] This is a refactor/code format and no logic has been changed.
            - [ ] Previous test can cover this change.
            - [ ] No code files have been changed.
            - [ ] Other reason <!-- Add your reason?  -->
    
    - Behavior changed:
        - [x] No.
        - [ ] Yes. <!-- Explain the behavior change -->
    
    - Does this need documentation?
        - [x] No.
    - [ ] Yes. <!-- Add document PR link here. eg:
    https://github.com/apache/doris-website/pull/1214 -->
    
    ### Check List (For Reviewer who merge this PR)
    
    - [ ] Confirm the release note
    - [ ] Confirm test cases
    - [ ] Confirm document
    - [ ] Add branch pick label <!-- Add branch pick label that this PR
    should merge into -->
---
 .../apache/doris/analysis/AlterRepositoryStmt.java |  2 +-
 .../doris/analysis/CreateRepositoryStmt.java       |  2 +-
 .../java/org/apache/doris/common/FeNameFormat.java | 17 ++++++++++++++++
 .../backup_restore/test_backup_cancelled.groovy    |  2 +-
 .../backup_restore/test_backup_restore.groovy      |  2 +-
 .../test_backup_restore_alias.groovy               |  3 ++-
 .../test_backup_restore_atomic.groovy              |  2 +-
 .../test_backup_restore_atomic_cancel.groovy       |  2 +-
 .../test_backup_restore_atomic_with_alter.groovy   |  2 +-
 .../test_backup_restore_atomic_with_view.groovy    |  2 +-
 ...est_backup_restore_backup_temp_partition.groovy |  2 +-
 .../test_backup_restore_bloom_filter.groovy        |  3 ++-
 .../test_backup_restore_clean_restore.groovy       |  2 +-
 .../backup_restore/test_backup_restore_db.groovy   |  2 +-
 ...t_backup_restore_diff_repo_same_snapshot.groovy | 23 +++++++++++-----------
 ..._backup_restore_dup_without_default_keys.groovy |  3 ++-
 .../test_backup_restore_exclude.groovy             |  2 +-
 ...backup_restore_force_replace_diff_column.groovy |  2 +-
 ...kup_restore_force_replace_diff_part_type.groovy |  2 +-
 ...ckup_restore_force_replace_diff_part_val.groovy |  2 +-
 .../test_backup_restore_inverted_idx.groovy        |  2 +-
 .../test_backup_restore_inverted_index.groovy      |  3 ++-
 .../backup_restore/test_backup_restore_mtmv.groovy |  2 +-
 .../test_backup_restore_multi_tables.groovy        |  2 +-
 ...st_backup_restore_multi_tables_overwrite.groovy |  2 +-
 .../backup_restore/test_backup_restore_mv.groovy   |  2 +-
 .../test_backup_restore_ngram_bloom_filter.groovy  |  2 +-
 .../test_backup_restore_overwrite_indexes.groovy   |  2 +-
 .../test_backup_restore_partition.groovy           |  2 +-
 ..._restore_reserve_dynamic_partition_false.groovy |  3 ++-
 ...p_restore_reserve_dynamic_partition_true.groovy |  3 ++-
 .../test_backup_restore_storage_policy.groovy      |  2 +-
 .../test_backup_restore_table_auto_bucket.groovy   |  3 ++-
 .../test_backup_restore_with_hdfs.groovy           |  2 +-
 ..._backup_restore_with_two_phase_fetch_opt.groovy |  2 +-
 .../test_backup_restore_with_view.groovy           |  2 +-
 .../test_backup_store_with_db_properties.groovy    |  2 +-
 .../test_backup_store_with_db_properties_kv.groovy |  2 +-
 .../test_duplicate_backup_restore.groovy           |  5 +++--
 .../test_restore_mix_exists_and_new_table.groovy   |  2 +-
 .../test_restore_to_new_table.groovy               |  3 ++-
 .../test_unique_backup_restore.groovy              |  5 +++--
 42 files changed, 81 insertions(+), 53 deletions(-)

diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterRepositoryStmt.java 
b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterRepositoryStmt.java
index b0ecd6d3bd4..4893225bf96 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterRepositoryStmt.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterRepositoryStmt.java
@@ -59,7 +59,7 @@ public class AlterRepositoryStmt extends DdlStmt {
         if 
(!Env.getCurrentEnv().getAccessManager().checkGlobalPriv(ConnectContext.get(), 
PrivPredicate.ADMIN)) {
             
ErrorReport.reportAnalysisException(ErrorCode.ERR_SPECIFIC_ACCESS_DENIED_ERROR, 
"ADMIN");
         }
-        FeNameFormat.checkCommonName("repository", name);
+        FeNameFormat.checkRepositoryName(name);
         Map<String, String> copyProperties = new HashMap<>(properties);
         if (copyProperties.size() == 0) {
             throw new UserException("alter repository need contains 
ak/sk/token info of s3.");
diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateRepositoryStmt.java 
b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateRepositoryStmt.java
index 4bd82be73e3..9df740faf42 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateRepositoryStmt.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateRepositoryStmt.java
@@ -70,7 +70,7 @@ public class CreateRepositoryStmt extends DdlStmt {
         if 
(!Env.getCurrentEnv().getAccessManager().checkGlobalPriv(ConnectContext.get(), 
PrivPredicate.ADMIN)) {
             
ErrorReport.reportAnalysisException(ErrorCode.ERR_SPECIFIC_ACCESS_DENIED_ERROR, 
"ADMIN");
         }
-        FeNameFormat.checkCommonName("repository", name);
+        FeNameFormat.checkRepositoryName(name);
     }
 
     @Override
diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/FeNameFormat.java 
b/fe/fe-core/src/main/java/org/apache/doris/common/FeNameFormat.java
index bbc83ee330d..9a99412ab1d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/FeNameFormat.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/FeNameFormat.java
@@ -36,6 +36,7 @@ public class FeNameFormat {
     private static final String TABLE_NAME_REGEX = "^[a-zA-Z][a-zA-Z0-9-_]*$";
     private static final String USER_NAME_REGEX = "^[a-zA-Z][a-zA-Z0-9.-_]*$";
     private static final String COLUMN_NAME_REGEX = 
"^[_a-zA-Z@0-9\\s/][.a-zA-Z0-9_+-/?@#$%^&*\"\\s,:]{0,255}$";
+    private static final String REPOSITORY_NAME_REGEX = 
"^[a-zA-Z][a-zA-Z0-9-_]{0,255}$";
 
     private static final String UNICODE_LABEL_REGEX = 
"^[-_A-Za-z0-9:\\p{L}]{1,128}$";
     private static final String UNICODE_COMMON_NAME_REGEX = 
"^[a-zA-Z\\p{L}][a-zA-Z0-9-_\\p{L}]{0,63}$";
@@ -44,6 +45,7 @@ public class FeNameFormat {
     private static final String UNICODE_USER_NAME_REGEX = 
"^[a-zA-Z\\p{L}][a-zA-Z0-9.-_\\p{L}]*$";
     private static final String UNICODE_COLUMN_NAME_REGEX
             = "^[_a-zA-Z@0-9\\p{L}][.a-zA-Z0-9_+-/?@#$%^&*\\p{L}]{0,255}$";
+    private static final String UNICODE_REPOSITORY_NAME_REGEX = 
"^[a-zA-Z\\p{L}][a-zA-Z0-9-_\\p{L}]{0,255}$";
 
     public static final String FORBIDDEN_PARTITION_NAME = "placeholder_";
 
@@ -152,6 +154,13 @@ public class FeNameFormat {
         }
     }
 
+    public static void checkRepositoryName(String repositoryName) throws 
AnalysisException {
+        final String regex = getRepositoryNameRegex();
+        if (Strings.isNullOrEmpty(repositoryName) || 
!repositoryName.matches(regex)) {
+            
ErrorReport.reportAnalysisException(ErrorCode.ERR_WRONG_NAME_FORMAT, 
"repository", repositoryName, regex);
+        }
+    }
+
     private static boolean isEnableUnicodeNameSupport() {
         boolean unicodeSupport;
         if (ConnectContext.get() != null) {
@@ -209,4 +218,12 @@ public class FeNameFormat {
             return UNDERSCORE_COMMON_NAME_REGEX;
         }
     }
+
+    public static String getRepositoryNameRegex() {
+        if (FeNameFormat.isEnableUnicodeNameSupport()) {
+            return UNICODE_REPOSITORY_NAME_REGEX;
+        } else {
+            return REPOSITORY_NAME_REGEX;
+        }
+    }
 }
diff --git a/regression-test/suites/backup_restore/test_backup_cancelled.groovy 
b/regression-test/suites/backup_restore/test_backup_cancelled.groovy
index 3f419a16a69..ef95d870d18 100644
--- a/regression-test/suites/backup_restore/test_backup_cancelled.groovy
+++ b/regression-test/suites/backup_restore/test_backup_cancelled.groovy
@@ -17,7 +17,7 @@
 
 suite("test_backup_cancelled", "backup_cancelled") {
     String suiteName = "test_backup_cancelled"
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String dbName = "${suiteName}_db"
     String tableName = "${suiteName}_table"
     String snapshotName = "${suiteName}_snapshot"
diff --git a/regression-test/suites/backup_restore/test_backup_restore.groovy 
b/regression-test/suites/backup_restore/test_backup_restore.groovy
index a36d8fce133..75062016517 100644
--- a/regression-test/suites/backup_restore/test_backup_restore.groovy
+++ b/regression-test/suites/backup_restore/test_backup_restore.groovy
@@ -17,7 +17,7 @@
 
 suite("test_backup_restore", "backup_restore") {
     String suiteName = "test_backup_restore"
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String dbName = "${suiteName}_db"
     String tableName = "${suiteName}_table"
     String snapshotName = "${suiteName}_snapshot"
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_alias.groovy 
b/regression-test/suites/backup_restore/test_backup_restore_alias.groovy
index 9e469a2056d..04b1dbd656d 100644
--- a/regression-test/suites/backup_restore/test_backup_restore_alias.groovy
+++ b/regression-test/suites/backup_restore/test_backup_restore_alias.groovy
@@ -16,7 +16,8 @@
 // under the License.
 
 suite("test_backup_restore_alias", "backup_restore") {
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String suiteName = "test_backup_restore_alias"
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String dbName = "backup_restore_alias_db"
     String tableName = "test_backup_restore_alias_table"
     String aliasName = "test_backup_restore_alias_table_alias"
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_atomic.groovy 
b/regression-test/suites/backup_restore/test_backup_restore_atomic.groovy
index 4b87340fb35..1b09ec3f927 100644
--- a/regression-test/suites/backup_restore/test_backup_restore_atomic.groovy
+++ b/regression-test/suites/backup_restore/test_backup_restore_atomic.groovy
@@ -19,7 +19,7 @@ suite("test_backup_restore_atomic", "backup_restore") {
     String suiteName = "test_backup_restore_atomic"
     String dbName = "${suiteName}_db_1"
     String dbName1 = "${suiteName}_db_2"
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String snapshotName = "${suiteName}_snapshot"
     String tableNamePrefix = "${suiteName}_tables"
 
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_atomic_cancel.groovy
 
b/regression-test/suites/backup_restore/test_backup_restore_atomic_cancel.groovy
index 3487c93b0d6..e29adfdd1d9 100644
--- 
a/regression-test/suites/backup_restore/test_backup_restore_atomic_cancel.groovy
+++ 
b/regression-test/suites/backup_restore/test_backup_restore_atomic_cancel.groovy
@@ -17,7 +17,7 @@
 
 suite("test_backup_restore_atomic_cancel") {
     String suiteName = "test_backup_restore_atomic_cancelled"
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String dbName = "${suiteName}_db"
     String tableName = "${suiteName}_table"
     String tableName1 = "${suiteName}_table_1"
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_atomic_with_alter.groovy
 
b/regression-test/suites/backup_restore/test_backup_restore_atomic_with_alter.groovy
index 572e64779c0..2754e5f8af6 100644
--- 
a/regression-test/suites/backup_restore/test_backup_restore_atomic_with_alter.groovy
+++ 
b/regression-test/suites/backup_restore/test_backup_restore_atomic_with_alter.groovy
@@ -23,7 +23,7 @@ suite("test_backup_restore_atomic_with_alter", 
"backup_restore") {
 
     String suiteName = "test_backup_restore_atomic_with_alter"
     String dbName = "${suiteName}_db"
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String snapshotName = "snapshot_" + 
UUID.randomUUID().toString().replace("-", "")
     String tableNamePrefix = "${suiteName}_tables"
 
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_atomic_with_view.groovy
 
b/regression-test/suites/backup_restore/test_backup_restore_atomic_with_view.groovy
index 9d090281364..5d0a6c4490e 100644
--- 
a/regression-test/suites/backup_restore/test_backup_restore_atomic_with_view.groovy
+++ 
b/regression-test/suites/backup_restore/test_backup_restore_atomic_with_view.groovy
@@ -19,7 +19,7 @@ suite("test_backup_restore_atomic_with_view", 
"backup_restore") {
     String suiteName = "backup_restore_atomic_with_view"
     String dbName = "${suiteName}_db"
     String dbName1 = "${suiteName}_db_1"
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String snapshotName = "${suiteName}_snapshot"
     String tableName = "${suiteName}_table"
     String viewName = "${suiteName}_view"
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_backup_temp_partition.groovy
 
b/regression-test/suites/backup_restore/test_backup_restore_backup_temp_partition.groovy
index 8f06ff4eb8b..74ec8841158 100644
--- 
a/regression-test/suites/backup_restore/test_backup_restore_backup_temp_partition.groovy
+++ 
b/regression-test/suites/backup_restore/test_backup_restore_backup_temp_partition.groovy
@@ -17,7 +17,7 @@
 
 suite("test_backup_restore_backup_temp_partition", "backup_restore") {
     String suiteName = "test_backup_restore_backup_temp_partition"
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String dbName = "${suiteName}_db"
     String tableName = "${suiteName}_table"
     String snapshotName = "${suiteName}_snapshot"
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_bloom_filter.groovy 
b/regression-test/suites/backup_restore/test_backup_restore_bloom_filter.groovy
index 70123fdbdfb..64f1becd804 100644
--- 
a/regression-test/suites/backup_restore/test_backup_restore_bloom_filter.groovy
+++ 
b/regression-test/suites/backup_restore/test_backup_restore_bloom_filter.groovy
@@ -16,7 +16,8 @@
 // under the License.
 
 suite("test_backup_restore_bloom_filter", "backup_restore") {
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String suiteName = "test_backup_restore_bloom_filter"
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String dbName = "test_backup_restore_bloom_filter_db"
     String tableName = "test_backup_restore_bloom_filter_table"
 
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_clean_restore.groovy
 
b/regression-test/suites/backup_restore/test_backup_restore_clean_restore.groovy
index 88e07f9e769..3d665bd08b6 100644
--- 
a/regression-test/suites/backup_restore/test_backup_restore_clean_restore.groovy
+++ 
b/regression-test/suites/backup_restore/test_backup_restore_clean_restore.groovy
@@ -18,7 +18,7 @@
 suite("test_backup_restore_clean_restore", "backup_restore") {
     String suiteName = "test_backup_restore_clean_restore"
     String dbName = "${suiteName}_db"
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String snapshotName = "${suiteName}_snapshot"
     String tableNamePrefix = "${suiteName}_tables"
 
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_db.groovy 
b/regression-test/suites/backup_restore/test_backup_restore_db.groovy
index 2cca1356dc5..b881bd2b6f7 100644
--- a/regression-test/suites/backup_restore/test_backup_restore_db.groovy
+++ b/regression-test/suites/backup_restore/test_backup_restore_db.groovy
@@ -18,7 +18,7 @@
 suite("test_backup_restore_db", "backup_restore") {
     String dbName = "backup_restore_db_1"
     String suiteName = "test_backup_restore_db"
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String snapshotName = "${suiteName}_snapshot"
     String tableNamePrefix = "${suiteName}_tables"
 
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_diff_repo_same_snapshot.groovy
 
b/regression-test/suites/backup_restore/test_backup_restore_diff_repo_same_snapshot.groovy
index 07c79e40172..92f90cbe828 100644
--- 
a/regression-test/suites/backup_restore/test_backup_restore_diff_repo_same_snapshot.groovy
+++ 
b/regression-test/suites/backup_restore/test_backup_restore_diff_repo_same_snapshot.groovy
@@ -17,14 +17,15 @@
 
 suite("test_backup_restore_diff_repo_same_snapshot", "backup_restore") {
     String suiteName = "test_backup_restore_diff_repo_same_snapshot"
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String repoName_1 = "${suiteName}_1_repo_" + 
UUID.randomUUID().toString().replace("-", "")
+    String repoName_2 = "${suiteName}_2_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String dbName = "${suiteName}_db"
     String tableName = "${suiteName}_table"
     String snapshotName = "${suiteName}_snapshot"
 
     def syncer = getSyncer()
-    syncer.createS3Repository("${repoName}_1")
-    syncer.createS3Repository("${repoName}_2")
+    syncer.createS3Repository("${repoName_1}")
+    syncer.createS3Repository("${repoName_2}")
 
     sql "CREATE DATABASE IF NOT EXISTS ${dbName}_1"
     sql "CREATE DATABASE IF NOT EXISTS ${dbName}_2"
@@ -61,12 +62,12 @@ suite("test_backup_restore_diff_repo_same_snapshot", 
"backup_restore") {
     // Backup to different repo, with same snapshot name.
     sql """
         BACKUP SNAPSHOT ${dbName}_1.${snapshotName}
-        TO `${repoName}_1`
+        TO `${repoName_1}`
         ON (${tableName}_1)
     """
     sql """
         BACKUP SNAPSHOT ${dbName}_2.${snapshotName}
-        TO `${repoName}_2`
+        TO `${repoName_2}`
         ON (${tableName}_2)
     """
 
@@ -74,13 +75,13 @@ suite("test_backup_restore_diff_repo_same_snapshot", 
"backup_restore") {
     syncer.waitSnapshotFinish("${dbName}_2")
 
     // Restore snapshot from repo_1 to db_1
-    def snapshot = syncer.getSnapshotTimestamp("${repoName}_1", snapshotName)
+    def snapshot = syncer.getSnapshotTimestamp("${repoName_1}", snapshotName)
     assertTrue(snapshot != null)
 
     sql "TRUNCATE TABLE ${dbName}_1.${tableName}_1"
     sql """
         RESTORE SNAPSHOT ${dbName}_1.${snapshotName}
-        FROM `${repoName}_1`
+        FROM `${repoName_1}`
         ON ( `${tableName}_1`)
         PROPERTIES
         (
@@ -95,13 +96,13 @@ suite("test_backup_restore_diff_repo_same_snapshot", 
"backup_restore") {
     assertEquals(result.size(), values.size());
 
     // Restore snapshot from repo_2 to db_2
-    snapshot = syncer.getSnapshotTimestamp("${repoName}_2", snapshotName)
+    snapshot = syncer.getSnapshotTimestamp("${repoName_2}", snapshotName)
     assertTrue(snapshot != null)
 
     sql "TRUNCATE TABLE ${dbName}_2.${tableName}_2"
     sql """
         RESTORE SNAPSHOT ${dbName}_2.${snapshotName}
-        FROM `${repoName}_2`
+        FROM `${repoName_2}`
         ON ( `${tableName}_2`)
         PROPERTIES
         (
@@ -119,7 +120,7 @@ suite("test_backup_restore_diff_repo_same_snapshot", 
"backup_restore") {
     sql "DROP TABLE ${dbName}_2.${tableName}_2 FORCE"
     sql "DROP DATABASE ${dbName}_1 FORCE"
     sql "DROP DATABASE ${dbName}_2 FORCE"
-    sql "DROP REPOSITORY `${repoName}_1`"
-    sql "DROP REPOSITORY `${repoName}_2`"
+    sql "DROP REPOSITORY `${repoName_1}`"
+    sql "DROP REPOSITORY `${repoName_2}`"
 }
 
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_dup_without_default_keys.groovy
 
b/regression-test/suites/backup_restore/test_backup_restore_dup_without_default_keys.groovy
index 99329b2f3cc..31ceddaf3a9 100644
--- 
a/regression-test/suites/backup_restore/test_backup_restore_dup_without_default_keys.groovy
+++ 
b/regression-test/suites/backup_restore/test_backup_restore_dup_without_default_keys.groovy
@@ -16,7 +16,8 @@
 // under the License.
 
 suite("test_backup_restore_dup_without_default_keys", "backup_restore") {
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String suiteName = "test_backup_restore_dup_without_default_keys"
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String dbName = "backup_restore_dup_without_default_keys_db"
     String tableName = "dup_without_keys_table"
 
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_exclude.groovy 
b/regression-test/suites/backup_restore/test_backup_restore_exclude.groovy
index 6993a0ca6fa..12a13b1ee0e 100644
--- a/regression-test/suites/backup_restore/test_backup_restore_exclude.groovy
+++ b/regression-test/suites/backup_restore/test_backup_restore_exclude.groovy
@@ -18,7 +18,7 @@
 suite("test_backup_restore_exclude", "backup_restore") {
     String dbName = "backup_restore_exclude"
     String suiteName = "test_backup_restore_exclude"
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String snapshotName = "${suiteName}_snapshot"
     String tableNamePrefix = "${suiteName}_tables"
 
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_force_replace_diff_column.groovy
 
b/regression-test/suites/backup_restore/test_backup_restore_force_replace_diff_column.groovy
index 79771d218d8..615c5e789f5 100644
--- 
a/regression-test/suites/backup_restore/test_backup_restore_force_replace_diff_column.groovy
+++ 
b/regression-test/suites/backup_restore/test_backup_restore_force_replace_diff_column.groovy
@@ -18,7 +18,7 @@
 suite("test_backup_restore_force_replace_diff_column", "backup_restore") {
     String suiteName = "test_backup_restore_force_replace_diff_column"
     String dbName = "${suiteName}_db_0"
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String snapshotName = "${suiteName}_snapshot_" + System.currentTimeMillis()
     String tableNamePrefix = "${suiteName}_tables"
     String tableName = "${tableNamePrefix}_0"
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_force_replace_diff_part_type.groovy
 
b/regression-test/suites/backup_restore/test_backup_restore_force_replace_diff_part_type.groovy
index f42932de1cd..e2ce12a1856 100644
--- 
a/regression-test/suites/backup_restore/test_backup_restore_force_replace_diff_part_type.groovy
+++ 
b/regression-test/suites/backup_restore/test_backup_restore_force_replace_diff_part_type.groovy
@@ -18,7 +18,7 @@
 suite("test_backup_restore_force_replace_diff_part_type", "backup_restore") {
     String suiteName = "test_backup_restore_force_replace_diff_part_type"
     String dbName = "${suiteName}_db_0"
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String snapshotName = "${suiteName}_snapshot_" + System.currentTimeMillis()
     String tableNamePrefix = "${suiteName}_tables"
     String tableName = "${tableNamePrefix}_0"
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_force_replace_diff_part_val.groovy
 
b/regression-test/suites/backup_restore/test_backup_restore_force_replace_diff_part_val.groovy
index 38b5c10b628..9007a406bd6 100644
--- 
a/regression-test/suites/backup_restore/test_backup_restore_force_replace_diff_part_val.groovy
+++ 
b/regression-test/suites/backup_restore/test_backup_restore_force_replace_diff_part_val.groovy
@@ -18,7 +18,7 @@
 suite("test_backup_restore_force_replace_diff_part_val", "backup_restore") {
     String suiteName = "test_backup_restore_force_replace_diff_part_val"
     String dbName = "${suiteName}_db_0"
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String snapshotName = "${suiteName}_snapshot_" + System.currentTimeMillis()
     String tableNamePrefix = "${suiteName}_tables"
     String tableName = "${tableNamePrefix}_0"
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_inverted_idx.groovy 
b/regression-test/suites/backup_restore/test_backup_restore_inverted_idx.groovy
index 9c5718e3bf7..3ff19ef60a1 100644
--- 
a/regression-test/suites/backup_restore/test_backup_restore_inverted_idx.groovy
+++ 
b/regression-test/suites/backup_restore/test_backup_restore_inverted_idx.groovy
@@ -18,7 +18,7 @@
 suite("test_backup_restore_inverted_idx", "backup_restore") {
     String suiteName = "test_backup_restore_inverted_idx"
     String dbName = "${suiteName}_db"
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String snapshotName = "${suiteName}_snapshot"
     String tableName = "${suiteName}_table"
 
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_inverted_index.groovy
 
b/regression-test/suites/backup_restore/test_backup_restore_inverted_index.groovy
index 5f04407b80c..6e3ad67c3c1 100644
--- 
a/regression-test/suites/backup_restore/test_backup_restore_inverted_index.groovy
+++ 
b/regression-test/suites/backup_restore/test_backup_restore_inverted_index.groovy
@@ -16,7 +16,8 @@
 // under the License.
 
 suite("test_backup_restore_inverted_index", "backup_restore") {
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String suiteName = "test_backup_restore_inverted_index"
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String dbName = "test_backup_restore_inverted_index_db"
     String tableName = "test_backup_restore_inverted_index_table"
 
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_mtmv.groovy 
b/regression-test/suites/backup_restore/test_backup_restore_mtmv.groovy
index 67152b3f56c..339d50f9bb3 100644
--- a/regression-test/suites/backup_restore/test_backup_restore_mtmv.groovy
+++ b/regression-test/suites/backup_restore/test_backup_restore_mtmv.groovy
@@ -17,7 +17,7 @@
 
 suite("test_backup_restore_mtmv", "backup_restore") {
     String suiteName = "test_backup_restore_mtmv"
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String dbName = "${suiteName}_db"
     String tableName = "${suiteName}_table"
     String mvName = "${suiteName}_mv"
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_multi_tables.groovy 
b/regression-test/suites/backup_restore/test_backup_restore_multi_tables.groovy
index 2be39d8eef1..cef4b5d5836 100644
--- 
a/regression-test/suites/backup_restore/test_backup_restore_multi_tables.groovy
+++ 
b/regression-test/suites/backup_restore/test_backup_restore_multi_tables.groovy
@@ -18,7 +18,7 @@
 suite("test_backup_restore_multi_tables", "backup_restore") {
     String dbName = "backup_restore_multi_tables_db"
     String suiteName = "test_backup_restore_multi_tables"
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String snapshotName = "${suiteName}_snapshot"
     String tableNamePrefix = "${suiteName}_tables"
 
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_multi_tables_overwrite.groovy
 
b/regression-test/suites/backup_restore/test_backup_restore_multi_tables_overwrite.groovy
index 9ee5c848aef..0c5294ab7cf 100644
--- 
a/regression-test/suites/backup_restore/test_backup_restore_multi_tables_overwrite.groovy
+++ 
b/regression-test/suites/backup_restore/test_backup_restore_multi_tables_overwrite.groovy
@@ -18,7 +18,7 @@
 suite("test_backup_restore_multi_tables_overwrite", "backup_restore") {
     String dbName = "backup_restore_multi_tables_overwrite_db"
     String suiteName = "test_backup_restore_multi_tables_overwrite"
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String snapshotName = "${suiteName}_snapshot"
     String tableNamePrefix = "${suiteName}_tables"
 
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_mv.groovy 
b/regression-test/suites/backup_restore/test_backup_restore_mv.groovy
index 398b51cc995..bfb69232b1e 100644
--- a/regression-test/suites/backup_restore/test_backup_restore_mv.groovy
+++ b/regression-test/suites/backup_restore/test_backup_restore_mv.groovy
@@ -17,7 +17,7 @@
 
 suite("test_backup_restore_mv", "backup_restore") {
     String suiteName = "test_backup_restore_mv"
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String dbName = "${suiteName}_db"
     String dbName1 = "${suiteName}_db_1"
     String tableName = "${suiteName}_table"
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_ngram_bloom_filter.groovy
 
b/regression-test/suites/backup_restore/test_backup_restore_ngram_bloom_filter.groovy
index 55af0dcad63..b26895465a3 100644
--- 
a/regression-test/suites/backup_restore/test_backup_restore_ngram_bloom_filter.groovy
+++ 
b/regression-test/suites/backup_restore/test_backup_restore_ngram_bloom_filter.groovy
@@ -17,7 +17,7 @@
 
 suite("test_backup_restore_ngram_bloom_filter", "backup_restore") {
     String suiteName = "test_backup_restore_ngram_bloom_filter"
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String dbName = "${suiteName}_db"
     String tableName = "${suiteName}_table"
     String snapshotName = "${suiteName}_snapshot"
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_overwrite_indexes.groovy
 
b/regression-test/suites/backup_restore/test_backup_restore_overwrite_indexes.groovy
index 82344a63041..5a4eca12741 100644
--- 
a/regression-test/suites/backup_restore/test_backup_restore_overwrite_indexes.groovy
+++ 
b/regression-test/suites/backup_restore/test_backup_restore_overwrite_indexes.groovy
@@ -17,7 +17,7 @@
 
 suite("test_backup_restore_overwrite_indexes", "backup_restore") {
     String suiteName = "test_backup_restore_overwrite_indexes"
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String dbName = "${suiteName}_db"
     String newDbName = "${suiteName}_new_db"
     String tableName = "${suiteName}_table"
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_partition.groovy 
b/regression-test/suites/backup_restore/test_backup_restore_partition.groovy
index cf34e8d2750..ac2cfe23b5d 100644
--- a/regression-test/suites/backup_restore/test_backup_restore_partition.groovy
+++ b/regression-test/suites/backup_restore/test_backup_restore_partition.groovy
@@ -18,7 +18,7 @@
 suite("test_backup_restore_partition", "backup_restore") {
     String suiteName = "test_backup_restore_partition"
     String dbName = "${suiteName}_db"
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String snapshotName = "${suiteName}_snapshot"
     String tableName = "${suiteName}_table"
 
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_reserve_dynamic_partition_false.groovy
 
b/regression-test/suites/backup_restore/test_backup_restore_reserve_dynamic_partition_false.groovy
index d222627c21c..b5a8843f1f0 100644
--- 
a/regression-test/suites/backup_restore/test_backup_restore_reserve_dynamic_partition_false.groovy
+++ 
b/regression-test/suites/backup_restore/test_backup_restore_reserve_dynamic_partition_false.groovy
@@ -16,7 +16,8 @@
 // under the License.
 
 suite("test_backup_restore_reserve_dynamic_partition_false", "backup_restore") 
{
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String suiteName = "test_backup_restore_reserve_dynamic_partition_false"
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String dbName = "backup_restore_dynamic_partition_reserve_false_db"
     String tableName = "dynamic_partition_reserve_false_table"
 
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_reserve_dynamic_partition_true.groovy
 
b/regression-test/suites/backup_restore/test_backup_restore_reserve_dynamic_partition_true.groovy
index 6e83d636359..1e32e5a16c2 100644
--- 
a/regression-test/suites/backup_restore/test_backup_restore_reserve_dynamic_partition_true.groovy
+++ 
b/regression-test/suites/backup_restore/test_backup_restore_reserve_dynamic_partition_true.groovy
@@ -16,7 +16,8 @@
 // under the License.
 
 suite("test_backup_restore_dynamic_partition_reserve_true", "backup_restore") {
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String suiteName = "test_backup_restore_dynamic_partition_reserve_true"
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String dbName = "backup_restore_dynamic_partition_reserve_true_db"
     String tableName = "dynamic_partition_reserve_true_table"
 
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_storage_policy.groovy
 
b/regression-test/suites/backup_restore/test_backup_restore_storage_policy.groovy
index 5fb2afdd644..2cf2d68de18 100644
--- 
a/regression-test/suites/backup_restore/test_backup_restore_storage_policy.groovy
+++ 
b/regression-test/suites/backup_restore/test_backup_restore_storage_policy.groovy
@@ -18,7 +18,7 @@
 suite("test_backup_restore_storage_policy", "backup_restore") {
     String suiteName = "test_backup_restore_storage_policy"
     String dbName = "${suiteName}_db"
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String snapshotName = "${suiteName}_snapshot"
     String tableName = "${suiteName}_table"
     def resource_name = "test_backup_restore_storage_policy_resource"
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_table_auto_bucket.groovy
 
b/regression-test/suites/backup_restore/test_backup_restore_table_auto_bucket.groovy
index 9fd56ced133..c01a0388acc 100644
--- 
a/regression-test/suites/backup_restore/test_backup_restore_table_auto_bucket.groovy
+++ 
b/regression-test/suites/backup_restore/test_backup_restore_table_auto_bucket.groovy
@@ -16,7 +16,8 @@
 // under the License.
 
 suite("test_backup_restore_table_auto_bucket", "backup_restore") {
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String suiteName = "test_backup_restore_table_auto_bucket"
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String dbName = "backup_restore_table_with_auto_bucket_db"
     String tableName = "auto_bucket_table"
 
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_with_hdfs.groovy 
b/regression-test/suites/backup_restore/test_backup_restore_with_hdfs.groovy
index 7c39e18a685..4f0d76c19ba 100644
--- a/regression-test/suites/backup_restore/test_backup_restore_with_hdfs.groovy
+++ b/regression-test/suites/backup_restore/test_backup_restore_with_hdfs.groovy
@@ -23,7 +23,7 @@ suite("test_backup_restore_with_hdfs", "backup_restore") {
         return
     }
 
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String dbName = "${suiteName}_db"
     String tableName = "${suiteName}_table"
     String snapshotName = "${suiteName}_snapshot"
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_with_two_phase_fetch_opt.groovy
 
b/regression-test/suites/backup_restore/test_backup_restore_with_two_phase_fetch_opt.groovy
index 32f7c4046f7..0f6d735a31d 100644
--- 
a/regression-test/suites/backup_restore/test_backup_restore_with_two_phase_fetch_opt.groovy
+++ 
b/regression-test/suites/backup_restore/test_backup_restore_with_two_phase_fetch_opt.groovy
@@ -17,7 +17,7 @@
 
 suite("test_backup_restore_with_two_phase_fetch_opt", "backup_restore") {
     String suiteName = "test_backup_restore_with_two_phase_fetch_opt"
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String dbName = "${suiteName}_db"
     String tableName = "${suiteName}_table"
     String snapshotName = "${suiteName}_snapshot"
diff --git 
a/regression-test/suites/backup_restore/test_backup_restore_with_view.groovy 
b/regression-test/suites/backup_restore/test_backup_restore_with_view.groovy
index c26f2a4b32e..eae59f33df2 100644
--- a/regression-test/suites/backup_restore/test_backup_restore_with_view.groovy
+++ b/regression-test/suites/backup_restore/test_backup_restore_with_view.groovy
@@ -19,7 +19,7 @@ suite("test_backup_restore_with_view", "backup_restore") {
     String suiteName = "backup_restore_with_view"
     String dbName = "${suiteName}_db"
     String dbName1 = "${suiteName}_db_1"
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String snapshotName = "${suiteName}_snapshot"
     String tableName = "${suiteName}_table"
     String viewName = "${suiteName}_view"
diff --git 
a/regression-test/suites/backup_restore/test_backup_store_with_db_properties.groovy
 
b/regression-test/suites/backup_restore/test_backup_store_with_db_properties.groovy
index 7871d304b29..b6cc65716fb 100644
--- 
a/regression-test/suites/backup_restore/test_backup_store_with_db_properties.groovy
+++ 
b/regression-test/suites/backup_restore/test_backup_store_with_db_properties.groovy
@@ -18,7 +18,7 @@
 suite("test_backup_store_with_db_properties","backup_restore") {
     String dbName = "test_backup_store_with_db_properties_db"
     String suiteName = "test_backup_store_with_db_properties"
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String snapshotName = "${suiteName}_snapshot"
     String tableNamePrefix = "${suiteName}"
 
diff --git 
a/regression-test/suites/backup_restore/test_backup_store_with_db_properties_kv.groovy
 
b/regression-test/suites/backup_restore/test_backup_store_with_db_properties_kv.groovy
index 28982f9eac0..4d39c3eca51 100644
--- 
a/regression-test/suites/backup_restore/test_backup_store_with_db_properties_kv.groovy
+++ 
b/regression-test/suites/backup_restore/test_backup_store_with_db_properties_kv.groovy
@@ -18,7 +18,7 @@
 suite("test_backup_store_with_db_properties_kv","backup_restore") {
     String dbName = "test_backup_store_with_db_properties_kv_db"
     String suiteName = "test_backup_store_with_db_properties_kv"
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String snapshotName = "${suiteName}_snapshot"
     String tableNamePrefix = "${suiteName}"
 
diff --git 
a/regression-test/suites/backup_restore/test_duplicate_backup_restore.groovy 
b/regression-test/suites/backup_restore/test_duplicate_backup_restore.groovy
index d182a9b04fa..8b66326f4bc 100644
--- a/regression-test/suites/backup_restore/test_duplicate_backup_restore.groovy
+++ b/regression-test/suites/backup_restore/test_duplicate_backup_restore.groovy
@@ -16,7 +16,8 @@
 // under the License.
 
 suite("test_duplicate_backup_restore", "backup_restore") {
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String suiteName = "test_duplicate_backup_restore"
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String dbName = "duplicate_backup_restore_db"
     String tableName = "test_duplicate_backup_restore_table"
 
@@ -81,7 +82,7 @@ suite("test_duplicate_backup_restore", "backup_restore") {
     sql "DELETE FROM ${dbName}.${tableName} WHERE id = 1"
     result = sql "SELECT * FROM ${dbName}.${tableName}"
     assertEquals(result.size(), values.size() + 5 - 3)
-    repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    repoName = "${suiteName}_delete_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     syncer.createS3Repository(repoName)
     snapshotName = "test_duplicate_delete_backup_restore_snapshot"
     sql """
diff --git 
a/regression-test/suites/backup_restore/test_restore_mix_exists_and_new_table.groovy
 
b/regression-test/suites/backup_restore/test_restore_mix_exists_and_new_table.groovy
index b1cc9136b25..04cc70453d3 100644
--- 
a/regression-test/suites/backup_restore/test_restore_mix_exists_and_new_table.groovy
+++ 
b/regression-test/suites/backup_restore/test_restore_mix_exists_and_new_table.groovy
@@ -18,7 +18,7 @@
 suite("test_restore_mix_exists_and_new_table", "backup_restore") {
     String dbName = "restore_mix_exists_and_new_table"
     String suiteName = "test_restore_mix_exists_and_new_table"
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String snapshotName = "${suiteName}_snapshot"
     String tableNamePrefix = "${suiteName}_tables"
 
diff --git 
a/regression-test/suites/backup_restore/test_restore_to_new_table.groovy 
b/regression-test/suites/backup_restore/test_restore_to_new_table.groovy
index 915afb0bcde..48b80f0eac1 100644
--- a/regression-test/suites/backup_restore/test_restore_to_new_table.groovy
+++ b/regression-test/suites/backup_restore/test_restore_to_new_table.groovy
@@ -16,7 +16,8 @@
 // under the License.
 
 suite("test_restore_to_new_table", "backup_restore") {
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String suiteName = "test_restore_to_new_table"
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String dbName = "restore_to_new_table_db"
     String tableName = "test_restore_to_new_table_table"
     String snapshotName = "test_backup_restore_snapshot"
diff --git 
a/regression-test/suites/backup_restore/test_unique_backup_restore.groovy 
b/regression-test/suites/backup_restore/test_unique_backup_restore.groovy
index 24ae396d331..b1d6ccbf7f8 100644
--- a/regression-test/suites/backup_restore/test_unique_backup_restore.groovy
+++ b/regression-test/suites/backup_restore/test_unique_backup_restore.groovy
@@ -16,7 +16,8 @@
 // under the License.
 
 suite("test_unique_backup_restore", "backup_restore") {
-    String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    String suiteName = "test_unique_backup_restore"
+    String repoName = "${suiteName}_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     String dbName = "unique_backup_restore_db"
     String tableName = "test_unique_backup_restore_table"
 
@@ -81,7 +82,7 @@ suite("test_unique_backup_restore", "backup_restore") {
     sql "DELETE FROM ${dbName}.${tableName} WHERE id = 1"
     result = sql "SELECT * FROM ${dbName}.${tableName}"
     assertEquals(result.size(), 1)
-    repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+    repoName = "${suiteName}_delete_repo_" + 
UUID.randomUUID().toString().replace("-", "")
     syncer.createS3Repository(repoName)
     snapshotName = "test_unique_delete_backup_restore_snapshot"
     sql """


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]


Reply via email to