Skip to content

Commit

Permalink
Fix FindMinSnapshotByGeneration() loop ref bug
Browse files Browse the repository at this point in the history
  • Loading branch information
benbjohnson committed Dec 5, 2021
1 parent 1e68789 commit 393317b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
6 changes: 4 additions & 2 deletions litestream.go
Original file line number Diff line number Diff line change
Expand Up @@ -207,11 +207,13 @@ func FilterSnapshotsAfter(a []SnapshotInfo, t time.Time) []SnapshotInfo {
// FindMinSnapshotByGeneration finds the snapshot with the lowest index in a generation.
func FindMinSnapshotByGeneration(a []SnapshotInfo, generation string) *SnapshotInfo {
var min *SnapshotInfo
for _, snapshot := range a {
for i := range a {
snapshot := &a[i]

if snapshot.Generation != generation {
continue
} else if min == nil || snapshot.Index < min.Index {
min = &snapshot
min = snapshot
}
}
return min
Expand Down
10 changes: 10 additions & 0 deletions litestream_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,16 @@ func TestWALSegmentPath(t *testing.T) {
})
}

func TestFindMinSnapshotByGeneration(t *testing.T) {
infos := []litestream.SnapshotInfo{
{Generation: "29cf4bced74e92ab", Index: 0},
{Generation: "5dfeb4aa03232553", Index: 24},
}
if got, want := litestream.FindMinSnapshotByGeneration(infos, "29cf4bced74e92ab"), &infos[0]; got != want {
t.Fatalf("info=%#v, want %#v", got, want)
}
}

func MustDecodeHexString(s string) []byte {
b, err := hex.DecodeString(s)
if err != nil {
Expand Down

0 comments on commit 393317b

Please sign in to comment.