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 09f2516c7c6 [fix](test) fix some test cases #43217 (#43216)
09f2516c7c6 is described below
commit 09f2516c7c6c9d0790f5dc9f714fa25ed3e472a7
Author: Mingyu Chen (Rayner) <[email protected]>
AuthorDate: Mon Nov 4 22:15:30 2024 +0800
[fix](test) fix some test cases #43217 (#43216)
bp #43217
---
regression-test/data/audit/test_audit_log_behavior.out | 4 +---
.../external_table_p0/jdbc/test_mysql_jdbc_catalog.out | 18 ++++++++++++++++++
.../suites/audit/test_audit_log_behavior.groovy | 11 +++++++----
.../jdbc/test_mysql_jdbc_catalog.groovy | 1 +
4 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/regression-test/data/audit/test_audit_log_behavior.out
b/regression-test/data/audit/test_audit_log_behavior.out
index 96ad13a4c7c..cfcd49eb639 100644
--- a/regression-test/data/audit/test_audit_log_behavior.out
+++ b/regression-test/data/audit/test_audit_log_behavior.out
@@ -16,15 +16,13 @@ return_rows bigint Yes false \N NONE
shuffle_send_rows bigint Yes false \N NONE
shuffle_send_bytes bigint Yes false \N NONE
stmt_id bigint Yes false \N NONE
-stmt_type varchar(48) Yes false \N NONE
is_query tinyint Yes false \N NONE
-is_nereids tinyint Yes false \N NONE
+is_nereids tinyint Yes false \N NONE
frontend_ip varchar(128) Yes false \N NONE
cpu_time_ms bigint Yes false \N NONE
sql_hash varchar(128) Yes false \N NONE
sql_digest varchar(128) Yes false \N NONE
peak_memory_bytes bigint Yes false \N NONE
workload_group text Yes false \N NONE
-compute_group text Yes false \N NONE
stmt text Yes false \N NONE
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 1caeec713e2..b2101cd96c8 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
@@ -436,6 +436,15 @@ t2 text Yes false \N NONE
varchar varchar(65533) Yes true \N
int_u bigint Yes false \N NONE
+-- !sql --
+int_u bigint Yes true \N
+text varchar(65533) Yes true \N
+t2 varchar(65533) Yes false \N NONE
+
+-- !sql --
+varchar varchar(65533) Yes true \N
+int_u bigint Yes false \N NONE
+
-- !sql --
internal
@@ -870,3 +879,12 @@ t2 text Yes false \N NONE
varchar varchar(65533) Yes true \N
int_u bigint Yes false \N NONE
+-- !sql --
+int_u bigint Yes true \N
+text varchar(65533) Yes true \N
+t2 varchar(65533) Yes false \N NONE
+
+-- !sql --
+varchar varchar(65533) Yes true \N
+int_u bigint Yes false \N NONE
+
diff --git a/regression-test/suites/audit/test_audit_log_behavior.groovy
b/regression-test/suites/audit/test_audit_log_behavior.groovy
index 163de0c931e..0636c2ad7cb 100644
--- a/regression-test/suites/audit/test_audit_log_behavior.groovy
+++ b/regression-test/suites/audit/test_audit_log_behavior.groovy
@@ -82,10 +82,13 @@ suite("test_audit_log_behavior") {
sql tuple2[0]
}
- // make sure audit event is created.
- // see WorkloadRuntimeStatusMgr.getQueryNeedAudit()
- Thread.sleep(6000)
- sql """call flush_audit_log()"""
+ if (on == true) {
+ // only new planner supports call flush_audit_log
+ // make sure audit event is created.
+ // see WorkloadRuntimeStatusMgr.getQueryNeedAudit()
+ Thread.sleep(6000)
+ sql """call flush_audit_log()"""
+ }
// check result
for (int i = 0; i < cnt; i++) {
def tuple2 = sqls.get(i)
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 f6f4b3bc30a..65c4fe39a97 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
@@ -654,6 +654,7 @@ suite("test_mysql_jdbc_catalog",
"p0,external,mysql,external_docker,external_doc
qt_sql """desc ctas_partition_text_4"""
sql """drop catalog if exists mysql_conjuncts;"""
+ sql """set enable_nereids_planner=true"""
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
