[#446] feat(iceberg): Support detailed iceberg catalog property metadata

apache · Oct 13, 2023 · 87c6445 · 87c6445
1 parent 62746b0
commit 87c6445
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/...main/java/com/datastrato/graviton/catalog/lakehouse/iceberg/IcebergCatalogOperations.java b/...main/java/com/datastrato/graviton/catalog/lakehouse/iceberg/IcebergCatalogOperations.java
@@ -32,6 +32,7 @@
 import com.datastrato.graviton.utils.MapUtils;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
+import com.google.common.collect.Maps;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -87,12 +88,13 @@ public IcebergCatalogOperations(CatalogEntity entity) {
    */
   @Override
   public void initialize(Map<String, String> conf) throws RuntimeException {
+    Map<String, String> config = Maps.newHashMap(conf);
     Map<String, String> prefixMap = MapUtils.getPrefixMap(conf, CATALOG_BYPASS_PREFIX);
-    conf.putAll(prefixMap);
+    config.putAll(prefixMap);
 
     this.icebergCatalogPropertiesMetadata = new IcebergCatalogPropertiesMetadata();
     Map<String, String> resultConf =
-        this.icebergCatalogPropertiesMetadata.transformProperties(conf);
+        this.icebergCatalogPropertiesMetadata.transformProperties(config);
 
     IcebergConfig icebergConfig = new IcebergConfig();
     icebergConfig.loadFromMap(resultConf, k -> true);

diff --git a/...a/com/datastrato/graviton/catalog/lakehouse/iceberg/IcebergCatalogPropertiesMetadata.java b/...a/com/datastrato/graviton/catalog/lakehouse/iceberg/IcebergCatalogPropertiesMetadata.java
@@ -12,6 +12,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -57,7 +58,9 @@ public class IcebergCatalogPropertiesMetadata extends BaseCatalogPropertiesMetad
             stringRequiredPropertyEntry(URI, "Iceberg catalog uri config", false, false),
             stringRequiredPropertyEntry(
                 WAREHOUSE, "Iceberg catalog warehouse config", false, false));
-    PROPERTIES_METADATA = Maps.uniqueIndex(propertyEntries, PropertyEntry::getName);
+    HashMap<String, PropertyEntry<?>> result = Maps.newHashMap(BASIC_CATALOG_PROPERTY_ENTRIES);
+    result.putAll(Maps.uniqueIndex(propertyEntries, PropertyEntry::getName));
+    PROPERTIES_METADATA = ImmutableMap.copyOf(result);
   }
 
   @Override