From d283da51c627fac4600edfecc8fe5001ab251151 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Fri, 8 Aug 2025 23:00:59 +0200 Subject: [PATCH] Upgrade rust-rocksdb --- Cargo.lock | 79 +++++++++++++++++++----------------------------------- Cargo.toml | 2 +- flake.lock | 8 +++--- flake.nix | 2 +- 4 files changed, 34 insertions(+), 57 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a6b4fed7..274e64f8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -256,26 +256,6 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba" -[[package]] -name = "bindgen" -version = "0.69.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" -dependencies = [ - "bitflags 2.9.1", - "cexpr", - "clang-sys", - "itertools 0.12.1", - "lazy_static", - "lazycell", - "proc-macro2", - "quote", - "regex", - "rustc-hash 1.1.0", - "shlex", - "syn", -] - [[package]] name = "bindgen" version = "0.71.1" @@ -289,7 +269,25 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash 2.1.1", + "rustc-hash", + "shlex", + "syn", +] + +[[package]] +name = "bindgen" +version = "0.72.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f72209734318d0b619a5e0f5129918b848c416e122a3c4ce054e03cb87b726f" +dependencies = [ + "bitflags 2.9.1", + "cexpr", + "clang-sys", + "itertools 0.13.0", + "proc-macro2", + "quote", + "regex", + "rustc-hash", "shlex", "syn", ] @@ -1190,7 +1188,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.5.10", + "socket2 0.6.0", "tokio", "tower-service", "tracing", @@ -1404,15 +1402,6 @@ dependencies = [ "serde", ] -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.13.0" @@ -1516,12 +1505,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "libc" version = "0.2.174" @@ -1535,7 +1518,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-targets 0.53.3", ] [[package]] @@ -2226,7 +2209,7 @@ dependencies = [ "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash 2.1.1", + "rustc-hash", "rustls", "socket2 0.5.10", "thiserror 2.0.12", @@ -2246,7 +2229,7 @@ dependencies = [ "lru-slab", "rand 0.9.2", "ring", - "rustc-hash 2.1.1", + "rustc-hash", "rustls", "rustls-pki-types", "slab", @@ -2668,11 +2651,11 @@ dependencies = [ [[package]] name = "rust-librocksdb-sys" -version = "0.32.0+9.10.0" +version = "0.38.0+10.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50146b7fadd68926e9dcb902bf0515783aaaf5f73af26949f188aead5ede8cd0" +checksum = "455560a01423fff351732e26cb436b4ab43805642e0783d7db2c12d372849cf7" dependencies = [ - "bindgen 0.69.5", + "bindgen 0.72.0", "bzip2-sys", "cc", "glob", @@ -2684,9 +2667,9 @@ dependencies = [ [[package]] name = "rust-rocksdb" -version = "0.36.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf088a714aa3fad699f7dbe06047ca732c09629a2f9b28aa16ca6d3897a4c2f" +checksum = "41be0c32ea0155c97e2d19c2276739a2ec17606d0b89485ca5124c4b14e2a38f" dependencies = [ "libc", "rust-librocksdb-sys", @@ -2698,12 +2681,6 @@ version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace" -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - [[package]] name = "rustc-hash" version = "2.1.1" diff --git a/Cargo.toml b/Cargo.toml index 685c0e6f..bdea44fb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -120,7 +120,7 @@ rand = "0.8.5" regex = "1.11.1" reqwest = { version = "0.12.22", default-features = false, features = ["http2", "rustls-tls-native-roots", "socks"] } ring = "0.17.14" -rocksdb = { package = "rust-rocksdb", version = "0.36.0", features = ["lz4", "multi-threaded-cf", "zstd"], optional = true } +rocksdb = { package = "rust-rocksdb", version = "0.42.1", features = ["lz4", "multi-threaded-cf", "zstd"], optional = true } rusqlite = { version = "0.34.0", optional = true, features = ["bundled"] } rustls = { version = "0.23.31", default-features = false, features = ["ring", "log", "logging", "std", "tls12"] } sd-notify = { version = "0.4.5", optional = true } diff --git a/flake.lock b/flake.lock index 11986b29..4a278e21 100644 --- a/flake.lock +++ b/flake.lock @@ -238,16 +238,16 @@ "rocksdb": { "flake": false, "locked": { - "lastModified": 1734381914, - "narHash": "sha256-G+DlQwEUyd7JOCjS1Hg1cKWmA/qAiK8UpUIKcP+riGQ=", + "lastModified": 1752084860, + "narHash": "sha256-mKh6zsmxsiUix4LX+npiytmKvLbo6WNA9y4Ns/EY+bE=", "owner": "facebook", "repo": "rocksdb", - "rev": "ae8fb3e5000e46d8d4c9dbf3a36019c0aaceebff", + "rev": "410c5623195ecbe4699b9b5a5f622c7325cec6fe", "type": "github" }, "original": { "owner": "facebook", - "ref": "v9.10.0", + "ref": "v10.4.2", "repo": "rocksdb", "type": "github" } diff --git a/flake.nix b/flake.nix index 18cf25d4..5d62b734 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ flake-utils.url = "github:numtide/flake-utils?ref=main"; nix-filter.url = "github:numtide/nix-filter?ref=main"; nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable"; - rocksdb = { url = "github:facebook/rocksdb?ref=v9.10.0"; flake = false; }; + rocksdb = { url = "github:facebook/rocksdb?ref=v10.4.2"; flake = false; }; }; outputs = inputs: