You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by yi...@apache.org on 2022/10/11 07:44:26 UTC

[doris] branch master updated: [regression-test](unique) Check the table version upper 1 before select operation. #13205

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

yiguolei 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 88264b3e7b [regression-test](unique) Check the table version upper 1 before select operation. #13205
88264b3e7b is described below

commit 88264b3e7b55c2a2950cf56a03f71f9d92cd2f83
Author: Hong Liu <84...@qq.com>
AuthorDate: Tue Oct 11 15:44:17 2022 +0800

    [regression-test](unique) Check the table version upper 1 before select operation. #13205
    
    Co-authored-by: smallhibiscus <84...@qq.com>
---
 .../four/load_four_step.groovy                     | 23 ++++++++++++++++++----
 .../one/load_one_step.groovy                       | 23 ++++++++++++++++++----
 .../three/load_three_step.groovy                   | 23 ++++++++++++++++++----
 .../two/load_two_step.groovy                       | 23 ++++++++++++++++++----
 4 files changed, 76 insertions(+), 16 deletions(-)

diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/four/load_four_step.groovy b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/four/load_four_step.groovy
index b3f5853388..5fbd0d88e0 100644
--- a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/four/load_four_step.groovy
+++ b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/four/load_four_step.groovy
@@ -56,10 +56,25 @@ suite("load_four_step") {
                 }
             }
             sql 'sync'
-            for (int i = 1; i <= 5; i++) {
-                def loadRowCount = sql "select count(1) from ${tableName}"
-                logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString())
-                assertTrue(loadRowCount[0][0] == rows[1])
+            int flag = 1
+            while (flag < 30){
+                def tableVersion = sql "admin show replica status from ${tableName}"
+                logger.info(" ${tableName} version: ${tableVersion[0][3]}".toString())
+                if (tableVersion[0][3] > 1){
+                    for (int i = 1; i <= 5; i++) {
+                        def loadRowCount = sql "select count(1) from ${tableName}"
+                        logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString())
+                        assertTrue(loadRowCount[0][0] == rows[1])
+                    }
+                    break
+                } else {
+                    flag ++
+                    sleep(1000)
+                }
+            }
+            if (flag >= 30){
+                logger.info("wait version timeout")
+                assertTrue(1 == 2)
             }
         }
         sql """ set delete_without_partition = true; """
diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/one/load_one_step.groovy b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/one/load_one_step.groovy
index 68c8e98a88..eb8b5a7e9f 100644
--- a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/one/load_one_step.groovy
+++ b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/one/load_one_step.groovy
@@ -51,10 +51,25 @@ suite("load_one_step") {
             }
         }
         sql 'sync'
-        for (int i = 1; i <= 5; i++) {
-            def loadRowCount = sql "select count(1) from ${tableName}"
-            logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString())
-            assertTrue(loadRowCount[0][0] == rows[1])
+        int flag = 1
+        while (flag < 30){
+            def tableVersion = sql "admin show replica status from ${tableName}"
+            logger.info(" ${tableName} version: ${tableVersion[0][3]}".toString())
+            if (tableVersion[0][3] > 1){
+                for (int i = 1; i <= 5; i++) {
+                    def loadRowCount = sql "select count(1) from ${tableName}"
+                    logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString())
+                    assertTrue(loadRowCount[0][0] == rows[1])
+                }
+                break
+            } else {
+                flag ++
+                sleep(1000)
+            }
+        }
+        if (flag >= 30){
+            logger.info("wait version timeout")
+            assertTrue(1 == 2)
         }
     }
 }
diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/three/load_three_step.groovy b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/three/load_three_step.groovy
index bbd9e0f4ba..672174d504 100644
--- a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/three/load_three_step.groovy
+++ b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/three/load_three_step.groovy
@@ -53,10 +53,25 @@ suite("load_three_step") {
                 }
             }
             sql 'sync'
-            for (int i = 1; i <= 5; i++) {
-                def loadRowCount = sql "select count(1) from ${tableName}"
-                logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString())
-                assertTrue(loadRowCount[0][0] == rows[1])
+            int flag = 1
+            while (flag < 30){
+                def tableVersion = sql "admin show replica status from ${tableName}"
+                logger.info(" ${tableName} version: ${tableVersion[0][3]}".toString())
+                if (tableVersion[0][3] > 1){
+                    for (int i = 1; i <= 5; i++) {
+                        def loadRowCount = sql "select count(1) from ${tableName}"
+                        logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString())
+                        assertTrue(loadRowCount[0][0] == rows[1])
+                    }
+                    break
+                } else {
+                    flag ++
+                    sleep(1000)
+                }
+            }
+            if (flag >= 30){
+                logger.info("wait version timeout")
+                assertTrue(1 == 2)
             }
         }
         sql new File("""${context.file.parentFile.parent}/ddl/${tableName}_delete.sql""").text
diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/two/load_two_step.groovy b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/two/load_two_step.groovy
index 4e2e7ae3b8..ade9581fd1 100644
--- a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/two/load_two_step.groovy
+++ b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/two/load_two_step.groovy
@@ -52,10 +52,25 @@ suite("load_two_step") {
             }
         }
         sql 'sync'
-        for (int i = 1; i <= 5; i++) {
-            def loadRowCount = sql "select count(1) from ${tableName}"
-            logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString())
-            assertTrue(loadRowCount[0][0] == rows[1])
+        int flag = 1
+        while (flag < 30){
+            def tableVersion = sql "admin show replica status from ${tableName}"
+            logger.info(" ${tableName} version: ${tableVersion[0][3]}".toString())
+            if (tableVersion[0][3] > 1){
+                for (int i = 1; i <= 5; i++) {
+                    def loadRowCount = sql "select count(1) from ${tableName}"
+                    logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString())
+                    assertTrue(loadRowCount[0][0] == rows[1])
+                }
+                break
+            } else {
+                flag ++
+                sleep(1000)
+            }
+        }
+        if (flag >= 30){
+            logger.info("wait version timeout")
+            assertTrue(1 == 2)
         }
         sql new File("""${context.file.parentFile.parent}/ddl/${tableName}_delete.sql""").text
         for (int i = 1; i <= 5; i++) {


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