resolve conflict

apache · Nov 16, 2023 · 611c4de · 611c4de
1 parent 78c62f9
commit 611c4de
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/core/src/main/java/com/netease/arctic/mixed/BasicMixedIcebergCatalog.java b/core/src/main/java/com/netease/arctic/mixed/BasicMixedIcebergCatalog.java
@@ -102,19 +102,19 @@ public void initialize(String name, Map<String, String> properties, TableMetaSto
           properties.get(CatalogMetaProperties.KEY_DATABASE_FILTER_REGULAR_EXPRESSION);
       databaseFilterPattern = Pattern.compile(databaseFilter);
     }
-    Catalog icebergCatalog = buildIcebergCatalog(name, properties, metaStore.getConfiguration());
+    Catalog catalog = buildIcebergCatalog(name, properties, metaStore.getConfiguration());
     this.name = name;
     this.tableMetaStore = metaStore;
     this.icebergCatalog =
         cacheEnabled
-            ? CachingCatalog.wrap(icebergCatalog, cacheCaseSensitive, cacheExpirationIntervalMs)
-            : icebergCatalog;
-    if (icebergCatalog instanceof SupportsNamespaces) {
-      this.asNamespaceCatalog = (SupportsNamespaces) icebergCatalog;
+            ? CachingCatalog.wrap(catalog, cacheCaseSensitive, cacheExpirationIntervalMs)
+            : catalog;
+    if (catalog instanceof SupportsNamespaces) {
+      this.asNamespaceCatalog = (SupportsNamespaces) catalog;
     }
     this.databaseFilterPattern = databaseFilterPattern;
     this.catalogProperties = properties;
-    this.tables = newMixedTables(metaStore, properties, icebergCatalog);
+    this.tables = newMixedTables(metaStore, properties, icebergCatalog());
     if (properties.containsKey(CatalogMetaProperties.AMS_URI)) {
       this.client = new PooledAmsClient(properties.get(CatalogMetaProperties.AMS_URI));
     }