From 796a6ee29812cf8f5fbdfebcdbef7e2c13e14720 Mon Sep 17 00:00:00 2001 From: Luiz Irber Date: Thu, 26 Dec 2024 11:26:14 -0800 Subject: [PATCH] update to rocksdb 0.23 --- Cargo.lock | 20 ++++---------------- flake.lock | 18 +++++++++--------- src/core/Cargo.toml | 8 ++++++-- 3 files changed, 19 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5877dc8636..a81daa3c08 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -844,17 +844,15 @@ checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" [[package]] name = "librocksdb-sys" -version = "0.16.0+8.10.0" +version = "0.17.1+9.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce3d60bc059831dc1c83903fb45c103f75db65c5a7bf22272764d9cc683e348c" +checksum = "2b7869a512ae9982f4d46ba482c2a304f1efd80c6412a3d4bf57bb79a619679f" dependencies = [ "bindgen", "bzip2-sys", "cc", - "glob", "libc", "libz-sys", - "lz4-sys", "zstd-sys", ] @@ -896,16 +894,6 @@ version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" -[[package]] -name = "lz4-sys" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "lzma-sys" version = "0.1.17" @@ -1457,9 +1445,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bd13e55d6d7b8cd0ea569161127567cd587676c99f4472f779a0279aa60a7a7" +checksum = "26ec73b20525cb235bad420f911473b69f9fe27cc856c5461bccd7e4af037f43" dependencies = [ "libc", "librocksdb-sys", diff --git a/flake.lock b/flake.lock index 41f929d8e7..e464b535f9 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1728979988, - "narHash": "sha256-GBJRnbFLDg0y7ridWJHAP4Nn7oss50/VNgqoXaf/RVk=", + "lastModified": 1734988233, + "narHash": "sha256-Ucfnxq1rF/GjNP3kTL+uTfgdoE9a3fxDftSfeLIS8mA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7881fbfd2e3ed1dfa315fca889b2cfd94be39337", + "rev": "de1864217bfa9b5845f465e771e0ecb48b30e02d", "type": "github" }, "original": { @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1729184663, - "narHash": "sha256-uNyi5vQrzaLkt4jj6ZEOs4+4UqOAwP6jFG2s7LIDwIk=", + "lastModified": 1735180071, + "narHash": "sha256-ceUDFBsLf5Cz3GlhQAdaJsEfi5s1MDjDsO9VvPFoKAE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "16fb78d443c1970dda9a0bbb93070c9d8598a925", + "rev": "550e1f10be4a504747a7894c35e887e61235763b", "type": "github" }, "original": { @@ -63,11 +63,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { diff --git a/src/core/Cargo.toml b/src/core/Cargo.toml index 552a7e58c2..4fdde4e7e8 100644 --- a/src/core/Cargo.toml +++ b/src/core/Cargo.toml @@ -108,7 +108,11 @@ chrono = { version = "0.4.32", features = ["wasmbind"] } wasm-bindgen-test = "0.3.42" ### These crates don't compile on wasm -[target.'cfg(not(target_arch = "wasm32"))'.dependencies] -rocksdb = { version = "0.22.0", optional = true } +[target.'cfg(not(target_arch = "wasm32"))'.dependencies.rocksdb] +version = "0.23.0" +optional = true +default-features = false +features = [ "bindgen-runtime", "snappy", "zstd" ] + [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies] criterion = "0.5.1"