spanset: remove unused bool return value

Epic: none
Release note: none

Author: pav-kv

pkg/kv/kvserver/spanset/merge.go

@@ -7,15 +7,13 @@ package spanset
 
 import "slices"
 
-// mergeSpans sorts the given spans and merges ones with overlapping
-// spans and equal access timestamps. The implementation is a copy of
-// roachpb.MergeSpans.
+// mergeSpans sorts the given spans and merges ones with overlapping spans and
+// equal access timestamps. The implementation is a modified roachpb.MergeSpans.
 //
-// Returns true iff all of the spans are distinct.
 // The input spans are not safe for re-use.
-func mergeSpans(latches []Span) ([]Span, bool) {
+func mergeSpans(latches []Span) []Span {
 	if len(latches) == 0 {
-		return latches, true
+		return latches
 	}
 
 	// Sort first on the start key and second on the end key. Note that we're
@@ -31,7 +29,6 @@ func mergeSpans(latches []Span) ([]Span, bool) {
 	// because "r" grows by at most 1 element on each iteration, staying abreast
 	// or behind the iteration over "latches".
 	r := latches[:1]
-	distinct := true
 
 	for _, cur := range latches[1:] {
 		prev := &r[len(r)-1]
@@ -44,7 +41,6 @@ func mergeSpans(latches []Span) ([]Span, bool) {
 				if cur.Timestamp != prev.Timestamp {
 					r = append(r, cur)
 				}
-				distinct = false
 			}
 			continue
 		}
@@ -56,7 +52,6 @@ func mergeSpans(latches []Span) ([]Span, bool) {
 				} else {
 					prev.EndKey = cur.EndKey
 				}
-				distinct = false
 			} else {
 				// [a, nil] merge [b, c]
 				r = append(r, cur)
@@ -73,15 +68,11 @@ func mergeSpans(latches []Span) ([]Span, bool) {
 					} else {
 						prev.EndKey = cur.EndKey
 					}
-					if c > 0 {
-						distinct = false
-					}
 				} else {
 					// [a, c] merge [b, c]
 					if cur.Timestamp != prev.Timestamp {
 						r = append(r, cur)
 					}
-					distinct = false
 				}
 			} else if c == 0 {
 				// [a, b] merge [b, nil]
@@ -94,11 +85,10 @@ func mergeSpans(latches []Span) ([]Span, bool) {
 				if cur.Timestamp != prev.Timestamp {
 					r = append(r, cur)
 				}
-				distinct = false
 			}
 			continue
 		}
 		r = append(r, cur)
 	}
-	return r, distinct
+	return r
 }

pkg/kv/kvserver/spanset/spanset.go

@@ -216,7 +216,7 @@ func (s *SpanSet) Merge(s2 *SpanSet) {
 func (s *SpanSet) SortAndDedup() {
 	for sa := SpanAccess(0); sa < NumSpanAccess; sa++ {
 		for ss := SpanScope(0); ss < NumSpanScope; ss++ {
-			s.spans[sa][ss], _ /* distinct */ = mergeSpans(s.spans[sa][ss])
+			s.spans[sa][ss] = mergeSpans(s.spans[sa][ss])
 		}
 	}
 }