From 54ed85040a3c07f324d34fc94b3ad440dfed258b Mon Sep 17 00:00:00 2001 From: dawn <90008@klbr.net> Date: Sat, 3 Oct 2026 16:19:04 +0300 Subject: [PATCH] [deps] bump fjall and lsm-tree forks onto upstream fjall 3.1.11 and lsm-tree 3.1.10 with the fork commits rebased on top, plus recovery fixes in fjall: - skip journal items a keyspace already flushed and stop seeking per entry, which takes reopening a 266MB journal set from 8.9s to 1.0s (3.8s vs 42s at e2-small's 25% cpu) - don't replay a clear onto tables written after it, which lost ingested data after a restart - an ingested value no longer gets shadowed by an older journaled write - continue the seqno counter after a trailing clear - reject a torn uncompressed journal item instead of panicking --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- default.nix | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a99795d..57fc057 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1102,8 +1102,8 @@ checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" [[package]] name = "fjall" -version = "3.1.8" -source = "git+https://github.com/90-008/fjall.git?rev=85a8ad9b3d327c39263cc547fa9944e7535e802f#85a8ad9b3d327c39263cc547fa9944e7535e802f" +version = "3.1.11" +source = "git+https://github.com/90-008/fjall.git?rev=4ae8fce3083d371acd2b20253cf4d7dc49244789#4ae8fce3083d371acd2b20253cf4d7dc49244789" dependencies = [ "byteorder-lite", "byteview", @@ -2275,8 +2275,8 @@ checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" [[package]] name = "lsm-tree" -version = "3.1.8" -source = "git+https://github.com/90-008/lsm-tree.git#ffa6e5edea9dd199b4fe5286a2ad20fc5df63001" +version = "3.1.10" +source = "git+https://github.com/90-008/lsm-tree.git#a236e78bf93d3d218dfa1df7c77e0d5290ae5968" dependencies = [ "byteorder-lite", "byteview", diff --git a/Cargo.toml b/Cargo.toml index eb9d568..2a577c8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ serde_bytes = "0.11" serde_json = "1.0" rmp-serde = { git = "https://github.com/90-008/msgpack-rust.git", rev = "19c54a922301d06310a816c3a6a097aeb73ea3ae" } -fjall = { git = "https://github.com/90-008/fjall.git", rev = "85a8ad9b3d327c39263cc547fa9944e7535e802f", features = ["lz4", "zstd"], version = "3.1.2" } +fjall = { git = "https://github.com/90-008/fjall.git", rev = "4ae8fce3083d371acd2b20253cf4d7dc49244789", features = ["lz4", "zstd"], version = "3.1.2" } lsm-tree = { git = "https://github.com/90-008/lsm-tree.git", features = ["lz4", "zstd"] } serde_ipld_dagcbor = "0.6" serde_html_form = "0.3" diff --git a/default.nix b/default.nix index 5335449..bd91da2 100644 --- a/default.nix +++ b/default.nix @@ -22,8 +22,8 @@ rustPlatform.buildRustPackage { lockFile = ./Cargo.lock; outputHashes = { "rmp-0.8.15" = "sha256-0VATbSR2lGiCJ8Ww4a5pkOHSRUjoysnFonpKS/oMzgU="; - "fjall-3.1.8" = "sha256-8M+rgLpuepjIgN6JsrEL+SuyOhMMFN3J+Djv1IYewjI="; - "lsm-tree-3.1.8" = "sha256-kXo+taNw/DCyBZEmI2Dcbe0dFpM3T6P67QIpzYgce/Y="; + "fjall-3.1.11" = "sha256-a4jDJbCjvwcbTmv5lVQglCYrffX9ADQvOtuyF5rSCWo="; + "lsm-tree-3.1.10" = "sha256-uRhibxf83N+uLg6WjnL+EOfBTdSevnkS2ve8jZOOlHM="; }; }; } -- 2.51.2