catalog/descs: use btrees to store leased descriptors #51997
Conversation
This commit introduces a type `leasedDescriptors` to wrap the slice of leased descriptors, with methods for accessing descriptors and adding and removing them. Release note: None
This commit replaces the internal representation of `leasedDescriptors` in the descriptor collection with a pair of btrees, to support faster resolution of descriptors by name and ID. Release note: None
|
This change is |
| toRelease = append(toRelease, i.(descriptorWithID).Descriptor) | ||
| return true | ||
| }) | ||
| ld.byName.Clear(true) |
There was a problem hiding this comment.
[nit] add a comment for these true arguments
| @@ -58,6 +181,10 @@ func MakeCollection( | |||
| dbCacheSubscriber DatabaseCacheSubscriber, | |||
| ) Collection { | |||
| return Collection{ | |||
| leasedDescriptors: leasedDescriptors{ | |||
| byName: btree.New(2), | |||
There was a problem hiding this comment.
How did you pick this degree (not that I have a suggestion for another value)
There was a problem hiding this comment.
Reviewed 1 of 1 files at r2.
Reviewable status:complete! 1 of 0 LGTMs obtained (waiting on @lucy-zhang)
pkg/sql/catalog/descs/collection.go, line 52 at r2 (raw file):
immutable catalog.Descriptor }
This ends up being pretty crufty, huh.
pkg/sql/catalog/descs/collection.go, line 130 at r2 (raw file):
func (ld *leasedDescriptors) releaseAll() (toRelease []catalog.Descriptor) { defer ld.assertConsistency() ld.byID.Ascend(func(i btree.Item) bool {
total nit: preallocate toRelease
pkg/sql/catalog/descs/collection.go, line 139 at r2 (raw file):
} func (ld *leasedDescriptors) release(ids []sqlbase.ID) (toRelease []catalog.Descriptor) {
consider changing this API now to just take one at a time as there isn't really an efficiency win in terms of algorithmic performance given the sorting and this will allow you to avoid allocating the ids slice and the cruft that went with it.
This commit replaces the internal representation of
leasedDescriptorsin the descriptor collection with a pair of btrees, to support faster
resolution of descriptors by name and ID.
The first commit is #51996.
Release note: None