Merge pull request #31 from Code-Hex/fix/issue-29

fixed clock policy algorithm around delete

Author: Code-Hex

policy/clock/clock.go

@@ -86,21 +86,20 @@ func (c *Cache[K, V]) Get(key K) (zero V, _ bool) {
 		return
 	}
 	entry := e.Value.(*entry[K, V])
-	entry.referenceCount = 1
+	entry.referenceCount++
 	return entry.val, true
 }
 
 func (c *Cache[K, V]) evict() {
-	if c.hand.Value == nil {
-		return
-	}
-	for c.hand.Value.(*entry[K, V]).referenceCount > 0 {
+	for c.hand.Value != nil && c.hand.Value.(*entry[K, V]).referenceCount > 0 {
 		c.hand.Value.(*entry[K, V]).referenceCount--
 		c.hand = c.hand.Next()
 	}
-	entry := c.hand.Value.(*entry[K, V])
-	delete(c.items, entry.key)
-	c.hand.Value = nil
+	if c.hand.Value != nil {
+		entry := c.hand.Value.(*entry[K, V])
+		delete(c.items, entry.key)
+		c.hand.Value = nil
+	}
 }
 
 // Keys returns the keys of the cache. the order as same as current ring order.
@@ -116,12 +115,10 @@ func (c *Cache[K, V]) Keys() []K {
 	// iterating
 	for p := c.head.Next(); p != r; p = p.Next() {
 		if p.Value == nil {
-			break
+			continue
 		}
 		e := p.Value.(*entry[K, V])
-		if e.referenceCount > 0 {
-			keys = append(keys, e.key)
-		}
+		keys = append(keys, e.key)
 	}
 	return keys
 }
@@ -130,7 +127,7 @@ func (c *Cache[K, V]) Keys() []K {
 func (c *Cache[K, V]) Delete(key K) {
 	if e, ok := c.items[key]; ok {
 		delete(c.items, key)
-		e.Value.(*entry[K, V]).referenceCount = 0
+		e.Value = nil
 	}
 }
 

policy/clock/clock_test.go

@@ -1,6 +1,7 @@
 package clock_test
 
 import (
+	"strconv"
 	"strings"
 	"testing"
 
@@ -123,10 +124,29 @@ func TestKeys(t *testing.T) {
 			"hoge",
 		}, ",")
 		if got2 != want2 {
-			t.Errorf("want2 %q, but got2 %q", want, got)
+			t.Errorf("want2 %q, but got2 %q", want2, got2)
 		}
 		if len(cache.Keys()) != cache.Len() {
 			t.Errorf("want2 number of keys %d, but got2 %d", len(cache.Keys()), cache.Len())
 		}
 	})
 }
+
+func TestIssue29(t *testing.T) {
+	cap := 3
+	cache := clock.NewCache[string, int](clock.WithCapacity(cap))
+	for i := 0; i < cap; i++ {
+		cache.Set(strconv.Itoa(i), i)
+	}
+	cache.Set(strconv.Itoa(cap), cap)
+
+	keys := cache.Keys()
+	if got := len(keys); cap != got {
+		t.Errorf("want number of keys %d, but got %d", cap, got)
+	}
+	wantKeys := "3,1,2"
+	gotKeys := strings.Join(keys, ",")
+	if wantKeys != gotKeys {
+		t.Errorf("want keys %q, but got keys %q", wantKeys, gotKeys)
+	}
+}