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

morningman 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 a9c3d468b80 [fix](regression-test) adjust hudi cases (#46473)
a9c3d468b80 is described below

commit a9c3d468b801c19461f641d5bb41b8cb882f400e
Author: Socrates <suyit...@selectdb.com>
AuthorDate: Tue Jan 7 09:44:44 2025 +0800

    [fix](regression-test) adjust hudi cases (#46473)
    
    ### What problem does this PR solve?
    
    This pull request includes changes to multiple test suites for Hudi
    tables in the `regression-test/suites/external_table_p2/hudi` directory.
    The primary goal of these changes is to ensure that tests are skipped if
    the `enableExternalHudiTest` configuration is not set to "true".
    Additionally, there is a minor modification to a query in the
    `test_hudi_snapshot` suite.
    
    Skipping tests based on configuration:
    
    Added a return statement to skip the test if `enableExternalHudiTest` is
    not enabled.
    
    Minor query modification:
    
    *
    
[`regression-test/suites/external_table_p2/hudi/test_hudi_snapshot.groovy`](diffhunk://#diff-4db2d76dccb6191451d6c0359d0f6636837f6aca5efa6f8425ea5ed4ede9d82aL69-R70):
    Changed the order by clause in a query from `signup_date` to `user_id`
    to ensure correct ordering.
---
 .../external_table_p2/hudi/test_hudi_snapshot.out  | Bin 696105 -> 696105 bytes
 .../hudi/test_hudi_catalog.groovy                  |   1 +
 .../hudi/test_hudi_incremental.groovy              |   1 +
 .../external_table_p2/hudi/test_hudi_meta.groovy   |   1 +
 .../hudi/test_hudi_orc_tables.groovy               |   1 +
 .../hudi/test_hudi_partition_prune.groovy          |   1 +
 .../hudi/test_hudi_schema_evolution.groovy         |   1 +
 .../hudi/test_hudi_snapshot.groovy                 |   3 ++-
 .../hudi/test_hudi_timestamp.groovy                |   1 +
 .../hudi/test_hudi_timetravel.groovy               |   1 +
 10 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/regression-test/data/external_table_p2/hudi/test_hudi_snapshot.out 
b/regression-test/data/external_table_p2/hudi/test_hudi_snapshot.out
index 1c117c92f6d..114ca5b0a89 100644
Binary files 
a/regression-test/data/external_table_p2/hudi/test_hudi_snapshot.out and 
b/regression-test/data/external_table_p2/hudi/test_hudi_snapshot.out differ
diff --git 
a/regression-test/suites/external_table_p2/hudi/test_hudi_catalog.groovy 
b/regression-test/suites/external_table_p2/hudi/test_hudi_catalog.groovy
index 149eecf5817..ad0f8d25d63 100644
--- a/regression-test/suites/external_table_p2/hudi/test_hudi_catalog.groovy
+++ b/regression-test/suites/external_table_p2/hudi/test_hudi_catalog.groovy
@@ -19,6 +19,7 @@ suite("test_hudi_catalog", 
"p2,external,hudi,external_remote,external_remote_hud
     String enabled = context.config.otherConfigs.get("enableExternalHudiTest")
     if (enabled == null || !enabled.equalsIgnoreCase("true")) {
         logger.info("disable hudi test")
+        return
     }
 
     String catalog_name = "test_hudi_catalog"
diff --git 
a/regression-test/suites/external_table_p2/hudi/test_hudi_incremental.groovy 
b/regression-test/suites/external_table_p2/hudi/test_hudi_incremental.groovy
index 885903646cc..87e3e4a9c6a 100644
--- a/regression-test/suites/external_table_p2/hudi/test_hudi_incremental.groovy
+++ b/regression-test/suites/external_table_p2/hudi/test_hudi_incremental.groovy
@@ -19,6 +19,7 @@ suite("test_hudi_incremental", 
"p2,external,hudi,external_remote,external_remote
     String enabled = context.config.otherConfigs.get("enableExternalHudiTest")
     if (enabled == null || !enabled.equalsIgnoreCase("true")) {
         logger.info("disable hudi test")
+        return
     }
 
     String catalog_name = "test_hudi_incremental"
diff --git 
a/regression-test/suites/external_table_p2/hudi/test_hudi_meta.groovy 
b/regression-test/suites/external_table_p2/hudi/test_hudi_meta.groovy
index 0fe650aded9..efe93d68320 100644
--- a/regression-test/suites/external_table_p2/hudi/test_hudi_meta.groovy
+++ b/regression-test/suites/external_table_p2/hudi/test_hudi_meta.groovy
@@ -19,6 +19,7 @@ suite("test_hudi_meta", 
"p2,external,hudi,external_remote,external_remote_hudi")
     String enabled = context.config.otherConfigs.get("enableExternalHudiTest")
     if (enabled == null || !enabled.equalsIgnoreCase("true")) {
         logger.info("disable hudi test")
+        return
     }
 
     String catalog_name = "test_hudi_meta"
diff --git 
a/regression-test/suites/external_table_p2/hudi/test_hudi_orc_tables.groovy 
b/regression-test/suites/external_table_p2/hudi/test_hudi_orc_tables.groovy
index 43638a23881..a57bd61784b 100644
--- a/regression-test/suites/external_table_p2/hudi/test_hudi_orc_tables.groovy
+++ b/regression-test/suites/external_table_p2/hudi/test_hudi_orc_tables.groovy
@@ -19,6 +19,7 @@ suite("test_hudi_orc_tables", 
"p2,external,hudi,external_remote,external_remote_
     String enabled = context.config.otherConfigs.get("enableExternalHudiTest")
     if (enabled == null || !enabled.equalsIgnoreCase("true")) {
         logger.info("disable hudi test")
+        return
     }
 
     String catalog_name = "test_hudi_orc_tables"
diff --git 
a/regression-test/suites/external_table_p2/hudi/test_hudi_partition_prune.groovy
 
b/regression-test/suites/external_table_p2/hudi/test_hudi_partition_prune.groovy
index eea17b01711..063439d9a87 100644
--- 
a/regression-test/suites/external_table_p2/hudi/test_hudi_partition_prune.groovy
+++ 
b/regression-test/suites/external_table_p2/hudi/test_hudi_partition_prune.groovy
@@ -19,6 +19,7 @@ suite("test_hudi_partition_prune", 
"p2,external,hudi,external_remote,external_re
     String enabled = context.config.otherConfigs.get("enableExternalHudiTest")
     if (enabled == null || !enabled.equalsIgnoreCase("true")) {
         logger.info("disable hudi test")
+        return
     }
 
     String catalog_name = "test_hudi_partition_prune"
diff --git 
a/regression-test/suites/external_table_p2/hudi/test_hudi_schema_evolution.groovy
 
b/regression-test/suites/external_table_p2/hudi/test_hudi_schema_evolution.groovy
index 0da88447cde..176484f25c6 100644
--- 
a/regression-test/suites/external_table_p2/hudi/test_hudi_schema_evolution.groovy
+++ 
b/regression-test/suites/external_table_p2/hudi/test_hudi_schema_evolution.groovy
@@ -19,6 +19,7 @@ suite("test_hudi_schema_evolution", 
"p2,external,hudi,external_remote,external_r
     String enabled = context.config.otherConfigs.get("enableExternalHudiTest")
     if (enabled == null || !enabled.equalsIgnoreCase("true")) {
         logger.info("disable hudi test")
+        return
     }
 
     String catalog_name = "test_hudi_schema_evolution"
diff --git 
a/regression-test/suites/external_table_p2/hudi/test_hudi_snapshot.groovy 
b/regression-test/suites/external_table_p2/hudi/test_hudi_snapshot.groovy
index 0dd7321875b..d7f5488c055 100644
--- a/regression-test/suites/external_table_p2/hudi/test_hudi_snapshot.groovy
+++ b/regression-test/suites/external_table_p2/hudi/test_hudi_snapshot.groovy
@@ -19,6 +19,7 @@ suite("test_hudi_snapshot", 
"p2,external,hudi,external_remote,external_remote_hu
     String enabled = context.config.otherConfigs.get("enableExternalHudiTest")
     if (enabled == null || !enabled.equalsIgnoreCase("true")) {
         logger.info("disable hudi test")
+        return
     }
 
     String catalog_name = "test_hudi_snapshot"
@@ -66,7 +67,7 @@ suite("test_hudi_snapshot", 
"p2,external,hudi,external_remote,external_remote_hu
         qt_q10 """SELECT * FROM ${table_name} WHERE rating > 4.5 ORDER BY 
event_time DESC LIMIT 5;"""
 
         // Query all users' signup dates and limit output
-        qt_q11 """SELECT user_id, signup_date FROM ${table_name} ORDER BY 
signup_date DESC LIMIT 10;"""
+        qt_q11 """SELECT user_id, signup_date FROM ${table_name} ORDER BY 
user_id DESC LIMIT 10;"""
 
         // Query users with a specific postal code and limit output
         qt_q12 """SELECT * FROM ${table_name} WHERE struct_element(address, 
'postal_code') = '80312' ORDER BY event_time LIMIT 5;"""
diff --git 
a/regression-test/suites/external_table_p2/hudi/test_hudi_timestamp.groovy 
b/regression-test/suites/external_table_p2/hudi/test_hudi_timestamp.groovy
index 3d7bd40b2d5..3c1d01e9f57 100644
--- a/regression-test/suites/external_table_p2/hudi/test_hudi_timestamp.groovy
+++ b/regression-test/suites/external_table_p2/hudi/test_hudi_timestamp.groovy
@@ -19,6 +19,7 @@ suite("test_hudi_timestamp", 
"p2,external,hudi,external_remote,external_remote_h
     String enabled = context.config.otherConfigs.get("enableExternalHudiTest")
     if (enabled == null || !enabled.equalsIgnoreCase("true")) {
         logger.info("disable hudi test")
+        return
     }
 
     String catalog_name = "test_hudi_timestamp"
diff --git 
a/regression-test/suites/external_table_p2/hudi/test_hudi_timetravel.groovy 
b/regression-test/suites/external_table_p2/hudi/test_hudi_timetravel.groovy
index cceeaa41220..f1e55a86b83 100644
--- a/regression-test/suites/external_table_p2/hudi/test_hudi_timetravel.groovy
+++ b/regression-test/suites/external_table_p2/hudi/test_hudi_timetravel.groovy
@@ -19,6 +19,7 @@ suite("test_hudi_timetravel", 
"p2,external,hudi,external_remote,external_remote_
     String enabled = context.config.otherConfigs.get("enableExternalHudiTest")
     if (enabled == null || !enabled.equalsIgnoreCase("true")) {
         logger.info("disable hudi test")
+        return
     }
 
     String catalog_name = "test_hudi_timetravel"


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

Reply via email to