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 27eed5399d7b1455b01e524b91624bbaf9998a04
Author: abmdocrt <yukang.lian2...@gmail.com>
AuthorDate: Sat Mar 9 19:59:22 2024 +0800
[Fix](auto-inc) Fix partial update auto inc publish case failure #31987
---
..._partial_update_publish_conflict_with_error.out | 106 +++++++++++----------
...rtial_update_publish_conflict_with_error.groovy | 6 +-
2 files changed, 59 insertions(+), 53 deletions(-)
diff --git
a/regression-test/data/fault_injection_p0/test_partial_update_publish_conflict_with_error.out
b/regression-test/data/fault_injection_p0/test_partial_update_publish_conflict_with_error.out
index bcdbd86093b..eacbf10a702 100644
---
a/regression-test/data/fault_injection_p0/test_partial_update_publish_conflict_with_error.out
+++
b/regression-test/data/fault_injection_p0/test_partial_update_publish_conflict_with_error.out
@@ -1,56 +1,60 @@
-- This file is automatically generated. You should know what you did if you
want to edit this
-- !sql --
-0 \N \N \N \N \N 100
-1 \N \N \N \N \N 101
-10 \N \N \N \N \N 110
-11 \N \N \N \N \N 111
-12 \N \N \N \N \N 112
-13 \N \N \N \N \N 113
-14 \N \N \N \N \N 114
-15 \N \N \N \N \N 115
-16 \N \N \N \N \N 116
-17 \N \N \N \N \N 117
-18 \N \N \N \N \N 118
-19 \N \N \N \N \N 119
-2 \N \N \N \N \N 102
-20 \N \N \N \N \N 120
-3 \N \N \N \N \N 103
-4 \N \N \N \N \N 104
-5 \N \N \N \N \N 105
-6 \N \N \N \N \N 106
-7 \N \N \N \N \N 107
-8 \N \N \N \N \N 108
-9 \N \N \N \N \N 109
+0 \N \N \N \N \N
+1 \N \N \N \N \N
+10 \N \N \N \N \N
+11 \N \N \N \N \N
+12 \N \N \N \N \N
+13 \N \N \N \N \N
+14 \N \N \N \N \N
+15 \N \N \N \N \N
+16 \N \N \N \N \N
+17 \N \N \N \N \N
+18 \N \N \N \N \N
+19 \N \N \N \N \N
+2 \N \N \N \N \N
+20 \N \N \N \N \N
+3 \N \N \N \N \N
+4 \N \N \N \N \N
+5 \N \N \N \N \N
+6 \N \N \N \N \N
+7 \N \N \N \N \N
+8 \N \N \N \N \N
+9 \N \N \N \N \N
+
+-- !sql --
+
+-- !sql --
+0 aaaaaaaaaa b0 \N \N \N
+1 aaaaaaaaaa b1 \N \N \N
+10 aaaaaaaaaa b10 \N \N \N
+11 aaaaaaaaaa b11 \N \N \N
+12 aaaaaaaaaa b12 \N \N \N
+13 aaaaaaaaaa b13 \N \N \N
+14 aaaaaaaaaa b14 \N \N \N
+15 aaaaaaaaaa b15 \N \N \N
+16 aaaaaaaaaa b16 \N \N \N
+17 aaaaaaaaaa b17 \N \N \N
+18 aaaaaaaaaa b18 \N \N \N
+19 aaaaaaaaaa b19 \N \N \N
+2 aaaaaaaaaa b2 \N \N \N
+20 aaaaaaaaaa b30 \N \N \N
+21 aaaaaaaaaa \N \N \N \N
+22 aaaaaaaaaa \N \N \N \N
+23 aaaaaaaaaa \N \N \N \N
+24 aaaaaaaaaa \N \N \N \N
+25 aaaaaaaaaa \N \N \N \N
+26 \N b26 \N \N \N
+27 \N b27 \N \N \N
+28 \N b28 \N \N \N
+29 \N b29 \N \N \N
+3 aaaaaaaaaa b3 \N \N \N
+4 aaaaaaaaaa b4 \N \N \N
+5 aaaaaaaaaa b5 \N \N \N
+6 aaaaaaaaaa b6 \N \N \N
+7 aaaaaaaaaa b7 \N \N \N
+8 aaaaaaaaaa b8 \N \N \N
+9 aaaaaaaaaa b9 \N \N \N
-- !sql --
-0 aaaaaaaaaa b0 \N \N \N 100
-1 aaaaaaaaaa b1 \N \N \N 101
-10 aaaaaaaaaa b10 \N \N \N 110
-11 aaaaaaaaaa b11 \N \N \N 111
-12 aaaaaaaaaa b12 \N \N \N 112
-13 aaaaaaaaaa b13 \N \N \N 113
-14 aaaaaaaaaa b14 \N \N \N 114
-15 aaaaaaaaaa b15 \N \N \N 115
-16 aaaaaaaaaa b16 \N \N \N 116
-17 aaaaaaaaaa b17 \N \N \N 117
-18 aaaaaaaaaa b18 \N \N \N 118
-19 aaaaaaaaaa b19 \N \N \N 119
-2 aaaaaaaaaa b2 \N \N \N 102
-20 aaaaaaaaaa b30 \N \N \N 120
-21 aaaaaaaaaa \N \N \N \N 121
-22 aaaaaaaaaa \N \N \N \N 122
-23 aaaaaaaaaa \N \N \N \N 123
-24 aaaaaaaaaa \N \N \N \N 124
-25 aaaaaaaaaa \N \N \N \N 125
-26 \N b26 \N \N \N 147
-27 \N b27 \N \N \N 148
-28 \N b28 \N \N \N 149
-29 \N b29 \N \N \N 150
-3 aaaaaaaaaa b3 \N \N \N 103
-4 aaaaaaaaaa b4 \N \N \N 104
-5 aaaaaaaaaa b5 \N \N \N 105
-6 aaaaaaaaaa b6 \N \N \N 106
-7 aaaaaaaaaa b7 \N \N \N 107
-8 aaaaaaaaaa b8 \N \N \N 108
-9 aaaaaaaaaa b9 \N \N \N 109
diff --git
a/regression-test/suites/fault_injection_p0/test_partial_update_publish_conflict_with_error.groovy
b/regression-test/suites/fault_injection_p0/test_partial_update_publish_conflict_with_error.groovy
index 1608dcaae54..9e61dd4eb0d 100644
---
a/regression-test/suites/fault_injection_p0/test_partial_update_publish_conflict_with_error.groovy
+++
b/regression-test/suites/fault_injection_p0/test_partial_update_publish_conflict_with_error.groovy
@@ -67,7 +67,8 @@ suite("test_partial_update_publish_conflict_with_error",
"nonConcurrent") {
time 10000 // limit inflight 10s
}
sql "sync;"
- qt_sql """ select * from ${tableName} order by k1;"""
+ qt_sql """ select k1, v1, v2, v3, v4, v5 from ${tableName} order by k1;"""
+ qt_sql """ select v6, count(*) from ${tableName} group by v6 having
count(*) > 1;"""
// NOTE: use streamload 2pc to construct the conflict of publish
def do_streamload_2pc_commit = { txnId ->
@@ -169,5 +170,6 @@ suite("test_partial_update_publish_conflict_with_error",
"nonConcurrent") {
wait_for_publish(txnId2, 20)
sql "sync;"
- qt_sql """ select * from ${tableName} order by k1;"""
+ qt_sql """ select k1, v1, v2, v3, v4, v5 from ${tableName} order by k1;"""
+ qt_sql """ select v6, count(*) from ${tableName} group by v6 having
count(*) > 1;"""
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
