Skip to content

Commit 09b90ad

Browse files
committed
Update jemalloc to latest version
This is similar to aptos-labs/aptos-core#17446. See that PR for more details. Similarly, we have to use a shim until everything is updated. Right now this repo still depends on an old version of `aptos-indexer-processor-sdk`, which in turn depends on an old version of `aptos-core`, and that pulls in `jemalloc-sys 0.5`, which is incompatible with `tikv-jemalloc-sys 0.6`.
1 parent 97d24c9 commit 09b90ad

File tree

3 files changed

+29
-6
lines changed

3 files changed

+29
-6
lines changed

Cargo.lock

Lines changed: 23 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,3 +135,7 @@ tracing-subscriber = { version = "0.3.17", features = ["json", "env-filter"] }
135135
unescape = "0.1.0"
136136
url = { version = "2.4.0", features = ["serde"] }
137137
warp = { version = "0.3.5", features = ["tls"] }
138+
139+
[patch.crates-io]
140+
# Can be removed once the dependencies on aptos-core and aptos-indexer-processor-sdk have been updated (so we stop pulling any old jemalloc-sys).
141+
jemalloc-sys = { git = "https://github.com/aptos-labs/jemalloc-sys-shim", rev = "e0920246dd74303fab9a14b990768c6ac990a59b" }

processor/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,9 @@ unescape = { workspace = true }
7575
url = { workspace = true }
7676

7777
[target.'cfg(unix)'.dependencies]
78-
jemallocator = { version = "0.5.0", features = [
78+
jemallocator = { package = "tikv-jemallocator", version = "0.6.0", features = [
7979
"profiling",
80+
"stats",
8081
"unprefixed_malloc_on_supported_platforms",
8182
] }
8283

0 commit comments

Comments
 (0)