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

nstree: fix Catalog namespace validation error messages #93726

Merged
merged 1 commit into from
Dec 20, 2022

Conversation

postamar
Copy link
Contributor

These mention draining names, but draining names have been removed two major versions ago.

Fixes #93724.

Release note: None

@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 all commit messages.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @postamar)


pkg/sql/catalog/nstree/catalog.go line 260 at r1 (raw file):

	switch ne.GetID() {
	case descpb.InvalidID:
		return errors.New("zero descriptor ID")

I always associate invalid with zero, but both languages are fine. Don't feel strongly about it either way.

@postamar postamar marked this pull request as ready for review December 15, 2022 18:52
@postamar postamar requested a review from a team December 15, 2022 18:52
@postamar postamar requested a review from a team as a code owner December 15, 2022 18:52
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 7 of 7 files at r2.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @postamar)

@postamar
Copy link
Contributor Author

Thanks for your review!

bors r+

@craig
Copy link
Contributor

craig bot commented Dec 15, 2022

Build failed (retrying...):

@craig
Copy link
Contributor

craig bot commented Dec 16, 2022

Build failed (retrying...):

@craig
Copy link
Contributor

craig bot commented Dec 16, 2022

Build failed:

These mention draining names, but draining names have been removed two
major versions ago.

Fixes cockroachdb#93724.

Release note: None
@postamar
Copy link
Contributor Author

bors r+

4th time's the charm

@craig
Copy link
Contributor

craig bot commented Dec 20, 2022

Build succeeded:

@craig craig bot merged commit 2bdff7b into cockroachdb:master Dec 20, 2022
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.

sql: crdb_internal.invalid_objects can mention draining names
3 participants