Updated bloom filters to use whole record

1 files changed, 6 insertions, 6 deletions

diff --git a/include/shard/TrieSpline.h b/include/shard/TrieSpline.h
index 349f41a..1588507 100644
--- a/include/shard/TrieSpline.h
+++ b/include/shard/TrieSpline.h
@@ -73,7 +73,7 @@ public:
         assert(alloc_size % CACHELINE_SIZE == 0);
         m_data = (Wrapped<R>*)std::aligned_alloc(CACHELINE_SIZE, alloc_size);
 
-        m_bf = new BloomFilter<K>(BF_FPR, buffer->get_tombstone_count(), BF_HASH_FUNCS);
+        m_bf = new BloomFilter<R>(BF_FPR, buffer->get_tombstone_count(), BF_HASH_FUNCS);
 
         size_t offset = 0;
         m_reccnt = 0;
@@ -116,7 +116,7 @@ public:
 
             if (m_bf && base->is_tombstone()) {
                 m_tombstone_cnt++;
-                m_bf->insert(base->rec.key);
+                m_bf->insert(base->rec);
             }
             
             base++;
@@ -158,7 +158,7 @@ public:
             }
         }
 
-        m_bf = new BloomFilter<K>(BF_FPR, tombstone_count, BF_HASH_FUNCS);
+        m_bf = new BloomFilter<R>(BF_FPR, tombstone_count, BF_HASH_FUNCS);
         auto bldr = ts::Builder<K>(m_min_key, m_max_key, g_max_error);
 
         size_t alloc_size = (attemp_reccnt * sizeof(Wrapped<R>)) + (CACHELINE_SIZE - (attemp_reccnt * sizeof(Wrapped<R>)) % CACHELINE_SIZE);
@@ -183,7 +183,7 @@ public:
                     bldr.AddKey(cursor.ptr->rec.key);
                     if (m_bf && cursor.ptr->is_tombstone()) {
                         ++m_tombstone_cnt;
-                        if (m_bf) m_bf->insert(cursor.ptr->rec.key);
+                        if (m_bf) m_bf->insert(cursor.ptr->rec);
                     }
                 }
                 pq.pop();
@@ -204,7 +204,7 @@ public:
     }
 
     Wrapped<R> *point_lookup(const R &rec, bool filter=false) {
-        if (filter && !m_bf->lookup(rec.key)) {
+        if (filter && !m_bf->lookup(rec)) {
             return nullptr;
         }
 
@@ -285,7 +285,7 @@ private:
     K m_max_key;
     K m_min_key;
     ts::TrieSpline<K> m_ts;
-    BloomFilter<K> *m_bf;
+    BloomFilter<R> *m_bf;
 };