release-20.1: sql: populate Oid on type upgrade #47240
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
|
This change is |
otan
approved these changes
Apr 9, 2020
pbardea
changed the title
pbardea
force-pushed
the
backport20.1-47234
branch
from
be5979e
to
16cc259
Compare
|
LGTM! |
|
❌ The GitHub CI (Cockroach) build has failed on 16cc2598. 🦉 Hoot! I am a Blathers, a bot for CockroachDB. I am experimental - my owner is otan. |
|
❌ The GitHub CI (Cockroach) build has failed on 16cc2598. 🦉 Hoot! I am a Blathers, a bot for CockroachDB. I am experimental - my owner is otan. |
|
❌ The GitHub CI (Cockroach) build has failed on 16cc2598. 🦉 Hoot! I am a Blathers, a bot for CockroachDB. I am experimental - my owner is otan. |
When types are unmarshalled, the types are upgraded and the Oid of the internal type should be set. In 19.1, timestamps received an Oid and they were populated by the default case in upgradeTypes. However, a case to handle timestamps was added, but the Oids were no longer set (as they didn't need to be anymore). However, this meant that default case was not triggered anymore, so the Oid was no longer set. This commit moves the setting of the Oid from the default case to after the switch statement and sets the Oid based on the type family if none has been set yet. Release note (bug fix): Restoring a backup from 2.1 to 20.1 with a timestamp column would result in incomplete type data. This would crash commands such as SHOW COLUMNS FROM <new_table>. This is now fixed.
pbardea
force-pushed
the
backport20.1-47234
branch
from
16cc259
to
1933ebd
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/1 commits from #47234.
/cc @cockroachdb/release
When types are unmarshalled, the types are upgraded and the Oid of the
internal type should be set. In 19.1, timestamps received an Oid and
they were populated by the default case in upgradeTypes. However,
a case to handle timestamps was added, but the Oids were no longer
set (as they didn't need to be anymore). However, this meant that
default case was not triggered anymore, so the Oid was no longer
set. This commit also sets the Oid in the timestamp case.
Fixes #44453.
Release note (bug fix): Restoring a backup from 2.1 to 20.1 with a
timestamp column would result in incomplete type data. This would
crash commands such as SHOW COLUMNS FROM <new_table>. This is now
fixed.