add EntriesCount to stats

phuslu · Mar 19, 2024 · 8152e22 · 8152e22
1 parent 7d80b4d
commit 8152e22
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 12 deletions.
diff --git a/lru_cache.go b/lru_cache.go
@@ -141,12 +141,15 @@ func (c *LRUCache[K, V]) AppendKeys(keys []K) []K {
 // Stats returns cache stats.
 func (c *LRUCache[K, V]) Stats() (stats Stats) {
 	for i := uint32(0); i <= c.mask; i++ {
-		c.shards[i].mu.Lock()
-		s := c.shards[i].stats
-		c.shards[i].mu.Unlock()
-		stats.GetCalls += s.getcalls
-		stats.SetCalls += s.setcalls
-		stats.Misses += s.misses
+		s := &c.shards[i]
+		s.mu.Lock()
+		sl := s.table.length
+		ss := s.stats
+		s.mu.Unlock()
+		stats.EntriesCount += uint64(sl)
+		stats.GetCalls += ss.getcalls
+		stats.SetCalls += ss.setcalls
+		stats.Misses += ss.misses
 	}
 	return
 }
diff --git a/lru_cache_test.go b/lru_cache_test.go
@@ -298,6 +298,9 @@ func TestLRUCacheStats(t *testing.T) {
 	cache.Set("d", 3)
 
 	stats := cache.Stats()
+	if got, want := stats.EntriesCount, uint64(4); got != want {
+		t.Fatalf("cache entries should be %v: %v", want, got)
+	}
 	if got, want := stats.GetCalls, uint64(0); got != want {
 		t.Fatalf("cache get calls should be %v: %v", want, got)
 	}
@@ -316,6 +319,9 @@ func TestLRUCacheStats(t *testing.T) {
 	cache.Set("c", 13)
 
 	stats = cache.Stats()
+	if got, want := stats.EntriesCount, uint64(4); got != want {
+		t.Fatalf("cache entries should be %v: %v", want, got)
+	}
 	if got, want := stats.GetCalls, uint64(5); got != want {
 		t.Fatalf("cache get calls should be %v: %v", want, got)
 	}

diff --git a/stats.go b/stats.go
@@ -10,4 +10,7 @@ type Stats struct {
 
 	// Misses is the number of cache misses.
 	Misses uint64
+
+	// EntriesCount is the current number of entries in the cache.
+	EntriesCount uint64
 }
diff --git a/ttl_cache.go b/ttl_cache.go
@@ -139,12 +139,15 @@ func (c *TTLCache[K, V]) AppendKeys(keys []K) []K {
 // Stats returns cache stats.
 func (c *TTLCache[K, V]) Stats() (stats Stats) {
 	for i := uint32(0); i <= c.mask; i++ {
-		c.shards[i].mu.Lock()
-		s := c.shards[i].stats
-		c.shards[i].mu.Unlock()
-		stats.GetCalls += s.getcalls
-		stats.SetCalls += s.setcalls
-		stats.Misses += s.misses
+		s := &c.shards[i]
+		s.mu.Lock()
+		sl := s.table.length
+		ss := s.stats
+		s.mu.Unlock()
+		stats.EntriesCount += uint64(sl)
+		stats.GetCalls += ss.getcalls
+		stats.SetCalls += ss.setcalls
+		stats.Misses += ss.misses
 	}
 	return
 }
diff --git a/ttl_cache_test.go b/ttl_cache_test.go
@@ -352,6 +352,9 @@ func TestTTLCacheStats(t *testing.T) {
 	cache.Set("d", 3, 2*time.Second)
 
 	stats := cache.Stats()
+	if got, want := stats.EntriesCount, uint64(4); got != want {
+		t.Fatalf("cache entries should be %v: %v", want, got)
+	}
 	if got, want := stats.GetCalls, uint64(0); got != want {
 		t.Fatalf("cache get calls should be %v: %v", want, got)
 	}
@@ -370,6 +373,9 @@ func TestTTLCacheStats(t *testing.T) {
 	cache.Set("c", 13, 3*time.Second)
 
 	stats = cache.Stats()
+	if got, want := stats.EntriesCount, uint64(4); got != want {
+		t.Fatalf("cache entries should be %v: %v", want, got)
+	}
 	if got, want := stats.GetCalls, uint64(5); got != want {
 		t.Fatalf("cache get calls should be %v: %v", want, got)
 	}