remove panic

Author: dsa0x

bloom.go

@@ -161,35 +161,35 @@ func NewBloom(opts *BloomOptions) *BloomFilter {
 }
 
 // Add adds the key to the bloom filter
-func (bf *BloomFilter) Add(key []byte) {
+func (bf *BloomFilter) Add(key []byte) error {
 	bf.lock.Lock()
 	defer bf.lock.Unlock()
 
 	indices := bf.candidates(string(key))
 
 	if bf.count >= bf.capacity {
-		log.Panicf("BloomFilter has reached full capacity %d", bf.capacity)
+		return fmt.Errorf("BloomFilter has reached full capacity %d", bf.capacity)
 	}
 
 	for i := 0; i < len(indices); i++ {
 		idx, mask := bf.getBitIndexN(indices[i])
 
 		if int(idx) >= len(bf.mem) {
-			panic("Error finding key: Index out of bounds")
+			return fmt.Errorf("Error finding key: Index out of bounds")
 		}
 
 		// set the bit at mask position of the byte at idx
 		// e.g. if idx = 2 and mask = 01000000, set the bit at 2nd position of byte 2
 		bf.mem[idx] |= mask
 	}
 	bf.count++
-
+	return nil
 }
 
 // Put adds the key to the bloom filter, and also stores it in the persistent store
 func (bf *BloomFilter) Put(key, val []byte) error {
 	if !bf.hasStore() {
-		fmt.Errorf("BloomFilter does not have a store, use Add() to add keys")
+		return fmt.Errorf("BloomFilter does not have a store, use Add() to add keys")
 	}
 
 	bf.Add(key)
@@ -204,7 +204,7 @@ func (bf *BloomFilter) Contains(key []byte) bool {
 		idx, mask := bf.getBitIndexN(indices[i])
 
 		if int(idx) >= len(bf.mem) {
-			panic("Error finding key: Index out of bounds")
+			return false
 		}
 		bit := bf.mem[idx]
 

scalable_bloom.go

@@ -91,6 +91,7 @@ func (sbf *ScalableBloomFilter) add(key []byte) {
 	for i := 0; i < len(indices); i++ {
 		idx, mask := bf.getBitIndexN(indices[i])
 		if int(idx) >= bf.bit_width {
+			// this should not happen
 			panic("Error adding key: Index out of bounds")
 		}
 		bf.mem[bf.pageOffset+int(idx)] |= mask
@@ -124,7 +125,7 @@ func (sbf *ScalableBloomFilter) contains(bf *BloomFilter, key []byte) bool {
 		idx, mask := bf.getBitIndexN(indices[i])
 
 		if int(idx) >= bf.bit_width {
-			panic("Error finding key: Index out of bounds")
+			return false
 		}
 		if bit := topFilter.mem[bf.pageOffset+int(idx)]; bit&mask == 0 {
 			return false