branch-2.1:[fix](audit)Fixed an issue that the audit log would record the previo… #54010
Conversation
This file contains hidden or 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
…us queryId when parseSQL fails. (apache#53107) ### What problem does this PR solve? Issue: - When parsing SQL, the queryId has not yet been generated. However, the audit log retrieves the queryId from ConnectContext, which means it uses the queryId from the previous execution. - The queryId stored in queryCache is from the previous query, not the current one. Solution: - Since parsing may produce multiple SQL statements, each should have its own queryId. Therefore, the queryId should not be set during parsing. As a compromise, we clear the queryId before parsing, ensuring that the audit log records an empty queryId if parsing fails. - Set the queryId when adding the cache, not in the constructor. # Conflicts: # fe/fe-core/src/main/java/org/apache/doris/common/cache/NereidsSqlCacheManager.java # fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java # fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java # fe/fe-core/src/test/java/org/apache/doris/qe/ConnectContextTest.java
Contributor
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
Contributor
Author
|
run buildall |
Contributor
Author
|
run feut |
1 similar comment
Contributor
Author
|
run feut |
Contributor
Author
|
run buildall |
yiguolei
approved these changes
Sep 11, 2025
github-actions
bot
added
the
approved
Contributor
|
PR approved by at least one committer and no changes requested. |
Contributor
|
PR approved by anyone and no changes requested. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
…us queryId when parseSQL fails. (#53107)
pick: #53107