[opt](test) Make the case stable. apache#44195 (apache#45638)

xinyiZzz · Dec 19, 2024 · 299bb87 · 299bb87
1 parent 55e5e69
commit 299bb87
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,