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

schemachanger: prep work ALTER DATABASE .. CONFIGURE ZONE in DSC #120362

Merged
merged 2 commits into from
May 15, 2024

Conversation

annrpom
Copy link
Contributor

@annrpom annrpom commented Mar 12, 2024

sqlerrors: move gloval var errNoZoneConfigApplies into sqlerrors package

This commit is a mechnical change that moves the gloval variable
errNoZoneConfigApplies from package sql to package sqlerrors, as
it will be used by the DSC when we support zone config in it.

Informs: #117574
Release note: None


scbuildstmt: Rerewrite a few function with better APIs

This commit cleaned up a few functions using the preferred .FilterXxx()
API to retrieve element from an element set. No functional change is
introduced.

Informs: #117574
Release note: None

Copy link

blathers-crl bot commented Mar 12, 2024

It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR?

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

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@annrpom annrpom force-pushed the alter-database-configure-zone-dsc branch 2 times, most recently from 0d4c606 to c0a39bc Compare March 12, 2024 18:18
@annrpom annrpom marked this pull request as ready for review April 1, 2024 17:07
@annrpom annrpom requested a review from a team as a code owner April 1, 2024 17:07
@annrpom annrpom requested a review from fqazi April 1, 2024 17:07
@annrpom
Copy link
Contributor Author

annrpom commented Apr 1, 2024

This some of Xiang's prep work for CONFIGURE ZONE (the parts that can be merged ahead of time to ease the review process)

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.

One minor nit

:lgtm:

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


pkg/sql/catalog/zone/zones.go line 37 at r2 (raw file):

	Field        config.Field
	RequiredType *types.T
	// Setter is used to set `Field` in the `zone config` to `datum`.

Think this needs to be in a different commit

This commit is a mechnical change that moves the gloval variable
`errNoZoneConfigApplies` from package `sql` to package `sqlerrors`, as
it will be used by the DSC when we support zone config in it.

Informs: cockroachdb#117574
Release note: None
This commit cleaned up a few functions using the preferred .FilterXxx()
API to retrieve element from an element set. No functional change is
introduced.

Informs: cockroachdb#117574
Release note: None
@annrpom annrpom force-pushed the alter-database-configure-zone-dsc branch from c0a39bc to 1d110f0 Compare May 15, 2024 16:30
@annrpom
Copy link
Contributor Author

annrpom commented May 15, 2024

had this sitting in anticipation for when db zone configs was wrapping up (personal preference) -- just rebased and addressed nit. will merge after checks are run

@annrpom
Copy link
Contributor Author

annrpom commented May 15, 2024

TFTR! ('-')7

bors r=fqazi

@craig craig bot merged commit 90af00c into cockroachdb:master May 15, 2024
22 checks passed
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.

None yet

4 participants