From 9c8be2f2deecb2a7f3483863b6126d05948260e2 Mon Sep 17 00:00:00 2001
From: ppom <reaction@ppom.me>
Date: Wed, 14 May 2025 12:00:00 +0200
Subject: [PATCH] Working db rewrite using fjall

---
 Cargo.lock                             | 548 +------------------------
 Cargo.toml                             |   2 -
 src/daemon/filter.rs                   | 147 ++++---
 src/daemon/filter/tests.rs             |  64 ++-
 src/daemon/{heedext.rs => fjallext.rs} | 173 ++++----
 src/daemon/mod.rs                      |  14 +-
 src/tests.rs                           |  20 +-
 7 files changed, 189 insertions(+), 779 deletions(-)
 rename src/daemon/{heedext.rs => fjallext.rs} (51%)

diff --git a/Cargo.lock b/Cargo.lock
index ceccccf..6753912 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -136,20 +136,11 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
 [[package]]
 name = "bitflags"
 version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
-dependencies = [
- "serde",
-]
 
 [[package]]
 name = "bumpalo"
@@ -288,15 +279,6 @@ version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
-[[package]]
-name = "crc32fast"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "crossbeam-epoch"
 version = "0.9.18"
@@ -306,15 +288,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "crossbeam-queue"
-version = "0.3.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
-dependencies = [
- "crossbeam-utils",
-]
-
 [[package]]
 name = "crossbeam-skiplist"
 version = "0.1.3"
@@ -342,18 +315,7 @@ dependencies = [
  "hashbrown 0.14.5",
  "lock_api",
  "once_cell",
- "parking_lot_core 0.9.10",
-]
-
-[[package]]
-name = "displaydoc"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.82",
+ "parking_lot_core",
 ]
 
 [[package]]
@@ -362,15 +324,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0d05e1c0dbad51b52c38bda7adceef61b9efc2baf04acfe8726a8c4630a6f57"
 
-[[package]]
-name = "doxygen-rs"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "415b6ec780d34dcf624666747194393603d0373b7141eef01d12ee58881507d9"
-dependencies = [
- "phf",
-]
-
 [[package]]
 name = "enum_dispatch"
 version = "0.3.13"
@@ -422,25 +375,6 @@ dependencies = [
  "xxhash-rust",
 ]
 
-[[package]]
-name = "form_urlencoded"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "fs2"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
-dependencies = [
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "futures"
 version = "0.3.31"
@@ -530,15 +464,6 @@ dependencies = [
  "slab",
 ]
 
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.15"
@@ -580,44 +505,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
-[[package]]
-name = "heed"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a56c94661ddfb51aa9cdfbf102cfcc340aa69267f95ebccc4af08d7c530d393"
-dependencies = [
- "bitflags 2.9.0",
- "byteorder",
- "heed-traits",
- "heed-types",
- "libc",
- "lmdb-master-sys",
- "once_cell",
- "page_size",
- "serde",
- "synchronoise",
- "url",
-]
-
-[[package]]
-name = "heed-traits"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3130048d404c57ce5a1ac61a903696e8fcde7e8c2991e9fcfc1f27c3ef74ff"
-
-[[package]]
-name = "heed-types"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c255bdf46e07fb840d120a36dcc81f385140d7191c76a7391672675c01a55d"
-dependencies = [
- "bincode",
- "byteorder",
- "heed-traits",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "hermit-abi"
 version = "0.3.9"
@@ -647,145 +534,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "icu_collections"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
-dependencies = [
- "displaydoc",
- "yoke",
- "zerofrom",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
-dependencies = [
- "displaydoc",
- "litemap",
- "tinystr",
- "writeable",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_locid_transform_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform_data"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d"
-
-[[package]]
-name = "icu_normalizer"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
-dependencies = [
- "displaydoc",
- "icu_collections",
- "icu_normalizer_data",
- "icu_properties",
- "icu_provider",
- "smallvec",
- "utf16_iter",
- "utf8_iter",
- "write16",
- "zerovec",
-]
-
-[[package]]
-name = "icu_normalizer_data"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7"
-
-[[package]]
-name = "icu_properties"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
-dependencies = [
- "displaydoc",
- "icu_collections",
- "icu_locid_transform",
- "icu_properties_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_properties_data"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2"
-
-[[package]]
-name = "icu_provider"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_provider_macros",
- "stable_deref_trait",
- "tinystr",
- "writeable",
- "yoke",
- "zerofrom",
- "zerovec",
-]
-
-[[package]]
-name = "icu_provider_macros"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.82",
-]
-
-[[package]]
-name = "idna"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
-dependencies = [
- "idna_adapter",
- "smallvec",
- "utf8_iter",
-]
-
-[[package]]
-name = "idna_adapter"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
-dependencies = [
- "icu_normalizer",
- "icu_properties",
-]
-
 [[package]]
 name = "indexmap"
 version = "2.6.0"
@@ -796,15 +544,6 @@ dependencies = [
  "hashbrown 0.15.0",
 ]
 
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "interval-heap"
 version = "0.0.5"
@@ -866,7 +605,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn 1.0.109",
- "synstructure 0.12.6",
+ "synstructure",
 ]
 
 [[package]]
@@ -936,23 +675,6 @@ version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
-[[package]]
-name = "litemap"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856"
-
-[[package]]
-name = "lmdb-master-sys"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "864808e0b19fb6dd3b70ba94ee671b82fce17554cf80aeb0a155c65bb08027df"
-dependencies = [
- "cc",
- "doxygen-rs",
- "libc",
-]
-
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -1038,7 +760,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags",
  "cfg-if",
  "cfg_aliases",
  "libc",
@@ -1094,27 +816,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
-[[package]]
-name = "page_size"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d5b2194ed13191c1999ae0704b7839fb18384fa22e49b57eeaa97d79ce40da"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core 0.8.6",
-]
-
 [[package]]
 name = "parking_lot"
 version = "0.12.3"
@@ -1122,21 +823,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.9.10",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
-dependencies = [
- "cfg-if",
- "instant",
- "libc",
- "redox_syscall 0.2.16",
- "smallvec",
- "winapi",
+ "parking_lot_core",
 ]
 
 [[package]]
@@ -1147,7 +834,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.5.7",
+ "redox_syscall",
  "smallvec",
  "windows-targets",
 ]
