From c33aed616176ca133190cbd16af9cf047afbb78b Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Tue, 5 Jul 2016 15:17:52 +0200 Subject: [PATCH] blocks/blockstore: improve logic a bit License: MIT Signed-off-by: Jakub Sztandera --- blocks/blockstore/caching.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/blocks/blockstore/caching.go b/blocks/blockstore/caching.go index 9a7bf9b23413..f97e4f031179 100644 --- a/blocks/blockstore/caching.go +++ b/blocks/blockstore/caching.go @@ -26,6 +26,7 @@ func CachedBlockstore(bs GCBlockstore, if ctx == nil { ctx = context.TODO() // For tests } + cbs = bs if opts.HasBloomFilterSize < 0 || opts.HasBloomFilterHashes < 0 || opts.HasARCCacheSize < 0 || opts.BlockARCCacheSize < 0 { @@ -35,8 +36,10 @@ func CachedBlockstore(bs GCBlockstore, if opts.HasBloomFilterSize != 0 && opts.HasBloomFilterHashes == 0 { return nil, errors.New("bloom filter hash count can't be 0 when there is size set") } - cbs, err = bloomCached(bs, ctx, opts.HasBloomFilterSize, opts.HasBloomFilterHashes, - opts.HasARCCacheSize) + if opts.HasBloomFilterSize != 0 { + cbs, err = bloomCached(cbs, ctx, opts.HasBloomFilterSize, opts.HasBloomFilterHashes, + opts.HasARCCacheSize) + } return cbs, err }