Merge #115805

115805: kvcoord: Remove unused function argument r=miretskiy a=miretskiy Cleanup PR to remove unused function argument. Epic: None Release note: None Co-authored-by: Yevgeniy Miretskiy <[email protected]>
cockroachdb · Jan 31, 2024 · f71b21d · f71b21d
2 parents 04dd7ea + 24aeb8c
commit f71b21d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/pkg/kv/kvclient/kvcoord/dist_sender_mux_rangefeed.go b/pkg/kv/kvclient/kvcoord/dist_sender_mux_rangefeed.go
@@ -95,7 +95,7 @@ func muxRangeFeed(
 	}
 
 	m.g.GoCtx(func(ctx context.Context) error {
-		return divideAllSpansOnRangeBoundaries(ctx, spans, m.startSingleRangeFeed, ds, &m.g)
+		return divideAllSpansOnRangeBoundaries(ctx, spans, m.startSingleRangeFeed, ds)
 	})
 
 	return errors.CombineErrors(m.g.Wait(), ctx.Err())

diff --git a/pkg/kv/kvclient/kvcoord/dist_sender_rangefeed.go b/pkg/kv/kvclient/kvcoord/dist_sender_rangefeed.go
@@ -283,17 +283,16 @@ func (ds *DistSender) RangeFeedSpans(
 
 	// Kick off the initial set of ranges.
 	g.GoCtx(func(ctx context.Context) error {
-		return divideAllSpansOnRangeBoundaries(ctx, spans, sendSingleRangeInfo(rangeCh), ds, &g)
+		return divideAllSpansOnRangeBoundaries(ctx, spans, sendSingleRangeInfo(rangeCh), ds)
 	})
 
 	return g.Wait()
 }
 
 // divideAllSpansOnRangeBoundaries divides all spans on range boundaries and invokes
-// provided onRange function for each range.  Resolution happens concurrently using provided
-// context group.
+// provided onRange function for each range.
 func divideAllSpansOnRangeBoundaries(
-	ctx context.Context, spans []SpanTimePair, onRange onRangeFn, ds *DistSender, g *ctxgroup.Group,
+	ctx context.Context, spans []SpanTimePair, onRange onRangeFn, ds *DistSender,
 ) error {
 	// Sort input spans based on their start time -- older spans first.
 	// Starting rangefeed over large number of spans is an expensive proposition,