From 0616fbce878951be46b0efcf2270115da1e00fd9 Mon Sep 17 00:00:00 2001
From: yangyang zhong <35210666+hdygxsj@users.noreply.github.com>
Date: Sat, 8 Mar 2025 20:31:21 +0800
Subject: [PATCH] (#6626) imporvement: Invoke open and close through
 realCatalog in BaseCatalog (#6627)

### What changes were proposed in this pull request?
 Invoke open and close through realCatalog in BaseCatalog
Fix #6626
---
 .../flink/connector/catalog/BaseCatalog.java        |  8 ++++++--
 .../flink/connector/hive/GravitinoHiveCatalog.java  | 13 -------------
 .../connector/iceberg/GravitinoIcebergCatalog.java  | 11 -----------
 3 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/catalog/BaseCatalog.java b/flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/catalog/BaseCatalog.java
index e9320c786cd..9a741eda626 100644
--- a/flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/catalog/BaseCatalog.java
+++ b/flink-connector/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/flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/hive/GravitinoHiveCatalog.java b/flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/hive/GravitinoHiveCatalog.java
index 3e5d31fd3c5..fe8f6cd6b02 100644
--- a/flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/hive/GravitinoHiveCatalog.java
+++ b/flink-connector/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/flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/iceberg/GravitinoIcebergCatalog.java b/flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/iceberg/GravitinoIcebergCatalog.java
index 30fac96bbc8..231fb22464a 100644
--- a/flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/iceberg/GravitinoIcebergCatalog.java
+++ b/flink-connector/flink/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();