Merge pull request #9156 from drmingdrmer/30-upgrade-xor

refactor(storage): upgrade xorfilter

Author: mergify[bot]

Cargo.lock

@@ -25,7 +25,7 @@ common-storages-table-meta = { path = "../table-meta" }
 
 xorfilter-rs = { git = "https://github.com/datafuse-extras/xorfilter", features = [
     "cbordata",
-], tag = "databend-alpha.1" }
+], tag = "databend-alpha.4" }
 
 anyerror = { workspace = true }
 cbordata = { version = "0.6.0" }

src/query/storages/index/Cargo.toml

@@ -34,7 +34,7 @@ use crate::SupportedType;
 ///
 /// When a filter is built, the source key set should be updated(by calling `add_keys()`), although Xor8 itself allows.
 pub struct Xor8Builder {
-    filter: Xor8,
+    builder: xorfilter::Xor8Builder,
 }
 
 pub struct Xor8Filter {
@@ -61,27 +61,27 @@ impl FilterBuilder for Xor8Builder {
     type Error = Xor8BuildingError;
 
     fn add_key<K: Hash>(&mut self, key: &K) {
-        self.filter.insert(key)
+        self.builder.insert(key)
     }
 
     fn add_keys<K: Hash>(&mut self, keys: &[K]) {
-        self.filter.populate(keys)
+        self.builder.populate(keys)
     }
 
     fn build(mut self) -> Result<Self::Filter, Self::Error> {
-        self.filter
+        let f = self
+            .builder
             .build()
             .map_err(|e| Xor8BuildingError::new(&e))?;
-        Ok(Xor8Filter {
-            filter: self.filter,
-        })
+
+        Ok(Xor8Filter { filter: f })
     }
 }
 
 impl Xor8Builder {
     pub fn create() -> Self {
         Xor8Builder {
-            filter: Xor8::default(),
+            builder: xorfilter::Xor8Builder::default(),
         }
     }
 }