Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release-24.1: schemachanger: consider column target status after resolving #122631

Merged
merged 2 commits into from
Apr 24, 2024

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Apr 18, 2024

Backport 2/2 commits from #122389 on behalf of @annrpom.

/cc @cockroachdb/release


schemachanger: consider "dropping" columns during drop col

Previously, using the "comma syntax" for dropping a col
with the same name (alter table t drop column i, drop column i;)
led to an internal error. This patch makes it so that
the error will instead be a proper external error by
ensuring that resolving columns in the DSC considers the
"dropping" state.

Epic: none

Release note: None


schemachanger: consider "dropping" columns while adding col

This patch enables the "comma syntax" to drop and add
a column with the same name in our DSC.

Epic: none
Fixes: #120226

Release note (bug fix): Dropping and adding a column with the same
name no longer results in a "column already exists error".


Release justification: bug fix

@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-24.1-122389 branch from 54f791f to 2c35eda Compare April 18, 2024 15:30
@blathers-crl blathers-crl bot requested a review from a team as a code owner April 18, 2024 15:30
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Apr 18, 2024
@blathers-crl blathers-crl bot requested review from annrpom, fqazi and rafiss April 18, 2024 15:30
Copy link
Author

blathers-crl bot commented Apr 18, 2024

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Backports should only be created for serious
    issues
    or test-only changes.
  • Backports should not break backwards-compatibility.
  • Backports should change as little code as possible.
  • Backports should not change on-disk formats or node communication protocols.
  • Backports should not add new functionality (except as defined
    here).
  • Backports must not add, edit, or otherwise modify cluster versions; or add version gates.
  • All backports must be reviewed by the owning areas TL and one additional
    TL. For more information as to how that review should be conducted, please consult the backport
    policy
    .
If your backport adds new functionality, please ensure that the following additional criteria are satisfied:
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters. State changes must be further protected such that nodes running old binaries will not be negatively impacted by the new state (with a mixed version test added).
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.
  • Your backport must be accompanied by a post to the appropriate Slack
    channel (#db-backports-point-releases or #db-backports-XX-X-release) for awareness and discussion.

Also, please add a brief release justification to the body of your PR to justify this
backport.

@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label Apr 18, 2024
Copy link
Author

blathers-crl bot commented Apr 18, 2024

Your pull request contains more than 1000 changes. It is strongly encouraged to split big PRs into smaller chunks.

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Collaborator

@fqazi fqazi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 1 of 1 files at r1, 17 of 17 files at r2, all commit messages.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @annrpom and @rafiss)

@annrpom
Copy link
Contributor

annrpom commented Apr 24, 2024

getting Required statuses must pass before merging -- i'll try rebasing

edit: i force-pushed to this branch as per https://cockroachlabs.slack.com/archives/CJ0H8Q97C/p1648648510522509?thread_ts=1648638969.754059&cid=CJ0H8Q97C

Previously, using the "comma syntax" for dropping a col
with the same name (`alter table t drop column i, drop column i;`)
led to an internal error. This patch makes it so that
the error will instead be a proper external error by
ensuring that resolving columns in the DSC considers the
"dropping" state.

Epic: none

Release note: None
This patch enables the "comma syntax" to drop and add
a column with the same name in our DSC.

Epic: none
Fixes: #120226

Release note (bug fix): Dropping and adding a column with the same
name no longer results in a "column already exists error".
@annrpom annrpom force-pushed the blathers/backport-release-24.1-122389 branch from 2c35eda to 406c69a Compare April 24, 2024 14:56
@annrpom annrpom merged commit f0090e4 into release-24.1 Apr 24, 2024
19 of 20 checks passed
@annrpom annrpom deleted the blathers/backport-release-24.1-122389 branch April 24, 2024 16:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Label PR's that are backports to older release branches blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants