perf

Author: julienrbrt

block/internal/cache/pending_base.go

@@ -87,13 +87,9 @@ func (pb *pendingBase[T]) getPending(ctx context.Context) ([]T, error) {
 	}
 
 	pb.inFlightMu.Lock()
-	claims := slices.Clone(pb.inFlightClaims)
-	gaps := slices.Clone(pb.gaps)
+	rangeStart, rangeEnd := findAvailableRange(pb.gaps, pb.inFlightClaims, lastSubmitted, storeHeight)
 	pb.inFlightMu.Unlock()
 
-	// Determine the first contiguous unclaimed range.
-	// Priority: gaps (failed ranges below lastHeight), then items above lastHeight.
-	rangeStart, rangeEnd := findAvailableRange(gaps, claims, lastSubmitted, storeHeight)
 	if rangeStart == 0 || rangeStart > rangeEnd {
 		return nil, nil
 	}
@@ -103,30 +99,18 @@ func (pb *pendingBase[T]) getPending(ctx context.Context) ([]T, error) {
 		rangeEnd = rangeStart + uint64(DefaultPendingCacheSize) - 1
 	}
 
-	// Fetch items not already in cache
+	pending := make([]T, 0, rangeEnd-rangeStart+1)
 	for h := rangeStart; h <= rangeEnd; h++ {
-		if _, ok := pb.pendingCache.Peek(h); ok {
+		if item, ok := pb.pendingCache.Get(h); ok {
+			pending = append(pending, item)
 			continue
 		}
 		item, err := pb.fetch(ctx, pb.store, h)
 		if err != nil {
-			return nil, err
+			return pending, err
 		}
 		pb.pendingCache.Add(h, item)
-	}
-
-	pending := make([]T, 0, rangeEnd-rangeStart+1)
-	for h := rangeStart; h <= rangeEnd; h++ {
-		if item, ok := pb.pendingCache.Get(h); ok {
-			pending = append(pending, item)
-		} else {
-			item, err := pb.fetch(ctx, pb.store, h)
-			if err != nil {
-				return pending, err
-			}
-			pb.pendingCache.Add(h, item)
-			pending = append(pending, item)
-		}
+		pending = append(pending, item)
 	}
 
 	if len(pending) > 0 {
@@ -146,24 +130,17 @@ func (pb *pendingBase[T]) numPending() uint64 {
 		return 0
 	}
 
-	pb.inFlightMu.Lock()
-	claims := slices.Clone(pb.inFlightClaims)
-	gaps := slices.Clone(pb.gaps)
-	pb.inFlightMu.Unlock()
-
 	lastSubmitted := pb.lastHeight.Load()
 
+	pb.inFlightMu.Lock()
 	var count uint64
-
-	// Count gap items not covered by claims
-	for _, gap := range gaps {
-		count += countUnclaimed(gap.start, gap.end, claims)
+	for _, gap := range pb.gaps {
+		count += countUnclaimed(gap.start, gap.end, pb.inFlightClaims)
 	}
-
-	// Count items above lastHeight not covered by claims
 	if height > lastSubmitted {
-		count += countUnclaimed(lastSubmitted+1, height, claims)
+		count += countUnclaimed(lastSubmitted+1, height, pb.inFlightClaims)
 	}
+	pb.inFlightMu.Unlock()
 
 	return count
 }
@@ -199,16 +176,17 @@ func (pb *pendingBase[T]) resetInFlightRange(start, end uint64) {
 	defer pb.inFlightMu.Unlock()
 
 	var removedClaim *inFlightClaim
-	newClaims := make([]inFlightClaim, 0, len(pb.inFlightClaims))
+	n := 0
 	for _, c := range pb.inFlightClaims {
 		if c.end < start || c.start > end {
-			newClaims = append(newClaims, c)
+			pb.inFlightClaims[n] = c
+			n++
 		} else {
 			cc := c
 			removedClaim = &cc
 		}
 	}
-	pb.inFlightClaims = newClaims
+	pb.inFlightClaims = pb.inFlightClaims[:n]
 
 	currentLast := pb.lastHeight.Load()