fix: expired

Author: 陈卓涵

bigcache_test.go

@@ -219,12 +219,21 @@ func TestTimingEviction(t *testing.T) {
 		MaxEntrySize:       256,
 	}, &clock)
 
-	// when
 	cache.Set("key", []byte("value"))
-	clock.set(5)
+
+	// when
+	clock.set(1)
 	cache.Set("key2", []byte("value2"))
 	_, err := cache.Get("key")
 
+	// then
+	noError(t, err)
+
+	// when
+	clock.set(5)
+	cache.Set("key2", []byte("value2"))
+	_, err = cache.Get("key")
+
 	// then
 	assertEqual(t, ErrEntryNotFound, err)
 }
@@ -1066,22 +1075,40 @@ func TestBigCache_GetWithInfo(t *testing.T) {
 	value := "100"
 	cache.Set(key, []byte(value))
 
-	// when
-	data, resp, err := cache.GetWithInfo(key)
-
-	// then
-	assertEqual(t, []byte(value), data)
-	noError(t, err)
-	assertEqual(t, Response{}, resp)
-
-	// when
-	clock.set(5)
-	data, resp, err = cache.GetWithInfo(key)
+	for _, tc := range []struct {
+		name     string
+		clock    int64
+		wantData string
+		wantResp Response
+	}{
+		{
+			name:     "zero",
+			clock:    0,
+			wantData: value,
+			wantResp: Response{},
+		},
+		{
+			name:     "Before Expired",
+			clock:    4,
+			wantData: value,
+			wantResp: Response{},
+		},
+		{
+			name:     "Expired",
+			clock:    5,
+			wantData: value,
+			wantResp: Response{},
+		},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			clock.set(tc.clock)
+			data, resp, err := cache.GetWithInfo(key)
 
-	// then
-	assertEqual(t, err, nil)
-	assertEqual(t, Response{EntryStatus: Expired}, resp)
-	assertEqual(t, []byte(value), data)
+			assertEqual(t, []byte(tc.wantData), data)
+			noError(t, err)
+			assertEqual(t, tc.wantResp, resp)
+		})
+	}
 }
 
 type mockedLogger struct {

shard.go

@@ -50,12 +50,11 @@ func (s *cacheShard) getWithInfo(key string, hashedKey uint64) (entry []byte, re
 	}
 
 	entry = readEntry(wrappedEntry)
-	oldestTimeStamp := readTimestampFromEntry(wrappedEntry)
-	s.lock.RUnlock()
-	s.hit(hashedKey)
-	if currentTime-oldestTimeStamp >= s.lifeWindow {
+	if s.isExpired(wrappedEntry, currentTime) {
 		resp.EntryStatus = Expired
 	}
+	s.lock.RUnlock()
+	s.hit(hashedKey)
 	return entry, resp, nil
 }
 
@@ -268,17 +267,21 @@ func (s *cacheShard) del(hashedKey uint64) error {
 }
 
 func (s *cacheShard) onEvict(oldestEntry []byte, currentTimestamp uint64, evict func(reason RemoveReason) error) bool {
-	oldestTimestamp := readTimestampFromEntry(oldestEntry)
-	if currentTimestamp < oldestTimestamp {
-		return false
-	}
-	if currentTimestamp-oldestTimestamp > s.lifeWindow {
+	if s.isExpired(oldestEntry, currentTimestamp) {
 		evict(Expired)
 		return true
 	}
 	return false
 }
 
+func (s *cacheShard) isExpired(oldestEntry []byte, currentTimestamp uint64) bool {
+	oldestTimestamp := readTimestampFromEntry(oldestEntry)
+	if currentTimestamp <= oldestTimestamp { // if currentTimestamp < oldestTimestamp, the result will out of uint64 limits;
+		return false
+	}
+	return currentTimestamp-oldestTimestamp > s.lifeWindow
+}
+
 func (s *cacheShard) cleanUp(currentTimestamp uint64) {
 	s.lock.Lock()
 	for {