Merge pull request ipfs/go-ipfs-blockstore#20 from ipfs/fix/use-2q

cache: switch to 2q This commit was moved from ipfs/go-ipfs-blockstore@4733550
ipfs · Aug 20, 2019 · 65c2816 · 65c2816
2 parents ea3c527 + d507153
commit 65c2816
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/blockstore/Makefile b/blockstore/Makefile
diff --git a/blockstore/arc_cache.go b/blockstore/arc_cache.go
@@ -16,15 +16,15 @@ type cacheSize int
 // block Cids. This provides block access-time improvements, allowing
 // to short-cut many searches without query-ing the underlying datastore.
 type arccache struct {
-	arc        *lru.ARCCache
+	arc        *lru.TwoQueueCache
 	blockstore Blockstore
 
 	hits  metrics.Counter
 	total metrics.Counter
 }
 
 func newARCCachedBS(ctx context.Context, bs Blockstore, lruSize int) (*arccache, error) {
-	arc, err := lru.NewARC(lruSize)
+	arc, err := lru.New2Q(lruSize)
 	if err != nil {
 		return nil, err
 	}

diff --git a/blockstore/bloom_cache.go b/blockstore/bloom_cache.go
@@ -148,7 +148,7 @@ func (b *bloomcache) Has(k cid.Cid) (bool, error) {
 }
 
 func (b *bloomcache) GetSize(k cid.Cid) (int, error) {
-  return b.blockstore.GetSize(k)
+	return b.blockstore.GetSize(k)
 }
 
 func (b *bloomcache) Get(k cid.Cid) (blocks.Block, error) {