Add missing not-dynamic script

Bump crate versions to 0.7.3
Configure structopt to report the right version
2026-08-14 16:13:11 +00:00 · 2022-08-29 20:56:02 +02:00 · 2022-08-29 18:01:53 +02:00 · 2022-08-29 17:54:03 +02:00 · 2022-08-29 17:48:19 +02:00 · 2022-08-29 17:47:17 +02:00
127 changed files with 1743 additions and 14814 deletions
@@ -2,17 +2,6 @@
 # It is not intended for manual editing.
 version = 3

-[[package]]
-name = "ahash"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
-dependencies = [
- "getrandom",
- "once_cell",
- "version_check",
-]
-
 [[package]]
 name = "aho-corasick"
 version = "0.7.18"
@@ -93,15 +82,6 @@ dependencies = [
 "winapi",
 ]

-[[package]]
-name = "autocfg"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78"
-dependencies = [
- "autocfg 1.1.0",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -321,15 +301,6 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"

-[[package]]
-name = "bincode"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -362,12 +333,6 @@ version = "3.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"

-[[package]]
-name = "bytemuck"
-version = "1.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdead85bdec19c194affaeeb670c0e41fe23de31459efd1c174d049269cf02cc"
-
 [[package]]
 name = "byteorder"
 version = "1.4.3"
@@ -396,12 +361,6 @@ dependencies = [
 "either",
 ]

-[[package]]
-name = "bytesize"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c58ec36aac5066d5ca17df51b3e70279f5670a72102f5752cb7e7c856adfc70"
-
 [[package]]
 name = "cc"
 version = "1.0.73"
@@ -411,12 +370,6 @@ dependencies = [
 "jobserver",
 ]

-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -533,7 +486,7 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]

 [[package]]
@@ -542,8 +495,8 @@ version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53"
 dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-utils 0.8.8",
+ "cfg-if",
+ "crossbeam-utils",
 ]

 [[package]]
@@ -552,40 +505,21 @@ version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c"
 dependencies = [
- "autocfg 1.1.0",
- "cfg-if 1.0.0",
- "crossbeam-utils 0.8.8",
+ "autocfg",
+ "cfg-if",
+ "crossbeam-utils",
 "lazy_static",
 "memoffset",
 "scopeguard",
 ]

-[[package]]
-name = "crossbeam-queue"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b"
-dependencies = [
- "crossbeam-utils 0.6.6",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
-dependencies = [
- "cfg-if 0.1.10",
- "lazy_static",
-]
-
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "lazy_static",
 ]

@@ -669,7 +603,7 @@ version = "4.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "num_cpus",
 ]

@@ -699,7 +633,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "dirs-sys-next",
 ]

@@ -738,7 +672,7 @@ version = "0.8.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]

 [[package]]
@@ -782,18 +716,6 @@ dependencies = [
 "synstructure",
 ]

-[[package]]
-name = "fallible-iterator"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
-
-[[package]]
-name = "fallible-streaming-iterator"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
-
 [[package]]
 name = "fastrand"
 version = "1.7.0"
