Skip to content

branch-3.0: [fix](catalog) fix refresh logic with lower case table name(#52989) #53992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dataroaring merged 1 commit into from
Aug 1, 2025
Merged

branch-3.0: [fix](catalog) fix refresh logic with lower case table name(#52989) #53992

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalDatabase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ public void setTableExtCatalog(ExternalCatalog extCatalog) {
public synchronized void setUnInitialized(boolean invalidCache) {
this.initialized = false;
this.invalidCacheInInit = invalidCache;
this.lowerCaseToTableName = Maps.newConcurrentMap();
if (extCatalog.getUseMetaCache().isPresent()) {
if (extCatalog.getUseMetaCache().get() && metaCache != null) {
metaCache.invalidateAll();
Expand Down Expand Up @@ -321,6 +322,7 @@ private void init() {

private List<Pair<String, String>> listTableNames() {
List<Pair<String, String>> tableNames;
this.lowerCaseToTableName.clear();
if (name.equals(InfoSchemaDb.DATABASE_NAME)) {
tableNames = ExternalInfoSchemaDatabase.listTableNames().stream()
.map(tableName -> {
Expand Down Expand Up @@ -586,37 +588,36 @@ public Set<String> getTableNamesWithLock() {
@Override
public T getTableNullable(String tableName) {
makeSureInitialized();
String finalName = tableName;
if (this.isStoredTableNamesLowerCase()) {
tableName = tableName.toLowerCase();
finalName = tableName.toLowerCase();
}
if (this.isTableNamesCaseInsensitive()) {
String realTableName = lowerCaseToTableName.get(tableName.toLowerCase());
if (realTableName == null) {
finalName = lowerCaseToTableName.get(tableName.toLowerCase());
if (finalName == null) {
// Here we need to execute listTableNames() once to fill in lowerCaseToTableName
// to prevent lowerCaseToTableName from being empty in some cases
listTableNames();
tableName = lowerCaseToTableName.get(tableName.toLowerCase());
if (tableName == null) {
finalName = lowerCaseToTableName.get(tableName.toLowerCase());
if (finalName == null) {
return null;
}
} else {
tableName = realTableName;
}
}
if (extCatalog.getLowerCaseMetaNames().equalsIgnoreCase("true")
&& (this.isTableNamesCaseInsensitive())) {
tableName = tableName.toLowerCase();
finalName = tableName.toLowerCase();
}
if (extCatalog.getUseMetaCache().get()) {
// must use full qualified name to generate id.
// otherwise, if 2 databases have the same table name, the id will be the same.
return metaCache.getMetaObj(tableName,
Util.genIdByName(extCatalog.getName(), name, tableName)).orElse(null);
return metaCache.getMetaObj(finalName,
Util.genIdByName(extCatalog.getName(), name, finalName)).orElse(null);
} else {
if (!tableNameToId.containsKey(tableName)) {
if (!tableNameToId.containsKey(finalName)) {
return null;
}
return idToTbl.get(tableNameToId.get(tableName));
return idToTbl.get(tableNameToId.get(finalName));
}
}

Expand Down
Loading