Skip to content

Commit 0616fbc

Browse files
authored
(#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
1 parent 1297713 commit 0616fbc

File tree

3 files changed

+6
-26
lines changed

3 files changed

+6
-26
lines changed

flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/catalog/BaseCatalog.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,14 @@ protected BaseCatalog(
104104
protected abstract AbstractCatalog realCatalog();
105105

106106
@Override
107-
public void open() throws CatalogException {}
107+
public void open() throws CatalogException {
108+
realCatalog().open();
109+
}
108110

109111
@Override
110-
public void close() throws CatalogException {}
112+
public void close() throws CatalogException {
113+
realCatalog().close();
114+
}
111115

112116
@Override
113117
public List<String> listDatabases() throws CatalogException {

flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/hive/GravitinoHiveCatalog.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.util.Optional;
2222
import javax.annotation.Nullable;
2323
import org.apache.flink.table.catalog.AbstractCatalog;
24-
import org.apache.flink.table.catalog.exceptions.CatalogException;
2524
import org.apache.flink.table.catalog.hive.HiveCatalog;
2625
import org.apache.flink.table.factories.Factory;
2726
import org.apache.gravitino.flink.connector.PartitionConverter;
@@ -48,18 +47,6 @@ public class GravitinoHiveCatalog extends BaseCatalog {
4847
this.hiveCatalog = new HiveCatalog(catalogName, defaultDatabase, hiveConf, hiveVersion);
4948
}
5049

51-
@Override
52-
public void open() throws CatalogException {
53-
super.open();
54-
hiveCatalog.open();
55-
}
56-
57-
@Override
58-
public void close() throws CatalogException {
59-
super.close();
60-
hiveCatalog.close();
61-
}
62-
6350
public HiveConf getHiveConf() {
6451
return hiveCatalog.getHiveConf();
6552
}

flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/iceberg/GravitinoIcebergCatalog.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.util.Map;
2222
import java.util.Optional;
2323
import org.apache.flink.table.catalog.AbstractCatalog;
24-
import org.apache.flink.table.catalog.exceptions.CatalogException;
2524
import org.apache.flink.table.factories.Factory;
2625
import org.apache.gravitino.flink.connector.PartitionConverter;
2726
import org.apache.gravitino.flink.connector.PropertiesConverter;
@@ -45,16 +44,6 @@ protected GravitinoIcebergCatalog(
4544
this.icebergCatalog = (FlinkCatalog) flinkCatalogFactory.createCatalog(catalogName, properties);
4645
}
4746

48-
@Override
49-
public void open() throws CatalogException {
50-
icebergCatalog.open();
51-
}
52-
53-
@Override
54-
public void close() throws CatalogException {
55-
icebergCatalog.close();
56-
}
57-
5847
@Override
5948
public Optional<Factory> getFactory() {
6049
return icebergCatalog.getFactory();

0 commit comments

Comments
 (0)