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

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


The following commit(s) were added to refs/heads/master by this push:
     new a977f356156 [fix](regression-test) Multi threaded testing (#39617)
a977f356156 is described below

commit a977f35615610aa14bd14133f4520f4d3c38a60d
Author: kkop <2449402...@qq.com>
AuthorDate: Fri Oct 11 17:25:04 2024 +0800

    [fix](regression-test) Multi threaded testing (#39617)
    
    ## Proposed changes
    
    Issue Number: close #xxx
    
    <!--Describe your changes.-->
---
 .../suites/schema_change_p0/test_agg_schema_key_change_modify.groovy  | 1 +
 .../suites/schema_change_p0/test_agg_schema_key_change_modify1.groovy | 1 +
 .../suites/schema_change_p0/test_agg_schema_value_modify.groovy       | 1 +
 .../suites/schema_change_p0/test_agg_schema_value_modify2.groovy      | 2 ++
 .../suites/schema_change_p0/test_agg_schema_value_modify3.groovy      | 2 +-
 .../suites/schema_change_p0/test_dup_schema_key_change_modify.groovy  | 1 +
 .../suites/schema_change_p0/test_dup_schema_key_change_modify1.groovy | 2 +-
 .../suites/schema_change_p0/test_dup_schema_value_modify.groovy       | 2 +-
 .../suites/schema_change_p0/test_dup_schema_value_modify1.groovy      | 2 +-
 .../suites/schema_change_p0/test_dup_schema_value_modify2.groovy      | 3 ++-
 .../suites/schema_change_p0/test_dup_schema_value_modify3.groovy      | 4 +---
 .../suites/schema_change_p0/test_dup_schema_value_modify4.groovy      | 2 --
 .../suites/schema_change_p0/test_unique_schema_key_change_add.groovy  | 1 -
 .../schema_change_p0/test_unique_schema_key_change_modify.groovy      | 4 +++-
 .../suites/schema_change_p0/test_unique_schema_value_drop.groovy      | 1 -
 .../suites/schema_change_p0/test_unique_schema_value_modify.groovy    | 2 +-
 .../suites/schema_change_p0/test_unique_schema_value_modify2.groovy   | 2 ++
 17 files changed, 19 insertions(+), 14 deletions(-)

diff --git 
a/regression-test/suites/schema_change_p0/test_agg_schema_key_change_modify.groovy
 
b/regression-test/suites/schema_change_p0/test_agg_schema_key_change_modify.groovy
index 9bf9520b9c1..70e2c2c242c 100644
--- 
a/regression-test/suites/schema_change_p0/test_agg_schema_key_change_modify.groovy
+++ 
b/regression-test/suites/schema_change_p0/test_agg_schema_key_change_modify.groovy
@@ -55,6 +55,7 @@ suite("test_agg_schema_key_change_modify","p0") {
 
      //TODO Test the agg model by modify a key type from BOOLEAN to TINYINT
      def errorMessage="errCode = 2, detailMessage = Can not change BOOLEAN to 
TINYINT"
+     def insertSql = ""
      expectException({
           sql initTable
           sql initTableData
diff --git 
a/regression-test/suites/schema_change_p0/test_agg_schema_key_change_modify1.groovy
 
b/regression-test/suites/schema_change_p0/test_agg_schema_key_change_modify1.groovy
index 13dff5950bc..78d203c4f73 100644
--- 
a/regression-test/suites/schema_change_p0/test_agg_schema_key_change_modify1.groovy
+++ 
b/regression-test/suites/schema_change_p0/test_agg_schema_key_change_modify1.groovy
@@ -51,6 +51,7 @@ suite("test_agg_schema_key_change_modify1","p0") {
              "               (789012345, 'Grace', 0, 'Xian', 29, 0, 
13333333333, 'No. 222 Street, Xian', '2022-07-07 22:00:00');"
      def initTable1 = ""
      def initTableData1 = ""
+     def insertSql = ""
 
      /**
       *  Test the agg model by modify a key type from LARGEINT to other type
diff --git 
a/regression-test/suites/schema_change_p0/test_agg_schema_value_modify.groovy 
b/regression-test/suites/schema_change_p0/test_agg_schema_value_modify.groovy
index bae5f663dbf..4d10211a523 100644
--- 
a/regression-test/suites/schema_change_p0/test_agg_schema_value_modify.groovy
+++ 
b/regression-test/suites/schema_change_p0/test_agg_schema_value_modify.groovy
@@ -54,6 +54,7 @@ suite("test_agg_schema_value_modify","p0") {
              "               (678901234, 'Frank', 1, 'Hangzhou', 32, 1, 
13467985213, 'No. 321 Street, Hangzhou', '2022-06-06 20:00:00')," +
              "               (789012345, 'Grace', 0, 'Xian', 29, 0, 
13333333333, 'No. 222 Street, Xian', '2022-07-07 22:00:00');"
 
+     def insertSql = ""
      //TODO Test the agg model by modify a value type from BOOLEAN to TINYINT
      errorMessagge="errCode = 2, detailMessage = Can not change BOOLEAN to 
TINYINT"
      expectException({
diff --git 
a/regression-test/suites/schema_change_p0/test_agg_schema_value_modify2.groovy 
b/regression-test/suites/schema_change_p0/test_agg_schema_value_modify2.groovy
index 4587516cec7..2489ba3c5d6 100644
--- 
a/regression-test/suites/schema_change_p0/test_agg_schema_value_modify2.groovy
+++ 
b/regression-test/suites/schema_change_p0/test_agg_schema_value_modify2.groovy
@@ -51,6 +51,8 @@ suite("test_agg_schema_value_modify2", "p0") {
     def getTableStatusSql = " SHOW ALTER TABLE COLUMN WHERE 
IndexName='${tbName1}' ORDER BY createtime DESC LIMIT 1  "
     def errorMessage = ""
     def insertSql = "insert into ${tbName1} values(923456689, 'Alice', '四川省', 
'Yaan', 25, 0, 13812345678, 'No. 123 Street, Beijing', '2022-01-01 10:00:00');"
+    def initTable1 = ""
+    def initTableData1 = ""
 
 
     /**
diff --git 
a/regression-test/suites/schema_change_p0/test_agg_schema_value_modify3.groovy 
b/regression-test/suites/schema_change_p0/test_agg_schema_value_modify3.groovy
index 7dd1a3ae10c..27664e2030e 100644
--- 
a/regression-test/suites/schema_change_p0/test_agg_schema_value_modify3.groovy
+++ 
b/regression-test/suites/schema_change_p0/test_agg_schema_value_modify3.groovy
@@ -54,7 +54,7 @@ suite("test_agg_schema_value_modify3", "p0") {
             "               (678901234, 'Frank', 1, 'Hangzhou', 32, 1, 
13467985213, 'No. 321 Street, Hangzhou', '2022-06-06 20:00:00')," +
             "               (789012345, 'Grace', 0, 'Xian', 29, 0, 
13333333333, 'No. 222 Street, Xian', '2022-07-07 22:00:00');"
 
-
+    def insertSql = ""
     /**
      *  Test the agg model by modify a value type from MAP to other type
      */
diff --git 
a/regression-test/suites/schema_change_p0/test_dup_schema_key_change_modify.groovy
 
b/regression-test/suites/schema_change_p0/test_dup_schema_key_change_modify.groovy
index 1b1c051eba5..ab2e5b1671d 100644
--- 
a/regression-test/suites/schema_change_p0/test_dup_schema_key_change_modify.groovy
+++ 
b/regression-test/suites/schema_change_p0/test_dup_schema_key_change_modify.groovy
@@ -55,6 +55,7 @@ suite("test_dup_schema_key_change_modify","p0") {
 
      //TODO Test the dup model by modify a key type from BOOLEAN to TINYINT
      def errorMessage="errCode = 2, detailMessage = Can not change BOOLEAN to 
TINYINT"
+     def insertSql = ""
      expectException({
           sql initTable
           sql initTableData
diff --git 
a/regression-test/suites/schema_change_p0/test_dup_schema_key_change_modify1.groovy
 
b/regression-test/suites/schema_change_p0/test_dup_schema_key_change_modify1.groovy
index 37c86b31468..74a5c1f86d8 100644
--- 
a/regression-test/suites/schema_change_p0/test_dup_schema_key_change_modify1.groovy
+++ 
b/regression-test/suites/schema_change_p0/test_dup_schema_key_change_modify1.groovy
@@ -51,7 +51,7 @@ suite("test_dup_schema_key_change_modify1","p0") {
              "               (789012345, 'Grace', 0, 'Xian', 29, 0, 
13333333333, 'No. 222 Street, Xian', '2022-07-07 22:00:00');"
      def initTable1 = ""
      def initTableData1 = ""
-
+     def insertSql = ""
      /**
       *  Test the dup model by modify a key type from LARGEINT to other type
       */
diff --git 
a/regression-test/suites/schema_change_p0/test_dup_schema_value_modify.groovy 
b/regression-test/suites/schema_change_p0/test_dup_schema_value_modify.groovy
index 83d1307f3c9..e63bb55dfc1 100644
--- 
a/regression-test/suites/schema_change_p0/test_dup_schema_value_modify.groovy
+++ 
b/regression-test/suites/schema_change_p0/test_dup_schema_value_modify.groovy
@@ -53,7 +53,7 @@ suite("test_dup_schema_value_modify","p0") {
              "               (567890123, 'Eve', 0, 'Chengdu', 27, 0, 
13572468091, 'No. 654 Street, Chengdu', '2022-05-05 18:00:00')," +
              "               (678901234, 'Frank', 1, 'Hangzhou', 32, 1, 
13467985213, 'No. 321 Street, Hangzhou', '2022-06-06 20:00:00')," +
              "               (789012345, 'Grace', 0, 'Xian', 29, 0, 
13333333333, 'No. 222 Street, Xian', '2022-07-07 22:00:00');"
-
+     def insertSql = ""
      //TODO Test the dup model by modify a value type from BOOLEAN to TINYINT
      errorMessage="errCode = 2, detailMessage = Can not change BOOLEAN to 
TINYINT"
      expectException({
diff --git 
a/regression-test/suites/schema_change_p0/test_dup_schema_value_modify1.groovy 
b/regression-test/suites/schema_change_p0/test_dup_schema_value_modify1.groovy
index 9c4eed77ec4..90dc5c030d8 100644
--- 
a/regression-test/suites/schema_change_p0/test_dup_schema_value_modify1.groovy
+++ 
b/regression-test/suites/schema_change_p0/test_dup_schema_value_modify1.groovy
@@ -56,7 +56,7 @@ suite("test_dup_schema_value_modify1", "p0") {
             "               (678901234, 'Frank', 1, 'Hangzhou', 32, 1, 
13467985213, 'No. 321 Street, Hangzhou', '2022-06-06 20:00:00')," +
             "               (789012345, 'Grace', 0, 'Xian', 29, 0, 
13333333333, 'No. 222 Street, Xian', '2022-07-07 22:00:00');"
 
-
+    def insertSql = ""
 
     /**
      *  Test the dup model by modify a value type from FLOAT to other type
diff --git 
a/regression-test/suites/schema_change_p0/test_dup_schema_value_modify2.groovy 
b/regression-test/suites/schema_change_p0/test_dup_schema_value_modify2.groovy
index c687bb6b87f..f1c3e1b1228 100644
--- 
a/regression-test/suites/schema_change_p0/test_dup_schema_value_modify2.groovy
+++ 
b/regression-test/suites/schema_change_p0/test_dup_schema_value_modify2.groovy
@@ -51,7 +51,8 @@ suite("test_dup_schema_value_modify2", "p0") {
     def getTableStatusSql = " SHOW ALTER TABLE COLUMN WHERE 
IndexName='${tbName1}' ORDER BY createtime DESC LIMIT 1  "
     def errorMessage = ""
     def insertSql = "insert into ${tbName1} values(923456689, 'Alice', '四川省', 
'Yaan', 25, 0, 13812345678, 'No. 123 Street, Beijing', '2022-01-01 10:00:00');"
-
+    def initTable1 = ""
+    def initTableData1 = ""
 
     /**
      *  Test the dup model by modify a value type from CHAR to other type
diff --git 
a/regression-test/suites/schema_change_p0/test_dup_schema_value_modify3.groovy 
b/regression-test/suites/schema_change_p0/test_dup_schema_value_modify3.groovy
index caa7a3ffa79..ddac0e19a04 100644
--- 
a/regression-test/suites/schema_change_p0/test_dup_schema_value_modify3.groovy
+++ 
b/regression-test/suites/schema_change_p0/test_dup_schema_value_modify3.groovy
@@ -25,8 +25,6 @@ suite("test_dup_schema_value_modify3", "p0") {
     /**
      *  Test the dup model by modify a value type
      */
-    def initTable2 = ""
-    def initTableData2 = ""
     sql """ DROP TABLE IF EXISTS ${tbName1} """
     def initTable = " CREATE TABLE IF NOT EXISTS ${tbName1}\n" +
             "          (\n" +
@@ -53,7 +51,7 @@ suite("test_dup_schema_value_modify3", "p0") {
             "               (567890123, 'Eve', 0, 'Chengdu', 27, 0, 
13572468091, 'No. 654 Street, Chengdu', '2022-05-05 18:00:00')," +
             "               (678901234, 'Frank', 1, 'Hangzhou', 32, 1, 
13467985213, 'No. 321 Street, Hangzhou', '2022-06-06 20:00:00')," +
             "               (789012345, 'Grace', 0, 'Xian', 29, 0, 
13333333333, 'No. 222 Street, Xian', '2022-07-07 22:00:00');"
-
+    def insertSql = ""
 
     /**
      *  Test the dup model by modify a value type from MAP to other type
diff --git 
a/regression-test/suites/schema_change_p0/test_dup_schema_value_modify4.groovy 
b/regression-test/suites/schema_change_p0/test_dup_schema_value_modify4.groovy
index 525fc691688..56870568ad7 100644
--- 
a/regression-test/suites/schema_change_p0/test_dup_schema_value_modify4.groovy
+++ 
b/regression-test/suites/schema_change_p0/test_dup_schema_value_modify4.groovy
@@ -17,7 +17,6 @@
 
 suite("test_dup_schema_value_modify4", "p0") {
     def tbName1 = "test_dup_model_value_change3"
-    def tbName2 = "test_dup_model_value_change_3"
 
     //Test the dup model by adding a value column
     sql """ DROP TABLE IF EXISTS ${tbName1} """
@@ -53,7 +52,6 @@ suite("test_dup_schema_value_modify4", "p0") {
     def errorMessage = ""
     def insertSql = "insert into ${tbName1} values(923456689, 'Alice', '四川省', 
'Yaan', 25, 0, 13812345678, 'No. 123 Street, Beijing', '2022-01-01 10:00:00');"
 
-
     /**
      *  Test the dup model by modify a value type from MAP to other type
      */
diff --git 
a/regression-test/suites/schema_change_p0/test_unique_schema_key_change_add.groovy
 
b/regression-test/suites/schema_change_p0/test_unique_schema_key_change_add.groovy
index e4cbe57807e..eaf2834019f 100644
--- 
a/regression-test/suites/schema_change_p0/test_unique_schema_key_change_add.groovy
+++ 
b/regression-test/suites/schema_change_p0/test_unique_schema_key_change_add.groovy
@@ -46,7 +46,6 @@ suite("test_unique_schema_key_change_add","p0") {
              "               (567890123, 'Eve', 'Chengdu', 27, 0, 13572468091, 
'No. 654 Street, Chengdu', '2022-05-05 18:00:00')," +
              "               (678901234, 'Frank', 'Hangzhou', 32, 1, 
13467985213, 'No. 321 Street, Hangzhou', '2022-06-06 20:00:00')," +
              "               (789012345, 'Grace', 'Xian', 29, 0, 13333333333, 
'No. 222 Street, Xian', '2022-07-07 22:00:00');"
-
      //Test the unique model by adding a key column with VARCHAR
      sql initTable
      sql initTableData
diff --git 
a/regression-test/suites/schema_change_p0/test_unique_schema_key_change_modify.groovy
 
b/regression-test/suites/schema_change_p0/test_unique_schema_key_change_modify.groovy
index 925e880a4e5..cf43e838773 100644
--- 
a/regression-test/suites/schema_change_p0/test_unique_schema_key_change_modify.groovy
+++ 
b/regression-test/suites/schema_change_p0/test_unique_schema_key_change_modify.groovy
@@ -52,7 +52,9 @@ suite("test_unique_schema_key_change_modify","p0") {
              "               (567890123, 'Eve', 0, 'Chengdu', 27, 0, 
13572468091, 'No. 654 Street, Chengdu', '2022-05-05 18:00:00')," +
              "               (678901234, 'Frank', 1, 'Hangzhou', 32, 1, 
13467985213, 'No. 321 Street, Hangzhou', '2022-06-06 20:00:00')," +
              "               (789012345, 'Grace', 0, 'Xian', 29, 0, 
13333333333, 'No. 222 Street, Xian', '2022-07-07 22:00:00');"
-
+     def insertSql = ""
+     def initTable2 = ""
+     def initTableData2 = ""
      //TODO Test the unique model by modify a key type from BOOLEAN to TINYINT
      def errorMessage="errCode = 2, detailMessage = Can not change BOOLEAN to 
TINYINT"
      expectException({
diff --git 
a/regression-test/suites/schema_change_p0/test_unique_schema_value_drop.groovy 
b/regression-test/suites/schema_change_p0/test_unique_schema_value_drop.groovy
index 69a8ea4a811..a804709eb60 100644
--- 
a/regression-test/suites/schema_change_p0/test_unique_schema_value_drop.groovy
+++ 
b/regression-test/suites/schema_change_p0/test_unique_schema_value_drop.groovy
@@ -27,7 +27,6 @@ suite("test_unique_schema_value_drop", "p0") {
     def errorMessage = ""
     def insertSql = "insert into ${tbName} values(123456689, 'Alice', '四川省', 
'Yaan', 25, 0, 13812345678, 'No. 123 Street, Beijing', '2022-01-01 10:00:00');"
 
-
     /**
      *  Test the unique model by drop a value type
      */
diff --git 
a/regression-test/suites/schema_change_p0/test_unique_schema_value_modify.groovy
 
b/regression-test/suites/schema_change_p0/test_unique_schema_value_modify.groovy
index 2091c8e915f..c8574bd0290 100644
--- 
a/regression-test/suites/schema_change_p0/test_unique_schema_value_modify.groovy
+++ 
b/regression-test/suites/schema_change_p0/test_unique_schema_value_modify.groovy
@@ -56,7 +56,7 @@ suite("test_unique_schema_value_modify","p0") {
              "               (567890123, 'Eve', 0, 'Chengdu', 27, 0, 
13572468091, 'No. 654 Street, Chengdu', '2022-05-05 18:00:00')," +
              "               (678901234, 'Frank', 1, 'Hangzhou', 32, 1, 
13467985213, 'No. 321 Street, Hangzhou', '2022-06-06 20:00:00')," +
              "               (789012345, 'Grace', 0, 'Xian', 29, 0, 
13333333333, 'No. 222 Street, Xian', '2022-07-07 22:00:00');"
-
+     def insertSql = ""
      //TODO Test the unique model by modify a value type from BOOLEAN to 
TINYINT
      errorMessage="errCode = 2, detailMessage = Can not change BOOLEAN to 
TINYINT"
      expectException({
diff --git 
a/regression-test/suites/schema_change_p0/test_unique_schema_value_modify2.groovy
 
b/regression-test/suites/schema_change_p0/test_unique_schema_value_modify2.groovy
index afbaea78d1a..63f582920ee 100644
--- 
a/regression-test/suites/schema_change_p0/test_unique_schema_value_modify2.groovy
+++ 
b/regression-test/suites/schema_change_p0/test_unique_schema_value_modify2.groovy
@@ -18,6 +18,8 @@
 suite("test_unique_schema_value_modify2", "p0") {
     def tbName = "test_unique_model_value_change2"
     def tbName2 = "test_unique_model_value_change_2"
+    def initTable1 = ""
+    def initTableData1 = ""
     def on_write = getRandomBoolean()
     println String.format("current enable_unique_key_merge_on_write is : %s 
",on_write)
     //Test the unique model by adding a value column


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org

Reply via email to