Merge pull request #266 from blampe/blampe/ttl

ristretto: return correct ttl

store/ristretto/ristretto.go

@@ -20,6 +20,7 @@ const (
 // RistrettoClientInterface represents a dgraph-io/ristretto client
 type RistrettoClientInterface interface {
 	Get(key any) (any, bool)
+	GetTTL(key any) (time.Duration, bool)
 	SetWithTTL(key, value any, cost int64, ttl time.Duration) bool
 	Del(key any)
 	Clear()
@@ -55,7 +56,11 @@ func (s *RistrettoStore) Get(_ context.Context, key any) (any, error) {
 // GetWithTTL returns data stored from a given key and its corresponding TTL
 func (s *RistrettoStore) GetWithTTL(ctx context.Context, key any) (any, time.Duration, error) {
 	value, err := s.Get(ctx, key)
-	return value, 0, err
+	if err != nil {
+		return value, 0, err
+	}
+	ttl, _ := s.client.GetTTL(key)
+	return value, ttl, nil
 }
 
 // Set defines data in Ristretto memory cache for given key identifier

store/ristretto/ristretto_test.go

@@ -80,6 +80,7 @@ func TestRistrettoGetWithTTL(t *testing.T) {
 
 	client := NewMockRistrettoClientInterface(ctrl)
 	client.EXPECT().Get(cacheKey).Return(cacheValue, true)
+	client.EXPECT().GetTTL(cacheKey).Return(time.Minute, true)
 
 	store := NewRistretto(client)
 
@@ -89,7 +90,7 @@ func TestRistrettoGetWithTTL(t *testing.T) {
 	// Then
 	assert.Nil(t, err)
 	assert.Equal(t, cacheValue, value)
-	assert.Equal(t, 0*time.Second, ttl)
+	assert.Equal(t, time.Minute, ttl)
 }
 
 func TestRistrettoGetWithTTLWhenError(t *testing.T) {