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

yuxia pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/fluss.git


The following commit(s) were added to refs/heads/main by this push:
     new d44a1cce6 [hotfix] Catalog related lake options should overwrite table 
lake related options (#2432)
d44a1cce6 is described below

commit d44a1cce6c47c689112057cc6b45d2ea27d09222
Author: yuxia Luo <[email protected]>
AuthorDate: Wed Jan 21 21:10:47 2026 +0800

    [hotfix] Catalog related lake options should overwrite table lake related 
options (#2432)
---
 .../main/java/org/apache/fluss/flink/lake/LakeFlinkCatalog.java  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git 
a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/lake/LakeFlinkCatalog.java
 
b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/lake/LakeFlinkCatalog.java
index 6e8b2a5e2..f42b0c4fb 100644
--- 
a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/lake/LakeFlinkCatalog.java
+++ 
b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/lake/LakeFlinkCatalog.java
@@ -30,6 +30,7 @@ import org.apache.paimon.flink.FlinkFileIOLoader;
 import org.apache.paimon.options.Options;
 
 import java.lang.reflect.Method;
+import java.util.HashMap;
 import java.util.Map;
 
 import static org.apache.fluss.metadata.DataLakeFormat.ICEBERG;
@@ -72,11 +73,11 @@ public class LakeFlinkCatalog implements AutoCloseable {
                                         + "' is set.");
                     }
                     Map<String, String> catalogProperties =
-                            PropertiesUtils.extractAndRemovePrefix(
-                                    lakeCatalogProperties, lakeFormat + ".");
-
+                            new 
HashMap<>(DataLakeUtils.extractLakeCatalogProperties(tableOptions));
+                    // properties in catalog are preferred
                     catalogProperties.putAll(
-                            
DataLakeUtils.extractLakeCatalogProperties(tableOptions));
+                            PropertiesUtils.extractAndRemovePrefix(
+                                    lakeCatalogProperties, lakeFormat + "."));
                     if (lakeFormat == PAIMON) {
                         catalog =
                                 PaimonCatalogFactory.create(

Reply via email to