sql: fix statement diagnostics for EXECUTE #66074
Merged
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
Previously, prepared statements ran through the EXECUTE statements could not trigger collection of statement diagnostics. This is because we consider the fingerprint of the EXECUTE statement instead of the one from the prepared statement. The fix is to move up the special handling code in the executor, and replace the AST and fingerprint before setting up the instrumentation helper. Release note (bug fix): queries ran through the EXECUTE statement can now generate statement diagnostic bundles as expected. Fixes cockroachdb#66048.
|
This change is |
yuzefovich
approved these changes
Jun 4, 2021
There was a problem hiding this comment.
Reviewed 2 of 2 files at r1.
Reviewable status:complete! 1 of 0 LGTMs obtained (waiting on @RaduBerinde)
pkg/sql/conn_executor_exec.go, line 400 at r1 (raw file):
// Special top-level handling for EXECUTE. This must happen after the handling // for EXPLAIN ANALYZE (in order to support EXPLAIN ANALYZE EXECUTE) but
nit: do we have a test for this? Should we add it if not?
RaduBerinde
commented
Jun 4, 2021
There was a problem hiding this comment.
TFTR!
bors r+
Reviewable status:
pkg/sql/conn_executor_exec.go, line 400 at r1 (raw file):
Previously, yuzefovich (Yahor Yuzefovich) wrote…
nit: do we have a test for this? Should we add it if not?
Yes, I did it wrong the first time and I hit it (it's an execbuilder test).
|
Build succeeded: |
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.
Previously, prepared statements ran through the EXECUTE statements
could not trigger collection of statement diagnostics. This is because
we consider the fingerprint of the EXECUTE statement instead of the
one from the prepared statement.
The fix is to move up the special handling code in the executor, and
replace the AST and fingerprint before setting up the instrumentation
helper.
Release note (bug fix): queries ran through the EXECUTE statement can
now generate statement diagnostic bundles as expected.
Fixes #66048.