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

adapter: Update ObjectId to handle catalog schema #18762

Merged
merged 8 commits into from
Apr 18, 2023

Conversation

jkosh44
Copy link
Contributor

@jkosh44 jkosh44 commented Apr 13, 2023

This commit updates the ObjectId enum so that it can be used for catalog schemas.

Motivation

  • This PR refactors existing code.

Checklist

  • This PR has adequate test coverage / QA involvement has been duly considered.
  • This PR has an associated up-to-date design doc, is a design doc (template), or is sufficiently small to not require a design.
  • This PR evolves an existing $T ⇔ Proto$T mapping (possibly in a backwards-incompatible way) and therefore is tagged with a T-proto label.
  • If this PR will require changes to cloud orchestration, there is a companion cloud PR to account for those changes that is tagged with the release-blocker label (example).
  • This PR includes the following user-facing behavior changes:

This commit updates the ObjectId enum so that it can be used for
catalog schemas.
@jkosh44 jkosh44 requested a review from a team as a code owner April 13, 2023 19:01
@@ -319,7 +319,7 @@ pub struct RevokeRoleV1 {
pub struct SchemaV1 {
pub id: String,
pub name: String,
pub database_name: String,
pub database_name: Option<String>,
Copy link
Contributor

Choose a reason for hiding this comment

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

The intention was that changes of this form would require making a SchemaV2: update all current creators to produce v2s, but the v1 struct could still be read off disk.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just updated this to use a V2

…ect-id-schemas

# Conflicts:
#	src/adapter/src/catalog.rs
#	src/adapter/src/catalog/storage.rs
#	src/adapter/src/rbac.rs
@jkosh44 jkosh44 enabled auto-merge (squash) April 18, 2023 14:45
@jkosh44 jkosh44 disabled auto-merge April 18, 2023 14:51
@umanwizard umanwizard force-pushed the object-id-schemas branch 2 times, most recently from e3867f6 to a51aeb5 Compare April 18, 2023 15:00
@jkosh44 jkosh44 enabled auto-merge (squash) April 18, 2023 16:11
@jkosh44 jkosh44 merged commit 274338c into MaterializeInc:main Apr 18, 2023
@jkosh44 jkosh44 deleted the object-id-schemas branch April 18, 2023 16:38
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

2 participants