sql: fix recently introduced minor bug around PREPARE #108461
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
|
It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR? 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
|
This change is |
rafiss
approved these changes
Aug 9, 2023
| @@ -903,6 +903,9 @@ func (ex *connExecutor) execStmtInOpenState( | |||
| // PREPARE statement itself. | |||
| oldPlaceholders := p.extendedEvalCtx.Placeholders | |||
| p.extendedEvalCtx.Placeholders = nil | |||
| defer func() { | |||
| p.extendedEvalCtx.Placeholders = oldPlaceholders | |||
There was a problem hiding this comment.
ty for fixing this! i think we could also put this into the defer:
// The call to addPreparedStmt changed the planner stmt to the statement
// being prepared. Set it back to the PREPARE statement, so that it's
// logged correctly.
p.stmt = stmt
In just merged 4a3e787, we had a minor bug that in case `addPreparedStmt` call fails, we don't restore the original placeholders, which can then lead to panics. Release note: None
yuzefovich
commented
Aug 9, 2023
There was a problem hiding this comment.
TFTR!
bors r+
Reviewable status:
complete! 0 of 0 LGTMs obtained (waiting on @rafiss)
pkg/sql/conn_executor_exec.go line 907 at r1 (raw file):
Previously, rafiss (Rafi Shamim) wrote…
ty for fixing this! i think we could also put this into the defer:
// The call to addPreparedStmt changed the planner stmt to the statement // being prepared. Set it back to the PREPARE statement, so that it's // logged correctly. p.stmt = stmt
Done.
|
Build failed (retrying...): |
|
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.
In just merged 4a3e787, we had a minor bug that in case
addPreparedStmtcall fails, we don't restore the original placeholders, which can then lead to panics.Fixes: #108421.
Release note: None