@@ -956,24 +878,21 @@ dependencies = [

 [[package]]
 name = "garage"
-version = "0.7.0"
+version = "0.7.3"
 dependencies = [
 "assert-json-diff",
 "async-trait",
 "aws-sdk-s3",
 "base64",
 "bytes 1.1.0",
- "bytesize",
 "chrono",
 "futures",
 "futures-util",
 "garage_api",
- "garage_block",
- "garage_db",
- "garage_model 0.7.0",
- "garage_rpc 0.7.0",
- "garage_table 0.7.0",
- "garage_util 0.7.0",
+ "garage_model 0.7.3",
+ "garage_rpc 0.7.3",
+ "garage_table 0.7.3",
+ "garage_util 0.7.3",
 "garage_web",
 "hex",
 "hmac 0.10.1",
@@ -992,9 +911,9 @@ dependencies = [
 "serde_bytes",
 "serde_json",
 "sha2",
+ "sled",
 "static_init",
 "structopt",
- "timeago",
 "tokio",
 "toml",
 "tracing",
@@ -1002,7 +921,7 @@ dependencies = [

 [[package]]
 name = "garage_api"
-version = "0.7.0"
+version = "0.7.3"
 dependencies = [
 "async-trait",
 "base64",
@@ -1014,10 +933,10 @@ dependencies = [
 "futures",
 "futures-util",
 "garage_block",
- "garage_model 0.7.0",
- "garage_rpc 0.7.0",
- "garage_table 0.7.0",
- "garage_util 0.7.0",
+ "garage_model 0.7.3",
+ "garage_rpc 0.7.3",
+ "garage_table 0.7.3",
+ "garage_util 0.7.3",
 "hex",
 "hmac 0.10.1",
 "http",
@@ -1047,43 +966,27 @@ dependencies = [

 [[package]]
 name = "garage_block"
-version = "0.7.0"
+version = "0.7.3"
 dependencies = [
- "arc-swap",
 "async-trait",
 "bytes 1.1.0",
 "futures",
 "futures-util",
- "garage_db",
- "garage_rpc 0.7.0",
- "garage_table 0.7.0",
- "garage_util 0.7.0",
+ "garage_rpc 0.7.3",
+ "garage_table 0.7.3",
+ "garage_util 0.7.3",
 "hex",
 "opentelemetry",
 "rand 0.8.5",
 "rmp-serde 0.15.5",
 "serde",
 "serde_bytes",
+ "sled",
 "tokio",
 "tracing",
 "zstd",
 ]

-[[package]]
-name = "garage_db"
-version = "0.8.0"
-dependencies = [
- "clap 3.1.18",
- "err-derive 0.3.1",
- "heed",
- "hexdump",
- "mktemp",
- "pretty_env_logger",
- "rusqlite",
- "sled",
- "tracing",
-]
-
 [[package]]
 name = "garage_model"
 version = "0.5.1"
@@ -1111,7 +1014,7 @@ dependencies = [

 [[package]]
 name = "garage_model"
-version = "0.7.0"
+version = "0.7.3"
 dependencies = [
 "arc-swap",
 "async-trait",
@@ -1121,11 +1024,10 @@ dependencies = [
 "futures",
 "futures-util",
 "garage_block",
- "garage_db",
 "garage_model 0.5.1",
- "garage_rpc 0.7.0",
- "garage_table 0.7.0",
- "garage_util 0.7.0",
+ "garage_rpc 0.7.3",
+ "garage_table 0.7.3",
+ "garage_util 0.7.3",
 "hex",
 "netapp 0.4.4",
 "opentelemetry",
@@ -1133,6 +1035,7 @@ dependencies = [
 "rmp-serde 0.15.5",
 "serde",
 "serde_bytes",
+ "sled",
 "tokio",
 "tracing",
 "zstd",
@@ -1167,14 +1070,14 @@ dependencies = [

 [[package]]
 name = "garage_rpc"
-version = "0.7.0"
+version = "0.7.3"
 dependencies = [
 "arc-swap",
 "async-trait",
 "bytes 1.1.0",
 "futures",
 "futures-util",
- "garage_util 0.7.0",
+ "garage_util 0.7.3",
 "gethostname",
 "hex",
 "hyper",
@@ -1220,21 +1123,21 @@ dependencies = [

 [[package]]
 name = "garage_table"
-version = "0.7.0"
+version = "0.7.3"
 dependencies = [
 "async-trait",
 "bytes 1.1.0",
 "futures",
 "futures-util",
- "garage_db",
- "garage_rpc 0.7.0",
- "garage_util 0.7.0",
+ "garage_rpc 0.7.3",
+ "garage_util 0.7.3",
 "hexdump",
 "opentelemetry",
 "rand 0.8.5",
 "rmp-serde 0.15.5",
 "serde",
 "serde_bytes",
+ "sled",
 "tokio",
 "tracing",
 ]
@@ -1267,14 +1170,12 @@ dependencies = [

 [[package]]
 name = "garage_util"
-version = "0.7.0"
+version = "0.7.3"
 dependencies = [
- "async-trait",
 "blake2",
 "chrono",
 "err-derive 0.3.1",
 "futures",
- "garage_db",
 "git-version",
 "hex",
 "http",
@@ -1286,6 +1187,7 @@ dependencies = [
 "serde",
 "serde_json",
 "sha2",
+ "sled",
 "tokio",
 "toml",
 "tracing",
@@ -1294,14 +1196,14 @@ dependencies = [

 [[package]]
 name = "garage_web"
-version = "0.7.0"
+version = "0.7.3"
 dependencies = [
 "err-derive 0.3.1",
 "futures",
 "garage_api",
- "garage_model 0.7.0",
- "garage_table 0.7.0",
- "garage_util 0.7.0",
+ "garage_model 0.7.3",
+ "garage_table 0.7.3",
+ "garage_util 0.7.3",
 "http",
 "hyper",
 "opentelemetry",
@@ -1335,7 +1237,7 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "libc",
 "wasi 0.10.0+wasi-snapshot-preview1",
 ]
@@ -1386,18 +1288,6 @@ name = "hashbrown"
 version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
-dependencies = [
- "ahash",
-]
-
-[[package]]
-name = "hashlink"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf"
-dependencies = [
- "hashbrown",
-]

 [[package]]
 name = "heck"
@@ -1414,45 +1304,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"

-[[package]]
-name = "heed"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "269c7486ed6def5d7b59a427cec3e87b4d4dd4381d01e21c8c9f2d3985688392"
-dependencies = [
- "bytemuck",
- "byteorder",
- "heed-traits",
- "heed-types",
- "libc",
- "lmdb-rkv-sys",
- "once_cell",
- "page_size",
- "serde",
- "synchronoise",
- "url",
-]
-
-[[package]]
-name = "heed-traits"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a53a94e5b2fd60417e83ffdfe136c39afacff0d4ac1d8d01cd66928ac610e1a2"
-
-[[package]]
-name = "heed-types"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a6cf0a6952fcedc992602d5cddd1e3fff091fbe87d38636e3ec23a31f32acbd"
-dependencies = [
- "bincode",
- "bytemuck",
- "byteorder",
- "heed-traits",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "hermit-abi"
 version = "0.1.19"
@@ -1642,7 +1493,7 @@ version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
 "hashbrown",
 ]

@@ -1652,7 +1503,7 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]

 [[package]]
@@ -1664,16 +1515,6 @@ dependencies = [
 "serde",
 ]

-[[package]]
-name = "isolang"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "265ef164908329e47e753c769b14cbb27434abf0c41984dca201484022f09ce5"
-dependencies = [
- "phf",
- "phf_codegen",
-]
-
 [[package]]
 name = "itertools"
 version = "0.4.19"
@@ -1737,11 +1578,11 @@ dependencies = [

 [[package]]
 name = "k2v-client"
-version = "0.0.1"
+version = "0.1.0"
 dependencies = [
 "base64",
 "clap 3.1.18",
- "garage_util 0.7.0",
+ "garage_util 0.7.3",
 "http",
 "log",
 "rusoto_core",
@@ -1917,34 +1758,12 @@ dependencies = [
 "walkdir",
 ]

-[[package]]
-name = "libsqlite3-sys"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "898745e570c7d0453cc1fbc4a701eb6c662ed54e8fec8b7d14be137ebeeb9d14"
-dependencies = [
- "cc",
- "pkg-config",
- "vcpkg",
-]
-
 [[package]]
 name = "linked-hash-map"
 version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"

-[[package]]
-name = "lmdb-rkv-sys"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61b9ce6b3be08acefa3003c57b7565377432a89ec24476bbe72e11d101f852fe"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
-
 [[package]]
 name = "lock_api"
 version = "0.4.6"
@@ -1960,7 +1779,7 @@ version = "0.4.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]

 [[package]]
@@ -1998,7 +1817,7 @@ version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
 ]

 [[package]]
@@ -2036,15 +1855,6 @@ dependencies = [
 "winapi",
 ]

-[[package]]
-name = "mktemp"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "975de676448231fcde04b9149d2543077e166b78fc29eae5aa219e7928410da2"
-dependencies = [
- "uuid",
-]
-
 [[package]]
 name = "multer"
 version = "2.0.2"
@@ -2118,7 +1928,7 @@ dependencies = [
 "arc-swap",
 "async-trait",
 "bytes 0.6.0",
- "cfg-if 1.0.0",
+ "cfg-if",
 "err-derive 0.2.4",
 "futures",
 "hex",
@@ -2160,7 +1970,7 @@ version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
 "num-traits",
 ]

@@ -2170,7 +1980,7 @@ version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
 ]

 [[package]]
@@ -2211,7 +2021,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95"
 dependencies = [
 "bitflags",
- "cfg-if 1.0.0",
+ "cfg-if",
 "foreign-types",
 "libc",
 "once_cell",
@@ -2239,7 +2049,7 @@ version = "0.9.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
 "cc",
 "libc",
 "openssl-src",
@@ -2324,16 +2134,6 @@ version = "6.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "029d8d0b2f198229de29dca79676f2738ff952edf3fde542eb8bf94d8c21b435"

-[[package]]
-name = "page_size"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eebde548fbbf1ea81a99b128872779c437752fb99f217c45245e1a61dcd9edcd"
-dependencies = [
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "parking_lot"
 version = "0.11.2"
@@ -2361,7 +2161,7 @@ version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "instant",
 "libc",
 "redox_syscall",
@@ -2375,7 +2175,7 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "libc",
 "redox_syscall",
 "smallvec",
@@ -2409,44 +2209,6 @@ dependencies = [
 "indexmap",
 ]

-[[package]]
-name = "phf"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18"
-dependencies = [
- "phf_shared",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
-dependencies = [
- "phf_generator",
- "phf_shared",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
-dependencies = [
- "phf_shared",
- "rand 0.6.5",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
-dependencies = [
- "siphasher",
-]
-
 [[package]]
 name = "pin-project"
 version = "0.4.29"
@@ -2595,7 +2357,7 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7f64969ffd5dd8f39bd57a68ac53c163a095ed9d0fb707146da1b27025a3504"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "fnv",
 "lazy_static",
 "memchr",
@@ -2701,25 +2463,6 @@ dependencies = [
 "winapi",
 ]

-[[package]]
-name = "rand"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
-dependencies = [
- "autocfg 0.1.8",
- "libc",
- "rand_chacha 0.1.1",
- "rand_core 0.4.2",
- "rand_hc",
- "rand_isaac",
- "rand_jitter",
- "rand_os",
- "rand_pcg",
- "rand_xorshift",
- "winapi",
-]
-
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -2727,20 +2470,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
 "libc",
- "rand_chacha 0.3.1",
+ "rand_chacha",
 "rand_core 0.6.3",
 ]

-[[package]]
-name = "rand_chacha"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
-dependencies = [
- "autocfg 0.1.8",
- "rand_core 0.3.1",
-]
-
 [[package]]
 name = "rand_chacha"
 version = "0.3.1"
@@ -2775,77 +2508,6 @@ dependencies = [
 "getrandom",
 ]

-[[package]]
-name = "rand_hc"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_isaac"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_jitter"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
-dependencies = [
- "libc",
- "rand_core 0.4.2",
- "winapi",
-]
-
-[[package]]
-name = "rand_os"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
-dependencies = [
- "cloudabi",
- "fuchsia-cprng",
- "libc",
- "rand_core 0.4.2",
- "rdrand",
- "winapi",
-]
-
-[[package]]
-name = "rand_pcg"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
-dependencies = [
- "autocfg 0.1.8",
- "rand_core 0.4.2",
-]
-
-[[package]]
-name = "rand_xorshift"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rdrand"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-dependencies = [
- "rand_core 0.3.1",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.2.11"
@@ -3017,21 +2679,6 @@ dependencies = [
 "tokio",
 ]

-[[package]]
-name = "rusqlite"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85127183a999f7db96d1a976a309eebbfb6ea3b0b400ddd8340190129de6eb7a"
-dependencies = [
- "bitflags",
- "fallible-iterator",
- "fallible-streaming-iterator",
- "hashlink",
- "libsqlite3-sys",
- "memchr",
- "smallvec",
-]
-
 [[package]]
 name = "rustc_version"
 version = "0.4.0"
@@ -3247,7 +2894,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
 dependencies = [
 "block-buffer",
- "cfg-if 1.0.0",
+ "cfg-if",
 "cpufeatures",
 "digest",
 "opaque-debug",
@@ -3268,12 +2915,6 @@ dependencies = [
 "libc",
 ]

-[[package]]
-name = "siphasher"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
-
 [[package]]
 name = "slab"
 version = "0.4.5"
@@ -3288,7 +2929,7 @@ checksum = "7f96b4737c2ce5987354855aed3797279def4ebf734436c6aa4552cf8e169935"
 dependencies = [
 "crc32fast",
 "crossbeam-epoch",
- "crossbeam-utils 0.8.8",
+ "crossbeam-utils",
 "fs2",
 "fxhash",
 "libc",
@@ -3422,15 +3063,6 @@ dependencies = [
 "unicode-xid",
 ]

-[[package]]
-name = "synchronoise"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d717ed0efc9d39ab3b642a096bc369a3e02a38a51c41845d7fe31bdad1d6eaeb"
-dependencies = [
- "crossbeam-queue",
-]
-
 [[package]]
 name = "synstructure"
 version = "0.12.6"
@@ -3449,7 +3081,7 @@ version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "fastrand",
 "libc",
 "redox_syscall",
@@ -3522,16 +3154,6 @@ dependencies = [
 "num_threads",
 ]

-[[package]]
-name = "timeago"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ec32dde57efb15c035ac074118d7f32820451395f28cb0524a01d4e94983b26"
-dependencies = [
- "chrono",
- "isolang",
-]
-
 [[package]]
 name = "tinyvec"
 version = "1.5.1"
@@ -3758,7 +3380,7 @@ version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "log",
 "pin-project-lite",
 "tracing-attributes",
@@ -3867,15 +3489,6 @@ dependencies = [
 "percent-encoding",
 ]

-[[package]]
-name = "uuid"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
-dependencies = [
- "getrandom",
-]
-
 [[package]]
 name = "vcpkg"
 version = "0.2.15"
@@ -3927,7 +3540,7 @@ version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "wasm-bindgen-macro",
 ]

@@ -1,6 +1,5 @@
 [workspace]
 members = [
-	"src/db",
 	"src/util",
 	"src/rpc",
 	"src/table",
@@ -1,27 +1,13 @@
-.PHONY: doc all release shell run1 run2 run3
+.PHONY: doc all release shell

 all:
 	clear; cargo build --all-features

+doc:
+	cd doc/book; mdbook build
+
 release:
 	nix-build --arg release true

 shell:
 	nix-shell
-
-# ----
-
-run1:
-	RUST_LOG=garage=debug ./target/debug/garage -c tmp/config1.toml server
-run1rel:
-	RUST_LOG=garage=debug ./target/release/garage -c tmp/config1.toml server
-
-run2:
-	RUST_LOG=garage=debug ./target/debug/garage -c tmp/config2.toml server
-run2rel:
-	RUST_LOG=garage=debug ./target/release/garage -c tmp/config2.toml server
-
-run3:
-	RUST_LOG=garage=debug ./target/debug/garage -c tmp/config3.toml server
-run3rel:
-	RUST_LOG=garage=debug ./target/release/garage -c tmp/config3.toml server
@@ -3,7 +3,7 @@ title = "Websites (Hugo, Jekyll, Publii...)"
 weight = 10
 +++

-Garage is also suitable [to host static websites](@/documentation/cookbook/exposing-websites.md).
+Garage is also suitable to host static websites.
 While they can be deployed with traditional CLI tools, some static website generators have integrated options to ease your workflow.

 | Name | Status | Note |
@@ -100,7 +100,7 @@ server {
 }
 ```

-### Exposing the web endpoint
+## Exposing the web endpoint

 To better understand the logic involved, you can refer to the [Exposing buckets as websites](/cookbook/exposing_websites.html) section.
 Otherwise, the configuration is very similar to the S3 endpoint.
@@ -140,143 +140,6 @@ server {

@TODO

-## Traefik v2
+## Traefik

-We will see in this part how to set up a reverse proxy with [Traefik](https://docs.traefik.io/).
-
-Here is [a basic configuration file](https://doc.traefik.io/traefik/https/acme/#configuration-examples):
-
-```toml
-[entryPoints]
-  [entryPoints.web]
-    address = ":80"
-
-  [entryPoints.websecure]
-    address = ":443"
-
-[certificatesResolvers.myresolver.acme]
-  email = "your-email@example.com"
-  storage = "acme.json"
-  [certificatesResolvers.myresolver.acme.httpChallenge]
-    # used during the challenge
-    entryPoint = "web"
-```
-
-### Add Garage service
-
-To add Garage on Traefik you should declare a new service using its IP address (or hostname) and port:
-
-```toml
-[http.services]
-  [http.services.my_garage_service.loadBalancer]
-    [[http.services.my_garage_service.loadBalancer.servers]]
-      url = "http://xxx.xxx.xxx.xxx"
-      port = 3900
-```
-
-It's possible to declare multiple Garage servers as back-ends:
-
-```toml
-[http.services]
-    [[http.services.my_garage_service.loadBalancer.servers]]
-      url = "http://xxx.xxx.xxx.xxx"
-      port = 3900
-    [[http.services.my_garage_service.loadBalancer.servers]]
-      url = "http://yyy.yyy.yyy.yyy"
-      port = 3900
-    [[http.services.my_garage_service.loadBalancer.servers]]
-      url = "http://zzz.zzz.zzz.zzz"
-      port = 3900
-```
-
-Traefik can remove unhealthy servers automatically with [a health check configuration](https://doc.traefik.io/traefik/routing/services/#health-check):
-
-```
-[http.services]
-  [http.services.my_garage_service.loadBalancer]
-    [http.services.my_garage_service.loadBalancer.healthCheck]
-      path = "/"
-      interval = "60s"
-      timeout = "5s"
-```
-
-### Adding a website
-
-To add a new website, add the following declaration to your Traefik configuration file:
-
-```toml
-[http.routers]
-  [http.routers.my_website]
-    rule = "Host(`yoururl.example.org`)"
-    service = "my_garage_service"
-    entryPoints = ["web"]
-```
-
-Enable HTTPS access to your website with the following configuration section ([documentation](https://doc.traefik.io/traefik/https/overview/)):
-
-```toml
-...
-    entryPoints = ["websecure"]
-    [http.routers.my_website.tls]
-      certResolver = "myresolver"
-...
-```
-
-### Adding gzip compression
-
-Add the following configuration section [to compress response](https://doc.traefik.io/traefik/middlewares/http/compress/) using [gzip](https://developer.mozilla.org/en-US/docs/Glossary/GZip_compression) before sending them to the client:
-
-```toml
-[http.routers]
-  [http.routers.my_website]
-    ...
-    middlewares = ["gzip_compress"]
-    ...
-[http.middlewares]
-  [http.middlewares.gzip_compress.compress]
-```
-
-### Add caching response
-
-Traefik's caching middleware is only available on [entreprise version](https://doc.traefik.io/traefik-enterprise/middlewares/http-cache/), however the freely-available [Souin plugin](https://github.com/darkweak/souin#tr%C3%A6fik-container) can also do the job. (section to be completed)
-
-### Complete example
-
-```toml
-[entryPoints]
-  [entryPoints.web]
-    address = ":80"
-
-  [entryPoints.websecure]
-    address = ":443"
-
-[certificatesResolvers.myresolver.acme]
-  email = "your-email@example.com"
-  storage = "acme.json"
-  [certificatesResolvers.myresolver.acme.httpChallenge]
-    # used during the challenge
-    entryPoint = "web"
-
-[http.routers]
-  [http.routers.my_website]
-    rule = "Host(`yoururl.example.org`)"
-    service = "my_garage_service"
-    middlewares = ["gzip_compress"]
-    entryPoints = ["websecure"]
-
-[http.services]
-  [http.services.my_garage_service.loadBalancer]
-    [http.services.my_garage_service.loadBalancer.healthCheck]
-      path = "/"
-      interval = "60s"
-      timeout = "5s"
-    [[http.services.my_garage_service.loadBalancer.servers]]
-      url = "http://xxx.xxx.xxx.xxx"
-    [[http.services.my_garage_service.loadBalancer.servers]]
-      url = "http://yyy.yyy.yyy.yyy"
-    [[http.services.my_garage_service.loadBalancer.servers]]
-      url = "http://zzz.zzz.zzz.zzz"
-
-[http.middlewares]
-  [http.middlewares.gzip_compress.compress]
-```
+@TODO
@@ -249,6 +249,16 @@ mc alias set \
  --api S3v4
 ```

+You must also add an environment variable to your configuration to
+inform MinIO of our region (`garage` by default, corresponding to the `s3_region` parameter
+in the configuration file).
+The best way is to add the following snippet to your `$HOME/.bash_profile`
+or `$HOME/.bashrc` file:
+
+```bash
+export MC_REGION=garage
+```
+
 ### Use `mc`

 You can not list buckets from `mc` currently.
@@ -134,8 +134,8 @@ Example request body:

 ```json
 [
-    "ec79480e0ce52ae26fd00c9da684e4fa56658d9c64cdcecb094e936de0bfe71f@10.0.0.11:3901",
-    "4a6ae5a1d0d33bf895f5bb4f0a418b7dc94c47c0dd2eb108d1158f3c8f60b0ff@10.0.0.12:3901"
+	"ec79480e0ce52ae26fd00c9da684e4fa56658d9c64cdcecb094e936de0bfe71f@10.0.0.11:3901",
+	"4a6ae5a1d0d33bf895f5bb4f0a418b7dc94c47c0dd2eb108d1158f3c8f60b0ff@10.0.0.12:3901"
 ]
 ```

@@ -145,14 +145,14 @@ Example response:

 ```json
 [
-    {
-        "success": true,
-        "error": null
-    },
-    {
-        "success": false,
-        "error": "Handshake error"
-    }
+	{
+		"success": true,
+		"error": null
+	},
+	{
+		"success": false,
+		"error": "Handshake error"
+	}
 ]
 ```

@@ -301,7 +301,7 @@ Request body format:

 ```json
 {
-    "name": "NameOfMyKey"
+	"name": "NameOfMyKey"
 }
 ```

@@ -313,9 +313,9 @@ Request body format:

 ```json
 {
-    "accessKeyId": "GK31c2f218a2e44f485b94239e",
-    "secretAccessKey": "b892c0665f0ada8a4755dae98baa3b133590e11dae3bcc1f9d769d67f16c3835",
-    "name": "NameOfMyKey"
+	"accessKeyId": "GK31c2f218a2e44f485b94239e",
+	"secretAccessKey": "b892c0665f0ada8a4755dae98baa3b133590e11dae3bcc1f9d769d67f16c3835",
+	"name": "NameOfMyKey"
 }
 ```

@@ -403,11 +403,11 @@ Request body format:

 ```json
 {
-    "name": "NameOfMyKey",
-    "allow": {
-        "createBucket": true,
-    },
-    "deny": {}
+	"name": "NameOfMyKey",
+	"allow": {
+		"createBucket": true,
+	},
+	"deny": {}
 }
 ```

@@ -473,31 +473,24 @@ Example response:

 ```json
 {
-    "id": "afa8f0a22b40b1247ccd0affb869b0af5cff980924a20e4b5e0720a44deb8d39",
-        "globalAliases": [],
-        "websiteAccess": false,
-        "websiteConfig": null,
-        "keys": [
-        {
-            "accessKeyId": "GK31c2f218a2e44f485b94239e",
-            "name": "Imported key",
-            "permissions": {
-                "read": true,
-                "write": true,
-                "owner": true
-            },
-            "bucketLocalAliases": [
-                "debug"
-            ]
-        }
-        ],
-        "objects": 14827,
-        "bytes": 13189855625,
-        "unfinshedUploads": 0,
-        "quotas": {
-            "maxSize": null,
-            "maxObjects": null
-        }
+  "id": "e6a14cd6a27f48684579ec6b381c078ab11697e6bc8513b72b2f5307e25fff9b",
+  "globalAliases": [
+    "alex"
+  ],
+  "keys": [
+    {
+      "accessKeyId": "GK31c2f218a2e44f485b94239e",
+      "name": "alex",
+      "permissions": {
+        "read": true,
+        "write": true,
+        "owner": true
+      },
+      "bucketLocalAliases": [
+        "test"
+      ]
+    }
+  ]
 }
 ```

@@ -509,7 +502,7 @@ Request body format:

 ```json
 {
-    "globalAlias": "NameOfMyBucket"
+	"globalAlias": "NameOfMyBucket"
 }
 ```

@@ -517,15 +510,15 @@ OR

 ```json
 {
-    "localAlias": {
-        "accessKeyId": "GK31c2f218a2e44f485b94239e",
-        "alias": "NameOfMyBucket",
-        "allow": {
-            "read": true,
-            "write": true,
-            "owner": false
-        }
-    }
+	"localAlias": {
+		"accessKeyId": "GK31c2f218a2e44f485b94239e",
+		"alias": "NameOfMyBucket",
+		"allow": {
+			"read": true,
+			"write": true,
+			"owner": false
+		}
+	}
 }
 ```

@@ -547,37 +540,26 @@ Deletes a storage bucket. A bucket cannot be deleted if it is not empty.

 Warning: this will delete all aliases associated with the bucket!

-#### UpdateBucket `PUT /v0/bucket?id=<bucket id>`
+#### PutBucketWebsite `PUT /v0/bucket/website?id=<bucket id>`

-Updates configuration of the given bucket.
+Sets the website configuration for a bucket (this also enables website access for this bucket).

 Request body format:

 ```json
 {
-    "websiteAccess": {
-        "enabled": true,
-        "indexDocument": "index.html",
-        "errorDocument": "404.html"
-    },
-    "quotas": {
-        "maxSize": 19029801,
-        "maxObjects": null,
-    }
+	"indexDocument": "index.html",
+	"errorDocument": "404.html"
 }
 ```

-All fields (`websiteAccess` and `quotas`) are optionnal.
-If they are present, the corresponding modifications are applied to the bucket, otherwise nothing is changed.
+The field `errorDocument` is optional, if no error document is set a generic error message is displayed when errors happen.

-In `websiteAccess`: if `enabled` is `true`, `indexDocument` must be specified.
-The field `errorDocument` is optional, if no error document is set a generic
-error message is displayed when errors happen. Conversely, if `enabled` is
-`false`, neither `indexDocument` nor `errorDocument` must be specified.

-In `quotas`: new values of `maxSize` and `maxObjects` must both be specified, or set to `null`
-to remove the quotas. An absent value will be considered the same as a `null`. It is not possible
-to change only one of the two quotas.
+#### DeleteBucketWebsite `DELETE /v0/bucket/website?id=<bucket id>`
+
+Deletes the website configuration for a bucket (disables website access for this bucket).
+

 ### Operations on permissions for keys on buckets

@@ -589,13 +571,13 @@ Request body format:

 ```json
 {
-    "bucketId": "e6a14cd6a27f48684579ec6b381c078ab11697e6bc8513b72b2f5307e25fff9b",
-    "accessKeyId": "GK31c2f218a2e44f485b94239e",
-    "permissions": {
-        "read": true,
-        "write": true,
-        "owner": true
-    },
+	"bucketId": "e6a14cd6a27f48684579ec6b381c078ab11697e6bc8513b72b2f5307e25fff9b",
+	"accessKeyId": "GK31c2f218a2e44f485b94239e",
+	"permissions": {
+		"read": true,
+		"write": true,
+		"owner": true
+	},
 }
 ```

@@ -610,13 +592,13 @@ Request body format:

 ```json
 {
-    "bucketId": "e6a14cd6a27f48684579ec6b381c078ab11697e6bc8513b72b2f5307e25fff9b",
-    "accessKeyId": "GK31c2f218a2e44f485b94239e",
-    "permissions": {
-        "read": false,
-        "write": false,
-        "owner": true
-    },
+	"bucketId": "e6a14cd6a27f48684579ec6b381c078ab11697e6bc8513b72b2f5307e25fff9b",
+	"accessKeyId": "GK31c2f218a2e44f485b94239e",
+	"permissions": {
+		"read": false,
+		"write": false,
+		"owner": true
+	},
 }
 ```

@@ -148,7 +148,7 @@ Please open an issue if you have a use case for replication.
 | [PutBucketReplication](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketReplication.html) | ❌ Missing | ❌| ⚠ | ❌| ❌|

 *Note: Ceph documentation briefly says that Ceph supports
-[replication through the S3 API](https://docs.ceph.com/en/latest/radosgw/multisite-sync-policy/#s3-replication-api)
+[replication though the S3 API](https://docs.ceph.com/en/latest/radosgw/multisite-sync-policy/#s3-replication-api)
 but with some limitations.
 Additionaly, replication endpoints are not documented in the S3 compatibility page so I don't know what kind of support we can expect.*

@@ -1,14 +0,0 @@
-*
-
-!assets
-
-!.gitignore
-!*.svg
-!*.png
-!*.jpg
-!*.tex
-!Makefile
-!.gitignore
-!assets/*.drawio.pdf
-
-!talk.pdf
@@ -1,5 +0,0 @@
-talk.pdf: talk.tex assets/consistent_hashing_1.pdf assets/consistent_hashing_2.pdf assets/consistent_hashing_3.pdf assets/consistent_hashing_4.pdf assets/garage_tables.pdf assets/deuxfleurs.pdf
-	pdflatex talk.tex
-
-assets/%.pdf: assets/%.svg
-	inkscape -D -z --file=$^ --export-pdf=$@
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9198d0cfc0e04a56f84a353dd660b294ecf0dc68fe429892c8e9e604de016748
-size 31966
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:14dbf4a45545889babb2fdc6580399811366f6cc786cb28e3467cbcedbfe9482
-size 31688
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:21a3bb004ad35c8b47f14195c720048f8db31f47bd6346c1d747000570149c67
-size 31073
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c4e109078a784c3999ca2ccd1adda8ff5793d1b230a9e27b4ad2e419afa0d37d
-size 25145
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   viewBox="0 0 70.424515 70.300102"
-   version="1.1"
-   id="svg8"
-   sodipodi:docname="logo.svg"
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
-   inkscape:export-filename="/home/quentin/Documents/dev/deuxfleurs/site/src/img/logo.png"
-   inkscape:export-xdpi="699.30194"
-   inkscape:export-ydpi="699.30194"
-   width="70.424515"
-   height="70.300102"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs12" />
-  <sodipodi:namedview
-     id="namedview10"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="12.125"
-     inkscape:cx="43.092783"
-     inkscape:cy="48.082474"
-     inkscape:window-width="3072"
-     inkscape:window-height="1659"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg8" />
-  <g
-     id="g79969"
-     transform="translate(-0.827,34.992103)">
-    <path
-       fill="#ffffff"
-       d="m 15.632,34.661 c -0.799,-0.597 -1.498,-1.484 -2.035,-2.592 l -0.228,-0.47 -0.46,0.249 c -0.975,0.528 -1.913,0.858 -2.744,0.969 L 9.963,29.061 6.327,30.029 C 6.17,29.175 6.202,28.142 6.423,27.007 L 6.526,26.482 5.994,26.416 C 4.752,26.262 3.688,25.891 2.89,25.336 L 4.411,22.419 1.423,20.896 C 1.742,19.952 2.371,19.014 3.257,18.161 L 3.634,17.798 3.255,17.438 C 2.452,16.674 1.847,15.884 1.485,15.127 L 4.995,13.774 2.95,10.615 C 3.69,10.213 4.643,9.929 5.739,9.783 L 6.258,9.715 6.167,9.201 C 5.952,7.99 5.995,6.863 6.291,5.913 l 3.308,0.523 0.524,-3.308 c 0.988,0.013 2.08,0.326 3.164,0.907 L 13.749,4.283 13.975,3.81 C 14.454,2.807 15.019,1.986 15.628,1.406 L 18,4.326 20.372,1.406 c 0.609,0.58 1.175,1.401 1.653,2.404 l 0.226,0.473 0.462,-0.247 C 23.798,3.455 24.891,3.142 25.877,3.13 L 26.4,6.438 29.71,5.913 c 0.296,0.951 0.34,2.078 0.124,3.288 l -0.092,0.515 0.518,0.069 c 1.095,0.145 2.048,0.43 2.788,0.832 l -2.046,3.156 3.511,1.355 c -0.361,0.757 -0.966,1.547 -1.77,2.311 l -0.379,0.36 0.377,0.363 c 0.888,0.854 1.516,1.793 1.835,2.736 l -2.984,1.52 1.521,2.984 c -0.812,0.574 -1.871,0.964 -3.094,1.134 l -0.518,0.072 0.096,0.514 c 0.201,1.089 0.226,2.083 0.073,2.909 l -3.634,-0.97 -0.204,3.757 c -0.83,-0.11 -1.768,-0.44 -2.742,-0.968 l -0.459,-0.249 -0.228,0.47 c -0.539,1.107 -1.237,1.994 -2.036,2.591 L 18,32.293 Z"
-       id="path2" />
-    <path
-       d="M 7.092,10.678 C 6.562,9.189 6.394,7.708 6.66,6.478 l 2.368,0.375 0.987,0.156 0.157,-0.988 0.375,-2.368 C 11.808,3.78 13.16,4.396 14.409,5.359 14.527,5.022 14.653,4.696 14.791,4.392 13.24,3.257 11.568,2.629 10.061,2.629 9.938,2.629 9.816,2.633 9.695,2.642 L 9.184,5.865 5.96,5.354 C 5.36,6.841 5.395,8.769 6.045,10.747 6.38,10.71 6.729,10.686 7.092,10.678 Z M 21.593,5.359 c 1.248,-0.962 2.6,-1.578 3.86,-1.705 l 0.376,2.368 0.156,0.988 0.987,-0.157 2.369,-0.376 c 0.266,1.23 0.098,2.71 -0.432,4.2 0.361,0.009 0.711,0.032 1.046,0.07 C 30.606,8.769 30.64,6.841 30.04,5.353 L 26.815,5.865 26.304,2.641 c -0.12,-0.008 -0.242,-0.012 -0.365,-0.012 -1.507,0 -3.179,0.628 -4.73,1.762 0.14,0.306 0.266,0.631 0.384,0.968 z M 7.368,27 h 0.035 c 0.067,0 0.157,-0.604 0.26,-0.947 -0.098,0.004 -0.197,0.046 -0.294,0.046 -1.496,0 -2.826,-0.303 -3.83,-0.89 L 4.628,23.081 5.082,22.194 4.191,21.742 2.055,20.654 C 2.563,19.503 3.57,18.404 4.873,17.511 4.586,17.292 4.312,17.07 4.063,16.842 2.376,18.059 1.217,19.597 0.828,21.152 l 2.908,1.483 -1.482,2.843 C 3.475,26.501 5.303,27 7.368,27 Z m 27.806,-5.846 c -0.39,-1.555 -1.548,-3.093 -3.234,-4.311 -0.25,0.228 -0.523,0.451 -0.81,0.669 1.304,0.893 2.31,1.992 2.817,3.145 l -2.136,1.088 -0.891,0.453 0.454,0.892 1.089,2.137 c -1.004,0.587 -2.332,0.904 -3.828,0.904 -0.099,0 -0.199,-0.01 -0.299,-0.013 0.103,0.344 0.192,0.683 0.26,1.011 l 0.039,0.002 c 2.066,0 3.892,-0.563 5.112,-1.587 l -1.482,-2.908 z m -12.653,9.182 c -0.447,1.517 -1.181,2.812 -2.119,3.651 L 18.707,32.293 18,31.586 l -0.707,0.707 -1.695,1.694 c -0.938,-0.839 -1.673,-2.136 -2.12,-3.652 -0.296,0.206 -0.593,0.397 -0.886,0.563 0.636,1.98 1.741,3.559 3.1,4.409 L 18,33 l 2.308,2.308 c 1.358,-0.851 2.464,-2.428 3.101,-4.408 -0.295,-0.168 -0.591,-0.359 -0.888,-0.564 z"
-       fill="#ea596e"
-       id="path4" />
-    <path
-       fill="#ea596e"
-       d="m 20.118,5.683 c 0.426,1.146 0.748,2.596 0.841,4.284 l 0.2,3.683 3.564,-0.946 c 1.32,-0.351 2.655,-0.536 3.86,-0.536 0.16,0 0.318,0.003 0.474,0.01 l -1.827,2.819 3.139,1.211 c -0.958,0.759 -2.237,1.514 -3.814,2.123 l -3.441,1.328 2.001,3.099 c 0.918,1.42 1.509,2.782 1.838,3.96 L 23.709,25.853 23.527,29.21 C 22.508,28.533 21.395,27.55 20.329,26.237 L 18,23.374 15.672,26.236 c -1.066,1.312 -2.179,2.295 -3.198,2.972 l -0.18,-3.354 -3.248,0.864 c 0.329,-1.178 0.921,-2.54 1.839,-3.961 L 12.889,19.658 9.447,18.33 C 7.87,17.721 6.591,16.967 5.633,16.208 L 8.768,15 6.941,12.177 c 0.155,-0.006 0.313,-0.01 0.473,-0.01 1.206,0 2.541,0.185 3.861,0.536 l 3.564,0.947 0.202,-3.683 c 0.092,-1.688 0.415,-3.138 0.84,-4.284 L 18,8.292 20.118,5.683 M 20.308,0.692 18,3.533 15.692,0.692 C 13.703,2.224 12.271,5.684 12.046,9.804 10.429,9.374 8.854,9.167 7.414,9.167 c -2.11,0 -3.929,0.445 -5.161,1.289 l 1.989,3.073 -3.415,1.316 c 0.842,2.366 3.69,4.797 7.54,6.283 -2.241,3.465 -3.116,7.106 -2.407,9.516 l 3.537,-0.941 0.196,3.654 c 2.512,-0.07 5.703,-2.027 8.307,-5.228 2.603,3.201 5.796,5.158 8.306,5.228 l 0.198,-3.655 3.535,0.943 c 0.71,-2.411 -0.165,-6.05 -2.404,-9.517 3.849,-1.485 6.696,-3.918 7.538,-6.283 l -3.415,-1.318 1.99,-3.07 c -1.233,-0.844 -3.053,-1.29 -5.164,-1.29 -1.438,0 -3.013,0.207 -4.63,0.636 C 23.729,5.684 22.297,2.224 20.308,0.692 Z"
-       id="path6" />
-  </g>
-  <g
-     id="g79964"
-     transform="translate(-1.043816,35.993714)">
-    <path
-       fill="#ffffff"
-       d="m 51.92633,-2.0247139 c -0.799,-0.597 -1.498,-1.484 -2.035,-2.592 l -0.228,-0.47 -0.46,0.249 c -0.975,0.528 -1.913,0.858 -2.744,0.969 l -0.202,-3.7560001 -3.636,0.968 c -0.157,-0.854 -0.125,-1.887 0.096,-3.022 l 0.103,-0.525 -0.532,-0.066 c -1.242,-0.154 -2.306,-0.525 -3.104,-1.08 l 1.521,-2.917 -2.988,-1.523 c 0.319,-0.944 0.948,-1.882 1.834,-2.735 l 0.377,-0.363 -0.379,-0.36 c -0.803,-0.764 -1.408,-1.554 -1.77,-2.311 l 3.51,-1.353 -2.045,-3.159 c 0.74,-0.402 1.693,-0.686 2.789,-0.832 l 0.519,-0.068 -0.091,-0.514 c -0.215,-1.211 -0.172,-2.338 0.124,-3.288 l 3.308,0.523 0.524,-3.308 c 0.988,0.013 2.08,0.326 3.164,0.907 l 0.462,0.248 0.226,-0.473 c 0.479,-1.003 1.044,-1.824 1.653,-2.404 l 2.372,2.92 2.372,-2.92 c 0.609,0.58 1.175,1.401 1.653,2.404 l 0.226,0.473 0.462,-0.247 c 1.085,-0.581 2.178,-0.894 3.164,-0.906 l 0.523,3.308 3.31,-0.525 c 0.296,0.951 0.34,2.078 0.124,3.288 l -0.092,0.515 0.518,0.069 c 1.095,0.145 2.048,0.43 2.788,0.832 l -2.046,3.156 3.511,1.355 c -0.361,0.757 -0.966,1.547 -1.77,2.311 l -0.379,0.36 0.377,0.363 c 0.888,0.854 1.516,1.793 1.835,2.736 l -2.984,1.52 1.521,2.984 c -0.812,0.574 -1.871,0.964 -3.094,1.134 l -0.518,0.072 0.096,0.514 c 0.201,1.089 0.226,2.083 0.073,2.909 l -3.634,-0.97 -0.204,3.7570001 c -0.83,-0.11 -1.768,-0.44 -2.742,-0.968 l -0.459,-0.249 -0.228,0.47 c -0.539,1.107 -1.237,1.994 -2.036,2.591 l -2.367,-2.369 z"
-       id="path2-9" />
-    <path
-       d="m 43.38633,-26.007714 c -0.53,-1.489 -0.698,-2.97 -0.432,-4.2 l 2.368,0.375 0.987,0.156 0.157,-0.988 0.375,-2.368 c 1.261,0.127 2.613,0.743 3.862,1.706 0.118,-0.337 0.244,-0.663 0.382,-0.967 -1.551,-1.135 -3.223,-1.763 -4.73,-1.763 -0.123,0 -0.245,0.004 -0.366,0.013 l -0.511,3.223 -3.224,-0.511 c -0.6,1.487 -0.565,3.415 0.085,5.393 0.335,-0.037 0.684,-0.061 1.047,-0.069 z m 14.501,-5.319 c 1.248,-0.962 2.6,-1.578 3.86,-1.705 l 0.376,2.368 0.156,0.988 0.987,-0.157 2.369,-0.376 c 0.266,1.23 0.098,2.71 -0.432,4.2 0.361,0.009 0.711,0.032 1.046,0.07 0.651,-1.978 0.685,-3.906 0.085,-5.394 l -3.225,0.512 -0.511,-3.224 c -0.12,-0.008 -0.242,-0.012 -0.365,-0.012 -1.507,0 -3.179,0.628 -4.73,1.762 0.14,0.306 0.266,0.631 0.384,0.968 z m -14.225,21.641 h 0.035 c 0.067,0 0.157,-0.604 0.26,-0.947 -0.098,0.004 -0.197,0.046 -0.294,0.046 -1.496,0 -2.826,-0.303 -3.83,-0.89 l 1.089,-2.128 0.454,-0.887 -0.891,-0.452 -2.136,-1.088 c 0.508,-1.151 1.515,-2.25 2.818,-3.143 -0.287,-0.219 -0.561,-0.441 -0.81,-0.669 -1.687,1.217 -2.846,2.755 -3.235,4.31 l 2.908,1.483 -1.482,2.843 c 1.221,1.023 3.049,1.522 5.114,1.522 z m 27.806,-5.846 c -0.39,-1.555 -1.548,-3.093 -3.234,-4.311 -0.25,0.228 -0.523,0.451 -0.81,0.669 1.304,0.893 2.31,1.992 2.817,3.145 l -2.136,1.088 -0.891,0.453 0.454,0.892 1.089,2.137 c -1.004,0.587 -2.332,0.904 -3.828,0.904 -0.099,0 -0.199,-0.01 -0.299,-0.013 0.103,0.344 0.192,0.683 0.26,1.011 l 0.039,0.002 c 2.066,0 3.892,-0.563 5.112,-1.587 l -1.482,-2.908 z m -12.653,9.182 c -0.447,1.5170001 -1.181,2.8120001 -2.119,3.6510001 l -1.695,-1.694 -0.707,-0.707 -0.707,0.707 -1.695,1.694 c -0.938,-0.839 -1.673,-2.136 -2.12,-3.6520001 -0.296,0.2060001 -0.593,0.3970001 -0.886,0.5630001 0.636,1.98 1.741,3.559 3.1,4.409 l 2.308,-2.307 2.308,2.308 c 1.358,-0.851 2.464,-2.428 3.101,-4.408 -0.295,-0.168 -0.591,-0.359 -0.888,-0.5640001 z"
-       fill="#ea596e"
-       id="path4-3" />
-    <path
-       fill="#ea596e"
-       d="m 56.41233,-31.002714 c 0.426,1.146 0.748,2.596 0.841,4.284 l 0.2,3.683 3.564,-0.946 c 1.32,-0.351 2.655,-0.536 3.86,-0.536 0.16,0 0.318,0.003 0.474,0.01 l -1.827,2.819 3.139,1.211 c -0.958,0.759 -2.237,1.514 -3.814,2.123 l -3.441,1.328 2.001,3.099 c 0.918,1.42 1.509,2.782 1.838,3.96 l -3.244,-0.865 -0.182,3.357 c -1.019,-0.677 -2.132,-1.66 -3.198,-2.973 l -2.329,-2.863 -2.328,2.862 c -1.066,1.312 -2.179,2.295 -3.198,2.972 l -0.18,-3.354 -3.248,0.864 c 0.329,-1.178 0.921,-2.54 1.839,-3.961 l 2.004,-3.099 -3.442,-1.328 c -1.577,-0.609 -2.856,-1.363 -3.814,-2.122 l 3.135,-1.208 -1.827,-2.823 c 0.155,-0.006 0.313,-0.01 0.473,-0.01 1.206,0 2.541,0.185 3.861,0.536 l 3.564,0.947 0.202,-3.683 c 0.092,-1.688 0.415,-3.138 0.84,-4.284 l 2.119,2.609 2.118,-2.609 m 0.19,-4.991 -2.308,2.841 -2.308,-2.841 c -1.989,1.532 -3.421,4.992 -3.646,9.112 -1.617,-0.43 -3.192,-0.637 -4.632,-0.637 -2.11,0 -3.929,0.445 -5.161,1.289 l 1.989,3.073 -3.415,1.316 c 0.842,2.366 3.69,4.797 7.54,6.283 -2.241,3.465 -3.116,7.106 -2.407,9.5160001 l 3.537,-0.9410001 0.196,3.6540001 c 2.512,-0.07 5.703,-2.027 8.307,-5.2280001 2.603,3.2010001 5.796,5.1580001 8.306,5.2280001 l 0.198,-3.6550001 3.535,0.9430001 c 0.71,-2.4110001 -0.165,-6.0500001 -2.404,-9.5170001 3.849,-1.485 6.696,-3.918 7.538,-6.283 l -3.415,-1.318 1.99,-3.07 c -1.233,-0.844 -3.053,-1.29 -5.164,-1.29 -1.438,0 -3.013,0.207 -4.63,0.636 -0.225,-4.119 -1.657,-7.579 -3.646,-9.111 z"
-       id="path6-6" />
-  </g>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:42.6667px;line-height:1.25;font-family:sans-serif;fill:#ea596e;fill-opacity:1;stroke:none"
-     x="2.2188232"
-     y="31.430677"
-     id="text46212"><tspan
-       sodipodi:role="line"
-       id="tspan46210"
-       x="2.2188232"
-       y="31.430677"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42.6667px;font-family:'TeX Gyre Termes';-inkscape-font-specification:'TeX Gyre Termes'">D</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:42.6667px;line-height:1.25;font-family:sans-serif;fill:#ea596e;fill-opacity:1;stroke:none"
-     x="41.347008"
-     y="67.114784"
-     id="text46212-1"><tspan
-       sodipodi:role="line"
-       id="tspan46210-5"
-       x="41.347008"
-       y="67.114784"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42.6667px;font-family:'TeX Gyre Termes';-inkscape-font-specification:'TeX Gyre Termes'">F</tspan></text>
-</svg>
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0d9ca1a04f943664e14d0e1edbde596789e4798f8ad5e1cff68bc9dd0cc1334f
-size 26098
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bffa5d4a72ad25e0b18b43022258a2e4471ce94ff5397aab892fe43ec9d4d7d5
-size 33911
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9c4913b52e84b5af3f8effbcb7e2060845a8c6f43d5b38072b9ee33c0300d49f
-size 31051
@@ -1,537 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="850"
-   height="480"
-   viewBox="0 0 224.89584 127"
-   version="1.1"
-   id="svg8"
-   inkscape:version="1.2 (dc2aedaf03, 2022-05-15)"
-   sodipodi:docname="garage_tables.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <defs
-     id="defs2">
-    <marker
-       style="overflow:visible"
-       id="marker1262"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Mend"
-       inkscape:isstock="true">
-      <path
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         id="path1260" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow1Mend"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Mend"
-       inkscape:isstock="true"
-       inkscape:collect="always">
-      <path
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         id="path965" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lend"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lend"
-       inkscape:isstock="true">
-      <path
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         id="path959" />
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.98994949"
-     inkscape:cx="429.31483"
-     inkscape:cy="289.40871"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     inkscape:document-rotation="0"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="1678"
-     inkscape:window-height="993"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-       x="39.570904"
-       y="38.452755"
-       id="text2025"><tspan
-         sodipodi:role="line"
-         id="tspan2023"
-         x="39.570904"
-         y="38.452755"
-         style="font-size:5.64444px;stroke-width:0.264583" /></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-       x="101.95796"
-       y="92.835831"
-       id="text2139"><tspan
-         sodipodi:role="line"
-         id="tspan2137"
-         x="101.95796"
-         y="92.835831"
-         style="stroke-width:0.264583"> </tspan></text>
-    <g
-       id="g2316"
-       transform="translate(-11.455511,1.5722486)">
-      <g
-         id="g2277">
-        <rect
-           style="fill:none;stroke:#000000;stroke-width:0.8;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="rect833"
-           width="47.419891"
-           height="95.353409"
-           x="18.534418"
-           y="24.42766" />
-        <rect
-           style="fill:none;stroke:#000000;stroke-width:0.799999;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="rect833-3"
-           width="47.419891"
-           height="86.973076"
-           x="18.534418"
-           y="32.807987" />
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-           x="32.250839"
-           y="29.894743"
-           id="text852"><tspan
-             sodipodi:role="line"
-             id="tspan850"
-             x="32.250839"
-             y="29.894743"
-             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:5.64444px;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono Bold';stroke-width:0.264583">Object</tspan></text>
-      </g>
-      <g
-         id="g2066"
-         transform="translate(-2.1807817,-3.0621439)">
-        <g
-           id="g1969"
-           transform="matrix(0.12763631,0,0,0.12763631,0.7215051,24.717273)"
-           style="fill:#ff6600;fill-opacity:1;stroke:none;stroke-opacity:1">
-          <path
-             style="fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-opacity:1"
-             d="m 203.71837,154.80038 c -1.11451,3.75057 -2.45288,5.84095 -5.11132,7.98327 -2.2735,1.83211 -4.66721,2.65982 -8.09339,2.79857 -2.59227,0.10498 -2.92868,0.0577 -5.02863,-0.70611 -3.99215,-1.45212 -7.1627,-4.65496 -8.48408,-8.57046 -1.28374,-3.80398 -0.61478,-8.68216 1.64793,-12.01698 0.87317,-1.28689 3.15089,-3.48326 4.18771,-4.03815 l 0.53332,-28.51234 5.78454,-5.09197 6.95158,6.16704 -3.21112,3.49026 3.17616,3.45499 -3.17616,3.40822 2.98973,3.28645 -3.24843,3.3829 4.49203,4.58395 0.0516,5.69106 c 1.06874,0.64848 3.81974,3.24046 4.69548,4.56257 0.452,0.68241 1.06834,2.0197 1.36962,2.97176 0.62932,1.98864 0.88051,5.785 0.47342,7.15497 z m -10.0406,2.32604 c -0.88184,-3.17515 -4.92402,-3.78864 -6.75297,-1.02492 -0.58328,0.8814 -0.6898,1.28852 -0.58362,2.23056 0.26492,2.35041 2.45434,3.95262 4.60856,3.37255 1.19644,-0.32217 2.39435,-1.44872 2.72875,-2.56621 0.30682,-1.02529 0.30686,-0.9045 -7.9e-4,-2.01198 z"
-             id="path1971"
-             sodipodi:nodetypes="ssscsscccccccccccssscsssscc" />
-        </g>
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-           x="28.809687"
-           y="44.070885"
-           id="text852-9"><tspan
-             sodipodi:role="line"
-             id="tspan850-4"
-             x="28.809687"
-             y="44.070885"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono Bold';stroke-width:0.264583">bucket </tspan></text>
-      </g>
-      <g
-         id="g2066-7"
-         transform="translate(-2.1807817,6.2627616)">
-        <g
-           id="g1969-8"
-           transform="matrix(0.12763631,0,0,0.12763631,0.7215051,24.717273)"
-           style="fill:#ff6600;fill-opacity:1;stroke:none;stroke-opacity:1">
-          <path
-             style="fill:#4040ff;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-opacity:1"
-             d="m 203.71837,154.80038 c -1.11451,3.75057 -2.45288,5.84095 -5.11132,7.98327 -2.2735,1.83211 -4.66721,2.65982 -8.09339,2.79857 -2.59227,0.10498 -2.92868,0.0577 -5.02863,-0.70611 -3.99215,-1.45212 -7.1627,-4.65496 -8.48408,-8.57046 -1.28374,-3.80398 -0.61478,-8.68216 1.64793,-12.01698 0.87317,-1.28689 3.15089,-3.48326 4.18771,-4.03815 l 0.53332,-28.51234 5.78454,-5.09197 6.95158,6.16704 -3.21112,3.49026 3.17616,3.45499 -3.17616,3.40822 2.98973,3.28645 -3.24843,3.3829 4.49203,4.58395 0.0516,5.69106 c 1.06874,0.64848 3.81974,3.24046 4.69548,4.56257 0.452,0.68241 1.06834,2.0197 1.36962,2.97176 0.62932,1.98864 0.88051,5.785 0.47342,7.15497 z m -10.0406,2.32604 c -0.88184,-3.17515 -4.92402,-3.78864 -6.75297,-1.02492 -0.58328,0.8814 -0.6898,1.28852 -0.58362,2.23056 0.26492,2.35041 2.45434,3.95262 4.60856,3.37255 1.19644,-0.32217 2.39435,-1.44872 2.72875,-2.56621 0.30682,-1.02529 0.30686,-0.9045 -7.9e-4,-2.01198 z"
-             id="path1971-4"
-             sodipodi:nodetypes="ssscsscccccccccccssscsssscc" />
-        </g>
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-           x="28.809687"
-           y="44.070885"
-           id="text852-9-5"><tspan
-             sodipodi:role="line"
-             id="tspan850-4-0"
-             x="28.809687"
-             y="44.070885"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono Bold';stroke-width:0.264583">file path </tspan></text>
-        <path
-           style="fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.0337704;stroke-opacity:1"
-           d="m 174.20027,104.45585 c -0.14225,0.47871 -0.31308,0.74552 -0.65239,1.01896 -0.29018,0.23384 -0.5957,0.33949 -1.03301,0.3572 -0.33087,0.0134 -0.37381,0.007 -0.64184,-0.0901 -0.50954,-0.18534 -0.91422,-0.59414 -1.08287,-1.0939 -0.16385,-0.48552 -0.0785,-1.10816 0.21033,-1.5338 0.11145,-0.16426 0.40217,-0.44459 0.53451,-0.51542 l 0.0681,-3.639207 0.73832,-0.64992 0.88727,0.787138 -0.40986,0.445484 0.4054,0.440982 -0.4054,0.435013 0.3816,0.41947 -0.41461,0.43178 0.57334,0.58508 0.007,0.72639 c 0.13641,0.0828 0.48753,0.4136 0.59931,0.58235 0.0577,0.0871 0.13636,0.25778 0.17481,0.3793 0.0803,0.25382 0.11239,0.73838 0.0604,0.91323 z m -1.28154,0.29689 c -0.11256,-0.40526 -0.62849,-0.48357 -0.86193,-0.13082 -0.0745,0.1125 -0.088,0.16447 -0.0745,0.2847 0.0338,0.3 0.31326,0.5045 0.58822,0.43046 0.15271,-0.0411 0.30561,-0.1849 0.34829,-0.32754 0.0392,-0.13086 0.0392,-0.11544 -1e-4,-0.2568 z"
-           id="path1971-3"
-           sodipodi:nodetypes="ssscsscccccccccccssscsssscc" />
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-           x="177.8474"
-           y="104.05132"
-           id="text852-9-6"><tspan
-             sodipodi:role="line"
-             id="tspan850-4-7"
-             x="177.8474"
-             y="104.05132"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono Bold';stroke-width:0.264583">= partition key </tspan></text>
-        <path
-           style="fill:#4040ff;fill-opacity:1;stroke:none;stroke-width:0.0337704;stroke-opacity:1"
-           d="m 174.20027,113.78076 c -0.14225,0.47871 -0.31308,0.74552 -0.65239,1.01895 -0.29018,0.23385 -0.5957,0.33949 -1.03301,0.3572 -0.33087,0.0134 -0.37381,0.007 -0.64184,-0.0901 -0.50954,-0.18534 -0.91422,-0.59414 -1.08287,-1.0939 -0.16385,-0.48553 -0.0785,-1.10816 0.21033,-1.53381 0.11145,-0.16425 0.40217,-0.44459 0.53451,-0.51541 l 0.0681,-3.63921 0.73832,-0.64992 0.88727,0.78714 -0.40986,0.44548 0.4054,0.44098 -0.4054,0.43502 0.3816,0.41947 -0.41461,0.43178 0.57334,0.58508 0.007,0.72638 c 0.13641,0.0828 0.48753,0.4136 0.59931,0.58235 0.0577,0.0871 0.13636,0.25779 0.17481,0.37931 0.0803,0.25382 0.11239,0.73837 0.0604,0.91323 z m -1.28154,0.29689 c -0.11256,-0.40527 -0.62849,-0.48357 -0.86193,-0.13082 -0.0745,0.1125 -0.088,0.16446 -0.0745,0.2847 0.0338,0.3 0.31326,0.5045 0.58822,0.43046 0.15271,-0.0411 0.30561,-0.18491 0.34829,-0.32754 0.0392,-0.13087 0.0392,-0.11545 -1e-4,-0.2568 z"
-           id="path1971-4-5"
-           sodipodi:nodetypes="ssscsscccccccccccssscsssscc" />
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-           x="177.8474"
-           y="113.37622"
-           id="text852-9-5-3"><tspan
-             sodipodi:role="line"
-             id="tspan850-4-0-5"
-             x="177.8474"
-             y="113.37622"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono Bold';stroke-width:0.264583">= sort key </tspan></text>
-      </g>
-      <g
-         id="g2161"
-         transform="translate(-62.264403,-59.333115)">
-        <g
-           id="g2271"
-           transform="translate(0,67.042823)">
-          <rect
-             style="fill:none;stroke:#000000;stroke-width:0.799999;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-             id="rect833-6"
-             width="39.008453"
-             height="16.775949"
-             x="84.896881"
-             y="90.266838" />
-          <rect
-             style="fill:none;stroke:#000000;stroke-width:0.799999;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-             id="rect833-3-1"
-             width="39.008453"
-             height="8.673645"
-             x="84.896881"
-             y="98.369141" />
-          <text
-             xml:space="preserve"
-             style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-             x="89.826942"
-             y="96.212921"
-             id="text852-0"><tspan
-               sodipodi:role="line"
-               id="tspan850-6"
-               x="89.826942"
-               y="96.212921"
-               style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:5.64444px;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono Bold';stroke-width:0.264583">Version 1</tspan></text>
-          <text
-             xml:space="preserve"
-             style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-             x="89.826942"
-             y="104.71013"
-             id="text852-0-3"><tspan
-               sodipodi:role="line"
-               id="tspan850-6-2"
-               x="89.826942"
-               y="104.71013"
-               style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono Bold';fill:#4d4d4d;stroke-width:0.264583">deleted</tspan></text>
-        </g>
-      </g>
-      <g
-         id="g2263"
-         transform="translate(0,-22.791204)">
-        <g
-           id="g2161-1"
-           transform="translate(-62.264403,-10.910843)">
-          <rect
-             style="fill:none;stroke:#000000;stroke-width:0.799999;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-             id="rect833-6-5"
-             width="39.008453"
-             height="36.749603"
-             x="84.896881"
-             y="90.266838" />
-          <rect
-             style="fill:none;stroke:#000000;stroke-width:0.799999;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-             id="rect833-3-1-5"
-             width="39.008453"
-             height="28.647301"
-             x="84.896881"
-             y="98.369141" />
-          <text
-             xml:space="preserve"
-             style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-             x="89.826942"
-             y="96.212921"
-             id="text852-0-4"><tspan
-               sodipodi:role="line"
-               id="tspan850-6-7"
-               x="89.826942"
-               y="96.212921"
-               style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:5.64444px;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono Bold';stroke-width:0.264583">Version 2</tspan></text>
-          <text
-             xml:space="preserve"
-             style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-             x="89.826942"
-             y="104.71013"
-             id="text852-0-3-6"><tspan
-               sodipodi:role="line"
-               id="tspan850-6-2-5"
-               x="89.826942"
-               y="104.71013"
-               style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono Bold';fill:#000000;stroke-width:0.264583">id</tspan></text>
-        </g>
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-           x="27.56254"
-           y="100.34132"
-           id="text852-0-3-6-6"><tspan
-             sodipodi:role="line"
-             id="tspan850-6-2-5-9"
-             x="27.56254"
-             y="100.34132"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono Bold';fill:#000000;stroke-width:0.264583">size</tspan></text>
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-           x="27.56254"
-           y="106.90263"
-           id="text852-0-3-6-6-3"><tspan
-             sodipodi:role="line"
-             id="tspan850-6-2-5-9-7"
-             x="27.56254"
-             y="106.90263"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono Bold';fill:#000000;stroke-width:0.264583">MIME type</tspan></text>
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-           x="27.56254"
-           y="111.92816"
-           id="text852-0-3-6-6-3-4"><tspan
-             sodipodi:role="line"
-             id="tspan850-6-2-5-9-7-5"
-             x="27.56254"
-             y="111.92816"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono Bold';fill:#000000;stroke-width:0.264583">...</tspan></text>
-      </g>
-    </g>
-    <g
-       id="g898"
-       transform="translate(-6.2484318,29.95006)">
-      <rect
-         style="fill:none;stroke:#000000;stroke-width:0.799999;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect833-7"
-         width="47.419891"
-         height="44.007515"
-         x="95.443573"
-         y="24.42766" />
-      <rect
-         style="fill:none;stroke:#000000;stroke-width:0.799999;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect833-3-4"
-         width="47.419891"
-         height="35.627186"
-         x="95.443573"
-         y="32.807987" />
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-         x="107.46638"
-         y="29.894743"
-         id="text852-4"><tspan
-           sodipodi:role="line"
-           id="tspan850-3"
-           x="107.46638"
-           y="29.894743"
-           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:5.64444px;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono Bold';stroke-width:0.264583">Version</tspan></text>
-      <path
-         style="fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.0337704;stroke-opacity:1"
-         d="m 102.90563,41.413279 c -0.14226,0.478709 -0.31308,0.745518 -0.65239,1.018956 -0.29019,0.233843 -0.59571,0.339489 -1.03301,0.357199 -0.33087,0.0134 -0.37381,0.0074 -0.64184,-0.09013 -0.50954,-0.185343 -0.914221,-0.594142 -1.082877,-1.093901 -0.163852,-0.485526 -0.07847,-1.108159 0.210335,-1.533803 0.111448,-0.164254 0.402172,-0.444591 0.534502,-0.515415 l 0.0681,-3.63921 0.73832,-0.64992 0.88727,0.787138 -0.40985,0.445484 0.40539,0.440982 -0.40539,0.435013 0.3816,0.41947 -0.41462,0.431781 0.57335,0.585078 0.007,0.726386 c 0.13641,0.08277 0.48753,0.413601 0.59931,0.58235 0.0577,0.0871 0.13636,0.257787 0.17481,0.379304 0.0803,0.253823 0.11239,0.738377 0.0604,0.913234 z m -1.28155,0.296888 c -0.11255,-0.405265 -0.62848,-0.483569 -0.86192,-0.130817 -0.0744,0.112498 -0.088,0.164461 -0.0745,0.2847 0.0338,0.299998 0.31326,0.504498 0.58822,0.43046 0.15271,-0.04112 0.3056,-0.184909 0.34828,-0.327542 0.0392,-0.130864 0.0392,-0.115447 -1e-4,-0.256801 z"
-         id="path1971-0"
-         sodipodi:nodetypes="ssscsscccccccccccssscsssscc" />
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-         x="104.99195"
-         y="41.008743"
-         id="text852-9-7"><tspan
-           sodipodi:role="line"
-           id="tspan850-4-8"
-           x="104.99195"
-           y="41.008743"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono Bold';stroke-width:0.264583">id </tspan></text>
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-         x="104.99195"
-         y="49.168018"
-         id="text852-9-7-6"><tspan
-           sodipodi:role="line"
-           id="tspan850-4-8-8"
-           x="104.99195"
-           y="49.168018"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono Bold';stroke-width:0.264583">h(block 1)</tspan></text>
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-         x="104.99195"
-         y="56.583336"
-         id="text852-9-7-6-8"><tspan
-           sodipodi:role="line"
-           id="tspan850-4-8-8-4"
-           x="104.99195"
-           y="56.583336"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono Bold';stroke-width:0.264583">h(block 2)</tspan></text>
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-         x="104.99195"
-         y="64.265732"
-         id="text852-9-7-6-3"><tspan
-           sodipodi:role="line"
-           id="tspan850-4-8-8-1"
-           x="104.99195"
-           y="64.265732"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono Bold';stroke-width:0.264583">...</tspan></text>
-    </g>
-    <g
-       id="g898-3"
-       transform="translate(75.777779,38.888663)">
-      <rect
-         style="fill:none;stroke:#000000;stroke-width:0.799999;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect833-7-6"
-         width="47.419891"
-         height="29.989157"
-         x="95.443573"
-         y="24.42766" />
-      <rect
-         style="fill:none;stroke:#000000;stroke-width:0.799999;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect833-3-4-7"
-         width="47.419891"
-         height="21.608831"
-         x="95.443573"
-         y="32.807987" />
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-         x="102.11134"
-         y="29.894743"
-         id="text852-4-5"><tspan
-           sodipodi:role="line"
-           id="tspan850-3-3"
-           x="102.11134"
-           y="29.894743"
-           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:5.64444px;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono Bold';stroke-width:0.264583">Data block</tspan></text>
-      <path
-         style="fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.0337704;stroke-opacity:1"
-         d="m 102.90563,41.413279 c -0.14226,0.478709 -0.31308,0.745518 -0.65239,1.018956 -0.29019,0.233843 -0.59571,0.339489 -1.03301,0.357199 -0.33087,0.0134 -0.37381,0.0074 -0.64184,-0.09013 -0.50954,-0.185343 -0.914221,-0.594142 -1.082877,-1.093901 -0.163852,-0.485526 -0.07847,-1.108159 0.210335,-1.533803 0.111448,-0.164254 0.402172,-0.444591 0.534502,-0.515415 l 0.0681,-3.63921 0.73832,-0.64992 0.88727,0.787138 -0.40985,0.445484 0.40539,0.440982 -0.40539,0.435013 0.3816,0.41947 -0.41462,0.431781 0.57335,0.585078 0.007,0.726386 c 0.13641,0.08277 0.48753,0.413601 0.59931,0.58235 0.0577,0.0871 0.13636,0.257787 0.17481,0.379304 0.0803,0.253823 0.11239,0.738377 0.0604,0.913234 z m -1.28155,0.296888 c -0.11255,-0.405265 -0.62848,-0.483569 -0.86192,-0.130817 -0.0744,0.112498 -0.088,0.164461 -0.0745,0.2847 0.0338,0.299998 0.31326,0.504498 0.58822,0.43046 0.15271,-0.04112 0.3056,-0.184909 0.34828,-0.327542 0.0392,-0.130864 0.0392,-0.115447 -1e-4,-0.256801 z"
-         id="path1971-0-5"
-         sodipodi:nodetypes="ssscsscccccccccccssscsssscc" />
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-         x="104.99195"
-         y="41.008743"
-         id="text852-9-7-62"><tspan
-           sodipodi:role="line"
-           id="tspan850-4-8-9"
-           x="104.99195"
-           y="41.008743"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono Bold';stroke-width:0.264583">hash </tspan></text>
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-         x="104.99195"
-         y="49.168018"
-         id="text852-9-7-6-1"><tspan
-           sodipodi:role="line"
-           id="tspan850-4-8-8-2"
-           x="104.99195"
-           y="49.168018"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono Bold';stroke-width:0.264583">data</tspan></text>
-    </g>
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Mend)"
-       d="M 42.105292,69.455903 89.563703,69.317144"
-       id="path954"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker1262)"
-       d="m 134.32612,77.363197 38.12618,0.260865"
-       id="path1258"
-       sodipodi:nodetypes="cc" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-       x="8.6727352"
-       y="16.687063"
-       id="text852-3"><tspan
-         sodipodi:role="line"
-         id="tspan850-67"
-         x="8.6727352"
-         y="16.687063"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:5.64444px;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono Bold';stroke-width:0.264583">Objects table </tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-       x="89.190445"
-       y="16.687063"
-       id="text852-3-5"><tspan
-         sodipodi:role="line"
-         id="tspan850-67-3"
-         x="89.190445"
-         y="16.687063"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:5.64444px;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono Bold';stroke-width:0.264583">Versions table </tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-       x="174.55702"
-       y="16.687063"
-       id="text852-3-56"><tspan
-         sodipodi:role="line"
-         id="tspan850-67-2"
-         x="174.55702"
-         y="16.687063"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:5.64444px;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono Bold';stroke-width:0.264583">Blocks table</tspan></text>
-  </g>
-</svg>
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f245bb017eb85a227d96e576ae821f165ef478d46de02535c196638aa5fc84b0
-size 2575953
@@ -1,480 +0,0 @@
-%\nonstopmode
-\documentclass[aspectratio=169]{beamer}
-\usepackage[utf8]{inputenc}
-% \usepackage[frenchb]{babel}
-\usepackage{amsmath}
-\usepackage{mathtools}
-\usepackage{breqn}
-\usepackage{multirow}
-\usetheme{boxes}
-\usepackage{graphicx}
-\usepackage{adjustbox}
-%\useoutertheme[footline=authortitle,subsection=false]{miniframes}
-%\useoutertheme[footline=authorinstitute,subsection=false]{miniframes}
-\useoutertheme{infolines}
-\setbeamertemplate{headline}{}
-
-\beamertemplatenavigationsymbolsempty
-
-\definecolor{TitleOrange}{RGB}{255,137,0}
-\setbeamercolor{title}{fg=TitleOrange}
-\setbeamercolor{frametitle}{fg=TitleOrange}
-
-\definecolor{ListOrange}{RGB}{255,145,5}
-\setbeamertemplate{itemize item}{\color{ListOrange}$\blacktriangleright$}
-
-\definecolor{verygrey}{RGB}{70,70,70}
-\setbeamercolor{normal text}{fg=verygrey}
-
-
-\usepackage{tabu}
-\usepackage{multicol}
-\usepackage{vwcol}
-\usepackage{stmaryrd}
-\usepackage{graphicx}
-
-\usepackage[normalem]{ulem}
-
-\title{Introducing Garage}
-\subtitle{a new storage platform for self-hosted geo-distributed clusters}
-\author{Deuxfleurs Association}
-\date{IMT Atlantique, 2022-06-23}
-
-\begin{document}
-
-\begin{frame}
-	\centering
-	\includegraphics[width=.3\linewidth]{../../sticker/Garage.pdf}
-	\vspace{1em}
-
-	{\large\bf Deuxfleurs Association}
-	\vspace{1em}
-
-	\url{https://garagehq.deuxfleurs.fr/}
-
-	Matrix channel: \texttt{\#garage:deuxfleurs.fr}
-\end{frame}
-
-\begin{frame}
-	\frametitle{Who we are}
-	\begin{columns}[t]
-		\begin{column}{.2\textwidth}
-			\centering
-			\adjincludegraphics[width=.4\linewidth, valign=t]{assets/alex.jpg}
-		\end{column}
-		\begin{column}{.6\textwidth}
-			\textbf{Alex Auvolat}\\
-			PhD at Inria, team WIDE; co-founder of Deuxfleurs
-		\end{column}
-		\begin{column}{.2\textwidth}
-			~
-		\end{column}
-	\end{columns}
-	\vspace{1em}
-
-	\begin{columns}[t]
-		\begin{column}{.2\textwidth}
-			~
-		\end{column}
-		\begin{column}{.6\textwidth}
-			\textbf{Quentin Dufour}\\
-			PhD at Inria, team WIDE; co-founder of Deuxfleurs
-		\end{column}
-		\begin{column}{.2\textwidth}
-			\centering
-			\adjincludegraphics[width=.5\linewidth, valign=t]{assets/quentin.jpg}
-		\end{column}
-	\end{columns}
-	\vspace{2em}
-
-	\begin{columns}[t]
-		\begin{column}{.2\textwidth}
-			\centering
-			\adjincludegraphics[width=.5\linewidth, valign=t]{assets/deuxfleurs.pdf}
-		\end{column}
-		\begin{column}{.6\textwidth}
-			\textbf{Deuxfleurs}\\
-			A non-profit self-hosting collective,\\
-			member of the CHATONS network
-		\end{column}
-		\begin{column}{.2\textwidth}
-			\centering
-			\adjincludegraphics[width=.7\linewidth, valign=t]{assets/logo_chatons.png}
-		\end{column}
-	\end{columns}
-
-\end{frame}
-
-\begin{frame}
-	\frametitle{Our objective at Deuxfleurs}
-	
-	\begin{center}
-		\textbf{Promote self-hosting and small-scale hosting\\
-			as an alternative to large cloud providers}
-	\end{center}
-	\vspace{2em}
-	\visible<2->{
-		Why is it hard?
-	}
-	\visible<3->{
-		\vspace{2em}
-		\begin{center}
-			\textbf{\underline{Resilience}}\\
-			{\footnotesize (we want good uptime/availability with low supervision)}
-		\end{center}
-	}
-\end{frame}
-
-\begin{frame}
-	\frametitle{How to make a \underline{stable} system}
-
-	Enterprise-grade systems typically employ:
-	\vspace{1em}
-	\begin{itemize}
-		\item RAID
-		\item Redundant power grid + UPS
-		\item Redundant Internet connections
-		\item Low-latency links
-		\item ... 
-	\end{itemize}
-	\vspace{1em}
-	$\to$ it's costly and only worth it at DC scale
-\end{frame}
-
-\begin{frame}
-	\frametitle{How to make a \underline{resilient} system}
-
-	\only<1,4-5>{
-		Instead, we use:
-		\vspace{1em}
-		\begin{itemize}
-			\item \textcolor<2->{gray}{Commodity hardware (e.g. old desktop PCs)}
-				\vspace{.5em}
-			\item<4-> \textcolor<5->{gray}{Commodity Internet (e.g. FTTB, FTTH) and power grid}
-				\vspace{.5em}
-			\item<5-> \textcolor<6->{gray}{\textbf{Geographical redundancy} (multi-site replication)}
-		\end{itemize}
-	}
-	\only<2>{
-		\begin{center}
-			\includegraphics[width=.8\linewidth]{assets/atuin.jpg}
-		\end{center}
-	}
-	\only<3>{
-		\begin{center}
-			\includegraphics[width=.8\linewidth]{assets/neptune.jpg}
-		\end{center}
-	}
-	\only<6>{
-		\begin{center}
-			\includegraphics[width=.5\linewidth]{assets/inframap.jpg}
-		\end{center}
-	}
-\end{frame}
-
-\begin{frame}
-	\frametitle{How to make this happen}
-	\begin{center}
-		\only<1>{\includegraphics[width=.8\linewidth]{assets/slide1.png}}%
-		\only<2>{\includegraphics[width=.8\linewidth]{assets/slide2.png}}%
-		\only<3>{\includegraphics[width=.8\linewidth]{assets/slide3.png}}%
-	\end{center}
-\end{frame}
-
-\begin{frame}
-	\frametitle{Distributed file systems are slow}
-	File systems are complex, for example:
-	\vspace{1em}
-	\begin{itemize}
-		\item Concurrent modification by several processes
-			\vspace{1em}
-		\item Folder hierarchies
-			\vspace{1em}
-		\item Other requirements of the POSIX spec
-	\end{itemize}
-	\vspace{1em}
-	Coordination in a distributed system is costly
-
-	\vspace{1em}
-	Costs explode with commodity hardware / Internet connections\\
-	{\small (we experienced this!)}
-\end{frame}
-
-\begin{frame}
-	\frametitle{A simpler solution: object storage}
-	Only two operations:
-	\vspace{1em}
-	\begin{itemize}
-		\item Put an object at a key
-			\vspace{1em}
-		\item Retrieve an object from its key
-	\end{itemize}
-	\vspace{1em}
-	{\footnotesize (and a few others)}
-
-	\vspace{1em}
-	Sufficient for many applications!
-\end{frame}
-
-\begin{frame}
-	\frametitle{A simpler solution: object storage}
-		\begin{center}
-			\includegraphics[width=.2\linewidth]{../2020-12-02_wide-team/img/Amazon-S3.jpg}
-			\hspace{5em}
-			\includegraphics[width=.2\linewidth]{assets/minio.png}
-		\end{center}
-		\vspace{1em}
-	S3: a de-facto standard, many compatible applications
-
-	\vspace{1em}
-
-	MinIO is self-hostable but not suited for geo-distributed deployments
-\end{frame}
-
-
-\begin{frame}
-	\frametitle{But what is Garage, exactly?}
-	\textbf{Garage is a self-hosted drop-in replacement for the Amazon S3 object store}\\
-	\vspace{.5em}
-	that implements resilience through geographical redundancy on commodity hardware
-		\begin{center}
-			\includegraphics[width=.8\linewidth]{assets/garageuses.png}
-		\end{center}
-\end{frame}
-
-\begin{frame}
-	\frametitle{Overview}
-	\begin{center}
-		\only<1>{\includegraphics[width=.45\linewidth]{assets/garage2a.drawio.pdf}}%
-		\only<2>{\includegraphics[width=.45\linewidth]{assets/garage2b.drawio.pdf}}%
-	\end{center}
-\end{frame}
-
-\begin{frame}
-	\frametitle{Garage is \emph{location-aware}}
-	\begin{center}
-		\includegraphics[width=\linewidth]{assets/location-aware.png}
-	\end{center}
-	\vspace{2em}
-	Garage replicates data on different zones when possible
-\end{frame}
-
-\begin{frame}
-	\frametitle{Garage is \emph{location-aware}}
-		\begin{center}
-			\includegraphics[width=.8\linewidth]{assets/map.png}
-		\end{center}
-\end{frame}
-
-\begin{frame}
-	\frametitle{How to spread files over different cluster nodes?}
-	\textbf{Consistent hashing (DynamoDB):}
-	\vspace{1em}
-
-	\begin{center}
-	\only<1>{\includegraphics[width=.45\columnwidth]{assets/consistent_hashing_1.pdf}}%
-	\only<2>{\includegraphics[width=.45\columnwidth]{assets/consistent_hashing_2.pdf}}%
-	\only<3>{\includegraphics[width=.45\columnwidth]{assets/consistent_hashing_3.pdf}}%
-	\only<4>{\includegraphics[width=.45\columnwidth]{assets/consistent_hashing_4.pdf}}%
-	\end{center}
-\end{frame}
-
-\begin{frame}
-	\frametitle{How to spread files over different cluster nodes?}
-	\textbf{Issues with consistent hashing:}
-	\vspace{1em}
-	\begin{itemize}
-		\item Doesn't dispatch data based on geographical location of nodes
-			\vspace{1em}
-		\item<2-> Geographically aware adaptation, try 1:\\
-			data quantities not well balanced between nodes
-			\vspace{1em}
-		\item<3-> Geographically aware adaptation, try 2:\\
-			too many reshuffles when adding/removing nodes
-	\end{itemize}
-\end{frame}
-
-\begin{frame}
-	\frametitle{How to spread files over different cluster nodes?}
-	\textbf{Garage's method: build an index table}
-	\vspace{1em}
-
-	Realization: we can actually precompute an optimal solution
-	\vspace{1em}
-
-	\visible<2->{
-		\begin{center}
-		\begin{tabular}{|l|l|l|l|}
-			\hline
-			\textbf{Partition} & \textbf{Node 1} & \textbf{Node 2} & \textbf{Node 3} \\
-			\hline
-			\hline
-			Partition 0 & Io (jupiter) & Drosera (atuin) & Courgette (neptune) \\
-			\hline
-			Partition 1 & Datura (atuin) & Courgette (neptune) & Io (jupiter) \\
-			\hline
-			Partition 2 & Io(jupiter) & Celeri (neptune) & Drosera (atuin) \\
-			\hline
-			\hspace{1em}$\vdots$ & \hspace{1em}$\vdots$ & \hspace{1em}$\vdots$ & \hspace{1em}$\vdots$ \\
-			\hline
-			Partition 255 & Concombre (neptune) & Io (jupiter) & Drosera (atuin) \\
-			\hline
-		\end{tabular}
-		\end{center}
-	}
-	\vspace{1em}
-	\visible<3->{
-		The index table is built centrally using an optimal* algorithm,\\
-		then propagated to all nodes\\
-		\hfill\footnotesize *not yet optimal but will be soon
-	}
-\end{frame}
-
-\begin{frame}
-	\frametitle{Garage's internal data structures}
-	\centering
-	\includegraphics[width=.75\columnwidth]{assets/garage_tables.pdf}
-\end{frame}
-
-%\begin{frame}
-%	\frametitle{Garage's architecture}
-%	\begin{center}
-%		\includegraphics[width=.35\linewidth]{assets/garage.drawio.pdf}
-%	\end{center}
-%\end{frame}
-
-\begin{frame}
-	\frametitle{Garage is \emph{coordination-free}:}
-	\begin{itemize}
-		\item No Raft or Paxos
-			\vspace{1em}
-		\item Internal data types are CRDTs
-			\vspace{1em}
-		\item All nodes are equivalent (no master/leader/index node)
-	\end{itemize}
-			\vspace{2em}
-	$\to$ less sensitive to higher latencies between nodes
-\end{frame}
-
-\begin{frame}
-	\frametitle{Consistency model}
-	\begin{itemize}
-		\item Not ACID (not required by S3 spec) / not linearizable
-			\vspace{1em}
-		\item \textbf{Read-after-write consistency}\\
-			{\footnotesize (stronger than eventual consistency)}
-	\end{itemize}
-\end{frame}
-
-\begin{frame}
-	\frametitle{Impact on performances}
-		\begin{center}
-			\includegraphics[width=.8\linewidth]{assets/endpoint-latency-dc.png}
-		\end{center}
-\end{frame}
-
-
-\begin{frame}
-	\frametitle{An ever-increasing compatibility list}
-		\begin{center}
-			\includegraphics[width=.7\linewidth]{assets/compatibility.png}
-		\end{center}
-\end{frame}
-
-\begin{frame}
-	\frametitle{Further plans for Garage}
-	\begin{center}
-		\only<1>{\includegraphics[width=.8\linewidth]{assets/slideB1.png}}%
-		\only<2>{\includegraphics[width=.8\linewidth]{assets/slideB2.png}}%
-		\only<3>{\includegraphics[width=.8\linewidth]{assets/slideB3.png}}%
-	\end{center}
-\end{frame}
-
-\begin{frame}
-	\frametitle{K2V Design}
-	\begin{itemize}
-		\item A new, custom, minimal API
-			\vspace{1em}
-		\item<2-> Exposes the partitoning mechanism of Garage\\
-			K2V = partition key / sort key / value (like Dynamo)
-			\vspace{1em}
-		\item<3-> Coordination-free, CRDT-friendly (inspired by Riak)\\
-			\vspace{1em}
-		\item<4-> Cryptography-friendly: values are binary blobs
-	\end{itemize}
-\end{frame}
-
-\begin{frame}
-	\frametitle{Application: an e-mail storage server}
-	\begin{center}
-		\only<1>{\includegraphics[width=.9\linewidth]{assets/aerogramme.png}}%
-	\end{center}
-\end{frame}
-
-\begin{frame}
-	\frametitle{Aerogramme data model}
-	\begin{center}
-		\only<1>{\includegraphics[width=.4\linewidth]{assets/aerogramme_datatype.drawio.pdf}}%
-		\only<2->{\includegraphics[width=.9\linewidth]{assets/aerogramme_keys.drawio.pdf}\vspace{1em}}%
-	\end{center}
-	\visible<3->{Aerogramme encrypts all stored values for privacy\\
-	(Garage server administrators can't read your mail)}
-\end{frame}
-
-\begin{frame}
-	\frametitle{Different deployment scenarios}
-	\begin{center}
-		\only<1>{\includegraphics[width=.9\linewidth]{assets/aerogramme_components1.drawio.pdf}}%
-		\only<2>{\includegraphics[width=.9\linewidth]{assets/aerogramme_components2.drawio.pdf}}%
-	\end{center}
-\end{frame}
-
-\begin{frame}
-	\frametitle{A new model for building resilient software}
-	\begin{itemize}
-		\item Design a data model suited to K2V\\
-			{\footnotesize (see Cassandra docs on porting SQL data models to Cassandra)}
-			\vspace{1em}
-			\begin{itemize}
-				\item Use CRDTs or other eventually consistent data types (see e.g. Bayou)
-					\vspace{1em}
-				\item Store opaque binary blobs to provide End-to-End Encryption\\
-			\end{itemize}
-			\vspace{1em}
-		\item Store big blobs (files) in S3
-			\vspace{1em}
-		\item Let Garage manage sharding, replication, failover, etc.
-	\end{itemize}
-\end{frame}
-
-\begin{frame}
-	\frametitle{Research perspectives}
-	\begin{itemize}
-		\item Write about Garage's global architecture \emph{(paper in progress)}
-			\vspace{1em}
-		\item Measure and improve Garage's performances
-			\vspace{1em}
-		\item Discuss the optimal layout algorithm, provide proofs
-			\vspace{1em}
-		\item Write about our proposed architecture for (E2EE) apps over K2V+S3
-	\end{itemize}
-\end{frame}
-
-\begin{frame}
-	\frametitle{Where to find us}
-	\begin{center}
-			\includegraphics[width=.25\linewidth]{../../logo/garage_hires.png}\\
-			\vspace{-1em}
-		\url{https://garagehq.deuxfleurs.fr/}\\
-		\url{mailto:garagehq@deuxfleurs.fr}\\
-		\texttt{\#garage:deuxfleurs.fr} on Matrix
-
-		\vspace{1.5em}
-			\includegraphics[width=.06\linewidth]{assets/rust_logo.png}
-			\includegraphics[width=.13\linewidth]{assets/AGPLv3_Logo.png}
-	\end{center}
-\end{frame}
-
-\end{document}
-
-%% vim: set ts=4 sw=4 tw=0 noet spelllang=en :
@@ -1,6 +1,6 @@
 [package]
 name = "garage_api"
-version = "0.7.0"
+version = "0.7.3"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -14,11 +14,11 @@ path = "lib.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-garage_model = { version = "0.7.0", path = "../model" }
-garage_table = { version = "0.7.0", path = "../table" }
-garage_block = { version = "0.7.0", path = "../block" }
-garage_util = { version = "0.7.0", path = "../util" }
-garage_rpc = { version = "0.7.0", path = "../rpc" }
+garage_model = { version = "0.7.3", path = "../model" }
+garage_table = { version = "0.7.3", path = "../table" }
+garage_block = { version = "0.7.3", path = "../block" }
+garage_util = { version = "0.7.3", path = "../util" }
+garage_rpc = { version = "0.7.3", path = "../rpc" }

 async-trait = "0.1.7"
 base64 = "0.13"
@@ -156,7 +156,12 @@ impl ApiHandler for AdminApiServer {
 			}
 			Endpoint::CreateBucket => handle_create_bucket(&self.garage, req).await,
 			Endpoint::DeleteBucket { id } => handle_delete_bucket(&self.garage, id).await,
-			Endpoint::UpdateBucket { id } => handle_update_bucket(&self.garage, id, req).await,
+			Endpoint::PutBucketWebsite { id } => {
+				handle_put_bucket_website(&self.garage, id, req).await
+			}
+			Endpoint::DeleteBucketWebsite { id } => {
+				handle_delete_bucket_website(&self.garage, id).await
+			}
 			// Bucket-key permissions
 			Endpoint::BucketAllowKey => {
 				handle_bucket_change_key_perm(&self.garage, req, true).await
@@ -14,7 +14,6 @@ use garage_model::bucket_alias_table::*;
 use garage_model::bucket_table::*;
 use garage_model::garage::Garage;
 use garage_model::permission::*;
-use garage_model::s3::object_table::*;

 use crate::admin::error::*;
 use crate::admin::key::ApiBucketKeyPerm;
@@ -78,13 +77,6 @@ struct BucketLocalAlias {
 	alias: String,
 }

-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct ApiBucketQuotas {
-	max_size: Option<u64>,
-	max_objects: Option<u64>,
-}
-
 pub async fn handle_get_bucket_info(
 	garage: &Arc<Garage>,
 	id: Option<String>,
@@ -116,14 +108,6 @@ async fn bucket_info_results(
 		.get_existing_bucket(bucket_id)
 		.await?;

-	let counters = garage
-		.object_counter_table
-		.table
-		.get(&bucket_id, &EmptyKey)
-		.await?
-		.map(|x| x.filtered_values(&garage.system.ring.borrow()))
-		.unwrap_or_default();
-
 	let mut relevant_keys = HashMap::new();
 	for (k, _) in bucket
 		.state
@@ -164,7 +148,6 @@ async fn bucket_info_results(

 	let state = bucket.state.as_option().unwrap();

-	let quotas = state.quotas.get();
 	let res =
 		GetBucketInfoResult {
 			id: hex::encode(&bucket.id),
@@ -208,16 +191,6 @@ async fn bucket_info_results(
 					}
 				})
 				.collect::<Vec<_>>(),
-			objects: counters.get(OBJECTS).cloned().unwrap_or_default(),
-			bytes: counters.get(BYTES).cloned().unwrap_or_default(),
-			unfinshed_uploads: counters
-				.get(UNFINISHED_UPLOADS)
-				.cloned()
-				.unwrap_or_default(),
-			quotas: ApiBucketQuotas {
-				max_size: quotas.max_size,
-				max_objects: quotas.max_objects,
-			},
 		};

 	Ok(json_ok_response(&res)?)
@@ -232,10 +205,6 @@ struct GetBucketInfoResult {
 	#[serde(default)]
 	website_config: Option<GetBucketInfoWebsiteResult>,
 	keys: Vec<GetBucketInfoKey>,
-	objects: i64,
-	bytes: i64,
-	unfinshed_uploads: i64,
-	quotas: ApiBucketQuotas,
 }

 #[derive(Serialize)]
@@ -394,12 +363,14 @@ pub async fn handle_delete_bucket(
 		.body(Body::empty())?)
 }

-pub async fn handle_update_bucket(
+// ---- BUCKET WEBSITE CONFIGURATION ----
+
+pub async fn handle_put_bucket_website(
 	garage: &Arc<Garage>,
 	id: String,
 	req: Request<Body>,
 ) -> Result<Response<Body>, Error> {
-	let req = parse_json_body::<UpdateBucketRequest>(req).await?;
+	let req = parse_json_body::<PutBucketWebsiteRequest>(req).await?;
 	let bucket_id = parse_bucket_id(&id)?;

 	let mut bucket = garage
@@ -408,31 +379,10 @@ pub async fn handle_update_bucket(
 		.await?;

 	let state = bucket.state.as_option_mut().unwrap();
-
-	if let Some(wa) = req.website_access {
-		if wa.enabled {
-			state.website_config.update(Some(WebsiteConfig {
-				index_document: wa.index_document.ok_or_bad_request(
-					"Please specify indexDocument when enabling website access.",
-				)?,
-				error_document: wa.error_document,
-			}));
-		} else {
-			if wa.index_document.is_some() || wa.error_document.is_some() {
-				return Err(Error::bad_request(
-					"Cannot specify indexDocument or errorDocument when disabling website access.",
-				));
-			}
-			state.website_config.update(None);
-		}
-	}
-
-	if let Some(q) = req.quotas {
-		state.quotas.update(BucketQuotas {
-			max_size: q.max_size,
-			max_objects: q.max_objects,
-		});
-	}
+	state.website_config.update(Some(WebsiteConfig {
+		index_document: req.index_document,
+		error_document: req.error_document,
+	}));

 	garage.bucket_table.insert(&bucket).await?;

@@ -441,17 +391,29 @@ pub async fn handle_update_bucket(

 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
-struct UpdateBucketRequest {
-	website_access: Option<UpdateBucketWebsiteAccess>,
-	quotas: Option<ApiBucketQuotas>,
+struct PutBucketWebsiteRequest {
+	index_document: String,
+	#[serde(default)]
+	error_document: Option<String>,
 }

-#[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct UpdateBucketWebsiteAccess {
-	enabled: bool,
-	index_document: Option<String>,
-	error_document: Option<String>,
+pub async fn handle_delete_bucket_website(
+	garage: &Arc<Garage>,
+	id: String,
+) -> Result<Response<Body>, Error> {
+	let bucket_id = parse_bucket_id(&id)?;
+
+	let mut bucket = garage
+		.bucket_helper()
+		.get_existing_bucket(bucket_id)
+		.await?;
+
+	let state = bucket.state.as_option_mut().unwrap();
+	state.website_config.update(None);
+
+	garage.bucket_table.insert(&bucket).await?;
+
+	bucket_info_results(garage, bucket_id).await
 }

 // ---- BUCKET/KEY PERMISSIONS ----
@@ -19,7 +19,6 @@ pub async fn handle_get_cluster_status(garage: &Arc<Garage>) -> Result<Response<
 	let res = GetClusterStatusResponse {
 		node: hex::encode(garage.system.id),
 		garage_version: garage.system.garage_version(),
-		db_engine: garage.db.engine(),
 		known_nodes: garage
 			.system
 			.get_known_nodes()
@@ -99,7 +98,6 @@ fn get_cluster_layout(garage: &Arc<Garage>) -> GetClusterLayoutResponse {
 struct GetClusterStatusResponse {
 	node: String,
 	garage_version: &'static str,
-	db_engine: String,
 	known_nodes: HashMap<String, KnownNodeResp>,
 	layout: GetClusterLayoutResponse,
 }
@@ -48,7 +48,10 @@ pub enum Endpoint {
 	DeleteBucket {
 		id: String,
 	},
-	UpdateBucket {
+	PutBucketWebsite {
+		id: String,
+	},
+	DeleteBucketWebsite {
 		id: String,
 	},
 	// Bucket-Key Permissions
@@ -110,7 +113,8 @@ impl Endpoint {
 			GET "/v0/bucket" => ListBuckets,
 			POST "/v0/bucket" => CreateBucket,
 			DELETE "/v0/bucket" if id => DeleteBucket (query::id),
-			PUT "/v0/bucket" if id => UpdateBucket (query::id),
+			PUT "/v0/bucket/website" if id => PutBucketWebsite (query::id),
+			DELETE "/v0/bucket/website" if id => DeleteBucketWebsite (query::id),
 			// Bucket-key permissions
 			POST "/v0/bucket/allow" => BucketAllowKey,
 			POST "/v0/bucket/deny" => BucketDenyKey,
@@ -10,7 +10,7 @@ use garage_rpc::ring::Ring;
 use garage_table::util::*;

 use garage_model::garage::Garage;
-use garage_model::k2v::item_table::{BYTES, CONFLICTS, ENTRIES, VALUES};
+use garage_model::k2v::counter_table::{BYTES, CONFLICTS, ENTRIES, VALUES};

 use crate::k2v::error::*;
 use crate::k2v::range::read_range;
@@ -4,7 +4,7 @@ use async_trait::async_trait;

 use futures::future::Future;
 use hyper::header;
-use hyper::{Body, Request, Response};
+use hyper::{Body, Method, Request, Response};

 use opentelemetry::{trace::SpanRef, KeyValue};

@@ -167,7 +167,14 @@ impl ApiHandler for S3ApiServer {
 			return Err(Error::forbidden("Operation is not allowed for this key."));
 		}

-		let matching_cors_rule = find_matching_cors_rule(&bucket, &req)?;
+		// Look up what CORS rule might apply to response.
+		// Requests for methods different than GET, HEAD or POST
+		// are always preflighted, i.e. the browser should make
+		// an OPTIONS call before to check it is allowed
+		let matching_cors_rule = match *req.method() {
+			Method::GET | Method::HEAD | Method::POST => find_matching_cors_rule(&bucket, &req)?,
+			_ => None,
+		};

 		let resp = match endpoint {
 			Endpoint::HeadObject {
@@ -212,7 +219,7 @@ impl ApiHandler for S3ApiServer {
 				.await
 			}
 			Endpoint::PutObject { key } => {
-				handle_put(garage, req, &bucket, &key, content_sha256).await
+				handle_put(garage, req, bucket_id, &key, content_sha256).await
 			}
 			Endpoint::AbortMultipartUpload { key, upload_id } => {
 				handle_abort_multipart_upload(garage, bucket_id, &key, &upload_id).await
@@ -226,7 +233,7 @@ impl ApiHandler for S3ApiServer {
 					garage,
 					req,
 					&bucket_name,
-					&bucket,
+					bucket_id,
 					&key,
 					&upload_id,
 					content_sha256,
@@ -22,7 +22,7 @@ use crate::signature::payload::{parse_date, verify_v4};
 pub async fn handle_post_object(
 	garage: Arc<Garage>,
 	req: Request<Body>,
-	bucket_name: String,
+	bucket: String,
 ) -> Result<Response<Body>, Error> {
 	let boundary = req
 		.headers()
@@ -126,18 +126,13 @@ pub async fn handle_post_object(

 	let bucket_id = garage
 		.bucket_helper()
-		.resolve_bucket(&bucket_name, &api_key)
+		.resolve_bucket(&bucket, &api_key)
 		.await?;

 	if !api_key.allow_write(&bucket_id) {
 		return Err(Error::forbidden("Operation is not allowed for this key."));
 	}

-	let bucket = garage
-		.bucket_helper()
-		.get_existing_bucket(bucket_id)
-		.await?;
-
 	let decoded_policy = base64::decode(&policy).ok_or_bad_request("Invalid policy")?;
 	let decoded_policy: Policy =
 		serde_json::from_slice(&decoded_policy).ok_or_bad_request("Invalid policy")?;
@@ -232,7 +227,7 @@ pub async fn handle_post_object(
 		garage,
 		headers,
 		StreamLimiter::new(stream, conditions.content_length),
-		&bucket,
+		bucket_id,
 		&key,
 		None,
 		None,
@@ -249,7 +244,7 @@ pub async fn handle_post_object(
 	{
 		target
 			.query_pairs_mut()
-			.append_pair("bucket", &bucket_name)
+			.append_pair("bucket", &bucket)
 			.append_pair("key", &key)
 			.append_pair("etag", &etag);
 		let target = target.to_string();
@@ -294,7 +289,7 @@ pub async fn handle_post_object(
 				let xml = s3_xml::PostObject {
 					xmlns: (),
 					location: s3_xml::Value(location),
-					bucket: s3_xml::Value(bucket_name),
+					bucket: s3_xml::Value(bucket),
 					key: s3_xml::Value(key),
 					etag: s3_xml::Value(etag),
 				};
@@ -1,4 +1,4 @@
-use std::collections::{BTreeMap, BTreeSet, HashMap, VecDeque};
+use std::collections::{BTreeMap, BTreeSet, VecDeque};
 use std::sync::Arc;

 use futures::prelude::*;
@@ -14,9 +14,7 @@ use garage_util::error::Error as GarageError;
 use garage_util::time::*;

 use garage_block::manager::INLINE_THRESHOLD;
-use garage_model::bucket_table::Bucket;
 use garage_model::garage::Garage;
-use garage_model::index_counter::CountedItem;
 use garage_model::s3::block_ref_table::*;
 use garage_model::s3::object_table::*;
 use garage_model::s3::version_table::*;
@@ -28,7 +26,7 @@ use crate::signature::verify_signed_content;
 pub async fn handle_put(
 	garage: Arc<Garage>,
 	req: Request<Body>,
-	bucket: &Bucket,
+	bucket_id: Uuid,
 	key: &str,
 	content_sha256: Option<Hash>,
 ) -> Result<Response<Body>, Error> {
@@ -48,7 +46,7 @@ pub async fn handle_put(
 		garage,
 		headers,
 		body,
-		bucket,
+		bucket_id,
 		key,
 		content_md5,
 		content_sha256,
@@ -61,7 +59,7 @@ pub(crate) async fn save_stream<S: Stream<Item = Result<Bytes, Error>> + Unpin>(
 	garage: Arc<Garage>,
 	headers: ObjectVersionHeaders,
 	body: S,
-	bucket: &Bucket,
+	bucket_id: Uuid,
 	key: &str,
 	content_md5: Option<String>,
 	content_sha256: Option<FixedBytes32>,
@@ -82,7 +80,6 @@ pub(crate) async fn save_stream<S: Stream<Item = Result<Bytes, Error>> + Unpin>(
 		let data_md5sum_hex = hex::encode(data_md5sum);

 		let data_sha256sum = sha256sum(&first_block[..]);
-		let size = first_block.len() as u64;

 		ensure_checksum_matches(
 			data_md5sum.as_slice(),
@@ -91,22 +88,20 @@ pub(crate) async fn save_stream<S: Stream<Item = Result<Bytes, Error>> + Unpin>(
 			content_sha256,
 		)?;

-		check_quotas(&garage, bucket, key, size).await?;
-
 		let object_version = ObjectVersion {
 			uuid: version_uuid,
 			timestamp: version_timestamp,
 			state: ObjectVersionState::Complete(ObjectVersionData::Inline(
 				ObjectVersionMeta {
 					headers,
-					size,
+					size: first_block.len() as u64,
 					etag: data_md5sum_hex.clone(),
 				},
 				first_block,
 			)),
 		};

-		let object = Object::new(bucket.id, key.into(), vec![object_version]);
+		let object = Object::new(bucket_id, key.into(), vec![object_version]);
 		garage.object_table.insert(&object).await?;

 		return Ok((version_uuid, data_md5sum_hex));
@@ -119,42 +114,36 @@ pub(crate) async fn save_stream<S: Stream<Item = Result<Bytes, Error>> + Unpin>(
 		timestamp: version_timestamp,
 		state: ObjectVersionState::Uploading(headers.clone()),
 	};
-	let object = Object::new(bucket.id, key.into(), vec![object_version.clone()]);
+	let object = Object::new(bucket_id, key.into(), vec![object_version.clone()]);
 	garage.object_table.insert(&object).await?;

 	// Initialize corresponding entry in version table
 	// Write this entry now, even with empty block list,
 	// to prevent block_ref entries from being deleted (they can be deleted
 	// if the reference a version that isn't found in the version table)
-	let version = Version::new(version_uuid, bucket.id, key.into(), false);
+	let version = Version::new(version_uuid, bucket_id, key.into(), false);
 	garage.version_table.insert(&version).await?;

 	// Transfer data and verify checksum
 	let first_block_hash = blake2sum(&first_block[..]);
-
-	let tx_result = (|| async {
-		let (total_size, data_md5sum, data_sha256sum) = read_and_put_blocks(
-			&garage,
-			&version,
-			1,
-			first_block,
-			first_block_hash,
-			&mut chunker,
-		)
-		.await?;
-
+	let tx_result = read_and_put_blocks(
+		&garage,
+		&version,
+		1,
+		first_block,
+		first_block_hash,
+		&mut chunker,
+	)
+	.await
+	.and_then(|(total_size, data_md5sum, data_sha256sum)| {
 		ensure_checksum_matches(
 			data_md5sum.as_slice(),
 			data_sha256sum,
 			content_md5.as_deref(),
 			content_sha256,
-		)?;
-
-		check_quotas(&garage, bucket, key, total_size).await?;
-
-		Ok((total_size, data_md5sum))
-	})()
-	.await;
+		)
+		.map(|()| (total_size, data_md5sum))
+	});

 	// If something went wrong, clean up
 	let (total_size, md5sum_arr) = match tx_result {
@@ -162,7 +151,7 @@ pub(crate) async fn save_stream<S: Stream<Item = Result<Bytes, Error>> + Unpin>(
 		Err(e) => {
 			// Mark object as aborted, this will free the blocks further down
 			object_version.state = ObjectVersionState::Aborted;
-			let object = Object::new(bucket.id, key.into(), vec![object_version.clone()]);
+			let object = Object::new(bucket_id, key.into(), vec![object_version.clone()]);
 			garage.object_table.insert(&object).await?;
 			return Err(e);
 		}
@@ -178,7 +167,7 @@ pub(crate) async fn save_stream<S: Stream<Item = Result<Bytes, Error>> + Unpin>(
 		},
 		first_block_hash,
 	));
-	let object = Object::new(bucket.id, key.into(), vec![object_version]);
+	let object = Object::new(bucket_id, key.into(), vec![object_version]);
 	garage.object_table.insert(&object).await?;

 	Ok((version_uuid, md5sum_hex))
@@ -211,64 +200,6 @@ fn ensure_checksum_matches(
 	Ok(())
 }

-/// Check that inserting this object with this size doesn't exceed bucket quotas
-async fn check_quotas(
-	garage: &Arc<Garage>,
-	bucket: &Bucket,
-	key: &str,
-	size: u64,
-) -> Result<(), Error> {
-	let quotas = bucket.state.as_option().unwrap().quotas.get();
-	if quotas.max_objects.is_none() && quotas.max_size.is_none() {
-		return Ok(());
-	};
-
-	let key = key.to_string();
-	let (prev_object, counters) = futures::try_join!(
-		garage.object_table.get(&bucket.id, &key),
-		garage.object_counter_table.table.get(&bucket.id, &EmptyKey),
-	)?;
-
-	let counters = counters
-		.map(|x| x.filtered_values(&garage.system.ring.borrow()))
-		.unwrap_or_default();
-
-	let (prev_cnt_obj, prev_cnt_size) = match prev_object {
-		Some(o) => {
-			let prev_cnt = o.counts().into_iter().collect::<HashMap<_, _>>();
-			(
-				prev_cnt.get(OBJECTS).cloned().unwrap_or_default(),
-				prev_cnt.get(BYTES).cloned().unwrap_or_default(),
-			)
-		}
-		None => (0, 0),
-	};
-	let cnt_obj_diff = 1 - prev_cnt_obj;
-	let cnt_size_diff = size as i64 - prev_cnt_size;
-
-	if let Some(mo) = quotas.max_objects {
-		let current_objects = counters.get(OBJECTS).cloned().unwrap_or_default();
-		if cnt_obj_diff > 0 && current_objects + cnt_obj_diff > mo as i64 {
-			return Err(Error::forbidden(format!(
-				"Object quota is reached, maximum objects for this bucket: {}",
-				mo
-			)));
-		}
-	}
-
-	if let Some(ms) = quotas.max_size {
-		let current_size = counters.get(BYTES).cloned().unwrap_or_default();
-		if cnt_size_diff > 0 && current_size + cnt_size_diff > ms as i64 {
-			return Err(Error::forbidden(format!(
-				"Bucket size quota is reached, maximum total size of objects for this bucket: {}. The bucket is already {} bytes, and this object would add {} bytes.",
-				ms, current_size, size
-			)));
-		}
-	}
-
-	Ok(())
-}
-
 async fn read_and_put_blocks<S: Stream<Item = Result<Bytes, Error>> + Unpin>(
 	garage: &Garage,
 	version: &Version,
@@ -542,7 +473,7 @@ pub async fn handle_complete_multipart_upload(
 	garage: Arc<Garage>,
 	req: Request<Body>,
 	bucket_name: &str,
-	bucket: &Bucket,
+	bucket_id: Uuid,
 	key: &str,
 	upload_id: &str,
 	content_sha256: Option<Hash>,
@@ -566,7 +497,7 @@ pub async fn handle_complete_multipart_upload(
 	// Get object and version
 	let key = key.to_string();
 	let (object, version) = futures::try_join!(
-		garage.object_table.get(&bucket.id, &key),
+		garage.object_table.get(&bucket_id, &key),
 		garage.version_table.get(&version_uuid, &EmptyKey),
 	)?;

@@ -659,14 +590,6 @@ pub async fn handle_complete_multipart_upload(
 	// Calculate total size of final object
 	let total_size = version.blocks.items().iter().map(|x| x.1.size).sum();

-	if let Err(e) = check_quotas(&garage, bucket, &key, total_size).await {
-		object_version.state = ObjectVersionState::Aborted;
-		let final_object = Object::new(bucket.id, key.clone(), vec![object_version]);
-		garage.object_table.insert(&final_object).await?;
-
-		return Err(e);
-	}
-
 	// Write final object version
 	object_version.state = ObjectVersionState::Complete(ObjectVersionData::FirstBlock(
 		ObjectVersionMeta {
@@ -677,7 +600,7 @@ pub async fn handle_complete_multipart_upload(
 		version.blocks.items()[0].1.hash,
 	));

-	let final_object = Object::new(bucket.id, key.clone(), vec![object_version]);
+	let final_object = Object::new(bucket_id, key.clone(), vec![object_version]);
 	garage.object_table.insert(&final_object).await?;

 	// Send response saying ok we're done
@@ -1,6 +1,6 @@
 [package]
 name = "garage_block"
-version = "0.7.0"
+version = "0.7.3"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -14,14 +14,12 @@ path = "lib.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-garage_db = { version = "0.8.0", path = "../db" }
-garage_rpc = { version = "0.7.0", path = "../rpc" }
-garage_util = { version = "0.7.0", path = "../util" }
-garage_table = { version = "0.7.0", path = "../table" }
+garage_rpc = { version = "0.7.3", path = "../rpc" }
+garage_util = { version = "0.7.3", path = "../util" }
+garage_table = { version = "0.7.3", path = "../table" }

 opentelemetry = "0.17"

-arc-swap = "1.5"
 async-trait = "0.1.7"
 bytes = "1.0"
 hex = "0.4"
@@ -29,6 +27,8 @@ tracing = "0.1.30"
 rand = "0.8"
 zstd = { version = "0.9", default-features = false }

+sled = "0.34"
+
 rmp-serde = "0.15"
 serde = { version = "1.0", default-features = false, features = ["derive", "rc"] }
 serde_bytes = "0.11"
@@ -2,7 +2,6 @@
 extern crate tracing;

 pub mod manager;
-pub mod repair;

 mod block;
 mod metrics;
@@ -1,30 +1,26 @@
 use std::convert::TryInto;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use std::time::Duration;

-use arc_swap::ArcSwapOption;
 use async_trait::async_trait;
 use serde::{Deserialize, Serialize};

 use futures::future::*;
+use futures::select;
 use tokio::fs;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
-use tokio::select;
-use tokio::sync::{mpsc, watch, Mutex, Notify};
+use tokio::sync::{watch, Mutex, Notify};

 use opentelemetry::{
 	trace::{FutureExt as OtelFutureExt, TraceContextExt, Tracer},
 	Context, KeyValue,
 };

-use garage_db as db;
-use garage_db::counted_tree_hack::CountedTree;
-
-use garage_util::background::*;
 use garage_util::data::*;
 use garage_util::error::*;
 use garage_util::metrics::RecordDuration;
+use garage_util::sled_counter::SledCountedTree;
 use garage_util::time::*;
 use garage_util::tranquilizer::Tranquilizer;

@@ -36,7 +32,6 @@ use garage_table::replication::{TableReplication, TableShardedReplication};
 use crate::block::*;
 use crate::metrics::*;
 use crate::rc::*;
-use crate::repair::*;

 /// Size under which data will be stored inlined in database instead of as files
 pub const INLINE_THRESHOLD: usize = 3072;
@@ -94,18 +89,16 @@ pub struct BlockManager {

 	mutation_lock: Mutex<BlockManagerLocked>,

-	pub(crate) rc: BlockRc,
+	rc: BlockRc,

-	resync_queue: CountedTree,
+	resync_queue: SledCountedTree,
 	resync_notify: Notify,
-	resync_errors: CountedTree,
+	resync_errors: SledCountedTree,

-	pub(crate) system: Arc<System>,
+	system: Arc<System>,
 	endpoint: Arc<Endpoint<BlockRpc, Self>>,

 	metrics: BlockManagerMetrics,
-
-	tx_scrub_command: ArcSwapOption<mpsc::Sender<ScrubWorkerCommand>>,
 }

 // This custom struct contains functions that must only be ran
@@ -113,15 +106,9 @@ pub struct BlockManager {
 // it INSIDE a Mutex.
 struct BlockManagerLocked();

-enum ResyncIterResult {
-	BusyDidSomething,
-	BusyDidNothing,
-	IdleFor(Duration),
-}
-
 impl BlockManager {
 	pub fn new(
-		db: &db::Db,
+		db: &sled::Db,
 		data_dir: PathBuf,
 		compression_level: Option<i32>,
 		background_tranquility: u32,
@@ -136,14 +123,12 @@ impl BlockManager {
 		let resync_queue = db
 			.open_tree("block_local_resync_queue")
 			.expect("Unable to open block_local_resync_queue tree");
-		let resync_queue =
-			CountedTree::new(resync_queue).expect("Could not count block_local_resync_queue");
+		let resync_queue = SledCountedTree::new(resync_queue);

 		let resync_errors = db
 			.open_tree("block_local_resync_errors")
 			.expect("Unable to open block_local_resync_errors tree");
-		let resync_errors =
-			CountedTree::new(resync_errors).expect("Could not count block_local_resync_errors");
+		let resync_errors = SledCountedTree::new(resync_errors);

 		let endpoint = system
 			.netapp
@@ -166,11 +151,10 @@ impl BlockManager {
 			system,
 			endpoint,
 			metrics,
-			tx_scrub_command: ArcSwapOption::new(None),
 		});
 		block_manager.endpoint.set_handler(block_manager.clone());

-		block_manager.clone().spawn_background_workers();
+		block_manager.clone().spawn_background_worker();

 		block_manager
 	}
@@ -228,81 +212,98 @@ impl BlockManager {
 		Ok(())
 	}

+	/// Launch the repair procedure on the data store
+	///
+	/// This will list all blocks locally present, as well as those
+	/// that are required because of refcount > 0, and will try
+	/// to fix any mismatch between the two.
+	pub async fn repair_data_store(&self, must_exit: &watch::Receiver<bool>) -> Result<(), Error> {
+		// 1. Repair blocks from RC table.
+		for (i, entry) in self.rc.rc.iter().enumerate() {
+			let (hash, _) = entry?;
+			let hash = Hash::try_from(&hash[..]).unwrap();
+			self.put_to_resync(&hash, Duration::from_secs(0))?;
+			if i & 0xFF == 0 && *must_exit.borrow() {
+				return Ok(());
+			}
+		}
+
+		// 2. Repair blocks actually on disk
+		// Lists all blocks on disk and adds them to the resync queue.
+		// This allows us to find blocks we are storing but don't actually need,
+		// so that we can offload them if necessary and then delete them locally.
+		self.for_each_file(
+			(),
+			move |_, hash| async move {
+				self.put_to_resync(&hash, Duration::from_secs(0))
+					.map_err(Into::into)
+			},
+			must_exit,
+		)
+		.await
+	}
+
+	/// Verify integrity of each block on disk. Use `speed_limit` to limit the load generated by
+	/// this function.
+	pub async fn scrub_data_store(
+		&self,
+		must_exit: &watch::Receiver<bool>,
+		tranquility: u32,
+	) -> Result<(), Error> {
+		let tranquilizer = Tranquilizer::new(30);
+		self.for_each_file(
+			tranquilizer,
+			move |mut tranquilizer, hash| async move {
+				let _ = self.read_block(&hash).await;
+				tranquilizer.tranquilize(tranquility).await;
+				Ok(tranquilizer)
+			},
+			must_exit,
+		)
+		.await
+	}
+
 	/// Get lenght of resync queue
-	pub fn resync_queue_len(&self) -> Result<usize, Error> {
-		// This currently can't return an error because the CountedTree hack
-		// doesn't error on .len(), but this will change when we remove the hack
-		// (hopefully someday!)
-		Ok(self.resync_queue.len())
+	pub fn resync_queue_len(&self) -> usize {
+		self.resync_queue.len()
 	}

 	/// Get number of blocks that have an error
-	pub fn resync_errors_len(&self) -> Result<usize, Error> {
-		// (see resync_queue_len comment)
-		Ok(self.resync_errors.len())
+	pub fn resync_errors_len(&self) -> usize {
+		self.resync_errors.len()
 	}

 	/// Get number of items in the refcount table
-	pub fn rc_len(&self) -> Result<usize, Error> {
-		Ok(self.rc.rc.len()?)
-	}
-
-	/// Send command to start/stop/manager scrub worker
-	pub async fn send_scrub_command(&self, cmd: ScrubWorkerCommand) {
-		let _ = self
-			.tx_scrub_command
-			.load()
-			.as_ref()
-			.unwrap()
-			.send(cmd)
-			.await;
+	pub fn rc_len(&self) -> usize {
+		self.rc.rc.len()
 	}

 	//// ----- Managing the reference counter ----

 	/// Increment the number of time a block is used, putting it to resynchronization if it is
 	/// required, but not known
-	pub fn block_incref(
-		self: &Arc<Self>,
-		tx: &mut db::Transaction,
-		hash: Hash,
-	) -> db::TxOpResult<()> {
-		if self.rc.block_incref(tx, &hash)? {
+	pub fn block_incref(&self, hash: &Hash) -> Result<(), Error> {
+		if self.rc.block_incref(hash)? {
 			// When the reference counter is incremented, there is
 			// normally a node that is responsible for sending us the
 			// data of the block. However that operation may fail,
 			// so in all cases we add the block here to the todo list
 			// to check later that it arrived correctly, and if not
 			// we will fecth it from someone.
-			let this = self.clone();
-			tokio::spawn(async move {
-				if let Err(e) = this.put_to_resync(&hash, 2 * BLOCK_RW_TIMEOUT) {
-					error!("Block {:?} could not be put in resync queue: {}.", hash, e);
-				}
-			});
+			self.put_to_resync(hash, 2 * BLOCK_RW_TIMEOUT)?;
 		}
 		Ok(())
 	}

 	/// Decrement the number of time a block is used
-	pub fn block_decref(
-		self: &Arc<Self>,
-		tx: &mut db::Transaction,
-		hash: Hash,
-	) -> db::TxOpResult<()> {
-		if self.rc.block_decref(tx, &hash)? {
+	pub fn block_decref(&self, hash: &Hash) -> Result<(), Error> {
+		if self.rc.block_decref(hash)? {
 			// When the RC is decremented, it might drop to zero,
 			// indicating that we don't need the block.
 			// There is a delay before we garbage collect it;
 			// make sure that it is handled in the resync loop
 			// after that delay has passed.
-			let this = self.clone();
-			tokio::spawn(async move {
-				if let Err(e) = this.put_to_resync(&hash, BLOCK_GC_DELAY + Duration::from_secs(10))
-				{
-					error!("Block {:?} could not be put in resync queue: {}.", hash, e);
-				}
-			});
+			self.put_to_resync(hash, BLOCK_GC_DELAY + Duration::from_secs(10))?;
 		}
 		Ok(())
 	}
@@ -327,7 +328,7 @@ impl BlockManager {
 	}

 	/// Read block from disk, verifying it's integrity
-	pub(crate) async fn read_block(&self, hash: &Hash) -> Result<BlockRpc, Error> {
+	async fn read_block(&self, hash: &Hash) -> Result<BlockRpc, Error> {
 		let data = self
 			.read_block_internal(hash)
 			.bound_record_duration(&self.metrics.block_read_duration)
@@ -491,28 +492,23 @@ impl BlockManager {
 	// for times that are earlier than the exponential back-off delay
 	// is a natural condition that is handled properly).

-	fn spawn_background_workers(self: Arc<Self>) {
+	fn spawn_background_worker(self: Arc<Self>) {
 		// Launch a background workers for background resync loop processing
 		let background = self.system.background.clone();
-		let worker = ResyncWorker::new(self.clone());
 		tokio::spawn(async move {
 			tokio::time::sleep(Duration::from_secs(10)).await;
-			background.spawn_worker(worker);
+			background.spawn_worker("block resync worker".into(), move |must_exit| {
+				self.resync_loop(must_exit)
+			});
 		});
-
-		// Launch a background worker for data store scrubs
-		let (scrub_tx, scrub_rx) = mpsc::channel(1);
-		self.tx_scrub_command.store(Some(Arc::new(scrub_tx)));
-		let scrub_worker = ScrubWorker::new(self.clone(), scrub_rx);
-		self.system.background.spawn_worker(scrub_worker);
 	}

-	pub(crate) fn put_to_resync(&self, hash: &Hash, delay: Duration) -> db::Result<()> {
+	fn put_to_resync(&self, hash: &Hash, delay: Duration) -> Result<(), sled::Error> {
 		let when = now_msec() + delay.as_millis() as u64;
 		self.put_to_resync_at(hash, when)
 	}

-	fn put_to_resync_at(&self, hash: &Hash, when: u64) -> db::Result<()> {
+	fn put_to_resync_at(&self, hash: &Hash, when: u64) -> Result<(), sled::Error> {
 		trace!("Put resync_queue: {} {:?}", when, hash);
 		let mut key = u64::to_be_bytes(when).to_vec();
 		key.extend(hash.as_ref());
@@ -521,8 +517,43 @@ impl BlockManager {
 		Ok(())
 	}

-	async fn resync_iter(&self) -> Result<ResyncIterResult, db::Error> {
-		if let Some((time_bytes, hash_bytes)) = self.resync_queue.first()? {
+	async fn resync_loop(self: Arc<Self>, mut must_exit: watch::Receiver<bool>) {
+		let mut tranquilizer = Tranquilizer::new(30);
+
+		while !*must_exit.borrow() {
+			match self.resync_iter(&mut must_exit).await {
+				Ok(true) => {
+					tranquilizer.tranquilize(self.background_tranquility).await;
+				}
+				Ok(false) => {
+					tranquilizer.reset();
+				}
+				Err(e) => {
+					// The errors that we have here are only Sled errors
+					// We don't really know how to handle them so just ¯\_(ツ)_/¯
+					// (there is kind of an assumption that Sled won't error on us,
+					// if it does there is not much we can do -- TODO should we just panic?)
+					error!(
+						"Could not do a resync iteration: {} (this is a very bad error)",
+						e
+					);
+					tranquilizer.reset();
+				}
+			}
+		}
+	}
+
+	// The result of resync_iter is:
+	// - Ok(true) -> a block was processed (successfully or not)
+	// - Ok(false) -> no block was processed, but we are ready for the next iteration
+	// - Err(_) -> a Sled error occurred when reading/writing from resync_queue/resync_errors
+	async fn resync_iter(
+		&self,
+		must_exit: &mut watch::Receiver<bool>,
+	) -> Result<bool, sled::Error> {
+		if let Some(first_pair_res) = self.resync_queue.iter().next() {
+			let (time_bytes, hash_bytes) = first_pair_res?;
+
 			let time_msec = u64::from_be_bytes(time_bytes[0..8].try_into().unwrap());
 			let now = now_msec();

@@ -530,7 +561,7 @@ impl BlockManager {
 				let hash = Hash::try_from(&hash_bytes[..]).unwrap();

 				if let Some(ec) = self.resync_errors.get(hash.as_slice())? {
-					let ec = ErrorCounter::decode(&ec);
+					let ec = ErrorCounter::decode(ec);
 					if now < ec.next_try() {
 						// if next retry after an error is not yet,
 						// don't do resync and return early, but still
@@ -541,7 +572,7 @@ impl BlockManager {
 						// (we want to do the remove after the insert to ensure
 						// that the item is not lost if we crash in-between)
 						self.resync_queue.remove(time_bytes)?;
-						return Ok(ResyncIterResult::BusyDidNothing);
+						return Ok(false);
 					}
 				}

@@ -571,7 +602,7 @@ impl BlockManager {
 					warn!("Error when resyncing {:?}: {}", hash, e);

 					let err_counter = match self.resync_errors.get(hash.as_slice())? {
-						Some(ec) => ErrorCounter::decode(&ec).add1(now + 1),
+						Some(ec) => ErrorCounter::decode(ec).add1(now + 1),
 						None => ErrorCounter::new(now + 1),
 					};

@@ -588,11 +619,15 @@ impl BlockManager {
 					self.resync_queue.remove(time_bytes)?;
 				}

-				Ok(ResyncIterResult::BusyDidSomething)
+				Ok(true)
 			} else {
-				Ok(ResyncIterResult::IdleFor(Duration::from_millis(
-					time_msec - now,
-				)))
+				let delay = tokio::time::sleep(Duration::from_millis(time_msec - now));
+				select! {
+					_ = delay.fuse() => {},
+					_ = self.resync_notify.notified().fuse() => {},
+					_ = must_exit.changed().fuse() => {},
+				}
+				Ok(false)
 			}
 		} else {
 			// Here we wait either for a notification that an item has been
@@ -601,7 +636,13 @@ impl BlockManager {
 			// between the time we checked the queue and the first poll
 			// to resync_notify.notified(): if that happens, we'll just loop
 			// back 10 seconds later, which is fine.
-			Ok(ResyncIterResult::IdleFor(Duration::from_secs(10)))
+			let delay = tokio::time::sleep(Duration::from_secs(10));
+			select! {
+				_ = delay.fuse() => {},
+				_ = self.resync_notify.notified().fuse() => {},
+				_ = must_exit.changed().fuse() => {},
+			}
+			Ok(false)
 		}
 	}

@@ -716,6 +757,72 @@ impl BlockManager {

 		Ok(())
 	}
+
+	// ---- Utility: iteration on files in the data directory ----
+
+	async fn for_each_file<F, Fut, State>(
+		&self,
+		state: State,
+		mut f: F,
+		must_exit: &watch::Receiver<bool>,
+	) -> Result<(), Error>
+	where
+		F: FnMut(State, Hash) -> Fut + Send,
+		Fut: Future<Output = Result<State, Error>> + Send,
+		State: Send,
+	{
+		self.for_each_file_rec(&self.data_dir, state, &mut f, must_exit)
+			.await
+			.map(|_| ())
+	}
+
+	fn for_each_file_rec<'a, F, Fut, State>(
+		&'a self,
+		path: &'a Path,
+		mut state: State,
+		f: &'a mut F,
+		must_exit: &'a watch::Receiver<bool>,
+	) -> BoxFuture<'a, Result<State, Error>>
+	where
+		F: FnMut(State, Hash) -> Fut + Send,
+		Fut: Future<Output = Result<State, Error>> + Send,
+		State: Send + 'a,
+	{
+		async move {
+			let mut ls_data_dir = fs::read_dir(path).await?;
+			while let Some(data_dir_ent) = ls_data_dir.next_entry().await? {
+				if *must_exit.borrow() {
+					break;
+				}
+
+				let name = data_dir_ent.file_name();
+				let name = if let Ok(n) = name.into_string() {
+					n
+				} else {
+					continue;
+				};
+				let ent_type = data_dir_ent.file_type().await?;
+
+				let name = name.strip_suffix(".zst").unwrap_or(&name);
+				if name.len() == 2 && hex::decode(&name).is_ok() && ent_type.is_dir() {
+					state = self
+						.for_each_file_rec(&data_dir_ent.path(), state, f, must_exit)
+						.await?;
+				} else if name.len() == 64 {
+					let hash_bytes = if let Ok(h) = hex::decode(&name) {
+						h
+					} else {
+						continue;
+					};
+					let mut hash = [0u8; 32];
+					hash.copy_from_slice(&hash_bytes[..]);
+					state = f(state, hash.into()).await?;
+				}
+			}
+			Ok(state)
+		}
+		.boxed()
+	}
 }

 #[async_trait]
@@ -734,77 +841,6 @@ impl EndpointHandler<BlockRpc> for BlockManager {
 	}
 }

-struct ResyncWorker {
-	manager: Arc<BlockManager>,
-	tranquilizer: Tranquilizer,
-	next_delay: Duration,
-}
-
-impl ResyncWorker {
-	fn new(manager: Arc<BlockManager>) -> Self {
-		Self {
-			manager,
-			tranquilizer: Tranquilizer::new(30),
-			next_delay: Duration::from_secs(10),
-		}
-	}
-}
-
-#[async_trait]
-impl Worker for ResyncWorker {
-	fn name(&self) -> String {
-		"Block resync worker".into()
-	}
-
-	fn info(&self) -> Option<String> {
-		let mut ret = vec![];
-		let qlen = self.manager.resync_queue_len().unwrap_or(0);
-		let elen = self.manager.resync_errors_len().unwrap_or(0);
-		if qlen > 0 {
-			ret.push(format!("{} blocks in queue", qlen));
-		}
-		if elen > 0 {
-			ret.push(format!("{} blocks in error state", elen));
-		}
-		if !ret.is_empty() {
-			Some(ret.join(", "))
-		} else {
-			None
-		}
-	}
-
-	async fn work(&mut self, _must_exit: &mut watch::Receiver<bool>) -> Result<WorkerState, Error> {
-		self.tranquilizer.reset();
-		match self.manager.resync_iter().await {
-			Ok(ResyncIterResult::BusyDidSomething) => Ok(self
-				.tranquilizer
-				.tranquilize_worker(self.manager.background_tranquility)),
-			Ok(ResyncIterResult::BusyDidNothing) => Ok(WorkerState::Busy),
-			Ok(ResyncIterResult::IdleFor(delay)) => {
-				self.next_delay = delay;
-				Ok(WorkerState::Idle)
-			}
-			Err(e) => {
-				// The errors that we have here are only Sled errors
-				// We don't really know how to handle them so just ¯\_(ツ)_/¯
-				// (there is kind of an assumption that Sled won't error on us,
-				// if it does there is not much we can do -- TODO should we just panic?)
-				// Here we just give the error to the worker manager,
-				// it will print it to the logs and increment a counter
-				Err(e.into())
-			}
-		}
-	}
-
-	async fn wait_for_work(&mut self, _must_exit: &watch::Receiver<bool>) -> WorkerState {
-		select! {
-			_ = tokio::time::sleep(self.next_delay) => (),
-			_ = self.manager.resync_notify.notified() => (),
-		};
-		WorkerState::Busy
-	}
-}
-
 struct BlockStatus {
 	exists: bool,
 	needed: RcEntry,
@@ -930,7 +966,7 @@ impl ErrorCounter {
 		}
 	}

-	fn decode(data: &[u8]) -> Self {
+	fn decode(data: sled::IVec) -> Self {
 		Self {
 			errors: u64::from_be_bytes(data[0..8].try_into().unwrap()),
 			last_try: u64::from_be_bytes(data[8..16].try_into().unwrap()),
@@ -1,6 +1,6 @@
 use opentelemetry::{global, metrics::*};

-use garage_db::counted_tree_hack::CountedTree;
+use garage_util::sled_counter::SledCountedTree;

 /// TableMetrics reference all counter used for metrics
 pub struct BlockManagerMetrics {
@@ -23,7 +23,7 @@ pub struct BlockManagerMetrics {
 }

 impl BlockManagerMetrics {
-	pub fn new(resync_queue: CountedTree, resync_errors: CountedTree) -> Self {
+	pub fn new(resync_queue: SledCountedTree, resync_errors: SledCountedTree) -> Self {
 		let meter = global::meter("garage_model/block");
 		Self {
 			_resync_queue_len: meter
@@ -1,7 +1,5 @@
 use std::convert::TryInto;

-use garage_db as db;
-
 use garage_util::data::*;
 use garage_util::error::*;
 use garage_util::time::*;
@@ -9,41 +7,31 @@ use garage_util::time::*;
 use crate::manager::BLOCK_GC_DELAY;

 pub struct BlockRc {
-	pub(crate) rc: db::Tree,
+	pub(crate) rc: sled::Tree,
 }

 impl BlockRc {
-	pub(crate) fn new(rc: db::Tree) -> Self {
+	pub(crate) fn new(rc: sled::Tree) -> Self {
 		Self { rc }
 	}

 	/// Increment the reference counter associated to a hash.
 	/// Returns true if the RC goes from zero to nonzero.
-	pub(crate) fn block_incref(
-		&self,
-		tx: &mut db::Transaction,
-		hash: &Hash,
-	) -> db::TxOpResult<bool> {
-		let old_rc = RcEntry::parse_opt(tx.get(&self.rc, &hash)?);
-		match old_rc.increment().serialize() {
-			Some(x) => tx.insert(&self.rc, &hash, x)?,
-			None => unreachable!(),
-		};
+	pub(crate) fn block_incref(&self, hash: &Hash) -> Result<bool, Error> {
+		let old_rc = self
+			.rc
+			.fetch_and_update(&hash, |old| RcEntry::parse_opt(old).increment().serialize())?;
+		let old_rc = RcEntry::parse_opt(old_rc);
 		Ok(old_rc.is_zero())
 	}

 	/// Decrement the reference counter associated to a hash.
 	/// Returns true if the RC is now zero.
-	pub(crate) fn block_decref(
-		&self,
-		tx: &mut db::Transaction,
-		hash: &Hash,
-	) -> db::TxOpResult<bool> {
-		let new_rc = RcEntry::parse_opt(tx.get(&self.rc, &hash)?).decrement();
-		match new_rc.serialize() {
-			Some(x) => tx.insert(&self.rc, &hash, x)?,
-			None => tx.remove(&self.rc, &hash)?,
-		};
+	pub(crate) fn block_decref(&self, hash: &Hash) -> Result<bool, Error> {
+		let new_rc = self
+			.rc
+			.update_and_fetch(&hash, |old| RcEntry::parse_opt(old).decrement().serialize())?;
+		let new_rc = RcEntry::parse_opt(new_rc);
 		Ok(matches!(new_rc, RcEntry::Deletable { .. }))
 	}

@@ -56,15 +44,12 @@ impl BlockRc {
 	/// deletion time has passed
 	pub(crate) fn clear_deleted_block_rc(&self, hash: &Hash) -> Result<(), Error> {
 		let now = now_msec();
-		self.rc.db().transaction(|mut tx| {
-			let rcval = RcEntry::parse_opt(tx.get(&self.rc, &hash)?);
-			match rcval {
-				RcEntry::Deletable { at_time } if now > at_time => {
-					tx.remove(&self.rc, &hash)?;
-				}
-				_ => (),
+		self.rc.update_and_fetch(&hash, |rcval| {
+			let updated = match RcEntry::parse_opt(rcval) {
+				RcEntry::Deletable { at_time } if now > at_time => RcEntry::Absent,
+				v => v,
 			};
-			tx.commit(())
+			updated.serialize()
 		})?;
 		Ok(())
 	}
@@ -1,444 +0,0 @@
-use core::ops::Bound;
-use std::path::PathBuf;
-use std::sync::Arc;
-use std::time::Duration;
-
-use async_trait::async_trait;
-use serde::{Deserialize, Serialize};
-use tokio::fs;
-use tokio::select;
-use tokio::sync::mpsc;
-use tokio::sync::watch;
-
-use garage_util::background::*;
-use garage_util::data::*;
-use garage_util::error::*;
-use garage_util::persister::Persister;
-use garage_util::time::*;
-use garage_util::tranquilizer::Tranquilizer;
-
-use crate::manager::*;
-
-const SCRUB_INTERVAL: Duration = Duration::from_secs(3600 * 24 * 30); // full scrub every 30 days
-
-pub struct RepairWorker {
-	manager: Arc<BlockManager>,
-	next_start: Option<Hash>,
-	block_iter: Option<BlockStoreIterator>,
-}
-
-impl RepairWorker {
-	pub fn new(manager: Arc<BlockManager>) -> Self {
-		Self {
-			manager,
-			next_start: None,
-			block_iter: None,
-		}
-	}
-}
-
-#[async_trait]
-impl Worker for RepairWorker {
-	fn name(&self) -> String {
-		"Block repair worker".into()
-	}
-
-	fn info(&self) -> Option<String> {
-		match self.block_iter.as_ref() {
-			None => {
-				let idx_bytes = self
-					.next_start
-					.as_ref()
-					.map(|x| x.as_slice())
-					.unwrap_or(&[]);
-				let idx_bytes = if idx_bytes.len() > 4 {
-					&idx_bytes[..4]
-				} else {
-					idx_bytes
-				};
-				Some(format!("Phase 1: {}", hex::encode(idx_bytes)))
-			}
-			Some(bi) => Some(format!("Phase 2: {:.2}% done", bi.progress() * 100.)),
-		}
-	}
-
-	async fn work(&mut self, _must_exit: &mut watch::Receiver<bool>) -> Result<WorkerState, Error> {
-		match self.block_iter.as_mut() {
-			None => {
-				// Phase 1: Repair blocks from RC table.
-
-				// We have to do this complicated two-step process where we first read a bunch
-				// of hashes from the RC table, and then insert them in the to-resync queue,
-				// because of SQLite. Basically, as long as we have an iterator on a DB table,
-				// we can't do anything else on the DB. The naive approach (which we had previously)
-				// of just iterating on the RC table and inserting items one to one in the resync
-				// queue can't work here, it would just provoke a deadlock in the SQLite adapter code.
-				// This is mostly because the Rust bindings for SQLite assume a worst-case scenario
-				// where SQLite is not compiled in thread-safe mode, so we have to wrap everything
-				// in a mutex (see db/sqlite_adapter.rs and discussion in PR #322).
-				// TODO: maybe do this with tokio::task::spawn_blocking ?
-				let mut batch_of_hashes = vec![];
-				let start_bound = match self.next_start.as_ref() {
-					None => Bound::Unbounded,
-					Some(x) => Bound::Excluded(x.as_slice()),
-				};
-				for entry in self
-					.manager
-					.rc
-					.rc
-					.range::<&[u8], _>((start_bound, Bound::Unbounded))?
-				{
-					let (hash, _) = entry?;
-					let hash = Hash::try_from(&hash[..]).unwrap();
-					batch_of_hashes.push(hash);
-					if batch_of_hashes.len() >= 1000 {
-						break;
-					}
-				}
-				if batch_of_hashes.is_empty() {
-					// move on to phase 2
-					self.block_iter = Some(BlockStoreIterator::new(&self.manager));
-					return Ok(WorkerState::Busy);
-				}
-
-				for hash in batch_of_hashes.into_iter() {
-					self.manager.put_to_resync(&hash, Duration::from_secs(0))?;
-					self.next_start = Some(hash)
-				}
-
-				Ok(WorkerState::Busy)
-			}
-			Some(bi) => {
-				// Phase 2: Repair blocks actually on disk
-				// Lists all blocks on disk and adds them to the resync queue.
-				// This allows us to find blocks we are storing but don't actually need,
-				// so that we can offload them if necessary and then delete them locally.
-				if let Some(hash) = bi.next().await? {
-					self.manager.put_to_resync(&hash, Duration::from_secs(0))?;
-					Ok(WorkerState::Busy)
-				} else {
-					Ok(WorkerState::Done)
-				}
-			}
-		}
-	}
-
-	async fn wait_for_work(&mut self, _must_exit: &watch::Receiver<bool>) -> WorkerState {
-		unreachable!()
-	}
-}
-
-// ----
-
-pub struct ScrubWorker {
-	manager: Arc<BlockManager>,
-	rx_cmd: mpsc::Receiver<ScrubWorkerCommand>,
-
-	work: ScrubWorkerState,
-	tranquilizer: Tranquilizer,
-
-	persister: Persister<ScrubWorkerPersisted>,
-	persisted: ScrubWorkerPersisted,
-}
-
-#[derive(Serialize, Deserialize)]
-struct ScrubWorkerPersisted {
-	tranquility: u32,
-	time_last_complete_scrub: u64,
-	corruptions_detected: u64,
-}
-
-enum ScrubWorkerState {
-	Running(BlockStoreIterator),
-	Paused(BlockStoreIterator, u64), // u64 = time when to resume scrub
-	Finished,
-}
-
-impl Default for ScrubWorkerState {
-	fn default() -> Self {
-		ScrubWorkerState::Finished
-	}
-}
-
-#[derive(Debug)]
-pub enum ScrubWorkerCommand {
-	Start,
-	Pause(Duration),
-	Resume,
-	Cancel,
-	SetTranquility(u32),
-}
-
-impl ScrubWorker {
-	pub fn new(manager: Arc<BlockManager>, rx_cmd: mpsc::Receiver<ScrubWorkerCommand>) -> Self {
-		let persister = Persister::new(&manager.system.metadata_dir, "scrub_info");
-		let persisted = match persister.load() {
-			Ok(v) => v,
-			Err(_) => ScrubWorkerPersisted {
-				time_last_complete_scrub: 0,
-				tranquility: 4,
-				corruptions_detected: 0,
-			},
-		};
-		Self {
-			manager,
-			rx_cmd,
-			work: ScrubWorkerState::Finished,
-			tranquilizer: Tranquilizer::new(30),
-			persister,
-			persisted,
-		}
-	}
-
-	async fn handle_cmd(&mut self, cmd: ScrubWorkerCommand) {
-		match cmd {
-			ScrubWorkerCommand::Start => {
-				self.work = match std::mem::take(&mut self.work) {
-					ScrubWorkerState::Finished => {
-						let iterator = BlockStoreIterator::new(&self.manager);
-						ScrubWorkerState::Running(iterator)
-					}
-					work => {
-						error!("Cannot start scrub worker: already running!");
-						work
-					}
-				};
-			}
-			ScrubWorkerCommand::Pause(dur) => {
-				self.work = match std::mem::take(&mut self.work) {
-					ScrubWorkerState::Running(it) | ScrubWorkerState::Paused(it, _) => {
-						ScrubWorkerState::Paused(it, now_msec() + dur.as_millis() as u64)
-					}
-					work => {
-						error!("Cannot pause scrub worker: not running!");
-						work
-					}
-				};
-			}
-			ScrubWorkerCommand::Resume => {
-				self.work = match std::mem::take(&mut self.work) {
-					ScrubWorkerState::Paused(it, _) => ScrubWorkerState::Running(it),
-					work => {
-						error!("Cannot resume scrub worker: not paused!");
-						work
-					}
-				};
-			}
-			ScrubWorkerCommand::Cancel => {
-				self.work = match std::mem::take(&mut self.work) {
-					ScrubWorkerState::Running(_) | ScrubWorkerState::Paused(_, _) => {
-						ScrubWorkerState::Finished
-					}
-					work => {
-						error!("Cannot cancel scrub worker: not running!");
-						work
-					}
-				}
-			}
-			ScrubWorkerCommand::SetTranquility(t) => {
-				self.persisted.tranquility = t;
-				if let Err(e) = self.persister.save_async(&self.persisted).await {
-					error!("Could not save new tranquilitiy value: {}", e);
-				}
-			}
-		}
-	}
-}
-
-#[async_trait]
-impl Worker for ScrubWorker {
-	fn name(&self) -> String {
-		"Block scrub worker".into()
-	}
-
-	fn info(&self) -> Option<String> {
-		let s = match &self.work {
-			ScrubWorkerState::Running(bsi) => format!(
-				"{:.2}% done (tranquility = {})",
-				bsi.progress() * 100.,
-				self.persisted.tranquility
-			),
-			ScrubWorkerState::Paused(bsi, rt) => {
-				format!(
-					"Paused, {:.2}% done, resumes at {}",
-					bsi.progress() * 100.,
-					msec_to_rfc3339(*rt)
-				)
-			}
-			ScrubWorkerState::Finished => format!(
-				"Last completed scrub: {}",
-				msec_to_rfc3339(self.persisted.time_last_complete_scrub)
-			),
-		};
-		Some(format!(
-			"{} ; corruptions detected: {}",
-			s, self.persisted.corruptions_detected
-		))
-	}
-
-	async fn work(&mut self, _must_exit: &mut watch::Receiver<bool>) -> Result<WorkerState, Error> {
-		match self.rx_cmd.try_recv() {
-			Ok(cmd) => self.handle_cmd(cmd).await,
-			Err(mpsc::error::TryRecvError::Disconnected) => return Ok(WorkerState::Done),
-			Err(mpsc::error::TryRecvError::Empty) => (),
-		};
-
-		match &mut self.work {
-			ScrubWorkerState::Running(bsi) => {
-				self.tranquilizer.reset();
-				if let Some(hash) = bsi.next().await? {
-					match self.manager.read_block(&hash).await {
-						Err(Error::CorruptData(_)) => {
-							error!("Found corrupt data block during scrub: {:?}", hash);
-							self.persisted.corruptions_detected += 1;
-							self.persister.save_async(&self.persisted).await?;
-						}
-						Err(e) => return Err(e),
-						_ => (),
-					};
-					Ok(self
-						.tranquilizer
-						.tranquilize_worker(self.persisted.tranquility))
-				} else {
-					self.persisted.time_last_complete_scrub = now_msec();
-					self.persister.save_async(&self.persisted).await?;
-					self.work = ScrubWorkerState::Finished;
-					self.tranquilizer.clear();
-					Ok(WorkerState::Idle)
-				}
-			}
-			_ => Ok(WorkerState::Idle),
-		}
-	}
-
-	async fn wait_for_work(&mut self, _must_exit: &watch::Receiver<bool>) -> WorkerState {
-		let (wait_until, command) = match &self.work {
-			ScrubWorkerState::Running(_) => return WorkerState::Busy,
-			ScrubWorkerState::Paused(_, resume_time) => (*resume_time, ScrubWorkerCommand::Resume),
-			ScrubWorkerState::Finished => (
-				self.persisted.time_last_complete_scrub + SCRUB_INTERVAL.as_millis() as u64,
-				ScrubWorkerCommand::Start,
-			),
-		};
-
-		let now = now_msec();
-		if now >= wait_until {
-			self.handle_cmd(command).await;
-			return WorkerState::Busy;
-		}
-		let delay = Duration::from_millis(wait_until - now);
-		select! {
-			_ = tokio::time::sleep(delay) => self.handle_cmd(command).await,
-			cmd = self.rx_cmd.recv() => if let Some(cmd) = cmd {
-				self.handle_cmd(cmd).await;
-			} else {
-				return WorkerState::Done;
-			}
-		}
-
-		match &self.work {
-			ScrubWorkerState::Running(_) => WorkerState::Busy,
-			_ => WorkerState::Idle,
-		}
-	}
-}
-
-// ----
-
-struct BlockStoreIterator {
-	path: Vec<ReadingDir>,
-}
-
-enum ReadingDir {
-	Pending(PathBuf),
-	Read {
-		subpaths: Vec<fs::DirEntry>,
-		pos: usize,
-	},
-}
-
-impl BlockStoreIterator {
-	fn new(manager: &BlockManager) -> Self {
-		let root_dir = manager.data_dir.clone();
-		Self {
-			path: vec![ReadingDir::Pending(root_dir)],
-		}
-	}
-
-	/// Returns progress done, between 0 and 1
-	fn progress(&self) -> f32 {
-		if self.path.is_empty() {
-			1.0
-		} else {
-			let mut ret = 0.0;
-			let mut next_div = 1;
-			for p in self.path.iter() {
-				match p {
-					ReadingDir::Pending(_) => break,
-					ReadingDir::Read { subpaths, pos } => {
-						next_div *= subpaths.len();
-						ret += ((*pos - 1) as f32) / (next_div as f32);
-					}
-				}
-			}
-			ret
-		}
-	}
-
-	async fn next(&mut self) -> Result<Option<Hash>, Error> {
-		loop {
-			let last_path = match self.path.last_mut() {
-				None => return Ok(None),
-				Some(lp) => lp,
-			};
-
-			if let ReadingDir::Pending(path) = last_path {
-				let mut reader = fs::read_dir(&path).await?;
-				let mut subpaths = vec![];
-				while let Some(ent) = reader.next_entry().await? {
-					subpaths.push(ent);
-				}
-				*last_path = ReadingDir::Read { subpaths, pos: 0 };
-			}
-
-			let (subpaths, pos) = match *last_path {
-				ReadingDir::Read {
-					ref subpaths,
-					ref mut pos,
-				} => (subpaths, pos),
-				ReadingDir::Pending(_) => unreachable!(),
-			};
-
-			let data_dir_ent = match subpaths.get(*pos) {
-				None => {
-					self.path.pop();
-					continue;
-				}
-				Some(ent) => {
-					*pos += 1;
-					ent
-				}
-			};
-
-			let name = data_dir_ent.file_name();
-			let name = if let Ok(n) = name.into_string() {
-				n
-			} else {
-				continue;
-			};
-			let ent_type = data_dir_ent.file_type().await?;
-
-			let name = name.strip_suffix(".zst").unwrap_or(&name);
-			if name.len() == 2 && hex::decode(&name).is_ok() && ent_type.is_dir() {
-				let path = data_dir_ent.path();
-				self.path.push(ReadingDir::Pending(path));
-			} else if name.len() == 64 {
-				if let Ok(h) = hex::decode(&name) {
-					let mut hash = [0u8; 32];
-					hash.copy_from_slice(&h);
-					return Ok(Some(hash.into()));
-				}
-			}
-		}
-	}
-}
@@ -1,36 +0,0 @@
-[package]
-name = "garage_db"
-version = "0.8.0"
-authors = ["Alex Auvolat <alex@adnab.me>"]
-edition = "2018"
-license = "AGPL-3.0"
-description = "Abstraction over multiple key/value storage engines that supports transactions"
-repository = "https://git.deuxfleurs.fr/Deuxfleurs/garage"
-readme = "../../README.md"
-
-[lib]
-path = "lib.rs"
-
-[[bin]]
-name = "convert"
-path = "bin/convert.rs"
-required-features = ["cli"]
-
-[dependencies]
-err-derive = "0.3"
-hexdump = "0.1"
-tracing = "0.1.30"
-
-heed = "0.11"
-rusqlite = { version = "0.27", features = ["bundled"] }
-sled = "0.34"
-
-# cli deps
-clap = { version = "3.1.18", optional = true, features = ["derive", "env"] }
-pretty_env_logger = { version = "0.4", optional = true }
-
-[dev-dependencies]
-mktemp = "0.4"
-
-[features]
-cli = ["clap", "pretty_env_logger"]
@@ -1,69 +0,0 @@
-use std::path::PathBuf;
-
-use garage_db::*;
-
-use clap::Parser;
-
-/// K2V command line interface
-#[derive(Parser, Debug)]
-#[clap(author, version, about, long_about = None)]
-struct Args {
-	/// Input DB path
-	#[clap(short = 'i')]
-	input_path: PathBuf,
-	/// Input DB engine
-	#[clap(short = 'a')]
-	input_engine: String,
-
-	/// Output DB path
-	#[clap(short = 'o')]
-	output_path: PathBuf,
-	/// Output DB engine
-	#[clap(short = 'b')]
-	output_engine: String,
-}
-
-fn main() {
-	let args = Args::parse();
-	pretty_env_logger::init();
-
-	match do_conversion(args) {
-		Ok(()) => println!("Success!"),
-		Err(e) => eprintln!("Error: {}", e),
-	}
-}
-
-fn do_conversion(args: Args) -> Result<()> {
-	let input = open_db(args.input_path, args.input_engine)?;
-	let output = open_db(args.output_path, args.output_engine)?;
-	output.import(&input)?;
-	Ok(())
-}
-
-fn open_db(path: PathBuf, engine: String) -> Result<Db> {
-	match engine.as_str() {
-		"sled" => {
-			let db = sled_adapter::sled::Config::default().path(&path).open()?;
-			Ok(sled_adapter::SledDb::init(db))
-		}
-		"sqlite" | "sqlite3" | "rusqlite" => {
-			let db = sqlite_adapter::rusqlite::Connection::open(&path)?;
-			Ok(sqlite_adapter::SqliteDb::init(db))
-		}
-		"lmdb" | "heed" => {
-			std::fs::create_dir_all(&path).map_err(|e| {
-				Error(format!("Unable to create LMDB data directory: {}", e).into())
-			})?;
-
-			let map_size = lmdb_adapter::recommended_map_size();
-
-			let db = lmdb_adapter::heed::EnvOpenOptions::new()
-				.max_dbs(100)
-				.map_size(map_size)
-				.open(&path)
-				.unwrap();
-			Ok(lmdb_adapter::LmdbDb::init(db))
-		}
-		e => Err(Error(format!("Invalid DB engine: {}", e).into())),
-	}
-}
@@ -1,127 +0,0 @@
-//! This hack allows a db tree to keep in RAM a counter of the number of entries
-//! it contains, which is used to call .len() on it.  This is usefull only for
-//! the sled backend where .len() otherwise would have to traverse the whole
-//! tree to count items.  For sqlite and lmdb, this is mostly useless (but
-//! hopefully not harmfull!). Note that a CountedTree cannot be part of a
-//! transaction.
-
-use std::sync::{
-	atomic::{AtomicUsize, Ordering},
-	Arc,
-};
-
-use crate::{Result, Tree, TxError, Value, ValueIter};
-
-#[derive(Clone)]
-pub struct CountedTree(Arc<CountedTreeInternal>);
-
-struct CountedTreeInternal {
-	tree: Tree,
-	len: AtomicUsize,
-}
-
-impl CountedTree {
-	pub fn new(tree: Tree) -> Result<Self> {
-		let len = tree.len()?;
-		Ok(Self(Arc::new(CountedTreeInternal {
-			tree,
-			len: AtomicUsize::new(len),
-		})))
-	}
-
-	pub fn len(&self) -> usize {
-		self.0.len.load(Ordering::SeqCst)
-	}
-
-	pub fn is_empty(&self) -> bool {
-		self.len() == 0
-	}
-
-	pub fn get<K: AsRef<[u8]>>(&self, key: K) -> Result<Option<Value>> {
-		self.0.tree.get(key)
-	}
-
-	pub fn first(&self) -> Result<Option<(Value, Value)>> {
-		self.0.tree.first()
-	}
-
-	pub fn iter(&self) -> Result<ValueIter<'_>> {
-		self.0.tree.iter()
-	}
-
-	// ---- writing functions ----
-
-	pub fn insert<K, V>(&self, key: K, value: V) -> Result<Option<Value>>
-	where
-		K: AsRef<[u8]>,
-		V: AsRef<[u8]>,
-	{
-		let old_val = self.0.tree.insert(key, value)?;
-		if old_val.is_none() {
-			self.0.len.fetch_add(1, Ordering::SeqCst);
-		}
-		Ok(old_val)
-	}
-
-	pub fn remove<K: AsRef<[u8]>>(&self, key: K) -> Result<Option<Value>> {
-		let old_val = self.0.tree.remove(key)?;
-		if old_val.is_some() {
-			self.0.len.fetch_sub(1, Ordering::SeqCst);
-		}
-		Ok(old_val)
-	}
-
-	pub fn compare_and_swap<K, OV, NV>(
-		&self,
-		key: K,
-		expected_old: Option<OV>,
-		new: Option<NV>,
-	) -> Result<bool>
-	where
-		K: AsRef<[u8]>,
-		OV: AsRef<[u8]>,
-		NV: AsRef<[u8]>,
-	{
-		let old_some = expected_old.is_some();
-		let new_some = new.is_some();
-
-		let tx_res = self.0.tree.db().transaction(|mut tx| {
-			let old_val = tx.get(&self.0.tree, &key)?;
-			let is_same = match (&old_val, &expected_old) {
-				(None, None) => true,
-				(Some(x), Some(y)) if x == y.as_ref() => true,
-				_ => false,
-			};
-			if is_same {
-				match &new {
-					Some(v) => {
-						tx.insert(&self.0.tree, &key, v)?;
-					}
-					None => {
-						tx.remove(&self.0.tree, &key)?;
-					}
-				}
-				tx.commit(())
-			} else {
-				tx.abort(())
-			}
-		});
-
-		match tx_res {
-			Ok(()) => {
-				match (old_some, new_some) {
-					(false, true) => {
-						self.0.len.fetch_add(1, Ordering::SeqCst);
-					}
-					(true, false) => {
-						self.0.len.fetch_sub(1, Ordering::SeqCst);
-					}
-					_ => (),
-				}
-				Ok(true)
-			}
-			Err(TxError::Abort(())) => Ok(false),
-			Err(TxError::Db(e)) => Err(e),
-		}
-	}
-}
@@ -1,409 +0,0 @@
-#[macro_use]
-extern crate tracing;
-
-pub mod lmdb_adapter;
-pub mod sled_adapter;
-pub mod sqlite_adapter;
-
-pub mod counted_tree_hack;
-
-#[cfg(test)]
-pub mod test;
-
-use core::ops::{Bound, RangeBounds};
-
-use std::borrow::Cow;
-use std::cell::Cell;
-use std::sync::Arc;
-
-use err_derive::Error;
-
-#[derive(Clone)]
-pub struct Db(pub(crate) Arc<dyn IDb>);
-
-pub struct Transaction<'a>(&'a mut dyn ITx);
-
-#[derive(Clone)]
-pub struct Tree(Arc<dyn IDb>, usize);
-
-pub type Value = Vec<u8>;
-pub type ValueIter<'a> = Box<dyn std::iter::Iterator<Item = Result<(Value, Value)>> + 'a>;
-pub type TxValueIter<'a> = Box<dyn std::iter::Iterator<Item = TxOpResult<(Value, Value)>> + 'a>;
-
-// ----
-
-#[derive(Debug, Error)]
-#[error(display = "{}", _0)]
-pub struct Error(pub Cow<'static, str>);
-
-pub type Result<T> = std::result::Result<T, Error>;
-
-#[derive(Debug, Error)]
-#[error(display = "{}", _0)]
-pub struct TxOpError(pub(crate) Error);
-pub type TxOpResult<T> = std::result::Result<T, TxOpError>;
-
-pub enum TxError<E> {
-	Abort(E),
-	Db(Error),
-}
-pub type TxResult<R, E> = std::result::Result<R, TxError<E>>;
-
-impl<E> From<TxOpError> for TxError<E> {
-	fn from(e: TxOpError) -> TxError<E> {
-		TxError::Db(e.0)
-	}
-}
-
-pub fn unabort<R, E>(res: TxResult<R, E>) -> TxOpResult<std::result::Result<R, E>> {
-	match res {
-		Ok(v) => Ok(Ok(v)),
-		Err(TxError::Abort(e)) => Ok(Err(e)),
-		Err(TxError::Db(e)) => Err(TxOpError(e)),
-	}
-}
-
-// ----
-
-impl Db {
-	pub fn engine(&self) -> String {
-		self.0.engine()
-	}
-
-	pub fn open_tree<S: AsRef<str>>(&self, name: S) -> Result<Tree> {
-		let tree_id = self.0.open_tree(name.as_ref())?;
-		Ok(Tree(self.0.clone(), tree_id))
-	}
-
-	pub fn list_trees(&self) -> Result<Vec<String>> {
-		self.0.list_trees()
-	}
-
-	pub fn transaction<R, E, F>(&self, fun: F) -> TxResult<R, E>
-	where
-		F: Fn(Transaction<'_>) -> TxResult<R, E>,
-	{
-		let f = TxFn {
-			function: fun,
-			result: Cell::new(None),
-		};
-		let tx_res = self.0.transaction(&f);
-		let ret = f
-			.result
-			.into_inner()
-			.expect("Transaction did not store result");
-
-		match tx_res {
-			Ok(()) => {
-				assert!(matches!(ret, Ok(_)));
-				ret
-			}
-			Err(TxError::Abort(())) => {
-				assert!(matches!(ret, Err(TxError::Abort(_))));
-				ret
-			}
-			Err(TxError::Db(e2)) => match ret {
-				// Ok was stored -> the error occured when finalizing
-				// transaction
-				Ok(_) => Err(TxError::Db(e2)),
-				// An error was already stored: that's the one we want to
-				// return
-				Err(TxError::Db(e)) => Err(TxError::Db(e)),
-				_ => unreachable!(),
-			},
-		}
-	}
-
-	pub fn import(&self, other: &Db) -> Result<()> {
-		let existing_trees = self.list_trees()?;
-		if !existing_trees.is_empty() {
-			return Err(Error(
-				format!(
-					"destination database already contains data: {:?}",
-					existing_trees
-				)
-				.into(),
-			));
-		}
-
-		let tree_names = other.list_trees()?;
-		for name in tree_names {
-			let tree = self.open_tree(&name)?;
-			if tree.len()? > 0 {
-				return Err(Error(format!("tree {} already contains data", name).into()));
-			}
-
-			let ex_tree = other.open_tree(&name)?;
-
-			let tx_res = self.transaction(|mut tx| {
-				let mut i = 0;
-				for item in ex_tree.iter().map_err(TxError::Abort)? {
-					let (k, v) = item.map_err(TxError::Abort)?;
-					tx.insert(&tree, k, v)?;
-					i += 1;
-					if i % 1000 == 0 {
-						println!("{}: imported {}", name, i);
-					}
-				}
-				tx.commit(i)
-			});
-			let total = match tx_res {
-				Err(TxError::Db(e)) => return Err(e),
-				Err(TxError::Abort(e)) => return Err(e),
-				Ok(x) => x,
-			};
-
-			println!("{}: finished importing, {} items", name, total);
-		}
-		Ok(())
-	}
-}
-
-#[allow(clippy::len_without_is_empty)]
-impl Tree {
-	#[inline]
-	pub fn db(&self) -> Db {
-		Db(self.0.clone())
-	}
-
-	#[inline]
-	pub fn get<T: AsRef<[u8]>>(&self, key: T) -> Result<Option<Value>> {
-		self.0.get(self.1, key.as_ref())
-	}
-	#[inline]
-	pub fn len(&self) -> Result<usize> {
-		self.0.len(self.1)
-	}
-
-	#[inline]
-	pub fn first(&self) -> Result<Option<(Value, Value)>> {
-		self.iter()?.next().transpose()
-	}
-	#[inline]
-	pub fn get_gt<T: AsRef<[u8]>>(&self, from: T) -> Result<Option<(Value, Value)>> {
-		self.range((Bound::Excluded(from), Bound::Unbounded))?
-			.next()
-			.transpose()
-	}
-
-	/// Returns the old value if there was one
-	#[inline]
-	pub fn insert<T: AsRef<[u8]>, U: AsRef<[u8]>>(
-		&self,
-		key: T,
-		value: U,
-	) -> Result<Option<Value>> {
-		self.0.insert(self.1, key.as_ref(), value.as_ref())
-	}
-	/// Returns the old value if there was one
-	#[inline]
-	pub fn remove<T: AsRef<[u8]>>(&self, key: T) -> Result<Option<Value>> {
-		self.0.remove(self.1, key.as_ref())
-	}
-	/// Clears all values from the tree
-	#[inline]
-	pub fn clear(&self) -> Result<()> {
-		self.0.clear(self.1)
-	}
-
-	#[inline]
-	pub fn iter(&self) -> Result<ValueIter<'_>> {
-		self.0.iter(self.1)
-	}
-	#[inline]
-	pub fn iter_rev(&self) -> Result<ValueIter<'_>> {
-		self.0.iter_rev(self.1)
-	}
-
-	#[inline]
-	pub fn range<K, R>(&self, range: R) -> Result<ValueIter<'_>>
-	where
-		K: AsRef<[u8]>,
-		R: RangeBounds<K>,
-	{
-		let sb = range.start_bound();
-		let eb = range.end_bound();
-		self.0.range(self.1, get_bound(sb), get_bound(eb))
-	}
-	#[inline]
-	pub fn range_rev<K, R>(&self, range: R) -> Result<ValueIter<'_>>
-	where
-		K: AsRef<[u8]>,
-		R: RangeBounds<K>,
-	{
-		let sb = range.start_bound();
-		let eb = range.end_bound();
-		self.0.range_rev(self.1, get_bound(sb), get_bound(eb))
-	}
-}
-
-#[allow(clippy::len_without_is_empty)]
-impl<'a> Transaction<'a> {
-	#[inline]
-	pub fn get<T: AsRef<[u8]>>(&self, tree: &Tree, key: T) -> TxOpResult<Option<Value>> {
-		self.0.get(tree.1, key.as_ref())
-	}
-	#[inline]
-	pub fn len(&self, tree: &Tree) -> TxOpResult<usize> {
-		self.0.len(tree.1)
-	}
-
-	/// Returns the old value if there was one
-	#[inline]
-	pub fn insert<T: AsRef<[u8]>, U: AsRef<[u8]>>(
-		&mut self,
-		tree: &Tree,
-		key: T,
-		value: U,
-	) -> TxOpResult<Option<Value>> {
-		self.0.insert(tree.1, key.as_ref(), value.as_ref())
-	}
-	/// Returns the old value if there was one
-	#[inline]
-	pub fn remove<T: AsRef<[u8]>>(&mut self, tree: &Tree, key: T) -> TxOpResult<Option<Value>> {
-		self.0.remove(tree.1, key.as_ref())
-	}
-
-	#[inline]
-	pub fn iter(&self, tree: &Tree) -> TxOpResult<TxValueIter<'_>> {
-		self.0.iter(tree.1)
-	}
-	#[inline]
-	pub fn iter_rev(&self, tree: &Tree) -> TxOpResult<TxValueIter<'_>> {
-		self.0.iter_rev(tree.1)
-	}
-
-	#[inline]
-	pub fn range<K, R>(&self, tree: &Tree, range: R) -> TxOpResult<TxValueIter<'_>>
-	where
-		K: AsRef<[u8]>,
-		R: RangeBounds<K>,
-	{
-		let sb = range.start_bound();
-		let eb = range.end_bound();
-		self.0.range(tree.1, get_bound(sb), get_bound(eb))
-	}
-	#[inline]
-	pub fn range_rev<K, R>(&self, tree: &Tree, range: R) -> TxOpResult<TxValueIter<'_>>
-	where
-		K: AsRef<[u8]>,
-		R: RangeBounds<K>,
-	{
-		let sb = range.start_bound();
-		let eb = range.end_bound();
-		self.0.range_rev(tree.1, get_bound(sb), get_bound(eb))
-	}
-
-	// ----
-
-	#[inline]
-	pub fn abort<R, E>(self, e: E) -> TxResult<R, E> {
-		Err(TxError::Abort(e))
-	}
-
-	#[inline]
-	pub fn commit<R, E>(self, r: R) -> TxResult<R, E> {
-		Ok(r)
-	}
-}
-
-// ---- Internal interfaces
-
-pub(crate) trait IDb: Send + Sync {
-	fn engine(&self) -> String;
-	fn open_tree(&self, name: &str) -> Result<usize>;
-	fn list_trees(&self) -> Result<Vec<String>>;
-
-	fn get(&self, tree: usize, key: &[u8]) -> Result<Option<Value>>;
-	fn len(&self, tree: usize) -> Result<usize>;
-
-	fn insert(&self, tree: usize, key: &[u8], value: &[u8]) -> Result<Option<Value>>;
-	fn remove(&self, tree: usize, key: &[u8]) -> Result<Option<Value>>;
-	fn clear(&self, tree: usize) -> Result<()>;
-
-	fn iter(&self, tree: usize) -> Result<ValueIter<'_>>;
-	fn iter_rev(&self, tree: usize) -> Result<ValueIter<'_>>;
-
-	fn range<'r>(
-		&self,
-		tree: usize,
-		low: Bound<&'r [u8]>,
-		high: Bound<&'r [u8]>,
-	) -> Result<ValueIter<'_>>;
-	fn range_rev<'r>(
-		&self,
-		tree: usize,
-		low: Bound<&'r [u8]>,
-		high: Bound<&'r [u8]>,
-	) -> Result<ValueIter<'_>>;
-
-	fn transaction(&self, f: &dyn ITxFn) -> TxResult<(), ()>;
-}
-
-pub(crate) trait ITx {
-	fn get(&self, tree: usize, key: &[u8]) -> TxOpResult<Option<Value>>;
-	fn len(&self, tree: usize) -> TxOpResult<usize>;
-
-	fn insert(&mut self, tree: usize, key: &[u8], value: &[u8]) -> TxOpResult<Option<Value>>;
-	fn remove(&mut self, tree: usize, key: &[u8]) -> TxOpResult<Option<Value>>;
-
-	fn iter(&self, tree: usize) -> TxOpResult<TxValueIter<'_>>;
-	fn iter_rev(&self, tree: usize) -> TxOpResult<TxValueIter<'_>>;
-
-	fn range<'r>(
-		&self,
-		tree: usize,
-		low: Bound<&'r [u8]>,
-		high: Bound<&'r [u8]>,
-	) -> TxOpResult<TxValueIter<'_>>;
-	fn range_rev<'r>(
-		&self,
-		tree: usize,
-		low: Bound<&'r [u8]>,
-		high: Bound<&'r [u8]>,
-	) -> TxOpResult<TxValueIter<'_>>;
-}
-
-pub(crate) trait ITxFn {
-	fn try_on(&self, tx: &mut dyn ITx) -> TxFnResult;
-}
-
-pub(crate) enum TxFnResult {
-	Ok,
-	Abort,
-	DbErr,
-}
-
-struct TxFn<F, R, E>
-where
-	F: Fn(Transaction<'_>) -> TxResult<R, E>,
-{
-	function: F,
-	result: Cell<Option<TxResult<R, E>>>,
-}
-
-impl<F, R, E> ITxFn for TxFn<F, R, E>
-where
-	F: Fn(Transaction<'_>) -> TxResult<R, E>,
-{
-	fn try_on(&self, tx: &mut dyn ITx) -> TxFnResult {
-		let res = (self.function)(Transaction(tx));
-		let res2 = match &res {
-			Ok(_) => TxFnResult::Ok,
-			Err(TxError::Abort(_)) => TxFnResult::Abort,
-			Err(TxError::Db(_)) => TxFnResult::DbErr,
-		};
-		self.result.set(Some(res));
-		res2
-	}
-}
-
-// ----
-
-fn get_bound<K: AsRef<[u8]>>(b: Bound<&K>) -> Bound<&[u8]> {
-	match b {
-		Bound::Included(v) => Bound::Included(v.as_ref()),
-		Bound::Excluded(v) => Bound::Excluded(v.as_ref()),
-		Bound::Unbounded => Bound::Unbounded,
-	}
-}
@@ -1,350 +0,0 @@
-use core::ops::Bound;
-use core::ptr::NonNull;
-
-use std::collections::HashMap;
-use std::convert::TryInto;
-use std::sync::{Arc, RwLock};
-
-use heed::types::ByteSlice;
-use heed::{BytesDecode, Env, RoTxn, RwTxn, UntypedDatabase as Database};
-
-use crate::{
-	Db, Error, IDb, ITx, ITxFn, Result, TxError, TxFnResult, TxOpError, TxOpResult, TxResult,
-	TxValueIter, Value, ValueIter,
-};
-
-pub use heed;
-
-// -- err
-
-impl From<heed::Error> for Error {
-	fn from(e: heed::Error) -> Error {
-		Error(format!("LMDB: {}", e).into())
-	}
-}
-
-impl From<heed::Error> for TxOpError {
-	fn from(e: heed::Error) -> TxOpError {
-		TxOpError(e.into())
-	}
-}
-
-// -- db
-
-pub struct LmdbDb {
-	db: heed::Env,
-	trees: RwLock<(Vec<Database>, HashMap<String, usize>)>,
-}
-
-impl LmdbDb {
-	pub fn init(db: Env) -> Db {
-		let s = Self {
-			db,
-			trees: RwLock::new((Vec::new(), HashMap::new())),
-		};
-		Db(Arc::new(s))
-	}
-
-	fn get_tree(&self, i: usize) -> Result<Database> {
-		self.trees
-			.read()
-			.unwrap()
-			.0
-			.get(i)
-			.cloned()
-			.ok_or_else(|| Error("invalid tree id".into()))
-	}
-}
-
-impl IDb for LmdbDb {
-	fn engine(&self) -> String {
-		"LMDB (using Heed crate)".into()
-	}
-
-	fn open_tree(&self, name: &str) -> Result<usize> {
-		let mut trees = self.trees.write().unwrap();
-		if let Some(i) = trees.1.get(name) {
-			Ok(*i)
-		} else {
-			let tree = self.db.create_database(Some(name))?;
-			let i = trees.0.len();
-			trees.0.push(tree);
-			trees.1.insert(name.to_string(), i);
-			Ok(i)
-		}
-	}
-
-	fn list_trees(&self) -> Result<Vec<String>> {
-		let tree0 = match self.db.open_database::<heed::types::Str, ByteSlice>(None)? {
-			Some(x) => x,
-			None => return Ok(vec![]),
-		};
-
-		let mut ret = vec![];
-		let tx = self.db.read_txn()?;
-		for item in tree0.iter(&tx)? {
-			let (tree_name, _) = item?;
-			ret.push(tree_name.to_string());
-		}
-		drop(tx);
-
-		let mut ret2 = vec![];
-		for tree_name in ret {
-			if self
-				.db
-				.open_database::<ByteSlice, ByteSlice>(Some(&tree_name))?
-				.is_some()
-			{
-				ret2.push(tree_name);
-			}
-		}
-
-		Ok(ret2)
-	}
-
-	// ----
-
-	fn get(&self, tree: usize, key: &[u8]) -> Result<Option<Value>> {
-		let tree = self.get_tree(tree)?;
-
-		let tx = self.db.read_txn()?;
-		let val = tree.get(&tx, key)?;
-		match val {
-			None => Ok(None),
-			Some(v) => Ok(Some(v.to_vec())),
-		}
-	}
-
-	fn len(&self, tree: usize) -> Result<usize> {
-		let tree = self.get_tree(tree)?;
-		let tx = self.db.read_txn()?;
-		Ok(tree.len(&tx)?.try_into().unwrap())
-	}
-
-	fn insert(&self, tree: usize, key: &[u8], value: &[u8]) -> Result<Option<Value>> {
-		let tree = self.get_tree(tree)?;
-		let mut tx = self.db.write_txn()?;
-		let old_val = tree.get(&tx, key)?.map(Vec::from);
-		tree.put(&mut tx, key, value)?;
-		tx.commit()?;
-		Ok(old_val)
-	}
-
-	fn remove(&self, tree: usize, key: &[u8]) -> Result<Option<Value>> {
-		let tree = self.get_tree(tree)?;
-		let mut tx = self.db.write_txn()?;
-		let old_val = tree.get(&tx, key)?.map(Vec::from);
-		tree.delete(&mut tx, key)?;
-		tx.commit()?;
-		Ok(old_val)
-	}
-
-	fn clear(&self, tree: usize) -> Result<()> {
-		let tree = self.get_tree(tree)?;
-		let mut tx = self.db.write_txn()?;
-		tree.clear(&mut tx)?;
-		tx.commit()?;
-		Ok(())
-	}
-
-	fn iter(&self, tree: usize) -> Result<ValueIter<'_>> {
-		let tree = self.get_tree(tree)?;
-		let tx = self.db.read_txn()?;
-		TxAndIterator::make(tx, |tx| Ok(tree.iter(tx)?))
-	}
-
-	fn iter_rev(&self, tree: usize) -> Result<ValueIter<'_>> {
-		let tree = self.get_tree(tree)?;
-		let tx = self.db.read_txn()?;
-		TxAndIterator::make(tx, |tx| Ok(tree.rev_iter(tx)?))
-	}
-
-	fn range<'r>(
-		&self,
-		tree: usize,
-		low: Bound<&'r [u8]>,
-		high: Bound<&'r [u8]>,
-	) -> Result<ValueIter<'_>> {
-		let tree = self.get_tree(tree)?;
-		let tx = self.db.read_txn()?;
-		TxAndIterator::make(tx, |tx| Ok(tree.range(tx, &(low, high))?))
-	}
-	fn range_rev<'r>(
-		&self,
-		tree: usize,
-		low: Bound<&'r [u8]>,
-		high: Bound<&'r [u8]>,
-	) -> Result<ValueIter<'_>> {
-		let tree = self.get_tree(tree)?;
-		let tx = self.db.read_txn()?;
-		TxAndIterator::make(tx, |tx| Ok(tree.rev_range(tx, &(low, high))?))
-	}
-
-	// ----
-
-	fn transaction(&self, f: &dyn ITxFn) -> TxResult<(), ()> {
-		let trees = self.trees.read().unwrap();
-		let mut tx = LmdbTx {
-			trees: &trees.0[..],
-			tx: self
-				.db
-				.write_txn()
-				.map_err(Error::from)
-				.map_err(TxError::Db)?,
-		};
-
-		let res = f.try_on(&mut tx);
-		match res {
-			TxFnResult::Ok => {
-				tx.tx.commit().map_err(Error::from).map_err(TxError::Db)?;
-				Ok(())
-			}
-			TxFnResult::Abort => {
-				tx.tx.abort().map_err(Error::from).map_err(TxError::Db)?;
-				Err(TxError::Abort(()))
-			}
-			TxFnResult::DbErr => {
-				tx.tx.abort().map_err(Error::from).map_err(TxError::Db)?;
-				Err(TxError::Db(Error(
-					"(this message will be discarded)".into(),
-				)))
-			}
-		}
-	}
-}
-
-// ----
-
-struct LmdbTx<'a> {
-	trees: &'a [Database],
-	tx: RwTxn<'a, 'a>,
-}
-
-impl<'a> LmdbTx<'a> {
-	fn get_tree(&self, i: usize) -> TxOpResult<&Database> {
-		self.trees.get(i).ok_or_else(|| {
-			TxOpError(Error(
-				"invalid tree id (it might have been openned after the transaction started)".into(),
-			))
-		})
-	}
-}
-
-impl<'a> ITx for LmdbTx<'a> {
-	fn get(&self, tree: usize, key: &[u8]) -> TxOpResult<Option<Value>> {
-		let tree = self.get_tree(tree)?;
-		match tree.get(&self.tx, key)? {
-			Some(v) => Ok(Some(v.to_vec())),
-			None => Ok(None),
-		}
-	}
-	fn len(&self, _tree: usize) -> TxOpResult<usize> {
-		unimplemented!(".len() in transaction not supported with LMDB backend")
-	}
-
-	fn insert(&mut self, tree: usize, key: &[u8], value: &[u8]) -> TxOpResult<Option<Value>> {
-		let tree = *self.get_tree(tree)?;
-		let old_val = tree.get(&self.tx, key)?.map(Vec::from);
-		tree.put(&mut self.tx, key, value)?;
-		Ok(old_val)
-	}
-	fn remove(&mut self, tree: usize, key: &[u8]) -> TxOpResult<Option<Value>> {
-		let tree = *self.get_tree(tree)?;
-		let old_val = tree.get(&self.tx, key)?.map(Vec::from);
-		tree.delete(&mut self.tx, key)?;
-		Ok(old_val)
-	}
-
-	fn iter(&self, _tree: usize) -> TxOpResult<TxValueIter<'_>> {
-		unimplemented!("Iterators in transactions not supported with LMDB backend");
-	}
-	fn iter_rev(&self, _tree: usize) -> TxOpResult<TxValueIter<'_>> {
-		unimplemented!("Iterators in transactions not supported with LMDB backend");
-	}
-
-	fn range<'r>(
-		&self,
-		_tree: usize,
-		_low: Bound<&'r [u8]>,
-		_high: Bound<&'r [u8]>,
-	) -> TxOpResult<TxValueIter<'_>> {
-		unimplemented!("Iterators in transactions not supported with LMDB backend");
-	}
-	fn range_rev<'r>(
-		&self,
-		_tree: usize,
-		_low: Bound<&'r [u8]>,
-		_high: Bound<&'r [u8]>,
-	) -> TxOpResult<TxValueIter<'_>> {
-		unimplemented!("Iterators in transactions not supported with LMDB backend");
-	}
-}
-
-// ----
-
-type IteratorItem<'a> = heed::Result<(
-	<ByteSlice as BytesDecode<'a>>::DItem,
-	<ByteSlice as BytesDecode<'a>>::DItem,
-)>;
-
-struct TxAndIterator<'a, I>
-where
-	I: Iterator<Item = IteratorItem<'a>> + 'a,
-{
-	tx: RoTxn<'a>,
-	iter: Option<I>,
-}
-
-impl<'a, I> TxAndIterator<'a, I>
-where
-	I: Iterator<Item = IteratorItem<'a>> + 'a,
-{
-	fn make<F>(tx: RoTxn<'a>, iterfun: F) -> Result<ValueIter<'a>>
-	where
-		F: FnOnce(&'a RoTxn<'a>) -> Result<I>,
-	{
-		let mut res = TxAndIterator { tx, iter: None };
-
-		let tx = unsafe { NonNull::from(&res.tx).as_ref() };
-		res.iter = Some(iterfun(tx)?);
-
-		Ok(Box::new(res))
-	}
-}
-
-impl<'a, I> Drop for TxAndIterator<'a, I>
-where
-	I: Iterator<Item = IteratorItem<'a>> + 'a,
-{
-	fn drop(&mut self) {
-		drop(self.iter.take());
-	}
-}
-
-impl<'a, I> Iterator for TxAndIterator<'a, I>
-where
-	I: Iterator<Item = IteratorItem<'a>> + 'a,
-{
-	type Item = Result<(Value, Value)>;
-
-	fn next(&mut self) -> Option<Self::Item> {
-		match self.iter.as_mut().unwrap().next() {
-			None => None,
-			Some(Err(e)) => Some(Err(e.into())),
-			Some(Ok((k, v))) => Some(Ok((k.to_vec(), v.to_vec()))),
-		}
-	}
-}
-
-// ----
-
-#[cfg(target_pointer_width = "64")]
-pub fn recommended_map_size() -> usize {
-	1usize << 40
-}
-
-#[cfg(target_pointer_width = "32")]
-pub fn recommended_map_size() -> usize {
-	warn!("LMDB is not recommended on 32-bit systems, database size will be limited");
-	1usize << 30
-}
@@ -1,266 +0,0 @@
-use core::ops::Bound;
-
-use std::cell::Cell;
-use std::collections::HashMap;
-use std::sync::{Arc, RwLock};
-
-use sled::transaction::{
-	ConflictableTransactionError, TransactionError, Transactional, TransactionalTree,
-	UnabortableTransactionError,
-};
-
-use crate::{
-	Db, Error, IDb, ITx, ITxFn, Result, TxError, TxFnResult, TxOpError, TxOpResult, TxResult,
-	TxValueIter, Value, ValueIter,
-};
-
-pub use sled;
-
-// -- err
-
-impl From<sled::Error> for Error {
-	fn from(e: sled::Error) -> Error {
-		Error(format!("Sled: {}", e).into())
-	}
-}
-
-impl From<sled::Error> for TxOpError {
-	fn from(e: sled::Error) -> TxOpError {
-		TxOpError(e.into())
-	}
-}
-
-// -- db
-
-pub struct SledDb {
-	db: sled::Db,
-	trees: RwLock<(Vec<sled::Tree>, HashMap<String, usize>)>,
-}
-
-impl SledDb {
-	pub fn init(db: sled::Db) -> Db {
-		let s = Self {
-			db,
-			trees: RwLock::new((Vec::new(), HashMap::new())),
-		};
-		Db(Arc::new(s))
-	}
-
-	fn get_tree(&self, i: usize) -> Result<sled::Tree> {
-		self.trees
-			.read()
-			.unwrap()
-			.0
-			.get(i)
-			.cloned()
-			.ok_or_else(|| Error("invalid tree id".into()))
-	}
-}
-
-impl IDb for SledDb {
-	fn engine(&self) -> String {
-		"Sled".into()
-	}
-
-	fn open_tree(&self, name: &str) -> Result<usize> {
-		let mut trees = self.trees.write().unwrap();
-		if let Some(i) = trees.1.get(name) {
-			Ok(*i)
-		} else {
-			let tree = self.db.open_tree(name)?;
-			let i = trees.0.len();
-			trees.0.push(tree);
-			trees.1.insert(name.to_string(), i);
-			Ok(i)
-		}
-	}
-
-	fn list_trees(&self) -> Result<Vec<String>> {
-		let mut trees = vec![];
-		for name in self.db.tree_names() {
-			let name = std::str::from_utf8(&name)
-				.map_err(|e| Error(format!("{}", e).into()))?
-				.to_string();
-			if name != "__sled__default" {
-				trees.push(name);
-			}
-		}
-		Ok(trees)
-	}
-
-	// ----
-
-	fn get(&self, tree: usize, key: &[u8]) -> Result<Option<Value>> {
-		let tree = self.get_tree(tree)?;
-		let val = tree.get(key)?;
-		Ok(val.map(|x| x.to_vec()))
-	}
-
-	fn len(&self, tree: usize) -> Result<usize> {
-		let tree = self.get_tree(tree)?;
-		Ok(tree.len())
-	}
-
-	fn insert(&self, tree: usize, key: &[u8], value: &[u8]) -> Result<Option<Value>> {
-		let tree = self.get_tree(tree)?;
-		let old_val = tree.insert(key, value)?;
-		Ok(old_val.map(|x| x.to_vec()))
-	}
-
-	fn remove(&self, tree: usize, key: &[u8]) -> Result<Option<Value>> {
-		let tree = self.get_tree(tree)?;
-		let old_val = tree.remove(key)?;
-		Ok(old_val.map(|x| x.to_vec()))
-	}
-
-	fn clear(&self, tree: usize) -> Result<()> {
-		let tree = self.get_tree(tree)?;
-		tree.clear()?;
-		Ok(())
-	}
-
-	fn iter(&self, tree: usize) -> Result<ValueIter<'_>> {
-		let tree = self.get_tree(tree)?;
-		Ok(Box::new(tree.iter().map(|v| {
-			v.map(|(x, y)| (x.to_vec(), y.to_vec())).map_err(Into::into)
-		})))
-	}
-
-	fn iter_rev(&self, tree: usize) -> Result<ValueIter<'_>> {
-		let tree = self.get_tree(tree)?;
-		Ok(Box::new(tree.iter().rev().map(|v| {
-			v.map(|(x, y)| (x.to_vec(), y.to_vec())).map_err(Into::into)
-		})))
-	}
-
-	fn range<'r>(
-		&self,
-		tree: usize,
-		low: Bound<&'r [u8]>,
-		high: Bound<&'r [u8]>,
-	) -> Result<ValueIter<'_>> {
-		let tree = self.get_tree(tree)?;
-		Ok(Box::new(tree.range::<&'r [u8], _>((low, high)).map(|v| {
-			v.map(|(x, y)| (x.to_vec(), y.to_vec())).map_err(Into::into)
-		})))
-	}
-	fn range_rev<'r>(
-		&self,
-		tree: usize,
-		low: Bound<&'r [u8]>,
-		high: Bound<&'r [u8]>,
-	) -> Result<ValueIter<'_>> {
-		let tree = self.get_tree(tree)?;
-		Ok(Box::new(tree.range::<&'r [u8], _>((low, high)).rev().map(
-			|v| v.map(|(x, y)| (x.to_vec(), y.to_vec())).map_err(Into::into),
-		)))
-	}
-
-	// ----
-
-	fn transaction(&self, f: &dyn ITxFn) -> TxResult<(), ()> {
-		let trees = self.trees.read().unwrap();
-		let res = trees.0.transaction(|txtrees| {
-			let mut tx = SledTx {
-				trees: txtrees,
-				err: Cell::new(None),
-			};
-			match f.try_on(&mut tx) {
-				TxFnResult::Ok => {
-					assert!(tx.err.into_inner().is_none());
-					Ok(())
-				}
-				TxFnResult::Abort => {
-					assert!(tx.err.into_inner().is_none());
-					Err(ConflictableTransactionError::Abort(()))
-				}
-				TxFnResult::DbErr => {
-					let e = tx.err.into_inner().expect("No DB error");
-					Err(e.into())
-				}
-			}
-		});
-		match res {
-			Ok(()) => Ok(()),
-			Err(TransactionError::Abort(())) => Err(TxError::Abort(())),
-			Err(TransactionError::Storage(s)) => Err(TxError::Db(s.into())),
-		}
-	}
-}
-
-// ----
-
-struct SledTx<'a> {
-	trees: &'a [TransactionalTree],
-	err: Cell<Option<UnabortableTransactionError>>,
-}
-
-impl<'a> SledTx<'a> {
-	fn get_tree(&self, i: usize) -> TxOpResult<&TransactionalTree> {
-		self.trees.get(i).ok_or_else(|| {
-			TxOpError(Error(
-				"invalid tree id (it might have been openned after the transaction started)".into(),
-			))
-		})
-	}
-
-	fn save_error<R>(
-		&self,
-		v: std::result::Result<R, UnabortableTransactionError>,
-	) -> TxOpResult<R> {
-		match v {
-			Ok(x) => Ok(x),
-			Err(e) => {
-				let txt = format!("{}", e);
-				self.err.set(Some(e));
-				Err(TxOpError(Error(txt.into())))
-			}
-		}
-	}
-}
-
-impl<'a> ITx for SledTx<'a> {
-	fn get(&self, tree: usize, key: &[u8]) -> TxOpResult<Option<Value>> {
-		let tree = self.get_tree(tree)?;
-		let tmp = self.save_error(tree.get(key))?;
-		Ok(tmp.map(|x| x.to_vec()))
-	}
-	fn len(&self, _tree: usize) -> TxOpResult<usize> {
-		unimplemented!(".len() in transaction not supported with Sled backend")
-	}
-
-	fn insert(&mut self, tree: usize, key: &[u8], value: &[u8]) -> TxOpResult<Option<Value>> {
-		let tree = self.get_tree(tree)?;
-		let old_val = self.save_error(tree.insert(key, value))?;
-		Ok(old_val.map(|x| x.to_vec()))
-	}
-	fn remove(&mut self, tree: usize, key: &[u8]) -> TxOpResult<Option<Value>> {
-		let tree = self.get_tree(tree)?;
-		let old_val = self.save_error(tree.remove(key))?;
-		Ok(old_val.map(|x| x.to_vec()))
-	}
-
-	fn iter(&self, _tree: usize) -> TxOpResult<TxValueIter<'_>> {
-		unimplemented!("Iterators in transactions not supported with Sled backend");
-	}
-	fn iter_rev(&self, _tree: usize) -> TxOpResult<TxValueIter<'_>> {
-		unimplemented!("Iterators in transactions not supported with Sled backend");
-	}
-
-	fn range<'r>(
-		&self,
-		_tree: usize,
-		_low: Bound<&'r [u8]>,
-		_high: Bound<&'r [u8]>,
-	) -> TxOpResult<TxValueIter<'_>> {
-		unimplemented!("Iterators in transactions not supported with Sled backend");
-	}
-	fn range_rev<'r>(
-		&self,
-		_tree: usize,
-		_low: Bound<&'r [u8]>,
-		_high: Bound<&'r [u8]>,
-	) -> TxOpResult<TxValueIter<'_>> {
-		unimplemented!("Iterators in transactions not supported with Sled backend");
-	}
-}
@@ -1,508 +0,0 @@
-use core::ops::Bound;
-
-use std::borrow::BorrowMut;
-use std::marker::PhantomPinned;
-use std::pin::Pin;
-use std::ptr::NonNull;
-use std::sync::{Arc, Mutex, MutexGuard};
-
-use rusqlite::{params, Connection, Rows, Statement, Transaction};
-
-use crate::{
-	Db, Error, IDb, ITx, ITxFn, Result, TxError, TxFnResult, TxOpError, TxOpResult, TxResult,
-	TxValueIter, Value, ValueIter,
-};
-
-pub use rusqlite;
-
-// --- err
-
-impl From<rusqlite::Error> for Error {
-	fn from(e: rusqlite::Error) -> Error {
-		Error(format!("Sqlite: {}", e).into())
-	}
-}
-
-impl From<rusqlite::Error> for TxOpError {
-	fn from(e: rusqlite::Error) -> TxOpError {
-		TxOpError(e.into())
-	}
-}
-
-// -- db
-
-pub struct SqliteDb(Mutex<SqliteDbInner>);
-
-struct SqliteDbInner {
-	db: Connection,
-	trees: Vec<String>,
-}
-
-impl SqliteDb {
-	pub fn init(db: rusqlite::Connection) -> Db {
-		let s = Self(Mutex::new(SqliteDbInner {
-			db,
-			trees: Vec::new(),
-		}));
-		Db(Arc::new(s))
-	}
-}
-
-impl SqliteDbInner {
-	fn get_tree(&self, i: usize) -> Result<&'_ str> {
-		self.trees
-			.get(i)
-			.map(String::as_str)
-			.ok_or_else(|| Error("invalid tree id".into()))
-	}
-
-	fn internal_get(&self, tree: &str, key: &[u8]) -> Result<Option<Value>> {
-		let mut stmt = self
-			.db
-			.prepare(&format!("SELECT v FROM {} WHERE k = ?1", tree))?;
-		let mut res_iter = stmt.query([key])?;
-		match res_iter.next()? {
-			None => Ok(None),
-			Some(v) => Ok(Some(v.get::<_, Vec<u8>>(0)?)),
-		}
-	}
-}
-
-impl IDb for SqliteDb {
-	fn engine(&self) -> String {
-		format!("sqlite3 v{} (using rusqlite crate)", rusqlite::version())
-	}
-
-	fn open_tree(&self, name: &str) -> Result<usize> {
-		let name = format!("tree_{}", name.replace(':', "_COLON_"));
-		let mut this = self.0.lock().unwrap();
-
-		if let Some(i) = this.trees.iter().position(|x| x == &name) {
-			Ok(i)
-		} else {
-			trace!("create table {}", name);
-			this.db.execute(
-				&format!(
-					"CREATE TABLE IF NOT EXISTS {} (
-						k BLOB PRIMARY KEY,
-						v BLOB
-					)",
-					name
-				),
-				[],
-			)?;
-			trace!("table created: {}, unlocking", name);
-
-			let i = this.trees.len();
-			this.trees.push(name.to_string());
-			Ok(i)
-		}
-	}
-
-	fn list_trees(&self) -> Result<Vec<String>> {
-		let mut trees = vec![];
-
-		trace!("list_trees: lock db");
-		let this = self.0.lock().unwrap();
-		trace!("list_trees: lock acquired");
-
-		let mut stmt = this.db.prepare(
-			"SELECT name FROM sqlite_schema WHERE type = 'table' AND name LIKE 'tree_%'",
-		)?;
-		let mut rows = stmt.query([])?;
-		while let Some(row) = rows.next()? {
-			let name = row.get::<_, String>(0)?;
-			let name = name.replace("_COLON_", ":");
-			let name = name.strip_prefix("tree_").unwrap().to_string();
-			trees.push(name);
-		}
-		Ok(trees)
-	}
-
-	// ----
-
-	fn get(&self, tree: usize, key: &[u8]) -> Result<Option<Value>> {
-		trace!("get {}: lock db", tree);
-		let this = self.0.lock().unwrap();
-		trace!("get {}: lock acquired", tree);
-
-		let tree = this.get_tree(tree)?;
-		this.internal_get(tree, key)
-	}
-
-	fn len(&self, tree: usize) -> Result<usize> {
-		trace!("len {}: lock db", tree);
-		let this = self.0.lock().unwrap();
-		trace!("len {}: lock acquired", tree);
-
-		let tree = this.get_tree(tree)?;
-		let mut stmt = this.db.prepare(&format!("SELECT COUNT(*) FROM {}", tree))?;
-		let mut res_iter = stmt.query([])?;
-		match res_iter.next()? {
-			None => Ok(0),
-			Some(v) => Ok(v.get::<_, usize>(0)?),
-		}
-	}
-
-	fn insert(&self, tree: usize, key: &[u8], value: &[u8]) -> Result<Option<Value>> {
-		trace!("insert {}: lock db", tree);
-		let this = self.0.lock().unwrap();
-		trace!("insert {}: lock acquired", tree);
-
-		let tree = this.get_tree(tree)?;
-		let old_val = this.internal_get(tree, key)?;
-
-		let sql = match &old_val {
-			Some(_) => format!("UPDATE {} SET v = ?2 WHERE k = ?1", tree),
-			None => format!("INSERT INTO {} (k, v) VALUES (?1, ?2)", tree),
-		};
-		let n = this.db.execute(&sql, params![key, value])?;
-		assert_eq!(n, 1);
-
-		Ok(old_val)
-	}
-
-	fn remove(&self, tree: usize, key: &[u8]) -> Result<Option<Value>> {
-		trace!("remove {}: lock db", tree);
-		let this = self.0.lock().unwrap();
-		trace!("remove {}: lock acquired", tree);
-
-		let tree = this.get_tree(tree)?;
-		let old_val = this.internal_get(tree, key)?;
-
-		if old_val.is_some() {
-			let n = this
-				.db
-				.execute(&format!("DELETE FROM {} WHERE k = ?1", tree), params![key])?;
-			assert_eq!(n, 1);
-		}
-
-		Ok(old_val)
-	}
-
-	fn clear(&self, tree: usize) -> Result<()> {
-		trace!("clear {}: lock db", tree);
-		let this = self.0.lock().unwrap();
-		trace!("clear {}: lock acquired", tree);
-
-		let tree = this.get_tree(tree)?;
-		this.db.execute(&format!("DELETE FROM {}", tree), [])?;
-		Ok(())
-	}
-
-	fn iter(&self, tree: usize) -> Result<ValueIter<'_>> {
-		trace!("iter {}: lock db", tree);
-		let this = self.0.lock().unwrap();
-		trace!("iter {}: lock acquired", tree);
-
-		let tree = this.get_tree(tree)?;
-		let sql = format!("SELECT k, v FROM {} ORDER BY k ASC", tree);
-		DbValueIterator::make(this, &sql, [])
-	}
-
-	fn iter_rev(&self, tree: usize) -> Result<ValueIter<'_>> {
-		trace!("iter_rev {}: lock db", tree);
-		let this = self.0.lock().unwrap();
-		trace!("iter_rev {}: lock acquired", tree);
-
-		let tree = this.get_tree(tree)?;
-		let sql = format!("SELECT k, v FROM {} ORDER BY k DESC", tree);
-		DbValueIterator::make(this, &sql, [])
-	}
-
-	fn range<'r>(
-		&self,
-		tree: usize,
-		low: Bound<&'r [u8]>,
-		high: Bound<&'r [u8]>,
-	) -> Result<ValueIter<'_>> {
-		trace!("range {}: lock db", tree);
-		let this = self.0.lock().unwrap();
-		trace!("range {}: lock acquired", tree);
-
-		let tree = this.get_tree(tree)?;
-
-		let (bounds_sql, params) = bounds_sql(low, high);
-		let sql = format!("SELECT k, v FROM {} {} ORDER BY k ASC", tree, bounds_sql);
-
-		let params = params
-			.iter()
-			.map(|x| x as &dyn rusqlite::ToSql)
-			.collect::<Vec<_>>();
-
-		DbValueIterator::make::<&[&dyn rusqlite::ToSql]>(this, &sql, params.as_ref())
-	}
-	fn range_rev<'r>(
-		&self,
-		tree: usize,
-		low: Bound<&'r [u8]>,
-		high: Bound<&'r [u8]>,
-	) -> Result<ValueIter<'_>> {
-		trace!("range_rev {}: lock db", tree);
-		let this = self.0.lock().unwrap();
-		trace!("range_rev {}: lock acquired", tree);
-
-		let tree = this.get_tree(tree)?;
-
-		let (bounds_sql, params) = bounds_sql(low, high);
-		let sql = format!("SELECT k, v FROM {} {} ORDER BY k DESC", tree, bounds_sql);
-
-		let params = params
-			.iter()
-			.map(|x| x as &dyn rusqlite::ToSql)
-			.collect::<Vec<_>>();
-
-		DbValueIterator::make::<&[&dyn rusqlite::ToSql]>(this, &sql, params.as_ref())
-	}
-
-	// ----
-
-	fn transaction(&self, f: &dyn ITxFn) -> TxResult<(), ()> {
-		trace!("transaction: lock db");
-		let mut this = self.0.lock().unwrap();
-		trace!("transaction: lock acquired");
-
-		let this_mut_ref: &mut SqliteDbInner = this.borrow_mut();
-
-		let mut tx = SqliteTx {
-			tx: this_mut_ref
-				.db
-				.transaction()
-				.map_err(Error::from)
-				.map_err(TxError::Db)?,
-			trees: &this_mut_ref.trees,
-		};
-		let res = match f.try_on(&mut tx) {
-			TxFnResult::Ok => {
-				tx.tx.commit().map_err(Error::from).map_err(TxError::Db)?;
-				Ok(())
-			}
-			TxFnResult::Abort => {
-				tx.tx.rollback().map_err(Error::from).map_err(TxError::Db)?;
-				Err(TxError::Abort(()))
-			}
-			TxFnResult::DbErr => {
-				tx.tx.rollback().map_err(Error::from).map_err(TxError::Db)?;
-				Err(TxError::Db(Error(
-					"(this message will be discarded)".into(),
-				)))
-			}
-		};
-
-		trace!("transaction done");
-		res
-	}
-}
-
-// ----
-
-struct SqliteTx<'a> {
-	tx: Transaction<'a>,
-	trees: &'a [String],
-}
-
-impl<'a> SqliteTx<'a> {
-	fn get_tree(&self, i: usize) -> TxOpResult<&'_ str> {
-		self.trees.get(i).map(String::as_ref).ok_or_else(|| {
-			TxOpError(Error(
-				"invalid tree id (it might have been openned after the transaction started)".into(),
-			))
-		})
-	}
-
-	fn internal_get(&self, tree: &str, key: &[u8]) -> TxOpResult<Option<Value>> {
-		let mut stmt = self
-			.tx
-			.prepare(&format!("SELECT v FROM {} WHERE k = ?1", tree))?;
-		let mut res_iter = stmt.query([key])?;
-		match res_iter.next()? {
-			None => Ok(None),
-			Some(v) => Ok(Some(v.get::<_, Vec<u8>>(0)?)),
-		}
-	}
-}
-
-impl<'a> ITx for SqliteTx<'a> {
-	fn get(&self, tree: usize, key: &[u8]) -> TxOpResult<Option<Value>> {
-		let tree = self.get_tree(tree)?;
-		self.internal_get(tree, key)
-	}
-	fn len(&self, tree: usize) -> TxOpResult<usize> {
-		let tree = self.get_tree(tree)?;
-		let mut stmt = self.tx.prepare(&format!("SELECT COUNT(*) FROM {}", tree))?;
-		let mut res_iter = stmt.query([])?;
-		match res_iter.next()? {
-			None => Ok(0),
-			Some(v) => Ok(v.get::<_, usize>(0)?),
-		}
-	}
-
-	fn insert(&mut self, tree: usize, key: &[u8], value: &[u8]) -> TxOpResult<Option<Value>> {
-		let tree = self.get_tree(tree)?;
-		let old_val = self.internal_get(tree, key)?;
-
-		let sql = match &old_val {
-			Some(_) => format!("UPDATE {} SET v = ?2 WHERE k = ?1", tree),
-			None => format!("INSERT INTO {} (k, v) VALUES (?1, ?2)", tree),
-		};
-		let n = self.tx.execute(&sql, params![key, value])?;
-		assert_eq!(n, 1);
-
-		Ok(old_val)
-	}
-	fn remove(&mut self, tree: usize, key: &[u8]) -> TxOpResult<Option<Value>> {
-		let tree = self.get_tree(tree)?;
-		let old_val = self.internal_get(tree, key)?;
-
-		if old_val.is_some() {
-			let n = self
-				.tx
-				.execute(&format!("DELETE FROM {} WHERE k = ?1", tree), params![key])?;
-			assert_eq!(n, 1);
-		}
-
-		Ok(old_val)
-	}
-
-	fn iter(&self, _tree: usize) -> TxOpResult<TxValueIter<'_>> {
-		unimplemented!();
-	}
-	fn iter_rev(&self, _tree: usize) -> TxOpResult<TxValueIter<'_>> {
-		unimplemented!();
-	}
-
-	fn range<'r>(
-		&self,
-		_tree: usize,
-		_low: Bound<&'r [u8]>,
-		_high: Bound<&'r [u8]>,
-	) -> TxOpResult<TxValueIter<'_>> {
-		unimplemented!();
-	}
-	fn range_rev<'r>(
-		&self,
-		_tree: usize,
-		_low: Bound<&'r [u8]>,
-		_high: Bound<&'r [u8]>,
-	) -> TxOpResult<TxValueIter<'_>> {
-		unimplemented!();
-	}
-}
-
-// ----
-
-struct DbValueIterator<'a> {
-	db: MutexGuard<'a, SqliteDbInner>,
-	stmt: Option<Statement<'a>>,
-	iter: Option<Rows<'a>>,
-	_pin: PhantomPinned,
-}
-
-impl<'a> DbValueIterator<'a> {
-	fn make<P: rusqlite::Params>(
-		db: MutexGuard<'a, SqliteDbInner>,
-		sql: &str,
-		args: P,
-	) -> Result<ValueIter<'a>> {
-		let res = DbValueIterator {
-			db,
-			stmt: None,
-			iter: None,
-			_pin: PhantomPinned,
-		};
-		let mut boxed = Box::pin(res);
-		trace!("make iterator with sql: {}", sql);
-
-		unsafe {
-			let db = NonNull::from(&boxed.db);
-			let stmt = db.as_ref().db.prepare(sql)?;
-
-			let mut_ref: Pin<&mut DbValueIterator<'a>> = Pin::as_mut(&mut boxed);
-			Pin::get_unchecked_mut(mut_ref).stmt = Some(stmt);
-
-			let mut stmt = NonNull::from(&boxed.stmt);
-			let iter = stmt.as_mut().as_mut().unwrap().query(args)?;
-
-			let mut_ref: Pin<&mut DbValueIterator<'a>> = Pin::as_mut(&mut boxed);
-			Pin::get_unchecked_mut(mut_ref).iter = Some(iter);
-		}
-
-		Ok(Box::new(DbValueIteratorPin(boxed)))
-	}
-}
-
-impl<'a> Drop for DbValueIterator<'a> {
-	fn drop(&mut self) {
-		trace!("drop iter");
-		drop(self.iter.take());
-		drop(self.stmt.take());
-	}
-}
-
-struct DbValueIteratorPin<'a>(Pin<Box<DbValueIterator<'a>>>);
-
-impl<'a> Iterator for DbValueIteratorPin<'a> {
-	type Item = Result<(Value, Value)>;
-
-	fn next(&mut self) -> Option<Self::Item> {
-		let next = unsafe {
-			let mut_ref: Pin<&mut DbValueIterator<'a>> = Pin::as_mut(&mut self.0);
-			Pin::get_unchecked_mut(mut_ref).iter.as_mut()?.next()
-		};
-		let row = match next {
-			Err(e) => return Some(Err(e.into())),
-			Ok(None) => return None,
-			Ok(Some(r)) => r,
-		};
-		let k = match row.get::<_, Vec<u8>>(0) {
-			Err(e) => return Some(Err(e.into())),
-			Ok(x) => x,
-		};
-		let v = match row.get::<_, Vec<u8>>(1) {
-			Err(e) => return Some(Err(e.into())),
-			Ok(y) => y,
-		};
-		Some(Ok((k, v)))
-	}
-}
-
-// ----
-
-fn bounds_sql<'r>(low: Bound<&'r [u8]>, high: Bound<&'r [u8]>) -> (String, Vec<Vec<u8>>) {
-	let mut sql = String::new();
-	let mut params: Vec<Vec<u8>> = vec![];
-
-	match low {
-		Bound::Included(b) => {
-			sql.push_str(" WHERE k >= ?1");
-			params.push(b.to_vec());
-		}
-		Bound::Excluded(b) => {
-			sql.push_str(" WHERE k > ?1");
-			params.push(b.to_vec());
-		}
-		Bound::Unbounded => (),
-	};
-
-	match high {
-		Bound::Included(b) => {
-			if !params.is_empty() {
-				sql.push_str(" AND k <= ?2");
-			} else {
-				sql.push_str(" WHERE k <= ?1");
-			}
-			params.push(b.to_vec());
-		}
-		Bound::Excluded(b) => {
-			if !params.is_empty() {
-				sql.push_str(" AND k < ?2");
-			} else {
-				sql.push_str(" WHERE k < ?1");
-			}
-			params.push(b.to_vec());
-		}
-		Bound::Unbounded => (),
-	}
-
-	(sql, params)
-}
@@ -1,106 +0,0 @@
-use crate::*;
-
-use crate::lmdb_adapter::LmdbDb;
-use crate::sled_adapter::SledDb;
-use crate::sqlite_adapter::SqliteDb;
-
-fn test_suite(db: Db) {
-	let tree = db.open_tree("tree").unwrap();
-
-	let ka: &[u8] = &b"test"[..];
-	let kb: &[u8] = &b"zwello"[..];
-	let kint: &[u8] = &b"tz"[..];
-	let va: &[u8] = &b"plop"[..];
-	let vb: &[u8] = &b"plip"[..];
-	let vc: &[u8] = &b"plup"[..];
-
-	assert!(tree.insert(ka, va).unwrap().is_none());
-	assert_eq!(tree.get(ka).unwrap().unwrap(), va);
-
-	let res = db.transaction::<_, (), _>(|mut tx| {
-		assert_eq!(tx.get(&tree, ka).unwrap().unwrap(), va);
-
-		assert_eq!(tx.insert(&tree, ka, vb).unwrap().unwrap(), va);
-
-		assert_eq!(tx.get(&tree, ka).unwrap().unwrap(), vb);
-
-		tx.commit(12)
-	});
-	assert!(matches!(res, Ok(12)));
-	assert_eq!(tree.get(ka).unwrap().unwrap(), vb);
-
-	let res = db.transaction::<(), _, _>(|mut tx| {
-		assert_eq!(tx.get(&tree, ka).unwrap().unwrap(), vb);
-
-		assert_eq!(tx.insert(&tree, ka, vc).unwrap().unwrap(), vb);
-
-		assert_eq!(tx.get(&tree, ka).unwrap().unwrap(), vc);
-
-		tx.abort(42)
-	});
-	assert!(matches!(res, Err(TxError::Abort(42))));
-	assert_eq!(tree.get(ka).unwrap().unwrap(), vb);
-
-	let mut iter = tree.iter().unwrap();
-	let next = iter.next().unwrap().unwrap();
-	assert_eq!((next.0.as_ref(), next.1.as_ref()), (ka, vb));
-	assert!(iter.next().is_none());
-	drop(iter);
-
-	assert!(tree.insert(kb, vc).unwrap().is_none());
-	assert_eq!(tree.get(kb).unwrap().unwrap(), vc);
-
-	let mut iter = tree.iter().unwrap();
-	let next = iter.next().unwrap().unwrap();
-	assert_eq!((next.0.as_ref(), next.1.as_ref()), (ka, vb));
-	let next = iter.next().unwrap().unwrap();
-	assert_eq!((next.0.as_ref(), next.1.as_ref()), (kb, vc));
-	assert!(iter.next().is_none());
-	drop(iter);
-
-	let mut iter = tree.range(kint..).unwrap();
-	let next = iter.next().unwrap().unwrap();
-	assert_eq!((next.0.as_ref(), next.1.as_ref()), (kb, vc));
-	assert!(iter.next().is_none());
-	drop(iter);
-
-	let mut iter = tree.range_rev(..kint).unwrap();
-	let next = iter.next().unwrap().unwrap();
-	assert_eq!((next.0.as_ref(), next.1.as_ref()), (ka, vb));
-	assert!(iter.next().is_none());
-	drop(iter);
-
-	let mut iter = tree.iter_rev().unwrap();
-	let next = iter.next().unwrap().unwrap();
-	assert_eq!((next.0.as_ref(), next.1.as_ref()), (kb, vc));
-	let next = iter.next().unwrap().unwrap();
-	assert_eq!((next.0.as_ref(), next.1.as_ref()), (ka, vb));
-	assert!(iter.next().is_none());
-	drop(iter);
-}
-
-#[test]
-fn test_lmdb_db() {
-	let path = mktemp::Temp::new_dir().unwrap();
-	let db = heed::EnvOpenOptions::new()
-		.max_dbs(100)
-		.open(&path)
-		.unwrap();
-	let db = LmdbDb::init(db);
-	test_suite(db);
-	drop(path);
-}
-
-#[test]
-fn test_sled_db() {
-	let path = mktemp::Temp::new_dir().unwrap();
-	let db = SledDb::init(sled::open(path.to_path_buf()).unwrap());
-	test_suite(db);
-	drop(path);
-}
-
-#[test]
-fn test_sqlite_db() {
-	let db = SqliteDb::init(rusqlite::Connection::open_in_memory().unwrap());
-	test_suite(db);
-}
@@ -1,6 +1,6 @@
 [package]
 name = "garage"
-version = "0.7.0"
+version = "0.7.3"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -21,18 +21,14 @@ path = "tests/lib.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-garage_db = { version = "0.8.0", path = "../db" }
-garage_api = { version = "0.7.0", path = "../api" }
-garage_block = { version = "0.7.0", path = "../block" }
-garage_model = { version = "0.7.0", path = "../model" }
-garage_rpc = { version = "0.7.0", path = "../rpc" }
-garage_table = { version = "0.7.0", path = "../table" }
-garage_util = { version = "0.7.0", path = "../util" }
-garage_web = { version = "0.7.0", path = "../web" }
+garage_api = { version = "0.7.3", path = "../api" }
+garage_model = { version = "0.7.3", path = "../model" }
+garage_rpc = { version = "0.7.3", path = "../rpc" }
+garage_table = { version = "0.7.3", path = "../table" }
+garage_util = { version = "0.7.3", path = "../util" }
+garage_web = { version = "0.7.3", path = "../web" }

 bytes = "1.0"
-bytesize = "1.1"
-timeago = "0.3"
 hex = "0.4"
 tracing = { version = "0.1.30", features = ["log-always"] }
 pretty_env_logger = "0.4"
@@ -40,6 +36,8 @@ rand = "0.8"
 async-trait = "0.1.7"
 sodiumoxide = { version = "0.2.5-0", package = "kuska-sodiumoxide" }

+sled = "0.34"
+
 rmp-serde = "0.15"
 serde = { version = "1.0", default-features = false, features = ["derive", "rc"] }
 serde_bytes = "0.11"
@@ -24,34 +24,24 @@ use garage_model::migrate::Migrate;
 use garage_model::permission::*;

 use crate::cli::*;
-use crate::repair::online::launch_online_repair;
+use crate::repair::Repair;

 pub const ADMIN_RPC_PATH: &str = "garage/admin_rpc.rs/Rpc";

 #[derive(Debug, Serialize, Deserialize)]
-#[allow(clippy::large_enum_variant)]
 pub enum AdminRpc {
 	BucketOperation(BucketOperation),
 	KeyOperation(KeyOperation),
 	LaunchRepair(RepairOpt),
 	Migrate(MigrateOpt),
 	Stats(StatsOpt),
-	Worker(WorkerOpt),

 	// Replies
 	Ok(String),
 	BucketList(Vec<Bucket>),
-	BucketInfo {
-		bucket: Bucket,
-		relevant_keys: HashMap<String, Key>,
-		counters: HashMap<String, i64>,
-	},
+	BucketInfo(Bucket, HashMap<String, Key>),
 	KeyList(Vec<(String, String)>),
 	KeyInfo(Key, HashMap<Uuid, Bucket>),
-	WorkerList(
-		HashMap<usize, garage_util::background::WorkerInfo>,
-		WorkerListOpt,
-	),
 }

 impl Rpc for AdminRpc {
@@ -82,7 +72,6 @@ impl AdminRpcHandler {
 			BucketOperation::Allow(query) => self.handle_bucket_allow(query).await,
 			BucketOperation::Deny(query) => self.handle_bucket_deny(query).await,
 			BucketOperation::Website(query) => self.handle_bucket_website(query).await,
-			BucketOperation::SetQuotas(query) => self.handle_bucket_set_quotas(query).await,
 		}
 	}

@@ -98,7 +87,6 @@ impl AdminRpcHandler {
 				EnumerationOrder::Forward,
 			)
 			.await?;
-
 		Ok(AdminRpc::BucketList(buckets))
 	}

@@ -116,15 +104,6 @@ impl AdminRpcHandler {
 			.get_existing_bucket(bucket_id)
 			.await?;

-		let counters = self
-			.garage
-			.object_counter_table
-			.table
-			.get(&bucket_id, &EmptyKey)
-			.await?
-			.map(|x| x.filtered_values(&self.garage.system.ring.borrow()))
-			.unwrap_or_default();
-
 		let mut relevant_keys = HashMap::new();
 		for (k, _) in bucket
 			.state
@@ -160,11 +139,7 @@ impl AdminRpcHandler {
 			}
 		}

-		Ok(AdminRpc::BucketInfo {
-			bucket,
-			relevant_keys,
-			counters,
-		})
+		Ok(AdminRpc::BucketInfo(bucket, relevant_keys))
 	}

 	#[allow(clippy::ptr_arg)]
@@ -456,60 +431,6 @@ impl AdminRpcHandler {
 		Ok(AdminRpc::Ok(msg))
 	}

-	async fn handle_bucket_set_quotas(&self, query: &SetQuotasOpt) -> Result<AdminRpc, Error> {
-		let bucket_id = self
-			.garage
-			.bucket_helper()
-			.resolve_global_bucket_name(&query.bucket)
-			.await?
-			.ok_or_bad_request("Bucket not found")?;
-
-		let mut bucket = self
-			.garage
-			.bucket_helper()
-			.get_existing_bucket(bucket_id)
-			.await?;
-		let bucket_state = bucket.state.as_option_mut().unwrap();
-
-		if query.max_size.is_none() && query.max_objects.is_none() {
-			return Err(Error::BadRequest(
-				"You must specify either --max-size or --max-objects (or both) for this command to do something.".to_string(),
-			));
-		}
-
-		let mut quotas = bucket_state.quotas.get().clone();
-
-		match query.max_size.as_ref().map(String::as_ref) {
-			Some("none") => quotas.max_size = None,
-			Some(v) => {
-				let bs = v
-					.parse::<bytesize::ByteSize>()
-					.ok_or_bad_request(format!("Invalid size specified: {}", v))?;
-				quotas.max_size = Some(bs.as_u64());
-			}
-			_ => (),
-		}
-
-		match query.max_objects.as_ref().map(String::as_ref) {
-			Some("none") => quotas.max_objects = None,
-			Some(v) => {
-				let mo = v
-					.parse::<u64>()
-					.ok_or_bad_request(format!("Invalid number specified: {}", v))?;
-				quotas.max_objects = Some(mo);
-			}
-			_ => (),
-		}
-
-		bucket_state.quotas.update(quotas);
-		self.garage.bucket_table.insert(&bucket).await?;
-
-		Ok(AdminRpc::Ok(format!(
-			"Quotas updated for {}",
-			&query.bucket
-		)))
-	}
-
 	async fn handle_key_cmd(&self, cmd: &KeyOperation) -> Result<AdminRpc, Error> {
 		match cmd {
 			KeyOperation::List => self.handle_list_keys().await,
@@ -698,7 +619,15 @@ impl AdminRpcHandler {
 				)))
 			}
 		} else {
-			launch_online_repair(self.garage.clone(), opt).await;
+			let repair = Repair {
+				garage: self.garage.clone(),
+			};
+			self.garage
+				.system
+				.background
+				.spawn_worker("Repair worker".into(), move |must_exit| async move {
+					repair.repair_worker(opt, must_exit).await
+				});
 			Ok(AdminRpc::Ok(format!(
 				"Repair launched on {:?}",
 				self.garage.system.id
@@ -731,11 +660,11 @@ impl AdminRpcHandler {
 			}
 			Ok(AdminRpc::Ok(ret))
 		} else {
-			Ok(AdminRpc::Ok(self.gather_stats_local(opt)?))
+			Ok(AdminRpc::Ok(self.gather_stats_local(opt)))
 		}
 	}

-	fn gather_stats_local(&self, opt: StatsOpt) -> Result<String, Error> {
+	fn gather_stats_local(&self, opt: StatsOpt) -> String {
 		let mut ret = String::new();
 		writeln!(
 			&mut ret,
@@ -743,7 +672,6 @@ impl AdminRpcHandler {
 			self.garage.system.garage_version(),
 		)
 		.unwrap();
-		writeln!(&mut ret, "\nDatabase engine: {}", self.garage.db.engine()).unwrap();

 		// Gather ring statistics
 		let ring = self.garage.system.ring.borrow().clone();
@@ -761,82 +689,59 @@ impl AdminRpcHandler {
 			writeln!(&mut ret, "  {:?} {}", n, c).unwrap();
 		}

-		self.gather_table_stats(&mut ret, &self.garage.bucket_table, &opt)?;
-		self.gather_table_stats(&mut ret, &self.garage.key_table, &opt)?;
-		self.gather_table_stats(&mut ret, &self.garage.object_table, &opt)?;
-		self.gather_table_stats(&mut ret, &self.garage.version_table, &opt)?;
-		self.gather_table_stats(&mut ret, &self.garage.block_ref_table, &opt)?;
+		self.gather_table_stats(&mut ret, &self.garage.bucket_table, &opt);
+		self.gather_table_stats(&mut ret, &self.garage.key_table, &opt);
+		self.gather_table_stats(&mut ret, &self.garage.object_table, &opt);
+		self.gather_table_stats(&mut ret, &self.garage.version_table, &opt);
+		self.gather_table_stats(&mut ret, &self.garage.block_ref_table, &opt);

 		writeln!(&mut ret, "\nBlock manager stats:").unwrap();
 		if opt.detailed {
 			writeln!(
 				&mut ret,
 				"  number of RC entries (~= number of blocks): {}",
-				self.garage.block_manager.rc_len()?
+				self.garage.block_manager.rc_len()
 			)
 			.unwrap();
 		}
 		writeln!(
 			&mut ret,
 			"  resync queue length: {}",
-			self.garage.block_manager.resync_queue_len()?
+			self.garage.block_manager.resync_queue_len()
 		)
 		.unwrap();
 		writeln!(
 			&mut ret,
 			"  blocks with resync errors: {}",
-			self.garage.block_manager.resync_errors_len()?
+			self.garage.block_manager.resync_errors_len()
 		)
 		.unwrap();

-		Ok(ret)
+		ret
 	}

-	fn gather_table_stats<F, R>(
-		&self,
-		to: &mut String,
-		t: &Arc<Table<F, R>>,
-		opt: &StatsOpt,
-	) -> Result<(), Error>
+	fn gather_table_stats<F, R>(&self, to: &mut String, t: &Arc<Table<F, R>>, opt: &StatsOpt)
 	where
 		F: TableSchema + 'static,
 		R: TableReplication + 'static,
 	{
 		writeln!(to, "\nTable stats for {}", F::TABLE_NAME).unwrap();
 		if opt.detailed {
-			writeln!(
-				to,
-				"  number of items: {}",
-				t.data.store.len().map_err(GarageError::from)?
-			)
-			.unwrap();
+			writeln!(to, "  number of items: {}", t.data.store.len()).unwrap();
 			writeln!(
 				to,
 				"  Merkle tree size: {}",
-				t.merkle_updater.merkle_tree_len()?
+				t.merkle_updater.merkle_tree_len()
 			)
 			.unwrap();
 		}
 		writeln!(
 			to,
 			"  Merkle updater todo queue length: {}",
-			t.merkle_updater.todo_len()?
+			t.merkle_updater.todo_len()
 		)
 		.unwrap();
-		writeln!(to, "  GC todo queue length: {}", t.data.gc_todo_len()?).unwrap();
-
-		Ok(())
-	}
-
-	// ----
-
-	async fn handle_worker_cmd(&self, opt: WorkerOpt) -> Result<AdminRpc, Error> {
-		match opt.cmd {
-			WorkerCmd::List { opt } => {
-				let workers = self.garage.background.get_worker_info();
-				Ok(AdminRpc::WorkerList(workers, opt))
-			}
-		}
+		writeln!(to, "  GC todo queue length: {}", t.data.gc_todo_len()).unwrap();
 	}
 }

@@ -853,7 +758,6 @@ impl EndpointHandler<AdminRpc> for AdminRpcHandler {
 			AdminRpc::Migrate(opt) => self.handle_migrate(opt.clone()).await,
 			AdminRpc::LaunchRepair(opt) => self.handle_launch_repair(opt.clone()).await,
 			AdminRpc::Stats(opt) => self.handle_stats(opt.clone()).await,
-			AdminRpc::Worker(opt) => self.handle_worker_cmd(opt.clone()).await,
 			m => Err(GarageError::unexpected_rpc_message(m).into()),
 		}
 	}
@@ -1,5 +1,4 @@
 use std::collections::HashSet;
-use std::time::Duration;

 use garage_util::error::*;
 use garage_util::formater::format_table;
@@ -40,7 +39,6 @@ pub async fn cli_command_dispatch(
 			cmd_admin(admin_rpc_endpoint, rpc_host, AdminRpc::LaunchRepair(ro)).await
 		}
 		Command::Stats(so) => cmd_admin(admin_rpc_endpoint, rpc_host, AdminRpc::Stats(so)).await,
-		Command::Worker(wo) => cmd_admin(admin_rpc_endpoint, rpc_host, AdminRpc::Worker(wo)).await,
 		_ => unreachable!(),
 	}
 }
@@ -102,7 +100,6 @@ pub async fn cmd_status(rpc_cli: &Endpoint<SystemRpc, ()>, rpc_host: NodeID) ->
 			vec!["ID\tHostname\tAddress\tTags\tZone\tCapacity\tLast seen".to_string()];
 		for adv in status.iter().filter(|adv| !adv.is_up) {
 			if let Some(NodeRoleV(Some(cfg))) = layout.roles.get(&adv.id) {
-				let tf = timeago::Formatter::new();
 				failed_nodes.push(format!(
 					"{id:?}\t{host}\t{addr}\t[{tags}]\t{zone}\t{capacity}\t{last_seen}",
 					id = adv.id,
@@ -113,7 +110,7 @@ pub async fn cmd_status(rpc_cli: &Endpoint<SystemRpc, ()>, rpc_host: NodeID) ->
 					capacity = cfg.capacity_string(),
 					last_seen = adv
 						.last_seen_secs_ago
-						.map(|s| tf.convert(Duration::from_secs(s)))
+						.map(|s| format!("{}s ago", s))
 						.unwrap_or_else(|| "never seen".into()),
 				));
 			}
@@ -172,12 +169,8 @@ pub async fn cmd_admin(
 		AdminRpc::BucketList(bl) => {
 			print_bucket_list(bl);
 		}
-		AdminRpc::BucketInfo {
-			bucket,
-			relevant_keys,
-			counters,
-		} => {
-			print_bucket_info(&bucket, &relevant_keys, &counters);
+		AdminRpc::BucketInfo(bucket, rk) => {
+			print_bucket_info(&bucket, &rk);
 		}
 		AdminRpc::KeyList(kl) => {
 			print_key_list(kl);
@@ -185,9 +178,6 @@ pub async fn cmd_admin(
 		AdminRpc::KeyInfo(key, rb) => {
 			print_key_info(&key, &rb);
 		}
-		AdminRpc::WorkerList(wi, wlo) => {
-			print_worker_info(wi, wlo);
-		}
 		r => {
 			error!("Unexpected response: {:?}", r);
 		}
@@ -38,18 +38,9 @@ pub enum Command {
 	#[structopt(name = "repair", version = version::garage())]
 	Repair(RepairOpt),

-	/// Offline reparation of node data (these repairs must be run offline
-	/// directly on the server node)
-	#[structopt(name = "offline-repair", version = version::garage())]
-	OfflineRepair(OfflineRepairOpt),
-
 	/// Gather node statistics
 	#[structopt(name = "stats", version = version::garage())]
 	Stats(StatsOpt),
-
-	/// Manage background workers
-	#[structopt(name = "worker", version = version::garage())]
-	Worker(WorkerOpt),
 }

 #[derive(StructOpt, Debug)]
@@ -185,10 +176,6 @@ pub enum BucketOperation {
 	/// Expose as website or not
 	#[structopt(name = "website", version = version::garage())]
 	Website(WebsiteOpt),
-
-	/// Set the quotas for this bucket
-	#[structopt(name = "set-quotas", version = version::garage())]
-	SetQuotas(SetQuotasOpt),
 }

 #[derive(Serialize, Deserialize, StructOpt, Debug)]
@@ -275,21 +262,6 @@ pub struct PermBucketOpt {
 	pub bucket: String,
 }

-#[derive(Serialize, Deserialize, StructOpt, Debug)]
-pub struct SetQuotasOpt {
-	/// Bucket name
-	pub bucket: String,
-
-	/// Set a maximum size for the bucket (specify a size e.g. in MiB or GiB,
-	/// or `none` for no size restriction)
-	#[structopt(long = "max-size")]
-	pub max_size: Option<String>,
-
-	/// Set a maximum number of objects for the bucket (or `none` for no restriction)
-	#[structopt(long = "max-objects")]
-	pub max_objects: Option<String>,
-}
-
 #[derive(Serialize, Deserialize, StructOpt, Debug)]
 pub enum KeyOperation {
 	/// List keys
@@ -428,54 +400,12 @@ pub enum RepairWhat {
 	/// Verify integrity of all blocks on disc (extremely slow, i/o intensive)
 	#[structopt(name = "scrub", version = version::garage())]
 	Scrub {
-		#[structopt(subcommand)]
-		cmd: ScrubCmd,
-	},
-}
-
-#[derive(Serialize, Deserialize, StructOpt, Debug, Eq, PartialEq, Clone)]
-pub enum ScrubCmd {
-	/// Start scrub
-	#[structopt(name = "start", version = version::garage())]
-	Start,
-	/// Pause scrub (it will resume automatically after 24 hours)
-	#[structopt(name = "pause", version = version::garage())]
-	Pause,
-	/// Resume paused scrub
-	#[structopt(name = "resume", version = version::garage())]
-	Resume,
-	/// Cancel scrub in progress
-	#[structopt(name = "cancel", version = version::garage())]
-	Cancel,
-	/// Set tranquility level for in-progress and future scrubs
-	#[structopt(name = "set-tranquility", version = version::garage())]
-	SetTranquility {
-		#[structopt()]
+		/// Tranquility factor (see tranquilizer documentation)
+		#[structopt(name = "tranquility", default_value = "2")]
 		tranquility: u32,
 	},
 }

-#[derive(Serialize, Deserialize, StructOpt, Debug, Clone)]
-pub struct OfflineRepairOpt {
-	/// Confirm the launch of the repair operation
-	#[structopt(long = "yes")]
-	pub yes: bool,
-
-	#[structopt(subcommand)]
-	pub what: OfflineRepairWhat,
-}
-
-#[derive(Serialize, Deserialize, StructOpt, Debug, Eq, PartialEq, Clone)]
-pub enum OfflineRepairWhat {
-	/// Repair K2V item counters
-	#[cfg(feature = "k2v")]
-	#[structopt(name = "k2v_item_counters", version = version::garage())]
-	K2VItemCounters,
-	/// Repair object counters
-	#[structopt(name = "object_counters", version = version::garage())]
-	ObjectCounters,
-}
-
 #[derive(Serialize, Deserialize, StructOpt, Debug, Clone)]
 pub struct StatsOpt {
 	/// Gather statistics from all nodes
@@ -486,29 +416,3 @@ pub struct StatsOpt {
 	#[structopt(short = "d", long = "detailed")]
 	pub detailed: bool,
 }
-
-#[derive(Serialize, Deserialize, StructOpt, Debug, Clone)]
-pub struct WorkerOpt {
-	#[structopt(subcommand)]
-	pub cmd: WorkerCmd,
-}
-
-#[derive(Serialize, Deserialize, StructOpt, Debug, Eq, PartialEq, Clone)]
-pub enum WorkerCmd {
-	/// List all workers on Garage node
-	#[structopt(name = "list", version = version::garage())]
-	List {
-		#[structopt(flatten)]
-		opt: WorkerListOpt,
-	},
-}
-
-#[derive(Serialize, Deserialize, StructOpt, Debug, Eq, PartialEq, Clone, Copy)]
-pub struct WorkerListOpt {
-	/// Show only busy workers
-	#[structopt(short = "b", long = "busy")]
-	pub busy: bool,
-	/// Show only workers with errors
-	#[structopt(short = "e", long = "errors")]
-	pub errors: bool,
-}
@@ -1,18 +1,12 @@
 use std::collections::HashMap;
-use std::time::Duration;

-use garage_util::background::*;
 use garage_util::crdt::*;
 use garage_util::data::Uuid;
 use garage_util::error::*;
 use garage_util::formater::format_table;
-use garage_util::time::*;

 use garage_model::bucket_table::*;
 use garage_model::key_table::*;
-use garage_model::s3::object_table::{BYTES, OBJECTS, UNFINISHED_UPLOADS};
-
-use crate::cli::structs::WorkerListOpt;

 pub fn print_bucket_list(bl: Vec<Bucket>) {
 	println!("List of buckets:");
@@ -35,12 +29,11 @@ pub fn print_bucket_list(bl: Vec<Bucket>) {
 			[((k, n), _, _)] => format!("{}:{}", k, n),
 			s => format!("[{} local aliases]", s.len()),
 		};
-
 		table.push(format!(
 			"\t{}\t{}\t{}",
 			aliases.join(","),
 			local_aliases_n,
-			hex::encode(bucket.id),
+			hex::encode(bucket.id)
 		));
 	}
 	format_table(table);
@@ -128,11 +121,7 @@ pub fn print_key_info(key: &Key, relevant_buckets: &HashMap<Uuid, Bucket>) {
 	}
 }

-pub fn print_bucket_info(
-	bucket: &Bucket,
-	relevant_keys: &HashMap<String, Key>,
-	counters: &HashMap<String, i64>,
-) {
+pub fn print_bucket_info(bucket: &Bucket, relevant_keys: &HashMap<String, Key>) {
 	let key_name = |k| {
 		relevant_keys
 			.get(k)
@@ -144,42 +133,7 @@ pub fn print_bucket_info(
 	match &bucket.state {
 		Deletable::Deleted => println!("Bucket is deleted."),
 		Deletable::Present(p) => {
-			let size =
-				bytesize::ByteSize::b(counters.get(BYTES).cloned().unwrap_or_default() as u64);
-			println!(
-				"\nSize: {} ({})",
-				size.to_string_as(true),
-				size.to_string_as(false)
-			);
-			println!(
-				"Objects: {}",
-				counters.get(OBJECTS).cloned().unwrap_or_default()
-			);
-			println!(
-				"Unfinished multipart uploads: {}",
-				counters
-					.get(UNFINISHED_UPLOADS)
-					.cloned()
-					.unwrap_or_default()
-			);
-
-			println!("\nWebsite access: {}", p.website_config.get().is_some());
-
-			let quotas = p.quotas.get();
-			if quotas.max_size.is_some() || quotas.max_objects.is_some() {
-				println!("\nQuotas:");
-				if let Some(ms) = quotas.max_size {
-					let ms = bytesize::ByteSize::b(ms);
-					println!(
-						" maximum size: {} ({})",
-						ms.to_string_as(true),
-						ms.to_string_as(false)
-					);
-				}
-				if let Some(mo) = quotas.max_objects {
-					println!(" maximum number of objects: {}", mo);
-				}
-			}
+			println!("Website access: {}", p.website_config.get().is_some());

 			println!("\nGlobal aliases:");
 			for (alias, _, active) in p.aliases.items().iter() {
@@ -240,56 +194,3 @@ pub fn find_matching_node(
 		Ok(candidates[0])
 	}
 }
-
-pub fn print_worker_info(wi: HashMap<usize, WorkerInfo>, wlo: WorkerListOpt) {
-	let mut wi = wi.into_iter().collect::<Vec<_>>();
-	wi.sort_by_key(|(tid, info)| {
-		(
-			match info.state {
-				WorkerState::Busy | WorkerState::Throttled(_) => 0,
-				WorkerState::Idle => 1,
-				WorkerState::Done => 2,
-			},
-			*tid,
-		)
-	});
-
-	let mut table = vec![];
-	for (tid, info) in wi.iter() {
-		if wlo.busy && !matches!(info.state, WorkerState::Busy | WorkerState::Throttled(_)) {
-			continue;
-		}
-		if wlo.errors && info.errors == 0 {
-			continue;
-		}
-
-		table.push(format!("{}\t{}\t{}", tid, info.state, info.name));
-		if let Some(i) = &info.info {
-			table.push(format!("\t\t  {}", i));
-		}
-		let tf = timeago::Formatter::new();
-		let (err_ago, err_msg) = info
-			.last_error
-			.as_ref()
-			.map(|(m, t)| {
-				(
-					tf.convert(Duration::from_millis(now_msec() - t)),
-					m.as_str(),
-				)
-			})
-			.unwrap_or(("(?) ago".into(), "(?)"));
-		if info.consecutive_errors > 0 {
-			table.push(format!(
-				"\t\t  {} consecutive errors ({} total), last {}",
-				info.consecutive_errors, info.errors, err_ago,
-			));
-			table.push(format!("\t\t  {}", err_msg));
-		} else if info.errors > 0 {
-			table.push(format!("\t\t  ({} errors, last {})", info.errors, err_ago,));
-			if wlo.errors {
-				table.push(format!("\t\t  {}", err_msg));
-			}
-		}
-	}
-	format_table(table);
-}
@@ -62,17 +62,17 @@ async fn main() {
 	pretty_env_logger::init();
 	sodiumoxide::init().expect("Unable to init sodiumoxide");

-	// Abort on panic (same behavior as in Go)
-	std::panic::set_hook(Box::new(|panic_info| {
-		error!("{}", panic_info.to_string());
-		std::process::abort();
-	}));
-
 	let opt = Opt::from_args();
+
 	let res = match opt.cmd {
-		Command::Server => server::run_server(opt.config_file).await,
-		Command::OfflineRepair(repair_opt) => {
-			repair::offline::offline_repair(opt.config_file, repair_opt).await
+		Command::Server => {
+			// Abort on panic (same behavior as in Go)
+			std::panic::set_hook(Box::new(|panic_info| {
+				error!("{}", panic_info.to_string());
+				std::process::abort();
+			}));
+
+			server::run_server(opt.config_file).await
 		}
 		Command::Node(NodeOperation::NodeId(node_id_opt)) => {
 			node_id_command(opt.config_file, node_id_opt.quiet)
@@ -0,0 +1,149 @@
+use std::sync::Arc;
+
+use tokio::sync::watch;
+
+use garage_model::garage::Garage;
+use garage_model::s3::block_ref_table::*;
+use garage_model::s3::object_table::*;
+use garage_model::s3::version_table::*;
+use garage_table::*;
+use garage_util::error::Error;
+
+use crate::*;
+
+pub struct Repair {
+	pub garage: Arc<Garage>,
+}
+
+impl Repair {
+	pub async fn repair_worker(&self, opt: RepairOpt, must_exit: watch::Receiver<bool>) {
+		if let Err(e) = self.repair_worker_aux(opt, must_exit).await {
+			warn!("Repair worker failed with error: {}", e);
+		}
+	}
+
+	async fn repair_worker_aux(
+		&self,
+		opt: RepairOpt,
+		must_exit: watch::Receiver<bool>,
+	) -> Result<(), Error> {
+		match opt.what {
+			RepairWhat::Tables => {
+				info!("Launching a full sync of tables");
+				self.garage.bucket_table.syncer.add_full_sync();
+				self.garage.object_table.syncer.add_full_sync();
+				self.garage.version_table.syncer.add_full_sync();
+				self.garage.block_ref_table.syncer.add_full_sync();
+				self.garage.key_table.syncer.add_full_sync();
+			}
+			RepairWhat::Versions => {
+				info!("Repairing the versions table");
+				self.repair_versions(&must_exit).await?;
+			}
+			RepairWhat::BlockRefs => {
+				info!("Repairing the block refs table");
+				self.repair_block_ref(&must_exit).await?;
+			}
+			RepairWhat::Blocks => {
+				info!("Repairing the stored blocks");
+				self.garage
+					.block_manager
+					.repair_data_store(&must_exit)
+					.await?;
+			}
+			RepairWhat::Scrub { tranquility } => {
+				info!("Verifying integrity of stored blocks");
+				self.garage
+					.block_manager
+					.scrub_data_store(&must_exit, tranquility)
+					.await?;
+			}
+		}
+		Ok(())
+	}
+
+	async fn repair_versions(&self, must_exit: &watch::Receiver<bool>) -> Result<(), Error> {
+		let mut pos = vec![];
+
+		while let Some((item_key, item_bytes)) =
+			self.garage.version_table.data.store.get_gt(&pos)?
+		{
+			pos = item_key.to_vec();
+
+			let version = rmp_serde::decode::from_read_ref::<_, Version>(item_bytes.as_ref())?;
+			if version.deleted.get() {
+				continue;
+			}
+			let object = self
+				.garage
+				.object_table
+				.get(&version.bucket_id, &version.key)
+				.await?;
+			let version_exists = match object {
+				Some(o) => o
+					.versions()
+					.iter()
+					.any(|x| x.uuid == version.uuid && x.state != ObjectVersionState::Aborted),
+				None => false,
+			};
+			if !version_exists {
+				info!("Repair versions: marking version as deleted: {:?}", version);
+				self.garage
+					.version_table
+					.insert(&Version::new(
+						version.uuid,
+						version.bucket_id,
+						version.key,
+						true,
+					))
+					.await?;
+			}
+
+			if *must_exit.borrow() {
+				break;
+			}
+		}
+		Ok(())
+	}
+
+	async fn repair_block_ref(&self, must_exit: &watch::Receiver<bool>) -> Result<(), Error> {
+		let mut pos = vec![];
+
+		while let Some((item_key, item_bytes)) =
+			self.garage.block_ref_table.data.store.get_gt(&pos)?
+		{
+			pos = item_key.to_vec();
+
+			let block_ref = rmp_serde::decode::from_read_ref::<_, BlockRef>(item_bytes.as_ref())?;
+			if block_ref.deleted.get() {
+				continue;
+			}
+			let version = self
+				.garage
+				.version_table
+				.get(&block_ref.version, &EmptyKey)
+				.await?;
+			// The version might not exist if it has been GC'ed
+			let ref_exists = version.map(|v| !v.deleted.get()).unwrap_or(false);
+			if !ref_exists {
+				info!(
+					"Repair block ref: marking block_ref as deleted: {:?}",
+					block_ref
+				);
+				self.garage
+					.block_ref_table
+					.insert(&BlockRef {
+						block: block_ref.block,
+						version: block_ref.version,
+						deleted: true.into(),
+					})
+					.await?;
+			}
+
+			if *must_exit.borrow() {
+				break;
+			}
+		}
+		Ok(())
+	}
+}
@@ -1,2 +0,0 @@
-pub mod offline;
-pub mod online;
@@ -1,55 +0,0 @@
-use std::path::PathBuf;
-
-use tokio::sync::watch;
-
-use garage_util::background::*;
-use garage_util::config::*;
-use garage_util::error::*;
-
-use garage_model::garage::Garage;
-
-use crate::cli::structs::*;
-
-pub async fn offline_repair(config_file: PathBuf, opt: OfflineRepairOpt) -> Result<(), Error> {
-	if !opt.yes {
-		return Err(Error::Message(
-			"Please add the --yes flag to launch repair operation".into(),
-		));
-	}
-
-	info!("Loading configuration...");
-	let config = read_config(config_file)?;
-
-	info!("Initializing background runner...");
-	let (done_tx, done_rx) = watch::channel(false);
-	let (background, await_background_done) = BackgroundRunner::new(16, done_rx);
-
-	info!("Initializing Garage main data store...");
-	let garage = Garage::new(config.clone(), background)?;
-
-	info!("Launching repair operation...");
-	match opt.what {
-		#[cfg(feature = "k2v")]
-		OfflineRepairWhat::K2VItemCounters => {
-			garage
-				.k2v
-				.counter_table
-				.offline_recount_all(&garage.k2v.item_table)?;
-		}
-		OfflineRepairWhat::ObjectCounters => {
-			garage
-				.object_counter_table
-				.offline_recount_all(&garage.object_table)?;
-		}
-	}
-
-	info!("Repair operation finished, shutting down Garage internals...");
-	done_tx.send(true).unwrap();
-	drop(garage);
-
-	await_background_done.await?;
-
-	info!("Cleaning up...");
-
-	Ok(())
-}
@@ -1,215 +0,0 @@
-use std::sync::Arc;
-use std::time::Duration;
-
-use async_trait::async_trait;
-use tokio::sync::watch;
-
-use garage_block::repair::ScrubWorkerCommand;
-use garage_model::garage::Garage;
-use garage_model::s3::block_ref_table::*;
-use garage_model::s3::object_table::*;
-use garage_model::s3::version_table::*;
-use garage_table::*;
-use garage_util::background::*;
-use garage_util::error::Error;
-
-use crate::*;
-
-pub async fn launch_online_repair(garage: Arc<Garage>, opt: RepairOpt) {
-	match opt.what {
-		RepairWhat::Tables => {
-			info!("Launching a full sync of tables");
-			garage.bucket_table.syncer.add_full_sync();
-			garage.object_table.syncer.add_full_sync();
-			garage.version_table.syncer.add_full_sync();
-			garage.block_ref_table.syncer.add_full_sync();
-			garage.key_table.syncer.add_full_sync();
-		}
-		RepairWhat::Versions => {
-			info!("Repairing the versions table");
-			garage
-				.background
-				.spawn_worker(RepairVersionsWorker::new(garage.clone()));
-		}
-		RepairWhat::BlockRefs => {
-			info!("Repairing the block refs table");
-			garage
-				.background
-				.spawn_worker(RepairBlockrefsWorker::new(garage.clone()));
-		}
-		RepairWhat::Blocks => {
-			info!("Repairing the stored blocks");
-			garage
-				.background
-				.spawn_worker(garage_block::repair::RepairWorker::new(
-					garage.block_manager.clone(),
-				));
-		}
-		RepairWhat::Scrub { cmd } => {
-			let cmd = match cmd {
-				ScrubCmd::Start => ScrubWorkerCommand::Start,
-				ScrubCmd::Pause => ScrubWorkerCommand::Pause(Duration::from_secs(3600 * 24)),
-				ScrubCmd::Resume => ScrubWorkerCommand::Resume,
-				ScrubCmd::Cancel => ScrubWorkerCommand::Cancel,
-				ScrubCmd::SetTranquility { tranquility } => {
-					ScrubWorkerCommand::SetTranquility(tranquility)
-				}
-			};
-			info!("Sending command to scrub worker: {:?}", cmd);
-			garage.block_manager.send_scrub_command(cmd).await;
-		}
-	}
-}
-
-// ----
-
-struct RepairVersionsWorker {
-	garage: Arc<Garage>,
-	pos: Vec<u8>,
-	counter: usize,
-}
-
-impl RepairVersionsWorker {
-	fn new(garage: Arc<Garage>) -> Self {
-		Self {
-			garage,
-			pos: vec![],
-			counter: 0,
-		}
-	}
-}
-
-#[async_trait]
-impl Worker for RepairVersionsWorker {
-	fn name(&self) -> String {
-		"Version repair worker".into()
-	}
-
-	fn info(&self) -> Option<String> {
-		Some(format!("{} items done", self.counter))
-	}
-
-	async fn work(&mut self, _must_exit: &mut watch::Receiver<bool>) -> Result<WorkerState, Error> {
-		let item_bytes = match self.garage.version_table.data.store.get_gt(&self.pos)? {
-			Some((k, v)) => {
-				self.pos = k;
-				v
-			}
-			None => {
-				info!("repair_versions: finished, done {}", self.counter);
-				return Ok(WorkerState::Done);
-			}
-		};
-
-		self.counter += 1;
-
-		let version = rmp_serde::decode::from_read_ref::<_, Version>(&item_bytes)?;
-		if !version.deleted.get() {
-			let object = self
-				.garage
-				.object_table
-				.get(&version.bucket_id, &version.key)
-				.await?;
-			let version_exists = match object {
-				Some(o) => o
-					.versions()
-					.iter()
-					.any(|x| x.uuid == version.uuid && x.state != ObjectVersionState::Aborted),
-				None => false,
-			};
-			if !version_exists {
-				info!("Repair versions: marking version as deleted: {:?}", version);
-				self.garage
-					.version_table
-					.insert(&Version::new(
-						version.uuid,
-						version.bucket_id,
-						version.key,
-						true,
-					))
-					.await?;
-			}
-		}
-
-		Ok(WorkerState::Busy)
-	}
-
-	async fn wait_for_work(&mut self, _must_exit: &watch::Receiver<bool>) -> WorkerState {
-		unreachable!()
-	}
-}
-
-// ----
-
-struct RepairBlockrefsWorker {
-	garage: Arc<Garage>,
-	pos: Vec<u8>,
-	counter: usize,
-}
-
-impl RepairBlockrefsWorker {
-	fn new(garage: Arc<Garage>) -> Self {
-		Self {
-			garage,
-			pos: vec![],
-			counter: 0,
-		}
-	}
-}
-
-#[async_trait]
-impl Worker for RepairBlockrefsWorker {
-	fn name(&self) -> String {
-		"Block refs repair worker".into()
-	}
-
-	fn info(&self) -> Option<String> {
-		Some(format!("{} items done", self.counter))
-	}
-
-	async fn work(&mut self, _must_exit: &mut watch::Receiver<bool>) -> Result<WorkerState, Error> {
-		let item_bytes = match self.garage.block_ref_table.data.store.get_gt(&self.pos)? {
-			Some((k, v)) => {
-				self.pos = k;
-				v
-			}
-			None => {
-				info!("repair_block_ref: finished, done {}", self.counter);
-				return Ok(WorkerState::Done);
-			}
-		};
-
-		self.counter += 1;
-
-		let block_ref = rmp_serde::decode::from_read_ref::<_, BlockRef>(&item_bytes)?;
-		if !block_ref.deleted.get() {
-			let version = self
-				.garage
-				.version_table
-				.get(&block_ref.version, &EmptyKey)
-				.await?;
-			// The version might not exist if it has been GC'ed
-			let ref_exists = version.map(|v| !v.deleted.get()).unwrap_or(false);
-			if !ref_exists {
-				info!(
-					"Repair block ref: marking block_ref as deleted: {:?}",
-					block_ref
-				);
-				self.garage
-					.block_ref_table
-					.insert(&BlockRef {
-						block: block_ref.block,
-						version: block_ref.version,
-						deleted: true.into(),
-					})
-					.await?;
-			}
-		}
-
-		Ok(WorkerState::Busy)
-	}
-
-	async fn wait_for_work(&mut self, _must_exit: &watch::Receiver<bool>) -> WorkerState {
-		unreachable!()
-	}
-}
@@ -27,14 +27,24 @@ async fn wait_from(mut chan: watch::Receiver<bool>) {

 pub async fn run_server(config_file: PathBuf) -> Result<(), Error> {
 	info!("Loading configuration...");
-	let config = read_config(config_file)?;
+	let config = read_config(config_file).expect("Unable to read config file");
+
+	info!("Opening database...");
+	let mut db_path = config.metadata_dir.clone();
+	db_path.push("db");
+	let db = sled::Config::default()
+		.path(&db_path)
+		.cache_capacity(config.sled_cache_capacity)
+		.flush_every_ms(Some(config.sled_flush_every_ms))
+		.open()
+		.expect("Unable to open sled DB");

 	info!("Initializing background runner...");
 	let watch_cancel = netapp::util::watch_ctrl_c();
 	let (background, await_background_done) = BackgroundRunner::new(16, watch_cancel.clone());

 	info!("Initializing Garage main data store...");
-	let garage = Garage::new(config.clone(), background)?;
+	let garage = Garage::new(config.clone(), db, background);

 	info!("Initialize tracing...");
 	if let Some(export_to) = config.admin.trace_sink {
@@ -44,7 +54,6 @@ pub async fn run_server(config_file: PathBuf) -> Result<(), Error> {
 	info!("Initialize Admin API server and metrics collector...");
 	let admin_server = AdminApiServer::new(garage.clone());

-	info!("Launching internal Garage cluster communications...");
 	let run_system = tokio::spawn(garage.system.clone().run(watch_cancel.clone()));

 	info!("Create admin RPC handler...");
@@ -29,7 +29,8 @@ async fn test_bucket_all() {
 			.unwrap()
 			.iter()
 			.filter(|x| x.name.as_ref().is_some())
-			.any(|x| x.name.as_ref().unwrap() == "hello"));
+			.find(|x| x.name.as_ref().unwrap() == "hello")
+			.is_some());
 	}
 	{
 		// Get its location
@@ -74,12 +75,13 @@ async fn test_bucket_all() {
 	{
 		// Check bucket is deleted with List buckets
 		let r = ctx.client.list_buckets().send().await.unwrap();
-		assert!(!r
+		assert!(r
 			.buckets
 			.as_ref()
 			.unwrap()
 			.iter()
 			.filter(|x| x.name.as_ref().is_some())
-			.any(|x| x.name.as_ref().unwrap() == "hello"));
+			.find(|x| x.name.as_ref().unwrap() == "hello")
+			.is_none());
 	}
 }
@@ -1,5 +1,3 @@
-use std::time::Duration;
-
 use crate::common;

 use assert_json_diff::assert_json_eq;
@@ -88,7 +86,6 @@ async fn test_items_and_indices() {
 		assert_eq!(res_body, content);

 		// ReadIndex -- now there should be some stuff
-		tokio::time::sleep(Duration::from_secs(1)).await;
 		let res = ctx
 			.k2v
 			.request
@@ -157,7 +154,6 @@ async fn test_items_and_indices() {
 		assert_eq!(res_body, content2);

 		// ReadIndex -- now there should be some stuff
-		tokio::time::sleep(Duration::from_secs(1)).await;
 		let res = ctx
 			.k2v
 			.request
@@ -226,7 +222,6 @@ async fn test_items_and_indices() {
 		);

 		// ReadIndex -- now there should be some stuff
-		tokio::time::sleep(Duration::from_secs(1)).await;
 		let res = ctx
 			.k2v
 			.request
@@ -295,7 +290,6 @@ async fn test_items_and_indices() {
 		assert_eq!(res.status(), 204);

 		// ReadIndex -- now there should be some stuff
-		tokio::time::sleep(Duration::from_secs(1)).await;
 		let res = ctx
 			.k2v
 			.request
@@ -1,12 +1,7 @@
 [package]
 name = "k2v-client"
-version = "0.0.1"
-authors = ["Trinity Pointard <trinity.pointard@gmail.com>", "Alex Auvolat <alex@adnab.me>"]
+version = "0.1.0"
 edition = "2018"
-license = "AGPL-3.0"
-description = "Client library for the Garage K2V protocol"
-repository = "https://git.deuxfleurs.fr/Deuxfleurs/garage"
-readme = "../../README.md"

 [dependencies]
 base64 = "0.13.0"
@@ -22,7 +17,7 @@ tokio = "1.17.0"

 # cli deps
 clap = { version = "3.1.18", optional = true, features = ["derive", "env"] }
-garage_util = { version = "0.7.0", path = "../util", optional = true }
+garage_util = { path = "../util", optional = true }


 [features]
@@ -1,5 +1,3 @@
-use std::time::Duration;
-
 use k2v_client::*;

 use garage_util::formater::format_table;
@@ -57,22 +55,6 @@ enum Command {
 		#[clap(flatten)]
 		output_kind: ReadOutputKind,
 	},
-	/// Watch changes on  a single value
-	Poll {
-		/// Partition key to delete from
-		partition_key: String,
-		/// Sort key to delete from
-		sort_key: String,
-		/// Causality information
-		#[clap(short, long)]
-		causality: String,
-		/// Timeout, in seconds
-		#[clap(short, long)]
-		timeout: Option<u64>,
-		/// Output formating
-		#[clap(flatten)]
-		output_kind: ReadOutputKind,
-	},
 	/// Delete a single value
 	Delete {
 		/// Partition key to delete from
@@ -342,23 +324,6 @@ async fn main() -> Result<(), Error> {
 			let res = client.read_item(&partition_key, &sort_key).await?;
 			output_kind.display_output(res);
 		}
-		Command::Poll {
-			partition_key,
-			sort_key,
-			causality,
-			timeout,
-			output_kind,
-		} => {
-			let timeout = timeout.map(Duration::from_secs);
-			let res_opt = client
-				.poll_item(&partition_key, &sort_key, causality.into(), timeout)
-				.await?;
-			if let Some(res) = res_opt {
-				output_kind.display_output(res);
-			} else {
-				println!("Delay expired and value didn't change.");
-			}
-		}
 		Command::ReadIndex {
 			output_kind,
 			filter,
@@ -122,14 +122,14 @@ impl K2vClient {

 		let res = self.dispatch(req, Some(timeout + DEFAULT_TIMEOUT)).await?;

-		if res.status == StatusCode::NOT_MODIFIED {
-			return Ok(None);
-		}
-
 		let causality = res
 			.causality_token
 			.ok_or_else(|| Error::InvalidResponse("missing causality token".into()))?;

+		if res.status == StatusCode::NOT_MODIFIED {
+			return Ok(None);
+		}
+
 		if res.status == StatusCode::NO_CONTENT {
 			return Ok(Some(CausalValue {
 				causality,
@@ -1,6 +1,6 @@
 [package]
 name = "garage_model"
-version = "0.7.0"
+version = "0.7.3"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -14,11 +14,10 @@ path = "lib.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-garage_db = { version = "0.8.0", path = "../db" }
-garage_rpc = { version = "0.7.0", path = "../rpc" }
-garage_table = { version = "0.7.0", path = "../table" }
-garage_block = { version = "0.7.0", path = "../block" }
-garage_util = { version = "0.7.0", path = "../util" }
+garage_rpc = { version = "0.7.3", path = "../rpc" }
+garage_table = { version = "0.7.3", path = "../table" }
+garage_block = { version = "0.7.3", path = "../block" }
+garage_util = { version = "0.7.3", path = "../util" }
 garage_model_050 = { package = "garage_model", version = "0.5.1" }

 async-trait = "0.1.7"
@@ -31,6 +30,8 @@ tracing = "0.1.30"
 rand = "0.8"
 zstd = { version = "0.9", default-features = false }

+sled = "0.34"
+
 rmp-serde = "0.15"
 serde = { version = "1.0", default-features = false, features = ["derive", "rc"] }
 serde_bytes = "0.11"
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};

-use garage_table::crdt::*;
+use garage_table::crdt::Crdt;
 use garage_table::*;
 use garage_util::data::*;
 use garage_util::time::*;
@@ -44,9 +44,6 @@ pub struct BucketParams {
 	pub website_config: crdt::Lww<Option<WebsiteConfig>>,
 	/// CORS rules
 	pub cors_config: crdt::Lww<Option<Vec<CorsRule>>>,
-	/// Bucket quotas
-	#[serde(default)]
-	pub quotas: crdt::Lww<BucketQuotas>,
 }

 #[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)]
@@ -65,18 +62,6 @@ pub struct CorsRule {
 	pub expose_headers: Vec<String>,
 }

-#[derive(Default, PartialEq, Eq, PartialOrd, Ord, Clone, Debug, Serialize, Deserialize)]
-pub struct BucketQuotas {
-	/// Maximum size in bytes (bucket size = sum of sizes of objects in the bucket)
-	pub max_size: Option<u64>,
-	/// Maximum number of non-deleted objects in the bucket
-	pub max_objects: Option<u64>,
-}
-
-impl AutoCrdt for BucketQuotas {
-	const WARN_IF_DIFFERENT: bool = true;
-}
-
 impl BucketParams {
 	/// Create an empty BucketParams with no authorized keys and no website accesss
 	pub fn new() -> Self {
@@ -87,7 +72,6 @@ impl BucketParams {
 			local_aliases: crdt::LwwMap::new(),
 			website_config: crdt::Lww::new(None),
 			cors_config: crdt::Lww::new(None),
-			quotas: crdt::Lww::new(BucketQuotas::default()),
 		}
 	}
 }
@@ -102,7 +86,6 @@ impl Crdt for BucketParams {

 		self.website_config.merge(&o.website_config);
 		self.cors_config.merge(&o.cors_config);
-		self.quotas.merge(&o.quotas);
 	}
 }

@@ -2,11 +2,8 @@ use std::sync::Arc;

 use netapp::NetworkKey;

-use garage_db as db;
-
 use garage_util::background::*;
 use garage_util::config::*;
-use garage_util::error::Error;

 use garage_rpc::system::System;

@@ -23,11 +20,12 @@ use crate::s3::version_table::*;
 use crate::bucket_alias_table::*;
 use crate::bucket_table::*;
 use crate::helper;
-use crate::index_counter::*;
 use crate::key_table::*;

 #[cfg(feature = "k2v")]
-use crate::k2v::{item_table::*, poll::*, rpc::*};
+use crate::index_counter::*;
+#[cfg(feature = "k2v")]
+use crate::k2v::{counter_table::*, item_table::*, poll::*, rpc::*};

 /// An entire Garage full of data
 pub struct Garage {
@@ -35,7 +33,7 @@ pub struct Garage {
 	pub config: Config,

 	/// The local database
-	pub db: db::Db,
+	pub db: sled::Db,
 	/// A background job runner
 	pub background: Arc<BackgroundRunner>,
 	/// The membership manager
@@ -52,8 +50,6 @@ pub struct Garage {

 	/// Table containing S3 objects
 	pub object_table: Arc<Table<ObjectTable, TableShardedReplication>>,
-	/// Counting table containing object counters
-	pub object_counter_table: Arc<IndexCounter<Object>>,
 	/// Table containing S3 object versions
 	pub version_table: Arc<Table<VersionTable, TableShardedReplication>>,
 	/// Table containing S3 block references (not blocks themselves)
@@ -68,57 +64,14 @@ pub struct GarageK2V {
 	/// Table containing K2V items
 	pub item_table: Arc<Table<K2VItemTable, TableShardedReplication>>,
 	/// Indexing table containing K2V item counters
-	pub counter_table: Arc<IndexCounter<K2VItem>>,
+	pub counter_table: Arc<IndexCounter<K2VCounterTable>>,
 	/// K2V RPC handler
 	pub rpc: Arc<K2VRpcHandler>,
 }

 impl Garage {
 	/// Create and run garage
-	pub fn new(config: Config, background: Arc<BackgroundRunner>) -> Result<Arc<Self>, Error> {
-		info!("Opening database...");
-		let mut db_path = config.metadata_dir.clone();
-		std::fs::create_dir_all(&db_path).expect("Unable to create Garage meta data directory");
-		let db = match config.db_engine.as_str() {
-			"sled" => {
-				db_path.push("db");
-				info!("Opening Sled database at: {}", db_path.display());
-				let db = db::sled_adapter::sled::Config::default()
-					.path(&db_path)
-					.cache_capacity(config.sled_cache_capacity)
-					.flush_every_ms(Some(config.sled_flush_every_ms))
-					.open()
-					.expect("Unable to open sled DB");
-				db::sled_adapter::SledDb::init(db)
-			}
-			"sqlite" | "sqlite3" | "rusqlite" => {
-				db_path.push("db.sqlite");
-				info!("Opening Sqlite database at: {}", db_path.display());
-				let db = db::sqlite_adapter::rusqlite::Connection::open(db_path)
-					.expect("Unable to open sqlite DB");
-				db::sqlite_adapter::SqliteDb::init(db)
-			}
-			"lmdb" | "heed" => {
-				db_path.push("db.lmdb");
-				info!("Opening LMDB database at: {}", db_path.display());
-				std::fs::create_dir_all(&db_path).expect("Unable to create LMDB data directory");
-				let map_size = garage_db::lmdb_adapter::recommended_map_size();
-
-				let db = db::lmdb_adapter::heed::EnvOpenOptions::new()
-					.max_dbs(100)
-					.map_size(map_size)
-					.open(&db_path)
-					.expect("Unable to open LMDB DB");
-				db::lmdb_adapter::LmdbDb::init(db)
-			}
-			e => {
-				return Err(Error::Message(format!(
-					"Unsupported DB engine: {} (options: sled, sqlite, lmdb)",
-					e
-				)));
-			}
-		};
-
+	pub fn new(config: Config, db: sled::Db, background: Arc<BackgroundRunner>) -> Arc<Self> {
 		let network_key = NetworkKey::from_slice(
 			&hex::decode(&config.rpc_secret).expect("Invalid RPC secret key")[..],
 		)
@@ -200,16 +153,12 @@ impl Garage {
 			&db,
 		);

-		info!("Initialize object counter table...");
-		let object_counter_table = IndexCounter::new(system.clone(), meta_rep_param.clone(), &db);
-
 		info!("Initialize object_table...");
 		#[allow(clippy::redundant_clone)]
 		let object_table = Table::new(
 			ObjectTable {
 				background: background.clone(),
 				version_table: version_table.clone(),
-				object_counter_table: object_counter_table.clone(),
 			},
 			meta_rep_param.clone(),
 			system.clone(),
@@ -220,8 +169,9 @@ impl Garage {
 		#[cfg(feature = "k2v")]
 		let k2v = GarageK2V::new(system.clone(), &db, meta_rep_param);

-		// -- done --
-		Ok(Arc::new(Self {
+		info!("Initialize Garage...");
+
+		Arc::new(Self {
 			config,
 			db,
 			background,
@@ -231,12 +181,11 @@ impl Garage {
 			bucket_alias_table,
 			key_table,
 			object_table,
-			object_counter_table,
 			version_table,
 			block_ref_table,
 			#[cfg(feature = "k2v")]
 			k2v,
-		}))
+		})
 	}

 	pub fn bucket_helper(&self) -> helper::bucket::BucketHelper {
@@ -250,7 +199,7 @@ impl Garage {

 #[cfg(feature = "k2v")]
 impl GarageK2V {
-	fn new(system: Arc<System>, db: &db::Db, meta_rep_param: TableShardedReplication) -> Self {
+	fn new(system: Arc<System>, db: &sled::Db, meta_rep_param: TableShardedReplication) -> Self {
 		info!("Initialize K2V counter table...");
 		let counter_table = IndexCounter::new(system.clone(), meta_rep_param.clone(), db);
 		info!("Initialize K2V subscription manager...");
@@ -1,49 +1,39 @@
-use core::ops::Bound;
 use std::collections::{hash_map, BTreeMap, HashMap};
 use std::marker::PhantomData;
 use std::sync::Arc;
+use std::time::Duration;

-use async_trait::async_trait;
 use serde::{Deserialize, Serialize};
 use tokio::sync::{mpsc, watch};

-use garage_db as db;
-
 use garage_rpc::ring::Ring;
 use garage_rpc::system::System;
-use garage_util::background::*;
 use garage_util::data::*;
 use garage_util::error::*;
-use garage_util::time::*;

 use garage_table::crdt::*;
-use garage_table::replication::*;
+use garage_table::replication::TableShardedReplication;
 use garage_table::*;

-pub trait CountedItem: Clone + PartialEq + Send + Sync + 'static {
-	const COUNTER_TABLE_NAME: &'static str;
-
-	type CP: PartitionKey + Clone + PartialEq + Serialize + for<'de> Deserialize<'de> + Send + Sync;
-	type CS: SortKey + Clone + PartialEq + Serialize + for<'de> Deserialize<'de> + Send + Sync;
-
-	fn counter_partition_key(&self) -> &Self::CP;
-	fn counter_sort_key(&self) -> &Self::CS;
-	fn counts(&self) -> Vec<(&'static str, i64)>;
+pub trait CounterSchema: Clone + PartialEq + Send + Sync + 'static {
+	const NAME: &'static str;
+	type P: PartitionKey + Clone + PartialEq + Serialize + for<'de> Deserialize<'de> + Send + Sync;
+	type S: SortKey + Clone + PartialEq + Serialize + for<'de> Deserialize<'de> + Send + Sync;
 }

 /// A counter entry in the global table
-#[derive(Clone, PartialEq, Debug, Serialize, Deserialize)]
-pub struct CounterEntry<T: CountedItem> {
-	pub pk: T::CP,
-	pub sk: T::CS,
+#[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
+pub struct CounterEntry<T: CounterSchema> {
+	pub pk: T::P,
+	pub sk: T::S,
 	pub values: BTreeMap<String, CounterValue>,
 }

-impl<T: CountedItem> Entry<T::CP, T::CS> for CounterEntry<T> {
-	fn partition_key(&self) -> &T::CP {
+impl<T: CounterSchema> Entry<T::P, T::S> for CounterEntry<T> {
+	fn partition_key(&self) -> &T::P {
 		&self.pk
 	}
-	fn sort_key(&self) -> &T::CS {
+	fn sort_key(&self) -> &T::S {
 		&self.sk
 	}
 	fn is_tombstone(&self) -> bool {
@@ -53,7 +43,7 @@ impl<T: CountedItem> Entry<T::CP, T::CS> for CounterEntry<T> {
 	}
 }

-impl<T: CountedItem> CounterEntry<T> {
+impl<T: CounterSchema> CounterEntry<T> {
 	pub fn filtered_values(&self, ring: &Ring) -> HashMap<String, i64> {
 		let nodes = &ring.layout.node_id_vec[..];
 		self.filtered_values_with_nodes(nodes)
@@ -86,7 +76,7 @@ pub struct CounterValue {
 	pub node_values: BTreeMap<Uuid, (u64, i64)>,
 }

-impl<T: CountedItem> Crdt for CounterEntry<T> {
+impl<T: CounterSchema> Crdt for CounterEntry<T> {
 	fn merge(&mut self, other: &Self) {
 		for (name, e2) in other.values.iter() {
 			if let Some(e) = self.values.get_mut(name) {
@@ -112,18 +102,22 @@ impl Crdt for CounterValue {
 	}
 }

-pub struct CounterTable<T: CountedItem> {
+pub struct CounterTable<T: CounterSchema> {
 	_phantom_t: PhantomData<T>,
 }

-impl<T: CountedItem> TableSchema for CounterTable<T> {
-	const TABLE_NAME: &'static str = T::COUNTER_TABLE_NAME;
+impl<T: CounterSchema> TableSchema for CounterTable<T> {
+	const TABLE_NAME: &'static str = T::NAME;

-	type P = T::CP;
-	type S = T::CS;
+	type P = T::P;
+	type S = T::S;
 	type E = CounterEntry<T>;
 	type Filter = (DeletedFilter, Vec<Uuid>);

+	fn updated(&self, _old: Option<&Self::E>, _new: Option<&Self::E>) {
+		// nothing for now
+	}
+
 	fn matches_filter(entry: &Self::E, filter: &Self::Filter) -> bool {
 		if filter.0 == DeletedFilter::Any {
 			return true;
@@ -139,18 +133,18 @@ impl<T: CountedItem> TableSchema for CounterTable<T> {

 // ----

-pub struct IndexCounter<T: CountedItem> {
+pub struct IndexCounter<T: CounterSchema> {
 	this_node: Uuid,
-	local_counter: db::Tree,
-	propagate_tx: mpsc::UnboundedSender<(T::CP, T::CS, LocalCounterEntry<T>)>,
+	local_counter: sled::Tree,
+	propagate_tx: mpsc::UnboundedSender<(T::P, T::S, LocalCounterEntry)>,
 	pub table: Arc<Table<CounterTable<T>, TableShardedReplication>>,
 }

-impl<T: CountedItem> IndexCounter<T> {
+impl<T: CounterSchema> IndexCounter<T> {
 	pub fn new(
 		system: Arc<System>,
 		replication: TableShardedReplication,
-		db: &db::Db,
+		db: &sled::Db,
 	) -> Arc<Self> {
 		let background = system.background.clone();

@@ -159,7 +153,7 @@ impl<T: CountedItem> IndexCounter<T> {
 		let this = Arc::new(Self {
 			this_node: system.id,
 			local_counter: db
-				.open_tree(format!("local_counter_v2:{}", T::COUNTER_TABLE_NAME))
+				.open_tree(format!("local_counter:{}", T::NAME))
 				.expect("Unable to open local counter tree"),
 			propagate_tx,
 			table: Table::new(
@@ -172,67 +166,44 @@ impl<T: CountedItem> IndexCounter<T> {
 			),
 		});

-		background.spawn_worker(IndexPropagatorWorker {
-			index_counter: this.clone(),
-			propagate_rx,
-			buf: HashMap::new(),
-			errors: 0,
-		});
-
+		let this2 = this.clone();
+		background.spawn_worker(
+			format!("{} index counter propagator", T::NAME),
+			move |must_exit| this2.clone().propagate_loop(propagate_rx, must_exit),
+		);
 		this
 	}

-	pub fn count(
-		&self,
-		tx: &mut db::Transaction,
-		old: Option<&T>,
-		new: Option<&T>,
-	) -> db::TxResult<(), Error> {
-		let pk = old
-			.map(|e| e.counter_partition_key())
-			.unwrap_or_else(|| new.unwrap().counter_partition_key());
-		let sk = old
-			.map(|e| e.counter_sort_key())
-			.unwrap_or_else(|| new.unwrap().counter_sort_key());
-
-		// calculate counter differences
-		let mut counts = HashMap::new();
-		for (k, v) in old.map(|x| x.counts()).unwrap_or_default() {
-			*counts.entry(k).or_insert(0) -= v;
-		}
-		for (k, v) in new.map(|x| x.counts()).unwrap_or_default() {
-			*counts.entry(k).or_insert(0) += v;
-		}
-
-		// update local counter table
+	pub fn count(&self, pk: &T::P, sk: &T::S, counts: &[(&str, i64)]) -> Result<(), Error> {
 		let tree_key = self.table.data.tree_key(pk, sk);

-		let mut entry = match tx.get(&self.local_counter, &tree_key[..])? {
-			Some(old_bytes) => {
-				rmp_serde::decode::from_read_ref::<_, LocalCounterEntry<T>>(&old_bytes)
-					.map_err(Error::RmpDecode)
-					.map_err(db::TxError::Abort)?
+		let new_entry = self.local_counter.transaction(|tx| {
+			let mut entry = match tx.get(&tree_key[..])? {
+				Some(old_bytes) => {
+					rmp_serde::decode::from_read_ref::<_, LocalCounterEntry>(&old_bytes)
+						.map_err(Error::RmpDecode)
+						.map_err(sled::transaction::ConflictableTransactionError::Abort)?
+				}
+				None => LocalCounterEntry {
+					values: BTreeMap::new(),
+				},
+			};
+
+			for (s, inc) in counts.iter() {
+				let mut ent = entry.values.entry(s.to_string()).or_insert((0, 0));
+				ent.0 += 1;
+				ent.1 += *inc;
 			}
-			None => LocalCounterEntry {
-				pk: pk.clone(),
-				sk: sk.clone(),
-				values: BTreeMap::new(),
-			},
-		};

-		let now = now_msec();
-		for (s, inc) in counts.iter() {
-			let mut ent = entry.values.entry(s.to_string()).or_insert((0, 0));
-			ent.0 = std::cmp::max(ent.0 + 1, now);
-			ent.1 += *inc;
-		}
+			let new_entry_bytes = rmp_to_vec_all_named(&entry)
+				.map_err(Error::RmpEncode)
+				.map_err(sled::transaction::ConflictableTransactionError::Abort)?;
+			tx.insert(&tree_key[..], new_entry_bytes)?;

-		let new_entry_bytes = rmp_to_vec_all_named(&entry)
-			.map_err(Error::RmpEncode)
-			.map_err(db::TxError::Abort)?;
-		tx.insert(&self.local_counter, &tree_key[..], new_entry_bytes)?;
+			Ok(entry)
+		})?;

-		if let Err(e) = self.propagate_tx.send((pk.clone(), sk.clone(), entry)) {
+		if let Err(e) = self.propagate_tx.send((pk.clone(), sk.clone(), new_entry)) {
 			error!(
 				"Could not propagate updated counter values, failed to send to channel: {}",
 				e
@@ -242,246 +213,84 @@ impl<T: CountedItem> IndexCounter<T> {
 		Ok(())
 	}

-	pub fn offline_recount_all<TS, TR>(
-		&self,
-		counted_table: &Arc<Table<TS, TR>>,
-	) -> Result<(), Error>
-	where
-		TS: TableSchema<E = T>,
-		TR: TableReplication,
-	{
-		let save_counter_entry = |entry: CounterEntry<T>| -> Result<(), Error> {
-			let entry_k = self
-				.table
-				.data
-				.tree_key(entry.partition_key(), entry.sort_key());
-			self.table
-				.data
-				.update_entry_with(&entry_k, |ent| match ent {
-					Some(mut ent) => {
-						ent.merge(&entry);
-						ent
-					}
-					None => entry.clone(),
-				})?;
-			Ok(())
-		};
-
-		// 1. Set all old local counters to zero
-		let now = now_msec();
-		let mut next_start: Option<Vec<u8>> = None;
-		loop {
-			let low_bound = match next_start.take() {
-				Some(v) => Bound::Excluded(v),
-				None => Bound::Unbounded,
-			};
-			let mut batch = vec![];
-			for item in self.local_counter.range((low_bound, Bound::Unbounded))? {
-				batch.push(item?);
-				if batch.len() > 1000 {
-					break;
-				}
-			}
-
-			if batch.is_empty() {
-				break;
-			}
-
-			info!("zeroing old counters... ({})", hex::encode(&batch[0].0));
-			for (local_counter_k, local_counter) in batch {
-				let mut local_counter =
-					rmp_serde::decode::from_read_ref::<_, LocalCounterEntry<T>>(&local_counter)?;
-
-				for (_, tv) in local_counter.values.iter_mut() {
-					tv.0 = std::cmp::max(tv.0 + 1, now);
-					tv.1 = 0;
-				}
-
-				let local_counter_bytes = rmp_to_vec_all_named(&local_counter)?;
-				self.local_counter
-					.insert(&local_counter_k, &local_counter_bytes)?;
-
-				let counter_entry = local_counter.into_counter_entry(self.this_node);
-				save_counter_entry(counter_entry)?;
-
-				next_start = Some(local_counter_k);
-			}
-		}
-
-		// 2. Recount all table entries
-		let now = now_msec();
-		let mut next_start: Option<Vec<u8>> = None;
-		loop {
-			let low_bound = match next_start.take() {
-				Some(v) => Bound::Excluded(v),
-				None => Bound::Unbounded,
-			};
-			let mut batch = vec![];
-			for item in counted_table
-				.data
-				.store
-				.range((low_bound, Bound::Unbounded))?
-			{
-				batch.push(item?);
-				if batch.len() > 1000 {
-					break;
-				}
-			}
-
-			if batch.is_empty() {
-				break;
-			}
-
-			info!("counting entries... ({})", hex::encode(&batch[0].0));
-			for (counted_entry_k, counted_entry) in batch {
-				let counted_entry = counted_table.data.decode_entry(&counted_entry)?;
-
-				let pk = counted_entry.counter_partition_key();
-				let sk = counted_entry.counter_sort_key();
-				let counts = counted_entry.counts();
-
-				let local_counter_key = self.table.data.tree_key(pk, sk);
-				let mut local_counter = match self.local_counter.get(&local_counter_key)? {
-					Some(old_bytes) => {
-						let ent = rmp_serde::decode::from_read_ref::<_, LocalCounterEntry<T>>(
-							&old_bytes,
-						)?;
-						assert!(ent.pk == *pk);
-						assert!(ent.sk == *sk);
-						ent
-					}
-					None => LocalCounterEntry {
-						pk: pk.clone(),
-						sk: sk.clone(),
-						values: BTreeMap::new(),
-					},
-				};
-				for (s, v) in counts.iter() {
-					let mut tv = local_counter.values.entry(s.to_string()).or_insert((0, 0));
-					tv.0 = std::cmp::max(tv.0 + 1, now);
-					tv.1 += v;
-				}
-
-				let local_counter_bytes = rmp_to_vec_all_named(&local_counter)?;
-				self.local_counter
-					.insert(&local_counter_key, local_counter_bytes)?;
-
-				let counter_entry = local_counter.into_counter_entry(self.this_node);
-				save_counter_entry(counter_entry)?;
-
-				next_start = Some(counted_entry_k);
-			}
-		}
-
-		// Done
-		Ok(())
-	}
-}
-
-struct IndexPropagatorWorker<T: CountedItem> {
-	index_counter: Arc<IndexCounter<T>>,
-	propagate_rx: mpsc::UnboundedReceiver<(T::CP, T::CS, LocalCounterEntry<T>)>,
-
-	buf: HashMap<Vec<u8>, CounterEntry<T>>,
-	errors: usize,
-}
-
-impl<T: CountedItem> IndexPropagatorWorker<T> {
-	fn add_ent(&mut self, pk: T::CP, sk: T::CS, counters: LocalCounterEntry<T>) {
-		let tree_key = self.index_counter.table.data.tree_key(&pk, &sk);
-		let dist_entry = counters.into_counter_entry(self.index_counter.this_node);
-		match self.buf.entry(tree_key) {
-			hash_map::Entry::Vacant(e) => {
-				e.insert(dist_entry);
-			}
-			hash_map::Entry::Occupied(mut e) => {
-				e.get_mut().merge(&dist_entry);
-			}
-		}
-	}
-}
-
-#[async_trait]
-impl<T: CountedItem> Worker for IndexPropagatorWorker<T> {
-	fn name(&self) -> String {
-		format!("{} index counter propagator", T::COUNTER_TABLE_NAME)
-	}
-
-	fn info(&self) -> Option<String> {
-		if !self.buf.is_empty() {
-			Some(format!("{} items in queue", self.buf.len()))
-		} else {
-			None
-		}
-	}
-
-	async fn work(&mut self, must_exit: &mut watch::Receiver<bool>) -> Result<WorkerState, Error> {
+	async fn propagate_loop(
+		self: Arc<Self>,
+		mut propagate_rx: mpsc::UnboundedReceiver<(T::P, T::S, LocalCounterEntry)>,
+		must_exit: watch::Receiver<bool>,
+	) {
 		// This loop batches updates to counters to be sent all at once.
 		// They are sent once the propagate_rx channel has been emptied (or is closed).
-		let closed = loop {
-			match self.propagate_rx.try_recv() {
-				Ok((pk, sk, counters)) => {
-					self.add_ent(pk, sk, counters);
-				}
-				Err(mpsc::error::TryRecvError::Empty) => break false,
-				Err(mpsc::error::TryRecvError::Disconnected) => break true,
-			}
-		};
+		let mut buf = HashMap::new();
+		let mut errors = 0;

-		if !self.buf.is_empty() {
-			let entries_k = self.buf.keys().take(100).cloned().collect::<Vec<_>>();
-			let entries = entries_k.iter().map(|k| self.buf.get(k).unwrap());
-			if let Err(e) = self.index_counter.table.insert_many(entries).await {
-				self.errors += 1;
-				if self.errors >= 2 && *must_exit.borrow() {
-					error!("({}) Could not propagate {} counter values: {}, these counters will not be updated correctly.", T::COUNTER_TABLE_NAME, self.buf.len(), e);
-					return Ok(WorkerState::Done);
+		loop {
+			let (ent, closed) = match propagate_rx.try_recv() {
+				Ok(ent) => (Some(ent), false),
+				Err(mpsc::error::TryRecvError::Empty) if buf.is_empty() => {
+					match propagate_rx.recv().await {
+						Some(ent) => (Some(ent), false),
+						None => (None, true),
+					}
 				}
-				// Propagate error up to worker manager, it will log it, increment a counter,
-				// and sleep for a certain delay (with exponential backoff), waiting for
-				// things to go back to normal
-				return Err(e);
-			} else {
-				for k in entries_k {
-					self.buf.remove(&k);
+				Err(mpsc::error::TryRecvError::Empty) => (None, false),
+				Err(mpsc::error::TryRecvError::Disconnected) => (None, true),
+			};
+
+			if let Some((pk, sk, counters)) = ent {
+				let tree_key = self.table.data.tree_key(&pk, &sk);
+				let dist_entry = counters.into_counter_entry::<T>(self.this_node, pk, sk);
+				match buf.entry(tree_key) {
+					hash_map::Entry::Vacant(e) => {
+						e.insert(dist_entry);
+					}
+					hash_map::Entry::Occupied(mut e) => {
+						e.get_mut().merge(&dist_entry);
+					}
 				}
-				self.errors = 0;
+				// As long as we can add entries, loop back and add them to batch
+				// before sending batch to other nodes
+				continue;
 			}

-			return Ok(WorkerState::Busy);
-		} else if closed {
-			return Ok(WorkerState::Done);
-		} else {
-			return Ok(WorkerState::Idle);
-		}
-	}
+			if !buf.is_empty() {
+				let entries = buf.iter().map(|(_k, v)| v);
+				if let Err(e) = self.table.insert_many(entries).await {
+					errors += 1;
+					if errors >= 2 && *must_exit.borrow() {
+						error!("({}) Could not propagate {} counter values: {}, these counters will not be updated correctly.", T::NAME, buf.len(), e);
+						break;
+					}
+					warn!("({}) Could not propagate {} counter values: {}, retrying in 5 seconds (retry #{})", T::NAME, buf.len(), e, errors);
+					tokio::time::sleep(Duration::from_secs(5)).await;
+					continue;
+				}

-	async fn wait_for_work(&mut self, _must_exit: &watch::Receiver<bool>) -> WorkerState {
-		match self.propagate_rx.recv().await {
-			Some((pk, sk, counters)) => {
-				self.add_ent(pk, sk, counters);
-				WorkerState::Busy
+				buf.clear();
+				errors = 0;
+			}
+
+			if closed || *must_exit.borrow() {
+				break;
 			}
-			None => match self.buf.is_empty() {
-				false => WorkerState::Busy,
-				true => WorkerState::Done,
-			},
 		}
 	}
 }

 #[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
-struct LocalCounterEntry<T: CountedItem> {
-	pk: T::CP,
-	sk: T::CS,
+struct LocalCounterEntry {
 	values: BTreeMap<String, (u64, i64)>,
 }

-impl<T: CountedItem> LocalCounterEntry<T> {
-	fn into_counter_entry(self, this_node: Uuid) -> CounterEntry<T> {
+impl LocalCounterEntry {
+	fn into_counter_entry<T: CounterSchema>(
+		self,
+		this_node: Uuid,
+		pk: T::P,
+		sk: T::S,
+	) -> CounterEntry<T> {
 		CounterEntry {
-			pk: self.pk,
-			sk: self.sk,
+			pk,
+			sk,
 			values: self
 				.values
 				.into_iter()
@@ -0,0 +1,20 @@
+use garage_util::data::*;
+
+use crate::index_counter::*;
+
+pub const ENTRIES: &str = "entries";
+pub const CONFLICTS: &str = "conflicts";
+pub const VALUES: &str = "values";
+pub const BYTES: &str = "bytes";
+
+#[derive(PartialEq, Clone)]
+pub struct K2VCounterTable;
+
+impl CounterSchema for K2VCounterTable {
+	const NAME: &'static str = "k2v_index_counter";
+
+	// Partition key = bucket id
+	type P = Uuid;
+	// Sort key = K2V item's partition key
+	type S = String;
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alex Auvolat	e8a52192d0	Add missing not-dynamic script	2022-08-29 20:56:02 +02:00
Alex Auvolat	8394f32d16	Bump crate versions to 0.7.3	2022-08-29 18:01:53 +02:00
Quentin Dufour	cd5fa90c68	Configure structopt to report the right version By default, structopt reports the value provided by the env var CARGO_PKG_VERSION, feeded by Cargo when reading Cargo.toml. However for Garage we use a versioning based on git, so we often report a version that is behind the real version. In this commit, we create garage_util::version::garage() that reports the right version and configure all structopt subcommands to call this function instead of using the env var.	2022-08-29 17:54:03 +02:00
Quentin Dufour	d47af7b173	drone: set TARGET env as needed by "to_s3" func	2022-08-29 17:48:19 +02:00
Quentin Dufour	1cc0de40f0	Migrate to nix-daemon builders	2022-08-29 17:47:17 +02:00
Quentin Dufour	40a140bd20	Run clippy in nix, leveraging nix caching ability	2022-08-29 17:47:16 +02:00
Quentin Dufour	71d4cf42f1	Refactor default.nix to follow Nix Flakes patterns	2022-08-29 17:46:51 +02:00
Quentin Dufour	ac98769009	Bump Nix image to 22.05	2022-08-29 17:46:50 +02:00
Quentin Dufour	4279ca95eb	Fix: compile aarch64+armv6 as static binaries	2022-08-29 17:46:20 +02:00
Quentin Dufour	90a57fbc7e	Put log-lines in nix.conf	2022-08-29 17:46:16 +02:00