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


The following commit(s) were added to refs/heads/branch-3.0 by this push:
     new 2e7ed69aa8c branch-3.0: [fix](regression) warmup_show_stmt flaky by 
concurrent execution #44226 (#44287)
2e7ed69aa8c is described below

commit 2e7ed69aa8c4ff68ad9441afdfb2c05af33b5bdb
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Nov 20 09:32:17 2024 +0800

    branch-3.0: [fix](regression) warmup_show_stmt flaky by concurrent 
execution #44226 (#44287)
    
    Cherry-picked from #44226
    
    Co-authored-by: zhengyu <[email protected]>
---
 .../warm_up/hotspot/test_warmup_show_stmt_2.groovy             | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git 
a/regression-test/suites/cloud_p0/cache/multi_cluster/warm_up/hotspot/test_warmup_show_stmt_2.groovy
 
b/regression-test/suites/cloud_p0/cache/multi_cluster/warm_up/hotspot/test_warmup_show_stmt_2.groovy
index 6ebe891f5f3..221edfef550 100644
--- 
a/regression-test/suites/cloud_p0/cache/multi_cluster/warm_up/hotspot/test_warmup_show_stmt_2.groovy
+++ 
b/regression-test/suites/cloud_p0/cache/multi_cluster/warm_up/hotspot/test_warmup_show_stmt_2.groovy
@@ -38,7 +38,7 @@ suite("test_warmup_show_stmt_2") {
         |"exec_mem_limit" = "8589934592",
         |"load_parallelism" = "3")""".stripMargin()
 
-    def load_customer_once =  { 
+    def load_customer_once =  {
         def uniqueID = Math.abs(UUID.randomUUID().hashCode()).toString()
         def loadLabel = table + "_" + uniqueID
         // load data from cos
@@ -84,15 +84,17 @@ suite("test_warmup_show_stmt_2") {
     log.info(result.toString())
     org.junit.Assert.assertTrue("result.size() " + result.size() + " > 0", 
result.size() > 0)
     def hotTableName = 
"regression_test_cloud_p0_cache_multi_cluster_warm_up_hotspot.customer"
+    def found = false
     for (int i = 0; i < result.size(); ++i) {
         if (!result[i].get("TableName").equals(hotTableName)) {
-            org.junit.Assert.assertTrue(getLineNumber() + "cannot find 
expected cache hotspot ${hotTableName}", result.size() > i + 1)
             continue
         }
+        found = true
         assertEquals(result[i].get("ComputeGroupId"), "regression_cluster_id0")
         assertEquals(result[i].get("ComputeGroupName"), 
"regression_cluster_name0")
         assertEquals(result[i].get("TableName"), 
"regression_test_cloud_p0_cache_multi_cluster_warm_up_hotspot.customer")
     }
+    org.junit.Assert.assertTrue(getLineNumber() + "cannot find expected cache 
hotspot ${hotTableName}", found)
 
     result = sql_return_maparray """ show cache hotspot 
"/regression_cluster_name0" """
     log.info(result.toString())
@@ -111,14 +113,16 @@ suite("test_warmup_show_stmt_2") {
     result = sql_return_maparray """ show cache hotspot "/" """
     log.info(result.toString())
     org.junit.Assert.assertTrue("result.size() " + result.size() + " > 0", 
result.size() > 0)
+    found = false
     for (int i = 0; i < result.size(); ++i) {
         if (!result[i].get("TableName").equals(hotTableName)) {
-            org.junit.Assert.assertTrue("cannot find expected cache hotspot 
${hotTableName}", result.size() > i + 1)
             continue
         }
+        found = true
         assertEquals(result[i].get("ComputeGroupId"), "regression_cluster_id0")
         assertEquals(result[i].get("ComputeGroupName"), 
"regression_cluster_name0")
         assertEquals(result[i].get("TableName"), 
"regression_test_cloud_p0_cache_multi_cluster_warm_up_hotspot.customer")
         break
     }
+    org.junit.Assert.assertTrue("cannot find expected cache hotspot 
${hotTableName}", found)
 }


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

Reply via email to