This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 4fa3b14bf0 [Fix](multi-catalog)Fix NPE caused by GsonUtils created
objects. #13489
4fa3b14bf0 is described below
commit 4fa3b14bf00aa14c1dae34c7a0011a51ba7d9464
Author: Jibing-Li <64681310+jibing...@users.noreply.github.com>
AuthorDate: Thu Oct 20 08:52:58 2022 +0800
[Fix](multi-catalog)Fix NPE caused by GsonUtils created objects. #13489
---
.../main/java/org/apache/doris/catalog/external/EsExternalDatabase.java | 2 +-
.../java/org/apache/doris/catalog/external/HMSExternalDatabase.java | 2 +-
.../src/main/java/org/apache/doris/datasource/HMSExternalCatalog.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/catalog/external/EsExternalDatabase.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/external/EsExternalDatabase.java
index 4241d75988..8898ede84d 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/catalog/external/EsExternalDatabase.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/catalog/external/EsExternalDatabase.java
@@ -67,7 +67,7 @@ public class EsExternalDatabase extends
ExternalDatabase<EsExternalTable> {
Map<Long, EsExternalTable> tmpIdToTbl = Maps.newHashMap();
for (String tableName : tableNames) {
long tblId;
- if (tableNameToId.containsKey(tableName)) {
+ if (tableNameToId != null &&
tableNameToId.containsKey(tableName)) {
tblId = tableNameToId.get(tableName);
tmpTableNameToId.put(tableName, tblId);
EsExternalTable table = idToTbl.get(tblId);
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/catalog/external/HMSExternalDatabase.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/external/HMSExternalDatabase.java
index 4e50a4c59a..b8d9287982 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/catalog/external/HMSExternalDatabase.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/catalog/external/HMSExternalDatabase.java
@@ -69,7 +69,7 @@ public class HMSExternalDatabase extends
ExternalDatabase<HMSExternalTable> {
Map<Long, HMSExternalTable> tmpIdToTbl = Maps.newHashMap();
for (String tableName : tableNames) {
long tblId;
- if (tableNameToId.containsKey(tableName)) {
+ if (tableNameToId != null &&
tableNameToId.containsKey(tableName)) {
tblId = tableNameToId.get(tableName);
tmpTableNameToId.put(tableName, tblId);
HMSExternalTable table = idToTbl.get(tblId);
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/HMSExternalCatalog.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/HMSExternalCatalog.java
index e15226cad7..8bd8c8288f 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/datasource/HMSExternalCatalog.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/HMSExternalCatalog.java
@@ -84,7 +84,7 @@ public class HMSExternalCatalog extends ExternalCatalog {
}
for (String dbName : allDatabases) {
long dbId;
- if (dbNameToId.containsKey(dbName)) {
+ if (dbNameToId != null && dbNameToId.containsKey(dbName)) {
dbId = dbNameToId.get(dbName);
tmpDbNameToId.put(dbName, dbId);
HMSExternalDatabase db = idToDb.get(dbId);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
