Merge branch 'main' into dependabot/github_actions/toolmantim/release-drafter-6.1.0

Author: janisz

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: ${{matrix.go}}
         id: go

bigcache_test.go

@@ -256,7 +256,6 @@ func TestTimingEviction(t *testing.T) {
 	cache.Set("key", []byte("value"))
 
 	// when
-	clock.set(1)
 	cache.Set("key2", []byte("value2"))
 	_, err := cache.Get("key")
 
@@ -1181,7 +1180,7 @@ func TestBigCache_GetWithInfo(t *testing.T) {
 			name:     "Expired",
 			clock:    5,
 			wantData: value,
-			wantResp: Response{},
+			wantResp: Response{EntryStatus: Expired},
 		},
 		{
 			name:     "After Expired",

shard.go

@@ -286,7 +286,7 @@ func (s *cacheShard) isExpired(oldestEntry []byte, currentTimestamp uint64) bool
 	if currentTimestamp <= oldestTimestamp { // if currentTimestamp < oldestTimestamp, the result will out of uint64 limits;
 		return false
 	}
-	return currentTimestamp-oldestTimestamp > s.lifeWindow
+	return currentTimestamp-oldestTimestamp >= s.lifeWindow
 }
 
 func (s *cacheShard) cleanUp(currentTimestamp uint64) {
@@ -437,9 +437,13 @@ func initNewShard(config Config, callback onRemoveCallback, clock clock) *cacheS
 	if maximumShardSizeInBytes > 0 && bytesQueueInitialCapacity > maximumShardSizeInBytes {
 		bytesQueueInitialCapacity = maximumShardSizeInBytes
 	}
+	var hashmapStatsCapacity int
+	if config.StatsEnabled {
+		hashmapStatsCapacity = config.initialShardSize()
+	}
 	return &cacheShard{
 		hashmap:      make(map[uint64]uint64, config.initialShardSize()),
-		hashmapStats: make(map[uint64]uint32, config.initialShardSize()),
+		hashmapStats: make(map[uint64]uint32, hashmapStatsCapacity),
 		entries:      *queue.NewBytesQueue(bytesQueueInitialCapacity, maximumShardSizeInBytes, config.Verbose),
 		entryBuffer:  make([]byte, config.MaxEntrySize+headersSizeInBytes),
 		onRemove:     callback,