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 bd00f56b10b [fix](auth)fix mtmv name to resolve conflicts (#38057)
bd00f56b10b is described below
commit bd00f56b10b161de5c02c400f93e79bcb38f1638
Author: zfr95 <[email protected]>
AuthorDate: Thu Jul 18 19:13:55 2024 +0800
[fix](auth)fix mtmv name to resolve conflicts (#38057)
pick from master #36958
## Proposed changes
[fix](auth)fix mtmv name to resolve conflicts
---
.../test_master_slave_consistency_auth.groovy | 49 ++++++++++++----------
.../suites/auth_p0/test_select_column_auth.groovy | 33 ++++++++-------
2 files changed, 46 insertions(+), 36 deletions(-)
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 b9493bf2e03..33fbbdeccb7 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
@@ -34,11 +34,16 @@ suite ("test_follower_consistent_auth","p0,auth") {
String user = 'test_follower_consistent_user'
String pwd = 'C123_567p'
- String dbName = 'test_select_column_auth_db'
- String tableName = 'test_select_column_auth_table'
- String role = 'test_select_column_auth_role'
- String wg = 'test_select_column_auth_wg'
- String rg = 'test_select_column_auth_rg'
+ String dbName = 'test_follower_consistent_db'
+ String tableName = 'test_follower_consistent_table'
+ String role = 'test_follower_consistent_role'
+ String wg = 'test_follower_consistent_wg'
+ String rg = 'test_follower_consistent_rg'
+ String mv_name = 'test_follower_consistent_mv'
+ String mtmv_name = 'test_follower_consistent_mtmv'
+ String view_name = 'test_follower_consistent_view'
+ String rollup_name = 'test_follower_consistent_rollup'
+ String catalog_name = 'test_follower_consistent_catalog'
try_sql("DROP role ${role}")
sql """CREATE ROLE ${role}"""
sql """drop WORKLOAD GROUP if exists '${wg}'"""
@@ -76,12 +81,12 @@ suite ("test_follower_consistent_auth","p0,auth") {
);
"""
- sql """create view ${dbName}.v1 as select * from
${dbName}.${tableName};"""
- sql """alter table ${dbName}.${tableName} add rollup
rollup1(username)"""
+ sql """create view ${dbName}.${view_name} as select * from
${dbName}.${tableName};"""
+ sql """alter table ${dbName}.${tableName} add rollup
${rollup_name}(username)"""
sleep(5 * 1000)
- sql """create materialized view mv1 as select username from
${dbName}.${tableName}"""
+ sql """create materialized view ${mv_name} as select username from
${dbName}.${tableName}"""
sleep(5 * 1000)
- sql """CREATE MATERIALIZED VIEW ${dbName}.mtmv1
+ sql """CREATE MATERIALIZED VIEW ${dbName}.${mtmv_name}
BUILD IMMEDIATE REFRESH AUTO ON MANUAL
DISTRIBUTED BY RANDOM BUCKETS 1
PROPERTIES ('replication_num' = '1')
@@ -93,13 +98,13 @@ suite ("test_follower_consistent_auth","p0,auth") {
(3, "333");
"""
sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'"""
- sql """refresh MATERIALIZED VIEW ${dbName}.mtmv1 auto"""
+ sql """refresh MATERIALIZED VIEW ${dbName}.${mtmv_name} auto"""
sql """grant select_priv on regression_test to ${user}"""
connect(user=user, password="${pwd}", url=context.config.jdbcUrl) {
try {
- sql "SHOW CATALOG RECYCLE BIN WHERE NAME = 'test'"
+ sql "SHOW CATALOG RECYCLE BIN WHERE NAME = '${catalog_name}'"
} catch (Exception e) {
log.info(e.getMessage())
assertTrue(e.getMessage().contains("denied"))
@@ -107,7 +112,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
}
connect(user=user, password="${pwd}", url=new_jdbc_url) {
try {
- sql "SHOW CATALOG RECYCLE BIN WHERE NAME = 'test'"
+ sql "SHOW CATALOG RECYCLE BIN WHERE NAME = '${catalog_name}'"
} catch (Exception e) {
log.info(e.getMessage())
assertTrue(e.getMessage().contains("denied"))
@@ -157,7 +162,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
connect(user=user, password="${pwd}", url=context.config.jdbcUrl) {
try {
- sql "select username from ${dbName}.v1"
+ sql "select username from ${dbName}.${view_name}"
} catch (Exception e) {
log.info(e.getMessage())
assertTrue(e.getMessage().contains("denied"))
@@ -165,24 +170,24 @@ suite ("test_follower_consistent_auth","p0,auth") {
}
connect(user=user, password="${pwd}", url=new_jdbc_url) {
try {
- sql "select username from ${dbName}.v1"
+ sql "select username from ${dbName}.${view_name}"
} catch (Exception e) {
log.info(e.getMessage())
assertTrue(e.getMessage().contains("denied"))
}
}
- sql """grant select_priv(username) on ${dbName}.v1 to ${user}"""
+ sql """grant select_priv(username) on ${dbName}.${view_name} to
${user}"""
connect(user=user, password="${pwd}", url=context.config.jdbcUrl) {
- sql "select username from ${dbName}.v1"
+ sql "select username from ${dbName}.${view_name}"
}
connect(user=user, password="${pwd}", url=new_jdbc_url) {
- sql "select username from ${dbName}.v1"
+ sql "select username from ${dbName}.${view_name}"
}
connect(user=user, password="${pwd}", url=context.config.jdbcUrl) {
try {
- sql "select username from ${dbName}.mtmv1"
+ sql "select username from ${dbName}.${mtmv_name}"
} catch (Exception e) {
log.info(e.getMessage())
assertTrue(e.getMessage().contains("denied"))
@@ -190,18 +195,18 @@ suite ("test_follower_consistent_auth","p0,auth") {
}
connect(user=user, password="${pwd}", url=new_jdbc_url) {
try {
- sql "select username from ${dbName}.mtmv1"
+ sql "select username from ${dbName}.${mtmv_name}"
} catch (Exception e) {
log.info(e.getMessage())
assertTrue(e.getMessage().contains("denied"))
}
}
- sql """grant select_priv(username) on ${dbName}.mtmv1 to ${user}"""
+ sql """grant select_priv(username) on ${dbName}.${mtmv_name} to
${user}"""
connect(user=user, password="${pwd}", url=context.config.jdbcUrl) {
- sql "select username from ${dbName}.mtmv1"
+ sql "select username from ${dbName}.${mtmv_name}"
}
connect(user=user, password="${pwd}", url=new_jdbc_url) {
- sql "select username from ${dbName}.mtmv1"
+ sql "select username from ${dbName}.${mtmv_name}"
}
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 b4f24ee3c17..a204672ea90 100644
--- a/regression-test/suites/auth_p0/test_select_column_auth.groovy
+++ b/regression-test/suites/auth_p0/test_select_column_auth.groovy
@@ -20,6 +20,11 @@ suite("test_select_column_auth","p0,auth") {
String pwd = 'C123_567p'
String dbName = 'test_select_column_auth_db'
String tableName = 'test_select_column_auth_table'
+ String mv_name = 'test_select_column_auth_mv'
+ String mtmv_name = 'test_select_column_auth_mtmv'
+ String view_name = 'test_select_column_auth_view'
+ String rollup_name = 'test_select_column_auth_rollup'
+ String catalog_name = 'test_select_column_auth_catalog'
try_sql("drop user ${user}")
try_sql """drop table if exists ${dbName}.${tableName}"""
sql """drop database if exists ${dbName}"""
@@ -38,12 +43,12 @@ suite("test_select_column_auth","p0,auth") {
);
"""
- sql """create view ${dbName}.v1 as select * from ${dbName}.${tableName};"""
- sql """alter table ${dbName}.${tableName} add rollup rollup1(username)"""
+ sql """create view ${dbName}.${mv_name} as select * from
${dbName}.${tableName};"""
+ sql """alter table ${dbName}.${tableName} add rollup
${rollup_name}(username)"""
sleep(5 * 1000)
- sql """create materialized view mv1 as select username from
${dbName}.${tableName}"""
+ sql """create materialized view ${mtmv_name} as select username from
${dbName}.${tableName}"""
sleep(5 * 1000)
- sql """CREATE MATERIALIZED VIEW ${dbName}.mtmv1
+ sql """CREATE MATERIALIZED VIEW ${dbName}.${mtmv_name}
BUILD IMMEDIATE REFRESH AUTO ON MANUAL
DISTRIBUTED BY RANDOM BUCKETS 1
PROPERTIES ('replication_num' = '1')
@@ -54,7 +59,7 @@ suite("test_select_column_auth","p0,auth") {
(2, "222"),
(3, "333");
"""
- sql """refresh MATERIALIZED VIEW ${dbName}.mtmv1 auto"""
+ sql """refresh MATERIALIZED VIEW ${dbName}.${mtmv_name} auto"""
sql """grant select_priv on regression_test to ${user}"""
// table column
@@ -74,29 +79,29 @@ suite("test_select_column_auth","p0,auth") {
// view column
connect(user=user, password="${pwd}", url=context.config.jdbcUrl) {
try {
- sql "select username from ${dbName}.v1"
+ sql "select username from ${dbName}.${mv_name}"
} catch (Exception e) {
log.info(e.getMessage())
assertTrue(e.getMessage().contains("denied"))
}
}
- sql """grant select_priv(username) on ${dbName}.v1 to ${user}"""
+ sql """grant select_priv(username) on ${dbName}.${mv_name} to ${user}"""
connect(user=user, password="${pwd}", url=context.config.jdbcUrl) {
- sql "select username from ${dbName}.v1"
+ sql "select username from ${dbName}.${mv_name}"
}
// mtmv column
connect(user=user, password="${pwd}", url=context.config.jdbcUrl) {
try {
- sql "select username from ${dbName}.mtmv1"
+ sql "select username from ${dbName}.${mtmv_name}"
} catch (Exception e) {
log.info(e.getMessage())
assertTrue(e.getMessage().contains("denied"))
}
}
- sql """grant select_priv(username) on ${dbName}.mtmv1 to ${user}"""
+ sql """grant select_priv(username) on ${dbName}.${mtmv_name} to ${user}"""
connect(user=user, password="${pwd}", url=context.config.jdbcUrl) {
- sql "select username from ${dbName}.mtmv1"
+ sql "select username from ${dbName}.${mtmv_name}"
}
@@ -110,14 +115,14 @@ suite("test_select_column_auth","p0,auth") {
assertTrue(e.getMessage().contains("denied"))
}
}
- sql """grant select_priv(username) on ${dbName}.mtmv1 to ${user}"""
- sql """grant select_priv(sum_id) on ${dbName}.mtmv1 to ${user}"""
+ sql """grant select_priv(username) on ${dbName}.${mtmv_name} to ${user}"""
+ sql """grant select_priv(sum_id) on ${dbName}.${mtmv_name} to ${user}"""
sql """grant select_priv(id) on ${dbName}.${tableName} to ${user}"""
connect(user=user, password="${pwd}", url=context.config.jdbcUrl) {
sql "SET enable_materialized_view_rewrite=true"
explain {
sql("""select username, sum(id) from ${dbName}.${tableName} group
by username""")
- contains "mtmv1(mtmv1)"
+ contains "${mtmv_name}(${mtmv_name})"
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
