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

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


The following commit(s) were added to refs/heads/branch-3.0 by this push:
     new baa6e478ca0 [improvement](test)aovid cluster contain keyword that will 
make grant… (#47061)
baa6e478ca0 is described below

commit baa6e478ca03df280a993aa6a069722f83c42b6a
Author: chunping <zhangchunp...@selectdb.com>
AuthorDate: Thu Jan 16 17:29:05 2025 +0800

    [improvement](test)aovid cluster contain keyword that will make grant… 
(#47061)
---
 .../suites/account_p0/test_nereids_authentication.groovy         | 2 +-
 regression-test/suites/account_p0/test_nereids_row_policy.groovy | 4 ++--
 .../suites/auth_call/test_account_management_grant_auth.groovy   | 2 +-
 .../suites/auth_call/test_account_management_role_auth.groovy    | 2 +-
 .../suites/auth_call/test_account_management_user_auth.groovy    | 2 +-
 .../suites/auth_call/test_assistant_command_auth.groovy          | 2 +-
 .../suites/auth_call/test_cluster_management_auth.groovy         | 2 +-
 .../suites/auth_call/test_database_management_auth.groovy        | 2 +-
 regression-test/suites/auth_call/test_ddl_catalog_auth.groovy    | 2 +-
 regression-test/suites/auth_call/test_ddl_database_auth.groovy   | 2 +-
 regression-test/suites/auth_call/test_ddl_encryptkey_auth.groovy | 2 +-
 regression-test/suites/auth_call/test_ddl_file_auth.groovy       | 2 +-
 regression-test/suites/auth_call/test_ddl_function_auth.groovy   | 2 +-
 regression-test/suites/auth_call/test_ddl_index_auth.groovy      | 2 +-
 regression-test/suites/auth_call/test_ddl_job_auth.groovy        | 2 +-
 regression-test/suites/auth_call/test_ddl_mask_view_auth.groovy  | 2 +-
 regression-test/suites/auth_call/test_ddl_mtmv_auth.groovy       | 2 +-
 regression-test/suites/auth_call/test_ddl_mv_auth.groovy         | 2 +-
 regression-test/suites/auth_call/test_ddl_part_table_auth.groovy | 2 +-
 regression-test/suites/auth_call/test_ddl_row_policy_auth.groovy | 2 +-
 .../suites/auth_call/test_ddl_sql_block_rule_auth.groovy         | 2 +-
 regression-test/suites/auth_call/test_ddl_table_auth.groovy      | 2 +-
 regression-test/suites/auth_call/test_ddl_view_auth.groovy       | 2 +-
 regression-test/suites/auth_call/test_dml_analyze_auth.groovy    | 2 +-
 .../suites/auth_call/test_dml_broker_load_auth.groovy            | 2 +-
 .../suites/auth_call/test_dml_cancel_profile_auth.groovy         | 2 +-
 .../suites/auth_call/test_dml_delete_table_auth.groovy           | 2 +-
 .../suites/auth_call/test_dml_export_table_auth.groovy           | 2 +-
 regression-test/suites/auth_call/test_dml_insert_auth.groovy     | 2 +-
 .../suites/auth_call/test_dml_multi_routine_load_auth.groovy     | 2 +-
 regression-test/suites/auth_call/test_dml_mysql_load_auth.groovy | 2 +-
 regression-test/suites/auth_call/test_dml_outfile_auth.groovy    | 2 +-
 .../suites/auth_call/test_dml_routine_load_auth.groovy           | 2 +-
 regression-test/suites/auth_call/test_dml_select_udf_auth.groovy | 2 +-
 .../suites/auth_call/test_dml_stream_load_auth.groovy            | 2 +-
 .../suites/auth_call/test_dml_update_table_auth.groovy           | 2 +-
 .../suites/auth_call/test_grant_show_view_priv_auth.groovy       | 2 +-
 regression-test/suites/auth_call/test_hive_base_case_auth.groovy | 2 +-
 regression-test/suites/auth_call/test_show_backend_auth.groovy   | 2 +-
 regression-test/suites/auth_call/test_show_broker_auth.groovy    | 2 +-
 regression-test/suites/auth_call/test_show_charset_auth.groovy   | 2 +-
 .../suites/auth_call/test_show_convert_light_sc_auth.groovy      | 2 +-
 .../suites/auth_call/test_show_create_table_auth.groovy          | 2 +-
 regression-test/suites/auth_call/test_show_data_auth.groovy      | 2 +-
 .../suites/auth_call/test_show_database_id_auth.groovy           | 2 +-
 .../suites/auth_call/test_show_dynamic_table_auth.groovy         | 2 +-
 regression-test/suites/auth_call/test_show_frontend_auth.groovy  | 2 +-
 regression-test/suites/auth_call/test_show_grant_auth.groovy     | 2 +-
 regression-test/suites/auth_call/test_show_proc_auth.groovy      | 2 +-
 .../suites/auth_call/test_show_query_stats_auth.groovy           | 2 +-
 regression-test/suites/auth_call/test_show_tablet_auth.groovy    | 2 +-
 regression-test/suites/auth_call/test_show_typecast_auth.groovy  | 2 +-
 regression-test/suites/auth_p0/test_catalogs_auth.groovy         | 2 +-
 .../suites/auth_p0/test_master_slave_consistency_auth.groovy     | 2 +-
 regression-test/suites/auth_p0/test_mtmv_auth.groovy             | 2 +-
 .../suites/auth_p0/test_partition_values_tvf_auth.groovy         | 2 +-
 regression-test/suites/auth_p0/test_partitions_auth.groovy       | 2 +-
 regression-test/suites/auth_p0/test_query_tvf_auth.groovy        | 2 +-
 regression-test/suites/auth_p0/test_select_column_auth.groovy    | 2 +-
 regression-test/suites/auth_p0/test_select_count_auth.groovy     | 2 +-
 regression-test/suites/auth_p0/test_select_view_auth.groovy      | 2 +-
 regression-test/suites/auth_p0/test_use_encryptkey_auth.groovy   | 2 +-
 regression-test/suites/auth_up_down_p0/load.groovy               | 4 ++--
 .../suites/external_table_p0/jdbc/test_jdbc_call.groovy          | 4 ++--
 .../external_table_p0/lower_case/test_conflict_name.groovy       | 9 +++++++++
 .../lower_case/test_lower_case_meta_include.groovy               | 9 +++++++++
 .../lower_case/test_lower_case_meta_show_and_select.groovy       | 9 +++++++++
 .../test_lower_case_meta_with_lower_table_conf_grant.groovy      | 4 ++--
 ..._lower_case_meta_with_lower_table_conf_show_and_select.groovy | 9 +++++++++
 .../external_table_p0/lower_case/test_lower_case_mtmv.groovy     | 9 +++++++++
 .../lower_case/test_meta_cache_select_without_refresh.groovy     | 9 +++++++++
 .../external_table_p0/lower_case/test_meta_names_mapping.groovy  | 9 +++++++++
 .../lower_case/test_timing_refresh_catalog.groovy                | 9 +++++++++
 .../suites/external_table_p0/lower_case/upgrade/load.groovy      | 9 +++++++++
 .../tvf/test_insert_from_tvf_with_common_user.groovy             | 2 +-
 .../external_table_p0/tvf/test_s3_tvf_with_resource.groovy       | 2 +-
 .../suites/external_table_p2/tvf/test_iceberg_meta.groovy        | 2 +-
 regression-test/suites/javaudf_p0/test_javaudf_auth.groovy       | 2 +-
 .../load_p0/routine_load/test_routine_load_with_user.groovy      | 2 +-
 .../suites/load_p0/stream_load/test_stream_load.groovy           | 2 +-
 .../load_p0/stream_load/test_stream_load_move_memtable.groovy    | 2 +-
 regression-test/suites/manager/test_manager_interface_3.groovy   | 8 ++++----
 .../suites/nereids_p0/authorization/column_authorization.groovy  | 2 +-
 .../suites/nereids_p0/authorization/view_authorization.groovy    | 2 +-
 .../suites/nereids_p0/cache/parse_sql_from_sql_cache.groovy      | 8 ++++----
 .../suites/nereids_p0/insert_into_table/insert_auth.groovy       | 2 +-
 .../suites/query_p0/system/test_partitions_schema.groovy         | 2 +-
 regression-test/suites/query_p0/system/test_table_options.groovy | 2 +-
 .../suites/query_p0/system/test_table_properties.groovy          | 2 +-
 regression-test/suites/query_p0/test_row_policy.groovy           | 2 +-
 regression-test/suites/workload_manager_p0/test_curd_wlg.groovy  | 4 ++--
 91 files changed, 174 insertions(+), 93 deletions(-)

diff --git 
a/regression-test/suites/account_p0/test_nereids_authentication.groovy 
b/regression-test/suites/account_p0/test_nereids_authentication.groovy
index c2ee5f12e8c..4b8c644495c 100644
--- a/regression-test/suites/account_p0/test_nereids_authentication.groovy
+++ b/regression-test/suites/account_p0/test_nereids_authentication.groovy
@@ -49,7 +49,7 @@ suite("test_nereids_authentication", "query") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
     
     def tokens = context.config.jdbcUrl.split('/')
diff --git a/regression-test/suites/account_p0/test_nereids_row_policy.groovy 
b/regression-test/suites/account_p0/test_nereids_row_policy.groovy
index 38426dc09e6..4463a41c90b 100644
--- a/regression-test/suites/account_p0/test_nereids_row_policy.groovy
+++ b/regression-test/suites/account_p0/test_nereids_row_policy.groovy
@@ -28,7 +28,7 @@ suite("test_nereids_row_policy") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     def assertQueryResult = { size ->
@@ -88,7 +88,7 @@ suite("test_nereids_row_policy") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     dropPolciy "policy0"
diff --git 
a/regression-test/suites/auth_call/test_account_management_grant_auth.groovy 
b/regression-test/suites/auth_call/test_account_management_grant_auth.groovy
index eff62e64f88..a1e1f68916f 100644
--- a/regression-test/suites/auth_call/test_account_management_grant_auth.groovy
+++ b/regression-test/suites/auth_call/test_account_management_grant_auth.groovy
@@ -31,7 +31,7 @@ suite("test_account_management_grant_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
     
     try_sql("DROP USER ${user}")
diff --git 
a/regression-test/suites/auth_call/test_account_management_role_auth.groovy 
b/regression-test/suites/auth_call/test_account_management_role_auth.groovy
index c3b27810081..dab9596b8c2 100644
--- a/regression-test/suites/auth_call/test_account_management_role_auth.groovy
+++ b/regression-test/suites/auth_call/test_account_management_role_auth.groovy
@@ -32,7 +32,7 @@ suite("test_account_management_role_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git 
a/regression-test/suites/auth_call/test_account_management_user_auth.groovy 
b/regression-test/suites/auth_call/test_account_management_user_auth.groovy
index fe6d6805f47..9cbb489615b 100644
--- a/regression-test/suites/auth_call/test_account_management_user_auth.groovy
+++ b/regression-test/suites/auth_call/test_account_management_user_auth.groovy
@@ -30,7 +30,7 @@ suite("test_account_management_user_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git 
a/regression-test/suites/auth_call/test_assistant_command_auth.groovy 
b/regression-test/suites/auth_call/test_assistant_command_auth.groovy
index 1b47e566ff3..ba539f129d7 100644
--- a/regression-test/suites/auth_call/test_assistant_command_auth.groovy
+++ b/regression-test/suites/auth_call/test_assistant_command_auth.groovy
@@ -31,7 +31,7 @@ suite("test_assistant_command_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git 
a/regression-test/suites/auth_call/test_cluster_management_auth.groovy 
b/regression-test/suites/auth_call/test_cluster_management_auth.groovy
index 2061b9dbca7..f769f29c967 100644
--- a/regression-test/suites/auth_call/test_cluster_management_auth.groovy
+++ b/regression-test/suites/auth_call/test_cluster_management_auth.groovy
@@ -66,7 +66,7 @@ suite 
("test_cluster_management_auth","nonConcurrent,p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git 
a/regression-test/suites/auth_call/test_database_management_auth.groovy 
b/regression-test/suites/auth_call/test_database_management_auth.groovy
index c8db5036272..cbf979abc1e 100644
--- a/regression-test/suites/auth_call/test_database_management_auth.groovy
+++ b/regression-test/suites/auth_call/test_database_management_auth.groovy
@@ -29,7 +29,7 @@ suite("test_database_management_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_ddl_catalog_auth.groovy 
b/regression-test/suites/auth_call/test_ddl_catalog_auth.groovy
index 80f71a2e16f..8d6b31d35c9 100644
--- a/regression-test/suites/auth_call/test_ddl_catalog_auth.groovy
+++ b/regression-test/suites/auth_call/test_ddl_catalog_auth.groovy
@@ -29,7 +29,7 @@ suite("test_ddl_catalog_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     sql """create catalog if not exists ${catalogNameOther} properties (
diff --git a/regression-test/suites/auth_call/test_ddl_database_auth.groovy 
b/regression-test/suites/auth_call/test_ddl_database_auth.groovy
index 2821a375ddb..bdcf5ff7c39 100644
--- a/regression-test/suites/auth_call/test_ddl_database_auth.groovy
+++ b/regression-test/suites/auth_call/test_ddl_database_auth.groovy
@@ -30,7 +30,7 @@ suite("test_ddl_database_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_ddl_encryptkey_auth.groovy 
b/regression-test/suites/auth_call/test_ddl_encryptkey_auth.groovy
index 0749bdab717..dfa469bfce0 100644
--- a/regression-test/suites/auth_call/test_ddl_encryptkey_auth.groovy
+++ b/regression-test/suites/auth_call/test_ddl_encryptkey_auth.groovy
@@ -28,7 +28,7 @@ suite("test_ddl_encryptkey_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_ddl_file_auth.groovy 
b/regression-test/suites/auth_call/test_ddl_file_auth.groovy
index ff4dd4b4a18..2cc60473406 100644
--- a/regression-test/suites/auth_call/test_ddl_file_auth.groovy
+++ b/regression-test/suites/auth_call/test_ddl_file_auth.groovy
@@ -28,7 +28,7 @@ suite("test_ddl_file_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_ddl_function_auth.groovy 
b/regression-test/suites/auth_call/test_ddl_function_auth.groovy
index 2fa524bf424..a2e38f0eb6d 100644
--- a/regression-test/suites/auth_call/test_ddl_function_auth.groovy
+++ b/regression-test/suites/auth_call/test_ddl_function_auth.groovy
@@ -28,7 +28,7 @@ suite("test_ddl_function_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_ddl_index_auth.groovy 
b/regression-test/suites/auth_call/test_ddl_index_auth.groovy
index 53ba3a0d4b3..61a727923be 100644
--- a/regression-test/suites/auth_call/test_ddl_index_auth.groovy
+++ b/regression-test/suites/auth_call/test_ddl_index_auth.groovy
@@ -58,7 +58,7 @@ suite("test_ddl_index_auth","p0,auth_call") {
         logger.info("cluster:" + clusters)
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
     sql """create database ${dbName}"""
     sql """
diff --git a/regression-test/suites/auth_call/test_ddl_job_auth.groovy 
b/regression-test/suites/auth_call/test_ddl_job_auth.groovy
index 45798191e48..ef758026377 100644
--- a/regression-test/suites/auth_call/test_ddl_job_auth.groovy
+++ b/regression-test/suites/auth_call/test_ddl_job_auth.groovy
@@ -30,7 +30,7 @@ suite("test_ddl_job_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_ddl_mask_view_auth.groovy 
b/regression-test/suites/auth_call/test_ddl_mask_view_auth.groovy
index 590e75781f1..4a8bc2787dc 100644
--- a/regression-test/suites/auth_call/test_ddl_mask_view_auth.groovy
+++ b/regression-test/suites/auth_call/test_ddl_mask_view_auth.groovy
@@ -29,7 +29,7 @@ suite("test_ddl_mask_view_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_ddl_mtmv_auth.groovy 
b/regression-test/suites/auth_call/test_ddl_mtmv_auth.groovy
index 4db2177ee6c..160b6b840b0 100644
--- a/regression-test/suites/auth_call/test_ddl_mtmv_auth.groovy
+++ b/regression-test/suites/auth_call/test_ddl_mtmv_auth.groovy
@@ -30,7 +30,7 @@ suite("test_ddl_mtmv_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_ddl_mv_auth.groovy 
b/regression-test/suites/auth_call/test_ddl_mv_auth.groovy
index 4dbf54fdf0d..92ec1d9eae0 100644
--- a/regression-test/suites/auth_call/test_ddl_mv_auth.groovy
+++ b/regression-test/suites/auth_call/test_ddl_mv_auth.groovy
@@ -30,7 +30,7 @@ suite("test_ddl_mv_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_ddl_part_table_auth.groovy 
b/regression-test/suites/auth_call/test_ddl_part_table_auth.groovy
index 34e4766e19e..5217dc2d051 100644
--- a/regression-test/suites/auth_call/test_ddl_part_table_auth.groovy
+++ b/regression-test/suites/auth_call/test_ddl_part_table_auth.groovy
@@ -28,7 +28,7 @@ suite("test_ddl_part_table_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_ddl_row_policy_auth.groovy 
b/regression-test/suites/auth_call/test_ddl_row_policy_auth.groovy
index af1e074f8d7..f9ac109f7f3 100644
--- a/regression-test/suites/auth_call/test_ddl_row_policy_auth.groovy
+++ b/regression-test/suites/auth_call/test_ddl_row_policy_auth.groovy
@@ -29,7 +29,7 @@ suite("test_ddl_row_policy_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git 
a/regression-test/suites/auth_call/test_ddl_sql_block_rule_auth.groovy 
b/regression-test/suites/auth_call/test_ddl_sql_block_rule_auth.groovy
index 3941897a5e9..568ea9723d5 100644
--- a/regression-test/suites/auth_call/test_ddl_sql_block_rule_auth.groovy
+++ b/regression-test/suites/auth_call/test_ddl_sql_block_rule_auth.groovy
@@ -29,7 +29,7 @@ suite("test_ddl_sql_block_rule_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_ddl_table_auth.groovy 
b/regression-test/suites/auth_call/test_ddl_table_auth.groovy
index c96aeb0d5e2..47ac4e07abc 100644
--- a/regression-test/suites/auth_call/test_ddl_table_auth.groovy
+++ b/regression-test/suites/auth_call/test_ddl_table_auth.groovy
@@ -33,7 +33,7 @@ suite("test_ddl_table_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_ddl_view_auth.groovy 
b/regression-test/suites/auth_call/test_ddl_view_auth.groovy
index 05f263ada20..1a915acdb3c 100644
--- a/regression-test/suites/auth_call/test_ddl_view_auth.groovy
+++ b/regression-test/suites/auth_call/test_ddl_view_auth.groovy
@@ -29,7 +29,7 @@ suite("test_ddl_view_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_dml_analyze_auth.groovy 
b/regression-test/suites/auth_call/test_dml_analyze_auth.groovy
index 59706f140e6..8bc6a070d61 100644
--- a/regression-test/suites/auth_call/test_dml_analyze_auth.groovy
+++ b/regression-test/suites/auth_call/test_dml_analyze_auth.groovy
@@ -30,7 +30,7 @@ suite("test_dml_analyze_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_dml_broker_load_auth.groovy 
b/regression-test/suites/auth_call/test_dml_broker_load_auth.groovy
index 3ec26146699..0ea44241bfa 100644
--- a/regression-test/suites/auth_call/test_dml_broker_load_auth.groovy
+++ b/regression-test/suites/auth_call/test_dml_broker_load_auth.groovy
@@ -42,7 +42,7 @@ suite("test_dml_broker_load_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git 
a/regression-test/suites/auth_call/test_dml_cancel_profile_auth.groovy 
b/regression-test/suites/auth_call/test_dml_cancel_profile_auth.groovy
index 6aab08b9337..0b4d05ef88c 100644
--- a/regression-test/suites/auth_call/test_dml_cancel_profile_auth.groovy
+++ b/regression-test/suites/auth_call/test_dml_cancel_profile_auth.groovy
@@ -28,7 +28,7 @@ 
suite("test_dml_cancel_profile_auth","p0,auth_call,nonConcurrent") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_dml_delete_table_auth.groovy 
b/regression-test/suites/auth_call/test_dml_delete_table_auth.groovy
index ed1c11e7754..bda3059157c 100644
--- a/regression-test/suites/auth_call/test_dml_delete_table_auth.groovy
+++ b/regression-test/suites/auth_call/test_dml_delete_table_auth.groovy
@@ -30,7 +30,7 @@ suite("test_dml_delete_table_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_dml_export_table_auth.groovy 
b/regression-test/suites/auth_call/test_dml_export_table_auth.groovy
index 12812fdf0dd..ee5674c940a 100644
--- a/regression-test/suites/auth_call/test_dml_export_table_auth.groovy
+++ b/regression-test/suites/auth_call/test_dml_export_table_auth.groovy
@@ -36,7 +36,7 @@ suite("test_dml_export_table_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_dml_insert_auth.groovy 
b/regression-test/suites/auth_call/test_dml_insert_auth.groovy
index 6cfe66cb10c..5b8a20e18f9 100644
--- a/regression-test/suites/auth_call/test_dml_insert_auth.groovy
+++ b/regression-test/suites/auth_call/test_dml_insert_auth.groovy
@@ -31,7 +31,7 @@ suite("test_dml_insert_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git 
a/regression-test/suites/auth_call/test_dml_multi_routine_load_auth.groovy 
b/regression-test/suites/auth_call/test_dml_multi_routine_load_auth.groovy
index 11fd6c43db4..5b8ecef7e57 100644
--- a/regression-test/suites/auth_call/test_dml_multi_routine_load_auth.groovy
+++ b/regression-test/suites/auth_call/test_dml_multi_routine_load_auth.groovy
@@ -34,7 +34,7 @@ suite("test_dml_multi_routine_load_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_dml_mysql_load_auth.groovy 
b/regression-test/suites/auth_call/test_dml_mysql_load_auth.groovy
index 3963fe9433e..97151a0d001 100644
--- a/regression-test/suites/auth_call/test_dml_mysql_load_auth.groovy
+++ b/regression-test/suites/auth_call/test_dml_mysql_load_auth.groovy
@@ -30,7 +30,7 @@ suite("test_dml_mysql_load_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_dml_outfile_auth.groovy 
b/regression-test/suites/auth_call/test_dml_outfile_auth.groovy
index 7edf476883a..5f4096344b8 100644
--- a/regression-test/suites/auth_call/test_dml_outfile_auth.groovy
+++ b/regression-test/suites/auth_call/test_dml_outfile_auth.groovy
@@ -34,7 +34,7 @@ suite("test_dml_outfile_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_dml_routine_load_auth.groovy 
b/regression-test/suites/auth_call/test_dml_routine_load_auth.groovy
index db6698b01af..025ac555356 100644
--- a/regression-test/suites/auth_call/test_dml_routine_load_auth.groovy
+++ b/regression-test/suites/auth_call/test_dml_routine_load_auth.groovy
@@ -33,7 +33,7 @@ suite("test_dml_routine_load_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_dml_select_udf_auth.groovy 
b/regression-test/suites/auth_call/test_dml_select_udf_auth.groovy
index b2f565fc02e..6aa74784969 100644
--- a/regression-test/suites/auth_call/test_dml_select_udf_auth.groovy
+++ b/regression-test/suites/auth_call/test_dml_select_udf_auth.groovy
@@ -34,7 +34,7 @@ suite("test_dml_select_udf_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_dml_stream_load_auth.groovy 
b/regression-test/suites/auth_call/test_dml_stream_load_auth.groovy
index 1a01f68d5b9..69aa863073b 100644
--- a/regression-test/suites/auth_call/test_dml_stream_load_auth.groovy
+++ b/regression-test/suites/auth_call/test_dml_stream_load_auth.groovy
@@ -29,7 +29,7 @@ suite("test_dml_stream_load_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_dml_update_table_auth.groovy 
b/regression-test/suites/auth_call/test_dml_update_table_auth.groovy
index 153dad5026a..eb258df2df2 100644
--- a/regression-test/suites/auth_call/test_dml_update_table_auth.groovy
+++ b/regression-test/suites/auth_call/test_dml_update_table_auth.groovy
@@ -30,7 +30,7 @@ suite("test_dml_update_table_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git 
a/regression-test/suites/auth_call/test_grant_show_view_priv_auth.groovy 
b/regression-test/suites/auth_call/test_grant_show_view_priv_auth.groovy
index 3a736fe4703..c05da39ce2e 100644
--- a/regression-test/suites/auth_call/test_grant_show_view_priv_auth.groovy
+++ b/regression-test/suites/auth_call/test_grant_show_view_priv_auth.groovy
@@ -32,7 +32,7 @@ suite("test_grant_show_view_priv_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_hive_base_case_auth.groovy 
b/regression-test/suites/auth_call/test_hive_base_case_auth.groovy
index 271015bec7c..0fb0d422ebd 100644
--- a/regression-test/suites/auth_call/test_hive_base_case_auth.groovy
+++ b/regression-test/suites/auth_call/test_hive_base_case_auth.groovy
@@ -29,7 +29,7 @@ suite("test_hive_base_case_auth", "p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     String enabled = context.config.otherConfigs.get("enableHiveTest")
diff --git a/regression-test/suites/auth_call/test_show_backend_auth.groovy 
b/regression-test/suites/auth_call/test_show_backend_auth.groovy
index adccf3637e6..13e1fa4fbe4 100644
--- a/regression-test/suites/auth_call/test_show_backend_auth.groovy
+++ b/regression-test/suites/auth_call/test_show_backend_auth.groovy
@@ -26,7 +26,7 @@ suite("test_show_backend_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_show_broker_auth.groovy 
b/regression-test/suites/auth_call/test_show_broker_auth.groovy
index d8fa9bd10eb..a364ad5b331 100644
--- a/regression-test/suites/auth_call/test_show_broker_auth.groovy
+++ b/regression-test/suites/auth_call/test_show_broker_auth.groovy
@@ -26,7 +26,7 @@ suite("test_show_broker_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_show_charset_auth.groovy 
b/regression-test/suites/auth_call/test_show_charset_auth.groovy
index 3ca23f7f6be..14991bc99f9 100644
--- a/regression-test/suites/auth_call/test_show_charset_auth.groovy
+++ b/regression-test/suites/auth_call/test_show_charset_auth.groovy
@@ -27,7 +27,7 @@ suite("test_show_no_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git 
a/regression-test/suites/auth_call/test_show_convert_light_sc_auth.groovy 
b/regression-test/suites/auth_call/test_show_convert_light_sc_auth.groovy
index d54862f1710..6f8387d8929 100644
--- a/regression-test/suites/auth_call/test_show_convert_light_sc_auth.groovy
+++ b/regression-test/suites/auth_call/test_show_convert_light_sc_auth.groovy
@@ -26,7 +26,7 @@ suite("test_show_convert_light_sc_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git 
a/regression-test/suites/auth_call/test_show_create_table_auth.groovy 
b/regression-test/suites/auth_call/test_show_create_table_auth.groovy
index 2a85ea42e6c..166179bae5f 100644
--- a/regression-test/suites/auth_call/test_show_create_table_auth.groovy
+++ b/regression-test/suites/auth_call/test_show_create_table_auth.groovy
@@ -28,7 +28,7 @@ suite("test_show_create_table_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_show_data_auth.groovy 
b/regression-test/suites/auth_call/test_show_data_auth.groovy
index c6f3b6dd153..951ba564d42 100644
--- a/regression-test/suites/auth_call/test_show_data_auth.groovy
+++ b/regression-test/suites/auth_call/test_show_data_auth.groovy
@@ -29,7 +29,7 @@ suite("test_show_data_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_show_database_id_auth.groovy 
b/regression-test/suites/auth_call/test_show_database_id_auth.groovy
index e30dc8d0db7..d9d131ee779 100644
--- a/regression-test/suites/auth_call/test_show_database_id_auth.groovy
+++ b/regression-test/suites/auth_call/test_show_database_id_auth.groovy
@@ -28,7 +28,7 @@ suite("test_show_database_id_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git 
a/regression-test/suites/auth_call/test_show_dynamic_table_auth.groovy 
b/regression-test/suites/auth_call/test_show_dynamic_table_auth.groovy
index 7718a115b65..ccfc42455f6 100644
--- a/regression-test/suites/auth_call/test_show_dynamic_table_auth.groovy
+++ b/regression-test/suites/auth_call/test_show_dynamic_table_auth.groovy
@@ -28,7 +28,7 @@ suite("test_show_dynamic_table_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_show_frontend_auth.groovy 
b/regression-test/suites/auth_call/test_show_frontend_auth.groovy
index f4a9bc15b07..87f8e9c7c09 100644
--- a/regression-test/suites/auth_call/test_show_frontend_auth.groovy
+++ b/regression-test/suites/auth_call/test_show_frontend_auth.groovy
@@ -26,7 +26,7 @@ suite("test_show_frontend_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_show_grant_auth.groovy 
b/regression-test/suites/auth_call/test_show_grant_auth.groovy
index 1223faf6739..efd2e84e38a 100644
--- a/regression-test/suites/auth_call/test_show_grant_auth.groovy
+++ b/regression-test/suites/auth_call/test_show_grant_auth.groovy
@@ -26,7 +26,7 @@ suite("test_show_grant_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_show_proc_auth.groovy 
b/regression-test/suites/auth_call/test_show_proc_auth.groovy
index 1daf8d97f70..4608c64ca67 100644
--- a/regression-test/suites/auth_call/test_show_proc_auth.groovy
+++ b/regression-test/suites/auth_call/test_show_proc_auth.groovy
@@ -26,7 +26,7 @@ suite("test_show_proc_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_show_query_stats_auth.groovy 
b/regression-test/suites/auth_call/test_show_query_stats_auth.groovy
index ba951a47465..7552038a743 100644
--- a/regression-test/suites/auth_call/test_show_query_stats_auth.groovy
+++ b/regression-test/suites/auth_call/test_show_query_stats_auth.groovy
@@ -26,7 +26,7 @@ suite("test_show_query_stats_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_show_tablet_auth.groovy 
b/regression-test/suites/auth_call/test_show_tablet_auth.groovy
index c96cd904b01..b3201d4b8af 100644
--- a/regression-test/suites/auth_call/test_show_tablet_auth.groovy
+++ b/regression-test/suites/auth_call/test_show_tablet_auth.groovy
@@ -28,7 +28,7 @@ suite("test_show_tablet_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_call/test_show_typecast_auth.groovy 
b/regression-test/suites/auth_call/test_show_typecast_auth.groovy
index 8df4a2e2dc1..9e5d7186f01 100644
--- a/regression-test/suites/auth_call/test_show_typecast_auth.groovy
+++ b/regression-test/suites/auth_call/test_show_typecast_auth.groovy
@@ -26,7 +26,7 @@ suite("test_show_typecast_auth","p0,auth_call") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     try_sql("DROP USER ${user}")
diff --git a/regression-test/suites/auth_p0/test_catalogs_auth.groovy 
b/regression-test/suites/auth_p0/test_catalogs_auth.groovy
index 96ebcef7cf8..1b67282d8fe 100644
--- a/regression-test/suites/auth_p0/test_catalogs_auth.groovy
+++ b/regression-test/suites/auth_p0/test_catalogs_auth.groovy
@@ -36,7 +36,7 @@ suite("test_catalogs_auth","p0,auth") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     sql """grant select_priv on regression_test to ${user}"""
diff --git 
a/regression-test/suites/auth_p0/test_master_slave_consistency_auth.groovy 
b/regression-test/suites/auth_p0/test_master_slave_consistency_auth.groovy
index 407852f176a..dc3fa0f005a 100644
--- a/regression-test/suites/auth_p0/test_master_slave_consistency_auth.groovy
+++ b/regression-test/suites/auth_p0/test_master_slave_consistency_auth.groovy
@@ -110,7 +110,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
             def clusters = sql " SHOW CLUSTERS; "
             assertTrue(!clusters.isEmpty())
             def validCluster = clusters[0][0]
-            sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+            sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
         }
 
         logger.info("url_tmp1:" + url_tmp1)
diff --git a/regression-test/suites/auth_p0/test_mtmv_auth.groovy 
b/regression-test/suites/auth_p0/test_mtmv_auth.groovy
index 52ecbebb70b..a190edaa022 100644
--- a/regression-test/suites/auth_p0/test_mtmv_auth.groovy
+++ b/regression-test/suites/auth_p0/test_mtmv_auth.groovy
@@ -58,7 +58,7 @@ suite("test_mtmv_auth","p0,auth") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     sql """grant select_priv on regression_test to ${user}"""
diff --git 
a/regression-test/suites/auth_p0/test_partition_values_tvf_auth.groovy 
b/regression-test/suites/auth_p0/test_partition_values_tvf_auth.groovy
index 3f0ae7ea8d5..b9ce9f43646 100644
--- a/regression-test/suites/auth_p0/test_partition_values_tvf_auth.groovy
+++ b/regression-test/suites/auth_p0/test_partition_values_tvf_auth.groovy
@@ -44,7 +44,7 @@ suite("test_partition_values_tvf_auth","p0,auth") {
                 def clusters = sql " SHOW CLUSTERS; "
                 assertTrue(!clusters.isEmpty())
                 def validCluster = clusters[0][0]
-                sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO 
${user}""";
+                sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO 
${user}""";
             }
 
             sql """grant select_priv on regression_test to ${user}"""
diff --git a/regression-test/suites/auth_p0/test_partitions_auth.groovy 
b/regression-test/suites/auth_p0/test_partitions_auth.groovy
index 0b769f11567..1a398b84b4e 100644
--- a/regression-test/suites/auth_p0/test_partitions_auth.groovy
+++ b/regression-test/suites/auth_p0/test_partitions_auth.groovy
@@ -48,7 +48,7 @@ suite("test_partitions_auth","p0,auth") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     sql """grant select_priv on regression_test to ${user}"""
diff --git a/regression-test/suites/auth_p0/test_query_tvf_auth.groovy 
b/regression-test/suites/auth_p0/test_query_tvf_auth.groovy
index 05c274077d9..415ea7bf5e9 100644
--- a/regression-test/suites/auth_p0/test_query_tvf_auth.groovy
+++ b/regression-test/suites/auth_p0/test_query_tvf_auth.groovy
@@ -48,7 +48,7 @@ suite("test_jdbc_query_tvf","p0,auth") {
             def clusters = sql " SHOW CLUSTERS; "
             assertTrue(!clusters.isEmpty())
             def validCluster = clusters[0][0]
-            sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO 
${dorisuser}""";
+            sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO 
${dorisuser}""";
         }
 
         sql """grant select_priv on regression_test to ${dorisuser}"""
diff --git a/regression-test/suites/auth_p0/test_select_column_auth.groovy 
b/regression-test/suites/auth_p0/test_select_column_auth.groovy
index 36cc2a0a09c..647b426c62a 100644
--- a/regression-test/suites/auth_p0/test_select_column_auth.groovy
+++ b/regression-test/suites/auth_p0/test_select_column_auth.groovy
@@ -37,7 +37,7 @@ suite("test_select_column_auth","p0,auth") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
     sql """create database ${dbName}"""
     sql("""use ${dbName}""")
diff --git a/regression-test/suites/auth_p0/test_select_count_auth.groovy 
b/regression-test/suites/auth_p0/test_select_count_auth.groovy
index ccea1a4a580..47a199aaca2 100644
--- a/regression-test/suites/auth_p0/test_select_count_auth.groovy
+++ b/regression-test/suites/auth_p0/test_select_count_auth.groovy
@@ -29,7 +29,7 @@ suite("test_select_count_auth","p0,auth") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     sql """grant select_priv on regression_test to ${user}"""
diff --git a/regression-test/suites/auth_p0/test_select_view_auth.groovy 
b/regression-test/suites/auth_p0/test_select_view_auth.groovy
index 9a5020ea163..6932fbbb58d 100644
--- a/regression-test/suites/auth_p0/test_select_view_auth.groovy
+++ b/regression-test/suites/auth_p0/test_select_view_auth.groovy
@@ -37,7 +37,7 @@ suite("test_select_view_auth","p0,auth") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
     sql """create database ${dbName}"""
     sql("""use ${dbName}""")
diff --git a/regression-test/suites/auth_p0/test_use_encryptkey_auth.groovy 
b/regression-test/suites/auth_p0/test_use_encryptkey_auth.groovy
index 965bd4b3b16..258c1726ebf 100644
--- a/regression-test/suites/auth_p0/test_use_encryptkey_auth.groovy
+++ b/regression-test/suites/auth_p0/test_use_encryptkey_auth.groovy
@@ -32,7 +32,7 @@ suite("test_use_encryptkey_auth","p0,auth") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
     sql """CREATE ENCRYPTKEY ${key} AS 'ABCD123456789'"""
 
diff --git a/regression-test/suites/auth_up_down_p0/load.groovy 
b/regression-test/suites/auth_up_down_p0/load.groovy
index 7ac11b627ab..73429318589 100644
--- a/regression-test/suites/auth_up_down_p0/load.groovy
+++ b/regression-test/suites/auth_up_down_p0/load.groovy
@@ -50,8 +50,8 @@ 
suite("test_upgrade_downgrade_prepare_auth","p0,auth,restart_fe") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user1}""";
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user2}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user1}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user2}""";
     }
 
     try_sql """drop table if exists ${dbName}.${tableName1}"""
diff --git 
a/regression-test/suites/external_table_p0/jdbc/test_jdbc_call.groovy 
b/regression-test/suites/external_table_p0/jdbc/test_jdbc_call.groovy
index 89a43d71fb1..e06e1e97a30 100644
--- a/regression-test/suites/external_table_p0/jdbc/test_jdbc_call.groovy
+++ b/regression-test/suites/external_table_p0/jdbc/test_jdbc_call.groovy
@@ -125,8 +125,8 @@ suite("test_jdbc_call", 
"p0,external,doris,external_docker,external_docker_doris
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user1}""";
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user2}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user1}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user2}""";
     }    
 
     def result1 = connect("${user1}", "", context.config.jdbcUrl) {
diff --git 
a/regression-test/suites/external_table_p0/lower_case/test_conflict_name.groovy 
b/regression-test/suites/external_table_p0/lower_case/test_conflict_name.groovy
index 43d6a68c1ad..0047ceace91 100644
--- 
a/regression-test/suites/external_table_p0/lower_case/test_conflict_name.groovy
+++ 
b/regression-test/suites/external_table_p0/lower_case/test_conflict_name.groovy
@@ -26,6 +26,15 @@ suite("test_conflict_name", 
"p0,external,doris,meta_names_mapping") {
 
     try_sql """drop user ${jdbcUser}"""
     sql """create user ${jdbcUser} identified by '${jdbcPassword}'"""
+
+    //cloud-mode
+    if (isCloudMode()) {
+        def clusters = sql " SHOW CLUSTERS; "
+        assertTrue(!clusters.isEmpty())
+        def validCluster = clusters[0][0]
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${jdbcUser}""";
+    }
+
     sql """grant all on *.*.* to ${jdbcUser}"""
 
     sql """drop database if exists internal.external_conflict_name; """
diff --git 
a/regression-test/suites/external_table_p0/lower_case/test_lower_case_meta_include.groovy
 
b/regression-test/suites/external_table_p0/lower_case/test_lower_case_meta_include.groovy
index cd48678f25c..91a56f7f317 100644
--- 
a/regression-test/suites/external_table_p0/lower_case/test_lower_case_meta_include.groovy
+++ 
b/regression-test/suites/external_table_p0/lower_case/test_lower_case_meta_include.groovy
@@ -26,6 +26,15 @@ suite("test_lower_case_meta_include", 
"p0,external,doris,external_docker,externa
 
     try_sql """drop user ${jdbcUser}"""
     sql """create user ${jdbcUser} identified by '${jdbcPassword}'"""
+
+    //cloud-mode
+    if (isCloudMode()) {
+        def clusters = sql " SHOW CLUSTERS; "
+        assertTrue(!clusters.isEmpty())
+        def validCluster = clusters[0][0]
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${jdbcUser}""";
+    }
+
     sql """grant all on *.*.* to ${jdbcUser}"""
 
     String mapping_db = """
diff --git 
a/regression-test/suites/external_table_p0/lower_case/test_lower_case_meta_show_and_select.groovy
 
b/regression-test/suites/external_table_p0/lower_case/test_lower_case_meta_show_and_select.groovy
index ac86623243d..8853d169a13 100644
--- 
a/regression-test/suites/external_table_p0/lower_case/test_lower_case_meta_show_and_select.groovy
+++ 
b/regression-test/suites/external_table_p0/lower_case/test_lower_case_meta_show_and_select.groovy
@@ -42,6 +42,15 @@ suite("test_lower_case_meta_show_and_select", 
"p0,external,doris,external_docker
 
     try_sql """drop user ${jdbcUser}"""
     sql """create user ${jdbcUser} identified by '${jdbcPassword}'"""
+
+    //cloud-mode
+    if (isCloudMode()) {
+        def clusters = sql " SHOW CLUSTERS; "
+        assertTrue(!clusters.isEmpty())
+        def validCluster = clusters[0][0]
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${jdbcUser}""";
+    }
+
     sql """grant all on *.*.* to ${jdbcUser}"""
 
     sql """drop database if exists internal.external_test_lower; """
diff --git 
a/regression-test/suites/external_table_p0/lower_case/test_lower_case_meta_with_lower_table_conf_grant.groovy
 
b/regression-test/suites/external_table_p0/lower_case/test_lower_case_meta_with_lower_table_conf_grant.groovy
index ab47a1e23bd..78baa9aa438 100644
--- 
a/regression-test/suites/external_table_p0/lower_case/test_lower_case_meta_with_lower_table_conf_grant.groovy
+++ 
b/regression-test/suites/external_table_p0/lower_case/test_lower_case_meta_with_lower_table_conf_grant.groovy
@@ -86,7 +86,7 @@ suite("test_lower_case_meta_with_lower_table_conf_auth", 
"p0,external,doris,exte
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     sql """grant select_priv on regression_test to ${user}"""
@@ -134,7 +134,7 @@ suite("test_lower_case_meta_with_lower_table_conf_auth", 
"p0,external,doris,exte
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     sql """grant select_priv on regression_test to ${user}"""
diff --git 
a/regression-test/suites/external_table_p0/lower_case/test_lower_case_meta_with_lower_table_conf_show_and_select.groovy
 
b/regression-test/suites/external_table_p0/lower_case/test_lower_case_meta_with_lower_table_conf_show_and_select.groovy
index 0c2712e4686..13750535628 100644
--- 
a/regression-test/suites/external_table_p0/lower_case/test_lower_case_meta_with_lower_table_conf_show_and_select.groovy
+++ 
b/regression-test/suites/external_table_p0/lower_case/test_lower_case_meta_with_lower_table_conf_show_and_select.groovy
@@ -42,6 +42,15 @@ 
suite("test_lower_case_meta_with_lower_table_conf_show_and_select", "p0,external
 
     try_sql """drop user ${jdbcUser}"""
     sql """create user ${jdbcUser} identified by '${jdbcPassword}'"""
+
+    //cloud-mode
+    if (isCloudMode()) {
+        def clusters = sql " SHOW CLUSTERS; "
+        assertTrue(!clusters.isEmpty())
+        def validCluster = clusters[0][0]
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${jdbcUser}""";
+    }
+
     sql """grant all on *.*.* to ${jdbcUser}"""
 
     sql """drop database if exists internal.external_test_lower_with_conf; """
diff --git 
a/regression-test/suites/external_table_p0/lower_case/test_lower_case_mtmv.groovy
 
b/regression-test/suites/external_table_p0/lower_case/test_lower_case_mtmv.groovy
index f72b3c9e68d..67081ed3afe 100644
--- 
a/regression-test/suites/external_table_p0/lower_case/test_lower_case_mtmv.groovy
+++ 
b/regression-test/suites/external_table_p0/lower_case/test_lower_case_mtmv.groovy
@@ -26,6 +26,15 @@ suite("test_lower_case_mtmv", 
"p0,external,doris,external_docker,external_docker
 
     try_sql """drop user ${jdbcUser}"""
     sql """create user ${jdbcUser} identified by '${jdbcPassword}'"""
+
+    //cloud-mode
+    if (isCloudMode()) {
+        def clusters = sql " SHOW CLUSTERS; "
+        assertTrue(!clusters.isEmpty())
+        def validCluster = clusters[0][0]
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${jdbcUser}""";
+    }
+
     sql """grant all on *.*.* to ${jdbcUser}"""
 
     sql """drop database if exists internal.EXTERNAL_LOWER_MTMV; """
diff --git 
a/regression-test/suites/external_table_p0/lower_case/test_meta_cache_select_without_refresh.groovy
 
b/regression-test/suites/external_table_p0/lower_case/test_meta_cache_select_without_refresh.groovy
index 17f37b2c132..c2073f9864c 100644
--- 
a/regression-test/suites/external_table_p0/lower_case/test_meta_cache_select_without_refresh.groovy
+++ 
b/regression-test/suites/external_table_p0/lower_case/test_meta_cache_select_without_refresh.groovy
@@ -26,6 +26,15 @@ suite("test_meta_cache_select_without_refresh", 
"p0,external,doris,external_dock
 
     try_sql """drop user ${jdbcUser}"""
     sql """create user ${jdbcUser} identified by '${jdbcPassword}'"""
+
+    //cloud-mode
+    if (isCloudMode()) {
+        def clusters = sql " SHOW CLUSTERS; "
+        assertTrue(!clusters.isEmpty())
+        def validCluster = clusters[0][0]
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${jdbcUser}""";
+    }
+
     sql """grant all on *.*.* to ${jdbcUser}"""
 
     sql """ drop database if exists 
internal.external_lower_select_without_refresh; """
diff --git 
a/regression-test/suites/external_table_p0/lower_case/test_meta_names_mapping.groovy
 
b/regression-test/suites/external_table_p0/lower_case/test_meta_names_mapping.groovy
index b58077295b3..f8694ed7a43 100644
--- 
a/regression-test/suites/external_table_p0/lower_case/test_meta_names_mapping.groovy
+++ 
b/regression-test/suites/external_table_p0/lower_case/test_meta_names_mapping.groovy
@@ -26,6 +26,15 @@ suite("test_meta_names_mapping", 
"p0,external,doris,meta_names_mapping") {
 
     try_sql """drop user ${jdbcUser}"""
     sql """create user ${jdbcUser} identified by '${jdbcPassword}'"""
+
+    //cloud-mode
+    if (isCloudMode()) {
+        def clusters = sql " SHOW CLUSTERS; "
+        assertTrue(!clusters.isEmpty())
+        def validCluster = clusters[0][0]
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${jdbcUser}""";
+    }
+
     sql """grant all on *.*.* to ${jdbcUser}"""
 
     String validMetaNamesMapping = """
diff --git 
a/regression-test/suites/external_table_p0/lower_case/test_timing_refresh_catalog.groovy
 
b/regression-test/suites/external_table_p0/lower_case/test_timing_refresh_catalog.groovy
index 242ca1b8a53..a353e20d685 100644
--- 
a/regression-test/suites/external_table_p0/lower_case/test_timing_refresh_catalog.groovy
+++ 
b/regression-test/suites/external_table_p0/lower_case/test_timing_refresh_catalog.groovy
@@ -47,6 +47,15 @@ suite("test_timing_refresh_catalog", 
"p0,external,doris,external_docker,external
 
     try_sql """drop user ${jdbcUser}"""
     sql """create user ${jdbcUser} identified by '${jdbcPassword}'"""
+
+    //cloud-mode
+    if (isCloudMode()) {
+        def clusters = sql " SHOW CLUSTERS; "
+        assertTrue(!clusters.isEmpty())
+        def validCluster = clusters[0][0]
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${jdbcUser}""";
+    }
+
     sql """grant all on *.*.* to ${jdbcUser}"""
 
     String mapping = """
diff --git 
a/regression-test/suites/external_table_p0/lower_case/upgrade/load.groovy 
b/regression-test/suites/external_table_p0/lower_case/upgrade/load.groovy
index 782f7b37119..8be76c3e0f4 100644
--- a/regression-test/suites/external_table_p0/lower_case/upgrade/load.groovy
+++ b/regression-test/suites/external_table_p0/lower_case/upgrade/load.groovy
@@ -42,6 +42,15 @@ suite("test_upgrade_lower_case_catalog_prepare", 
"p0,external,doris,external_doc
 
     try_sql """drop user ${jdbcUser}"""
     sql """create user ${jdbcUser} identified by '${jdbcPassword}'"""
+
+    //cloud-mode
+    if (isCloudMode()) {
+        def clusters = sql " SHOW CLUSTERS; "
+        assertTrue(!clusters.isEmpty())
+        def validCluster = clusters[0][0]
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${jdbcUser}""";
+    }
+
     sql """grant all on *.*.* to ${jdbcUser}"""
 
     sql """drop database if exists internal.upgrade_lower_case_catalog_lower; 
"""
diff --git 
a/regression-test/suites/external_table_p0/tvf/test_insert_from_tvf_with_common_user.groovy
 
b/regression-test/suites/external_table_p0/tvf/test_insert_from_tvf_with_common_user.groovy
index 91e3ab915eb..b64ac577b3c 100644
--- 
a/regression-test/suites/external_table_p0/tvf/test_insert_from_tvf_with_common_user.groovy
+++ 
b/regression-test/suites/external_table_p0/tvf/test_insert_from_tvf_with_common_user.groovy
@@ -93,7 +93,7 @@ suite("test_insert_from_tvf_with_common_user", "p0,external") 
{
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO 
${common_user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO 
${common_user}""";
     }
 
     connect("${common_user}", '12345', context.config.jdbcUrl) {
diff --git 
a/regression-test/suites/external_table_p0/tvf/test_s3_tvf_with_resource.groovy 
b/regression-test/suites/external_table_p0/tvf/test_s3_tvf_with_resource.groovy
index 1d243e9dd2f..5f21bc7a1a1 100644
--- 
a/regression-test/suites/external_table_p0/tvf/test_s3_tvf_with_resource.groovy
+++ 
b/regression-test/suites/external_table_p0/tvf/test_s3_tvf_with_resource.groovy
@@ -203,7 +203,7 @@ suite("test_s3_tvf_with_resource", "p0,external") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
     // not have usage priv, can not select tvf with resource
     connect(user, "${pwd}", url) {
diff --git 
a/regression-test/suites/external_table_p2/tvf/test_iceberg_meta.groovy 
b/regression-test/suites/external_table_p2/tvf/test_iceberg_meta.groovy
index 557eaf5b061..3fc898b865f 100644
--- a/regression-test/suites/external_table_p2/tvf/test_iceberg_meta.groovy
+++ b/regression-test/suites/external_table_p2/tvf/test_iceberg_meta.groovy
@@ -63,7 +63,7 @@ suite("test_iceberg_meta", 
"p2,external,iceberg,external_remote,external_remote_
              def clusters = sql " SHOW CLUSTERS; "
              assertTrue(!clusters.isEmpty())
              def validCluster = clusters[0][0]
-             sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+             sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO 
${user}""";
          }
 
          sql """grant select_priv on regression_test to ${user}"""
diff --git a/regression-test/suites/javaudf_p0/test_javaudf_auth.groovy 
b/regression-test/suites/javaudf_p0/test_javaudf_auth.groovy
index 0729f14bb33..7f02c921855 100644
--- a/regression-test/suites/javaudf_p0/test_javaudf_auth.groovy
+++ b/regression-test/suites/javaudf_p0/test_javaudf_auth.groovy
@@ -49,7 +49,7 @@ suite("test_javaudf_auth") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }    
 
     sql """USE ${dbName}"""
diff --git 
a/regression-test/suites/load_p0/routine_load/test_routine_load_with_user.groovy
 
b/regression-test/suites/load_p0/routine_load/test_routine_load_with_user.groovy
index 73cce57822f..73641f46d01 100644
--- 
a/regression-test/suites/load_p0/routine_load/test_routine_load_with_user.groovy
+++ 
b/regression-test/suites/load_p0/routine_load/test_routine_load_with_user.groovy
@@ -65,7 +65,7 @@ suite("test_routine_load_with_user","p0") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
 
         try {
             def storageVaults = (sql " SHOW STORAGE VAULT; ").stream().map(row 
-> row[0]).collect(Collectors.toSet())
diff --git a/regression-test/suites/load_p0/stream_load/test_stream_load.groovy 
b/regression-test/suites/load_p0/stream_load/test_stream_load.groovy
index 54731a94958..1bbf6033ef8 100644
--- a/regression-test/suites/load_p0/stream_load/test_stream_load.groovy
+++ b/regression-test/suites/load_p0/stream_load/test_stream_load.groovy
@@ -1059,7 +1059,7 @@ suite("test_stream_load", "p0") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO common_user""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO common_user""";
     }
 
     streamLoad {
diff --git 
a/regression-test/suites/load_p0/stream_load/test_stream_load_move_memtable.groovy
 
b/regression-test/suites/load_p0/stream_load/test_stream_load_move_memtable.groovy
index bbd532a7625..1df859d03d1 100644
--- 
a/regression-test/suites/load_p0/stream_load/test_stream_load_move_memtable.groovy
+++ 
b/regression-test/suites/load_p0/stream_load/test_stream_load_move_memtable.groovy
@@ -937,7 +937,7 @@ suite("test_stream_load_move_memtable", "p0") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ddd""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ddd""";
     }
 
     streamLoad {
diff --git a/regression-test/suites/manager/test_manager_interface_3.groovy 
b/regression-test/suites/manager/test_manager_interface_3.groovy
index d29c853704a..ba7d90486e0 100644
--- a/regression-test/suites/manager/test_manager_interface_3.groovy
+++ b/regression-test/suites/manager/test_manager_interface_3.groovy
@@ -89,8 +89,8 @@ suite('test_manager_interface_3',"p0") {
             def clusters = sql " SHOW CLUSTERS; "
             assertTrue(!clusters.isEmpty())
             def validCluster = clusters[0][0]
-            sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user1}""";
-            sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user2}""";
+            sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO 
${user1}""";
+            sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO 
${user2}""";
         }
 
         connect(user1, "${pwd}", url) {
@@ -412,7 +412,7 @@ suite('test_manager_interface_3',"p0") {
             def clusters = sql " SHOW CLUSTERS; "
             assertTrue(!clusters.isEmpty())
             def validCluster = clusters[0][0]
-            sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+            sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
         }
         
         List<List<Object>> result = sql  """ show resources """
@@ -609,7 +609,7 @@ suite('test_manager_interface_3',"p0") {
             def clusters = sql " SHOW CLUSTERS; "
             assertTrue(!clusters.isEmpty())
             def validCluster = clusters[0][0]
-            sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+            sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
         }
         
         connect(user, "${pwd}", url) { 
diff --git 
a/regression-test/suites/nereids_p0/authorization/column_authorization.groovy 
b/regression-test/suites/nereids_p0/authorization/column_authorization.groovy
index c2e22f10c22..eea353368c9 100644
--- 
a/regression-test/suites/nereids_p0/authorization/column_authorization.groovy
+++ 
b/regression-test/suites/nereids_p0/authorization/column_authorization.groovy
@@ -49,7 +49,7 @@ suite("column_authorization") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user1}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user1}""";
     }
 
     sql 'sync'
diff --git 
a/regression-test/suites/nereids_p0/authorization/view_authorization.groovy 
b/regression-test/suites/nereids_p0/authorization/view_authorization.groovy
index 51503c3cd2d..fa7f56c1e09 100644
--- a/regression-test/suites/nereids_p0/authorization/view_authorization.groovy
+++ b/regression-test/suites/nereids_p0/authorization/view_authorization.groovy
@@ -52,7 +52,7 @@ suite("view_authorization") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user1}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user1}""";
     }    
 
     sql 'sync'
diff --git 
a/regression-test/suites/nereids_p0/cache/parse_sql_from_sql_cache.groovy 
b/regression-test/suites/nereids_p0/cache/parse_sql_from_sql_cache.groovy
index e7fb5f3da6c..765d1208426 100644
--- a/regression-test/suites/nereids_p0/cache/parse_sql_from_sql_cache.groovy
+++ b/regression-test/suites/nereids_p0/cache/parse_sql_from_sql_cache.groovy
@@ -297,7 +297,7 @@ suite("parse_sql_from_sql_cache") {
                     def clusters = sql " SHOW CLUSTERS; "
                     assertTrue(!clusters.isEmpty())
                     def validCluster = clusters[0][0]
-                    sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO 
test_cache_user1"""
+                    sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO 
test_cache_user1"""
                 }
 
                 createTestTable "test_use_plan_cache12"
@@ -340,7 +340,7 @@ suite("parse_sql_from_sql_cache") {
                     def clusters = sql " SHOW CLUSTERS; "
                     assertTrue(!clusters.isEmpty())
                     def validCluster = clusters[0][0]
-                    sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO 
test_cache_user2"""
+                    sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO 
test_cache_user2"""
                 }
 
                 createTestTable "test_use_plan_cache13"
@@ -397,7 +397,7 @@ suite("parse_sql_from_sql_cache") {
                     def clusters = sql " SHOW CLUSTERS; "
                     assertTrue(!clusters.isEmpty())
                     def validCluster = clusters[0][0]
-                    sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO 
test_cache_user3"""
+                    sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO 
test_cache_user3"""
                 }
 
                 createTestTable "test_use_plan_cache14"
@@ -460,7 +460,7 @@ suite("parse_sql_from_sql_cache") {
                     def clusters = sql " SHOW CLUSTERS; "
                     assertTrue(!clusters.isEmpty())
                     def validCluster = clusters[0][0]
-                    sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO 
test_cache_user4"""
+                    sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO 
test_cache_user4"""
                 }
 
                 sql "sync"
diff --git 
a/regression-test/suites/nereids_p0/insert_into_table/insert_auth.groovy 
b/regression-test/suites/nereids_p0/insert_into_table/insert_auth.groovy
index 4c9968746d1..d146885a7bf 100644
--- a/regression-test/suites/nereids_p0/insert_into_table/insert_auth.groovy
+++ b/regression-test/suites/nereids_p0/insert_into_table/insert_auth.groovy
@@ -53,7 +53,7 @@ suite('nereids_insert_auth') {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     connect(user, "${pwd}", url) {
diff --git 
a/regression-test/suites/query_p0/system/test_partitions_schema.groovy 
b/regression-test/suites/query_p0/system/test_partitions_schema.groovy
index 98b12c3705c..84bbeafa7fe 100644
--- a/regression-test/suites/query_p0/system/test_partitions_schema.groovy
+++ b/regression-test/suites/query_p0/system/test_partitions_schema.groovy
@@ -176,7 +176,7 @@ suite("test_partitions_schema") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     sql "GRANT SELECT_PRIV ON information_schema.partitions  TO ${user}"
diff --git a/regression-test/suites/query_p0/system/test_table_options.groovy 
b/regression-test/suites/query_p0/system/test_table_options.groovy
index fef118a82b2..fd9cffcedfc 100644
--- a/regression-test/suites/query_p0/system/test_table_options.groovy
+++ b/regression-test/suites/query_p0/system/test_table_options.groovy
@@ -191,7 +191,7 @@ suite("test_table_options") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     sql "GRANT SELECT_PRIV ON information_schema.table_properties  TO ${user}"
diff --git 
a/regression-test/suites/query_p0/system/test_table_properties.groovy 
b/regression-test/suites/query_p0/system/test_table_properties.groovy
index 1861ae4d628..7465497ae76 100644
--- a/regression-test/suites/query_p0/system/test_table_properties.groovy
+++ b/regression-test/suites/query_p0/system/test_table_properties.groovy
@@ -98,7 +98,7 @@ suite("test_table_properties") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }  
     sql "GRANT SELECT_PRIV ON information_schema.table_properties  TO ${user}"
     
diff --git a/regression-test/suites/query_p0/test_row_policy.groovy 
b/regression-test/suites/query_p0/test_row_policy.groovy
index 4af498e55e3..c416537df15 100644
--- a/regression-test/suites/query_p0/test_row_policy.groovy
+++ b/regression-test/suites/query_p0/test_row_policy.groovy
@@ -34,7 +34,7 @@ suite("test_row_policy") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
     }
 
     connect(user, '123456', url) {
diff --git a/regression-test/suites/workload_manager_p0/test_curd_wlg.groovy 
b/regression-test/suites/workload_manager_p0/test_curd_wlg.groovy
index fc08eab982e..ea81ad5df33 100644
--- a/regression-test/suites/workload_manager_p0/test_curd_wlg.groovy
+++ b/regression-test/suites/workload_manager_p0/test_curd_wlg.groovy
@@ -324,7 +324,7 @@ suite("test_crud_wlg") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO test_wlg_user""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO 
test_wlg_user""";
     }
 
     connect('test_wlg_user', '12345', context.config.jdbcUrl) {
@@ -710,7 +710,7 @@ suite("test_crud_wlg") {
         def clusters = sql " SHOW CLUSTERS; "
         assertTrue(!clusters.isEmpty())
         def validCluster = clusters[0][0]
-        sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO 
test_wg_priv_user2""";
+        sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO 
test_wg_priv_user2""";
     }
     connect('test_wg_priv_user2', '', context.config.jdbcUrl) {
         qt_select_wgp_11 "select 
GRANTEE,WORKLOAD_GROUP_NAME,PRIVILEGE_TYPE,IS_GRANTABLE from 
information_schema.workload_group_privileges where grantee like 
'%test_wg_priv%' order by 
GRANTEE,WORKLOAD_GROUP_NAME,PRIVILEGE_TYPE,IS_GRANTABLE; "


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org

Reply via email to