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

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


The following commit(s) were added to refs/heads/branch-2.1 by this push:
     new 299bb8735cb [opt](test) Make the case stable. #44195 (#45638)
299bb8735cb is described below

commit 299bb8735cb2e9ea8ff813d6cc28e9a684b0c602
Author: Sun Chenyang <suncheny...@selectdb.com>
AuthorDate: Thu Dec 19 17:44:45 2024 +0800

    [opt](test) Make the case stable. #44195 (#45638)
---
 .../test_single_compaction_with_variant_inverted_index.groovy  |  2 +-
 .../suites/fault_injection_p0/test_variant_bloom_filter.groovy | 10 ++++++----
 .../inverted_index_p2/test_variant_index_format_v1.groovy      |  2 +-
 regression-test/suites/load_p2/test_single_replica_load.groovy |  2 +-
 regression-test/suites/variant_p0/with_index/var_index.groovy  |  3 ++-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git 
a/regression-test/suites/compaction/test_single_compaction_with_variant_inverted_index.groovy
 
b/regression-test/suites/compaction/test_single_compaction_with_variant_inverted_index.groovy
index fce01e48ddd..49a90af8e43 100644
--- 
a/regression-test/suites/compaction/test_single_compaction_with_variant_inverted_index.groovy
+++ 
b/regression-test/suites/compaction/test_single_compaction_with_variant_inverted_index.groovy
@@ -17,7 +17,7 @@
 
 import org.codehaus.groovy.runtime.IOGroovyMethods
 
-suite("test_single_compaction_with_variant_inverted", "p2") {
+suite("test_single_compaction_with_variant_inverted", "p2, nonConcurrent") {
     def tableName = "test_single_compaction_with_variant_inverted"
 
     def calc_file_crc_on_tablet = { ip, port, tablet ->
diff --git 
a/regression-test/suites/fault_injection_p0/test_variant_bloom_filter.groovy 
b/regression-test/suites/fault_injection_p0/test_variant_bloom_filter.groovy
index 33f93d1bef0..88c529d685d 100644
--- a/regression-test/suites/fault_injection_p0/test_variant_bloom_filter.groovy
+++ b/regression-test/suites/fault_injection_p0/test_variant_bloom_filter.groovy
@@ -72,8 +72,9 @@ suite("test_variant_bloom_filter", "nonConcurrent") {
     getBackendIpHttpPort(backendId_to_backendIP, backendId_to_backendHttpPort);
     def tablets = sql_return_maparray """ show tablets from ${index_table}; """
 
-    int beforeSegmentCount = 0
+    
     for (def tablet in tablets) {
+        int beforeSegmentCount = 0
         String tablet_id = tablet.TabletId
         (code, out, err) = curl("GET", tablet.CompactionStatus)
         logger.info("Show tablets status: code=" + code + ", out=" + out + ", 
err=" + err)
@@ -83,8 +84,8 @@ suite("test_variant_bloom_filter", "nonConcurrent") {
         for (String rowset in (List<String>) tabletJson.rowsets) {
             beforeSegmentCount += Integer.parseInt(rowset.split(" ")[1])
         }
+        assertEquals(beforeSegmentCount, 5)
     }
-    assertEquals(beforeSegmentCount, 5)
 
     // trigger compactions for all tablets in ${tableName}
     for (def tablet in tablets) {
@@ -111,8 +112,8 @@ suite("test_variant_bloom_filter", "nonConcurrent") {
         });
     }
 
-    int afterSegmentCount = 0
     for (def tablet in tablets) {
+        int afterSegmentCount = 0
         String tablet_id = tablet.TabletId
         (code, out, err) = curl("GET", tablet.CompactionStatus)
         logger.info("Show tablets status: code=" + code + ", out=" + out + ", 
err=" + err)
@@ -123,8 +124,9 @@ suite("test_variant_bloom_filter", "nonConcurrent") {
             logger.info("rowset is: " + rowset)
             afterSegmentCount += Integer.parseInt(rowset.split(" ")[1])
         }
+         assertEquals(afterSegmentCount, 1)
     }
-    assertEquals(afterSegmentCount, 1)
+   
 
     try {
         
GetDebugPoint().enableDebugPointForAllBEs("bloom_filter_must_filter_data")
diff --git 
a/regression-test/suites/inverted_index_p2/test_variant_index_format_v1.groovy 
b/regression-test/suites/inverted_index_p2/test_variant_index_format_v1.groovy
index 5f262c8bf07..2bf1d20b106 100644
--- 
a/regression-test/suites/inverted_index_p2/test_variant_index_format_v1.groovy
+++ 
b/regression-test/suites/inverted_index_p2/test_variant_index_format_v1.groovy
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-suite("test_variant_index_format_v1", "p2") {
+suite("test_variant_index_format_v1", "p2, nonConcurrent") {
     def calc_file_crc_on_tablet = { ip, port, tablet ->
         return curl("GET", 
String.format("http://%s:%s/api/calc_crc?tablet_id=%s";, ip, port, tablet))
     }
diff --git a/regression-test/suites/load_p2/test_single_replica_load.groovy 
b/regression-test/suites/load_p2/test_single_replica_load.groovy
index cb4f970ac66..67f0b4639f8 100644
--- a/regression-test/suites/load_p2/test_single_replica_load.groovy
+++ b/regression-test/suites/load_p2/test_single_replica_load.groovy
@@ -19,7 +19,7 @@
 // /testing/trino-product-tests/src/main/resources/sql-tests/testcases
 // and modified by Doris.
 
-suite("test_single_replica_load", "p2") {
+suite("test_single_replica_load", "p2, nonConcurrent") {
     
     def load_json_data = {table_name, file_name ->
         // load the json data
diff --git a/regression-test/suites/variant_p0/with_index/var_index.groovy 
b/regression-test/suites/variant_p0/with_index/var_index.groovy
index 96cab9a60a1..6576181ac66 100644
--- a/regression-test/suites/variant_p0/with_index/var_index.groovy
+++ b/regression-test/suites/variant_p0/with_index/var_index.groovy
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-suite("regression_test_variant_var_index", "p0"){
+suite("regression_test_variant_var_index", "p0, nonConcurrent"){
     def table_name = "var_index"
     sql "DROP TABLE IF EXISTS var_index"
     sql """
@@ -82,6 +82,7 @@ suite("regression_test_variant_var_index", "p0"){
     }
 
     sql """ set disable_inverted_index_v1_for_variant = false """
+    sql "DROP TABLE IF EXISTS var_index"
     sql """
         CREATE TABLE IF NOT EXISTS var_index (
             k bigint,


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

Reply via email to