This is an automated email from the ASF dual-hosted git repository.

dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git

commit 3c27c14deca39a12defd864d39ef2044efa4b15b
Author: abmdocrt <[email protected]>
AuthorDate: Thu May 16 09:25:34 2024 +0800

    [Fix](regression-test) Fix auto inc partial update unstable regression test 
(#34940)
---
 ..._auto_inc_partial_update_consistency_insert.out | 78 +++++++++++-----------
 ..._inc_partial_update_consistency_stream_load.out | 68 +++++++++----------
 ...to_inc_partial_update_consistency_insert.groovy | 14 ++--
 ...c_partial_update_consistency_stream_load.groovy | 12 ++--
 4 files changed, 86 insertions(+), 86 deletions(-)

diff --git 
a/regression-test/data/data_model_p0/unique/test_unique_table_auto_inc_partial_update_consistency_insert.out
 
b/regression-test/data/data_model_p0/unique/test_unique_table_auto_inc_partial_update_consistency_insert.out
index 57d16693a92..79a08299118 100644
--- 
a/regression-test/data/data_model_p0/unique/test_unique_table_auto_inc_partial_update_consistency_insert.out
+++ 
b/regression-test/data/data_model_p0/unique/test_unique_table_auto_inc_partial_update_consistency_insert.out
@@ -1,97 +1,97 @@
 -- This file is automatically generated. You should know what you did if you 
want to edit this
 -- !select1_1 --
-Bob    100
 Alice  200
-Tom    300
-Test   400
-Carter 500
-Smith  600
 Beata  700
+Bob    100
+Carter 500
 Doris  800
 Nereids        900
+Smith  600
+Test   400
+Tom    300
 
 -- !select1_2 --
 
 -- !select1_3 --
-Bob    123
 Alice  200
-Tom    323
-Test   400
-Carter 523
-Smith  600
 Beata  723
+Bob    123
+Carter 523
 Doris  800
 Nereids        923
+Smith  600
+Test   400
+Tom    323
 
 -- !select1_4 --
 
 -- !select2_1 --
-Bob    100
 Alice  200
-Tom    300
-Test   400
-Carter 500
-Smith  600
 Beata  700
+Bob    100
+Carter 500
 Doris  800
 Nereids        900
+Smith  600
+Test   400
+Tom    300
 
 -- !select2_2 --
 
 -- !select2_3 --
-Bob    100
 Alice  200
-Tom    300
-Test   400
-Carter 500
-Smith  600
 Beata  700
+Bob    100
+Carter 500
 Doris  800
 Nereids        900
+Smith  600
+Test   400
+Tom    300
 
 -- !select2_4 --
 
 -- !select3_1 --
-Bob    100
 Alice  200
-Tom    300
-Test   400
-Carter 500
-Smith  600
 Beata  700
+Bob    100
+Carter 500
 Doris  800
 Nereids        900
+Smith  600
+Test   400
+Tom    300
 
 -- !select3_2 --
 
 -- !select3_3 --
 Alice  200
-Test   400
-Smith  600
-Doris  800
+Beata  9996
 Bob    9990
-Tom    9992
 Carter 9994
-Beata  9996
+Doris  800
 Nereids        9998
+Smith  600
+Test   400
+Tom    9992
 
 -- !select3_4 --
 
 -- !select3_5 --
 Alice  200
-Test   400
-Smith  600
-Doris  800
-Bob    9990
-BBBBob 9990
-Tom    9992
-TTTTom 9992
-Carter 9994
-CCCCarter      9994
 BBBBeata       9996
+BBBBob 9990
 Beata  9996
+Bob    9990
+CCCCarter      9994
+Carter 9994
+Doris  800
 NNNNereids     9998
 Nereids        9998
+Smith  600
+TTTTom 9992
+Test   400
+Tom    9992
 
 -- !select3_6 --
 
diff --git 
a/regression-test/data/data_model_p0/unique/test_unique_table_auto_inc_partial_update_consistency_stream_load.out
 
b/regression-test/data/data_model_p0/unique/test_unique_table_auto_inc_partial_update_consistency_stream_load.out
index b48b8ab73c8..a31e438f292 100644
--- 
a/regression-test/data/data_model_p0/unique/test_unique_table_auto_inc_partial_update_consistency_stream_load.out
+++ 
b/regression-test/data/data_model_p0/unique/test_unique_table_auto_inc_partial_update_consistency_stream_load.out
@@ -11,85 +11,85 @@
 9      Nereids 900
 
 -- !select1_1 --
-Bob    123
 Alice  200
-Tom    323
-Test   400
-Carter 523
-Smith  600
 Beata  723
+Bob    123
+Carter 523
 Doris  800
 Nereids        923
+Smith  600
+Test   400
+Tom    323
 
 -- !select1_2 --
 
 -- !select2_1 --
-Bob    100
 Alice  200
-Tom    300
-Test   400
-Carter 500
-Smith  600
 Beata  700
+Bob    100
+Carter 500
 Doris  800
 Nereids        900
+Smith  600
+Test   400
+Tom    300
 
 -- !select2_2 --
 
 -- !select2_3 --
-Bob    100
 Alice  200
-Tom    300
-Test   400
-Carter 500
-Smith  600
 Beata  700
+Bob    100
+Carter 500
 Doris  800
 Nereids        900
+Smith  600
+Test   400
+Tom    300
 
 -- !select2_4 --
 
 -- !select3_1 --
-Bob    100
 Alice  200
-Tom    300
-Test   400
-Carter 500
-Smith  600
 Beata  700
+Bob    100
+Carter 500
 Doris  800
 Nereids        900
+Smith  600
+Test   400
+Tom    300
 
 -- !select3_2 --
 
 -- !select3_3 --
 Alice  200
-Test   400
-Smith  600
-Doris  800
+Beata  9996
 Bob    9990
-Tom    9992
 Carter 9994
-Beata  9996
+Doris  800
 Nereids        9998
+Smith  600
+Test   400
+Tom    9992
 
 -- !select3_4 --
 
 -- !select3_5 --
 Alice  200
-Test   400
-Smith  600
-Doris  800
-Bob    9990
+BBeata 9996
 BBob   9990
-TTom   9992
-Tom    9992
+Beata  9996
+Bob    9990
 CCarter        9994
 Carter 9994
-BBeata 9996
-Beata  9996
-Nereids        9998
+Doris  800
 NNereids       9998
+Nereids        9998
+Smith  600
+TTom   9992
+Test   400
+Tom    9992
 
 -- !select3_6 --
 
diff --git 
a/regression-test/suites/data_model_p0/unique/test_unique_table_auto_inc_partial_update_consistency_insert.groovy
 
b/regression-test/suites/data_model_p0/unique/test_unique_table_auto_inc_partial_update_consistency_insert.groovy
index e0e86c7c6b6..4e2c8a5cbd8 100644
--- 
a/regression-test/suites/data_model_p0/unique/test_unique_table_auto_inc_partial_update_consistency_insert.groovy
+++ 
b/regression-test/suites/data_model_p0/unique/test_unique_table_auto_inc_partial_update_consistency_insert.groovy
@@ -79,7 +79,7 @@ 
suite("test_unique_table_auto_inc_partial_update_correct_insert") {
     // Nereids, 900
     sql "insert into ${table1} (name, value) values 
('Bob',100),('Alice',200),('Tom',300),('Test',400),('Carter',500),('Smith',600),('Beata',700),('Doris',800),('Nereids',900)"
 
-    qt_select1_1 "select name, value from ${table1} order by value;"
+    qt_select1_1 "select name, value from ${table1} order by name, value;"
     qt_select1_2 "select id, count(*) from ${table1} group by id having 
count(*) > 1;"
     check_data_correct(table1)
     
@@ -92,7 +92,7 @@ 
suite("test_unique_table_auto_inc_partial_update_correct_insert") {
     // 7, 723
     // 9, 923
     sql "insert into ${table1} (id, value) values 
(1,123),(3,323),(5,523),(7,723),(9,923)"
-    qt_select1_3 "select name, value from ${table1} order by value;"
+    qt_select1_3 "select name, value from ${table1} order by name, value;"
     qt_select1_4 "select id, count(*) from ${table1} group by id having 
count(*) > 1;"
     check_data_correct(table1)
     sql "drop table if exists ${table1};"
@@ -139,7 +139,7 @@ 
suite("test_unique_table_auto_inc_partial_update_correct_insert") {
     sql "insert into ${table2} (name, value) values ('Beata',700)"
     sql "insert into ${table2} (name, value) values ('Doris',800)"
     sql "insert into ${table2} (name, value) values ('Nereids',900)"
-    qt_select2_1 "select name, value from ${table2} order by value;"
+    qt_select2_1 "select name, value from ${table2} order by name, value;"
     qt_select2_2 "select id, count(*) from ${table2} group by id having 
count(*) > 1;"
     check_data_correct(table2)
 
@@ -151,7 +151,7 @@ 
suite("test_unique_table_auto_inc_partial_update_correct_insert") {
     // Beata, 9996
     // Nereids, 9998
     sql "insert into ${table2} (name, id) values 
('Bob',9990),('Tom',9992),('Carter',9994),('Beata',9996),('Nereids',9998)"
-    qt_select2_3 "select name, value from ${table2} order by value;"
+    qt_select2_3 "select name, value from ${table2} order by name, value;"
     qt_select2_4 "select id, count(*) from ${table2} group by id having 
count(*) > 1;"
     check_data_correct(table2)
     sql "drop table if exists ${table2};"
@@ -188,7 +188,7 @@ 
suite("test_unique_table_auto_inc_partial_update_correct_insert") {
     // Doris, 800
     // Nereids, 900
     sql "insert into ${table2} (name, value) values 
('Bob',100),('Alice',200),('Tom',300),('Test',400),('Carter',500),('Smith',600),('Beata',700),('Doris',800),('Nereids',900)"
-    qt_select3_1 "select name, value from ${table3} order by value;"
+    qt_select3_1 "select name, value from ${table3} order by name, value;"
     qt_select3_2 "select id, count(*) from ${table3} group by id having 
count(*) > 1;"
     check_data_correct(table3)
 
@@ -204,7 +204,7 @@ 
suite("test_unique_table_auto_inc_partial_update_correct_insert") {
     sql "insert into ${table2} (name, value) values ('Carter',9994)"
     sql "insert into ${table2} (name, value) values ('Beata',9996)"
     sql "insert into ${table2} (name, value) values ('Nereids',9998)"
-    qt_select3_3 "select name, value from ${table3} order by value;"
+    qt_select3_3 "select name, value from ${table3} order by name, value;"
     qt_select3_4 "select id, count(*) from ${table3} group by id having 
count(*) > 1;"
     check_data_correct(table3)
 
@@ -213,7 +213,7 @@ 
suite("test_unique_table_auto_inc_partial_update_correct_insert") {
     sql "insert into ${table2} (name, value) values ('CCCCarter',9994)"
     sql "insert into ${table2} (name, value) values ('BBBBeata',9996)"
     sql "insert into ${table2} (name, value) values ('NNNNereids',9998)"
-    qt_select3_5 "select name, value from ${table3} order by value;"
+    qt_select3_5 "select name, value from ${table3} order by name, value;"
     qt_select3_6 "select id, count(*) from ${table3} group by id having 
count(*) > 1;"
     check_data_correct(table3)
     sql "drop table if exists ${table3};"
diff --git 
a/regression-test/suites/data_model_p0/unique/test_unique_table_auto_inc_partial_update_consistency_stream_load.groovy
 
b/regression-test/suites/data_model_p0/unique/test_unique_table_auto_inc_partial_update_consistency_stream_load.groovy
index 70a84ee971d..474794deb9b 100644
--- 
a/regression-test/suites/data_model_p0/unique/test_unique_table_auto_inc_partial_update_consistency_stream_load.groovy
+++ 
b/regression-test/suites/data_model_p0/unique/test_unique_table_auto_inc_partial_update_consistency_stream_load.groovy
@@ -105,7 +105,7 @@ 
suite("test_unique_table_auto_inc_partial_update_correct_stream_load") {
         time 10000
     }
     sql "sync"
-    qt_select1_1 "select name, value from ${table1} order by value;"
+    qt_select1_1 "select name, value from ${table1} order by name, value;"
     qt_select1_2 "select id, count(*) from ${table1} group by id having 
count(*) > 1;"
     check_data_correct(table1)
     sql "drop table if exists ${table1};"
@@ -150,7 +150,7 @@ 
suite("test_unique_table_auto_inc_partial_update_correct_stream_load") {
         time 10000 // limit inflight 10s
     }
     sql "sync"
-    qt_select2_1 "select name, value from ${table2} order by value;"
+    qt_select2_1 "select name, value from ${table2} order by name, value;"
     qt_select2_2 "select id, count(*) from ${table2} group by id having 
count(*) > 1;"
     check_data_correct(table2)
 
@@ -171,7 +171,7 @@ 
suite("test_unique_table_auto_inc_partial_update_correct_stream_load") {
         time 10000
     }
     sql "sync"
-    qt_select2_3 "select name, value from ${table2} order by value;"
+    qt_select2_3 "select name, value from ${table2} order by name, value;"
     qt_select2_4 "select id, count(*) from ${table2} group by id having 
count(*) > 1;"
     check_data_correct(table2)
     sql "drop table if exists ${table2};"
@@ -206,7 +206,7 @@ 
suite("test_unique_table_auto_inc_partial_update_correct_stream_load") {
         time 10000 // limit inflight 10s
     }
     sql "sync"
-    qt_select3_1 "select name, value from ${table3} order by value;"
+    qt_select3_1 "select name, value from ${table3} order by name, value;"
     qt_select3_2 "select id, count(*) from ${table3} group by id having 
count(*) > 1;"
     check_data_correct(table3)
 
@@ -227,7 +227,7 @@ 
suite("test_unique_table_auto_inc_partial_update_correct_stream_load") {
         time 10000
     }
     sql "sync"
-    qt_select3_3 "select name, value from ${table3} order by value;"
+    qt_select3_3 "select name, value from ${table3} order by name, value;"
     qt_select3_4 "select id, count(*) from ${table3} group by id having 
count(*) > 1;"
     check_data_correct(table3)
     // BBob, 9990
@@ -247,7 +247,7 @@ 
suite("test_unique_table_auto_inc_partial_update_correct_stream_load") {
         time 10000
     }
     sql "sync"
-    qt_select3_5 "select name, value from ${table3} order by value;"
+    qt_select3_5 "select name, value from ${table3} order by name, value;"
     qt_select3_6 "select id, count(*) from ${table3} group by id having 
count(*) > 1;"
     check_data_correct(table3)
     sql "drop table if exists ${table3};"


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to