From d7fc6874d1b75716c5032ac99d7ca26e289e1513 Mon Sep 17 00:00:00 2001 From: strawberry Date: Thu, 21 Mar 2024 23:57:09 -0400 Subject: [PATCH] Revert RocksDB 9.0.0 update there seems to be a regression, likely from https://github.com/facebook/rocksdb/issues/12361 / https://github.com/facebook/rocksdb/pull/12309 ``` [1/0/2 built] building rocksdb-9.0.0 (configurePhase): -- Detecting CXX compile features - donedirenv: ([/Users/strawberry/.nix-profile/bin/direnv export zsh]) is taking a while to execute. Use CTRL-C to give up. error: builder for '/nix/store/9slwgpnardhn2vqzqhn361ic668n38wq-rocksdb-9.0.0.drv' failed with exit code 1; last 10 log lines: > -- Found lz4: /nix/store/cafwv4439qbm2ij04mpc7xz5m3f7mfix-lz4-1.9.4/lib/liblz4.dylib > CMake Error at /nix/store/bin32lqag7lx38994xpf9jvhk1xbd64c-cmake-3.28.2/share/cmake-3.28/Modules/FindPackageHandleStandardArgs.cmake:230 (message): > Could NOT find zstd (missing: ZSTD_INCLUDE_DIRS) > Call Stack (most recent call first): > /nix/store/bin32lqag7lx38994xpf9jvhk1xbd64c-cmake-3.28.2/share/cmake-3.28/Modules/FindPackageHandleStandardArgs.cmake:600 (_FPHSA_FAILURE_MESSAGE) > cmake/modules/Findzstd.cmake:17 (find_package_handle_standard_args) > CMakeLists.txt:167 (find_package) > > > -- Configuring incomplete, errors occurred! For full logs, run 'nix log /nix/store/9slwgpnardhn2vqzqhn361ic668n38wq-rocksdb-9.0.0.drv'. error: 1 dependencies of derivation '/nix/store/ir8jf2wic98iymjlk7d2i1kjjsgv15v2-nix-shell-env.drv' failed to build ``` happens in both rust-rocksdb and our fork of rust-rocksdb Signed-off-by: strawberry --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 714c1cee..8ca20320 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2356,8 +2356,8 @@ dependencies = [ [[package]] name = "rust-librocksdb-sys" -version = "0.19.0+9.0.0" -source = "git+https://github.com/zaidoon1/rust-rocksdb?rev=78a8a2e99380f2185c2f337ab3c5d9ea05861c5d#78a8a2e99380f2185c2f337ab3c5d9ea05861c5d" +version = "0.18.2+8.11.3" +source = "git+https://github.com/zaidoon1/rust-rocksdb?rev=60f783b06b49d2f6fcf1d3dda66c7194e49095d4#60f783b06b49d2f6fcf1d3dda66c7194e49095d4" dependencies = [ "bindgen", "bzip2-sys", @@ -2372,8 +2372,8 @@ dependencies = [ [[package]] name = "rust-rocksdb" -version = "0.23.0" -source = "git+https://github.com/zaidoon1/rust-rocksdb?rev=78a8a2e99380f2185c2f337ab3c5d9ea05861c5d#78a8a2e99380f2185c2f337ab3c5d9ea05861c5d" +version = "0.22.8" +source = "git+https://github.com/zaidoon1/rust-rocksdb?rev=60f783b06b49d2f6fcf1d3dda66c7194e49095d4#60f783b06b49d2f6fcf1d3dda66c7194e49095d4" dependencies = [ "libc", "rust-librocksdb-sys", diff --git a/Cargo.toml b/Cargo.toml index 8765caba..d6075dd7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -261,7 +261,7 @@ features = [ [dependencies.rust-rocksdb] git = "https://github.com/zaidoon1/rust-rocksdb" #branch = "master" -rev = "78a8a2e99380f2185c2f337ab3c5d9ea05861c5d" +rev = "60f783b06b49d2f6fcf1d3dda66c7194e49095d4" optional = true default-features = true features = ["multi-threaded-cf"]