release-2.1: sql: fix panic in insert on conflict do update #33309
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 |
knz
approved these changes
Dec 21, 2018
There was an assumption that the row inserter and row updater had the same columns in the same order and if that wasn't the case row inserter's columns would be larger. This assumption is incorrect, so to fix it, when storing the existing rows (which are used to see if they conflicts with other rows further on in the statement) instead of storing the row used for inputs, convert the rows directly to those required by the row updater. Fixes cockroachdb#32834. Release note (bug fix): Fixed an issue in which if a nullable column wasn't supplied in an INSERT ON CONFLICT DO UPDATE statement, it may cause a panic.
BramGruneir
force-pushed
the
backport2.1-33245
branch
from
758f48f to
16071de
Compare
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.
Backport 1/2 commits from #33245.
/cc @cockroachdb/release
There was an assumption that the row inserter and row updater had the same
columns in the same order and if that wasn't the case row inserter's columns
would be larger.
This assumption is incorrect, so to fix it, when storing the existing rows
(which are used to see if they conflicts with other rows further on in the
statement) instead of storing the row used for inputs, convert the rows
directly to those required by the row updater.
Fixes #32834.
Release note (bug fix): Fixed an issue in which if a nullable column wasn't
supplied in an INSERT ON CONFLICT DO UPDATE statement, it may cause a panic.