@@ -1203,54 +890,6 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c719dcf55f09a3a7e764c6649ab594c18a177e3599c467983cdf644bfc0a4088"
 
-[[package]]
-name = "percent-encoding"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
-
-[[package]]
-name = "phf"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
-dependencies = [
- "phf_macros",
- "phf_shared",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
-dependencies = [
- "phf_shared",
- "rand",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"
-dependencies = [
- "phf_generator",
- "phf_shared",
- "proc-macro2",
- "quote",
- "syn 2.0.82",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
-dependencies = [
- "siphasher",
-]
-
 [[package]]
 name = "pin-project-lite"
 version = "0.2.14"
@@ -1341,7 +980,6 @@ dependencies = [
  "clap_mangen",
  "fjall",
  "futures",
- "heed",
  "jrsonnet-evaluator",
  "nix",
  "num_cpus",
@@ -1350,7 +988,6 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_yaml",
- "sled",
  "tempfile",
  "thiserror",
  "timer",
@@ -1360,22 +997,13 @@ dependencies = [
  "tracing-subscriber",
 ]
 
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags 1.3.2",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags",
 ]
 
 [[package]]
@@ -1437,7 +1065,7 @@ version = "0.38.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -1531,12 +1159,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "siphasher"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
-
 [[package]]
 name = "slab"
 version = "0.4.9"
@@ -1546,22 +1168,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "sled"
-version = "0.34.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f96b4737c2ce5987354855aed3797279def4ebf734436c6aa4552cf8e169935"
-dependencies = [
- "crc32fast",
- "crossbeam-epoch",
- "crossbeam-utils",
- "fs2",
- "fxhash",
- "libc",
- "log",
- "parking_lot 0.11.2",
-]
-
 [[package]]
 name = "smallvec"
 version = "1.13.2"
@@ -1578,12 +1184,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
 [[package]]
 name = "std-semaphore"
 version = "0.1.0"
@@ -1618,15 +1218,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "synchronoise"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dbc01390fc626ce8d1cffe3376ded2b72a11bb70e1c75f404a210e4daa4def2"
-dependencies = [
- "crossbeam-queue",
-]
-
 [[package]]
 name = "synstructure"
 version = "0.12.6"
@@ -1639,17 +1230,6 @@ dependencies = [
  "unicode-xid",
 ]
 
-[[package]]
-name = "synstructure"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.82",
-]
-
 [[package]]
 name = "tempfile"
 version = "3.13.0"
@@ -1702,16 +1282,6 @@ dependencies = [
  "chrono",
 ]
 
-[[package]]
-name = "tinystr"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
-dependencies = [
- "displaydoc",
- "zerovec",
-]
-
 [[package]]
 name = "tokio"
 version = "1.40.0"
@@ -1722,7 +1292,7 @@ dependencies = [
  "bytes",
  "libc",
  "mio",
- "parking_lot 0.12.3",
+ "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2",
@@ -1842,29 +1412,6 @@ version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
 
-[[package]]
-name = "url"
-version = "2.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
-]
-
-[[package]]
-name = "utf16_iter"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
-
-[[package]]
-name = "utf8_iter"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
-
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -2074,18 +1621,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
-[[package]]
-name = "write16"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
-
-[[package]]
-name = "writeable"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
-
 [[package]]
 name = "xxhash-rust"
 version = "0.8.15"
@@ -2101,30 +1636,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "yoke"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
-dependencies = [
- "serde",
- "stable_deref_trait",
- "yoke-derive",
- "zerofrom",
-]
-
-[[package]]
-name = "yoke-derive"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.82",
- "synstructure 0.13.1",
-]
-
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
@@ -2145,46 +1656,3 @@ dependencies = [
  "quote",
  "syn 2.0.82",
 ]
-
-[[package]]
-name = "zerofrom"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
-dependencies = [
- "zerofrom-derive",
-]
-
-[[package]]
-name = "zerofrom-derive"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.82",
- "synstructure 0.13.1",
-]
-
-[[package]]
-name = "zerovec"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
-dependencies = [
- "yoke",
- "zerofrom",
- "zerovec-derive",
-]
-
-[[package]]
-name = "zerovec-derive"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.82",
-]
diff --git a/Cargo.toml b/Cargo.toml
index f59ad21..4465d90 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -31,7 +31,6 @@ assets = [
 bincode = "1.3.3"
 chrono = { version = "0.4.38", features = ["std", "clock", "serde"] }
 clap = { version = "4.5.4", features = ["derive"] }
-heed = "0.22.0"
 jrsonnet-evaluator = "0.4.2"
 nix = { version = "0.29.0", features = ["signal"] }
 num_cpus = "1.16.0"
@@ -46,7 +45,6 @@ tokio = { version = "1.40.0", features = ["full", "tracing"] }
 tokio-util = { version = "0.7.12", features = ["codec"] }
 tracing = "0.1.40"
 tracing-subscriber = "0.3.18"
-sled = "0.34.7"
 fjall = "2.10.0"
 
 [build-dependencies]
diff --git a/src/daemon/filter.rs b/src/daemon/filter.rs
index 0679727..e8f5d13 100644
--- a/src/daemon/filter.rs
+++ b/src/daemon/filter.rs
@@ -1,13 +1,13 @@
 #[cfg(test)]
 mod tests;
 
-use std::{collections::BTreeMap, process::Stdio, sync::Arc};
-
-use heed::{
-    byteorder::LittleEndian,
-    types::{SerdeBincode, U64},
-    Database, RoTxn, RwTxn,
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    process::Stdio,
+    sync::Arc,
 };
+
+use fjall::WriteTransaction;
 use regex::Regex;
 use tokio::sync::Semaphore;
 use tracing::{error, info};
@@ -17,7 +17,7 @@ use crate::{
     protocol::{Order, PatternStatus},
 };
 
-use super::{shutdown::ShutdownToken, EnvExt as _, MatchTime};
+use super::{shutdown::ShutdownToken, KeyspaceExt as _, MatchTime, Tree};
 
 #[derive(Clone)]
 pub struct FilterManager {
@@ -30,15 +30,15 @@ pub struct FilterManager {
     /// Permits to run pending actions on shutdown
     shutdown: ShutdownToken,
     /// LMDB environment, necessary to create transactions
-    env: heed::Env,
+    env: fjall::TransactionalKeyspace,
     /// Saves all the current Matches for this Filter
     /// Has duplicate values for a key
-    matches: Database<SerdeBincode<Match>, SerdeBincode<Time>>,
+    matches: Tree<Match, BTreeSet<Time>>,
     /// Alternative view of the current Matches for O(1) cleaning of old Matches
     /// without added async Tasks to remove them
-    ordered_times: Database<SerdeBincode<Time>, SerdeBincode<Match>>,
+    ordered_times: Tree<Time, Match>,
     /// Saves all the current Triggers for this Filter
-    triggers: Database<SerdeBincode<MatchTime>, U64<LittleEndian>>,
+    triggers: Tree<MatchTime, usize>,
 }
 
 #[derive(Debug, PartialEq, Eq)]
@@ -54,9 +54,9 @@ impl FilterManager {
         filter: &'static Filter,
         exec_limit: Option<Arc<Semaphore>>,
         shutdown: ShutdownToken,
-        env: &heed::Env,
+        env: &fjall::TransactionalKeyspace,
         now: Time,
-    ) -> Result<Self, heed::Error> {
+    ) -> Result<Self, fjall::Error> {
         let manager = Self {
             filter,
             has_after: !filter.longuest_action_duration().is_zero(),
@@ -87,7 +87,7 @@ impl FilterManager {
     fn handle_match(&self, m: Match, now: Time) -> bool {
         self.clear_past_matches(now);
 
-        let mut wtxn = self.env.write_txn().unwrap();
+        let mut wtxn = self.env.write_tx();
 
         let exec = match self.filter.retry() {
             None => true,
@@ -125,8 +125,8 @@ impl FilterManager {
                 .all(|(a_match, regex)| regex.is_match(a_match))
         };
 
-        let rtxn = self.env.read_txn().unwrap();
-        let mut wtxn = self.env.write_txn().unwrap();
+        let rtxn = self.env.read_tx();
+        let mut wtxn = self.env.write_tx();
 
         let mut cs = BTreeMap::new();
         {
@@ -151,8 +151,7 @@ impl FilterManager {
             for k in self
                 .matches
                 .iter(&rtxn)
-                .unwrap()
-                .map(|result| result.unwrap().0)
+                .map(|result| result.0)
                 // match filtering
                 .filter(|match_| is_match(match_))
             {
@@ -170,8 +169,7 @@ impl FilterManager {
         for mt in self
             .triggers
             .iter(&rtxn)
-            .unwrap()
-            .map(|result| result.unwrap().0)
+            .map(|result| result.0)
             // match filtering
             .filter(|match_| is_match(&match_.m))
         {
@@ -201,7 +199,6 @@ impl FilterManager {
             }
         }
 
-        rtxn.commit().unwrap();
         wtxn.commit().unwrap();
 
         cs.into_iter().map(|(k, v)| (k.join(" "), v)).collect()
@@ -210,7 +207,7 @@ impl FilterManager {
     /// Schedule execution for a given Action and Match.
     /// We check first if the trigger is still here
     /// because pending actions can be flushed.
-    fn schedule_exec(&self, m: Match, t: Time, now: Time, wtxn: &mut RwTxn) {
+    fn schedule_exec(&self, m: Match, t: Time, now: Time, wtxn: &mut WriteTransaction) {
         for action in self.filter.actions().values() {
             let exec_time = t + action.after_duration().unwrap_or_default();
             let m = m.clone();
@@ -234,7 +231,7 @@ impl FilterManager {
                         _ = this.shutdown.wait() => true,
                     };
                     // Exec action if triggered hasn't been already flushed
-                    let mut wtxn = this.env.write_txn().unwrap();
+                    let mut wtxn = this.env.write_tx();
                     if (!exiting || action.on_exit()) && this.decrement_trigger(&m, t, &mut wtxn) {
                         this.exec_now(action, m);
                     }
@@ -244,70 +241,61 @@ impl FilterManager {
         }
     }
 
-    fn add_match(&self, m: &Match, t: Time, wtxn: &mut RwTxn) {
-        self.matches.put(wtxn, m, &t).unwrap();
-        self.ordered_times.put(wtxn, &t, m).unwrap();
+    fn add_match(&self, m: &Match, t: Time, wtxn: &mut WriteTransaction) {
+        self.matches
+            .fetch_update(wtxn, m, |set| {
+                let mut set = set.unwrap_or_default();
+                set.insert(t);
+                Some(set)
+            })
+            .unwrap();
+        self.ordered_times.insert(wtxn, &t, m);
     }
 
-    fn add_trigger(&self, m: Match, t: Time, wtxn: &mut RwTxn) {
+    fn add_trigger(&self, m: Match, t: Time, wtxn: &mut WriteTransaction) {
         // We record triggered filters only when there is an action with an `after` directive
         if self.has_after {
             // Add the (Match, Time) to the triggers map
             self.triggers
-                .put(
-                    wtxn,
-                    &MatchTime { m, t },
-                    &(self.filter.actions().len() as u64),
-                )
-                .unwrap();
+                .insert(wtxn, &MatchTime { m, t }, &self.filter.actions().len());
         }
     }
 
     // Completely remove a Match from the matches
-    fn remove_match(&self, m: &Match, wtxn: &mut RwTxn) {
-        // Collect the results to avoid two references on the same transaction
-        let duplicates = {
-            let iter = self.matches.get_duplicates(&wtxn, m).unwrap();
-            match iter {
-                Some(iter) => iter.into_iter().collect::<Result<Vec<_>, _>>().unwrap(),
-                None => Vec::default(),
+    fn remove_match(&self, m: &Match, wtxn: &mut WriteTransaction) {
+        if let Some(set) = self.matches.get(wtxn, m).unwrap() {
+            for t in set {
+                self.ordered_times.remove(wtxn, &t);
             }
-        };
-        for t in duplicates {
-            self.ordered_times.delete(wtxn, &t.1).unwrap();
+            self.matches.remove(wtxn, m);
         }
-        self.matches.delete(wtxn, m).unwrap();
     }
 
     /// Completely remove a Match from the triggers
-    fn remove_trigger(&self, m: &Match, t: &Time, wtxn: &mut RwTxn) {
-        self.triggers
-            .delete(
-                wtxn,
-                &MatchTime {
-                    m: m.clone(),
-                    t: *t,
-                },
-            )
-            .unwrap();
+    fn remove_trigger(&self, m: &Match, t: &Time, wtxn: &mut WriteTransaction) {
+        self.triggers.remove(
+            wtxn,
+            &MatchTime {
+                m: m.clone(),
+                t: *t,
+            },
+        );
     }
 
     /// Returns whether we should still execute an action for this (Match, Time) trigger
-    fn decrement_trigger(&self, m: &Match, t: Time, wtxn: &mut RwTxn) -> bool {
+    fn decrement_trigger(&self, m: &Match, t: Time, wtxn: &mut WriteTransaction) -> bool {
         // We record triggered filters only when there is an action with an `after` directive
         if self.has_after {
             let mut exec_needed = false;
-            let mut wtxn = self.env.nested_write_txn(wtxn).unwrap();
             let mt = MatchTime { m: m.clone(), t };
-            let count = self.triggers.get(&wtxn, &mt).unwrap();
+            let count = self.triggers.get(wtxn, &mt).unwrap();
             if let Some(count) = count {
                 exec_needed = true;
                 if count <= 1 {
-                    self.triggers.delete(&mut wtxn, &mt).unwrap();
+                    self.triggers.remove(wtxn, &mt);
                 } else {
-                    self.triggers.put(&mut wtxn, &mt, &(count - 1)).unwrap();
+                    self.triggers.insert(wtxn, &mt, &(count - 1));
                 }
-                wtxn.commit().unwrap();
             }
             exec_needed
         } else {
@@ -317,7 +305,7 @@ impl FilterManager {
 
     fn clear_past_matches(&self, now: Time) {
         let retry_duration = self.filter.retry_duration().unwrap_or_default();
-        let mut wtxn = self.env.write_txn().unwrap();
+        let mut wtxn = self.env.write_tx();
         while self
             .ordered_times
             .first(&wtxn)
@@ -327,41 +315,46 @@ impl FilterManager {
             #[allow(clippy::unwrap_used)]
             // second unwrap: we just checked in the condition that first is_some
             let (t, m) = self.ordered_times.first(&wtxn).unwrap().unwrap();
-            self.ordered_times.delete(&mut wtxn, &t).unwrap();
+            self.ordered_times.remove(&mut wtxn, &t);
             self.matches
-                .delete_one_duplicate(&mut wtxn, &m, &t)
+                .fetch_update(&mut wtxn, &m, |set| {
+                    let mut set = set.unwrap();
+                    set.remove(&t);
+                    if set.is_empty() {
+                        None
+                    } else {
+                        Some(set)
+                    }
+
+                })
                 .unwrap();
         }
         wtxn.commit().unwrap();
     }
 
-    fn get_times(&self, m: &Match, rtxn: &RoTxn) -> usize {
-        self.matches
-            .get_duplicates(&rtxn, m)
-            .unwrap()
-            .map(|iter| iter.count())
-            .unwrap_or(0)
+    fn get_times(&self, m: &Match, rtxn: &WriteTransaction) -> usize {
+        match self.matches.get(&rtxn, m).unwrap() {
+            Some(vec) => vec.len(),
+            None => 0,
+        }
     }
 
     fn clear_past_triggers_and_schedule_future_actions(&self, now: Time) {
         let longuest_action_duration = self.filter.longuest_action_duration();
         let number_of_actions = self.filter.actions().len();
 
-        let rtxn = self.env.read_txn().unwrap();
-        let mut wtxn = self.env.write_txn().unwrap();
-        for (mt, remaining) in self.triggers.iter(&rtxn).unwrap().map(|elt| elt.unwrap()) {
+        let rtxn = self.env.read_tx();
+        let mut wtxn = self.env.write_tx();
+        for (mt, remaining) in self.triggers.iter(&rtxn) {
             if remaining > 0 && mt.t + longuest_action_duration > now {
                 // Insert back the upcoming times
-                self.triggers
-                    .put(&mut wtxn, &mt, &(number_of_actions as u64))
-                    .unwrap();
+                self.triggers.insert(&mut wtxn, &mt, &number_of_actions);
                 // Schedule the upcoming times
                 self.schedule_exec(mt.m, mt.t, now, &mut wtxn);
             } else {
-                self.triggers.delete(&mut wtxn, &mt).unwrap();
+                self.triggers.remove(&mut wtxn, &mt);
             }
         }
-        rtxn.commit().unwrap();
         wtxn.commit().unwrap();
     }
 
diff --git a/src/daemon/filter/tests.rs b/src/daemon/filter/tests.rs
index 248fca7..e191e48 100644
--- a/src/daemon/filter/tests.rs
+++ b/src/daemon/filter/tests.rs
@@ -1,51 +1,43 @@
-use std::{collections::BTreeMap, fs::read_to_string, sync::Arc, time::Duration};
+use std::{collections::{BTreeMap, BTreeSet}, fs::read_to_string, sync::Arc, time::Duration};
 
 use chrono::{Local, TimeDelta};
-use heed::{
-    byteorder::LittleEndian,
-    types::{SerdeBincode, U64},
-    Database, Env,
-};
+use fjall::TransactionalKeyspace;
 use tempfile::TempPath;
 use tokio::sync::Semaphore;
 
 use super::FilterManager;
 use crate::{
     concepts::{Action, Filter, Match, Pattern, Patterns, Time},
-    daemon::{filter::React, shutdown::ShutdownController, EnvExt, MatchTime},
-    tests::TempEnv,
+    daemon::{filter::React, shutdown::ShutdownController, KeyspaceExt, MatchTime, Tree},
+    tests::TempKeyspace,
 };
 
 macro_rules! is_empty {
     ($db:expr, $env:expr) => {{
-        let rtxn = $env.read_txn().unwrap();
-        let ret = $db.iter(&rtxn).unwrap().next().is_none();
-        rtxn.commit().unwrap();
+        let rtxn = $env.read_tx();
+        let ret = $db.iter(&rtxn).next().is_none();
         ret
     }};
 }
 
 macro_rules! as_map {
     ($db:expr, $env:expr) => {{
-        let rtxn = $env.read_txn().unwrap();
+        let rtxn = $env.read_tx();
         let ret = $db
             .iter(&rtxn)
-            .unwrap()
-            .collect::<Result<BTreeMap<_, _>, _>>()
-            .unwrap();
-        rtxn.commit().unwrap();
+            .collect::<BTreeMap<_, _>>();
         ret
     }};
 }
 
 #[allow(clippy::type_complexity)]
 fn open_trees(
-    env: &Env,
+    env: &TransactionalKeyspace,
     filter: &Filter,
 ) -> (
-    Database<SerdeBincode<Match>, SerdeBincode<Time>>,
-    Database<SerdeBincode<Time>, SerdeBincode<Match>>,
-    Database<SerdeBincode<MatchTime>, U64<LittleEndian>>,
+    Tree<Match, BTreeSet<Time>>,
+    Tree<Time, Match>,
+    Tree<MatchTime, usize>,
 ) {
     (
         env.open_filter_matches_db(filter).unwrap(),
@@ -73,7 +65,7 @@ impl TestBed {
         }
     }
 
-    fn part2(self, filter: &'static Filter, now: Time, env: Option<TempEnv>) -> TestBed2 {
+    fn part2(self, filter: &'static Filter, now: Time, env: Option<TempKeyspace>) -> TestBed2 {
         let env = env.unwrap_or_default();
         let controller = ShutdownController::new();
         let semaphore = Arc::new(Semaphore::new(1));
@@ -106,10 +98,10 @@ struct TestBed2 {
     // pub controller: ShutdownController,
     pub semaphore: Arc<Semaphore>,
     pub now: Time,
-    pub env: TempEnv,
-    pub matches: Database<SerdeBincode<Match>, SerdeBincode<Time>>,
-    pub ordered_times: Database<SerdeBincode<Time>, SerdeBincode<Match>>,
-    pub triggers: Database<SerdeBincode<MatchTime>, U64<LittleEndian>>,
+    pub env: TempKeyspace,
+    pub matches: Tree<Match, BTreeSet<Time>>,
+    pub ordered_times: Tree<Time, Match>,
+    pub triggers: Tree<MatchTime, usize>,
     pub manager: FilterManager,
 }
 
@@ -174,7 +166,7 @@ async fn three_matches_then_action_then_delayed_action() {
     let one = vec!["one".to_string()];
     assert_eq!(
         as_map!(&bed.matches, &bed.env),
-        BTreeMap::from([(one.clone(), now)]),
+        BTreeMap::from([(one.clone(), BTreeSet::from([now]))]),
         "the match has been added to matches"
     );
     assert_eq!(
@@ -191,7 +183,7 @@ async fn three_matches_then_action_then_delayed_action() {
     assert_eq!(bed.manager.handle_line("test one", now1s), React::Match);
     assert_eq!(
         as_map!(&bed.matches, &bed.env),
-        BTreeMap::from([(one.clone(), now), (one.clone(), now1s)]),
+        BTreeMap::from([(one.clone(), BTreeSet::from([now, now1s]))]),
         "a second match is present in matches"
     );
     assert_eq!(
@@ -402,7 +394,7 @@ async fn one_db_match_one_runtime_match_one_action() {
         &bed.az_patterns,
     );
 
-    let db = TempEnv::default();
+    let db = TempKeyspace::default();
     let (matches, ordered_times, _) = open_trees(&db, filter);
 
     // Pre-add match
@@ -410,9 +402,9 @@ async fn one_db_match_one_runtime_match_one_action() {
     let one = vec!["one".to_string()];
     let now1s = now - TimeDelta::seconds(1);
 
-    let mut wtxn = db.write_txn().unwrap();
-    matches.put(&mut wtxn, &one, &now1s).unwrap();
-    ordered_times.put(&mut wtxn, &now1s, &one).unwrap();
+    let mut wtxn = db.write_tx();
+    matches.insert(&mut wtxn, &one, &BTreeSet::from([now1s]));
+    ordered_times.insert(&mut wtxn, &now1s, &one);
     wtxn.commit().unwrap();
 
     // Finish setup
@@ -420,7 +412,7 @@ async fn one_db_match_one_runtime_match_one_action() {
 
     assert_eq!(
         as_map!(&bed.matches, &bed.env),
-        BTreeMap::from([(one.clone(), now1s)]),
+        BTreeMap::from([(one.clone(), BTreeSet::from([now1s]))]),
         "the match previously added to matches"
     );
     assert_eq!(
@@ -463,7 +455,7 @@ async fn one_outdated_db_match() {
         &bed.az_patterns,
     );
 
-    let db = TempEnv::default();
+    let db = TempKeyspace::default();
     let (matches, ordered_times, _) = open_trees(&db, filter);
 
     // Pre-add match
@@ -471,9 +463,9 @@ async fn one_outdated_db_match() {
     let one = vec!["one".to_string()];
     let now1s = now - TimeDelta::milliseconds(1001);
 
-    let mut wtxn = db.write_txn().unwrap();
-    matches.put(&mut wtxn, &one, &now1s).unwrap();
-    ordered_times.put(&mut wtxn, &now1s, &one).unwrap();
+    let mut wtxn = db.write_tx();
+    matches.insert(&mut wtxn, &one, &BTreeSet::from([now1s]));
+    ordered_times.insert(&mut wtxn, &now1s, &one);
     wtxn.commit().unwrap();
 
     // Finish setup
diff --git a/src/daemon/heedext.rs b/src/daemon/fjallext.rs
similarity index 51%
rename from src/daemon/heedext.rs
rename to src/daemon/fjallext.rs
index 4e9e30f..4671019 100644
--- a/src/daemon/heedext.rs
+++ b/src/daemon/fjallext.rs
@@ -1,11 +1,13 @@
 use std::{collections::BTreeSet, fs::create_dir, io::ErrorKind, marker::PhantomData};
 
-use fjall::{Result, TransactionalKeyspace, WriteTransaction};
+use fjall::{
+    PartitionCreateOptions, ReadTransaction, Result, Slice, TransactionalKeyspace, WriteTransaction,
+};
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
 
 use crate::concepts::{Config, Filter, Match, Time};
 
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
 pub struct MatchTime {
     pub m: Match,
     pub t: Time,
@@ -48,23 +50,14 @@ pub fn open_db(config: &Config) -> std::result::Result<TransactionalKeyspace, St
     Ok(env)
 }
 
-/// This trait permits to manage in a single place what are the names of [`heed::Database`]s in
-/// reaction. It streamlines [`heed::Database`]s opening so that we can reliably open the same
+/// This trait permits to manage in a single place what are the names of [`fjall::TransactionalPartitionHandle`]s in
+/// reaction. It streamlines [`fjall::TransactionalPartitionHandle`]s opening so that we can reliably open the same
 /// Databases in multiple places.
 /// It also permits to manage the cleanup of unused databases.
-pub trait EnvExt {
-    fn open_filter_matches_db(
-        &self,
-        filter: &Filter,
-    ) -> Result<Database<SerdeBincode<Match>, SerdeBincode<Time>>>;
-    fn open_filter_ordered_times_db(
-        &self,
-        filter: &Filter,
-    ) -> Result<Database<SerdeBincode<Time>, SerdeBincode<Match>>>;
-    fn open_filter_triggers_db(
-        &self,
-        filter: &Filter,
-    ) -> Result<Database<SerdeBincode<MatchTime>, U64<LittleEndian>>>;
+pub trait KeyspaceExt {
+    fn open_filter_matches_db(&self, filter: &Filter) -> Result<Tree<Match, BTreeSet<Time>>>;
+    fn open_filter_ordered_times_db(&self, filter: &Filter) -> Result<Tree<Time, Match>>;
+    fn open_filter_triggers_db(&self, filter: &Filter) -> Result<Tree<MatchTime, usize>>;
 
     #[allow(dead_code)] // See FIXME
     fn cleanup_unused_dbs(&self, config: &Config) -> Result<()>;
@@ -86,44 +79,30 @@ fn filter_triggers_db_name(filter: &Filter) -> String {
     format!("filter_triggers_{}.{}", filter.stream_name(), filter.name())
 }
 
-impl EnvExt for TransactionalKeyspace {
-    fn open_filter_matches_db(
-        &self,
-        filter: &Filter,
-    ) -> Result<Database<SerdeBincode<Match>, SerdeBincode<Time>>> {
-        let mut wtxn = self.write_txn()?;
-        let res = self
-            .database_options()
-            .name(&filter_matches_db_name(filter))
-            // We allow duplicates on this database
-            .flags(DatabaseFlags::DUP_SORT)
-            .types::<SerdeBincode<Match>, SerdeBincode<Time>>()
-            .create(&mut wtxn);
-        wtxn.commit()?;
-        res
+impl KeyspaceExt for TransactionalKeyspace {
+    fn open_filter_matches_db(&self, filter: &Filter) -> Result<Tree<Match, BTreeSet<Time>>> {
+        // FIXME Partition names can be up to 255 characters long, can not be empty and can only contain alphanumerics, underscore (_), dash (-), hash tag (#) and dollar ($).
+        self.open_partition(
+            &filter_matches_db_name(filter),
+            PartitionCreateOptions::default(),
+        )
+        .map(Tree::new)
     }
 
-    fn open_filter_ordered_times_db(
-        &self,
-        filter: &Filter,
-    ) -> Result<Database<SerdeBincode<Time>, SerdeBincode<Match>>> {
-        let mut wtxn = self.write_txn()?;
-        let res = self.create_database(&mut wtxn, Some(&filter_ordered_times_db_name(filter)));
-        wtxn.commit()?;
-        res
+    fn open_filter_ordered_times_db(&self, filter: &Filter) -> Result<Tree<Time, Match>> {
+        self.open_partition(
+            &filter_ordered_times_db_name(filter),
+            PartitionCreateOptions::default(),
+        )
+        .map(Tree::new)
     }
 
-    fn open_filter_triggers_db(
-        &self,
-        filter: &Filter,
-    ) -> Result<Database<SerdeBincode<MatchTime>, U64<LittleEndian>>> {
-        let mut wtxn = self.write_txn()?;
-        let res = self.create_database::<SerdeBincode<MatchTime>, U64<LittleEndian>>(
-            &mut wtxn,
-            Some(&filter_triggers_db_name(filter)),
-        );
-        wtxn.commit()?;
-        res
+    fn open_filter_triggers_db(&self, filter: &Filter) -> Result<Tree<MatchTime, usize>> {
+        self.open_partition(
+            &filter_triggers_db_name(filter),
+            PartitionCreateOptions::default(),
+        )
+        .map(Tree::new)
     }
 
     fn cleanup_unused_dbs(&self, config: &Config) -> Result<()> {
@@ -139,36 +118,24 @@ impl EnvExt for TransactionalKeyspace {
                     filter_triggers_db_name(filter),
                 ]
             })
-            // convert as IVec which is sled's binary type
-            // .map(|string| sled::IVec::from(string.as_bytes()))
             .collect();
 
-        let rtxn = self.read_txn()?;
-        let unnamed: Database<Str, DecodeIgnore> = self
-            .open_database(&rtxn, None)?
-            .expect("the unnamed database always exists");
+        // let rtxn = self.read_tx()?;
+        // let unnamed: Tree<Str, DecodeIgnore> = self
+        //     .open_database(&rtxn, None)?
+        //     .expect("the unnamed database always exists");
 
-        let mut wtxn = self.write_txn()?;
         // Remove dbs that are not in the list of valid dbs
-        for outdated_db in unnamed
-            .iter(&rtxn)?
-            .filter(|key| key.is_ok())
-            // unwrap because we only kept `Result::Ok`s
-            .map(|key| key.unwrap().0)
-            .filter(|db_name| !valid_db_names.contains(*db_name))
+        for outdated_db in self
+            .list_partitions()
+            .iter()
+            .filter(|db_name| !valid_db_names.contains(&db_name.to_string()))
         {
-            if let Some(db) =
-                self.open_database::<DecodeIgnore, DecodeIgnore>(&wtxn, Some(outdated_db))?
-            {
-                // FIXME Waiting for this PR to land in a stable release
-                // https://github.com/meilisearch/heed/pull/330
-                // For now we're just clearing it
-                db.clear(&mut wtxn)?;
-                // db.remove(&mut write_txn)?
-            }
+            self.delete_partition(
+                self.open_partition(outdated_db, PartitionCreateOptions::default())?,
+            )?;
         }
 
-        wtxn.commit()?;
         Ok(())
     }
 }
@@ -193,18 +160,20 @@ impl<K: Serialize + DeserializeOwned, V: Serialize + DeserializeOwned> Tree<K, V
         }
     }
 
-    pub fn get(&self, k: &K) -> Result<Option<V>> {
+    pub fn get(&self, rtxn: &WriteTransaction, k: &K) -> Result<Option<V>> {
         let k = bincode::serialize(k).unwrap();
-        Ok(self.tree.get(k)?.map(|v| bincode::deserialize(&v).unwrap()))
+        Ok(rtxn
+            .get(&self.tree, k)?
+            .map(|v| bincode::deserialize(&v).unwrap()))
     }
 
-    pub fn remove(&self, key: &K, wtxn: WriteTransaction) {
+    pub fn remove(&self, wtxn: &mut WriteTransaction, key: &K) {
         let key = bincode::serialize(key).unwrap();
-        wtxn.remove(self, key);
+        wtxn.remove(&self.tree, key);
     }
 
-    pub fn first(&self) -> Result<Option<(K, V)>> {
-        let option = self.tree.first()?;
+    pub fn first(&self, wtxn: &WriteTransaction) -> Result<Option<(K, V)>> {
+        let option = wtxn.first_key_value(&self.tree)?;
         match option {
             None => Ok(None),
             Some((k, v)) => {
@@ -215,47 +184,43 @@ impl<K: Serialize + DeserializeOwned, V: Serialize + DeserializeOwned> Tree<K, V
         }
     }
 
-    pub fn pop_min(&self) -> Result<Option<(K, V)>> {
-        let option = self.tree.pop_min()?;
-        match option {
-            None => Ok(None),
-            Some((k, v)) => {
-                let k: K = bincode::deserialize(&k).unwrap();
-                let v: V = bincode::deserialize(&v).unwrap();
-                Ok(Some((k, v)))
-            }
-        }
-    }
+    // pub fn pop_min(&self, wtxn: &mut WriteTransaction) -> Result<Option<(K, V)>> {
+    //     let option = wtxn.pop_min(self.tree)?;
+    //     match option {
+    //         None => Ok(None),
+    //         Some((k, v)) => {
+    //             let k: K = bincode::deserialize(&k).unwrap();
+    //             let v: V = bincode::deserialize(&v).unwrap();
+    //             Ok(Some((k, v)))
+    //         }
+    //     }
+    // }
 
-    pub fn fetch_and_update<F>(&self, k: &K, mut f: F) -> Result<Option<V>>
+    pub fn fetch_update<F>(&self, wtxn: &mut WriteTransaction, k: &K, mut f: F) -> Result<Option<V>>
     where
         F: FnMut(Option<V>) -> Option<V>,
     {
         let k = bincode::serialize(&k).unwrap();
-        let f = |v: Option<&[u8]>| -> Option<Vec<u8>> {
+        let f = |v: Option<&Slice>| -> Option<Slice> {
             let v = v.map(|v| bincode::deserialize(v).unwrap());
-            f(v).map(|v| bincode::serialize(&v).unwrap())
+            f(v).map(|v| bincode::serialize(&v).unwrap().into())
         };
-        Ok(self
-            .tree
-            .fetch_and_update(k, f)?
+        Ok(wtxn
+            .fetch_update(&self.tree, k, f)?
             .map(|v| bincode::deserialize::<V>(&v).unwrap()))
     }
 
-    pub fn insert(&self, k: &K, v: &V) -> Result<Option<V>> {
+    pub fn insert(&self, wtxn: &mut WriteTransaction, k: &K, v: &V) {
         let k = bincode::serialize(k).unwrap();
         let v = bincode::serialize(v).unwrap();
-        Ok(self
-            .tree
-            .insert(k, v)?
-            .map(|v| bincode::deserialize(&v).unwrap()))
+        wtxn.insert(&self.tree, k, v);
     }
 
     // The lifetime annotations permit to decouple the lifetime of self
     // from the limetime of the Iterator
     #[allow(clippy::needless_lifetimes)] // I find this clearer with 2 lifetimes
-    pub fn iter<'a, 'b>(&'a self) -> impl Iterator<Item = (K, V)> + 'b {
-        self.tree.iter().map(|elt| {
+    pub fn iter<'a, 'b>(&'a self, rtxn: &ReadTransaction) -> impl Iterator<Item = (K, V)> + 'b {
+        rtxn.iter(&self.tree).map(|elt| {
             let (k, v) = elt.unwrap();
             let k: K = bincode::deserialize(&k).unwrap();
             let v: V = bincode::deserialize(&v).unwrap();
diff --git a/src/daemon/mod.rs b/src/daemon/mod.rs
index af24bce..ea83b06 100644
--- a/src/daemon/mod.rs
+++ b/src/daemon/mod.rs
@@ -18,13 +18,13 @@ use tracing::{debug, info};
 
 use crate::concepts::Config;
 use filter::FilterManager;
-use heedext::*;
+use fjallext::*;
 use shutdown::{ShutdownController, ShutdownDelegate};
 use socket::socket_manager;
 use stream::stream_manager;
 
 mod filter;
-mod heedext;
+mod fjallext;
 mod shutdown;
 mod socket;
 mod stream;
@@ -51,7 +51,7 @@ pub async fn daemon(
     };
 
     // Open Database
-    let env = open_db(config)?;
+    let keyspace = open_db(config)?;
 
     // Filter managers
     let now = Local::now();
@@ -60,7 +60,7 @@ pub async fn daemon(
         let mut filter_managers = HashMap::new();
         for filter in stream.filters().values() {
             let manager =
-                FilterManager::new(filter, exec_limit.clone(), shutdown.token(), &env, now)?;
+                FilterManager::new(filter, exec_limit.clone(), shutdown.token(), &keyspace, now)?;
             filter_managers.insert(filter, manager);
         }
         state.insert(stream, filter_managers.clone());
@@ -94,13 +94,13 @@ pub async fn daemon(
     shutdown.wait_shutdown().await;
 
     debug!("Closing DB...");
-    let _db_ok = env.prepare_for_closing().wait();
+    let db_ok = keyspace.persist(fjall::PersistMode::SyncAll);
 
     let stop_ok = config.stop();
 
-    /*if let Err(err) = db_ok {
+    if let Err(err) = db_ok {
         Err(format!("database was not saved, unrecoverable error: {}", err).into())
-    } else*/ if !signal_received.load(Ordering::SeqCst) {
+    } else if !signal_received.load(Ordering::SeqCst) {
         Err("quitting because all streams finished".into())
     } else if !stop_ok {
         Err("while executing stop command".into())
diff --git a/src/tests.rs b/src/tests.rs
index 53d51bb..6fdba28 100644
--- a/src/tests.rs
+++ b/src/tests.rs
@@ -55,27 +55,21 @@ impl Deref for Fixture {
     }
 }
 
-pub struct TempEnv {
-    env: heed::Env,
+pub struct TempKeyspace {
+    env: fjall::TransactionalKeyspace,
     _tempdir: TempDir,
 }
 
-impl Default for TempEnv {
+impl Default for TempKeyspace {
     fn default() -> Self {
         let _tempdir = TempDir::new().unwrap();
-        #[allow(unsafe_code)]
-        let env = unsafe {
-            heed::EnvOpenOptions::new()
-                .max_dbs(20)
-                .open(_tempdir.path())
-        }
-        .unwrap();
-        TempEnv { _tempdir, env }
+        let env = fjall::Config::new(_tempdir.path()).open_transactional().unwrap();
+        TempKeyspace { _tempdir, env }
     }
 }
 
-impl Deref for TempEnv {
-    type Target = heed::Env;
+impl Deref for TempKeyspace {
+    type Target = fjall::TransactionalKeyspace;
 
     fn deref(&self) -> &Self::Target {
         &self.env