Skip to content

Commit

Permalink
remove namespace cache key expiration
Browse files Browse the repository at this point in the history
  • Loading branch information
jakedt committed Dec 10, 2021
1 parent eb2e715 commit c5d6666
Showing 1 changed file with 2 additions and 16 deletions.
18 changes: 2 additions & 16 deletions internal/namespace/caching.go
Expand Up @@ -25,11 +25,6 @@ type cachingManager struct {
c *ristretto.Cache
}

type cacheEntry struct {
definition *v0.NamespaceDefinition
expiration time.Time
}

func cacheKey(nsName string, revision decimal.Decimal) string {
return fmt.Sprintf("%s@%s", nsName, revision)
}
Expand Down Expand Up @@ -75,14 +70,9 @@ func (nsc cachingManager) ReadNamespace(ctx context.Context, nsName string, revi
defer span.End()

// Check the cache.
now := time.Now()
value, found := nsc.c.Get(cacheKey(nsName, revision))
if found {
foundEntry := value.(cacheEntry)
if foundEntry.expiration.After(now) {
span.AddEvent("Returning namespace from cache")
return foundEntry.definition, nil
}
return value.(*v0.NamespaceDefinition), nil
}

// We couldn't use the cached entry, load one
Expand All @@ -98,11 +88,7 @@ func (nsc cachingManager) ReadNamespace(ctx context.Context, nsName string, revi
loaded = namespace.FilterUserDefinedMetadata(loaded)

// Save it to the cache
newEntry := cacheEntry{
definition: loaded,
expiration: now.Add(nsc.expiration),
}
nsc.c.Set(cacheKey(nsName, revision), newEntry, int64(proto.Size(loaded)))
nsc.c.Set(cacheKey(nsName, revision), loaded, int64(proto.Size(loaded)))

span.AddEvent("Saved to cache")

Expand Down

0 comments on commit c5d6666

Please sign in to comment.