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 937b5b5f1c6 branch-4.0: [opt](compression) change default compression 
from lz4f to zstd #58923 (#60006)
937b5b5f1c6 is described below

commit 937b5b5f1c6cbb63ce8acbb22f898489c7f0c312
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon Jan 19 15:54:41 2026 +0800

    branch-4.0: [opt](compression) change default compression from lz4f to zstd 
#58923 (#60006)
    
    Cherry-picked from #58923
    
    Co-authored-by: Yongqiang YANG <[email protected]>
---
 .../src/main/java/org/apache/doris/common/Config.java        |  2 +-
 fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java   |  2 +-
 .../data/query_p0/system/test_table_properties.out           | 12 ++++++------
 regression-test/suites/mtmv_p0/test_compression_mtmv.groovy  |  1 -
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java 
b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
index 9f8b9da0d3b..ea3301cabbc 100644
--- a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
+++ b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
@@ -1816,7 +1816,7 @@ public class Config extends ConfigBase {
             "内部表的默认压缩类型。支持的值有:LZ4, LZ4F, LZ4HC, ZLIB, ZSTD, SNAPPY, NONE。",
             "Default compression type for internal tables. Supported values: 
LZ4, LZ4F, LZ4HC, ZLIB, ZSTD,"
             + " SNAPPY, NONE."})
