Skip to content

Commit

Permalink
[fix](regression) fix flaky partial update cases (#42072) (#43202)
Browse files Browse the repository at this point in the history 
cherry-pick #42072 and #42908
  • Loading branch information
@zhannngchen
zhannngchen authored Nov 4, 2024
1 parent 8120c59 commit 9bae30a
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 0 deletions.
11 changes: 11 additions & 0 deletions regression-test/suites/unique_with_mow_c_p0/partial_update/test_mix_partial_update.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ suite('test_mix_partial_update') {
file "test_mix_partial_update_load1.csv"
time 10000 // limit inflight 10s
}
sql "sync"
// sql "insert into ${tableInsertName1} values(1,1,1,1,1),(1,1,1,1,10),(2,2,2,2,2),(3,3,3,3,3)"
// 1,1,1,1,10
// 2,2,2,2,2
Expand All @@ -136,6 +137,7 @@ suite('test_mix_partial_update') {
file "test_mix_partial_update_load2.csv"
time 10000 // limit inflight 10s
}
sql "sync"
//sql "insert into ${tableStreamName1} (k1,c1,c2,c3,seq,__DORIS_DELETE_SIGN__) values(1,10,null,10,10,1)"
// 2,2,2,2,2
// 3,3,3,3,3
Expand All @@ -151,6 +153,7 @@ suite('test_mix_partial_update') {
file "test_mix_partial_update_load3.csv"
time 10000 // limit inflight 10s
}
sql "sync"
//sql "insert into ${tableStreamName1} (k1,c1,c2,c3,seq,__DORIS_DELETE_SIGN__) values(1,10,null,10,20,1)"
// 2,2,2,2,2
// 3,3,3,3,3
Expand All @@ -166,6 +169,7 @@ suite('test_mix_partial_update') {
file "test_mix_partial_update_load4.csv"
time 10000 // limit inflight 10s
}
sql "sync"
//sql "insert into ${tableStreamName1} (k1,c1,c2,c3,seq,__DORIS_DELETE_SIGN__) values(1,10,null,10,1,0)"
// 1,10,null,10,1
// 2,2,2,2,2
Expand Down Expand Up @@ -197,6 +201,7 @@ suite('test_mix_partial_update') {
assertTrue(json.Message.contains("Can't do partial update on merge-on-write Unique table with cluster keys"))
}
}
sql "sync"
//sql "set enable_unique_key_partial_update=true;"
//sql "set enable_insert_strict=false;"
//sql "insert into ${tableStreamName1} (k1,seq) values(2,1)"
Expand Down Expand Up @@ -224,6 +229,7 @@ suite('test_mix_partial_update') {
assertTrue(json.Message.contains("Can't do partial update on merge-on-write Unique table with cluster keys"))
}
}
sql "sync"
//sql "set enable_unique_key_partial_update=true;"
//sql "set enable_insert_strict=false;"
// sql "insert into ${tableStreamName1} (k1,seq,__DORIS_DELETE_SIGN__) values(3,1,1)"
Expand All @@ -238,6 +244,7 @@ suite('test_mix_partial_update') {
file "test_mix_partial_update_load7.csv"
time 10000 // limit inflight 10s
}
sql "sync"
// sql "insert into ${tableStreamName1} values(4,4,4,4,4)"
// 2,2,2,2,1
// 3,3,3,3,3
Expand Down Expand Up @@ -342,6 +349,7 @@ suite('test_mix_partial_update') {
file "test_mix_partial_update_load_A.csv"
time 10000 // limit inflight 10s
}
sql "sync"
qt_select_A "select k1,c2,c3,c4 from ${tableStreamName2}"
qt_select_AA "select count(distinct c1) from ${tableStreamName2}"
qt_select_AAA "select count(*) from ${tableStreamName2} where c5 = c6"
Expand All @@ -367,6 +375,7 @@ suite('test_mix_partial_update') {
assertTrue(json.Message.contains("Can't do partial update on merge-on-write Unique table with cluster keys"))
}
}
sql "sync"
qt_select_B "select k1,c2,c3,c4 from ${tableStreamName2}"
qt_select_BB "select count(distinct c1) from ${tableStreamName2}"
qt_select_BBB "select count(*) from ${tableStreamName2} where c5 = c6"
Expand All @@ -391,6 +400,7 @@ suite('test_mix_partial_update') {
file "test_mix_partial_update_load_C.csv"
time 10000 // limit inflight 10s
}
sql "sync"
qt_select_D "select k1,c2,c3,c4 from ${tableStreamName2}"
qt_select_DD "select count(distinct c1) from ${tableStreamName2}"
qt_select_DDD "select count(*) from ${tableStreamName2} where c5 = c7"
Expand All @@ -410,6 +420,7 @@ suite('test_mix_partial_update') {
file "test_mix_partial_update_load_D.csv"
time 10000 // limit inflight 10s
}
sql "sync"
qt_select_E "select k1,c2,c3,c4 from ${tableStreamName2}"
qt_select_EE "select count(distinct c1) from ${tableStreamName2}"
qt_select_EEE "select count(*) from ${tableStreamName2} where c5 = c7"
Expand Down
11 changes: 11 additions & 0 deletions regression-test/suites/unique_with_mow_p0/partial_update/test_mix_partial_update.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ suite('test_mix_partial_update') {
file "test_mix_partial_update_load1.csv"
time 10000 // limit inflight 10s
}
sql "sync"
// sql "insert into ${tableInsertName1} values(1,1,1,1,1),(1,1,1,1,10),(2,2,2,2,2),(3,3,3,3,3)"
// 1,1,1,1,10
// 2,2,2,2,2
Expand All @@ -134,6 +135,7 @@ suite('test_mix_partial_update') {
file "test_mix_partial_update_load2.csv"
time 10000 // limit inflight 10s
}
sql "sync"
//sql "insert into ${tableStreamName1} (k1,c1,c2,c3,seq,__DORIS_DELETE_SIGN__) values(1,10,null,10,10,1)"
// 2,2,2,2,2
// 3,3,3,3,3
Expand All @@ -149,6 +151,7 @@ suite('test_mix_partial_update') {
file "test_mix_partial_update_load3.csv"
time 10000 // limit inflight 10s
}
sql "sync"
//sql "insert into ${tableStreamName1} (k1,c1,c2,c3,seq,__DORIS_DELETE_SIGN__) values(1,10,null,10,20,1)"
// 2,2,2,2,2
// 3,3,3,3,3
Expand All @@ -164,6 +167,7 @@ suite('test_mix_partial_update') {
file "test_mix_partial_update_load4.csv"
time 10000 // limit inflight 10s
}
sql "sync"
//sql "insert into ${tableStreamName1} (k1,c1,c2,c3,seq,__DORIS_DELETE_SIGN__) values(1,10,null,10,1,0)"
// 1,10,null,10,1
// 2,2,2,2,2
Expand All @@ -184,6 +188,7 @@ suite('test_mix_partial_update') {
file "test_mix_partial_update_load5.csv"
time 10000 // limit inflight 10s
}
sql "sync"
//sql "set enable_unique_key_partial_update=true;"
//sql "set enable_insert_strict=false;"
//sql "insert into ${tableStreamName1} (k1,seq) values(2,1)"
Expand All @@ -200,6 +205,7 @@ suite('test_mix_partial_update') {
file "test_mix_partial_update_load6.csv"
time 10000 // limit inflight 10s
}
sql "sync"
//sql "set enable_unique_key_partial_update=true;"
//sql "set enable_insert_strict=false;"
// sql "insert into ${tableStreamName1} (k1,seq,__DORIS_DELETE_SIGN__) values(3,1,1)"
Expand All @@ -214,6 +220,7 @@ suite('test_mix_partial_update') {
file "test_mix_partial_update_load7.csv"
time 10000 // limit inflight 10s
}
sql "sync"
// sql "insert into ${tableStreamName1} values(4,4,4,4,4)"
// 2,2,2,2,1
// 3,3,3,3,3
Expand Down Expand Up @@ -316,6 +323,7 @@ suite('test_mix_partial_update') {
file "test_mix_partial_update_load_A.csv"
time 10000 // limit inflight 10s
}
sql "sync"
qt_select_A "select k1,c2,c3,c4 from ${tableStreamName2}"
qt_select_AA "select count(distinct c1) from ${tableStreamName2}"
qt_select_AAA "select count(*) from ${tableStreamName2} where c5 = c6"
Expand All @@ -330,6 +338,7 @@ suite('test_mix_partial_update') {
file "test_mix_partial_update_load_B.csv"
time 10000 // limit inflight 10s
}
sql "sync"
qt_select_B "select k1,c2,c3,c4 from ${tableStreamName2}"
qt_select_BB "select count(distinct c1) from ${tableStreamName2}"
qt_select_BBB "select count(*) from ${tableStreamName2} where c5 = c6"
Expand All @@ -354,6 +363,7 @@ suite('test_mix_partial_update') {
file "test_mix_partial_update_load_C.csv"
time 10000 // limit inflight 10s
}
sql "sync"
qt_select_D "select k1,c2,c3,c4 from ${tableStreamName2}"
qt_select_DD "select count(distinct c1) from ${tableStreamName2}"
qt_select_DDD "select count(*) from ${tableStreamName2} where c5 = c7"
Expand All @@ -373,6 +383,7 @@ suite('test_mix_partial_update') {
file "test_mix_partial_update_load_D.csv"
time 10000 // limit inflight 10s
}
sql "sync"
qt_select_E "select k1,c2,c3,c4 from ${tableStreamName2}"
qt_select_EE "select count(distinct c1) from ${tableStreamName2}"
qt_select_EEE "select count(*) from ${tableStreamName2} where c5 = c7"
Expand Down
7 changes: 7 additions & 0 deletions ...ssion-test/suites/unique_with_mow_p0/partial_update/test_partial_update_merge_type.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ suite("test_partial_update_merge_type", "p0") {
file 'merge1.csv'
time 10000
}
sql "sync"
qt_sql_1_1 """select * from ${tableName} order by k;"""
// 1.2 merge_type=MERGE, no sequence col, no value col
streamLoad {
Expand All @@ -77,6 +78,7 @@ suite("test_partial_update_merge_type", "p0") {
file 'merge5.csv'
time 10000
}
sql "sync"
qt_sql_1_2 """select * from ${tableName} order by k;"""
// 2.1 merge_type=DELETE, no sequence col
streamLoad {
Expand All @@ -101,6 +103,7 @@ suite("test_partial_update_merge_type", "p0") {
file 'merge6.csv'
time 10000
}
sql "sync"
qt_sql_2_2 """select * from ${tableName} order by k;"""


Expand Down Expand Up @@ -132,6 +135,7 @@ suite("test_partial_update_merge_type", "p0") {
file 'merge3.csv'
time 10000
}
sql "sync"
qt_sql_3_1 """select * from ${tableName} order by k;"""
inspect_rows """select k,c1,c2,c3,__DORIS_SEQUENCE_COL__,__DORIS_DELETE_SIGN__ from ${tableName} order by k,__DORIS_SEQUENCE_COL__;"""
// 3.2 merge_type=MERGE, has sequence type col, no value col
Expand All @@ -147,6 +151,7 @@ suite("test_partial_update_merge_type", "p0") {
file 'merge7.csv'
time 10000
}
sql "sync"
qt_sql_3_2 """select * from ${tableName} order by k;"""
inspect_rows """select k,c1,c2,c3,__DORIS_SEQUENCE_COL__,__DORIS_DELETE_SIGN__ from ${tableName} order by k,__DORIS_SEQUENCE_COL__;"""

Expand All @@ -162,6 +167,7 @@ suite("test_partial_update_merge_type", "p0") {
file 'merge4.csv'
time 10000
}
sql "sync"
qt_sql_4_1 """select * from ${tableName} order by k;"""
inspect_rows """select k,c1,c2,c3,__DORIS_SEQUENCE_COL__,__DORIS_DELETE_SIGN__ from ${tableName} order by k,__DORIS_SEQUENCE_COL__;"""
// 4.2 merge_type=DELETE, has sequence type col, no value col
Expand All @@ -176,6 +182,7 @@ suite("test_partial_update_merge_type", "p0") {
file 'merge8.csv'
time 10000
}
sql "sync"
qt_sql_4_2 """select * from ${tableName} order by k;"""
inspect_rows """select k,c1,c2,c3,__DORIS_SEQUENCE_COL__,__DORIS_DELETE_SIGN__ from ${tableName} order by k,__DORIS_SEQUENCE_COL__;"""

Expand Down

0 comments on commit 9bae30a

Please sign in to comment.