[fix](audit)Fixed an issue that the audit log would record the previous queryId when parseSQL fails. #53107
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
Contributor
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
Contributor
Author
|
run buildall |
TPC-H: Total hot run time: 32913 ms |
TPC-DS: Total hot run time: 185955 ms |
ClickBench: Total hot run time: 29.49 s |
Contributor
FE UT Coverage ReportIncrement line coverage |
Contributor
Author
|
run buildall |
TPC-H: Total hot run time: 33878 ms |
TPC-DS: Total hot run time: 187418 ms |
ClickBench: Total hot run time: 32.41 s |
Contributor
Author
|
run p0 |
morrySnow
reviewed
Jul 25, 2025
| exprIdGenerator = ExprId.createGenerator(initialId); | ||
| if (connectContext != null && connectContext.getSessionVariable() != null | ||
| && connectContext.queryId() != null | ||
| //&& connectContext.queryId() != null |
Contributor
Author
There was a problem hiding this comment.
The queryId retrieved here is always null—the current query's queryId is set in subsequent steps, while what was obtained earlier actually belonged to the previous query.
| protected void handleQuery(String originStmt) throws ConnectionException { | ||
| // Before executing the query, the queryId should be set to empty. | ||
| // Otherwise, if SQL parsing fails, the audit log will record the queryId from the previous query. | ||
| ctx.resetQueryId(); |
Contributor
There was a problem hiding this comment.
now, what will be in the audit log? null?
Contributor
Author
There was a problem hiding this comment.
.setQueryId(ctx.queryId() == null ? "NaN" : DebugUtil.printId(ctx.queryId()))
NAN
924060929
approved these changes
Jul 25, 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. |
Contributor
Author
|
run buildall |
Contributor
FE UT Coverage ReportIncrement line coverage |
Contributor
Author
|
run performance |
TPC-H: Total hot run time: 33898 ms |
TPC-DS: Total hot run time: 187085 ms |
ClickBench: Total hot run time: 32.63 s |
morrySnow
approved these changes
Jul 28, 2025
github-actions
bot
added
dev/3.0.x-conflict
dev/2.1.x-conflict
dev/3.1.x-conflict
labels
zddr
added a commit
to zddr/incubator-doris
that referenced
this pull request
Jul 29, 2025
…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/qe/ConnectContext.java
zddr
added a commit
to zddr/incubator-doris
that referenced
this pull request
Jul 29, 2025
…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/test/java/org/apache/doris/qe/ConnectContextTest.java
zddr
added a commit
to zddr/incubator-doris
that referenced
this pull request
Jul 29, 2025
…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
zhiqiang-hhhh
pushed a commit
to zhiqiang-hhhh/doris
that referenced
this pull request
Aug 4, 2025
…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.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 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.
What problem does this PR solve?
Issue:
Solution:
Issue Number: close #xxx
Related PR: #xxx
Problem Summary:
Fixed an issue that the audit log would record the previous queryId when parseSQL fails.
Release note
Fixed an issue that the audit log would record the previous queryId when parseSQL fails.
Check List (For Author)
Test
Behavior changed:
Does this need documentation?
Check List (For Reviewer who merge this PR)