From 2d851d487291ff9f7ef0a68b2702edfdff10282e Mon Sep 17 00:00:00 2001 From: charlie <3140647@qq.com> Date: Thu, 11 Apr 2024 10:45:33 +0800 Subject: [PATCH] fix error --- bloom/bloom.go | 14 +++++++++----- bloom/mem_store.go | 1 - 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/bloom/bloom.go b/bloom/bloom.go index bbc48fa..be90f29 100644 --- a/bloom/bloom.go +++ b/bloom/bloom.go @@ -5,7 +5,6 @@ import ( "math" "github.com/charlienet/go-mixed/bytesconv" - "github.com/charlienet/go-mixed/expr" "github.com/charlienet/go-mixed/hash" "github.com/charlienet/go-mixed/redis" ) @@ -58,10 +57,7 @@ func New(expectedInsertions uint, fpp float64, opts ...option) *BloomFilter { bf := &BloomFilter{ bits: bits, funcs: k, - store: expr.Ternary[bitStore]( - opt.redisClient == nil, - newMemStore(bits), - newRedisStore(opt.redisClient, opt.redisKey, bits)), + store: createBitStore(opt, bits), } return bf @@ -104,6 +100,14 @@ func (bf *BloomFilter) Clear() { bf.store.Clear() } +func createBitStore(opt *bloomOptions, bits uint) bitStore { + if opt.redisClient != nil { + return newRedisStore(opt.redisClient, opt.redisKey, bits) + } + + return newMemStore(bits) +} + // 计算优化的位图长度, // n 期望放置元素数量, // p 预期的误判概率 diff --git a/bloom/mem_store.go b/bloom/mem_store.go index 529fe75..c807668 100644 --- a/bloom/mem_store.go +++ b/bloom/mem_store.go @@ -17,7 +17,6 @@ func newMemStore(size uint) *memStore { return &memStore{ size: size, set: bitset.New(size), - lock: locker.NewRWLocker(), } }