This is an automated email from the ASF dual-hosted git repository.
zhangchen pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 9bae30a383a [fix](regression) fix flaky partial update cases (#42072)
(#43202)
9bae30a383a is described below
commit 9bae30a383ad30edc20ec0415b0bcb67c337ba80
Author: zhannngchen <48427519+zhannngc...@users.noreply.github.com>
AuthorDate: Mon Nov 4 21:47:03 2024 +0800
[fix](regression) fix flaky partial update cases (#42072) (#43202)
cherry-pick #42072 and #42908
---
.../partial_update/test_mix_partial_update.groovy | 11 +++++++++++
.../partial_update/test_mix_partial_update.groovy | 11 +++++++++++
.../partial_update/test_partial_update_merge_type.groovy | 7 +++++++
3 files changed, 29 insertions(+)
diff --git
a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_mix_partial_update.groovy
b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_mix_partial_update.groovy
index 3d2c52f01a1..7bcda3debb6 100644
---
a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_mix_partial_update.groovy
+++
b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_mix_partial_update.groovy
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)"
@@ -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)"
@@ -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
@@ -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"
@@ -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"
@@ -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"
@@ -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"
diff --git
a/regression-test/suites/unique_with_mow_p0/partial_update/test_mix_partial_update.groovy
b/regression-test/suites/unique_with_mow_p0/partial_update/test_mix_partial_update.groovy
index 0a2322b9d0b..35b5e0cce81 100644
---
a/regression-test/suites/unique_with_mow_p0/partial_update/test_mix_partial_update.groovy
+++
b/regression-test/suites/unique_with_mow_p0/partial_update/test_mix_partial_update.groovy
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)"
@@ -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)"
@@ -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
@@ -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"
@@ -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"
@@ -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"
@@ -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"
diff --git
a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_merge_type.groovy
b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_merge_type.groovy
index ece523838b0..f1919e8b066 100644
---
a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_merge_type.groovy
+++
b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_merge_type.groovy
@@ -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 {
@@ -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 {
@@ -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;"""
@@ -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
@@ -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__;"""
@@ -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
@@ -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__;"""
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
