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 49ae71043c9 branch-3.0: [test](p2) fix case test_s3_load_properties 
#47226 (#47276)
49ae71043c9 is described below

commit 49ae71043c906bc4d4544d56e43f08885b255953
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Feb 7 14:39:45 2025 +0800

    branch-3.0: [test](p2) fix case test_s3_load_properties #47226 (#47276)
    
    Cherry-picked from #47226
    
    Co-authored-by: Kaijie Chen <[email protected]>
---
 .../load_p2/broker_load/test_s3_load_properties.out  | Bin 2581 -> 2727 bytes
 .../broker_load/test_s3_load_properties.groovy       |  19 ++++++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git 
a/regression-test/data/load_p2/broker_load/test_s3_load_properties.out 
b/regression-test/data/load_p2/broker_load/test_s3_load_properties.out
index 8608a3107fe..4275696e02f 100644
Binary files 
a/regression-test/data/load_p2/broker_load/test_s3_load_properties.out and 
b/regression-test/data/load_p2/broker_load/test_s3_load_properties.out differ
diff --git 
a/regression-test/suites/load_p2/broker_load/test_s3_load_properties.groovy 
b/regression-test/suites/load_p2/broker_load/test_s3_load_properties.groovy
index 59ad8e67dff..1cd0f6a532a 100644
--- a/regression-test/suites/load_p2/broker_load/test_s3_load_properties.groovy
+++ b/regression-test/suites/load_p2/broker_load/test_s3_load_properties.groovy
@@ -57,9 +57,22 @@ suite("test_s3_load_properties", "p2") {
 
     /* ========================================================== normal 
========================================================== */
     for (String table : basicTables) {
-        attributesList.add(new 
LoadAttributes("s3://${s3BucketName}/regression/load/data/basic_data.csv",
+        def attributes = new 
LoadAttributes("s3://${s3BucketName}/regression/load/data/basic_data.csv",
                 "${table}", "LINES TERMINATED BY \"\n\"", "COLUMNS TERMINATED 
BY \"|\"", "FORMAT AS \"CSV\"", 
"(k00,k01,k02,k03,k04,k05,k06,k07,k08,k09,k10,k11,k12,k13,k14,k15,k16,k17,k18)",
-                "", "", "", "", ""))
+                "", "", "", "", "")
+        // 'use_new_load_scan_node' is deprecated and its value will be 
ignored. Testing backward compatibility.
+        switch (table) {
+            case 'dup_tbl_basic':
+                attributes.addProperties("use_new_load_scan_node", "false")
+                break
+            case 'uniq_tbl_basic':
+                attributes.addProperties("use_new_load_scan_node", "true")
+                break
+            default:
+                // omit this property
+                break
+        }
+        attributesList.add(attributes)
     }
 
     attributesList.add(new 
LoadAttributes("s3://${s3BucketName}/regression/load/data/basic_data.csv",
@@ -525,7 +538,7 @@ suite("test_s3_load_properties", "p2") {
             """
         logger.info("submit sql: ${sql_str}");
         sql """${sql_str}"""
-        logger.info("Submit load with lable: $label, table: 
$attributes.dataDesc.tableName, path: $attributes.dataDesc.path")
+        logger.info("Submit load with label: $label, table: 
$attributes.dataDesc.tableName, path: $attributes.dataDesc.path")
 
         def max_try_milli_secs = 600000
         while (max_try_milli_secs > 0) {


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

Reply via email to