Fix data race in Items()

jellydator · Aug 24, 2024 · 2371d93 · 2371d93
1 parent 66d8e52
commit 2371d93
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/cache.go b/cache.go
@@ -469,9 +469,9 @@ func (c *Cache[K, V]) Items() map[K]*Item[K, V] {
 
 	items := make(map[K]*Item[K, V], len(c.items.values))
 	for k := range c.items.values {
-		item := c.get(k, false, false)
-		if item != nil {
-			items[k] = item.Value.(*Item[K, V])
+		item := c.items.values[k].Value.(*Item[K, V])
+		if item != nil && !item.isExpiredUnsafe() {
+			items[k] = item
 		}
 	}
 

diff --git a/cache_test.go b/cache_test.go
@@ -837,6 +837,7 @@ func Test_Cache_Keys(t *testing.T) {
 
 func Test_Cache_Items(t *testing.T) {
 	cache := prepCache(time.Hour, "1", "2", "3")
+	addToCache(cache, time.Nanosecond, "4")
 	items := cache.Items()
 	require.Len(t, items, 3)