This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 04223de2eb4 [chore](test) remove enable_nereids_planner=false in cases
(#41035)
04223de2eb4 is described below
commit 04223de2eb4b9bcc8b3ec9d52ca158a3e6f870a2
Author: morrySnow <[email protected]>
AuthorDate: Fri Sep 20 14:24:14 2024 +0800
[chore](test) remove enable_nereids_planner=false in cases (#41035)
- test_cloud_mow_insert_with_retry
---
.../cloud/test_cloud_mow_insert_with_retry.out | 7 ---
.../cloud/test_cloud_mow_insert_with_retry.groovy | 70 ++++++++++------------
2 files changed, 30 insertions(+), 47 deletions(-)
diff --git
a/regression-test/data/fault_injection_p0/cloud/test_cloud_mow_insert_with_retry.out
b/regression-test/data/fault_injection_p0/cloud/test_cloud_mow_insert_with_retry.out
index 979483692d3..f3a322f2b9f 100644
---
a/regression-test/data/fault_injection_p0/cloud/test_cloud_mow_insert_with_retry.out
+++
b/regression-test/data/fault_injection_p0/cloud/test_cloud_mow_insert_with_retry.out
@@ -6,10 +6,3 @@
-- !sql --
1 1 1
--- !sql --
-1 1 1
-2 2 2
-
--- !sql --
-1 1 1
-
diff --git
a/regression-test/suites/fault_injection_p0/cloud/test_cloud_mow_insert_with_retry.groovy
b/regression-test/suites/fault_injection_p0/cloud/test_cloud_mow_insert_with_retry.groovy
index f7038b80e42..99eb18a4917 100644
---
a/regression-test/suites/fault_injection_p0/cloud/test_cloud_mow_insert_with_retry.groovy
+++
b/regression-test/suites/fault_injection_p0/cloud/test_cloud_mow_insert_with_retry.groovy
@@ -29,11 +29,10 @@ suite("test_cloud_mow_insert_with_retry", "nonConcurrent") {
def dbName = "regression_test_fault_injection_p0_cloud"
def table1 = dbName + ".test_cloud_mow_insert_with_retry"
setFeConfigTemporary(customFeConfig) {
- for (item in ["legacy", "nereids"]) {
- try {
-
GetDebugPoint().enableDebugPointForAllBEs("CloudEngineCalcDeleteBitmapTask.execute.enable_wait")
- sql "DROP TABLE IF EXISTS ${table1} FORCE;"
- sql """ CREATE TABLE IF NOT EXISTS ${table1} (
+ try {
+
GetDebugPoint().enableDebugPointForAllBEs("CloudEngineCalcDeleteBitmapTask.execute.enable_wait")
+ sql "DROP TABLE IF EXISTS ${table1} FORCE;"
+ sql """ CREATE TABLE IF NOT EXISTS ${table1} (
`k1` int NOT NULL,
`c1` int,
`c2` int
@@ -43,44 +42,35 @@ suite("test_cloud_mow_insert_with_retry", "nonConcurrent") {
"enable_unique_key_merge_on_write" = "true",
"disable_auto_compaction" = "true",
"replication_num" = "1"); """
- connect(user = context.config.jdbcUser, password =
context.config.jdbcPassword, url = context.config.jdbcUrl +
"&useLocalSessionState=true") {
- if (item == "nereids") {
- sql """ set enable_nereids_planner=true; """
- sql """ set enable_fallback_to_original_planner=false;
"""
- } else {
- sql """ set enable_nereids_planner = false; """
- }
- def timeout = 2000
- def now = System.currentTimeMillis()
- sql "insert into ${table1} values(1,1,1);"
- def time_diff = System.currentTimeMillis() - now
- logger.info("time_diff:" + time_diff)
- assertTrue(time_diff > timeout, "insert or delete should
take over " + timeout + " ms")
+ connect(user = context.config.jdbcUser, password =
context.config.jdbcPassword, url = context.config.jdbcUrl +
"&useLocalSessionState=true") {
+ def timeout = 2000
+ def now = System.currentTimeMillis()
+ sql "insert into ${table1} values(1,1,1);"
+ def time_diff = System.currentTimeMillis() - now
+ logger.info("time_diff:" + time_diff)
+ assertTrue(time_diff > timeout, "insert or delete should take
over " + timeout + " ms")
- now = System.currentTimeMillis()
- sql "insert into ${table1} values(2,2,2);"
- time_diff = System.currentTimeMillis() - now
- logger.info("time_diff:" + time_diff)
- assertTrue(time_diff > timeout, "insert or delete should
take over " + timeout + " ms")
- order_qt_sql "select * from ${table1};"
+ now = System.currentTimeMillis()
+ sql "insert into ${table1} values(2,2,2);"
+ time_diff = System.currentTimeMillis() - now
+ logger.info("time_diff:" + time_diff)
+ assertTrue(time_diff > timeout, "insert or delete should take
over " + timeout + " ms")
+ order_qt_sql "select * from ${table1};"
- now = System.currentTimeMillis()
- sql "delete from ${table1} where k1=2;"
- time_diff = System.currentTimeMillis() - now
- logger.info("time_diff:" + time_diff)
- assertTrue(time_diff > timeout, "insert or delete should
take over " + timeout + " ms")
- order_qt_sql "select * from ${table1};"
- }
- } catch (Exception e) {
- logger.info(e.getMessage())
- throw e
- } finally {
-
GetDebugPoint().disableDebugPointForAllFEs("CloudEngineCalcDeleteBitmapTask.execute.enable_wait")
- sql "DROP TABLE IF EXISTS ${table1};"
- GetDebugPoint().clearDebugPointsForAllBEs()
+ now = System.currentTimeMillis()
+ sql "delete from ${table1} where k1=2;"
+ time_diff = System.currentTimeMillis() - now
+ logger.info("time_diff:" + time_diff)
+ assertTrue(time_diff > timeout, "insert or delete should take
over " + timeout + " ms")
+ order_qt_sql "select * from ${table1};"
}
+ } catch (Exception e) {
+ logger.info(e.getMessage())
+ throw e
+ } finally {
+
GetDebugPoint().disableDebugPointForAllFEs("CloudEngineCalcDeleteBitmapTask.execute.enable_wait")
+ sql "DROP TABLE IF EXISTS ${table1};"
+ GetDebugPoint().clearDebugPointsForAllBEs()
}
-
}
-
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
