upgrading upstream to 2.0.0

this now includes ->Size and contains a breaking change on serialisation format therefore binfuse must also make a breaking change
oschonrock · Jan 29, 2025 · 8732348 · 8732348
1 parent ddac531
commit 8732348
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/ext/xor_singleheader b/ext/xor_singleheader
diff --git a/include/binfuse/filter.hpp b/include/binfuse/filter.hpp
@@ -113,7 +113,11 @@ class filter {
     return ftype<FilterType>::contains(needle, &fil_);
   }
 
-  [[nodiscard]] bool is_populated() const { return fil_.SegmentCount > 0; }
+  [[nodiscard]] std::size_t size() const {
+    return static_cast<std::size_t>(fil_.Size);
+  }
+
+  [[nodiscard]] bool is_populated() const { return size() > 0; }
 
   [[nodiscard]] std::size_t serialization_bytes() const {
     // upstream API should be const

diff --git a/include/binfuse/sharded_filter.hpp b/include/binfuse/sharded_filter.hpp
@@ -55,9 +55,9 @@ class sharded_filter : private sharded_mmap_base<AccessMode> {
   }
 
   [[nodiscard]] bool contains(std::uint64_t needle) const {
-    auto prefix = extract_prefix(needle);
+    const auto prefix = extract_prefix(needle);
     // we know prefix is always < max_shards() by definition
-    auto& filter = filters[prefix];
+    const auto& filter = filters[prefix];
     if (!filter.is_populated()) {
       // this filter has not been populated. no fingerprint pointer
       // has been set and an upstream `contain` call will throw

diff --git a/test/data/sharded_filter8_tiny.bin b/test/data/sharded_filter8_tiny.bin
diff --git a/test/filter.cpp b/test/filter.cpp
@@ -25,6 +25,7 @@ TEST(binfuse_filter, construct_from_upstream) { // NOLINT
 
   binfuse::filter8 filter(std::move(fil)); // NOLINT not trivial
   EXPECT_TRUE(filter.is_populated());
+  EXPECT_EQ(filter.size(), 3);
   EXPECT_TRUE(filter.contains(0x0000000000000000));
   EXPECT_TRUE(filter.contains(0x0000000000000001));
   EXPECT_TRUE(filter.contains(0x0000000000000002));
+1 −1		CMakeLists.txt
+41 −19		README.md
+3 −0		benchmarks/CMakeLists.txt
+119 −0		benchmarks/spaceusage.c
+131 −2		include/binaryfusefilter.h
+104 −0		include/xorfilter.h
+2 −2		tests/CMakeLists.txt
+175 −13		tests/unit.c