Skip to content

Commit a5c1153

Browse files
Thomas StrombergThomas Stromberg
authored andcommitted
datastore: fix flush semantics, upgrade ds9
1 parent 0079525 commit a5c1153

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

pkg/persist/datastore/datastore.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,11 +261,11 @@ func (p *store[K, V]) Cleanup(ctx context.Context, maxAge time.Duration) (int, e
261261
// Flush removes all entries from Datastore.
262262
// Returns the number of entries removed and any error.
263263
func (p *store[K, V]) Flush(ctx context.Context) (int, error) {
264-
// Query for all keys
264+
// Query for all keys (use empty slice for mock compatibility)
265265
query := ds.NewQuery(p.kind).KeysOnly()
266266

267-
var entries []entry
268-
keys, err := p.client.GetAll(ctx, query, &entries)
267+
var dst []entry
268+
keys, err := p.client.GetAll(ctx, query, &dst)
269269
if err != nil {
270270
return 0, fmt.Errorf("query all entries: %w", err)
271271
}
@@ -285,7 +285,8 @@ func (p *store[K, V]) Flush(ctx context.Context) (int, error) {
285285
// Len returns the number of entries in Datastore.
286286
func (p *store[K, V]) Len(ctx context.Context) (int, error) {
287287
query := ds.NewQuery(p.kind).KeysOnly()
288-
keys, err := p.client.GetAll(ctx, query, nil)
288+
var dst []entry
289+
keys, err := p.client.GetAll(ctx, query, &dst)
289290
if err != nil {
290291
return 0, fmt.Errorf("query all entries: %w", err)
291292
}

pkg/persist/datastore/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/codeGROOVE-dev/sfcache/pkg/persist/datastore
33
go 1.25.4
44

55
require (
6+
github.com/codeGROOVE-dev/ds9 v0.7.2
67
github.com/codeGROOVE-dev/sfcache/pkg/persist v0.0.0
7-
github.com/codeGROOVE-dev/ds9 v0.7.1
88
)
99

1010
replace github.com/codeGROOVE-dev/sfcache/pkg/persist => ..

pkg/persist/datastore/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github.com/codeGROOVE-dev/ds9 v0.7.1 h1:UuffbTksanUPERBkOsiPOe46fkTJlzBOA9jUyfkBxEI=
2-
github.com/codeGROOVE-dev/ds9 v0.7.1/go.mod h1:0UDipxF1DADfqM5GtjefgB2u+EXdDgOKmxVvrSGLHoM=
1+
github.com/codeGROOVE-dev/ds9 v0.7.2 h1:Jm+/L/1ACG18lF2SimmgmGu977ocwUebfb2o5AAKeU0=
2+
github.com/codeGROOVE-dev/ds9 v0.7.2/go.mod h1:0UDipxF1DADfqM5GtjefgB2u+EXdDgOKmxVvrSGLHoM=

0 commit comments

Comments
 (0)