Skip overwritten entries.

Author: andreiavrammsd

fastcache.go

@@ -350,24 +350,28 @@ func (b *bucket) Del(h uint64) {
 
 func (b *bucket) VisitAllEntries(f func(k, v []byte) error) error {
 	b.mu.RLock()
-	for _, idx := range b.m {
-		idx &= (1 << bucketSizeBits) - 1
-		chunkIdx := idx / chunkSize
-		chunk := b.chunks[chunkIdx]
+	for _, v := range b.m {
+		idx := v & ((1 << bucketSizeBits) - 1)
+		gen := v >> bucketSizeBits
+
+		if gen == b.gen && idx < b.idx || gen+1 == b.gen && idx >= b.idx {
+			chunkIdx := idx / chunkSize
+			chunk := b.chunks[chunkIdx]
 
-		kvLenBuf := chunk[idx : idx+4]
-		keyLen := (uint64(kvLenBuf[0]) << 8) | uint64(kvLenBuf[1])
-		valLen := (uint64(kvLenBuf[2]) << 8) | uint64(kvLenBuf[3])
+			kvLenBuf := chunk[idx : idx+4]
+			keyLen := (uint64(kvLenBuf[0]) << 8) | uint64(kvLenBuf[1])
+			valLen := (uint64(kvLenBuf[2]) << 8) | uint64(kvLenBuf[3])
 
-		idx += 4
-		key := chunk[idx : idx+keyLen : idx+keyLen]
+			idx += 4
+			key := chunk[idx : idx+keyLen : idx+keyLen]
 
-		idx += keyLen
-		value := chunk[idx : idx+valLen : idx+valLen]
+			idx += keyLen
+			value := chunk[idx : idx+valLen : idx+valLen]
 
-		if err := f(key, value); err != nil {
-			b.mu.RUnlock()
-			return err
+			if err := f(key, value); err != nil {
+				b.mu.RUnlock()
+				return err
+			}
 		}
 	}
 	b.mu.RUnlock()