diff --git a/Cargo.lock b/Cargo.lock index 692c9d8577..5c0519c849 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1623,7 +1623,7 @@ dependencies = [ "maybe-owned", "rustix 1.0.7", "rustix-linux-procfs", - "windows-sys 0.60.2", + "windows-sys 0.61.2", "winx", ] @@ -9175,7 +9175,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -11383,7 +11383,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" dependencies = [ "bytes", - "heck 0.5.0", + "heck 0.4.1", "itertools 0.12.1", "log", "multimap", @@ -11403,7 +11403,7 @@ version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac6c3320f9abac597dcbc668774ef006702672474aad53c6d596b62e487b40b1" dependencies = [ - "heck 0.5.0", + "heck 0.4.1", "itertools 0.14.0", "log", "multimap", @@ -12997,7 +12997,7 @@ dependencies = [ "security-framework 3.7.0", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -13883,7 +13883,7 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1961e2ef424c1424204d3a5d6975f934f56b6d50ff5732382d84ebf460e147f7" dependencies = [ - "heck 0.5.0", + "heck 0.4.1", "proc-macro2", "quote", "syn 2.0.117", @@ -13912,7 +13912,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -14921,7 +14921,7 @@ dependencies = [ "getrandom 0.3.4", "once_cell", "rustix 1.0.7", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -15180,9 +15180,9 @@ dependencies = [ [[package]] name = "tikv-jemalloc-ctl" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21f216790c8df74ce3ab25b534e0718da5a1916719771d3fec23315c99e468b" +checksum = "3a184c43b8ab2f41df2733b55556e3f5f632f4aeaa205b1bb018f574b7f5f142" dependencies = [ "libc", "paste", @@ -15191,9 +15191,8 @@ dependencies = [ [[package]] name = "tikv-jemalloc-sys" -version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3c60906412afa9c2b5b5a48ca6a5abe5736aec9eb48ad05037a677e52e4e2d" +version = "0.7.0+5.3.1-0-g81034ce1f1373e37dc865038e1bc8eeecf559ce8" +source = "git+https://github.com/GreptimeTeam/jemallocator?rev=e1846d8c12bbb65c39dcd224a86b24586478e264#e1846d8c12bbb65c39dcd224a86b24586478e264" dependencies = [ "cc", "libc", @@ -15201,9 +15200,9 @@ dependencies = [ [[package]] name = "tikv-jemallocator" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cec5ff18518d81584f477e9bfdf957f5bb0979b0bac3af4ca30b5b3ae2d2865" +checksum = "249f09e49ab1609436f34c776e84231bead18d6a955f119f939bdc1d847561bd" dependencies = [ "libc", "tikv-jemalloc-sys", diff --git a/Cargo.toml b/Cargo.toml index 7988ed908a..a2606954d6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -370,6 +370,13 @@ datafusion-sql = { git = "https://github.com/GreptimeTeam/datafusion.git", rev = datafusion-substrait = { git = "https://github.com/GreptimeTeam/datafusion.git", rev = "bb531e754b3b36d7a4d3222f35ebc88204dafd2b" } sqlparser = { git = "https://github.com/GreptimeTeam/sqlparser-rs.git", rev = "2aefa08a8d69c96eec2d6d6703598a009bba6e4c" } # on branch v0.61.x +# Temporary: use the GreptimeTeam fork of tikv-jemalloc-sys embedding +# jemalloc 5.3.1 + backport of 54f22c83 ("Initialize TSD tcache before +# enabling it"), fixing the TSD/tcache enable-before-init reentrancy +# window. Remove once tikv/jemallocator ships a jemalloc snapshot that +# includes the fix. See GreptimeTeam/jemalloc#1. +tikv-jemalloc-sys = { git = "https://github.com/GreptimeTeam/jemallocator", rev = "e1846d8c12bbb65c39dcd224a86b24586478e264" } + [profile.release] debug = 1 diff --git a/src/cmd/Cargo.toml b/src/cmd/Cargo.toml index 8cb8cff430..9c7ca6adea 100644 --- a/src/cmd/Cargo.toml +++ b/src/cmd/Cargo.toml @@ -124,7 +124,7 @@ pprof = { version = "0.14", features = [ ] } [target.'cfg(not(windows))'.dependencies] -tikv-jemallocator = "0.6" +tikv-jemallocator = "0.7" [dev-dependencies] api.workspace = true diff --git a/src/common/mem-prof/Cargo.toml b/src/common/mem-prof/Cargo.toml index ee4753ee88..10b67cf7fa 100644 --- a/src/common/mem-prof/Cargo.toml +++ b/src/common/mem-prof/Cargo.toml @@ -16,7 +16,7 @@ tempfile = "3.4" tokio.workspace = true [target.'cfg(not(windows))'.dependencies] -tikv-jemalloc-ctl = { version = "0.6", features = ["use_std", "stats"] } +tikv-jemalloc-ctl = { version = "0.7", features = ["use_std", "stats"] } jemalloc-pprof-utils = { version = "0.8", package = "pprof_util", features = [ "flamegraph", "symbolize", @@ -25,4 +25,4 @@ jemalloc-pprof-mappings = { version = "0.7", package = "mappings" } # for get th [target.'cfg(not(windows))'.dependencies.tikv-jemalloc-sys] features = ["stats", "profiling", "unprefixed_malloc_on_supported_platforms"] -version = "0.6" +version = "0.7" diff --git a/src/servers/Cargo.toml b/src/servers/Cargo.toml index 549a64e253..7975d02e5b 100644 --- a/src/servers/Cargo.toml +++ b/src/servers/Cargo.toml @@ -146,7 +146,7 @@ vrl.workspace = true zstd.workspace = true [target.'cfg(not(windows))'.dependencies] -tikv-jemalloc-ctl = { version = "0.6", features = ["use_std", "stats"] } +tikv-jemalloc-ctl = { version = "0.7", features = ["use_std", "stats"] } [dev-dependencies] auth = { workspace = true, features = ["testing"] } @@ -175,7 +175,7 @@ tokio-postgres-rustls = "0.14" pprof = { version = "0.14", features = ["criterion", "flamegraph"] } [target.'cfg(not(windows))'.dev-dependencies] -tikv-jemallocator = "0.6" +tikv-jemallocator = "0.7" [build-dependencies] common-version.workspace = true