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
commit d3752d2ab2c6d58e5d9c5e900fe6a176f63fa01d Author: Kang <[email protected]> AuthorDate: Tue Apr 16 10:26:12 2024 +0800 [fix](testcase) fix miss used global variables in index testcases (#33293) --- .../decimalv3/test_decimal256_index.groovy | 3 +++ .../suites/inverted_index_p0/test_show_data.groovy | 27 ++++++++++------------ .../suites/nereids_p0/test_mv_select.groovy | 4 ++++ .../suites/variant_p0/with_index/load.groovy | 5 ++-- 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/regression-test/suites/datatype_p0/decimalv3/test_decimal256_index.groovy b/regression-test/suites/datatype_p0/decimalv3/test_decimal256_index.groovy index 04564ca3629..46e0bb8e2cd 100644 --- a/regression-test/suites/datatype_p0/decimalv3/test_decimal256_index.groovy +++ b/regression-test/suites/datatype_p0/decimalv3/test_decimal256_index.groovy @@ -19,7 +19,10 @@ suite("test_decimal256_index") { sql "set enable_nereids_planner = true;" sql "set enable_decimal256 = true;" + def timeout = 60000 def delta_time = 1000 + def alter_res = "null" + def useTime = 0 def wait_for_latest_op_on_table_finish = { table_name, OpTimeout -> useTime = 0 for(int t = delta_time; t <= OpTimeout; t += delta_time){ diff --git a/regression-test/suites/inverted_index_p0/test_show_data.groovy b/regression-test/suites/inverted_index_p0/test_show_data.groovy index 055ac794e35..6601582e008 100644 --- a/regression-test/suites/inverted_index_p0/test_show_data.groovy +++ b/regression-test/suites/inverted_index_p0/test_show_data.groovy @@ -21,6 +21,8 @@ suite("test_show_data", "p0") { def testTableWithIndex = "test_show_data_httplogs_with_index" def delta_time = 5000 def timeout = 60000 + def alter_res = "null" + def useTime = 0 String database = context.config.getDbNameByFile(context.file) def create_httplogs_table_without_index = {testTablex -> @@ -99,7 +101,6 @@ suite("test_show_data", "p0") { } def wait_for_show_data_finish = { table_name, OpTimeout, origin_size -> - def useTime = 0 for(int t = delta_time; t <= OpTimeout; t += delta_time){ def result = sql """show data from ${database}.${table_name};""" if (result.size() > 0) { @@ -117,9 +118,8 @@ suite("test_show_data", "p0") { } def wait_for_latest_op_on_table_finish = { table_name, OpTimeout -> - def useTime = 0 for(int t = delta_time; t <= OpTimeout; t += delta_time){ - def alter_res = sql """SHOW ALTER TABLE COLUMN WHERE TableName = "${table_name}" ORDER BY CreateTime DESC LIMIT 1;""" + alter_res = sql """SHOW ALTER TABLE COLUMN WHERE TableName = "${table_name}" ORDER BY CreateTime DESC LIMIT 1;""" alter_res = alter_res.toString() if(alter_res.contains("FINISHED")) { sleep(3000) // wait change table state to normal @@ -133,9 +133,8 @@ suite("test_show_data", "p0") { } def wait_for_last_build_index_on_table_finish = { table_name, OpTimeout -> - def useTime = 0 for(int t = delta_time; t <= OpTimeout; t += delta_time){ - def alter_res = sql """SHOW BUILD INDEX WHERE TableName = "${table_name}" ORDER BY JobId """ + alter_res = sql """SHOW BUILD INDEX WHERE TableName = "${table_name}" ORDER BY JobId """ if (alter_res.size() == 0) { return "FINISHED" @@ -198,6 +197,8 @@ suite("test_show_data_for_bkd", "p0") { def testTableWithBKDIndex = "test_show_data_httplogs_with_bkd_index" def delta_time = 5000 def timeout = 60000 + def alter_res = "null" + def useTime = 0 String database = context.config.getDbNameByFile(context.file) def create_httplogs_table_without_bkd_index = {testTablex -> @@ -276,7 +277,6 @@ suite("test_show_data_for_bkd", "p0") { } def wait_for_show_data_finish = { table_name, OpTimeout, origin_size -> - def useTime = 0 for(int t = delta_time; t <= OpTimeout; t += delta_time){ def result = sql """show data from ${database}.${table_name};""" if (result.size() > 0) { @@ -294,9 +294,8 @@ suite("test_show_data_for_bkd", "p0") { } def wait_for_latest_op_on_table_finish = { table_name, OpTimeout -> - def useTime = 0 for(int t = delta_time; t <= OpTimeout; t += delta_time){ - def alter_res = sql """SHOW ALTER TABLE COLUMN WHERE TableName = "${table_name}" ORDER BY CreateTime DESC LIMIT 1;""" + alter_res = sql """SHOW ALTER TABLE COLUMN WHERE TableName = "${table_name}" ORDER BY CreateTime DESC LIMIT 1;""" alter_res = alter_res.toString() if(alter_res.contains("FINISHED")) { sleep(3000) // wait change table state to normal @@ -310,9 +309,8 @@ suite("test_show_data_for_bkd", "p0") { } def wait_for_last_build_index_on_table_finish = { table_name, OpTimeout -> - def useTime = 0 for(int t = delta_time; t <= OpTimeout; t += delta_time){ - def alter_res = sql """SHOW BUILD INDEX WHERE TableName = "${table_name}" ORDER BY JobId """ + alter_res = sql """SHOW BUILD INDEX WHERE TableName = "${table_name}" ORDER BY JobId """ if (alter_res.size() == 0) { return "FINISHED" @@ -376,6 +374,8 @@ suite("test_show_data_multi_add", "p0") { def testTableWithIndex = "test_show_data_httplogs_multi_add_with_index" def delta_time = 5000 def timeout = 60000 + def alter_res = "null" + def useTime = 0 String database = context.config.getDbNameByFile(context.file) def create_httplogs_table_without_index = {testTablex -> @@ -455,7 +455,6 @@ suite("test_show_data_multi_add", "p0") { } def wait_for_show_data_finish = { table_name, OpTimeout, origin_size -> - def useTime = 0 for(int t = delta_time; t <= OpTimeout; t += delta_time){ def result = sql """show data from ${database}.${table_name};""" if (result.size() > 0) { @@ -473,9 +472,8 @@ suite("test_show_data_multi_add", "p0") { } def wait_for_latest_op_on_table_finish = { table_name, OpTimeout -> - def useTime = 0 for(int t = delta_time; t <= OpTimeout; t += delta_time){ - def alter_res = sql """SHOW ALTER TABLE COLUMN WHERE TableName = "${table_name}" ORDER BY CreateTime DESC LIMIT 1;""" + alter_res = sql """SHOW ALTER TABLE COLUMN WHERE TableName = "${table_name}" ORDER BY CreateTime DESC LIMIT 1;""" alter_res = alter_res.toString() if(alter_res.contains("FINISHED")) { sleep(3000) // wait change table state to normal @@ -489,9 +487,8 @@ suite("test_show_data_multi_add", "p0") { } def wait_for_last_build_index_on_table_finish = { table_name, OpTimeout -> - def useTime = 0 for(int t = delta_time; t <= OpTimeout; t += delta_time){ - def alter_res = sql """SHOW BUILD INDEX WHERE TableName = "${table_name}" ORDER BY JobId """ + alter_res = sql """SHOW BUILD INDEX WHERE TableName = "${table_name}" ORDER BY JobId """ if (alter_res.size() == 0) { return "FINISHED" diff --git a/regression-test/suites/nereids_p0/test_mv_select.groovy b/regression-test/suites/nereids_p0/test_mv_select.groovy index 4d7c93828e1..bb0a681c611 100644 --- a/regression-test/suites/nereids_p0/test_mv_select.groovy +++ b/regression-test/suites/nereids_p0/test_mv_select.groovy @@ -56,7 +56,11 @@ suite("test_mv_select") { PROPERTIES ( "replication_allocation" = "tag.location.default: 1" );""" + + def timeout = 60000 def delta_time = 1000 + def alter_res = "null" + def useTime = 0 def wait_for_latest_op_on_table_finish = { table_name, OpTimeout -> for(int t = delta_time; t <= OpTimeout; t += delta_time){ alter_res = sql """SHOW ALTER TABLE COLUMN WHERE TableName = "${table_name}" ORDER BY CreateTime DESC LIMIT 1;""" diff --git a/regression-test/suites/variant_p0/with_index/load.groovy b/regression-test/suites/variant_p0/with_index/load.groovy index f700cdee7cb..2ff781a2008 100644 --- a/regression-test/suites/variant_p0/with_index/load.groovy +++ b/regression-test/suites/variant_p0/with_index/load.groovy @@ -27,7 +27,9 @@ suite("regression_test_variant_with_index", "nonConcurrent"){ logger.info("update config: code=" + code + ", out=" + out + ", err=" + err) } + def timeout = 60000 def delta_time = 1000 + def alter_res = "null" def useTime = 0 def wait_for_latest_op_on_table_finish = { tableName, OpTimeout -> for(int t = delta_time; t <= OpTimeout; t += delta_time){ @@ -74,9 +76,8 @@ suite("regression_test_variant_with_index", "nonConcurrent"){ drop index idx """ logger.info("drop index " + "${table_name}" + "; result: " + drop_result) - def timeout = 60000 wait_for_latest_op_on_table_finish(table_name, timeout) - show_result = sql "show index from ${table_name}" + def show_result = sql "show index from ${table_name}" assertEquals(show_result.size(), 0) qt_sql_inv4 """select v["a1"] from ${table_name} where cast(v['a1'] as int) = 0""" qt_sql_inv5 """select * from ${table_name} order by k""" --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
