remove mutex

Author: AskAlexSharov

v2/binarymarshaler.go

@@ -45,24 +45,21 @@ func (c *counter) Write(p []byte) (n int, err error) {
 // MarshallToWriter marshalls the filter into the given io.Writer
 // Binary layout (Little Endian):
 //
-//	 k	1 uint64
-//	 n	1 uint64
-//	 m	1 uint64
-//	 keys	[k]uint64
-//	 bits	[(m+63)/64]uint64
-//	 hash	sha384 (384 bits == 48 bytes)
-//
-//	 size = (3 + k + (m+63)/64) * 8 bytes
+//	k	1 uint64
+//	n	1 uint64
+//	m	1 uint64
+//	keys	[k]uint64
+//	bits	[(m+63)/64]uint64
+//	hash	sha384 (384 bits == 48 bytes)
 //
+//	size = (3 + k + (m+63)/64) * 8 bytes
 func (f *Filter) MarshallToWriter(out io.Writer) (int, [sha512.Size384]byte, error) {
 	var (
 		c      = &counter{0}
 		hasher = sha512.New384()
 		mw     = io.MultiWriter(out, hasher, c)
 		hash   [sha512.Size384]byte
 	)
-	f.lock.RLock()
-	defer f.lock.RUnlock()
 
 	if _, err := mw.Write(headerMagic); err != nil {
 		return c.bytes, hash, err

v2/binaryunmarshaler.go

@@ -98,9 +98,6 @@ func (f *Filter) UnmarshalBinary(data []byte) (err error) {
 }
 
 func (f *Filter) UnmarshalFromReader(input io.Reader) (n int64, err error) {
-	f.lock.Lock()
-	defer f.lock.Unlock()
-
 	buf := &hashingReader{
 		reader: input,
 		hasher: sha512.New384(),

v2/bloomfilter.go

@@ -18,7 +18,6 @@ package v2
 import (
 	"errors"
 	"hash"
-	"sync"
 )
 
 var (
@@ -27,7 +26,6 @@ var (
 
 // Filter is an opaque Bloom filter type
 type Filter struct {
-	lock sync.RWMutex
 	bits []uint64
 	keys []uint64
 	m    uint64 // number of bits the "bits" field should recognize
@@ -58,8 +56,6 @@ const rotation = 17
 // Adds an already hashes item to the filter.
 // Identical to Add (but slightly faster)
 func (f *Filter) AddHash(hash uint64) {
-	f.lock.Lock()
-	defer f.lock.Unlock()
 	var (
 		i uint64
 	)
@@ -74,8 +70,6 @@ func (f *Filter) AddHash(hash uint64) {
 // ContainsHash tests if f contains the (already hashed) key
 // Identical to Contains but slightly faster
 func (f *Filter) ContainsHash(hash uint64) bool {
-	f.lock.RLock()
-	defer f.lock.RUnlock()
 	var (
 		i uint64
 		r = uint64(1)
@@ -97,9 +91,6 @@ func (f *Filter) Contains(v hash.Hash64) bool {
 
 // Copy f to a new Bloom filter
 func (f *Filter) Copy() (*Filter, error) {
-	f.lock.RLock()
-	defer f.lock.RUnlock()
-
 	out, err := f.NewCompatible()
 	if err != nil {
 		return nil, err
@@ -115,9 +106,6 @@ func (f *Filter) UnionInPlace(f2 *Filter) error {
 		return errors.New("incompatible bloom filters")
 	}
 
-	f.lock.Lock()
-	defer f.lock.Unlock()
-
 	for i, bitword := range f2.bits {
 		f.bits[i] |= bitword
 	}
@@ -132,9 +120,6 @@ func (f *Filter) Union(f2 *Filter) (out *Filter, err error) {
 		return nil, errors.New("incompatible bloom filters")
 	}
 
-	f.lock.RLock()
-	defer f.lock.RUnlock()
-
 	out, err = f.NewCompatible()
 	if err != nil {
 		return nil, err

v2/fileio.go

@@ -30,8 +30,6 @@ func (f *Filter) ReadFrom(r io.Reader) (n int64, err error) {
 	if err != nil {
 		return -1, err
 	}
-	f.lock.Lock()
-	defer f.lock.Unlock()
 	f.m = f2.m
 	f.n = f2.n
 	f.bits = f2.bits
@@ -68,9 +66,6 @@ func ReadFile(filename string) (f *Filter, n int64, err error) {
 
 // WriteTo a Writer w from lossless-compressed Bloom Filter f
 func (f *Filter) WriteTo(w io.Writer) (n int64, err error) {
-	f.lock.RLock()
-	defer f.lock.RUnlock()
-
 	rawW := gzip.NewWriter(w)
 	defer rawW.Close()
 

v2/iscompatible.go

@@ -26,12 +26,6 @@ func noBranchCompareUint64s(b0, b1 []uint64) uint64 {
 
 // IsCompatible is true if f and f2 can be Union()ed together
 func (f *Filter) IsCompatible(f2 *Filter) bool {
-	f.lock.RLock()
-	defer f.lock.RUnlock()
-
-	f2.lock.RLock()
-	defer f2.lock.RUnlock()
-
 	// 0 is true, non-0 is false
 	compat := f.M() ^ f2.M()
 	compat |= f.K() ^ f2.K()

v2/statistics.go

@@ -31,22 +31,18 @@ func CountBitsUint64s(b []uint64) int {
 
 // PreciseFilledRatio is an exhaustive count # of 1's
 func (f *Filter) PreciseFilledRatio() float64 {
-	f.lock.RLock()
-	defer f.lock.RUnlock()
 	return float64(CountBitsUint64s(f.bits)) / float64(f.M())
 }
 
 // N is how many elements have been inserted
 // (actually, how many Add()s have been performed?)
 func (f *Filter) N() uint64 {
-	f.lock.RLock()
-	defer f.lock.RUnlock()
-
 	return f.n
 }
 
 // FalsePosititveProbability is the upper-bound probability of false positives
-//  (1 - exp(-k*(n+0.5)/(m-1))) ** k
+//
+//	(1 - exp(-k*(n+0.5)/(m-1))) ** k
 func (f *Filter) FalsePosititveProbability() float64 {
 	k := float64(f.K())
 	n := float64(f.N())