tidy: move predicate into typed general predicate

saido-labs · Oct 10, 2024 · db7883e · db7883e
1 parent e76743a
commit db7883e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 19 deletions.
diff --git a/api/search.go b/api/search.go
@@ -13,15 +13,34 @@ func (s SegmentPath) Valid() bool {
 	return true
 }
 
-func findLowestSegmentWithNearbyTimestamp(paths []string, target int64, pred func(offs uint64, ts int64) bool) int {
+type SegmentLookupPred func(u uint64, ts int64) bool
+
+func SegmentByTimestamp(store ObjectStore, topic string, partition uint32) SegmentLookupPred {
+	return func(u uint64, ts int64) bool {
+		key := SegmentName(topic, partition, u).Format(SegmentTimeIndex)
+		data, err := store.Get(key)
+		if err != nil {
+			return false
+		}
+
+		index := TimeIndexFromBytes(data)
+		if len(index) == 0 {
+			panic("empty index")
+		}
+
+		return ts >= index[0].Timestamp
+	}
+}
+
+func findLowestSegmentWithNearbyTimestamp(paths []string, target int64, pred SegmentLookupPred) int {
 	sp := parseSegmentPaths(paths)
 
 	l, r := 0, len(sp)-1
 	best := -1
 
 	for l <= r {
 		mid := l + ((r - l) / 2)
-		if pred(sp[mid], int64(target)) {
+		if pred(sp[mid], target) {
 			l = mid + 1
 			best = mid
 		} else {

diff --git a/api/search_test.go b/api/search_test.go
@@ -47,25 +47,9 @@ func Test_findOffsetByTimestamp(t *testing.T) {
 	}))
 	assert.NoError(t, err)
 
-	pred := func(u uint64, ts int64) bool {
-		key := SegmentName("orders", 0, u).Format(SegmentTimeIndex)
-		data, err := store.Get(key)
-		if err != nil {
-			return false
-		}
-
-		index := TimeIndexFromBytes(data)
-		if len(index) == 0 {
-			panic("empty index")
-		}
-
-		return ts >= index[0].Timestamp
-	}
-
+	pred := SegmentByTimestamp(store, "orders", 0)
 	timestamp := int64(0x10)
-
 	best := findLowestSegmentWithNearbyTimestamp(segmentsList, timestamp, pred)
-
 	assert.Equal(t, 1, best)
 }