plpgsql: allow nested blocks in a block with an exception handler #120045
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
|
This change is |
|
The first two commits are #120043. |
DrewKimball
force-pushed
the
nested-exception
branch
from
6db366d
to
fe06932
Compare
yuzefovich
approved these changes
Mar 7, 2024
There was a problem hiding this comment.
Reviewed 1 of 1 files at r3, 5 of 5 files at r4, all commit messages.
Reviewable status:complete! 1 of 0 LGTMs obtained (waiting on @mgartner)
There was some leftover logic for building the branches of a routine's exception handler after some refactoring in cockroachdb#110998. This didn't affect correctness, but added unnecessary overhead. This commit removes the extra work. Epic: None Release note: None
This commit removes the restriction on nesting PL/pgSQL blocks within a block that has an exception handler. This is accomplished by tracking the number of variables that are in scope for each block, and using that information to determine which arguments to supply to the exception handler for a block. This relies on the invariant that the variables of a parent block always form a prefix of the variables of a child block. Fixes cockroachdb#118551 Release note (sql change): PL/pgSQL blocks can now be nested in a block that has an exception handler.
DrewKimball
force-pushed
the
nested-exception
branch
from
fe06932
to
dc19dfc
Compare
|
The tests exposed a bug - subsequent branches of an exception handler were considered even if an earlier branch matched and returned its own exception. I fixed that by breaking out of the exception branch-checking loop before attempting to handle the error. |
yuzefovich
approved these changes
Mar 11, 2024
There was a problem hiding this comment.
Reviewed 14 of 14 files at r5, 14 of 14 files at r6, all commit messages.
Reviewable status:
|
TFTR! bors r+ |
|
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.
execbuilder,plpgsql: don't build redundant exception handler
There was some leftover logic for building the branches of a routine's
exception handler after some refactoring in #110998. This didn't affect
correctness, but added unnecessary overhead. This commit removes the
extra work.
plpgsql: allow nested blocks in a block with an exception handler
This commit removes the restriction on nesting PL/pgSQL blocks within
a block that has an exception handler. This is accomplished by tracking
the number of variables that are in scope for each block, and using that
information to determine which arguments to supply to the exception
handler for a block. This relies on the invariant that the variables of
a parent block always form a prefix of the variables of a child block.
Fixes #118551
Release note (sql change): PL/pgSQL blocks can now be nested in a block
that has an exception handler.