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

concurrency: do not partition locks in the lock table by span scope #102503

Merged
merged 1 commit into from
Apr 28, 2023
Merged

concurrency: do not partition locks in the lock table by span scope #102503

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
5 changes: 0 additions & 5 deletions pkg/kv/kvserver/batcheval/cmd_query_locks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,7 @@ func QueryLocks(
reply := resp.(*kvpb.QueryLocksResponse)

concurrencyManager := cArgs.EvalCtx.GetConcurrencyManager()
keyScope := spanset.SpanGlobal
if keys.IsLocal(args.Key) {
keyScope = spanset.SpanLocal
}
opts := concurrency.QueryLockTableOptions{
KeyScope: keyScope,
MaxLocks: h.MaxSpanRequestKeys,
TargetBytes: h.TargetBytes,
IncludeUncontended: args.IncludeUncontended,
Expand Down
1 change: 0 additions & 1 deletion pkg/kv/kvserver/concurrency/concurrency_control.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,6 @@ type Error = kvpb.Error

// QueryLockTableOptions bundles the options for the QueryLockTableState function.
type QueryLockTableOptions struct {
KeyScope spanset.SpanScope
MaxLocks int64
TargetBytes int64
IncludeUncontended bool
Expand Down
Loading