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 637bc6a95b0 branch-3.0: [fix](case) fix external case user cluster
usage_priv when cloud-mode #48016 (#48049)
637bc6a95b0 is described below
commit 637bc6a95b0ba4d20a6816a569d1028f7a4ec38e
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon Feb 24 10:57:13 2025 +0800
branch-3.0: [fix](case) fix external case user cluster usage_priv when
cloud-mode #48016 (#48049)
Cherry-picked from #48016
Co-authored-by: zy-kkk <zhongy...@gmail.com>
---
.../hive/test_external_sql_block_rule.groovy | 21 +++++++++++++++++++++
.../external_table_p0/tvf/test_catalogs_tvf.groovy | 8 +++++++-
2 files changed, 28 insertions(+), 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
index f9a94f92b8d..836a98ea36a 100644
---
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
index 2d68c207817..4b40e4d9fce 100644
--- 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) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
