From 1084bba4b8b78ea29c37c0a8be226160d57fc596 Mon Sep 17 00:00:00 2001 From: shuke987 Date: Thu, 19 Dec 2024 11:57:58 +0800 Subject: [PATCH] fix await bugs --- .../plugins/plugin_compaction.groovy | 4 ++-- ...st_delete_sign_with_cumu_compaction.groovy | 4 ++-- ...stale_resp_load_compaction_conflict.groovy | 2 +- ...date_compaction_with_higher_version.groovy | 2 +- ...ial_update_conflict_skip_compaction.groovy | 2 +- ...test_partial_update_skip_compaction.groovy | 2 +- ...umn_with_delete_drop_column_dup_key.groovy | 14 +++++------ ..._with_delete_drop_column_unique_key.groovy | 10 ++++---- .../test_agg_keys_schema_change_datev2.groovy | 12 +++++----- ...est_schema_change_varchar_to_datev2.groovy | 2 +- ...st_agg_keys_schema_change_decimalv2.groovy | 20 ++++++++-------- ...st_agg_keys_schema_change_decimalv3.groovy | 10 ++++---- .../test_dup_keys_schema_change.groovy | 2 +- .../test_dup_mv_schema_change.groovy | 2 +- .../test_dup_rollup_schema_change.groovy | 2 +- .../test_uniq_mv_schema_change.groovy | 2 +- .../test_uniq_rollup_schema_change.groovy | 4 ++-- .../test_varchar_schema_change.groovy | 6 ++--- ...l_update_insert_light_schema_change.groovy | 14 +++++------ ...partial_update_insert_schema_change.groovy | 14 +++++------ .../test_partial_update_schema_change.groovy | 24 +++++++++---------- ...tial_update_schema_change_row_store.groovy | 24 +++++++++---------- ...l_update_insert_light_schema_change.groovy | 14 +++++------ ...partial_update_insert_schema_change.groovy | 14 +++++------ .../test_partial_update_schema_change.groovy | 24 +++++++++---------- ...tial_update_schema_change_row_store.groovy | 24 +++++++++---------- 26 files changed, 127 insertions(+), 127 deletions(-) diff --git a/regression-test/plugins/plugin_compaction.groovy b/regression-test/plugins/plugin_compaction.groovy index 04aa24d1b9e3a8..d7f459036de0ce 100644 --- a/regression-test/plugins/plugin_compaction.groovy +++ b/regression-test/plugins/plugin_compaction.groovy @@ -34,13 +34,13 @@ Suite.metaClass.checkComactionStatus = { String backendIP, String backendPort, S } Suite.metaClass.assertCompactionStatus = { String backendIP, String backendPort, String tabletID -> - Awaitility.await().untilAsserted({ + Awaitility.await().pollInterval(1, SECONDS).untilAsserted({ assert checkComactionStatus(backendIP, backendPort, tabletID) }) } Suite.metaClass.assertCompactionStatusAtMost = { String backendIP, String backendPort, String tabletID, long t, TimeUnit tu -> - Awaitility.await().atMost(t, tu).untilAsserted({ + Awaitility.await().atMost(t, tu).pollInterval(1, SECONDS).untilAsserted({ assert checkComactionStatus(backendIP, backendPort, tabletID) }) } diff --git a/regression-test/suites/delete_p0/test_delete_sign_with_cumu_compaction.groovy b/regression-test/suites/delete_p0/test_delete_sign_with_cumu_compaction.groovy index eca0ed41128cc8..8f9ddb68101bfc 100644 --- a/regression-test/suites/delete_p0/test_delete_sign_with_cumu_compaction.groovy +++ b/regression-test/suites/delete_p0/test_delete_sign_with_cumu_compaction.groovy @@ -68,7 +68,7 @@ suite('test_delete_sign_with_cumu_compaction') { def waitForCompaction = { be_host, be_http_port -> // wait for all compactions done - Awaitility.await().atMost(30, SECONDS).pollInterval(1, SECONDS).until { + Awaitility.await().atMost(30, SECONDS).pollDelay(10, TimeUnit.SECONDS).pollInterval(1, SECONDS).untilAsserted { String tablet_id = tablet[0] StringBuilder sb = new StringBuilder(); sb.append("curl -X GET http://${be_host}:${be_http_port}") @@ -85,7 +85,7 @@ suite('test_delete_sign_with_cumu_compaction') { def compactionStatus = parseJson(out.trim()) assertEquals("success", compactionStatus.status.toLowerCase()) - !compactionStatus.run_status + assert !compactionStatus.run_status } } diff --git a/regression-test/suites/fault_injection_p0/cloud/test_cloud_mow_stale_resp_load_compaction_conflict.groovy b/regression-test/suites/fault_injection_p0/cloud/test_cloud_mow_stale_resp_load_compaction_conflict.groovy index 8f4fa45700b81f..a769730f576f4a 100644 --- a/regression-test/suites/fault_injection_p0/cloud/test_cloud_mow_stale_resp_load_compaction_conflict.groovy +++ b/regression-test/suites/fault_injection_p0/cloud/test_cloud_mow_stale_resp_load_compaction_conflict.groovy @@ -92,7 +92,7 @@ suite("test_cloud_mow_stale_resp_load_compaction_conflict", "nonConcurrent") { Assert.assertEquals("success", compactJson.status.toLowerCase()) // wait for full compaction to complete - Awaitility.await().atMost(3, TimeUnit.SECONDS).pollDelay(200, TimeUnit.MILLISECONDS).pollInterval(100, TimeUnit.MILLISECONDS).until( + Awaitility.await().atMost(30, TimeUnit.SECONDS).pollDelay(10, TimeUnit.SECONDS).pollInterval(1, TimeUnit.SECONDS).until( { (code, out, err) = be_get_compaction_status(tabletBackend.Host, tabletBackend.HttpPort, tabletId) logger.info("Get compaction status: code=" + code + ", out=" + out + ", err=" + err) diff --git a/regression-test/suites/fault_injection_p0/partial_update/test_partial_update_compaction_with_higher_version.groovy b/regression-test/suites/fault_injection_p0/partial_update/test_partial_update_compaction_with_higher_version.groovy index b5ae14957a706f..34ff11f28755b3 100644 --- a/regression-test/suites/fault_injection_p0/partial_update/test_partial_update_compaction_with_higher_version.groovy +++ b/regression-test/suites/fault_injection_p0/partial_update/test_partial_update_compaction_with_higher_version.groovy @@ -172,7 +172,7 @@ suite("test_partial_update_compaction_with_higher_version", "nonConcurrent") { Assert.assertEquals("success", compactJson.status.toLowerCase()) // wait for full compaction to complete - Awaitility.await().atMost(3, TimeUnit.SECONDS).pollDelay(200, TimeUnit.MILLISECONDS).pollInterval(100, TimeUnit.MILLISECONDS).until( + Awaitility.await().atMost(30, TimeUnit.SECONDS).pollDelay(10, TimeUnit.SECONDS).pollInterval(1, TimeUnit.SECONDS).until( { (code, out, err) = be_get_compaction_status(tabletBackend.Host, tabletBackend.HttpPort, tabletId) logger.info("Get compaction status: code=" + code + ", out=" + out + ", err=" + err) diff --git a/regression-test/suites/fault_injection_p0/partial_update/test_partial_update_conflict_skip_compaction.groovy b/regression-test/suites/fault_injection_p0/partial_update/test_partial_update_conflict_skip_compaction.groovy index 08eba337af3327..3974918a4de08a 100644 --- a/regression-test/suites/fault_injection_p0/partial_update/test_partial_update_conflict_skip_compaction.groovy +++ b/regression-test/suites/fault_injection_p0/partial_update/test_partial_update_conflict_skip_compaction.groovy @@ -155,7 +155,7 @@ suite("test_partial_update_conflict_skip_compaction", "nonConcurrent") { Assert.assertEquals("success", compactJson.status.toLowerCase()) // wait for full compaction to complete - Awaitility.await().atMost(3, TimeUnit.SECONDS).pollDelay(200, TimeUnit.MILLISECONDS).pollInterval(100, TimeUnit.MILLISECONDS).until( + Awaitility.await().atMost(30, TimeUnit.SECONDS).pollDelay(10, TimeUnit.SECONDS).pollInterval(1, TimeUnit.SECONDS).until( { (code, out, err) = be_get_compaction_status(tabletBackend.Host, tabletBackend.HttpPort, tabletId) logger.info("Get compaction status: code=" + code + ", out=" + out + ", err=" + err) diff --git a/regression-test/suites/fault_injection_p0/partial_update/test_partial_update_skip_compaction.groovy b/regression-test/suites/fault_injection_p0/partial_update/test_partial_update_skip_compaction.groovy index d816c30f7e9bd8..54589864d77b4c 100644 --- a/regression-test/suites/fault_injection_p0/partial_update/test_partial_update_skip_compaction.groovy +++ b/regression-test/suites/fault_injection_p0/partial_update/test_partial_update_skip_compaction.groovy @@ -144,7 +144,7 @@ suite("test_partial_update_skip_compaction", "nonConcurrent") { Assert.assertEquals("success", compactJson.status.toLowerCase()) // wait for full compaction to complete - Awaitility.await().atMost(3, TimeUnit.SECONDS).pollDelay(200, TimeUnit.MILLISECONDS).pollInterval(100, TimeUnit.MILLISECONDS).until( + Awaitility.await().atMost(30, TimeUnit.SECONDS).pollDelay(10, TimeUnit.SECONDS).pollInterval(1, TimeUnit.SECONDS).until( { (code, out, err) = be_get_compaction_status(tabletBackend.Host, tabletBackend.HttpPort, tabletId) logger.info("Get compaction status: code=" + code + ", out=" + out + ", err=" + err) diff --git a/regression-test/suites/schema_change/test_alter_table_column_with_delete_drop_column_dup_key.groovy b/regression-test/suites/schema_change/test_alter_table_column_with_delete_drop_column_dup_key.groovy index 1f9336ae3b3492..bf44c7f2d29c73 100644 --- a/regression-test/suites/schema_change/test_alter_table_column_with_delete_drop_column_dup_key.groovy +++ b/regression-test/suites/schema_change/test_alter_table_column_with_delete_drop_column_dup_key.groovy @@ -50,7 +50,7 @@ suite("test_alter_table_column_with_delete_drop_column_dup_key", "schema_change" """ int max_try_secs = 1200 String res = "NOT_FINISHED" - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { res = getJobState(tbName1) if (res == "FINISHED" || res == "CANCELLED") { assertEquals("FINISHED", res) @@ -66,7 +66,7 @@ suite("test_alter_table_column_with_delete_drop_column_dup_key", "schema_change" ADD COLUMN value3 CHAR(100) DEFAULT 'A'; """ max_try_secs = 1200 - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { res = getJobState(tbName1) if (res == "FINISHED" || res == "CANCELLED") { assertEquals("FINISHED", res) @@ -113,7 +113,7 @@ suite("test_alter_table_column_with_delete_drop_column_dup_key", "schema_change" ALTER TABLE ${tbName1} DROP COLUMN value3; """ - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { res = getJobState(tbName1) if (res == "FINISHED" || res == "CANCELLED") { assertEquals("FINISHED", res) @@ -128,7 +128,7 @@ suite("test_alter_table_column_with_delete_drop_column_dup_key", "schema_change" ALTER TABLE ${tbName1} ADD COLUMN value3 CHAR(100) DEFAULT 'A'; """ - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { res = getJobState(tbName1) if (res == "FINISHED" || res == "CANCELLED") { assertEquals("FINISHED", res) @@ -146,7 +146,7 @@ suite("test_alter_table_column_with_delete_drop_column_dup_key", "schema_change" ALTER TABLE ${tbName1} ADD COLUMN k2 CHAR(10) KEY DEFAULT 'A'; """ - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { res = getJobState(tbName1) if (res == "FINISHED" || res == "CANCELLED") { assertEquals("FINISHED", res) @@ -190,7 +190,7 @@ suite("test_alter_table_column_with_delete_drop_column_dup_key", "schema_change" ALTER TABLE ${tbName1} DROP COLUMN value3; """ - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { res = getJobState(tbName1) if (res == "FINISHED" || res == "CANCELLED") { assertEquals("FINISHED", res) @@ -206,7 +206,7 @@ suite("test_alter_table_column_with_delete_drop_column_dup_key", "schema_change" ADD COLUMN value3 CHAR(100) DEFAULT 'A'; """ - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { res = getJobState(tbName1) if (res == "FINISHED" || res == "CANCELLED") { assertEquals("FINISHED", res) diff --git a/regression-test/suites/schema_change/test_alter_table_column_with_delete_drop_column_unique_key.groovy b/regression-test/suites/schema_change/test_alter_table_column_with_delete_drop_column_unique_key.groovy index 2026b87c367f4c..5b1f4c154668cf 100644 --- a/regression-test/suites/schema_change/test_alter_table_column_with_delete_drop_column_unique_key.groovy +++ b/regression-test/suites/schema_change/test_alter_table_column_with_delete_drop_column_unique_key.groovy @@ -52,7 +52,7 @@ suite("test_alter_table_column_with_delete_drop_column_unique_key", "schema_chan """ int max_try_secs = 1200 String res = "NOT_FINISHED" - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { res = getJobState(tbName1) if (res == "FINISHED" || res == "CANCELLED") { assertEquals("FINISHED", res) @@ -67,7 +67,7 @@ suite("test_alter_table_column_with_delete_drop_column_unique_key", "schema_chan ALTER TABLE ${tbName1} ADD COLUMN value3 CHAR(100) DEFAULT 'A'; """ - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { res = getJobState(tbName1) if (res == "FINISHED" || res == "CANCELLED") { assertEquals("FINISHED", res) @@ -115,7 +115,7 @@ suite("test_alter_table_column_with_delete_drop_column_unique_key", "schema_chan ALTER TABLE ${tbName1} DROP COLUMN k2; """ - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { res = getJobState(tbName1) if (res == "FINISHED" || res == "CANCELLED") { assertEquals("FINISHED", res) @@ -130,7 +130,7 @@ suite("test_alter_table_column_with_delete_drop_column_unique_key", "schema_chan ALTER TABLE ${tbName1} ADD COLUMN value3 CHAR(100) DEFAULT 'A'; """ - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { res = getJobState(tbName1) if (res == "FINISHED" || res == "CANCELLED") { assertEquals("FINISHED", res) @@ -148,7 +148,7 @@ suite("test_alter_table_column_with_delete_drop_column_unique_key", "schema_chan ALTER TABLE ${tbName1} ADD COLUMN k2 CHAR(10) KEY DEFAULT 'A'; """ - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { res = getJobState(tbName1) if (res == "FINISHED" || res == "CANCELLED") { assertEquals("FINISHED", res) diff --git a/regression-test/suites/schema_change_p0/datev2/test_agg_keys_schema_change_datev2.groovy b/regression-test/suites/schema_change_p0/datev2/test_agg_keys_schema_change_datev2.groovy index 4190330415f591..1e41b326ee9893 100644 --- a/regression-test/suites/schema_change_p0/datev2/test_agg_keys_schema_change_datev2.groovy +++ b/regression-test/suites/schema_change_p0/datev2/test_agg_keys_schema_change_datev2.groovy @@ -85,7 +85,7 @@ suite("test_agg_keys_schema_change_datev2") { sql """ alter table ${tbName} add column `datev3` datev2 DEFAULT '2022-01-01' """ int max_try_secs = 300 - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { String result = getJobState(tbName) if (result == "FINISHED") { return true; @@ -102,7 +102,7 @@ suite("test_agg_keys_schema_change_datev2") { sql """sync""" qt_sql """select * from ${tbName} ORDER BY `datek1`;""" sql """ alter table ${tbName} drop column `datev3` """ - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { String result = getJobState(tbName) if (result == "FINISHED") { return true; @@ -125,7 +125,7 @@ suite("test_agg_keys_schema_change_datev2") { sql """sync""" qt_sql """select * from ${tbName} ORDER BY `datek1`;""" sql """ alter table ${tbName} add column `datev3` datetimev2 DEFAULT '2022-01-01 11:11:11' """ - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { String result = getJobState(tbName) if (result == "FINISHED") { return true; @@ -141,7 +141,7 @@ suite("test_agg_keys_schema_change_datev2") { sql """sync""" qt_sql """select * from ${tbName} ORDER BY `datek1`;""" sql """ alter table ${tbName} drop column `datev3` """ - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { String result = getJobState(tbName) if (result == "FINISHED") { return true; @@ -165,7 +165,7 @@ suite("test_agg_keys_schema_change_datev2") { qt_sql """select * from ${tbName} ORDER BY `datek1`;""" sql """ alter table ${tbName} add column `datev3` datetimev2(3) DEFAULT '2022-01-01 11:11:11.111' """ - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { String result = getJobState(tbName) if (result == "FINISHED") { return true; @@ -191,7 +191,7 @@ suite("test_agg_keys_schema_change_datev2") { qt_sql """select * from ${tbName} ORDER BY `datek1`;""" sql """ alter table ${tbName} drop column `datev3` """ - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { String result = getJobState(tbName) if (result == "FINISHED") { return true; diff --git a/regression-test/suites/schema_change_p0/datev2/test_schema_change_varchar_to_datev2.groovy b/regression-test/suites/schema_change_p0/datev2/test_schema_change_varchar_to_datev2.groovy index 8586fd8b525810..e65c54fb8b203a 100644 --- a/regression-test/suites/schema_change_p0/datev2/test_schema_change_varchar_to_datev2.groovy +++ b/regression-test/suites/schema_change_p0/datev2/test_schema_change_varchar_to_datev2.groovy @@ -75,7 +75,7 @@ suite("test_schema_change_varchar_to_datev2") { sql """ alter table ${tbName} modify column `k3` date; """ int max_try_secs = 300 - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { String result = getJobState(tbName) if (result == "FINISHED") { return true; diff --git a/regression-test/suites/schema_change_p0/decimalv2/test_agg_keys_schema_change_decimalv2.groovy b/regression-test/suites/schema_change_p0/decimalv2/test_agg_keys_schema_change_decimalv2.groovy index f19b026ffe727e..7bf4e28730f75a 100644 --- a/regression-test/suites/schema_change_p0/decimalv2/test_agg_keys_schema_change_decimalv2.groovy +++ b/regression-test/suites/schema_change_p0/decimalv2/test_agg_keys_schema_change_decimalv2.groovy @@ -90,7 +90,7 @@ suite("test_agg_keys_schema_change_decimalv2", "nonConcurrent") { sql """ alter table ${tbName} add column `decimalv2v3` decimalv2(27,9) """ int max_try_secs = 300 - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(500, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(500, TimeUnit.MILLISECONDS).until(() -> { String result = getJobState(tbName) if (result == "FINISHED") { return true; @@ -105,7 +105,7 @@ suite("test_agg_keys_schema_change_decimalv2", "nonConcurrent") { qt_sql3 """select * from ${tbName} ORDER BY 1,2,3,4;""" sql """ alter table ${tbName} drop column `decimalv2v3` """ - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(500, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(500, TimeUnit.MILLISECONDS).until(() -> { String result = getJobState(tbName) if (result == "FINISHED") { return true; @@ -118,7 +118,7 @@ suite("test_agg_keys_schema_change_decimalv2", "nonConcurrent") { // DECIMALV2(21,3) -> decimalv3 OK sql """ alter table ${tbName} modify column decimalv2k2 DECIMALV3(21,3) key """ - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(500, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(500, TimeUnit.MILLISECONDS).until(() -> { String result = getJobState(tbName) if (result == "FINISHED") { return true; @@ -131,7 +131,7 @@ suite("test_agg_keys_schema_change_decimalv2", "nonConcurrent") { // DECIMALV2(21,3) -> decimalv3 OK sql """ alter table ${tbName} modify column decimalv2k3 DECIMALV3(38,10) key """ - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(500, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(500, TimeUnit.MILLISECONDS).until(() -> { String result = getJobState(tbName) if (result == "FINISHED") { return true; @@ -144,7 +144,7 @@ suite("test_agg_keys_schema_change_decimalv2", "nonConcurrent") { // DECIMALV2(27,9) -> decimalv3, round scale part, not overflow sql """ alter table ${tbName} modify column decimalv2v1 DECIMALV3(26,8) sum """ - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(500, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(500, TimeUnit.MILLISECONDS).until(() -> { String result = getJobState(tbName) if (result == "FINISHED") { return true; @@ -158,7 +158,7 @@ suite("test_agg_keys_schema_change_decimalv2", "nonConcurrent") { // DECIMALV2(21,3) -> decimalv3, round scale part, overflow sql """ alter table ${tbName} modify column decimalv2v2 DECIMALV3(20,2) sum """ - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(500, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(500, TimeUnit.MILLISECONDS).until(() -> { String result = getJobState(tbName) if (result == "CANCELLED") { return true; @@ -172,7 +172,7 @@ suite("test_agg_keys_schema_change_decimalv2", "nonConcurrent") { // DECIMALV2(21,3) -> decimalv3, narrow integral, overflow sql """ alter table ${tbName} modify column decimalv2v2 DECIMALV3(20,3) sum """ - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(500, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(500, TimeUnit.MILLISECONDS).until(() -> { String result = getJobState(tbName) if (result == "CANCELLED") { return true; @@ -187,7 +187,7 @@ suite("test_agg_keys_schema_change_decimalv2", "nonConcurrent") { // DECIMALV3(21,3) -> decimalv2 OK sql """ alter table ${tbName} modify column decimalv2k2 DECIMALV2(21,3) key """ - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(500, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(500, TimeUnit.MILLISECONDS).until(() -> { String result = getJobState(tbName) if (result == "FINISHED") { return true; @@ -201,7 +201,7 @@ suite("test_agg_keys_schema_change_decimalv2", "nonConcurrent") { // DECIMALV3(26,8) -> decimalv2 sql """ alter table ${tbName} modify column decimalv2v1 DECIMALV2(25,7) sum """ - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(500, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(500, TimeUnit.MILLISECONDS).until(() -> { String result = getJobState(tbName) if (result == "FINISHED") { return true; @@ -215,7 +215,7 @@ suite("test_agg_keys_schema_change_decimalv2", "nonConcurrent") { // DECIMALV3(26,8) -> decimalv2, narrow integer sql """ alter table ${tbName} modify column decimalv2v1 DECIMALV2(25,8) sum """ - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(500, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(500, TimeUnit.MILLISECONDS).until(() -> { String result = getJobState(tbName) if (result == "FINISHED") { return true; diff --git a/regression-test/suites/schema_change_p0/decimalv3/test_agg_keys_schema_change_decimalv3.groovy b/regression-test/suites/schema_change_p0/decimalv3/test_agg_keys_schema_change_decimalv3.groovy index ee75826c7aa6af..bb14276d3ff1f8 100644 --- a/regression-test/suites/schema_change_p0/decimalv3/test_agg_keys_schema_change_decimalv3.groovy +++ b/regression-test/suites/schema_change_p0/decimalv3/test_agg_keys_schema_change_decimalv3.groovy @@ -74,7 +74,7 @@ suite("test_agg_keys_schema_change_decimalv3") { sql """ alter table ${tbName} add column `decimalv3v3` DECIMALV3(38,4) """ int max_try_secs = 300 - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { String result = getJobState(tbName) if (result == "FINISHED") { return true; @@ -88,7 +88,7 @@ suite("test_agg_keys_schema_change_decimalv3") { sql """sync""" qt_sql """select * from ${tbName} ORDER BY `decimalv3k1`;""" sql """ alter table ${tbName} drop column `decimalv3v3` """ - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { String result = getJobState(tbName) if (result == "FINISHED") { return true; @@ -99,7 +99,7 @@ suite("test_agg_keys_schema_change_decimalv3") { sql """sync""" qt_sql """select * from ${tbName} ORDER BY `decimalv3k1`;""" sql """ alter table ${tbName} modify column decimalv3k2 DECIMALV3(19,3) key """ - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { String result = getJobState(tbName) if (result == "CANCELLED") { return true; @@ -112,7 +112,7 @@ suite("test_agg_keys_schema_change_decimalv3") { qt_sql """select * from ${tbName} ORDER BY `decimalv3k1`;""" sql """ alter table ${tbName} modify column decimalv3k2 DECIMALV3(38,10) key """ - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { String result = getJobState(tbName) if (result == "CANCELLED") { return true; @@ -124,7 +124,7 @@ suite("test_agg_keys_schema_change_decimalv3") { qt_sql """select * from ${tbName} ORDER BY `decimalv3k1`;""" sql """ alter table ${tbName} modify column decimalv3k2 DECIMALV3(16,3) key """ - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { String result = getJobState(tbName) if (result == "CANCELLED") { return true; diff --git a/regression-test/suites/schema_change_p0/test_dup_keys_schema_change.groovy b/regression-test/suites/schema_change_p0/test_dup_keys_schema_change.groovy index 0f1ddb0201e37b..c0e8be0266d68b 100644 --- a/regression-test/suites/schema_change_p0/test_dup_keys_schema_change.groovy +++ b/regression-test/suites/schema_change_p0/test_dup_keys_schema_change.groovy @@ -101,7 +101,7 @@ suite ("test_dup_keys_schema_change") { ALTER TABLE ${tableName} DROP COLUMN sex """ int max_try_time = 300 - Awaitility.await().atMost(max_try_time, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_time, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { String result = getJobState(tableName) if (result == "FINISHED") { return true; diff --git a/regression-test/suites/schema_change_p0/test_dup_mv_schema_change.groovy b/regression-test/suites/schema_change_p0/test_dup_mv_schema_change.groovy index cc8f30dd862f4b..c96aa09eaa113c 100644 --- a/regression-test/suites/schema_change_p0/test_dup_mv_schema_change.groovy +++ b/regression-test/suites/schema_change_p0/test_dup_mv_schema_change.groovy @@ -27,7 +27,7 @@ suite ("test_dup_mv_schema_change") { } def waitForJob = (tbName, timeout) -> { - Awaitility.await().atMost(timeout, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(timeout, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { String result = getJobState(tbName) if (result == "FINISHED") { return true; diff --git a/regression-test/suites/schema_change_p0/test_dup_rollup_schema_change.groovy b/regression-test/suites/schema_change_p0/test_dup_rollup_schema_change.groovy index 6278bf83d26d12..70baf71204efe3 100644 --- a/regression-test/suites/schema_change_p0/test_dup_rollup_schema_change.groovy +++ b/regression-test/suites/schema_change_p0/test_dup_rollup_schema_change.groovy @@ -29,7 +29,7 @@ suite ("test_dup_rollup_schema_change") { return jobStateResult[0][9] } def waitForMVJob = (tbName, timeout) -> { - Awaitility.await().atMost(timeout, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(timeout, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { String result = getMVJobState(tbName) if (result == "FINISHED") { return true; diff --git a/regression-test/suites/schema_change_p0/test_uniq_mv_schema_change.groovy b/regression-test/suites/schema_change_p0/test_uniq_mv_schema_change.groovy index 04443288db5f66..cf75d4b599c6f2 100644 --- a/regression-test/suites/schema_change_p0/test_uniq_mv_schema_change.groovy +++ b/regression-test/suites/schema_change_p0/test_uniq_mv_schema_change.groovy @@ -26,7 +26,7 @@ suite ("test_uniq_mv_schema_change") { return jobStateResult[0][8] } def waitForJob = (tbName, timeout) -> { - Awaitility.await().atMost(timeout, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(timeout, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { String result = getMVJobState(tbName) if (result == "FINISHED") { return true; diff --git a/regression-test/suites/schema_change_p0/test_uniq_rollup_schema_change.groovy b/regression-test/suites/schema_change_p0/test_uniq_rollup_schema_change.groovy index e56c61a20d6bfb..42151e426a5d37 100644 --- a/regression-test/suites/schema_change_p0/test_uniq_rollup_schema_change.groovy +++ b/regression-test/suites/schema_change_p0/test_uniq_rollup_schema_change.groovy @@ -30,7 +30,7 @@ suite ("test_uniq_rollup_schema_change") { return jobStateResult[0][9] } def waitForMVJob = (tbName, timeout) -> { - Awaitility.await().atMost(timeout, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(timeout, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { String result = getMVJobState(tbName) if (result == "FINISHED") { return true; @@ -132,7 +132,7 @@ suite ("test_uniq_rollup_schema_change") { """ def max_try_time = 300 - Awaitility.await().atMost(max_try_time, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_time, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { String result = getJobState(tableName) if (result == "FINISHED") { return true; diff --git a/regression-test/suites/schema_change_p0/test_varchar_schema_change.groovy b/regression-test/suites/schema_change_p0/test_varchar_schema_change.groovy index c000a03fa35c40..f8cab105f25a42 100644 --- a/regression-test/suites/schema_change_p0/test_varchar_schema_change.groovy +++ b/regression-test/suites/schema_change_p0/test_varchar_schema_change.groovy @@ -66,7 +66,7 @@ suite ("test_varchar_schema_change") { sql """ alter table ${tableName} modify column c2 varchar(30) """ int max_try_secs = 300 - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { String result = getJobState(tableName) if (result == "FINISHED") { return true; @@ -89,7 +89,7 @@ suite ("test_varchar_schema_change") { sql """ insert into ${tableName} values(55,'2019-11-21',21474,'123aa') """ sql """ alter table ${tableName} modify column c2 INT """ - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { String result = getJobState(tableName) if (result == "CANCELLED" || result == "FINISHED") { assertEquals(result, "CANCELLED") @@ -131,7 +131,7 @@ suite ("test_varchar_schema_change") { modify column c2 varchar(40), modify column c3 varchar(6) DEFAULT '0' """ - Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { String result = getJobState(tableName) if (result == "FINISHED") { return true; diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_insert_light_schema_change.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_insert_light_schema_change.groovy index 135c18f4fc7141..1d35996c1c721a 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_insert_light_schema_change.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_insert_light_schema_change.groovy @@ -65,7 +65,7 @@ suite("test_partial_update_insert_light_schema_change", "p0") { sql " ALTER table ${tableName} add column c10 INT DEFAULT '0' " def try_times=1200 // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -125,7 +125,7 @@ suite("test_partial_update_insert_light_schema_change", "p0") { // schema change sql " ALTER table ${tableName} DROP COLUMN c8 " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -205,7 +205,7 @@ suite("test_partial_update_insert_light_schema_change", "p0") { // schema change sql " ALTER table ${tableName} MODIFY COLUMN c2 double " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -243,7 +243,7 @@ suite("test_partial_update_insert_light_schema_change", "p0") { // schema change sql """ ALTER table ${tableName} ADD COLUMN c1 int key default "0"; """ // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -254,7 +254,7 @@ suite("test_partial_update_insert_light_schema_change", "p0") { sql " ALTER table ${tableName} ADD COLUMN c2 int null " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -265,7 +265,7 @@ suite("test_partial_update_insert_light_schema_change", "p0") { sql " ALTER table ${tableName} ADD COLUMN c3 int null " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -321,7 +321,7 @@ suite("test_partial_update_insert_light_schema_change", "p0") { sql " CREATE INDEX test ON ${tableName} (c1) USING BITMAP " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_insert_schema_change.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_insert_schema_change.groovy index 62140ac58bf1cf..9d6a7f1e78ded4 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_insert_schema_change.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_insert_schema_change.groovy @@ -57,7 +57,7 @@ suite("test_partial_update_insert_schema_change", "p0") { sql " ALTER table ${tableName} add column c10 INT DEFAULT '0' " def try_times=1200 // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -117,7 +117,7 @@ suite("test_partial_update_insert_schema_change", "p0") { // schema change sql " ALTER table ${tableName} DROP COLUMN c8 " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -196,7 +196,7 @@ suite("test_partial_update_insert_schema_change", "p0") { // schema change sql " ALTER table ${tableName} MODIFY COLUMN c2 double " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -233,7 +233,7 @@ suite("test_partial_update_insert_schema_change", "p0") { // schema change sql """ ALTER table ${tableName} ADD COLUMN c1 int key default "0"; """ // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -244,7 +244,7 @@ suite("test_partial_update_insert_schema_change", "p0") { sql " ALTER table ${tableName} ADD COLUMN c2 int null " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -255,7 +255,7 @@ suite("test_partial_update_insert_schema_change", "p0") { sql " ALTER table ${tableName} ADD COLUMN c3 int null " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -312,7 +312,7 @@ suite("test_partial_update_insert_schema_change", "p0") { sql " CREATE INDEX test ON ${tableName} (c1) USING BITMAP " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_schema_change.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_schema_change.groovy index d2e27699524635..2382b643f0cdae 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_schema_change.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_schema_change.groovy @@ -79,7 +79,7 @@ suite("test_partial_update_schema_change", "p0") { sql " ALTER table ${tableName} add column c10 INT DEFAULT '0' " def try_times=1200 // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -203,7 +203,7 @@ suite("test_partial_update_schema_change", "p0") { // schema change sql " ALTER table ${tableName} DROP COLUMN c8 " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -327,7 +327,7 @@ suite("test_partial_update_schema_change", "p0") { // schema change sql " ALTER table ${tableName} MODIFY COLUMN c2 double " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -410,7 +410,7 @@ suite("test_partial_update_schema_change", "p0") { // schema change sql " ALTER table ${tableName} ADD COLUMN c1 int key null " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -420,7 +420,7 @@ suite("test_partial_update_schema_change", "p0") { sql " ALTER table ${tableName} ADD COLUMN c2 int null " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -512,7 +512,7 @@ suite("test_partial_update_schema_change", "p0") { sql " CREATE INDEX test ON ${tableName} (c1) USING BITMAP " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -689,7 +689,7 @@ suite("test_partial_update_schema_change", "p0") { // schema change sql " ALTER table ${tableName} add column c10 INT DEFAULT '0' " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -811,7 +811,7 @@ suite("test_partial_update_schema_change", "p0") { // schema change sql " ALTER table ${tableName} DROP COLUMN c8 " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -928,7 +928,7 @@ suite("test_partial_update_schema_change", "p0") { // schema change sql " ALTER table ${tableName} MODIFY COLUMN c2 double " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -1009,7 +1009,7 @@ suite("test_partial_update_schema_change", "p0") { // schema change sql " ALTER table ${tableName} ADD COLUMN c1 int key null " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -1018,7 +1018,7 @@ suite("test_partial_update_schema_change", "p0") { }); sql " ALTER table ${tableName} ADD COLUMN c2 int null " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -1105,7 +1105,7 @@ suite("test_partial_update_schema_change", "p0") { sql " CREATE INDEX test ON ${tableName} (c1) USING BITMAP " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_schema_change_row_store.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_schema_change_row_store.groovy index cffb682488a2d3..5c4aae467f1ec9 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_schema_change_row_store.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_schema_change_row_store.groovy @@ -80,7 +80,7 @@ suite("test_partial_update_row_store_schema_change", "p0") { sql " ALTER table ${tableName} add column c10 INT DEFAULT '0' " def try_times = 1200 // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -206,7 +206,7 @@ suite("test_partial_update_row_store_schema_change", "p0") { // schema change sql " ALTER table ${tableName} DROP COLUMN c8 " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -331,7 +331,7 @@ suite("test_partial_update_row_store_schema_change", "p0") { // schema change sql " ALTER table ${tableName} MODIFY COLUMN c2 double " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -414,7 +414,7 @@ suite("test_partial_update_row_store_schema_change", "p0") { // schema change sql " ALTER table ${tableName} ADD COLUMN c1 int key null " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -424,7 +424,7 @@ suite("test_partial_update_row_store_schema_change", "p0") { sql " ALTER table ${tableName} ADD COLUMN c2 int null " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -517,7 +517,7 @@ suite("test_partial_update_row_store_schema_change", "p0") { sql " CREATE INDEX test ON ${tableName} (c1) USING BITMAP " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -696,7 +696,7 @@ suite("test_partial_update_row_store_schema_change", "p0") { // schema change sql " ALTER table ${tableName} add column c10 INT DEFAULT '0' " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -820,7 +820,7 @@ suite("test_partial_update_row_store_schema_change", "p0") { // schema change sql " ALTER table ${tableName} DROP COLUMN c8 " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -939,7 +939,7 @@ suite("test_partial_update_row_store_schema_change", "p0") { // schema change sql " ALTER table ${tableName} MODIFY COLUMN c2 double " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -1022,7 +1022,7 @@ suite("test_partial_update_row_store_schema_change", "p0") { // schema change sql " ALTER table ${tableName} ADD COLUMN c1 int key null " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -1031,7 +1031,7 @@ suite("test_partial_update_row_store_schema_change", "p0") { }); sql " ALTER table ${tableName} ADD COLUMN c2 int null " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -1119,7 +1119,7 @@ suite("test_partial_update_row_store_schema_change", "p0") { sql " CREATE INDEX test ON ${tableName} (c1) USING BITMAP " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_insert_light_schema_change.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_insert_light_schema_change.groovy index d92dc41a68bc34..b2193b19fe36b8 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_insert_light_schema_change.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_insert_light_schema_change.groovy @@ -60,7 +60,7 @@ suite("test_partial_update_insert_light_schema_change", "p0") { sql " ALTER table ${tableName} add column c10 INT DEFAULT '0' " def try_times=1200 // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -118,7 +118,7 @@ suite("test_partial_update_insert_light_schema_change", "p0") { // schema change sql " ALTER table ${tableName} DROP COLUMN c8 " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -194,7 +194,7 @@ suite("test_partial_update_insert_light_schema_change", "p0") { // schema change sql " ALTER table ${tableName} MODIFY COLUMN c2 double " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -232,7 +232,7 @@ suite("test_partial_update_insert_light_schema_change", "p0") { // schema change sql """ ALTER table ${tableName} ADD COLUMN c1 int key default "0"; """ // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -243,7 +243,7 @@ suite("test_partial_update_insert_light_schema_change", "p0") { sql " ALTER table ${tableName} ADD COLUMN c2 int null " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -254,7 +254,7 @@ suite("test_partial_update_insert_light_schema_change", "p0") { sql " ALTER table ${tableName} ADD COLUMN c3 int null " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -307,7 +307,7 @@ suite("test_partial_update_insert_light_schema_change", "p0") { sql " CREATE INDEX test ON ${tableName} (c1) USING BITMAP " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_insert_schema_change.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_insert_schema_change.groovy index 9e0abc9704c482..cc9755442b0a52 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_insert_schema_change.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_insert_schema_change.groovy @@ -51,7 +51,7 @@ suite("test_partial_update_insert_schema_change", "p0") { sql " ALTER table ${tableName} add column c10 INT DEFAULT '0' " def try_times=1200 // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -108,7 +108,7 @@ suite("test_partial_update_insert_schema_change", "p0") { // schema change sql " ALTER table ${tableName} DROP COLUMN c8 " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -181,7 +181,7 @@ suite("test_partial_update_insert_schema_change", "p0") { // schema change sql " ALTER table ${tableName} MODIFY COLUMN c2 double " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -217,7 +217,7 @@ suite("test_partial_update_insert_schema_change", "p0") { // schema change sql """ ALTER table ${tableName} ADD COLUMN c1 int key default "0"; """ // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -228,7 +228,7 @@ suite("test_partial_update_insert_schema_change", "p0") { sql " ALTER table ${tableName} ADD COLUMN c2 int null " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -239,7 +239,7 @@ suite("test_partial_update_insert_schema_change", "p0") { sql " ALTER table ${tableName} ADD COLUMN c3 int null " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -292,7 +292,7 @@ suite("test_partial_update_insert_schema_change", "p0") { sql " CREATE INDEX test ON ${tableName} (c1) USING BITMAP " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_schema_change.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_schema_change.groovy index 864a97e13bfdc5..012b784d98de52 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_schema_change.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_schema_change.groovy @@ -74,7 +74,7 @@ suite("test_partial_update_schema_change", "p0") { sql " ALTER table ${tableName} add column c10 INT DEFAULT '0' " def try_times=1200 // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -194,7 +194,7 @@ suite("test_partial_update_schema_change", "p0") { // schema change sql " ALTER table ${tableName} DROP COLUMN c8 " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -314,7 +314,7 @@ suite("test_partial_update_schema_change", "p0") { // schema change sql " ALTER table ${tableName} MODIFY COLUMN c2 double " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -396,7 +396,7 @@ suite("test_partial_update_schema_change", "p0") { // schema change sql " ALTER table ${tableName} ADD COLUMN c1 int key null " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -406,7 +406,7 @@ suite("test_partial_update_schema_change", "p0") { sql " ALTER table ${tableName} ADD COLUMN c2 int null " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -496,7 +496,7 @@ suite("test_partial_update_schema_change", "p0") { sql " CREATE INDEX test ON ${tableName} (c1) USING BITMAP " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -667,7 +667,7 @@ suite("test_partial_update_schema_change", "p0") { // schema change sql " ALTER table ${tableName} add column c10 INT DEFAULT '0' " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -785,7 +785,7 @@ suite("test_partial_update_schema_change", "p0") { // schema change sql " ALTER table ${tableName} DROP COLUMN c8 " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -899,7 +899,7 @@ suite("test_partial_update_schema_change", "p0") { // schema change sql " ALTER table ${tableName} MODIFY COLUMN c2 double " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -979,7 +979,7 @@ suite("test_partial_update_schema_change", "p0") { // schema change sql " ALTER table ${tableName} ADD COLUMN c1 int key null " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -988,7 +988,7 @@ suite("test_partial_update_schema_change", "p0") { }); sql " ALTER table ${tableName} ADD COLUMN c2 int null " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -1073,7 +1073,7 @@ suite("test_partial_update_schema_change", "p0") { sql " CREATE INDEX test ON ${tableName} (c1) USING BITMAP " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_schema_change_row_store.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_schema_change_row_store.groovy index 2ce042f8b6391c..2ae0ef8a3a56c9 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_schema_change_row_store.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_schema_change_row_store.groovy @@ -75,7 +75,7 @@ suite("test_partial_update_row_store_schema_change", "p0") { sql " ALTER table ${tableName} add column c10 INT DEFAULT '0' " def try_times = 1200 // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -197,7 +197,7 @@ suite("test_partial_update_row_store_schema_change", "p0") { // schema change sql " ALTER table ${tableName} DROP COLUMN c8 " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -318,7 +318,7 @@ suite("test_partial_update_row_store_schema_change", "p0") { // schema change sql " ALTER table ${tableName} MODIFY COLUMN c2 double " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -400,7 +400,7 @@ suite("test_partial_update_row_store_schema_change", "p0") { // schema change sql " ALTER table ${tableName} ADD COLUMN c1 int key null " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -410,7 +410,7 @@ suite("test_partial_update_row_store_schema_change", "p0") { sql " ALTER table ${tableName} ADD COLUMN c2 int null " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -501,7 +501,7 @@ suite("test_partial_update_row_store_schema_change", "p0") { sql " CREATE INDEX test ON ${tableName} (c1) USING BITMAP " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -674,7 +674,7 @@ suite("test_partial_update_row_store_schema_change", "p0") { // schema change sql " ALTER table ${tableName} add column c10 INT DEFAULT '0' " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -794,7 +794,7 @@ suite("test_partial_update_row_store_schema_change", "p0") { // schema change sql " ALTER table ${tableName} DROP COLUMN c8 " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -910,7 +910,7 @@ suite("test_partial_update_row_store_schema_change", "p0") { // schema change sql " ALTER table ${tableName} MODIFY COLUMN c2 double " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -992,7 +992,7 @@ suite("test_partial_update_row_store_schema_change", "p0") { // schema change sql " ALTER table ${tableName} ADD COLUMN c1 int key null " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -1001,7 +1001,7 @@ suite("test_partial_update_row_store_schema_change", "p0") { }); sql " ALTER table ${tableName} ADD COLUMN c2 int null " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true; @@ -1087,7 +1087,7 @@ suite("test_partial_update_row_store_schema_change", "p0") { sql " CREATE INDEX test ON ${tableName} (c1) USING BITMAP " // if timeout awaitility will raise exception - Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> { + Awaitility.await().atMost(try_times, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).until(() -> { def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName = '${tableName}' ORDER BY CreateTime DESC LIMIT 1 " if(res[0][9].toString() == "FINISHED"){ return true;