sql/catalog/descs: consolidate uncommitted metadata into MutableCatalog #160441
+141
−99
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
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. |
Member
|
This change is |
Previously, the `descs.Collection` tracked uncommitted comments and zone configs in two separate structs (`uncommittedComments` and `uncommittedZoneConfigs`), each with their own map-based storage and cache tracking. This commit consolidates both into a single `uncommittedMetadata` struct backed by `nstree.MutableCatalog`. This approach was suggested in PR cockroachdb#105981 because MutableCatalog already provides: - Built-in lazy initialization - Memory tracking via byteSize - Unified storage for comments and zone configs The new design uses MutableCatalog for value storage and separate "absent" sets to track entries that have been looked up and found to be deleted or non-existent. This maintains the same three-state cache semantics (not cached, cached-absent, cached-with-value) while consolidating the implementation. Note: `AddUncommittedComment` now returns an error to properly propagate validation errors from `MutableCatalog.UpsertComment`. Release note: None
rafiss
force-pushed
the
uncommitted-metadata-catalog
branch
from
b4d326b to
5eeec95
Compare
fqazi
approved these changes
Jan 6, 2026
Collaborator
fqazi
left a comment
fqazi
left a comment
There was a problem hiding this comment.
@fqazi reviewed 6 files and all commit messages, and made 1 comment.
Reviewable status:complete! 1 of 0 LGTMs obtained (waiting on @rafiss).
Collaborator
Author
|
TFTR! bors r+ |
Contributor
|
Build succeeded: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, the
descs.Collectiontracked uncommitted comments and zone configs in two separate structs (uncommittedCommentsanduncommittedZoneConfigs), each with their own map-based storage and cache tracking.This commit consolidates both into a single
uncommittedMetadatastruct backed bynstree.MutableCatalog. This approach was suggested in PR #105981 because MutableCatalog already provides:The new design uses MutableCatalog for value storage and separate "absent" sets to track entries that have been looked up and found to be deleted or non-existent. This maintains the same three-state cache semantics (not cached, cached-absent, cached-with-value) while consolidating the implementation.
Note:
AddUncommittedCommentnow returns an error to properly propagate validation errors fromMutableCatalog.UpsertComment.fixes #106151
Release note: None