fix: dont build bloom filter if bits = -1

Cargo.toml

@@ -2,7 +2,7 @@
 name = "lsm-tree"
 description = "A K.I.S.S. implementation of log-structured merge trees (LSM-trees/LSMTs)"
 license = "MIT OR Apache-2.0"
-version = "2.3.0"
+version = "2.3.2"
 edition = "2021"
 rust-version = "1.74.0"
 readme = "README.md"

src/compaction/worker.rs

@@ -21,9 +21,6 @@ use std::{
     time::Instant,
 };
 
-#[cfg(feature = "bloom")]
-use crate::segment::writer::BloomConstructionPolicy;
-
 /// Compaction options
 pub struct Options {
     pub tree_id: TreeId,
@@ -181,8 +178,7 @@ fn merge_segments(
 
     #[cfg(feature = "bloom")]
     {
-        // TODO: BUG: BloomConstructionPolicy::default is 10 BPK, so setting to 0 or -1
-        // will still write bloom filters
+        use crate::segment::writer::BloomConstructionPolicy;
 
         if opts.config.bloom_bits_per_key >= 0 {
             // NOTE: Apply some MONKEY to have very high FPR on small levels
@@ -197,6 +193,9 @@ fn merge_segments(
             };
 
             segment_writer = segment_writer.use_bloom_policy(bloom_policy);
+        } else {
+            segment_writer =
+                segment_writer.use_bloom_policy(BloomConstructionPolicy::BitsPerKey(0));
         }
     }
 

src/segment/inner.rs

@@ -8,9 +8,6 @@ use super::{
 use crate::{block_cache::BlockCache, descriptor_table::FileDescriptorTable, tree::inner::TreeId};
 use std::sync::Arc;
 
-#[cfg(feature = "bloom")]
-use crate::bloom::{BloomFilter, CompositeHash};
-
 pub struct Inner {
     pub(crate) tree_id: TreeId,
 
@@ -36,5 +33,5 @@ pub struct Inner {
     /// Bloom filter
     #[cfg(feature = "bloom")]
     #[doc(hidden)]
-    pub bloom_filter: Option<BloomFilter>,
+    pub bloom_filter: Option<crate::bloom::BloomFilter>,
 }

src/tree/mod.rs

@@ -152,12 +152,17 @@ impl AbstractTree for Tree {
 
         #[cfg(feature = "bloom")]
         {
+            use crate::segment::writer::BloomConstructionPolicy;
+
             if self.config.bloom_bits_per_key >= 0 {
                 segment_writer = segment_writer.use_bloom_policy(
                     // TODO: increase to 0.00001 when https://github.com/fjall-rs/lsm-tree/issues/63
                     // is fixed
-                    crate::segment::writer::BloomConstructionPolicy::FpRate(0.0001),
+                    BloomConstructionPolicy::FpRate(0.0001),
                 );
+            } else {
+                segment_writer =
+                    segment_writer.use_bloom_policy(BloomConstructionPolicy::BitsPerKey(0));
             }
         }