(amoro) branch master updated: [AMORO-3885] fix missing oss.endpoint for internal mixed_iceberg catalog (#3886)

[czy006]

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

czy006 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/amoro.git


The following commit(s) were added to refs/heads/master by this push:
     new 0c7737d63 [AMORO-3885] fix missing oss.endpoint for internal 
mixed_iceberg catalog (#3886)
0c7737d63 is described below

commit 0c7737d63f7fc20545f4511b5adb254a79d8add3
Author: yeatsliao <liaoyt66...@gmail.com>
AuthorDate: Wed Dec 10 17:12:45 2025 +0800

    [AMORO-3885] fix missing oss.endpoint for internal mixed_iceberg catalog 
(#3886)
    
    * fix missing oss.endpoint for internal mixed_iceberg catalog
    
    * fix missing oss.endpoint for internal mixed_iceberg catalog
    
    ---------
    
    Co-authored-by: ZhouJinsong <zhoujinsong0...@163.com>
    Co-authored-by: ConradJam <jam.gz...@gmail.com>
---
 .../dashboard/controller/CatalogController.java    | 44 +++++++++++++---------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git 
a/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/CatalogController.java
 
b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/CatalogController.java
index cfd8f4bcd..8a316e15f 100644
--- 
a/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/CatalogController.java
+++ 
b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/CatalogController.java
@@ -368,7 +368,7 @@ public class CatalogController {
   }
 
   private Map<String, Object> extractStorageConfigsFromCatalogMeta(
-      String catalogName, CatalogMeta catalogMeta, String storageType) {
+      String catalogName, CatalogMeta catalogMeta, String storageType, 
List<String> tableFormats) {
     Map<String, Object> storageConfig = new HashMap<>();
     storageConfig.put(STORAGE_CONFIGS_KEY_TYPE, storageType);
     if (STORAGE_CONFIGS_VALUE_TYPE_HADOOP.equals(storageType)) {
@@ -410,16 +410,20 @@ public class CatalogController {
           S3FileIOProperties.ENDPOINT,
           STORAGE_CONFIGS_KEY_S3_ENDPOINT);
     } else if (STORAGE_CONFIGS_VALUE_TYPE_OSS.equals(storageType)) {
-      CatalogUtil.copyProperty(
-          catalogMeta.getStorageConfigs(),
-          catalogMeta.getCatalogProperties(),
-          AliyunProperties.OSS_ENDPOINT,
-          STORAGE_CONFIGS_KEY_OSS_ENDPOINT);
-      CatalogUtil.copyProperty(
-          catalogMeta.getStorageConfigs(),
-          catalogMeta.getCatalogProperties(),
-          "fs.oss.endpoint",
-          STORAGE_CONFIGS_KEY_OSS_ENDPOINT);
+      if (tableFormats.contains(ICEBERG.name()) || 
tableFormats.contains(MIXED_ICEBERG.name())) {
+        CatalogUtil.copyProperty(
+            catalogMeta.getCatalogProperties(),
+            storageConfig,
+            AliyunProperties.OSS_ENDPOINT,
+            STORAGE_CONFIGS_KEY_OSS_ENDPOINT);
+      }
+      if (tableFormats.contains(PAIMON.name())) {
+        CatalogUtil.copyProperty(
+            catalogMeta.getCatalogProperties(),
+            storageConfig,
+            "fs.oss.endpoint",
+            STORAGE_CONFIGS_KEY_OSS_ENDPOINT);
+      }
     }
     return storageConfig;
   }
@@ -500,13 +504,15 @@ public class CatalogController {
           STORAGE_CONFIGS_KEY_S3_ENDPOINT,
           S3FileIOProperties.ENDPOINT);
     } else if (storageType.equals(STORAGE_CONFIGS_VALUE_TYPE_OSS)) {
-      if (TableFormat.valueOf(tableFormats) == TableFormat.ICEBERG) {
+      if (info.getTableFormatList().contains(ICEBERG.name())
+          || info.getTableFormatList().contains(MIXED_ICEBERG.name())) {
         CatalogUtil.copyProperty(
             info.getStorageConfig(),
             catalogMeta.getCatalogProperties(),
             STORAGE_CONFIGS_KEY_OSS_ENDPOINT,
             AliyunProperties.OSS_ENDPOINT);
-      } else if (TableFormat.valueOf(tableFormats) == PAIMON) {
+      }
+      if (info.getTableFormatList().contains(PAIMON.name())) {
         CatalogUtil.copyProperty(
             info.getStorageConfig(),
             catalogMeta.getCatalogProperties(),
@@ -623,10 +629,7 @@ public class CatalogController {
       } else {
         info.setType(catalogMeta.getCatalogType());
       }
-      String storageType = 
CatalogUtil.getCompatibleStorageType(catalogMeta.getStorageConfigs());
-      info.setAuthConfig(extractAuthConfigsFromCatalogMeta(catalogName, 
catalogMeta, storageType));
-      info.setStorageConfig(
-          extractStorageConfigsFromCatalogMeta(catalogName, catalogMeta, 
storageType));
+
       // we put the table format single
       String tableFormat =
           
catalogMeta.getCatalogProperties().get(CatalogMetaProperties.TABLE_FORMATS);
@@ -638,6 +641,13 @@ public class CatalogController {
         }
       }
       info.setTableFormatList(Arrays.asList(tableFormat.split(",")));
+
+      String storageType = 
CatalogUtil.getCompatibleStorageType(catalogMeta.getStorageConfigs());
+      info.setAuthConfig(extractAuthConfigsFromCatalogMeta(catalogName, 
catalogMeta, storageType));
+      info.setStorageConfig(
+          extractStorageConfigsFromCatalogMeta(
+              catalogName, catalogMeta, storageType, 
info.getTableFormatList()));
+
       info.setProperties(
           
PropertiesUtil.extractCatalogMetaProperties(catalogMeta.getCatalogProperties()));
       info.setTableProperties(