Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): extract some common deps to workspace #16213

Merged
merged 2 commits into from
Apr 9, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
185 changes: 96 additions & 89 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,70 +1,70 @@
[workspace]
members = [
"scripts/source/prepare_ci_pubsub",
"src/batch",
"src/bench",
"src/cmd",
"src/cmd_all",
"src/common",
"src/common/common_service",
"src/common/estimate_size",
"src/common/fields-derive",
"src/common/heap_profiling",
"src/common/metrics",
"src/compute",
"src/connector",
"src/connector/with_options",
"src/ctl",
"src/dml",
"src/error",
"src/expr/core",
"src/expr/impl",
"src/expr/macro",
"src/expr/udf",
"src/frontend",
"src/frontend/macro",
"src/frontend/planner_test",
"src/java_binding",
"src/jni_core",
"src/meta",
"src/meta/dashboard",
"src/meta/model_v2",
"src/meta/model_v2/migration",
"src/meta/node",
"src/meta/service",
"src/object_store",
"src/prost",
"src/prost/helpers",
"src/risedevtool",
"src/risedevtool/config",
"src/rpc_client",
"src/sqlparser",
"src/sqlparser/test_runner",
"src/storage",
"src/storage/backup",
"src/storage/compactor",
"src/storage/hummock_sdk",
"src/storage/hummock_test",
"src/stream",
"src/stream/spill_test",
"src/test_runner",
"src/tests/compaction_test",
"src/tests/e2e_extended_mode",
"src/tests/regress",
"src/tests/simulation",
"src/tests/sqlsmith",
"src/tests/state_cleaning_test",
"src/utils/delta_btree_map",
"src/utils/futures_util",
"src/utils/iter_util",
"src/utils/local_stats_alloc",
"src/utils/pgwire",
"src/utils/resource_util",
"src/utils/runtime",
"src/utils/sync-point",
"src/utils/variables",
"src/utils/workspace-config",
"src/workspace-hack",
"scripts/source/prepare_ci_pubsub",
"src/batch",
"src/bench",
"src/cmd",
"src/cmd_all",
"src/common",
"src/common/common_service",
"src/common/estimate_size",
"src/common/fields-derive",
"src/common/heap_profiling",
"src/common/metrics",
"src/compute",
"src/connector",
"src/connector/with_options",
"src/ctl",
"src/dml",
"src/error",
"src/expr/core",
"src/expr/impl",
"src/expr/macro",
"src/expr/udf",
"src/frontend",
"src/frontend/macro",
"src/frontend/planner_test",
"src/java_binding",
"src/jni_core",
"src/meta",
"src/meta/dashboard",
"src/meta/model_v2",
"src/meta/model_v2/migration",
"src/meta/node",
"src/meta/service",
"src/object_store",
"src/prost",
"src/prost/helpers",
"src/risedevtool",
"src/risedevtool/config",
"src/rpc_client",
"src/sqlparser",
"src/sqlparser/test_runner",
"src/storage",
"src/storage/backup",
"src/storage/compactor",
"src/storage/hummock_sdk",
"src/storage/hummock_test",
"src/stream",
"src/stream/spill_test",
"src/test_runner",
"src/tests/compaction_test",
"src/tests/e2e_extended_mode",
"src/tests/regress",
"src/tests/simulation",
"src/tests/sqlsmith",
"src/tests/state_cleaning_test",
"src/utils/delta_btree_map",
"src/utils/futures_util",
"src/utils/iter_util",
"src/utils/local_stats_alloc",
"src/utils/pgwire",
"src/utils/resource_util",
"src/utils/runtime",
"src/utils/sync-point",
"src/utils/variables",
"src/utils/workspace-config",
"src/workspace-hack",
]
exclude = ["e2e_test/udf/wasm", "lints"]
resolver = "2"
Expand All @@ -79,45 +79,46 @@ repository = "https://github.com/risingwavelabs/risingwave"

