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 3b55eb56cef branch-3.0: [fix](jdbc test) fix some jdbc catalog test
when cloud mode #48559 (#48584)
3b55eb56cef is described below
commit 3b55eb56cefbbce58dbf0bfd0f7aea9e258c445a
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Mar 4 17:26:41 2025 +0800
branch-3.0: [fix](jdbc test) fix some jdbc catalog test when cloud mode
#48559 (#48584)
Cherry-picked from #48559
Co-authored-by: zy-kkk <zhongy...@gmail.com>
---
.../jdbc/test_mysql_jdbc_catalog.groovy | 21 ++++++++++++---------
.../type_test/ctas/test_mysql_all_types_ctas.groovy | 12 +++++++-----
2 files changed, 19 insertions(+), 14 deletions(-)
diff --git
a/regression-test/suites/external_table_p0/jdbc/test_mysql_jdbc_catalog.groovy
b/regression-test/suites/external_table_p0/jdbc/test_mysql_jdbc_catalog.groovy
index 73daa77ad69..46f2bb371e9 100644
---
a/regression-test/suites/external_table_p0/jdbc/test_mysql_jdbc_catalog.groovy
+++
b/regression-test/suites/external_table_p0/jdbc/test_mysql_jdbc_catalog.groovy
@@ -75,6 +75,14 @@ suite("test_mysql_jdbc_catalog",
"p0,external,mysql,external_docker,external_doc
try_sql("DROP USER ${user}")
sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'"""
+ //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}""";
+ }
+
sql """create database if not exists ${internal_db_name}; """
sql """drop catalog if exists ${catalog_name} """
@@ -193,23 +201,18 @@ suite("test_mysql_jdbc_catalog",
"p0,external,mysql,external_docker,external_doc
// test insert
String uuid1 = UUID.randomUUID().toString();
connect(user, "${pwd}", url) {
- try {
+ test {
sql """ insert into
${catalog_name}.${ex_db_name}.${test_insert} values ('${uuid1}', 'doris1', 18)
"""
- fail()
- } catch (Exception e) {
- log.info(e.getMessage())
+ exception "denied"
}
}
sql """GRANT LOAD_PRIV ON ${catalog_name}.${ex_db_name}.${test_insert}
TO ${user}"""
connect(user, "${pwd}", url) {
- try {
- sql """ insert into
${catalog_name}.${ex_db_name}.${test_insert} values ('${uuid1}', 'doris1', 18)
"""
- } catch (Exception e) {
- fail();
- }
+ sql """ insert into ${catalog_name}.${ex_db_name}.${test_insert}
values ('${uuid1}', 'doris1', 18) """
}
+
order_qt_test_insert1 """ select name, age from ${test_insert} where
id = '${uuid1}' order by age """
String uuid2 = UUID.randomUUID().toString();
diff --git
a/regression-test/suites/external_table_p0/jdbc/type_test/ctas/test_mysql_all_types_ctas.groovy
b/regression-test/suites/external_table_p0/jdbc/type_test/ctas/test_mysql_all_types_ctas.groovy
index aee5642515b..fdd8fa19d1e 100644
---
a/regression-test/suites/external_table_p0/jdbc/type_test/ctas/test_mysql_all_types_ctas.groovy
+++
b/regression-test/suites/external_table_p0/jdbc/type_test/ctas/test_mysql_all_types_ctas.groovy
@@ -46,15 +46,17 @@ suite("test_mysql_all_types_ctas",
"p0,external,mysql,external_docker,external_d
sql """create table all_types_non_nullable
properties("replication_num" = "1") as select * from
mysql_all_type_ctas_test.doris_test.all_types_non_nullable;"""
- qt_select_all_types_non_nullable """select * from
internal.test_mysql_all_types_ctas.all_types_non_nullable order by 1;"""
+ if (!isCloudMode()) {
+ qt_select_all_types_non_nullable """select * from
internal.test_mysql_all_types_ctas.all_types_non_nullable order by 1;"""
- sql """create table t_varchar properties("replication_num" = "1") as
select * from mysql_all_type_ctas_test.doris_test.t_varchar;"""
+ sql """create table t_varchar properties("replication_num" = "1")
as select * from mysql_all_type_ctas_test.doris_test.t_varchar;"""
- qt_select_varchar """select * from
internal.test_mysql_all_types_ctas.t_varchar order by 1;"""
+ qt_select_varchar """select * from
internal.test_mysql_all_types_ctas.t_varchar order by 1;"""
- sql """create table t_char properties("replication_num" = "1") as
select * from mysql_all_type_ctas_test.doris_test.t_char;"""
+ sql """create table t_char properties("replication_num" = "1") as
select * from mysql_all_type_ctas_test.doris_test.t_char;"""
- qt_select_char """select * from
internal.test_mysql_all_types_ctas.t_char order by 1;"""
+ qt_select_char """select * from
internal.test_mysql_all_types_ctas.t_char order by 1;"""
+ }
sql """drop database if exists test_mysql_all_types_ctas;"""
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
