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

jianliangqi 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 3e08bec27f3 [opt](regression test) use select count from tablet api 
(#28327)
3e08bec27f3 is described below

commit 3e08bec27f304cd618f1917260b3140d2f478638
Author: qiye <jianliang5...@gmail.com>
AuthorDate: Wed Dec 13 16:12:56 2023 +0800

    [opt](regression test) use select count from tablet api (#28327)
---
 .../stream_load/test_load_to_single_tablet.groovy  | 205 +++++++--------------
 1 file changed, 65 insertions(+), 140 deletions(-)

diff --git 
a/regression-test/suites/load_p0/stream_load/test_load_to_single_tablet.groovy 
b/regression-test/suites/load_p0/stream_load/test_load_to_single_tablet.groovy
index 867601f5dc1..c35500267b9 100644
--- 
a/regression-test/suites/load_p0/stream_load/test_load_to_single_tablet.groovy
+++ 
b/regression-test/suites/load_p0/stream_load/test_load_to_single_tablet.groovy
@@ -17,17 +17,6 @@
 
 import groovy.json.JsonSlurper
 
-/**
- *   @Params url is "/xxx"
- *   @Return response body
- */
-def http_get(url) {
-    def conn = new URL(url).openConnection()
-    conn.setRequestMethod("GET")
-    //token for root
-    return conn.getInputStream().getText()
-}
-
 suite("test_load_to_single_tablet", "p0") {
     sql "show tables"
 
@@ -67,23 +56,16 @@ suite("test_load_to_single_tablet", "p0") {
     def totalCount = sql "select count() from ${tableName}"
     assertEquals(10, totalCount[0][0])
     def res = sql "show tablets from ${tableName}"
-    def tabletMetaUrl1 = res[0][17]
-    def tabletMetaUrl2 = res[1][17]
-    def tabletMetaUrl3 = res[2][17]
-    def tabletMetaRes1 = http_get(tabletMetaUrl1)
-    def tabletMetaRes2 = http_get(tabletMetaUrl2)
-    def tabletMetaRes3 = http_get(tabletMetaUrl3)
-
-    def obj1 = new JsonSlurper().parseText(tabletMetaRes1)
-    def obj2 = new JsonSlurper().parseText(tabletMetaRes2)
-    def obj3 = new JsonSlurper().parseText(tabletMetaRes3)
-    def rowCount1 = obj1.rs_metas[0].num_rows + obj1.rs_metas[1].num_rows
-    def rowCount2 = obj2.rs_metas[0].num_rows + obj2.rs_metas[1].num_rows
-    def rowCount3 = obj3.rs_metas[0].num_rows + obj3.rs_metas[1].num_rows
-
-    assertEquals(10, rowCount1)
-    assertEquals(0, rowCount2)
-    assertEquals(0, rowCount3)
+    def tablet1 = res[0][0]
+    def tablet2 = res[1][0]
+    def tablet3 = res[2][0]
+    def rowCount1 = sql "select count() from ${tableName} tablet(${tablet1})"
+    def rowCount2 = sql "select count() from ${tableName} tablet(${tablet2})"
+    def rowCount3 = sql "select count() from ${tableName} tablet(${tablet3})"
+
+    assertEquals(10, rowCount1[0][0])
+    assertEquals(0, rowCount2[0][0])
+    assertEquals(0, rowCount3[0][0])
     
 
     // load second time
@@ -99,21 +81,13 @@ suite("test_load_to_single_tablet", "p0") {
     }
     sql "sync"
     totalCount = sql "select count() from ${tableName}"
+    rowCount1 = sql "select count() from ${tableName} tablet(${tablet1})"
+    rowCount2 = sql "select count() from ${tableName} tablet(${tablet2})"
+    rowCount3 = sql "select count() from ${tableName} tablet(${tablet3})"
     assertEquals(20, totalCount[0][0])
-    tabletMetaRes1 = http_get(tabletMetaUrl1)
-    tabletMetaRes2 = http_get(tabletMetaUrl2)
-    tabletMetaRes3 = http_get(tabletMetaUrl3)
-
-    obj1 = new JsonSlurper().parseText(tabletMetaRes1)
-    obj2 = new JsonSlurper().parseText(tabletMetaRes2)
-    obj3 = new JsonSlurper().parseText(tabletMetaRes3)
-
-    rowCount1 = obj1.rs_metas[0].num_rows + obj1.rs_metas[1].num_rows + 
obj1.rs_metas[2].num_rows
-    rowCount2 = obj2.rs_metas[0].num_rows + obj2.rs_metas[1].num_rows + 
obj2.rs_metas[2].num_rows
-    rowCount3 = obj3.rs_metas[0].num_rows + obj3.rs_metas[1].num_rows + 
obj3.rs_metas[2].num_rows
-    assertEquals(10, rowCount1)
-    assertEquals(10, rowCount2)
-    assertEquals(0, rowCount3)
+    assertEquals(10, rowCount1[0][0])
+    assertEquals(10, rowCount2[0][0])
+    assertEquals(0, rowCount3[0][0])
 
     // load third time
     streamLoad {
@@ -128,21 +102,13 @@ suite("test_load_to_single_tablet", "p0") {
     }
     sql "sync"
     totalCount = sql "select count() from ${tableName}"
+    rowCount1 = sql "select count() from ${tableName} tablet(${tablet1})"
+    rowCount2 = sql "select count() from ${tableName} tablet(${tablet2})"
+    rowCount3 = sql "select count() from ${tableName} tablet(${tablet3})"
     assertEquals(30, totalCount[0][0])
-    tabletMetaRes1 = http_get(tabletMetaUrl1)
-    tabletMetaRes2 = http_get(tabletMetaUrl2)
-    tabletMetaRes3 = http_get(tabletMetaUrl3)
-
-    obj1 = new JsonSlurper().parseText(tabletMetaRes1)
-    obj2 = new JsonSlurper().parseText(tabletMetaRes2)
-    obj3 = new JsonSlurper().parseText(tabletMetaRes3)
-
-    rowCount1 = obj1.rs_metas[0].num_rows + obj1.rs_metas[1].num_rows + 
obj1.rs_metas[2].num_rows + obj1.rs_metas[3].num_rows
-    rowCount2 = obj2.rs_metas[0].num_rows + obj2.rs_metas[1].num_rows + 
obj2.rs_metas[2].num_rows + obj2.rs_metas[3].num_rows
-    rowCount3 = obj3.rs_metas[0].num_rows + obj3.rs_metas[1].num_rows + 
obj3.rs_metas[2].num_rows + obj3.rs_metas[3].num_rows
-    assertEquals(10, rowCount1)
-    assertEquals(10, rowCount2)
-    assertEquals(10, rowCount3)
+    assertEquals(10, rowCount1[0][0])
+    assertEquals(10, rowCount2[0][0])
+    assertEquals(10, rowCount3[0][0])
 
     // test partitioned table
     tableName = "test_load_to_single_tablet_partitioned"
@@ -184,38 +150,25 @@ suite("test_load_to_single_tablet", "p0") {
     totalCount = sql "select count() from ${tableName}"
     assertEquals(10, totalCount[0][0])
     res = sql "show tablets from ${tableName} partitions(p20231011, p20231012)"
-    tabletMetaUrl1 = res[0][17]
-    tabletMetaUrl2 = res[1][17]
-    tabletMetaUrl3 = res[2][17]
-    tabletMetaUrl4 = res[10][17]
-    tabletMetaUrl5 = res[11][17]
-    tabletMetaUrl6 = res[12][17]
-    tabletMetaRes1 = http_get(tabletMetaUrl1)
-    tabletMetaRes2 = http_get(tabletMetaUrl2)
-    tabletMetaRes3 = http_get(tabletMetaUrl3)
-    tabletMetaRes4 = http_get(tabletMetaUrl4)
-    tabletMetaRes5 = http_get(tabletMetaUrl5)
-    tabletMetaRes6 = http_get(tabletMetaUrl6)
-
-    obj1 = new JsonSlurper().parseText(tabletMetaRes1)
-    obj2 = new JsonSlurper().parseText(tabletMetaRes2)
-    obj3 = new JsonSlurper().parseText(tabletMetaRes3)
-    obj4 = new JsonSlurper().parseText(tabletMetaRes4)
-    obj5 = new JsonSlurper().parseText(tabletMetaRes5)
-    obj6 = new JsonSlurper().parseText(tabletMetaRes6)
-
-    rowCount1 = obj1.rs_metas[0].num_rows + obj1.rs_metas[1].num_rows
-    rowCount2 = obj2.rs_metas[0].num_rows + obj2.rs_metas[1].num_rows
-    rowCount3 = obj3.rs_metas[0].num_rows + obj3.rs_metas[1].num_rows
-    def rowCount4 = obj4.rs_metas[0].num_rows + obj4.rs_metas[1].num_rows
-    def rowCount5 = obj5.rs_metas[0].num_rows + obj5.rs_metas[1].num_rows
-    def rowCount6 = obj6.rs_metas[0].num_rows + obj6.rs_metas[1].num_rows
-    assertEquals(5, rowCount1)
-    assertEquals(0, rowCount2)
-    assertEquals(0, rowCount3)
-    assertEquals(5, rowCount4)
-    assertEquals(0, rowCount5)
-    assertEquals(0, rowCount6)
+    tablet1 = res[0][0]
+    tablet2 = res[1][0]
+    tablet3 = res[2][0]
+    tablet4 = res[10][0]
+    tablet5 = res[11][0]
+    tablet6 = res[12][0]
+
+    rowCount1 = sql "select count() from ${tableName} tablet(${tablet1})"
+    rowCount2 = sql "select count() from ${tableName} tablet(${tablet2})"
+    rowCount3 = sql "select count() from ${tableName} tablet(${tablet3})"
+    def rowCount4 = sql "select count() from ${tableName} tablet(${tablet4})"
+    def rowCount5 = sql "select count() from ${tableName} tablet(${tablet5})"
+    def rowCount6 = sql "select count() from ${tableName} tablet(${tablet6})"
+    assertEquals(5, rowCount1[0][0])
+    assertEquals(0, rowCount2[0][0])
+    assertEquals(0, rowCount3[0][0])
+    assertEquals(5, rowCount4[0][0])
+    assertEquals(0, rowCount5[0][0])
+    assertEquals(0, rowCount6[0][0])
 
     // load second time
     streamLoad {
@@ -230,33 +183,19 @@ suite("test_load_to_single_tablet", "p0") {
     }
     sql "sync"
     totalCount = sql "select count() from ${tableName}"
+    rowCount1 = sql "select count() from ${tableName} tablet(${tablet1})"
+    rowCount2 = sql "select count() from ${tableName} tablet(${tablet2})"
+    rowCount3 = sql "select count() from ${tableName} tablet(${tablet3})"
+    rowCount4 = sql "select count() from ${tableName} tablet(${tablet4})"
+    rowCount5 = sql "select count() from ${tableName} tablet(${tablet5})"
+    rowCount6 = sql "select count() from ${tableName} tablet(${tablet6})"
     assertEquals(20, totalCount[0][0])
-    tabletMetaRes1 = http_get(tabletMetaUrl1)
-    tabletMetaRes2 = http_get(tabletMetaUrl2)
-    tabletMetaRes3 = http_get(tabletMetaUrl3)
-    tabletMetaRes4 = http_get(tabletMetaUrl4)
-    tabletMetaRes5 = http_get(tabletMetaUrl5)
-    tabletMetaRes6 = http_get(tabletMetaUrl6)
-
-    obj1 = new JsonSlurper().parseText(tabletMetaRes1)
-    obj2 = new JsonSlurper().parseText(tabletMetaRes2)
-    obj3 = new JsonSlurper().parseText(tabletMetaRes3)
-    obj4 = new JsonSlurper().parseText(tabletMetaRes4)
-    obj5 = new JsonSlurper().parseText(tabletMetaRes5)
-    obj6 = new JsonSlurper().parseText(tabletMetaRes6)
-
-    rowCount1 = obj1.rs_metas[0].num_rows + obj1.rs_metas[1].num_rows + 
obj1.rs_metas[2].num_rows
-    rowCount2 = obj2.rs_metas[0].num_rows + obj2.rs_metas[1].num_rows + 
obj2.rs_metas[2].num_rows
-    rowCount3 = obj3.rs_metas[0].num_rows + obj3.rs_metas[1].num_rows + 
obj3.rs_metas[2].num_rows
-    rowCount4 = obj4.rs_metas[0].num_rows + obj4.rs_metas[1].num_rows + 
obj4.rs_metas[2].num_rows
-    rowCount5 = obj5.rs_metas[0].num_rows + obj5.rs_metas[1].num_rows + 
obj5.rs_metas[2].num_rows
-    rowCount6 = obj6.rs_metas[0].num_rows + obj6.rs_metas[1].num_rows + 
obj6.rs_metas[2].num_rows
-    assertEquals(5, rowCount1)
-    assertEquals(5, rowCount2)
-    assertEquals(0, rowCount3)
-    assertEquals(5, rowCount4)
-    assertEquals(5, rowCount5)
-    assertEquals(0, rowCount6)
+    assertEquals(5, rowCount1[0][0])
+    assertEquals(5, rowCount2[0][0])
+    assertEquals(0, rowCount3[0][0])
+    assertEquals(5, rowCount4[0][0])
+    assertEquals(5, rowCount5[0][0])
+    assertEquals(0, rowCount6[0][0])
 
     // load third time
     streamLoad {
@@ -271,32 +210,18 @@ suite("test_load_to_single_tablet", "p0") {
     }
     sql "sync"
     totalCount = sql "select count() from ${tableName}"
+    rowCount1 = sql "select count() from ${tableName} tablet(${tablet1})"
+    rowCount2 = sql "select count() from ${tableName} tablet(${tablet2})"
+    rowCount3 = sql "select count() from ${tableName} tablet(${tablet3})"
+    rowCount4 = sql "select count() from ${tableName} tablet(${tablet4})"
+    rowCount5 = sql "select count() from ${tableName} tablet(${tablet5})"
+    rowCount6 = sql "select count() from ${tableName} tablet(${tablet6})"
     assertEquals(30, totalCount[0][0])
-    tabletMetaRes1 = http_get(tabletMetaUrl1)
-    tabletMetaRes2 = http_get(tabletMetaUrl2)
-    tabletMetaRes3 = http_get(tabletMetaUrl3)
-    tabletMetaRes4 = http_get(tabletMetaUrl4)
-    tabletMetaRes5 = http_get(tabletMetaUrl5)
-    tabletMetaRes6 = http_get(tabletMetaUrl6)
-
-    obj1 = new JsonSlurper().parseText(tabletMetaRes1)
-    obj2 = new JsonSlurper().parseText(tabletMetaRes2)
-    obj3 = new JsonSlurper().parseText(tabletMetaRes3)
-    obj4 = new JsonSlurper().parseText(tabletMetaRes4)
-    obj5 = new JsonSlurper().parseText(tabletMetaRes5)
-    obj6 = new JsonSlurper().parseText(tabletMetaRes6)
-
-    rowCount1 = obj1.rs_metas[0].num_rows + obj1.rs_metas[1].num_rows + 
obj1.rs_metas[2].num_rows + obj1.rs_metas[3].num_rows
-    rowCount2 = obj2.rs_metas[0].num_rows + obj2.rs_metas[1].num_rows + 
obj2.rs_metas[2].num_rows + obj2.rs_metas[3].num_rows
-    rowCount3 = obj3.rs_metas[0].num_rows + obj3.rs_metas[1].num_rows + 
obj3.rs_metas[2].num_rows + obj3.rs_metas[3].num_rows
-    rowCount4 = obj4.rs_metas[0].num_rows + obj4.rs_metas[1].num_rows + 
obj4.rs_metas[2].num_rows + obj4.rs_metas[3].num_rows
-    rowCount5 = obj5.rs_metas[0].num_rows + obj5.rs_metas[1].num_rows + 
obj5.rs_metas[2].num_rows + obj5.rs_metas[3].num_rows
-    rowCount6 = obj6.rs_metas[0].num_rows + obj6.rs_metas[1].num_rows + 
obj6.rs_metas[2].num_rows + obj6.rs_metas[3].num_rows
-    assertEquals(5, rowCount1)
-    assertEquals(5, rowCount2)
-    assertEquals(5, rowCount3)
-    assertEquals(5, rowCount4)
-    assertEquals(5, rowCount5)
-    assertEquals(5, rowCount6)
+    assertEquals(5, rowCount1[0][0])
+    assertEquals(5, rowCount2[0][0])
+    assertEquals(5, rowCount3[0][0])
+    assertEquals(5, rowCount4[0][0])
+    assertEquals(5, rowCount5[0][0])
+    assertEquals(5, rowCount6[0][0])
 }
 


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

Reply via email to