(#6626) imporvement: Invoke open and close through realCatalog in Bas…

…eCatalog (#6627) ### What changes were proposed in this pull request? Invoke open and close through realCatalog in BaseCatalog Fix #6626
apache · Mar 8, 2025 · 0616fbc · 0616fbc
1 parent 1297713
commit 0616fbc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 26 deletions.
diff --git a/...nnector/flink/src/main/java/org/apache/gravitino/flink/connector/catalog/BaseCatalog.java b/...nnector/flink/src/main/java/org/apache/gravitino/flink/connector/catalog/BaseCatalog.java
@@ -104,10 +104,14 @@ protected BaseCatalog(
   protected abstract AbstractCatalog realCatalog();
 
   @Override
-  public void open() throws CatalogException {}
+  public void open() throws CatalogException {
+    realCatalog().open();
+  }
 
   @Override
-  public void close() throws CatalogException {}
+  public void close() throws CatalogException {
+    realCatalog().close();
+  }
 
   @Override
   public List<String> listDatabases() throws CatalogException {

diff --git a/...r/flink/src/main/java/org/apache/gravitino/flink/connector/hive/GravitinoHiveCatalog.java b/...r/flink/src/main/java/org/apache/gravitino/flink/connector/hive/GravitinoHiveCatalog.java
@@ -21,7 +21,6 @@
 import java.util.Optional;
 import javax.annotation.Nullable;
 import org.apache.flink.table.catalog.AbstractCatalog;
-import org.apache.flink.table.catalog.exceptions.CatalogException;
 import org.apache.flink.table.catalog.hive.HiveCatalog;
 import org.apache.flink.table.factories.Factory;
 import org.apache.gravitino.flink.connector.PartitionConverter;
@@ -48,18 +47,6 @@ public class GravitinoHiveCatalog extends BaseCatalog {
     this.hiveCatalog = new HiveCatalog(catalogName, defaultDatabase, hiveConf, hiveVersion);
   }
 
-  @Override
-  public void open() throws CatalogException {
-    super.open();
-    hiveCatalog.open();
-  }
-
-  @Override
-  public void close() throws CatalogException {
-    super.close();
-    hiveCatalog.close();
-  }
-
   public HiveConf getHiveConf() {
     return hiveCatalog.getHiveConf();
   }

diff --git a/...k/src/main/java/org/apache/gravitino/flink/connector/iceberg/GravitinoIcebergCatalog.java b/...k/src/main/java/org/apache/gravitino/flink/connector/iceberg/GravitinoIcebergCatalog.java
@@ -21,7 +21,6 @@
 import java.util.Map;
 import java.util.Optional;
 import org.apache.flink.table.catalog.AbstractCatalog;
-import org.apache.flink.table.catalog.exceptions.CatalogException;
 import org.apache.flink.table.factories.Factory;
 import org.apache.gravitino.flink.connector.PartitionConverter;
 import org.apache.gravitino.flink.connector.PropertiesConverter;
@@ -45,16 +44,6 @@ protected GravitinoIcebergCatalog(
     this.icebergCatalog = (FlinkCatalog) flinkCatalogFactory.createCatalog(catalogName, properties);
   }
 
-  @Override
-  public void open() throws CatalogException {
-    icebergCatalog.open();
-  }
-
-  @Override
-  public void close() throws CatalogException {
-    icebergCatalog.close();
-  }
-
   @Override
   public Optional<Factory> getFactory() {
     return icebergCatalog.getFactory();