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

[hotfix](jdbc catalog) fix load table and column names npe (#28865)

Browse Source 
This fix is for the npe situation that occurs when FE of non-Master nodes initializes Jdbc Catalog metadata.
This commit is contained in:
zy-kkk
2023-12-26 14:11:14 +08:00
committed by GitHub
parent 52eeee347f
commit 00bb099fdd
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcClient.java
View File

@ -74,8 +74,9 @@ public abstract class JdbcClient {
lowerColumnToRealColumn = new ConcurrentHashMap<>();
private final AtomicBoolean dbNamesLoaded = new AtomicBoolean(false);
private final AtomicBoolean tableNamesLoaded = new AtomicBoolean(false);
private final AtomicBoolean columnNamesLoaded = new AtomicBoolean(false);
private final ConcurrentHashMap<String, AtomicBoolean> tableNamesLoadedMap = new ConcurrentHashMap<>();
private final ConcurrentHashMap<String, ConcurrentHashMap<String, AtomicBoolean>> columnNamesLoadedMap
= new ConcurrentHashMap<>();
public static JdbcClient createJdbcClient(JdbcClientConfig jdbcClientConfig) {
String dbType = parseDbType(jdbcClientConfig.getJdbcUrl());
@ -404,13 +405,18 @@ public abstract class JdbcClient {
}
private void loadTableNamesIfNeeded(String dbName) {
if (tableNamesLoaded.compareAndSet(false, true)) {
AtomicBoolean isLoaded = tableNamesLoadedMap.computeIfAbsent(dbName, k -> new AtomicBoolean(false));
if (isLoaded.compareAndSet(false, true)) {
getTablesNameList(dbName);
}
}
private void loadColumnNamesIfNeeded(String dbName, String tableName) {
if (columnNamesLoaded.compareAndSet(false, true)) {
ConcurrentHashMap<String, AtomicBoolean> tableMap = columnNamesLoadedMap.computeIfAbsent(dbName,
k -> new ConcurrentHashMap<>());
AtomicBoolean isLoaded = tableMap.computeIfAbsent(tableName, k -> new AtomicBoolean(false));
if (isLoaded.compareAndSet(false, true)) {
getJdbcColumnsInfo(dbName, tableName);
}
}
@ -469,6 +475,7 @@ public abstract class JdbcClient {
/**
* Execute stmt direct via jdbc
*
* @param origStmt, the raw stmt string
*/
public void executeStmt(String origStmt) {