sqlbase: upgrade method can deal with mixed upgraded/old descriptors #39451
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
|
This change is |
jordanlewis
force-pushed
the
fk-mixed-upgrade
branch
2 times, most recently
from
23df67d to
5891ee2
Compare
thoszhang
reviewed
Aug 8, 2019
There was a problem hiding this comment.
Reviewable status:
complete! 0 of 0 LGTMs obtained (waiting on @jordanlewis and @lucy-zhang)
pkg/sql/sqlbase/structured.go, line 824 at r1 (raw file):
// or it's new (already upgraded). var inFK ForeignKeyConstraint if originIndex.ForeignKey.Table == 0 {
Should this just be if originIndex.ForeignKey.IsSet() for clarity (since I assume the intent is just to check that the FK is unset)?
pkg/sql/sqlbase/structured.go, line 869 at r1 (raw file):
} else { // We have an old (not upgraded yet) table. if !originIndex.ForeignKey.IsSet() {
(as discussed offline) this case can't happen since we already check that the FK is set in the if statement.
Previously, the maybeUpgradeFK method assumed that all on-disk descriptors were old-style. This is not always the case, because we might have written some upgraded ones after the 19.2 version bump had completely finished. Release note: None
jordanlewis
force-pushed
the
fk-mixed-upgrade
branch
from
5891ee2 to
caa8a62
Compare
thoszhang
approved these changes
Aug 8, 2019
|
TFTR! bors r+ |
craig bot
pushed a commit
that referenced
this pull request
Aug 8, 2019
39451: sqlbase: upgrade method can deal with mixed upgraded/old descriptors r=jordanlewis a=jordanlewis Previously, the maybeUpgradeFK method assumed that all on-disk descriptors were old-style. This is not always the case, because we might have written some upgraded ones after the 19.2 version bump had completely finished. Release note: None Co-authored-by: Jordan Lewis <[email protected]>
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, the maybeUpgradeFK method assumed that all on-disk
descriptors were old-style. This is not always the case, because we
might have written some upgraded ones after the 19.2 version bump had
completely finished.
Release note: None