From eef6a0e7a3f3832e87416590e72c10545dd5aaaf Mon Sep 17 00:00:00 2001 From: "Mingyu Chen (Rayner)" Date: Wed, 6 Nov 2024 14:00:48 +0800 Subject: [PATCH] [fix](test) fix some test cases (#43217) ### What problem does this PR solve? Problem Summary: 1. add some missing output blocks for `test_audit_log_behavior.out` 2. `call flush_audit_log()` does not support old planner, add check for it. followup #42262 --- .../jdbc/test_mysql_jdbc_catalog.out | 18 ++++++++++++++++++ .../audit/test_audit_log_behavior.groovy | 11 +++++++---- .../jdbc/test_mysql_jdbc_catalog.groovy | 1 + 3 files changed, 26 insertions(+), 4 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 1caeec713e269c..b2101cd96c87b7 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 c895abd2c3f6ce..3d24eb2e26dc9e 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 a88ba550eea87f..c97c74ec28eb0f 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 @@ -643,6 +643,7 @@ suite("test_mysql_jdbc_catalog", "p0,external,mysql,external_docker,external_doc // ctas logic is different between new and old planner. // so need to test both. sql """drop catalog if exists mysql_conjuncts;""" + sql """set enable_nereids_planner=true""" } }