Merge #157093

craig[bot] · yuzefovich · craig[bot] · commit 3b4cf41fb37c · 2025-11-10T18:17:23.000Z
157093: kvstreamer: avoid sorting single request r=yuzefovich a=yuzefovich

Epic: None
Release note: None

Co-authored-by: Yahor Yuzefovich &lt;yahor@cockroachlabs.com&gt;
diff --git a/pkg/kv/kvclient/kvstreamer/streamer.go b/pkg/kv/kvclient/kvstreamer/streamer.go
@@ -718,7 +718,7 @@ func (s *Streamer) Enqueue(ctx context.Context, reqs []kvpb.RequestUnion) (retEr
 		}
 		totalReqsMemUsage += r.reqsReservedBytes + r.overheadAccountedFor
 
-		if s.mode == OutOfOrder {
+		if s.mode == OutOfOrder && len(r.reqs) > 1 {
 			// Sort all single-range requests to be in the key order.
 			// TODO(yuzefovich): we should be able to sort not head-of-the-line
 			// request in the InOrder mode too; however, there would be

Original file line number	Diff line number	Diff line change
`@@ -718,7 +718,7 @@ func (s *Streamer) Enqueue(ctx context.Context, reqs []kvpb.RequestUnion) (retEr`
`718`	`718`	`}`
`719`	`719`	`totalReqsMemUsage += r.reqsReservedBytes + r.overheadAccountedFor`
`720`	`720`
`721`		`- if s.mode == OutOfOrder {`
	`721`	`+ if s.mode == OutOfOrder && len(r.reqs) > 1 {`
`722`	`722`	`// Sort all single-range requests to be in the key order.`
`723`	`723`	`// TODO(yuzefovich): we should be able to sort not head-of-the-line`
`724`	`724`	`// request in the InOrder mode too; however, there would be`