Update to rocksdb dependency to 0.16.0 (#4442)

Issue: #3266
near · Jul 9, 2021 · 34914ad · 34914ad
1 parent eb7a461
commit 34914ad
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 73 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/chain/indexer/Cargo.toml b/chain/indexer/Cargo.toml
@@ -9,7 +9,7 @@ actix = "=0.11.0-beta.2"
 async-recursion = "0.3.2"
 tracing = "0.1.13"
 futures = "0.3.5"
-rocksdb = "0.15.0"
+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
@@ -10,7 +10,7 @@ bytesize = "1"
 derive_more = "0.99.3"
 elastic-array = "0.11"
 lazy_static = "1.4"
-rocksdb = "0.15.0"
+rocksdb = "0.16.0"
 serde = { version = "1", features = [ "derive" ] }
 serde_json = "1"
 cached = "0.23"

diff --git a/core/store/src/db.rs b/core/store/src/db.rs
@@ -675,7 +675,7 @@ fn rocksdb_column_options(col: DBCol) -> Options {
     opts.set_target_file_size_base(1024 * 1024 * 64);
     opts.set_compression_per_level(&[]);
     if col.is_rc() {
-        opts.set_merge_operator("refcount merge", RocksDB::refcount_merge, None);
+        opts.set_merge_operator("refcount merge", RocksDB::refcount_merge, RocksDB::refcount_merge);
         opts.set_compaction_filter("empty value filter", RocksDB::empty_value_compaction_filter);
     }
     opts
@@ -777,10 +777,10 @@ mod tests {
     impl RocksDB {
         #[cfg(not(feature = "single_thread_rocksdb"))]
         fn compact(&self, col: DBCol) {
-            self.db.compact_range_cf::<&[u8], &[u8]>(
+            self.db.compact_range_cf(
                 unsafe { &*self.cfs[col as usize] },
-                None,
-                None,
+                Option::<&[u8]>::None,
+                Option::<&[u8]>::None,
             );
         }
 

diff --git a/core/store/src/db/v6_to_v7.rs b/core/store/src/db/v6_to_v7.rs
@@ -50,7 +50,7 @@ fn rocksdb_column_options_v6(col: DBCol) -> Options {
     let mut opts = rocksdb_column_options(DBCol::ColDbVersion);
 
     if col == DBCol::ColState {
-        opts.set_merge_operator("refcount merge", refcount_merge_v6, None);
+        opts.set_merge_operator("refcount merge", refcount_merge_v6, refcount_merge_v6);
         opts.set_compaction_filter("empty value filter", RocksDB::empty_value_compaction_filter);
     }
     opts

diff --git a/deny.toml b/deny.toml
@@ -22,7 +22,6 @@ deny = [
 
 skip = [
     { name = "clap", version = "=2.33.3" },
-    { name = "env_logger", version = "=0.7.1" },
     { name = "humantime", version = "=2.1.0" },
     { name = "socket2", version = "=0.3.19" },
     { name = "textwrap", version = "=0.12.1" },
@@ -116,11 +115,9 @@ skip = [
     { name = "cranelift-codegen-shared", version = "=0.68.0" },
     { name = "cranelift-entity", version = "=0.68.0" },
     { name = "cranelift-frontend", version = "=0.68.0" },
-    { name = "libloading", version = "=0.5.2" },
     { name = "wasmparser", version = "=0.65.0" },
-    { name = "which", version = "=3.1.1" },
     { name = "object", version = "=0.22.0" },
-   
+
     # cached uses an older version
     { name = "strsim", version = "=0.9.3" },
     { name = "darling", version = "=0.10.2" },
@@ -129,4 +126,9 @@ skip = [
 
     # hashbrown uses an older version
     { name = "ahash", version = "=0.4.7" },
+
+    # rocksdb (transitively through clang-sys) uses this as a build
+    # dependency which conflicts with 0.6.7 that wasmer-engine-native
+    # uses.
+    { name = "libloading", version = "=0.7.0" },
 ]
diff --git a/runtime/runtime-params-estimator/Cargo.toml b/runtime/runtime-params-estimator/Cargo.toml
@@ -32,7 +32,7 @@ near-primitives = { path = "../../core/primitives" }
 testlib = { path = "../../test-utils/testlib" }
 state-viewer = { path = "../../test-utils/state-viewer" }
 nearcore = { path = "../../nearcore" }
-rocksdb = "0.15.0"
+rocksdb = "0.16.0"
 glob = "0.3.0"
 walrus = "0.18.0"
 near-evm-runner = { path = "../../runtime/near-evm-runner", optional = true }