This is an automated email from the ASF dual-hosted git repository.
yiguolei 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 ee47ef88260 [Fix](regression) fix regression sql which has schema
change (#37941) (#38456)
ee47ef88260 is described below
commit ee47ef8826085e0aef0d23f3ea882f7d88d7f1fe
Author: feiniaofeiafei <53502832+feiniaofeia...@users.noreply.github.com>
AuthorDate: Wed Jul 31 22:31:38 2024 +0800
[Fix](regression) fix regression sql which has schema change (#37941)
(#38456)
cherry-pick #37941 to branch-2.1
---
.../org/apache/doris/regression/action/WaitForAction.groovy | 12 +++++++++---
.../suites/ddl_p0/test_create_table_like_nereids.groovy | 13 +++++++++----
2 files changed, 18 insertions(+), 7 deletions(-)
diff --git
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/action/WaitForAction.groovy
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/action/WaitForAction.groovy
index 711fb379a36..fb62081896e 100644
---
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/action/WaitForAction.groovy
+++
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/action/WaitForAction.groovy
@@ -57,15 +57,21 @@ class WaitForAction implements SuiteAction{
if (ObjectUtils.isEmpty(time) || time <= 0) {
time = 600
}
- Awaitility.await().atMost(time,
TimeUnit.SECONDS).with().pollDelay(100,
TimeUnit.MILLISECONDS).and().pollInterval(100,
TimeUnit.MILLISECONDS).await().until(() -> {
+ def forRollUp = sql.toUpperCase().contains("ALTER TABLE ROLLUP")
+ def num = 9
+ if (forRollUp) {
+ num = 8
+ }
+ Awaitility.await().atMost(time,
TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).and()
+ .pollInterval(100, TimeUnit.MILLISECONDS).await().until(() -> {
+ log.info("sql is :\n${sql}")
def (result, meta) =
JdbcUtils.executeToList(context.getConnection(), sql)
- String res = result.get(0).get(9)
+ String res = result.get(0).get(num)
if (res == "FINISHED" || res == "CANCELLED") {
Assert.assertEquals("FINISHED", res)
return true;
}
return false;
});
-
}
}
diff --git
a/regression-test/suites/ddl_p0/test_create_table_like_nereids.groovy
b/regression-test/suites/ddl_p0/test_create_table_like_nereids.groovy
index 9f06f049ce6..08eee916288 100644
--- a/regression-test/suites/ddl_p0/test_create_table_like_nereids.groovy
+++ b/regression-test/suites/ddl_p0/test_create_table_like_nereids.groovy
@@ -20,7 +20,6 @@ suite("test_create_table_like_nereids") {
sql "SET enable_fallback_to_original_planner=false;"
sql "set disable_nereids_rules=PRUNE_EMPTY_PARTITION"
-
sql "drop table if exists mal_test_create_table_like"
sql """create table mal_test_create_table_like(pk int, a int, b int)
distributed by hash(pk) buckets 10
properties('replication_num' = '1');"""
@@ -28,9 +27,15 @@ suite("test_create_table_like_nereids") {
,(3,5,6),(3,5,null),(6,7,1),(2,1,7),(2,4,2),(2,3,9),(1,3,6),(3,5,8),(3,2,8);"""
sql "sync"
sql "alter table mal_test_create_table_like add rollup ru1(a,pk);"
- sleep(2000)
- sql "alter table mal_test_create_table_like add rollup ru2(b,pk);"
- sleep(2000)
+ waitForSchemaChangeDone {
+ sql """show alter table rollup where
tablename='mal_test_create_table_like' order by createtime desc limit 1"""
+ time 600
+ }
+ sql "alter table mal_test_create_table_like add rollup ru2(b,pk)"
+ waitForSchemaChangeDone {
+ sql """show alter table rollup where
tablename='mal_test_create_table_like' order by createtime desc limit 1"""
+ time 600
+ }
// no rollup
sql "drop table if exists table_like"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
