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

upgrades: add weaker column schema exists funcs for use with migrations #91755

Merged
merged 1 commit into from
Nov 15, 2022

Conversation

andyyang890
Copy link
Collaborator

@andyyang890 andyyang890 commented Nov 11, 2022

This patch adds two schema exists functions for use with migrations
that involve multiple schema changes on the same column(s) in order
to preserve the idempotence of the migration(s). They are weaker
in the sense that they do not check that the stored and final
expected descriptor match.

Informs #91449

Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@andyyang890 andyyang890 force-pushed the column_exists_fns branch 6 times, most recently from 0b064a1 to c9e894a Compare November 14, 2022 18:32
@andyyang890 andyyang890 marked this pull request as ready for review November 14, 2022 18:37
@andyyang890 andyyang890 requested review from a team, rafiss and ajwerner November 14, 2022 18:37
This patch adds two schema exists functions for use with migrations
that involve multiple schema changes on the same column(s) in order
to preserve the idempotence of the migration(s). They are weaker
in the sense that they do not check that the stored and final
expected descriptor match.

Release note: None
Copy link
Contributor

@ajwerner ajwerner left a comment

Choose a reason for hiding this comment

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

:lgtm:

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


pkg/upgrade/upgrades/schema_changes.go line 245 at r1 (raw file):

	storedTable, expectedTable catalog.TableDescriptor, colName string,
) (bool, error) {
	_, err := storedTable.FindColumnWithName(tree.Name(colName))

This lead to my filing #91924, but don't do anything about it here

Copy link
Collaborator

@rafiss rafiss left a comment

Choose a reason for hiding this comment

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

nice!

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @andyyang890)

@andyyang890
Copy link
Collaborator Author

TFTRs!

bors r=ajwerner,rafiss

@craig
Copy link
Contributor

craig bot commented Nov 15, 2022

Build failed (retrying...):

@craig
Copy link
Contributor

craig bot commented Nov 15, 2022

Build succeeded:

@craig craig bot merged commit 03f6062 into cockroachdb:master Nov 15, 2022
@blathers-crl
Copy link

blathers-crl bot commented Nov 15, 2022

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from 61cc346 to blathers/backport-release-22.2-91755: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 403 Resource not accessible by integration []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 22.2.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is otan.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants