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 5d69536dab1 [fix](regression-test) Fix compaction trigger in 
test_dup_keys_schema_change and test_uniq_keys_schema_change (#49544)
5d69536dab1 is described below

commit 5d69536dab1f6eb99885274c4506b2518243b67a
Author: Siyang Tang <tangsiy...@selectdb.com>
AuthorDate: Thu Mar 27 10:08:42 2025 +0800

    [fix](regression-test) Fix compaction trigger in 
test_dup_keys_schema_change and test_uniq_keys_schema_change (#49544)
    
    Test case diff from master and may result in timeout when triggering
    compaction.
---
 .../test_dup_keys_schema_change.groovy             | 24 +---------------------
 .../test_uniq_keys_schema_change.groovy            | 24 +---------------------
 2 files changed, 2 insertions(+), 46 deletions(-)

diff --git 
a/regression-test/suites/schema_change_p0/test_dup_keys_schema_change.groovy 
b/regression-test/suites/schema_change_p0/test_dup_keys_schema_change.groovy
index 90dbe74ff68..9b3a38ee278 100644
--- a/regression-test/suites/schema_change_p0/test_dup_keys_schema_change.groovy
+++ b/regression-test/suites/schema_change_p0/test_dup_keys_schema_change.groovy
@@ -139,29 +139,7 @@ suite ("test_dup_keys_schema_change") {
             """
 
         // compaction
-        String[][] tablets = sql """ show tablets from ${tableName}; """
-        for (String[] tablet in tablets) {
-                String tablet_id = tablet[0]
-                def backend_id = tablet[2]
-                logger.info("run compaction:" + tablet_id)
-                def (code, out, err) = 
be_run_cumulative_compaction(backendId_to_backendIP.get(backend_id), 
backendId_to_backendHttpPort.get(backend_id), tablet_id)
-                logger.info("Run compaction: code=" + code + ", out=" + out + 
", err=" + err)
-                //assertEquals(code, 0)
-        }
-
-        // wait for all compactions done
-        for (String[] tablet in tablets) {
-                Awaitility.await().untilAsserted(() -> {
-                    String tablet_id = tablet[0]
-                    def backend_id = tablet[2]
-                    def (code, out, err) = 
be_get_compaction_status(backendId_to_backendIP.get(backend_id), 
backendId_to_backendHttpPort.get(backend_id), tablet_id)
-                    logger.info("Get compaction status: code=" + code + ", 
out=" + out + ", err=" + err)
-                    assertEquals(code, 0)
-                    def compactionStatus = parseJson(out.trim())
-                    assertEquals("success", 
compactionStatus.status.toLowerCase())
-                    return compactionStatus.run_status;
-                });
-        }
+        trigger_and_wait_compaction(tableName, "cumulative")
 
         qt_sc """ select count(*) from ${tableName} """
 
diff --git 
a/regression-test/suites/schema_change_p0/test_uniq_keys_schema_change.groovy 
b/regression-test/suites/schema_change_p0/test_uniq_keys_schema_change.groovy
index d57ff7cdfb4..3a164ec4c3b 100644
--- 
a/regression-test/suites/schema_change_p0/test_uniq_keys_schema_change.groovy
+++ 
b/regression-test/suites/schema_change_p0/test_uniq_keys_schema_change.groovy
@@ -122,29 +122,7 @@ suite ("test_uniq_keys_schema_change") {
             """
 
         // compaction
-        String[][] tablets = sql """ show tablets from ${tableName}; """
-        for (String[] tablet in tablets) {
-                String tablet_id = tablet[0]
-                backend_id = tablet[2]
-                logger.info("run compaction:" + tablet_id)
-                def (code, out, err) = 
be_run_cumulative_compaction(backendId_to_backendIP.get(backend_id), 
backendId_to_backendHttpPort.get(backend_id), tablet_id)
-                logger.info("Run compaction: code=" + code + ", out=" + out + 
", err=" + err)
-                //assertEquals(code, 0)
-        }
-
-        // wait for all compactions done
-        for (String[] tablet in tablets) {
-                Awaitility.await().untilAsserted(() -> {
-                    String tablet_id = tablet[0]
-                    backend_id = tablet[2]
-                    def (code, out, err) = 
be_get_compaction_status(backendId_to_backendIP.get(backend_id), 
backendId_to_backendHttpPort.get(backend_id), tablet_id)
-                    logger.info("Get compaction status: code=" + code + ", 
out=" + out + ", err=" + err)
-                    assertEquals(code, 0)
-                    def compactionStatus = parseJson(out.trim())
-                    assertEquals("success", 
compactionStatus.status.toLowerCase())
-                    return compactionStatus.run_status;
-                });
-        }
+        trigger_and_wait_compaction(tableName, "cumulative")
         qt_sc """ select count(*) from ${tableName} """
 
         qt_sc """  SELECT * FROM ${tableName} WHERE user_id=2 """


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

Reply via email to