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

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


The following commit(s) were added to refs/heads/branch-4.0 by this push:
     new d96662c0e85 branch-4.0: [fix](test) make hive compress split assertion 
BE-aware #60947 (#61008)
d96662c0e85 is described below

commit d96662c0e85eafcf54036410ff0608bc2b5c2eaa
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Mar 5 10:50:47 2026 +0800

    branch-4.0: [fix](test) make hive compress split assertion BE-aware #60947 
(#61008)
    
    Cherry-picked from #60947
    
    Co-authored-by: Socrates <[email protected]>
---
 .../hive/test_hive_compress_type.groovy            | 33 +++++++++++++---------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git 
a/regression-test/suites/external_table_p0/hive/test_hive_compress_type.groovy 
b/regression-test/suites/external_table_p0/hive/test_hive_compress_type.groovy
index 3dcab8869f0..8668e148a63 100644
--- 
a/regression-test/suites/external_table_p0/hive/test_hive_compress_type.groovy
+++ 
b/regression-test/suites/external_table_p0/hive/test_hive_compress_type.groovy
@@ -24,8 +24,14 @@ suite("test_hive_compress_type", 
"p0,external,hive,external_docker,external_dock
     }
 
     def backends = sql """show backends"""
-    def backendNum = backends.size();
-    logger.info("get backendNum:" + backendNum);    
+    def backendNum = backends.size()
+    logger.info("get backendNum: ${backendNum}")
+    // `parallel_fragment_exec_instance_num` may be displayed as
+    // `deprecated_parallel_fragment_exec_instance_num` in newer branches.
+    def parallelExecInstanceRows = sql("show variables like 
'%parallel_fragment_exec_instance_num%'")
+    assertTrue(parallelExecInstanceRows.size() > 0)
+    def parallelExecInstanceNum = (parallelExecInstanceRows[0][1] as 
String).toInteger()
+    logger.info("get ${parallelExecInstanceRows[0][0]}: 
${parallelExecInstanceNum}")
 
     for (String hivePrefix : ["hive3"]) {
         String hms_port = context.config.otherConfigs.get(hivePrefix + 
"HmsPort")
@@ -41,18 +47,17 @@ suite("test_hive_compress_type", 
"p0,external,hive,external_docker,external_dock
 
         // table test_compress_partitioned has 6 partitions with different 
compressed file: plain, gzip, bzip2, deflate
         sql """set file_split_size=0"""
-        if (backendNum == 1) {
-            explain {
-                sql("select count(*) from test_compress_partitioned")
-                contains "inputSplitNum=16, totalFileSize=734675596, 
scanRanges=16"
-                contains "partition=8/8"
-            }
-        } else {
-            explain {
-                sql("select count(*) from test_compress_partitioned")
-                contains "inputSplitNum=28, totalFileSize=734675596, 
scanRanges=28"
-                contains "partition=8/8"
-            }
+        // COUNT pushdown split behavior depends on:
+        // totalFileNum < parallel_fragment_exec_instance_num * backendNum
+        // test_compress_partitioned currently has 16 files.
+        def expectedSplitNum = 16
+        if (backendNum > 1) {
+            expectedSplitNum = (16 < parallelExecInstanceNum * backendNum) ? 
28 : 16
+        }
+        explain {
+            sql("select count(*) from test_compress_partitioned")
+            contains "inputSplitNum=${expectedSplitNum}, 
totalFileSize=734675596, scanRanges=${expectedSplitNum}"
+            contains "partition=8/8"
         }
         qt_q21 """select count(*) from test_compress_partitioned where 
dt="gzip" or dt="mix""""
         qt_q22 """select count(*) from test_compress_partitioned"""


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

Reply via email to