-    public static String default_compression_type = "LZ4F";
+    public static String default_compression_type = "ZSTD";
 
     /*
      * The job scheduling interval of the schema change handler.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java 
b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
index 67a004e45cf..07fcbe27c0c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
@@ -3723,7 +3723,7 @@ public class Env {
         sb.append(olapTable.getInvertedIndexFileStorageFormat()).append("\"");
 
         // compression type
-        if (olapTable.getCompressionType() != TCompressionType.LZ4F) {
+        if (olapTable.getCompressionType() != 
TCompressionType.valueOf(Config.default_compression_type)) {
             
sb.append(",\n\"").append(PropertyAnalyzer.PROPERTIES_COMPRESSION).append("\" = 
\"");
             sb.append(olapTable.getCompressionType()).append("\"");
         }
diff --git a/regression-test/data/query_p0/system/test_table_properties.out 
b/regression-test/data/query_p0/system/test_table_properties.out
index 8d32e2f55db..a6ff1c341f8 100644
--- a/regression-test/data/query_p0/system/test_table_properties.out
+++ b/regression-test/data/query_p0/system/test_table_properties.out
@@ -9,7 +9,7 @@ internal        test_table_properties_db        duplicate_table 
binlog.max_bytes        9223372036854
 internal       test_table_properties_db        duplicate_table 
binlog.max_history_nums 9223372036854775807
 internal       test_table_properties_db        duplicate_table 
binlog.ttl_seconds      86400
 internal       test_table_properties_db        duplicate_table 
compaction_policy       size_based
-internal       test_table_properties_db        duplicate_table compression     
LZ4F
+internal       test_table_properties_db        duplicate_table compression     
ZSTD
 internal       test_table_properties_db        duplicate_table 
data_sort.col_num       3
 internal       test_table_properties_db        duplicate_table 
data_sort.sort_type     LEXICAL
 internal       test_table_properties_db        duplicate_table 
disable_auto_compaction false
@@ -44,7 +44,7 @@ internal      test_table_properties_db        listtable       
binlog.max_bytes        9223372036854775807
 internal       test_table_properties_db        listtable       
binlog.max_history_nums 9223372036854775807
 internal       test_table_properties_db        listtable       
binlog.ttl_seconds      86400
 internal       test_table_properties_db        listtable       
compaction_policy       size_based
-internal       test_table_properties_db        listtable       compression     
LZ4F
+internal       test_table_properties_db        listtable       compression     
ZSTD
 internal       test_table_properties_db        listtable       
data_sort.col_num       6
 internal       test_table_properties_db        listtable       
data_sort.sort_type     LEXICAL
 internal       test_table_properties_db        listtable       
disable_auto_compaction false
@@ -79,7 +79,7 @@ internal      test_table_properties_db        unique_table    
binlog.max_bytes        9223372036854775
 internal       test_table_properties_db        unique_table    
binlog.max_history_nums 9223372036854775807
 internal       test_table_properties_db        unique_table    
binlog.ttl_seconds      86400
 internal       test_table_properties_db        unique_table    
compaction_policy       size_based
-internal       test_table_properties_db        unique_table    compression     
LZ4F
+internal       test_table_properties_db        unique_table    compression     
ZSTD
 internal       test_table_properties_db        unique_table    
data_sort.col_num       2
 internal       test_table_properties_db        unique_table    
data_sort.sort_type     LEXICAL
 internal       test_table_properties_db        unique_table    
disable_auto_compaction false
@@ -116,7 +116,7 @@ internal    test_table_properties_db        duplicate_table 
binlog.max_bytes        9223372036854
 internal       test_table_properties_db        duplicate_table 
binlog.max_history_nums 9223372036854775807
 internal       test_table_properties_db        duplicate_table 
binlog.ttl_seconds      86400
 internal       test_table_properties_db        duplicate_table 
compaction_policy       size_based
-internal       test_table_properties_db        duplicate_table compression     
LZ4F
+internal       test_table_properties_db        duplicate_table compression     
ZSTD
 internal       test_table_properties_db        duplicate_table 
data_sort.col_num       3
 internal       test_table_properties_db        duplicate_table 
data_sort.sort_type     LEXICAL
 internal       test_table_properties_db        duplicate_table 
disable_auto_compaction false
@@ -151,7 +151,7 @@ internal    test_table_properties_db        unique_table    
binlog.max_bytes        9223372036854775
 internal       test_table_properties_db        unique_table    
binlog.max_history_nums 9223372036854775807
 internal       test_table_properties_db        unique_table    
binlog.ttl_seconds      86400
 internal       test_table_properties_db        unique_table    
compaction_policy       size_based
-internal       test_table_properties_db        unique_table    compression     
LZ4F
+internal       test_table_properties_db        unique_table    compression     
ZSTD
 internal       test_table_properties_db        unique_table    
data_sort.col_num       2
 internal       test_table_properties_db        unique_table    
data_sort.sort_type     LEXICAL
 internal       test_table_properties_db        unique_table    
disable_auto_compaction false
@@ -190,7 +190,7 @@ internal    test_table_properties_db        duplicate_table 
binlog.max_bytes        9223372036854
 internal       test_table_properties_db        duplicate_table 
binlog.max_history_nums 9223372036854775807
 internal       test_table_properties_db        duplicate_table 
binlog.ttl_seconds      86400
 internal       test_table_properties_db        duplicate_table 
compaction_policy       size_based
-internal       test_table_properties_db        duplicate_table compression     
LZ4F
+internal       test_table_properties_db        duplicate_table compression     
ZSTD
 internal       test_table_properties_db        duplicate_table 
data_sort.col_num       3
 internal       test_table_properties_db        duplicate_table 
data_sort.sort_type     LEXICAL
 internal       test_table_properties_db        duplicate_table 
disable_auto_compaction false
diff --git a/regression-test/suites/mtmv_p0/test_compression_mtmv.groovy 
b/regression-test/suites/mtmv_p0/test_compression_mtmv.groovy
index 72ea457e9d8..64480d2acfd 100644
--- a/regression-test/suites/mtmv_p0/test_compression_mtmv.groovy
+++ b/regression-test/suites/mtmv_p0/test_compression_mtmv.groovy
@@ -61,7 +61,6 @@ suite("test_compression_mtmv","mtmv") {
 
     def showCreateTableResult = sql """show create materialized view 
${mvName}"""
     logger.info("showCreateTableResult: " + showCreateTableResult.toString())
-    assertTrue(showCreateTableResult.toString().contains('ZSTD'))
 
     sql """drop table if exists `${tableName}`"""
     sql """drop materialized view if exists ${mvName};"""


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

Reply via email to