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.

Sign up for GitHub

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

catalog: utilize scans for a large number of descriptors #101937

Merged
merged 1 commit into from
Apr 20, 2023
Merged

catalog: utilize scans for a large number of descriptors #101937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 60 additions & 6 deletions pkg/sql/catalog/internal/catkv/catalog_reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,34 @@ func (cr catalogReader) ScanNamespaceForSchemaObjects(
}))
}

// forEachDescriptorIDSpan loops over a list of descriptor IDs and generates
// spans from them.
func forEachDescriptorIDSpan(ids []descpb.ID, spanFn func(startID descpb.ID, endID descpb.ID)) {
// Tracks the start and end of the run of descriptor ID's.
startIDSet := false
runStartID := descpb.InvalidID
runEndID := descpb.InvalidID

for _, id := range ids {
// Detect if we have a linear run of IDs, which case extend the batch.
if startIDSet && id == runEndID+1 {
runEndID = id
} else if startIDSet {
// The run has broken so emit whatever is left.
spanFn(runStartID, runEndID)
startIDSet = false
}
if !startIDSet {
startIDSet = true
runStartID = id
runEndID = id
}
}
if startIDSet {
spanFn(runStartID, runEndID)
}
}

// GetByIDs is part of the CatalogReader interface.
func (cr catalogReader) GetByIDs(
ctx context.Context,
Expand All @@ -228,18 +256,36 @@ func (cr catalogReader) GetByIDs(
isDescriptorRequired: isDescriptorRequired,
expectedType: expectedType,
}

err := cq.query(ctx, txn, &mc, func(codec keys.SQLCodec, b *kv.Batch) {
for _, id := range ids {
get(ctx, b, catalogkeys.MakeDescMetadataKey(codec, id))
for _, t := range catalogkeys.AllCommentTypes {
scan(ctx, b, catalogkeys.MakeObjectCommentsMetadataPrefix(codec, t, id))
// Attempt to generate a optimal set of requests by extracting
// a spans of descriptors when possible.
forEachDescriptorIDSpan(ids, func(startID descpb.ID, endID descpb.ID) {
// Only a single descriptor run, so generate a Get request.
if startID == endID {
get(ctx, b, catalogkeys.MakeDescMetadataKey(codec, startID))
for _, t := range catalogkeys.AllCommentTypes {
scan(ctx, b, catalogkeys.MakeObjectCommentsMetadataPrefix(codec, t, startID))
}
get(ctx, b, config.MakeZoneKey(codec, startID))
} else {
// Otherwise, generate a Scan request instead. The end key is exclusive,
// so we will need to increment the endID.
scanRange(ctx, b, catalogkeys.MakeDescMetadataKey(codec, startID),
catalogkeys.MakeDescMetadataKey(codec, endID+1))
for _, t := range catalogkeys.AllCommentTypes {
scanRange(ctx, b, catalogkeys.MakeObjectCommentsMetadataPrefix(codec, t, startID),
catalogkeys.MakeObjectCommentsMetadataPrefix(codec, t, endID+1))
}
scanRange(ctx, b, config.MakeZoneKey(codec, startID),
config.MakeZoneKey(codec, endID+1))
}
get(ctx, b, config.MakeZoneKey(codec, id))
}
})
})
if err != nil {
return nstree.Catalog{}, err
}

if isDescriptorRequired {
for _, id := range ids {
if mc.LookupDescriptor(id) == nil {
Expand Down Expand Up @@ -279,6 +325,14 @@ func get(ctx context.Context, b *kv.Batch, key roachpb.Key) {
}
}

func scanRange(ctx context.Context, b *kv.Batch, start roachpb.Key, end roachpb.Key) {
b.Header.MaxSpanRequestKeys = 0
b.Scan(start, end)
if isEventLoggingEnabled(ctx) {
log.VEventfDepth(ctx, 1, 2, "Scan Range %s %s", start, end)
}
}

func scan(ctx context.Context, b *kv.Batch, prefix roachpb.Key) {
b.Header.MaxSpanRequestKeys = 0
b.Scan(prefix, prefix.PrefixEnd())
Expand Down
40 changes: 8 additions & 32 deletions pkg/sql/catalog/internal/catkv/testdata/testdata
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,38 +159,14 @@ catalog:
"107":
descriptor: function
trace:
- Get /Table/3/1/104/2/1
- Scan /Table/24/1/0/104
- Scan /Table/24/1/1/104
- Scan /Table/24/1/2/104
- Scan /Table/24/1/3/104
- Scan /Table/24/1/4/104
- Scan /Table/24/1/5/104
- Get /Table/5/1/104/2/1
- Get /Table/3/1/105/2/1
- Scan /Table/24/1/0/105
- Scan /Table/24/1/1/105
- Scan /Table/24/1/2/105
- Scan /Table/24/1/3/105
- Scan /Table/24/1/4/105
- Scan /Table/24/1/5/105
- Get /Table/5/1/105/2/1
- Get /Table/3/1/106/2/1
- Scan /Table/24/1/0/106
- Scan /Table/24/1/1/106
- Scan /Table/24/1/2/106
- Scan /Table/24/1/3/106
- Scan /Table/24/1/4/106
- Scan /Table/24/1/5/106
- Get /Table/5/1/106/2/1
- Get /Table/3/1/107/2/1
- Scan /Table/24/1/0/107
- Scan /Table/24/1/1/107
- Scan /Table/24/1/2/107
- Scan /Table/24/1/3/107
- Scan /Table/24/1/4/107
- Scan /Table/24/1/5/107
- Get /Table/5/1/107/2/1
- Scan Range /Table/3/1/104/2/1 /Table/3/1/108/2/1
- Scan Range /Table/24/1/0/104 /Table/24/1/0/108
- Scan Range /Table/24/1/1/104 /Table/24/1/1/108
- Scan Range /Table/24/1/2/104 /Table/24/1/2/108
- Scan Range /Table/24/1/3/104 /Table/24/1/3/108
- Scan Range /Table/24/1/4/104 /Table/24/1/4/108
- Scan Range /Table/24/1/5/104 /Table/24/1/5/108
- Scan Range /Table/5/1/104/2/1 /Table/5/1/108/2/1

is_id_in_cache id=107
----
Expand Down