Skip to content

Commit

Permalink
[chore](test) enlarge timeout of schemachange to stablize tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@dataroaring
dataroaring committed Jul 15, 2024
1 parent 01f00aa commit 902e947
Show file tree
Hide file tree
Showing 24 changed files with 1,120 additions and 1,120 deletions.
2 changes: 1 addition & 1 deletion ...n-test/framework/src/main/groovy/org/apache/doris/regression/action/CreateMVAction.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class CreateMVAction implements SuiteAction {
def tmp = doRun("SHOW ALTER TABLE MATERIALIZED VIEW ORDER BY CreateTime DESC LIMIT 1;")
sqlResult = tmp.result[0]
log.info("result: ${sqlResult}".toString())
if (tryTimes == 120 || sqlResult.contains("CANCELLED")) {
if (tryTimes == 600 || sqlResult.contains("CANCELLED")) {
throw new IllegalStateException("MV create check times over limit, result='${sqlResult}'");
}
Thread.sleep(1200)
Expand Down
10 changes: 5 additions & 5 deletions regression-test/suites/schema_change_p0/test_alter_table_column.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ suite("test_alter_table_column") {

waitForSchemaChangeDone {
sql """SHOW ALTER TABLE COLUMN WHERE IndexName='${tbName1}' ORDER BY createtime DESC LIMIT 1"""
time 60
time 600
}

sql """
Expand All @@ -54,7 +54,7 @@ suite("test_alter_table_column") {

waitForSchemaChangeDone {
sql """SHOW ALTER TABLE COLUMN WHERE IndexName='${tbName1}' ORDER BY createtime DESC LIMIT 1"""
time 60
time 600
}

sql "SHOW ALTER TABLE COLUMN;"
Expand Down Expand Up @@ -82,7 +82,7 @@ suite("test_alter_table_column") {

waitForSchemaChangeDone {
sql """SHOW ALTER TABLE COLUMN WHERE IndexName='${tbName2}' ORDER BY createtime DESC LIMIT 1"""
time 60
time 600
}

sql "SHOW ALTER TABLE COLUMN"
Expand Down Expand Up @@ -117,7 +117,7 @@ suite("test_alter_table_column") {

waitForSchemaChangeDone {
sql """SHOW ALTER TABLE COLUMN WHERE IndexName='${tbNameAddArray}' ORDER BY createtime DESC LIMIT 1"""
time 60
time 600
}
qt_sql "desc ${tbNameAddArray};"
qt_sql "select * from ${tbNameAddArray} order by k1;"
Expand Down Expand Up @@ -199,7 +199,7 @@ suite("test_alter_table_column") {

waitForSchemaChangeDone {
sql """SHOW ALTER TABLE COLUMN WHERE IndexName='${tbName3}' ORDER BY createtime DESC LIMIT 1"""
time 60
time 600
}

def res3 = sql "select * from ${tbName3} order by k1"
Expand Down
36 changes: 18 additions & 18 deletions regression-test/suites/schema_change_p0/test_dup_schema_key_add.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ suite("test_dup_schema_key_add","p0") {
sql """ alter table ${tbName1} add column province VARCHAR(20) KEY DEFAULT "广东省" AFTER username """
waitForSchemaChangeDone({
sql getTableStatusSql
time 60
time 600
}, insertSql, false,"${tbName1}")


Expand Down Expand Up @@ -100,7 +100,7 @@ suite("test_dup_schema_key_add","p0") {
insertSql = "insert into ${tbName1} values(923456689, 'Alice', 1, 'Yaan', 25, 0, 13812345678, 'No. 123 Street, Beijing', '2022-01-01 10:00:00'); "
waitForSchemaChangeDone({
sql getTableStatusSql
time 60
time 600
}, insertSql, false,"${tbName1}")


Expand Down Expand Up @@ -144,7 +144,7 @@ suite("test_dup_schema_key_add","p0") {
insertSql = " insert into ${tbName1} values(923456689, 'Alice', 1, 'Yaan', 25, 0, 13812345678, 'No. 123 Street, Beijing', '2022-01-01 10:00:00'); "
waitForSchemaChangeDone({
sql getTableStatusSql
time 60
time 600
}, insertSql, false,"${tbName1}")


Expand Down Expand Up @@ -189,7 +189,7 @@ suite("test_dup_schema_key_add","p0") {
insertSql = " insert into ${tbName1} values(923456689, 'Alice', 567, 'Yaan', 25, 0, 13812345678, 'No. 123 Street, Beijing', '2022-01-01 10:00:00'); "
waitForSchemaChangeDone({
sql getTableStatusSql
time 60
time 600
}, insertSql, false,"${tbName1}")


Expand Down Expand Up @@ -233,7 +233,7 @@ suite("test_dup_schema_key_add","p0") {
insertSql = " insert into ${tbName1} values(923456689, 'Alice', 22536, 'Yaan', 25, 0, 13812345678, 'No. 123 Street, Beijing', '2022-01-01 10:00:00'); "
waitForSchemaChangeDone({
sql getTableStatusSql
time 60
time 600
}, insertSql, false,"${tbName1}")


Expand Down Expand Up @@ -278,7 +278,7 @@ suite("test_dup_schema_key_add","p0") {
insertSql = " insert into ${tbName1} values(923456689, 'Alice', 88889494646, 'Yaan', 25, 0, 13812345678, 'No. 123 Street, Beijing', '2022-01-01 10:00:00'); "
waitForSchemaChangeDone({
sql getTableStatusSql
time 60
time 600
}, insertSql, false,"${tbName1}")


Expand Down Expand Up @@ -324,7 +324,7 @@ suite("test_dup_schema_key_add","p0") {
insertSql = " insert into ${tbName1} values(923456689, 'Alice', 555888555, 'Yaan', 25, 0, 13812345678, 'No. 123 Street, Beijing', '2022-01-01 10:00:00');"
waitForSchemaChangeDone({
sql getTableStatusSql
time 60
time 600
}, insertSql, false,"${tbName1}")


Expand Down Expand Up @@ -372,7 +372,7 @@ suite("test_dup_schema_key_add","p0") {
insertSql = " insert into ${tbName1} values(923456689, 'Alice', 189.9, 'Yaan', 25, 0, 13812345678, 'No. 123 Street, Beijing', '2022-01-01 10:00:00');"
waitForSchemaChangeDone({
sql getTableStatusSql
time 60
time 600
}, insertSql, true,"${tbName1}")
},errorMessage)

Expand All @@ -388,7 +388,7 @@ suite("test_dup_schema_key_add","p0") {
insertSql = " insert into ${tbName1} values(923456689, 'Alice', 189.479, 'Yaan', 25, 0, 13812345678, 'No. 123 Street, Beijing', '2022-01-01 10:00:00'); "
waitForSchemaChangeDone({
sql getTableStatusSql
time 60
time 600
}, insertSql, true,"${tbName1}")

},errorMessage)
Expand All @@ -403,7 +403,7 @@ suite("test_dup_schema_key_add","p0") {
insertSql = " insert into ${tbName1} values(923456689, 'Alice', 16499.6464689, 'Yaan', 25, 0, 13812345678, 'No. 123 Street, Beijing', '2022-01-01 10:00:00');"
waitForSchemaChangeDone({
sql getTableStatusSql
time 60
time 600
}, insertSql, true,"${tbName1}")


Expand All @@ -416,7 +416,7 @@ suite("test_dup_schema_key_add","p0") {
insertSql = " insert into ${tbName1} values(923456689, 'Alice', \"2024-01-01\", 'Yaan', 25, 0, 13812345678, 'No. 123 Street, Beijing', '2022-01-01 10:00:00'); "
waitForSchemaChangeDone({
sql getTableStatusSql
time 60
time 600
}, insertSql, false,"${tbName1}")

sql """ DROP TABLE IF EXISTS ${tbName2} """
Expand Down Expand Up @@ -460,7 +460,7 @@ suite("test_dup_schema_key_add","p0") {
insertSql = " insert into ${tbName1} values(923456689, 'Alice', \"2024-01-04 09:00:00\", 'Yaan', 25, 0, 13812345678, 'No. 123 Street, Beijing', '2022-01-01 10:00:00'); "
waitForSchemaChangeDone({
sql getTableStatusSql
time 60
time 600
}, insertSql, false,"${tbName1}")

sql """ DROP TABLE IF EXISTS ${tbName2} """
Expand Down Expand Up @@ -504,7 +504,7 @@ suite("test_dup_schema_key_add","p0") {
insertSql = " insert into ${tbName1} values(923456689, 'Alice', 'T', 'Yaan', 25, 0, 13812345678, 'No. 123 Street, Beijing', '2022-01-01 10:00:00'); "
waitForSchemaChangeDone({
sql getTableStatusSql
time 60
time 600
}, insertSql, false,"${tbName1}")


Expand Down Expand Up @@ -551,7 +551,7 @@ suite("test_dup_schema_key_add","p0") {
insertSql = " insert into ${tbName1} values(923456689, 'Alice', '我是侦探家', 'Yaan', 25, 0, 13812345678, 'No. 123 Street, Beijing', '2022-01-01 10:00:00'); "
waitForSchemaChangeDone({
sql getTableStatusSql
time 60
time 600
}, insertSql, true,"${tbName1}")},errorMessage)


Expand All @@ -565,7 +565,7 @@ suite("test_dup_schema_key_add","p0") {
insertSql = " insert into ${tbName1} values(923456689, 'Alice', to_bitmap(243), 'Yaan', 25, 0, 13812345678, 'No. 123 Street, Beijing', '2022-01-01 10:00:00'); "
waitForSchemaChangeDone({
sql getTableStatusSql
time 60
time 600
}, insertSql, true,"${tbName1}")

},errorMessage)
Expand All @@ -581,7 +581,7 @@ suite("test_dup_schema_key_add","p0") {
insertSql = " insert into ${tbName1} values(923456689, 'Alice', '{'a': 100, 'b': 200}', 'Yaan', 25, 0, 13812345678, 'No. 123 Street, Beijing', '2022-01-01 10:00:00'); "
waitForSchemaChangeDone({
sql getTableStatusSql
time 60
time 600
}, insertSql, true,"${tbName1}")
},errorMessage)

Expand All @@ -595,7 +595,7 @@ suite("test_dup_schema_key_add","p0") {
insertSql = " insert into ${tbName1} values(923456689, 'Alice', '{\"k1\":\"v31\", \"k2\": 300}', 'Yaan', 25, 0, 13812345678, 'No. 123 Street, Beijing', '2022-01-01 10:00:00'); "
waitForSchemaChangeDone({
sql getTableStatusSql
time 60
time 600
}, insertSql, true,"${tbName1}")
},errorMessage)

Expand All @@ -609,7 +609,7 @@ suite("test_dup_schema_key_add","p0") {
insertSql = " insert into ${tbName1} values(923456689, 'Alice', '{\"k1\":\"v31\", \"k2\": 300}', 'Yaan', 25, 0, 13812345678, 'No. 123 Street, Beijing', '2022-01-01 10:00:00'); "
waitForSchemaChangeDone({
sql getTableStatusSql
time 60
time 600
}, insertSql, true,"${tbName1}")
},errorMessage)

Expand Down
Loading

0 comments on commit 902e947

Please sign in to comment.