Merge pull request #127 from input-output-hk/bloom-cleanup

Refactor bloomfilter sublibrary
IntersectMBO · Mar 19, 2024 · 0a8b9ec · 0a8b9ec
2 parents 599ca64 + 232a776
commit 0a8b9ec
Show file tree

Hide file tree

Showing 35 changed files with 1,395 additions and 1,022 deletions.
diff --git a/bench/macro/Bench/Database/LSMTree/Internal/BloomFilter.hs b/bench/macro/Bench/Database/LSMTree/Internal/BloomFilter.hs
@@ -230,7 +230,7 @@ benchMakeCheapHashes !_  !_   0 = ()
 benchMakeCheapHashes !bs !rng !n =
     let k :: Word256
         (!k, !rng') = uniform rng
-        !kh = Bloom.makeCheapHashes (serialiseKey k)
+        !kh = Bloom.makeHashes (serialiseKey k) :: Bloom.CheapHashes SerialisedKey
      in kh `seq` benchMakeCheapHashes bs rng' (n-1)
 
 -- | This gives us a combined cost of calculating the series of keys, their
@@ -240,7 +240,7 @@ benchElemCheapHashes !_  !_   0  = ()
 benchElemCheapHashes !bs !rng !n =
     let k :: Word256
         (!k, !rng') = uniform rng
-        !kh =  Bloom.makeCheapHashes (serialiseKey k)
-     in foldl' (\_ b -> Bloom.elemCheapHashes kh b `seq` ()) () bs
+        !kh =  Bloom.makeHashes (serialiseKey k)
+     in foldl' (\_ b -> Bloom.elemHashes kh b `seq` ()) () bs
   `seq` benchElemCheapHashes bs rng' (n-1)
 
diff --git a/bloomfilter/CHANGELOG.md b/bloomfilter/CHANGELOG.md
diff --git a/bloomfilter/Data/BloomFilter.hs b/bloomfilter/Data/BloomFilter.hs