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
commit 980302e5d0c6eb720397230f59051f88f27ff61b Author: meiyi <[email protected]> AuthorDate: Sun Aug 11 17:47:50 2024 +0800 [fix](regression) Fix some insert_p2 cases (#39134) 1. txn load is not supported for mow in cloud mode 2. the `txn_insert_with_schema_change` wait for some specified state of schema change, rather than schema change is done --- .../insert_p2/txn_insert_concurrent_insert_mow.groovy | 5 +++++ .../insert_p2/txn_insert_concurrent_insert_ud.groovy | 5 +++++ .../txn_insert_concurrent_insert_update.groovy | 5 +++++ .../insert_p2/txn_insert_with_schema_change.groovy | 17 ++++++++++++++--- 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/regression-test/suites/insert_p2/txn_insert_concurrent_insert_mow.groovy b/regression-test/suites/insert_p2/txn_insert_concurrent_insert_mow.groovy index cf16dd95540..f8a971db75e 100644 --- a/regression-test/suites/insert_p2/txn_insert_concurrent_insert_mow.groovy +++ b/regression-test/suites/insert_p2/txn_insert_concurrent_insert_mow.groovy @@ -22,6 +22,11 @@ import java.util.concurrent.TimeUnit import java.util.concurrent.CompletableFuture suite("txn_insert_concurrent_insert_mow") { + if (isCloudMode()) { + logger.info("cloud txn load does not support mow") + return + } + def tableName = "txn_insert_concurrent_insert_mow" List<String> errors = new ArrayList<>() diff --git a/regression-test/suites/insert_p2/txn_insert_concurrent_insert_ud.groovy b/regression-test/suites/insert_p2/txn_insert_concurrent_insert_ud.groovy index 7f2f3831149..fe1f5533701 100644 --- a/regression-test/suites/insert_p2/txn_insert_concurrent_insert_ud.groovy +++ b/regression-test/suites/insert_p2/txn_insert_concurrent_insert_ud.groovy @@ -23,6 +23,11 @@ import java.util.concurrent.CompletableFuture // test update and delete command suite("txn_insert_concurrent_insert_ud") { + if (isCloudMode()) { + logger.info("cloud txn load does not support mow") + return + } + def tableName = "txn_insert_concurrent_insert_ud" List<String> errors = new ArrayList<>() diff --git a/regression-test/suites/insert_p2/txn_insert_concurrent_insert_update.groovy b/regression-test/suites/insert_p2/txn_insert_concurrent_insert_update.groovy index 37a9fb8697d..a5d0bcd114b 100644 --- a/regression-test/suites/insert_p2/txn_insert_concurrent_insert_update.groovy +++ b/regression-test/suites/insert_p2/txn_insert_concurrent_insert_update.groovy @@ -23,6 +23,11 @@ import java.util.concurrent.CompletableFuture // test partial columns update suite("txn_insert_concurrent_insert_update") { + if (isCloudMode()) { + logger.info("cloud txn load does not support mow") + return + } + def tableName = "txn_insert_concurrent_insert_update" List<String> errors = new ArrayList<>() diff --git a/regression-test/suites/insert_p2/txn_insert_with_schema_change.groovy b/regression-test/suites/insert_p2/txn_insert_with_schema_change.groovy index e16be16c6d2..3fef927c322 100644 --- a/regression-test/suites/insert_p2/txn_insert_with_schema_change.groovy +++ b/regression-test/suites/insert_p2/txn_insert_with_schema_change.groovy @@ -96,10 +96,21 @@ suite("txn_insert_with_schema_change") { def getAlterTableState = { tName, job_state -> def retry = 0 sql "use ${dbName};" - waitForSchemaChangeDone { - sql """ SHOW ALTER TABLE COLUMN WHERE tablename='${tName}' ORDER BY createtime DESC LIMIT 1 """ - time 600 + def last_state = "" + while (true) { + sleep(2000) + def state = sql """ show alter table column where tablename = "${tName}" order by CreateTime desc limit 1""" + logger.info("alter table state: ${state}") + last_state = state[0][9] + if (state.size() > 0 && last_state == job_state) { + return + } + retry++ + if (retry >= 10 || last_state == "FINISHED" || last_state == "CANCELLED") { + break + } } + assertTrue(false, "alter table job state is ${last_state}, not ${job_state} after retry ${retry} times") } // sqls size is 2 --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
