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

cache: switch to 2q
ipfs · Aug 20, 2019 · 4733550 · 4733550
2 parents 8d6a694 + b40a71c
commit 4733550
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 88 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,6 @@ env:
   global:
     - GOTFLAGS="-race"
   matrix:
-    - BUILD_DEPTYPE=gx
     - BUILD_DEPTYPE=gomod
 
 
@@ -24,7 +23,6 @@ script:
 
 cache:
   directories:
-    - $GOPATH/src/gx
     - $GOPATH/pkg/mod
     - $HOME/.cache/go-build
 

diff --git a/Makefile b/Makefile
diff --git a/arc_cache.go b/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/bloom_cache.go b/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) {

diff --git a/package.json b/package.json