From ed96064ebfcd0dfa489ece72f8c1eaab1ad63811 Mon Sep 17 00:00:00 2001 From: xxchan Date: Tue, 19 Sep 2023 17:48:55 +0800 Subject: [PATCH] chore: fix duplicated jeprof (again) (#12424) --- .config/hakari.toml | 8 +-- Cargo.lock | 15 ----- src/workspace-hack/Cargo.toml | 102 ---------------------------------- 3 files changed, 4 insertions(+), 121 deletions(-) diff --git a/.config/hakari.toml b/.config/hakari.toml index 2aa25a035985a..4d9ec4b357346 100644 --- a/.config/hakari.toml +++ b/.config/hakari.toml @@ -15,10 +15,10 @@ resolver = "2" # Add triples corresponding to platforms commonly used by developers here. # https://doc.rust-lang.org/rustc/platform-support.html platforms = [ - "x86_64-unknown-linux-gnu", - "aarch64-unknown-linux-gnu", - "x86_64-apple-darwin", - "aarch64-apple-darwin", + # "x86_64-unknown-linux-gnu", + # "aarch64-unknown-linux-gnu", + # "x86_64-apple-darwin", + # "aarch64-apple-darwin", ] # Write out exact versions rather than a semver range. (Defaults to false.) diff --git a/Cargo.lock b/Cargo.lock index 36a3068229fe5..12f7be03b7d2c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9903,11 +9903,9 @@ dependencies = [ "aws-credential-types", "aws-sdk-s3", "aws-smithy-client", - "axum", "base64 0.21.3", "bit-vec", "bitflags 2.4.0", - "byteorder", "bytes", "cc", "chrono", @@ -9946,18 +9944,12 @@ dependencies = [ "log", "madsim-rdkafka", "madsim-tokio", - "memchr", - "mime_guess", - "miniz_oxide", "mio", "multimap", "nom", "num-bigint", "num-integer", "num-traits", - "once_cell", - "openssl-sys", - "opentelemetry", "opentelemetry_api", "opentelemetry_sdk", "parking_lot 0.12.1", @@ -9972,15 +9964,12 @@ dependencies = [ "rand", "rand_chacha", "rand_core", - "rdkafka-sys", "regex", "regex-automata 0.3.8", "regex-syntax 0.7.5", "reqwest", "ring", "rust_decimal", - "rustix 0.38.11", - "rustls 0.21.7", "scopeguard", "serde", "serde_json", @@ -9989,8 +9978,6 @@ dependencies = [ "subtle", "syn 1.0.109", "syn 2.0.33", - "tikv-jemalloc-sys", - "tikv-jemallocator", "time", "time-macros", "tinyvec", @@ -10002,7 +9989,6 @@ dependencies = [ "toml_edit", "tonic", "tower", - "tower-http", "tracing", "tracing-core", "tracing-subscriber", @@ -10010,7 +9996,6 @@ dependencies = [ "unicode-normalization", "url", "uuid", - "zstd-sys", ] [[package]] diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml index 5d5d6d7bd0902..4f60cf6c03f92 100644 --- a/src/workspace-hack/Cargo.toml +++ b/src/workspace-hack/Cargo.toml @@ -152,106 +152,4 @@ time-macros = { version = "0.2", default-features = false, features = ["formatti toml_datetime = { version = "0.6", default-features = false, features = ["serde"] } toml_edit = { version = "0.19", features = ["serde"] } -[target.x86_64-unknown-linux-gnu.dependencies] -axum = { version = "0.6" } -byteorder = { version = "1", features = ["i128"] } -memchr = { version = "2" } -mime_guess = { version = "2" } -miniz_oxide = { version = "0.7", default-features = false, features = ["with-alloc"] } -once_cell = { version = "1", features = ["unstable"] } -openssl-sys = { version = "0.9", default-features = false, features = ["vendored"] } -opentelemetry = { version = "0.20", default-features = false, features = ["metrics", "rt-tokio", "trace"] } -opentelemetry_sdk = { version = "0.20", default-features = false, features = ["rt-tokio"] } -rdkafka-sys = { git = "https://github.com/MaterializeInc/rust-rdkafka", rev = "8ea07c4", default-features = false, features = ["cmake-build", "gssapi", "libz", "ssl-vendored", "zstd"] } -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"] } - -[target.x86_64-unknown-linux-gnu.build-dependencies] -memchr = { version = "2" } -miniz_oxide = { version = "0.7", default-features = false, features = ["with-alloc"] } -once_cell = { version = "1", features = ["unstable"] } -rustix = { version = "0.38", features = ["fs", "termios"] } -serde_json = { version = "1", default-features = false, features = ["raw_value"] } - -[target.aarch64-unknown-linux-gnu.dependencies] -axum = { version = "0.6" } -byteorder = { version = "1", features = ["i128"] } -memchr = { version = "2" } -mime_guess = { version = "2" } -miniz_oxide = { version = "0.7", default-features = false, features = ["with-alloc"] } -once_cell = { version = "1", features = ["unstable"] } -openssl-sys = { version = "0.9", default-features = false, features = ["vendored"] } -opentelemetry = { version = "0.20", default-features = false, features = ["metrics", "rt-tokio", "trace"] } -opentelemetry_sdk = { version = "0.20", default-features = false, features = ["rt-tokio"] } -rdkafka-sys = { git = "https://github.com/MaterializeInc/rust-rdkafka", rev = "8ea07c4", default-features = false, features = ["cmake-build", "gssapi", "libz", "ssl-vendored", "zstd"] } -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"] } - -[target.aarch64-unknown-linux-gnu.build-dependencies] -memchr = { version = "2" } -miniz_oxide = { version = "0.7", default-features = false, features = ["with-alloc"] } -once_cell = { version = "1", features = ["unstable"] } -rustix = { version = "0.38", features = ["fs", "termios"] } -serde_json = { version = "1", default-features = false, features = ["raw_value"] } - -[target.x86_64-apple-darwin.dependencies] -axum = { version = "0.6" } -memchr = { version = "2" } -mime_guess = { version = "2" } -miniz_oxide = { version = "0.7", default-features = false, features = ["with-alloc"] } -once_cell = { version = "1", features = ["unstable"] } -openssl-sys = { version = "0.9", default-features = false, features = ["vendored"] } -opentelemetry = { version = "0.20", default-features = false, features = ["metrics", "rt-tokio", "trace"] } -opentelemetry_sdk = { version = "0.20", default-features = false, features = ["rt-tokio"] } -rdkafka-sys = { git = "https://github.com/MaterializeInc/rust-rdkafka", rev = "8ea07c4", default-features = false, features = ["cmake-build", "gssapi", "libz", "ssl-vendored", "zstd"] } -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"] } - -[target.x86_64-apple-darwin.build-dependencies] -memchr = { version = "2" } -miniz_oxide = { version = "0.7", default-features = false, features = ["with-alloc"] } -once_cell = { version = "1", features = ["unstable"] } -rustix = { version = "0.38", features = ["fs", "termios"] } -serde_json = { version = "1", default-features = false, features = ["raw_value"] } - -[target.aarch64-apple-darwin.dependencies] -axum = { version = "0.6" } -memchr = { version = "2" } -mime_guess = { version = "2" } -miniz_oxide = { version = "0.7", default-features = false, features = ["with-alloc"] } -once_cell = { version = "1", features = ["unstable"] } -openssl-sys = { version = "0.9", default-features = false, features = ["vendored"] } -opentelemetry = { version = "0.20", default-features = false, features = ["metrics", "rt-tokio", "trace"] } -opentelemetry_sdk = { version = "0.20", default-features = false, features = ["rt-tokio"] } -rdkafka-sys = { git = "https://github.com/MaterializeInc/rust-rdkafka", rev = "8ea07c4", default-features = false, features = ["cmake-build", "gssapi", "libz", "ssl-vendored", "zstd"] } -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"] } - -[target.aarch64-apple-darwin.build-dependencies] -memchr = { version = "2" } -miniz_oxide = { version = "0.7", default-features = false, features = ["with-alloc"] } -once_cell = { version = "1", features = ["unstable"] } -rustix = { version = "0.38", features = ["fs", "termios"] } -serde_json = { version = "1", default-features = false, features = ["raw_value"] } - ### END HAKARI SECTION