[workspace.dependencies]
foyer = "0.6"
auto_enums = { version = "0.8", features = ["futures03", "tokio1"] }
await-tree = "0.2.1"
aws-config = { version = "1", default-features = false, features = [
"behavior-version-latest",
"rt-tokio",
"rustls",
"behavior-version-latest",
"rt-tokio",
"rustls",
] }
aws-credential-types = { version = "1", default-features = false, features = [
"hardcoded-credentials",
"hardcoded-credentials",
] }
aws-sdk-kinesis = { version = "1", default-features = false, features = [
"rt-tokio",
"rustls",
"rt-tokio",
"rustls",
] }
aws-sdk-s3 = { version = "1", default-features = false, features = [
"rt-tokio",
"rustls",
"rt-tokio",
"rustls",
] }
# To bump the version of aws-sdk-ec2, check the README of https://github.com/risingwavelabs/rw-aws-sdk-ec2
aws-sdk-ec2 = { package = "rw-aws-sdk-ec2", version = "1", default-features = false, features = [
"rt-tokio",
"rustls",
"rt-tokio",
"rustls",
] }
aws-sdk-sqs = { version = "1", default-features = false, features = [
"rt-tokio",
"rustls",
"rt-tokio",
"rustls",
] }
aws-smithy-http = "0.60"
aws-smithy-runtime-api = "1"
aws-smithy-runtime = "1"
aws-smithy-types = { version = "1", default-features = false, features = [
"hyper-0-14-x", # required by aws sdk
"hyper-0-14-x", # required by aws sdk
] }
aws-endpoint = "0.60"
aws-types = "1"
etcd-client = { package = "madsim-etcd-client", version = "0.4" }
futures-async-stream = "0.2.9"
hytra = "0.1"
rdkafka = { package = "madsim-rdkafka", version = "0.3.4", features = [
"cmake-build",
"cmake-build",
] }
hashbrown = { version = "0.14", features = ["ahash", "inline-more", "nightly"] }
criterion = { version = "0.5", features = ["async_futures"] }
Expand All @@ -126,7 +127,7 @@ tonic-build = { package = "madsim-tonic-build", version = "0.4.2" }
otlp-embedded = { git = "https://github.com/risingwavelabs/otlp-embedded", rev = "492c244e0be91feb659c0cd48a624bbd96045a33" }
prost = { version = "0.12" }
icelake = { git = "https://github.com/icelake-io/icelake", rev = "54fd72fbd1dd8c592f05eeeb79223c8a6a33c297", features = [
"prometheus",
"prometheus",
] }
arrow-array = "50"
arrow-arith = "50"
Expand All @@ -144,33 +145,39 @@ arrow-array-deltalake = { package = "arrow-array", version = "48.0.1" }
arrow-buffer-deltalake = { package = "arrow-buffer", version = "48.0.1" }
arrow-cast-deltalake = { package = "arrow-cast", version = "48.0.1" }
arrow-schema-deltalake = { package = "arrow-schema", version = "48.0.1" }
clap = { version = "4", features = ["cargo", "derive", "env"] }
# Use a forked version which removes the dependencies on dynamo db to reduce
# compile time and binary size.
deltalake = { git = "https://github.com/risingwavelabs/delta-rs", rev = "5c2dccd4640490202ffe98adbd13b09cef8e007b", features = [
"s3-no-concurrent-write",
"gcs",
"s3-no-concurrent-write",
"gcs",
] }
itertools = "0.12.0"
lru = { git = "https://github.com/risingwavelabs/lru-rs.git", rev = "2682b85" }
parquet = "50"
thiserror-ext = "0.0.11"
tikv-jemalloc-ctl = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9" }
tikv-jemallocator = { git = "https://github.com/risingwavelabs/jemallocator.git", features = [
"profiling",
"stats",
"profiling",
"stats",
], rev = "64a2d9" }
opentelemetry = "0.21"
opentelemetry-otlp = "0.14"
opentelemetry_sdk = { version = "0.21", default-features = false }
opentelemetry-semantic-conventions = "0.13"
parking_lot = { version = "0.12", features = [
"arc_lock",
"deadlock_detection",
] }
sea-orm = { version = "0.12.14", features = [
"sqlx-mysql",
"sqlx-postgres",
"sqlx-sqlite",
"runtime-tokio-native-tls",
"sqlx-mysql",
"sqlx-postgres",
"sqlx-sqlite",
"runtime-tokio-native-tls",
] }
tokio-util = "0.7"
tracing-opentelemetry = "0.22"

rand = { version = "0.8", features = ["small_rng"] }
risingwave_backup = { path = "./src/storage/backup" }
risingwave_batch = { path = "./src/batch" }
risingwave_cmd = { path = "./src/cmd" }
Expand Down
6 changes: 3 additions & 3 deletions integration_tests/feature-store/simulator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
tokio = { version = "1", features=["macros","rt", "rt-multi-thread"]}
tokio = { version = "1", features = ["macros", "rt", "rt-multi-thread"] }
tonic = "0.11.0"
reqwest = { version = "0.11"}
reqwest = { version = "0.11" }
serde_json = "1.0"
serde_derive = "1.0"
rand = "0.8"
rand = { workspace = true }
clap = "4.4.6"
prost = "0.12"
serde = { version = "1", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion lints/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ path = "ui/format_error.rs"
[dependencies]
clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "6fd0258e45105161b7e759a22e7350958e5cb0b1" }
dylint_linting = "2.6.0"
itertools = "0.12"
itertools = { workspace = true }

