database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[bugfix](jdbc catalog) refresh catalog close jdbcclient (#28300)

Browse Source
This commit is contained in:
Guangdong Liu
2023-12-16 23:38:24 +08:00
committed by GitHub
parent 61ad3b8dc4
commit 2f775260d7
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fe/fe-core/src/main/java/org/apache/doris/datasource/CatalogIf.java
View File

@ -85,7 +85,7 @@ public interface CatalogIf<T extends DatabaseIf> {
default void notifyPropertiesUpdated(Map<String, String> updatedProps) {
if (this instanceof ExternalCatalog) {
((ExternalCatalog) this).setUninitialized(false);
((ExternalCatalog) this).onRefresh(false);
}
}

2
fe/fe-core/src/main/java/org/apache/doris/datasource/CatalogMgr.java
View File

@ -150,7 +150,7 @@ public class CatalogMgr implements Writable, GsonPostProcessable {
if (catalog != null) {
String catalogName = catalog.getName();
if (!catalogName.equals(InternalCatalog.INTERNAL_CATALOG_NAME)) {
((ExternalCatalog) catalog).setUninitialized(invalidCache);
((ExternalCatalog) catalog).onRefresh(invalidCache);
}
}
}

2
fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java
View File

@ -287,7 +287,7 @@ public abstract class ExternalCatalog
Env.getCurrentEnv().getEditLog().logInitCatalog(initCatalogLog);
}
public void setUninitialized(boolean invalidCache) {
public void onRefresh(boolean invalidCache) {
this.objectCreated = false;
this.initialized = false;
this.invalidCacheInInit = invalidCache;

8
fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/JdbcExternalCatalog.java
View File

@ -67,6 +67,14 @@ public class JdbcExternalCatalog extends ExternalCatalog {
}
}
@Override
public void onRefresh(boolean invalidCache) {
super.onRefresh(invalidCache);
if (jdbcClient != null) {
jdbcClient.closeClient();
}
}
@Override
public void onClose() {
super.onClose();