Skip to content

Commit

Permalink
chore(deps): replace rooch-network/rust-rocksdb with upstream rocksdb (
Browse files Browse the repository at this point in the history
…#3182)

## Summary

1. replace rooch/rust-rocksdb with upstream rocksdb ([fix GETCPU feature](rust-rocksdb/rust-rocksdb#950) has been released in v0.23.0)
2. replace jemalloc with tikv-jemallocator
  • Loading branch information
popcnt1 authored Jan 13, 2025
1 parent ef933ba commit 972a090
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 32 deletions.
56 changes: 29 additions & 27 deletions Cargo.lock

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

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ revm-primitives = "4.0.0"
scopeguard = "1.1"
uuid = { version = "1.11.0", features = ["v4", "fast-rng"] }
protobuf = { version = "2.28", features = ["with-bytes"] }
rocksdb = { git = "https://github.com/rooch-network/rust-rocksdb.git", rev = "41d102327ba3cf9a2335d1192e8312c92bc3d6f9", features = ["lz4", "mt_static"] }
rocksdb = { version = "0.23.0", features = ["lz4", "mt_static", "jemalloc"] }
lz4 = { version = "1.28.1" }
ripemd = { version = "0.1.3" }
fastcrypto-zkp = { version = "0.1.3" }
Expand All @@ -325,6 +325,8 @@ crossbeam-channel = "0.5.14"
inferno = "0.11.21"
handlebars = "4.2.2"
indexmap = "2.7.0"
tikv-jemallocator = { version = "0.6.0", features = ["unprefixed_malloc_on_supported_platforms", "profiling"] }
mimalloc = { version = "0.1.39" }

# Note: the BEGIN and END comments below are required for external tooling. Do not remove.
# BEGIN MOVE DEPENDENCIES
Expand Down
2 changes: 1 addition & 1 deletion crates/rooch-benchmarks/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ bitcoincore-rpc = { workspace = true }
bitcoin = { workspace = true }
toml = { workspace = true }
[target.'cfg(not(target_env = "msvc"))'.dependencies]
jemallocator = { version = "0.5.4", features = ["unprefixed_malloc_on_supported_platforms", "profiling"] }
tikv-jemallocator = { workspace = true }
prometheus = { workspace = true }
tokio = { workspace = true }
tracing = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions crates/rooch/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ framework-release = { workspace = true }

#We should keep the allocator in the last of the dependencies
[target.'cfg(not(target_env = "msvc"))'.dependencies]
jemallocator = { version = "0.5.4", features = ["unprefixed_malloc_on_supported_platforms", "profiling"] }
tikv-jemallocator = { workspace = true }
[target.'cfg(target_env = "msvc")'.dependencies]
mimalloc = { version = "0.1.39" }
mimalloc = { workspace = true }

[build-dependencies]
anyhow = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/rooch/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use std::process::exit;

#[cfg(not(target_env = "msvc"))]
mod allocator {
use jemallocator::Jemalloc;
use tikv_jemallocator::Jemalloc;

pub type Allocator = Jemalloc;

Expand Down

0 comments on commit 972a090

Please sign in to comment.