Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to rocksdb dependency to 0.16.0 #4442

Merged
merged 6 commits into from
Jul 9, 2021
Merged

Update to rocksdb dependency to 0.16.0 #4442

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
423f5d0
Update to rocksdb dependency to 0.16.0
mina86 Jun 30, 2021
2cc2f0e
fix deny
mina86 Jul 1, 2021
0caaa0f
Merge remote-tracking branch 'up/master' into HEAD
mina86 Jul 1, 2021
ca6a688
remove stale deny skips
mina86 Jul 1, 2021
2374d62
Merge branch 'master' into rdb
mina86 Jul 7, 2021
c0adcab
Merge branch 'master' into rdb
bowenwang1996 Jul 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 19 additions & 61 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion chain/indexer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion core/store/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions core/store/src/db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
mina86 marked this conversation as resolved.
Show resolved Hide resolved
Option::<&[u8]>::None,
);
}

Expand Down
2 changes: 1 addition & 1 deletion core/store/src/db/v6_to_v7.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions deny.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
Expand Down Expand Up @@ -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" },
Expand All @@ -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
mina86 marked this conversation as resolved.
Show resolved Hide resolved
# uses.
{ name = "libloading", version = "=0.7.0" },
]
2 changes: 1 addition & 1 deletion runtime/runtime-params-estimator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down