Skip to content

client: break loop if entry is nil #1837

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

Open
bufferflies wants to merge 1 commit into
base: master
Choose a base branch
from
Open

client: break loop if entry is nil #1837

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: 5 additions & 0 deletions internal/client/client_batch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ func (b *batchCommandsBuilder) hasHighPriorityTask() bool {
func (b *batchCommandsBuilder) buildWithLimit(limit int64, collect func(id uint64, e *batchCommandsEntry),
) (*tikvpb.BatchCommandsRequest, map[string]*tikvpb.BatchCommandsRequest) {
count := int64(0)
exhaust := false
build := func(reqs []Item) {
for _, e := range reqs {
e := e.(*batchCommandsEntry)
Expand All @@ -178,6 +179,7 @@ func (b *batchCommandsBuilder) buildWithLimit(limit int64, collect func(id uint6
batchReq.Requests = append(batchReq.Requests, e.req)
}
b.idAlloc++
exhaust = len(reqs) == 0
}
}
for (count < limit && b.entries.Len() > 0) || b.hasHighPriorityTask() {
Expand All @@ -186,6 +188,9 @@ func (b *batchCommandsBuilder) buildWithLimit(limit int64, collect func(id uint6
n = 1
}
b.entries.Take(int(n), build)
if exhaust {
break
}
}
var req *tikvpb.BatchCommandsRequest
if len(b.requests) > 0 {
Expand Down
Loading