[dev-dependencies]
dylint_testing = "2.6.0"
Expand Down
8 changes: 4 additions & 4 deletions src/batch/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ futures-util = "0.3"
hashbrown = { workspace = true }
hytra = "0.1.2"
icelake = { workspace = true }
itertools = "0.12"
itertools = { workspace = true }
memcomparable = "0.2"
parking_lot = { version = "0.12", features = ["arc_lock"] }
parking_lot = { workspace = true }
paste = "1"
prometheus = { version = "0.13", features = ["process"] }
rand = "0.8"
rand = { workspace = true }
risingwave_common = { workspace = true }
risingwave_common_estimate_size = { workspace = true }
risingwave_connector = { workspace = true }
Expand Down Expand Up @@ -68,7 +68,7 @@ workspace-hack = { path = "../workspace-hack" }

[dev-dependencies]
criterion = { workspace = true, features = ["async_tokio", "async"] }
rand = "0.8"
rand = { workspace = true }
risingwave_expr_impl = { workspace = true }
risingwave_hummock_sdk = { workspace = true }
tempfile = "3"
Expand Down
8 changes: 4 additions & 4 deletions src/bench/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ aws-smithy-types = { workspace = true }
bcc = { version = "0.0.33", optional = true }
bytes = "1"
bytesize = { version = "1", features = ["serde"] }
clap = { version = "4", features = ["derive"] }
clap = { workspace = true }
futures = { version = "0.3", default-features = false, features = ["alloc"] }
futures-async-stream = { workspace = true }
hdrhistogram = "7"
itertools = "0.12"
itertools = { workspace = true }
libc = "0.2"
opentelemetry = { workspace = true, optional = true }
parking_lot = "0.12"
parking_lot = { workspace = true }
prometheus = { version = "0.13", features = ["process"] }
rand = "0.8"
rand = { workspace = true }
risingwave_common = { workspace = true }
risingwave_connector = { workspace = true }
risingwave_pb = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ignored = ["workspace-hack", "workspace-config", "task_stats_alloc"]
normal = ["workspace-hack", "workspace-config", "task_stats_alloc"]

[dependencies]
clap = { version = "4", features = ["derive"] }
clap = { workspace = true }
prometheus = { version = "0.13" }
risingwave_common = { workspace = true }
risingwave_compactor = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion src/cmd_all/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ignored = ["workspace-hack", "workspace-config", "task_stats_alloc"]

[dependencies]
anyhow = "1"
clap = { version = "4", features = ["cargo", "derive"] }
clap = { workspace = true }
console = "0.15"
const-str = "0.5"
home = "0.5"
Expand Down
12 changes: 6 additions & 6 deletions src/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ arrow-cast-deltalake = { workspace = true }
arrow-schema = { workspace = true }
arrow-schema-deltalake = { workspace = true }
async-trait = "0.1"
auto_enums = "0.8"
auto_enums = { workspace = true }
auto_impl = "1"
bitflags = "2"
byteorder = "1"
Expand All @@ -35,7 +35,7 @@ chrono = { version = "0.4", default-features = false, features = [
"std",
] }
chrono-tz = { version = "0.8", features = ["case-insensitive"] }
clap = { version = "4", features = ["derive"] }
clap = { workspace = true }
comfy-table = "7"
crc32fast = "1"
easy-ext = "1"
Expand All @@ -52,7 +52,7 @@ hex = "0.4.3"
http = "0.2"
humantime = "2.1"
hytra = { workspace = true }
itertools = "0.12"
itertools = { workspace = true }
itoa = "1.0"
jsonbb = "0.1.2"
lru = { workspace = true }
Expand All @@ -62,7 +62,7 @@ num-traits = "0.2"
number_prefix = "0.4.0"
opentelemetry = { workspace = true }
opentelemetry_sdk = { workspace = true }
parking_lot = "0.12"
parking_lot = { workspace = true }
parse-display = "0.9"
paste = "1"
pin-project-lite = "0.2"
Expand All @@ -73,7 +73,7 @@ postgres-types = { version = "0.2.6", features = [
] }
prometheus = { version = "0.13" }
prost = { workspace = true }
rand = "0.8"
rand = { workspace = true }
regex = "1"
reqwest = { version = "0.12.2", features = ["json"] }
risingwave-fields-derive = { path = "./fields-derive" }
Expand Down Expand Up @@ -138,7 +138,7 @@ criterion = { workspace = true }
expect-test = "1"
more-asserts = "0.3"
pretty_assertions = "1"
rand = "0.8"
rand = { workspace = true }
rusty-fork = "0.3"
tempfile = "3"

Expand Down
Loading
Loading