Merge branch 'master' into like-escape

yx-keith · Feb 19, 2025 · 66a2443 · 66a2443
2 parents 56ac963 + ae86e68
commit 66a2443
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/regression-test/suites/external_table_p0/hive/test_external_sql_block_rule.groovy b/regression-test/suites/external_table_p0/hive/test_external_sql_block_rule.groovy
@@ -49,16 +49,37 @@ suite("test_external_sql_block_rule", "external_docker,hive,external_docker_hive
     sql """create user external_block_user1;"""
     sql """SET PROPERTY FOR 'external_block_user1' 'sql_block_rules' = 'external_hive_partition';"""
     sql """grant all on *.*.* to external_block_user1;"""
+    //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 external_block_user1;""";
+    }
 
     sql """drop user if exists external_block_user2"""
     sql """create user external_block_user2;"""
     sql """SET PROPERTY FOR 'external_block_user2' 'sql_block_rules' = 'external_hive_partition2';"""
     sql """grant all on *.*.* to external_block_user2;"""
+    //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 external_block_user2;""";
+    }
 
     sql """drop user if exists external_block_user3"""
     sql """create user external_block_user3;"""
     sql """SET PROPERTY FOR 'external_block_user3' 'sql_block_rules' = 'external_hive_partition3';"""
     sql """grant all on *.*.* to external_block_user3;"""
+    //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 external_block_user3;""";
+    }
 
     // login as external_block_user1 
     def result1 = connect('external_block_user1', '', context.config.jdbcUrl) {

diff --git a/regression-test/suites/external_table_p0/tvf/test_catalogs_tvf.groovy b/regression-test/suites/external_table_p0/tvf/test_catalogs_tvf.groovy
@@ -105,7 +105,13 @@ suite("test_catalogs_tvf","p0,external,tvf,external_docker") {
 
     sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'"""
     sql """GRANT SELECT_PRIV on `internal`.``.`` to '${user}'"""
-
+    //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 ${user}""";
+    }
 
 
     connect(user, "${pwd}", context.config.jdbcUrl) {