consistent terminology

Author: Thomas Stromberg

persistent_test.go

@@ -206,7 +206,7 @@ func TestPersistentCache_Basic(t *testing.T) {
 	// Verify it's in persistence
 	val, _, found, err := store.Get(ctx, "key1")
 	if err != nil {
-		t.Fatalf("store.Load: %v", err)
+		t.Fatalf("store.Get: %v", err)
 	}
 	if !found {
 		t.Error("key1 should be persisted")
@@ -222,7 +222,7 @@ func TestPersistentCache_Basic(t *testing.T) {
 
 	_, _, found, err = store.Get(ctx, "key1")
 	if err != nil {
-		t.Fatalf("store.Load after delete: %v", err)
+		t.Fatalf("store.Get after delete: %v", err)
 	}
 	if found {
 		t.Error("key1 should be deleted from persistence")
@@ -336,7 +336,7 @@ func TestPersistentCache_SetAsync(t *testing.T) {
 	// Should also be persisted
 	val, _, found, err = store.Get(ctx, "key1")
 	if err != nil {
-		t.Fatalf("store.Load: %v", err)
+		t.Fatalf("store.Get: %v", err)
 	}
 	if !found || val != 42 {
 		t.Error("key1 should be persisted after SetAsync")
@@ -733,7 +733,7 @@ func TestPersistentCache_GetOrSet(t *testing.T) {
 	// Value should be persisted
 	persistedVal, _, found, err := store.Get(ctx, "key1")
 	if err != nil {
-		t.Fatalf("store.Load: %v", err)
+		t.Fatalf("store.Get: %v", err)
 	}
 	if !found || persistedVal != 42 {
 		t.Error("key1 should be persisted")
@@ -907,14 +907,14 @@ func TestPersistentCache_SetAsync_VariadicTTL(t *testing.T) {
 	// Both should be persisted
 	_, _, found, err = store.Get(ctx, "async-default")
 	if err != nil {
-		t.Fatalf("store.Load: %v", err)
+		t.Fatalf("store.Get: %v", err)
 	}
 	if !found {
 		t.Error("async-default should be persisted")
 	}
 	_, _, found, err = store.Get(ctx, "async-explicit")
 	if err != nil {
-		t.Fatalf("store.Load: %v", err)
+		t.Fatalf("store.Get: %v", err)
 	}
 	if !found {
 		t.Error("async-explicit should be persisted")

pkg/persist/cloudrun/cloudrun_test.go

@@ -88,18 +88,18 @@ func TestNew_BasicOperations(t *testing.T) {
 
 	err = p.Set(ctx, key, value, time.Time{})
 	if err != nil {
-		t.Fatalf("Store() failed: %v", err)
+		t.Fatalf("Set() failed: %v", err)
 	}
 
 	got, _, found, err := p.Get(ctx, key)
 	if err != nil {
-		t.Fatalf("Load() failed: %v", err)
+		t.Fatalf("Get() failed: %v", err)
 	}
 	if !found {
-		t.Fatal("Load() should find stored value")
+		t.Fatal("Get() should find stored value")
 	}
 	if got != value {
-		t.Errorf("Load() = %v, want %v", got, value)
+		t.Errorf("Get() = %v, want %v", got, value)
 	}
 }
 
@@ -242,7 +242,7 @@ func TestNew_CloudRunFallbackWithDelete(t *testing.T) {
 
 	// Store and delete
 	if err := p.Set(ctx, "key1", 100, time.Time{}); err != nil {
-		t.Fatalf("Store() failed: %v", err)
+		t.Fatalf("Set() failed: %v", err)
 	}
 
 	if err := p.Delete(ctx, "key1"); err != nil {
@@ -252,7 +252,7 @@ func TestNew_CloudRunFallbackWithDelete(t *testing.T) {
 	// Verify deleted
 	_, _, found, err := p.Get(ctx, "key1")
 	if err != nil {
-		t.Fatalf("Load() failed: %v", err)
+		t.Fatalf("Get() failed: %v", err)
 	}
 	if found {
 		t.Error("key should be deleted")

pkg/persist/datastore/datastore.go

@@ -18,15 +18,15 @@ const (
 	maxDatastoreKeyLen = 1500 // Datastore has stricter key length limits
 )
 
-// datastorePersist implements PersistenceLayer using Google Cloud Datastore.
-type persister[K comparable, V any] struct {
+// store implements Store using Google Cloud Datastore.
+type store[K comparable, V any] struct {
 	client *ds.Client
 	kind   string
 }
 
 // ValidateKey checks if a key is valid for Datastore persistence.
 // Datastore has stricter key length limits than files.
-func (*persister[K, V]) ValidateKey(key K) error {
+func (*store[K, V]) ValidateKey(key K) error {
 	s := fmt.Sprintf("%v", key)
 	if len(s) > maxDatastoreKeyLen {
 		return fmt.Errorf("key too long: %d bytes (max %d for datastore)", len(s), maxDatastoreKeyLen)
@@ -38,9 +38,9 @@ func (*persister[K, V]) ValidateKey(key K) error {
 }
 
 // Location returns the Datastore key path for a given cache key.
-// Implements the PersistenceLayer interface Location() method.
+// Implements the Store interface Location() method.
 // Format: "kind/key" (e.g., "CacheEntry/mykey").
-func (p *persister[K, V]) Location(key K) string {
+func (p *store[K, V]) Location(key K) string {
 	return fmt.Sprintf("%s/%v", p.kind, key)
 }
 
@@ -66,22 +66,22 @@ func New[K comparable, V any](ctx context.Context, cacheID string) (persist.Stor
 	// Verify connectivity (assert readiness)
 	// Note: ds9 doesn't expose Ping, but client creation validates connectivity
 
-	return &persister[K, V]{
+	return &store[K, V]{
 		client: client,
 		kind:   datastoreKind,
 	}, nil
 }
 
 // makeKey creates a Datastore key from a cache key.
 // We use the string representation directly as the key name.
-func (p *persister[K, V]) makeKey(key K) *ds.Key {
+func (p *store[K, V]) makeKey(key K) *ds.Key {
 	return ds.NameKey(p.kind, fmt.Sprintf("%v", key), nil)
 }
 
 // Get retrieves a value from Datastore.
 //
 //nolint:revive // function-result-limit - required by persist.Store interface
-func (p *persister[K, V]) Get(ctx context.Context, key K) (value V, expiry time.Time, found bool, err error) {
+func (p *store[K, V]) Get(ctx context.Context, key K) (value V, expiry time.Time, found bool, err error) {
 	var zero V
 	dsKey := p.makeKey(key)
 
@@ -114,7 +114,7 @@ func (p *persister[K, V]) Get(ctx context.Context, key K) (value V, expiry time.
 }
 
 // Set saves a value to Datastore.
-func (p *persister[K, V]) Set(ctx context.Context, key K, value V, expiry time.Time) error {
+func (p *store[K, V]) Set(ctx context.Context, key K, value V, expiry time.Time) error {
 	dsKey := p.makeKey(key)
 
 	// Encode value as JSON then base64
@@ -138,7 +138,7 @@ func (p *persister[K, V]) Set(ctx context.Context, key K, value V, expiry time.T
 }
 
 // Delete removes a value from Datastore.
-func (p *persister[K, V]) Delete(ctx context.Context, key K) error {
+func (p *store[K, V]) Delete(ctx context.Context, key K) error {
 	dsKey := p.makeKey(key)
 
 	if err := p.client.Delete(ctx, dsKey); err != nil {
@@ -149,7 +149,7 @@ func (p *persister[K, V]) Delete(ctx context.Context, key K) error {
 }
 
 // LoadRecent streams entries from Datastore, returning up to 'limit' most recently updated entries.
-func (p *persister[K, V]) LoadRecent(ctx context.Context, limit int) (entries <-chan persist.Entry[K, V], errs <-chan error) {
+func (p *store[K, V]) LoadRecent(ctx context.Context, limit int) (entries <-chan persist.Entry[K, V], errs <-chan error) {
 	entryCh := make(chan persist.Entry[K, V], 100)
 	errCh := make(chan error, 1)
 
@@ -230,7 +230,7 @@ func (p *persister[K, V]) LoadRecent(ctx context.Context, limit int) (entries <-
 // Cleanup removes expired entries from Datastore.
 // maxAge specifies how old entries must be (based on expiry field) before deletion.
 // If native Datastore TTL is properly configured, this will find no entries.
-func (p *persister[K, V]) Cleanup(ctx context.Context, maxAge time.Duration) (int, error) {
+func (p *store[K, V]) Cleanup(ctx context.Context, maxAge time.Duration) (int, error) {
 	cutoff := time.Now().Add(-maxAge)
 
 	// Query for entries with expiry before cutoff
@@ -260,7 +260,7 @@ func (p *persister[K, V]) Cleanup(ctx context.Context, maxAge time.Duration) (in
 
 // Flush removes all entries from Datastore.
 // Returns the number of entries removed and any error.
-func (p *persister[K, V]) Flush(ctx context.Context) (int, error) {
+func (p *store[K, V]) Flush(ctx context.Context) (int, error) {
 	// Query for all keys
 	query := ds.NewQuery(p.kind).KeysOnly()
 
@@ -283,7 +283,7 @@ func (p *persister[K, V]) Flush(ctx context.Context) (int, error) {
 }
 
 // Len returns the number of entries in Datastore.
-func (p *persister[K, V]) Len(ctx context.Context) (int, error) {
+func (p *store[K, V]) Len(ctx context.Context) (int, error) {
 	query := ds.NewQuery(p.kind).KeysOnly()
 	keys, err := p.client.GetAll(ctx, query, nil)
 	if err != nil {
@@ -293,6 +293,6 @@ func (p *persister[K, V]) Len(ctx context.Context) (int, error) {
 }
 
 // Close releases Datastore client resources.
-func (p *persister[K, V]) Close() error {
+func (p *store[K, V]) Close() error {
 	return p.client.Close()
 }