Revert "chore: Upgrade rust-rocksdb 0.16 to 0.18 (#6289)" (#6300)

This reverts commit 6a0349f.
near · Feb 16, 2022 · 4f4d877 · 4f4d877
1 parent ea731e3
commit 4f4d877
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 60 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/chain/indexer/Cargo.toml b/chain/indexer/Cargo.toml
@@ -13,7 +13,7 @@ anyhow = "1.0.51"
 async-recursion = "0.3.2"
 tracing = "0.1.13"
 futures = "0.3.5"
-rocksdb = { version = "0.18.0", default-features = false, features = ["snappy", "lz4", "zstd", "zlib"] }
+rocksdb = "0.16.0"
 serde = { version = "1", features = [ "derive" ] }
 serde_json = "1.0.55"
 tokio = { version = "1.1", features = ["time", "sync"] }

diff --git a/core/store/Cargo.toml b/core/store/Cargo.toml
@@ -13,7 +13,7 @@ byteorder = "1.2"
 bytesize = "1.1"
 derive_more = "0.99.3"
 elastic-array = "0.11"
-rocksdb = { version = "0.18.0", default-features = false, features = ["snappy", "lz4", "zstd", "zlib"] }
+rocksdb = "0.16.0"
 serde_json = "1"
 num_cpus = "1.11"
 rand = "0.7"

diff --git a/core/store/src/db.rs b/core/store/src/db.rs
@@ -802,7 +802,7 @@ fn rocksdb_block_based_options(cache_size: usize) -> BlockBasedOptions {
     block_opts.set_block_cache(&Cache::new_lru_cache(cache_size).unwrap());
     block_opts.set_pin_l0_filter_and_index_blocks_in_cache(true);
     block_opts.set_cache_index_and_filter_blocks(true);
-    block_opts.set_bloom_filter(10.0, true);
+    block_opts.set_bloom_filter(10, true);
     block_opts
 }
 

diff --git a/core/store/src/db/refcount.rs b/core/store/src/db/refcount.rs
@@ -85,7 +85,7 @@ impl RocksDB {
     pub(crate) fn refcount_merge(
         _new_key: &[u8],
         existing_val: Option<&[u8]>,
-        operands: &MergeOperands,
+        operands: &mut MergeOperands,
     ) -> Option<Vec<u8>> {
         let mut result = vec![];
         if let Some(val) = existing_val {

diff --git a/core/store/src/db/v6_to_v7.rs b/core/store/src/db/v6_to_v7.rs
@@ -10,7 +10,7 @@ use crate::DBCol;
 fn refcount_merge_v6(
     _new_key: &[u8],
     existing_val: Option<&[u8]>,
-    operands: &MergeOperands,
+    operands: &mut MergeOperands,
 ) -> Option<Vec<u8>> {
     let mut result = vec![];
     if let Some(val) = existing_val {

diff --git a/runtime/runtime-params-estimator/Cargo.toml b/runtime/runtime-params-estimator/Cargo.toml
@@ -37,7 +37,7 @@ near-store = { path = "../../core/store" }
 near-primitives = { path = "../../core/primitives" }
 
 nearcore = { path = "../../nearcore" }
-rocksdb = { version = "0.18.0", default-features = false, features = ["snappy", "lz4", "zstd", "zlib"] }
+rocksdb = "0.16.0"
 walrus = "0.18.0"
 hex = "0.4"
 cfg-if = "1"