From d3b8d56385c8ba8622de96fc3222762317c5d3c5 Mon Sep 17 00:00:00 2001 From: MrCroxx Date: Fri, 15 Sep 2023 11:50:56 +0000 Subject: [PATCH] exclude tikv-jemalloc-sys Signed-off-by: MrCroxx --- .config/hakari.toml | 2 ++ Cargo.lock | 1 - src/workspace-hack/Cargo.toml | 8 -------- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.config/hakari.toml b/.config/hakari.toml index e3e58e80cbf16..50000f6cc7586 100644 --- a/.config/hakari.toml +++ b/.config/hakari.toml @@ -36,4 +36,6 @@ third-party = [ { name = "criterion" }, { name = "console" }, { name = "similar" }, + # FYI: https://github.com/risingwavelabs/risingwave/issues/12315 + { name = "tikv-jemalloc-sys", git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9" }, ] diff --git a/Cargo.lock b/Cargo.lock index 9e73822d5a77d..75e4d922d5631 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10114,7 +10114,6 @@ dependencies = [ "subtle", "syn 1.0.109", "syn 2.0.33", - "tikv-jemalloc-sys", "tikv-jemallocator", "time", "time-macros", diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml index 63cf30bf854df..cec5ff69ec8fa 100644 --- a/src/workspace-hack/Cargo.toml +++ b/src/workspace-hack/Cargo.toml @@ -228,7 +228,6 @@ rdkafka-sys = { git = "https://github.com/MaterializeInc/rust-rdkafka", rev = "8 rustix = { version = "0.38", features = ["fs", "termios"] } rustls = { version = "0.21", features = ["dangerous_configuration"] } serde_json = { version = "1", default-features = false, features = ["raw_value"] } -tikv-jemalloc-sys = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] } tikv-jemallocator = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] } tower-http = { version = "0.4", features = ["add-extension", "cors", "fs"] } zstd-sys = { version = "2", features = ["std"] } @@ -246,7 +245,6 @@ rdkafka-sys = { git = "https://github.com/MaterializeInc/rust-rdkafka", rev = "8 rustix = { version = "0.38", features = ["fs", "termios"] } rustls = { version = "0.21", features = ["dangerous_configuration"] } serde_json = { version = "1", default-features = false, features = ["raw_value"] } -tikv-jemalloc-sys = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] } tikv-jemallocator = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] } tower-http = { version = "0.4", features = ["add-extension", "cors", "fs"] } zstd-sys = { version = "2", features = ["std"] } @@ -264,7 +262,6 @@ rdkafka-sys = { git = "https://github.com/MaterializeInc/rust-rdkafka", rev = "8 rustix = { version = "0.38", features = ["fs", "termios"] } rustls = { version = "0.21", features = ["dangerous_configuration"] } serde_json = { version = "1", default-features = false, features = ["raw_value"] } -tikv-jemalloc-sys = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] } tikv-jemallocator = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] } tower-http = { version = "0.4", features = ["add-extension", "cors", "fs"] } zstd-sys = { version = "2", features = ["std"] } @@ -282,7 +279,6 @@ rdkafka-sys = { git = "https://github.com/MaterializeInc/rust-rdkafka", rev = "8 rustix = { version = "0.38", features = ["fs", "termios"] } rustls = { version = "0.21", features = ["dangerous_configuration"] } serde_json = { version = "1", default-features = false, features = ["raw_value"] } -tikv-jemalloc-sys = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] } tikv-jemallocator = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] } tower-http = { version = "0.4", features = ["add-extension", "cors", "fs"] } zstd-sys = { version = "2", features = ["std"] } @@ -300,7 +296,6 @@ rdkafka-sys = { git = "https://github.com/MaterializeInc/rust-rdkafka", rev = "8 rustix = { version = "0.38", features = ["fs", "termios"] } rustls = { version = "0.21", features = ["dangerous_configuration"] } serde_json = { version = "1", default-features = false, features = ["raw_value"] } -tikv-jemalloc-sys = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] } tikv-jemallocator = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] } tower-http = { version = "0.4", features = ["add-extension", "cors", "fs"] } zstd-sys = { version = "2", features = ["std"] } @@ -318,7 +313,6 @@ rdkafka-sys = { git = "https://github.com/MaterializeInc/rust-rdkafka", rev = "8 rustix = { version = "0.38", features = ["fs", "termios"] } rustls = { version = "0.21", features = ["dangerous_configuration"] } serde_json = { version = "1", default-features = false, features = ["raw_value"] } -tikv-jemalloc-sys = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] } tikv-jemallocator = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] } tower-http = { version = "0.4", features = ["add-extension", "cors", "fs"] } zstd-sys = { version = "2", features = ["std"] } @@ -336,7 +330,6 @@ rdkafka-sys = { git = "https://github.com/MaterializeInc/rust-rdkafka", rev = "8 rustix = { version = "0.38", features = ["fs", "termios"] } rustls = { version = "0.21", features = ["dangerous_configuration"] } serde_json = { version = "1", default-features = false, features = ["raw_value"] } -tikv-jemalloc-sys = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] } tikv-jemallocator = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] } tower-http = { version = "0.4", features = ["add-extension", "cors", "fs"] } zstd-sys = { version = "2", features = ["std"] } @@ -354,7 +347,6 @@ rdkafka-sys = { git = "https://github.com/MaterializeInc/rust-rdkafka", rev = "8 rustix = { version = "0.38", features = ["fs", "termios"] } rustls = { version = "0.21", features = ["dangerous_configuration"] } serde_json = { version = "1", default-features = false, features = ["raw_value"] } -tikv-jemalloc-sys = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] } tikv-jemallocator = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] } tower-http = { version = "0.4", features = ["add-extension", "cors", "fs"] } zstd-sys = { version = "2", features = ["std"] }