1

liugddx · Jan 24, 2024 · c327440 · c327440
1 parent f1427ba
commit c327440
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy
@@ -475,7 +475,7 @@ class Suite implements GroovyInterceptable {
         runAction(new BenchmarkAction(context), actionSupplier)
     }
 
-    void waitFor(Closure actionSupplier) {
+    void waitForSchemaChangeDone(Closure actionSupplier) {
         runAction(new WaitForAction(context), actionSupplier)
     }
 

diff --git a/regression-test/framework/src/main/groovy/suite.gdsl b/regression-test/framework/src/main/groovy/suite.gdsl
@@ -49,7 +49,7 @@ bindAction("explain", "org.apache.doris.regression.action.ExplainAction")
 bindAction("streamLoad", "org.apache.doris.regression.action.StreamLoadAction")
 bindAction("httpTest", "org.apache.doris.regression.action.HttpCliAction")
 bindAction("benchmark", "org.apache.doris.regression.action.BenchmarkAction")
-bindAction("waitFor", "org.apache.doris.regression.action.WaitForAction")
+bindAction("waitForSchemaChangeDone", "org.apache.doris.regression.action.WaitForAction")
 
 // bind qt_xxx and order_qt_xxx methods
 contributor([suiteContext]) {
@@ -81,7 +81,7 @@ contributor([suiteContext]) {
                         !enclosingCall("explain") &&
                         !enclosingCall("streamLoad") &&
                         !enclosingCall("httpTest") &&
-                        !enclosingCall("waitFor"))) {
+                        !enclosingCall("waitForSchemaChangeDone"))) {
             // bind other suite method and field
             def suiteClass = findClass(suiteClassName)
             delegatesTo(suiteClass)

diff --git a/regression-test/suites/schema_change_p0/test_alter_table_column.groovy b/regression-test/suites/schema_change_p0/test_alter_table_column.groovy
@@ -39,7 +39,7 @@ suite("test_alter_table_column") {
             MODIFY COLUMN value2 INT AFTER value3;
         """
 
-    waitFor {
+    waitForSchemaChangeDone {
         sql """SHOW ALTER TABLE COLUMN WHERE IndexName='${tbName1}' ORDER BY createtime DESC LIMIT 1"""
         time 60
     }
@@ -50,7 +50,7 @@ suite("test_alter_table_column") {
             DROP COLUMN value3;
         """
 
-    waitFor {
+    waitForSchemaChangeDone {
         sql """SHOW ALTER TABLE COLUMN WHERE IndexName='${tbName1}' ORDER BY createtime DESC LIMIT 1"""
         time 60
     }
@@ -78,7 +78,7 @@ suite("test_alter_table_column") {
             ADD COLUMN value2 INT SUM AFTER value1;
         """
 
-    waitFor {
+    waitForSchemaChangeDone {
         sql """SHOW ALTER TABLE COLUMN WHERE IndexName='${tbName2}' ORDER BY createtime DESC LIMIT 1"""
         time 60
     }
@@ -113,7 +113,7 @@ suite("test_alter_table_column") {
             ADD COLUMN value4 ARRAY<INT> NOT NULL DEFAULT '[]' AFTER value3;
         """
 
-    waitFor {
+    waitForSchemaChangeDone {
         sql """SHOW ALTER TABLE COLUMN WHERE IndexName='${tbNameAddArray}' ORDER BY createtime DESC LIMIT 1"""
         time 60
     }
@@ -195,7 +195,7 @@ suite("test_alter_table_column") {
     sql "alter table ${tbName3} add column v2 int sum NULL"
 
 
-    waitFor {
+    waitForSchemaChangeDone {
         sql """SHOW ALTER TABLE COLUMN WHERE IndexName='${tbName3}' ORDER BY createtime DESC LIMIT 1"""
         time 60
     }