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

[fix](multicatalog) make lastdbofcatalog a session variable (#38114)

Browse Source 
bp #37828
This commit is contained in:
Yulei-Yang
2024-07-23 10:34:40 +08:00
committed by GitHub
parent 193be20c86
commit 41b355721f
4 changed files with 46 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
View File

@ -5204,7 +5204,7 @@ public class Env {
this.alter.getClusterHandler().cancel(stmt);
}
// Switch catalog of this sesseion.
// Switch catalog of this session.
public void changeCatalog(ConnectContext ctx, String catalogName) throws DdlException {
CatalogIf catalogIf = catalogMgr.getCatalog(catalogName);
if (catalogIf == null) {
@ -5216,11 +5216,11 @@ public class Env {
if (StringUtils.isNotEmpty(currentDB)) {
// When dropped the current catalog in current context, the current catalog will be null.
if (ctx.getCurrentCatalog() != null) {
catalogMgr.addLastDBOfCatalog(ctx.getCurrentCatalog().getName(), currentDB);
ctx.addLastDBOfCatalog(ctx.getCurrentCatalog().getName(), currentDB);
}
}
ctx.changeDefaultCatalog(catalogName);
String lastDb = catalogMgr.getLastDB(catalogName);
String lastDb = ctx.getLastDBOfCatalog(catalogName);
if (StringUtils.isNotEmpty(lastDb)) {
ctx.setDatabase(lastDb);
}

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

@ -96,8 +96,6 @@ public class CatalogMgr implements Writable, GsonPostProcessable {
private final Map<Long, CatalogIf<? extends DatabaseIf<? extends TableIf>>> idToCatalog = Maps.newConcurrentMap();
// this map will be regenerated from idToCatalog, so not need to persist.
private final Map<String, CatalogIf> nameToCatalog = Maps.newConcurrentMap();
// record last used database of every catalog
private final Map<String, String> lastDBOfCatalog = Maps.newConcurrentMap();
// Use a separate instance to facilitate access.
// internalDataSource still exists in idToCatalog and nameToCatalog
@ -140,7 +138,9 @@ public class CatalogMgr implements Writable, GsonPostProcessable {
if (catalog != null) {
catalog.onClose();
nameToCatalog.remove(catalog.getName());
lastDBOfCatalog.remove(catalog.getName());
if (ConnectContext.get() != null) {
ConnectContext.get().removeLastDBOfCatalog(catalog.getName());
}
Env.getCurrentEnv().getExtMetaCacheMgr().removeCache(catalog.getId());
if (!Strings.isNullOrEmpty(catalog.getResource())) {
Resource catalogResource = Env.getCurrentEnv().getResourceMgr().getResource(catalog.getResource());
@ -194,14 +194,6 @@ public class CatalogMgr implements Writable, GsonPostProcessable {
ErrorCode.ERR_UNKNOWN_CATALOG));
}
public void addLastDBOfCatalog(String catalog, String db) {
lastDBOfCatalog.put(catalog, db);
}
public String getLastDB(String catalog) {
return lastDBOfCatalog.get(catalog);
}
public List<Long> getCatalogIds() {
return Lists.newArrayList(idToCatalog.keySet());
}
@ -282,7 +274,9 @@ public class CatalogMgr implements Writable, GsonPostProcessable {
replayDropCatalog(log);
Env.getCurrentEnv().getEditLog().logCatalogLog(OperationType.OP_DROP_CATALOG, log);
lastDBOfCatalog.remove(stmt.getCatalogName());
if (ConnectContext.get() != null) {
ConnectContext.get().removeLastDBOfCatalog(stmt.getCatalogName());
}
Env.getCurrentEnv().getQueryStats().clear(catalog.getId());
} finally {
writeUnlock();
@ -306,10 +300,13 @@ public class CatalogMgr implements Writable, GsonPostProcessable {
replayAlterCatalogName(log);
Env.getCurrentEnv().getEditLog().logCatalogLog(OperationType.OP_ALTER_CATALOG_NAME, log);
String db = lastDBOfCatalog.get(stmt.getCatalogName());
if (db != null) {
lastDBOfCatalog.remove(stmt.getCatalogName());
lastDBOfCatalog.put(log.getNewCatalogName(), db);
ConnectContext ctx = ConnectContext.get();
if (ctx != null) {
String db = ctx.getLastDBOfCatalog(stmt.getCatalogName());
if (db != null) {
ctx.removeLastDBOfCatalog(stmt.getCatalogName());
ctx.addLastDBOfCatalog(log.getNewCatalogName(), db);
}
}
} finally {
writeUnlock();

15
fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
View File

@ -174,6 +174,9 @@ public class ConnectContext {
protected String defaultCatalog = InternalCatalog.INTERNAL_CATALOG_NAME;
protected boolean isSend;
// record last used database of every catalog
private final Map<String, String> lastDBOfCatalog = Maps.newConcurrentMap();
protected AuditEventBuilder auditEventBuilder = new AuditEventBuilder();
protected String remoteIP;
@ -321,6 +324,18 @@ public class ConnectContext {
return this.isSend;
}
public void addLastDBOfCatalog(String catalog, String db) {
lastDBOfCatalog.put(catalog, db);
}
public String getLastDBOfCatalog(String catalog) {
return lastDBOfCatalog.get(catalog);
}
public String removeLastDBOfCatalog(String catalog) {
return lastDBOfCatalog.get(catalog);
}
public void setNotEvalNondeterministicFunction(boolean notEvalNondeterministicFunction) {
this.notEvalNondeterministicFunction = notEvalNondeterministicFunction;
}

17
regression-test/suites/external_table_p0/hive/test_external_catalog_hive.groovy
View File

@ -145,10 +145,23 @@ suite("test_external_catalog_hive", "p0,external,hive,external_docker,external_d
sql """alter catalog ${catalog_name} rename hms;"""
sql """switch hms;"""
def res3 = sql """select count(*) from test.hive_test limit 10;"""
sql """use test;"""
def res3 = sql """select count(*) from hive_test limit 10;"""
logger.info("recoding select: " + res3.toString())
def user = 'account_user_test'
def pwd = 'C123_567p'
try_sql("DROP USER ${user}")
sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'"""
sql """GRANT SELECT_PRIV on *.*.* to '${user}'"""
connect(user=user, password="${pwd}", url=context.config.jdbcUrl) {
sql """switch hms;"""
test {
sql "show tables"
exception "errCode = 2, detailMessage = No database selected"
}
}
sql """alter catalog hms rename ${catalog_name};"""
// test wrong access controller