This is an automated email from the ASF dual-hosted git repository.
morningman 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 5ba0da4a84f [fix](test) fix unstable external p0 cases #42069 (#42153)
5ba0da4a84f is described below
commit 5ba0da4a84fd223b18d76a8ba460872f22ac7528
Author: Rayner Chen <morning...@163.com>
AuthorDate: Mon Oct 21 15:04:40 2024 +0800
[fix](test) fix unstable external p0 cases #42069 (#42153)
cherry pick from #42069
---
.../data/external_table_p0/jdbc/test_mysql_jdbc_catalog.out | 3 +++
.../external_table_p0/hive/test_hive_parquet_alter_column.groovy | 4 ++--
regression-test/suites/external_table_p0/hive/test_wide_table.groovy | 2 +-
.../suites/external_table_p0/jdbc/test_clickhouse_jdbc_catalog.groovy | 2 +-
.../suites/external_table_p0/jdbc/test_jdbc_query_tvf.groovy | 2 +-
.../suites/external_table_p0/jdbc/test_mysql_jdbc_catalog.groovy | 1 +
6 files changed, 9 insertions(+), 5 deletions(-)
diff --git
a/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog.out
b/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog.out
index d697c8e5e60..51bad0703d0 100644
--- a/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog.out
+++ b/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog.out
@@ -258,6 +258,9 @@ mysql
-- !ex_tb1 --
{"k1":"v1", "k2":"v2"}
+-- !mysql_all_types_count--
+4
+
-- !mysql_all_types --
\N 302 \N 502 602 4.14159 \N 6.14159 \N -124
-302 2013 -402 -502 -602 \N 2012-10-26T02:08:39.345700
2013-10-26T08:09:18 -5.14145 \N -7.1400 row2 \N
09:11:09.567 text2 0xE86F6C6C6F20576F726C67 \N \N 0x2F
\N 0x88656C6C9F Value3
201 301 401 501 601 3.14159 4.1415926 5.14159 1
-123 -301 2012 -401 -501 -601 2012-10-30
2012-10-25T12:05:36.345700 2012-10-25T08:08:08 -4.14145
-5.1400000001 -6.1400 row1 line1 09:09:09.567 text1
0x48656C6C6F20576F726C64 {"age": 30, "city": "London", "name": "Alice"}
Option1,Option3 0x2A 0x48656C6C6F00000000000000 0x48656C6C6F Value2
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_parquet_alter_column.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_parquet_alter_column.groovy
index f0984c62f68..9020b99c183 100644
---
a/regression-test/suites/external_table_p0/hive/test_hive_parquet_alter_column.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_hive_parquet_alter_column.groovy
@@ -25,7 +25,7 @@ suite("test_hive_parquet_alter_column",
"p0,external,hive,external_docker,extern
for (String hivePrefix : ["hive2", "hive3"]) {
String extHiveHmsHost =
context.config.otherConfigs.get("externalEnvIp")
String extHiveHmsPort = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
- String catalog_name =
"${hivePrefix}_test_hive_partition_column_analyze"
+ String catalog_name = "${hivePrefix}_test_hive_parquet_alter_column"
sql """drop catalog if exists ${catalog_name};"""
sql """
create catalog if not exists ${catalog_name} properties (
@@ -227,4 +227,4 @@ suite("test_hive_parquet_alter_column",
"p0,external,hive,external_docker,extern
order_qt_decimal_decimal """ select col_decimal from
parquet_alter_column_to_decimal where col_decimal=1.5 order by col_decimal
limit 3"""
}
-}
\ No newline at end of file
+}
diff --git
a/regression-test/suites/external_table_p0/hive/test_wide_table.groovy
b/regression-test/suites/external_table_p0/hive/test_wide_table.groovy
index 1c266d22c67..153e125d98c 100644
--- a/regression-test/suites/external_table_p0/hive/test_wide_table.groovy
+++ b/regression-test/suites/external_table_p0/hive/test_wide_table.groovy
@@ -47,7 +47,7 @@ suite("test_wide_table",
"p0,external,hive,external_docker,external_docker_hive"
for (String hivePrefix : ["hive2", "hive3"]) {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
- String catalog_name = "${hivePrefix}_test_complex_types"
+ String catalog_name = "${hivePrefix}_test_wide_table"
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
sql """drop catalog if exists ${catalog_name}"""
diff --git
a/regression-test/suites/external_table_p0/jdbc/test_clickhouse_jdbc_catalog.groovy
b/regression-test/suites/external_table_p0/jdbc/test_clickhouse_jdbc_catalog.groovy
index b1550ed971e..4d8d14f909d 100644
---
a/regression-test/suites/external_table_p0/jdbc/test_clickhouse_jdbc_catalog.groovy
+++
b/regression-test/suites/external_table_p0/jdbc/test_clickhouse_jdbc_catalog.groovy
@@ -117,7 +117,7 @@ suite("test_clickhouse_jdbc_catalog",
"p0,external,clickhouse,external_docker,ex
"test_connection" = "true"
);
"""
- exception "Test FE Connection to JDBC Failed: Can not connect to
jdbc due to error: Code: 516. DB::Exception: default: Authentication failed:
password is incorrect, or there is no user with such name."
+ exception "Test FE Connection to JDBC Failed"
}
sql """ drop catalog if exists ${catalog_name} """
sql """ drop catalog if exists clickhouse_catalog_test_conn_correct """
diff --git
a/regression-test/suites/external_table_p0/jdbc/test_jdbc_query_tvf.groovy
b/regression-test/suites/external_table_p0/jdbc/test_jdbc_query_tvf.groovy
index dcf36554be1..0c1e04afda9 100644
--- a/regression-test/suites/external_table_p0/jdbc/test_jdbc_query_tvf.groovy
+++ b/regression-test/suites/external_table_p0/jdbc/test_jdbc_query_tvf.groovy
@@ -25,7 +25,7 @@ suite("test_jdbc_query_tvf") {
if (enabled != null && enabled.equalsIgnoreCase("true")) {
String user = "test_jdbc_user";
String pwd = '123456';
- String catalog_name = "mysql_jdbc_catalog";
+ String catalog_name = "test_jdbc_query_tvf";
String mysql_port = context.config.otherConfigs.get("mysql_57_port");
sql """drop catalog if exists ${catalog_name} """
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 a510a74b9f0..d97a51ae364 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
@@ -307,6 +307,7 @@ suite("test_mysql_jdbc_catalog",
"p0,external,mysql,external_docker,external_doc
// test all types supported by MySQL
sql """use doris_test;"""
+ qt_mysql_all_types_count """select count(*) from all_types;"""
qt_mysql_all_types """select * from all_types order by tinyint_u;"""
// test insert into internal.db.table select * from all_types
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
