[fix](multicatalog) make lastdbofcatalog a session variable #37828
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Yulei-Yang
requested review from
dataroaring,
CalvinKirs and
morningman
as code owners
|
Thank you for your contribution to Apache Doris. Since 2024-03-18, the Document has been moved to doris-website. |
|
run buildall |
TPC-H: Total hot run time: 39287 ms |
morningman
reviewed
Jul 15, 2024
| @@ -5381,11 +5381,11 @@ public void changeCatalog(ConnectContext ctx, String catalogName) throws DdlExce | |||
| 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); | |||
| ConnectContext.get().addLastDBOfCatalog(ctx.getCurrentCatalog().getName(), currentDB); | |||
There was a problem hiding this comment.
Suggested change
| ConnectContext.get().addLastDBOfCatalog(ctx.getCurrentCatalog().getName(), currentDB); | |
| ctx.addLastDBOfCatalog(ctx.getCurrentCatalog().getName(), currentDB); |
| } | ||
| } | ||
| ctx.changeDefaultCatalog(catalogName); | ||
| String lastDb = catalogMgr.getLastDB(catalogName); | ||
| String lastDb = ConnectContext.get().getLastDBOfCatalog(catalogName); |
There was a problem hiding this comment.
Suggested change
| String lastDb = ConnectContext.get().getLastDBOfCatalog(catalogName); | |
| String lastDb = ctx.getLastDBOfCatalog(catalogName); |
| @@ -140,7 +138,7 @@ private CatalogIf removeCatalog(long catalogId) { | |||
| if (catalog != null) { | |||
| catalog.onClose(); | |||
| nameToCatalog.remove(catalog.getName()); | |||
| lastDBOfCatalog.remove(catalog.getName()); | |||
| ConnectContext.get().removeLastDBOfCatalog(catalog.getName()); | |||
There was a problem hiding this comment.
Need to check whether ConnectContext.get() is null.
Sometimes this operation is not within a connection session.
| @@ -282,7 +272,7 @@ public void dropCatalog(DropCatalogStmt stmt) throws UserException { | |||
| replayDropCatalog(log); | |||
| Env.getCurrentEnv().getEditLog().logCatalogLog(OperationType.OP_DROP_CATALOG, log); | |||
|
|
|||
| lastDBOfCatalog.remove(stmt.getCatalogName()); | |||
| ConnectContext.get().removeLastDBOfCatalog(stmt.getCatalogName()); | |||
TPC-DS: Total hot run time: 172221 ms |
ClickBench: Total hot run time: 30.96 s |
morrySnow
reviewed
Jul 15, 2024
|
run buildall |
TPC-H: Total hot run time: 39900 ms |
morrySnow
previously approved these changes
Jul 18, 2024
|
PR approved by at least one committer and no changes requested. |
github-actions
bot
added
approved
|
PR approved by anyone and no changes requested. |
TPC-DS: Total hot run time: 173118 ms |
ClickBench: Total hot run time: 31.09 s |
|
run external |
|
run cloud_p0 |
morningman
reviewed
Jul 18, 2024
| def result1 = connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { | ||
| sql """switch hms;""" | ||
| try { | ||
| sql """show tables;""" |
There was a problem hiding this comment.
should add assertTrue(false) here.
Otherwise, if show tables run successfully, there is no check
There was a problem hiding this comment.
good catch! fixed
There was a problem hiding this comment.
maybe
test {
sql "show tables"
exception "No database selected"
}
is better
|
run buildall |
TPC-H: Total hot run time: 40013 ms |
TPC-DS: Total hot run time: 174630 ms |
ClickBench: Total hot run time: 30.36 s |
|
run p0 |
2 similar comments
|
run p0 |
|
run p0 |
|
run buildall |
TPC-H: Total hot run time: 39838 ms |
TPC-DS: Total hot run time: 173323 ms |
ClickBench: Total hot run time: 30.77 s |
github-actions
bot
added
the
approved
|
PR approved by at least one committer and no changes requested. |
morrySnow
approved these changes
Jul 23, 2024
morningman
pushed a commit
that referenced
this pull request
Jul 23, 2024
morningman
pushed a commit
that referenced
this pull request
Jul 23, 2024
lide-reed
pushed a commit
that referenced
this pull request
Jul 23, 2024
dataroaring
pushed a commit
that referenced
this pull request
Jul 24, 2024
bring by: #14793 issue: lastdbofcatalog is a global variable, so all login user share it. that's not correct, should be a session variable
dataroaring
added
dev/3.0.1-merged
dev/2.1.6-merged
and removed
dev/2.1.6-merged
labels
mongo360
pushed a commit
to mongo360/doris
that referenced
this pull request
Aug 16, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
bring by: #14793
issue:
lastdbofcatalog is a global variable, so all login user share it. that's not correct, should be a session variable