diff --git a/Cargo.toml b/Cargo.toml index 67aa014821134..71f560623002d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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" @@ -79,37 +79,38 @@ 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" @@ -118,7 +119,7 @@ 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"] } @@ -127,7 +128,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" @@ -145,33 +146,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" } diff --git a/integration_tests/feature-store/simulator/Cargo.toml b/integration_tests/feature-store/simulator/Cargo.toml index 1058ac26ed55e..e7b53c9047de2 100644 --- a/integration_tests/feature-store/simulator/Cargo.toml +++ b/integration_tests/feature-store/simulator/Cargo.toml @@ -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"] } diff --git a/lints/Cargo.toml b/lints/Cargo.toml index 14bd09faca184..758dc2bd6d7b4 100644 --- a/lints/Cargo.toml +++ b/lints/Cargo.toml @@ -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" diff --git a/src/batch/Cargo.toml b/src/batch/Cargo.toml index 619075a9f5cb0..019c33253466b 100644 --- a/src/batch/Cargo.toml +++ b/src/batch/Cargo.toml @@ -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 } @@ -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" diff --git a/src/bench/Cargo.toml b/src/bench/Cargo.toml index 2aa378d857f83..f5c36c6b9adc2 100644 --- a/src/bench/Cargo.toml +++ b/src/bench/Cargo.toml @@ -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 } diff --git a/src/cmd/Cargo.toml b/src/cmd/Cargo.toml index d73f0bef0206b..33f1efd18a2ff 100644 --- a/src/cmd/Cargo.toml +++ b/src/cmd/Cargo.toml @@ -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 } diff --git a/src/cmd_all/Cargo.toml b/src/cmd_all/Cargo.toml index 1d1c617bfa1fe..c2f49c017e369 100644 --- a/src/cmd_all/Cargo.toml +++ b/src/cmd_all/Cargo.toml @@ -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" diff --git a/src/common/Cargo.toml b/src/common/Cargo.toml index dcc80c2568328..3108e06e789f2 100644 --- a/src/common/Cargo.toml +++ b/src/common/Cargo.toml @@ -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" @@ -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" @@ -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 } @@ -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" @@ -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" } @@ -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" diff --git a/src/common/heap_profiling/Cargo.toml b/src/common/heap_profiling/Cargo.toml index 0c9b6a1794695..706f801fe4762 100644 --- a/src/common/heap_profiling/Cargo.toml +++ b/src/common/heap_profiling/Cargo.toml @@ -20,7 +20,7 @@ chrono = { version = "0.4", default-features = false, features = [ "clock", "std", ] } -parking_lot = "0.12" +parking_lot = { workspace = true } risingwave_common = { workspace = true } thiserror = "1" thiserror-ext = { workspace = true } diff --git a/src/common/metrics/Cargo.toml b/src/common/metrics/Cargo.toml index af0429c84873d..4f3e8b20936b2 100644 --- a/src/common/metrics/Cargo.toml +++ b/src/common/metrics/Cargo.toml @@ -16,14 +16,14 @@ normal = ["workspace-hack"] [dependencies] bytes = "1" -clap = { version = "4", features = ["derive"] } +clap = { workspace = true } easy-ext = "1" futures = { version = "0.3", default-features = false, features = ["alloc"] } http = "0.2" -hyper = { version = "0.14", features = ["client"] } # used by tonic +hyper = { version = "0.14", features = ["client"] } # used by tonic hytra = { workspace = true } -itertools = "0.12" -parking_lot = "0.12" +itertools = { workspace = true } +parking_lot = { workspace = true } pin-project-lite = "0.2" prometheus = { version = "0.13" } rw_iter_util = { workspace = true } diff --git a/src/common/proc_macro/Cargo.toml b/src/common/proc_macro/Cargo.toml index bbfe10baf3b07..2219dc2efaba4 100644 --- a/src/common/proc_macro/Cargo.toml +++ b/src/common/proc_macro/Cargo.toml @@ -22,7 +22,7 @@ quote = "1" proc-macro2 = { version = "1", default-features = false } syn = "1" bae = "0.1.7" -itertools = "0.12" +itertools = { workspace = true } [lints] workspace = true diff --git a/src/compute/Cargo.toml b/src/compute/Cargo.toml index 3ac4777c05d5f..817578db32631 100644 --- a/src/compute/Cargo.toml +++ b/src/compute/Cargo.toml @@ -18,13 +18,13 @@ anyhow = "1" async-trait = "0.1" await-tree = { workspace = true } chrono = { version = "0.4" } -clap = { version = "4", features = ["derive"] } +clap = { workspace = true } either = "1" foyer = { workspace = true } futures = { version = "0.3", default-features = false, features = ["alloc"] } futures-async-stream = { workspace = true } hyper = "0.14" # required by tonic -itertools = "0.12" +itertools = { workspace = true } maplit = "1.0.2" pprof = { version = "0.13", features = ["flamegraph"] } prometheus = { version = "0.13" } @@ -64,7 +64,7 @@ workspace-hack = { path = "../workspace-hack" } [dev-dependencies] futures-async-stream = { workspace = true } -rand = "0.8" +rand = { workspace = true } risingwave_hummock_sdk = { workspace = true } tempfile = "3" diff --git a/src/connector/Cargo.toml b/src/connector/Cargo.toml index 55a8f198bccf3..7b43c39961ed7 100644 --- a/src/connector/Cargo.toml +++ b/src/connector/Cargo.toml @@ -28,7 +28,7 @@ arrow-select = { workspace = true } assert_matches = "1" async-nats = "0.34" async-trait = "0.1" -auto_enums = { version = "0.8", features = ["futures03"] } +auto_enums = { workspace = true } auto_impl = "1" aws-config = { workspace = true } aws-credential-types = { workspace = true } @@ -70,7 +70,7 @@ hyper = { version = "0.14", features = [ hyper-tls = "0.5" icelake = { workspace = true } indexmap = { version = "1.9.3", features = ["serde"] } -itertools = "0.12" +itertools = { workspace = true } jni = { version = "0.21.1", features = ["invocation"] } jst = { package = 'jsonschema-transpiler', git = "https://github.com/mozilla/jsonschema-transpiler", rev = "c1a89d720d118843d8bcca51084deb0ed223e4b4" } maplit = "1.0.2" @@ -85,7 +85,7 @@ nexmark = { version = "0.2", features = ["serde"] } num-bigint = "0.4" opendal = "0.45" openssl = "0.10" -parking_lot = "0.12" +parking_lot = { workspace = true } paste = "1" postgres-openssl = "0.5.0" prometheus = { version = "0.13", features = ["process"] } @@ -166,7 +166,7 @@ expect-test = "1" paste = "1" pretty_assertions = "1" quote = "1" -rand = "0.8" +rand = { workspace = true } serde = { version = "1", features = ["derive"] } serde_yaml = "0.9" syn = { version = "1", features = ["full"] } diff --git a/src/ctl/Cargo.toml b/src/ctl/Cargo.toml index 20af56afb98e4..109d412ba1e89 100644 --- a/src/ctl/Cargo.toml +++ b/src/ctl/Cargo.toml @@ -17,13 +17,13 @@ normal = ["workspace-hack"] anyhow = "1" bytes = "1" chrono = "0.4" -clap = { version = "4", features = ["derive"] } +clap = { workspace = true } comfy-table = "7" etcd-client = { workspace = true } futures = { version = "0.3", default-features = false, features = ["alloc"] } hex = "0.4" inquire = "0.7.0" -itertools = "0.12" +itertools = { workspace = true } memcomparable = "0.2" prost = { workspace = true } regex = "1.10.0" diff --git a/src/dml/Cargo.toml b/src/dml/Cargo.toml index c429ad9238649..df0ce4ebc19d6 100644 --- a/src/dml/Cargo.toml +++ b/src/dml/Cargo.toml @@ -16,16 +16,24 @@ normal = ["workspace-hack"] [dependencies] futures = { version = "0.3", default-features = false, features = ["alloc"] } futures-async-stream = { workspace = true } -itertools = "0.12" -parking_lot = "0.12" -rand = "0.8" +itertools = { workspace = true } +parking_lot = { workspace = true } +rand = { workspace = true } risingwave_common = { workspace = true } risingwave_connector = { workspace = true } risingwave_pb = { workspace = true } rw_futures_util = { workspace = true } thiserror = "1" thiserror-ext = { workspace = true } -tokio = { version = "0.2", package = "madsim-tokio", features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal", "fs"] } +tokio = { version = "0.2", package = "madsim-tokio", features = [ + "rt", + "rt-multi-thread", + "sync", + "macros", + "time", + "signal", + "fs", +] } tracing = { version = "0.1" } [target.'cfg(not(madsim))'.dependencies] diff --git a/src/expr/core/Cargo.toml b/src/expr/core/Cargo.toml index ecea3b6b1c8d3..30f6419e05e5d 100644 --- a/src/expr/core/Cargo.toml +++ b/src/expr/core/Cargo.toml @@ -41,7 +41,7 @@ either = "1" enum-as-inner = "0.6" futures-async-stream = { workspace = true } futures-util = "0.3" -itertools = "0.12" +itertools = { workspace = true } linkme = { version = "0.3", features = ["used_linker"] } md5 = "0.7" moka = { version = "0.12", features = ["sync"] } diff --git a/src/expr/impl/Cargo.toml b/src/expr/impl/Cargo.toml index 1e9266dba5b41..082f33de2da4e 100644 --- a/src/expr/impl/Cargo.toml +++ b/src/expr/impl/Cargo.toml @@ -20,7 +20,7 @@ aho-corasick = "1" anyhow = "1" arrow-schema = { workspace = true } async-trait = "0.1" -auto_enums = "0.8" +auto_enums = { workspace = true } chrono = { version = "0.4", default-features = false, features = [ "clock", "std", @@ -31,7 +31,7 @@ futures-async-stream = { workspace = true } futures-util = "0.3" hex = "0.4" icelake = { workspace = true } -itertools = "0.12" +itertools = { workspace = true } jsonbb = "0.1.2" linkme = { version = "0.3", features = ["used_linker"] } md5 = "0.7" diff --git a/src/expr/macro/Cargo.toml b/src/expr/macro/Cargo.toml index 9b388920d2ebb..2ad4fe3510563 100644 --- a/src/expr/macro/Cargo.toml +++ b/src/expr/macro/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" proc-macro = true [dependencies] -itertools = "0.12" +itertools = { workspace = true } proc-macro2 = "1" quote = "1" syn = { version = "2", features = ["full", "extra-traits"] } diff --git a/src/frontend/Cargo.toml b/src/frontend/Cargo.toml index 65033da4d8b4c..3cba7afe82660 100644 --- a/src/frontend/Cargo.toml +++ b/src/frontend/Cargo.toml @@ -21,12 +21,12 @@ arrow-schema = { workspace = true } arrow-udf-wasm = { workspace = true } async-recursion = "1.1.0" async-trait = "0.1" -auto_enums = { version = "0.8", features = ["futures03"] } +auto_enums = { workspace = true } auto_impl = "1" base64 = "0.22" bk-tree = "0.5.0" bytes = "1" -clap = { version = "4", features = ["derive"] } +clap = { workspace = true } downcast-rs = "1.2" dyn-clone = "1.0.14" easy-ext = "1" @@ -39,14 +39,14 @@ futures = { version = "0.3", default-features = false, features = ["alloc"] } futures-async-stream = { workspace = true } iana-time-zone = "0.1" icelake = { workspace = true } -itertools = "0.12" +itertools = { workspace = true } jsonbb = "0.1.2" linkme = { version = "0.3", features = ["used_linker"] } maplit = "1" md5 = "0.7.0" memcomparable = "0.2" num-integer = "0.1" -parking_lot = "0.12" +parking_lot = { workspace = true } parse-display = "0.9" paste = "1" petgraph = "0.6" @@ -57,7 +57,7 @@ pretty-xmlish = "0.1.13" pretty_assertions = "1" prometheus = { version = "0.13", features = ["process"] } prost = { workspace = true } -rand = "0.8" +rand = { version = "0.8", features = ["small_rng"] } risingwave_batch = { workspace = true } risingwave_common = { workspace = true } risingwave_common_heap_profiling = { workspace = true } diff --git a/src/frontend/planner_test/Cargo.toml b/src/frontend/planner_test/Cargo.toml index 251045fca8879..1534e1d510b4f 100644 --- a/src/frontend/planner_test/Cargo.toml +++ b/src/frontend/planner_test/Cargo.toml @@ -16,7 +16,7 @@ normal = ["workspace-hack"] [dependencies] anyhow = "1" expect-test = "1" -itertools = "0.12" +itertools = { workspace = true } paste = "1" risingwave_expr_impl = { workspace = true } risingwave_frontend = { workspace = true } diff --git a/src/jni_core/Cargo.toml b/src/jni_core/Cargo.toml index b8ed54460025b..1e2e2fb3c8218 100644 --- a/src/jni_core/Cargo.toml +++ b/src/jni_core/Cargo.toml @@ -16,7 +16,7 @@ cfg-or-panic = "0.2" chrono = { version = "0.4", default-features = false } fs-err = "2" futures = { version = "0.3", default-features = false, features = ["alloc"] } -itertools = "0.12" +itertools = { workspace = true } jni = { version = "0.21.1", features = ["invocation"] } paste = "1" prost = { workspace = true } diff --git a/src/meta/Cargo.toml b/src/meta/Cargo.toml index fb757462adbc5..c43c43c0dc01f 100644 --- a/src/meta/Cargo.toml +++ b/src/meta/Cargo.toml @@ -23,7 +23,7 @@ aws-sdk-ec2 = { workspace = true } base64-url = { version = "2.0.0" } bytes = { version = "1", features = ["serde"] } chrono = "0.4" -clap = { version = "4", features = ["derive", "env"] } +clap = { workspace = true } comfy-table = "7" crepe = "0.1" easy-ext = "1" @@ -35,18 +35,18 @@ function_name = "0.3.0" futures = { version = "0.3", default-features = false, features = ["alloc"] } hex = "0.4" hyper = "0.14" # required by tonic -itertools = "0.12" +itertools = { workspace = true } maplit = "1.0.2" memcomparable = { version = "0.2" } mime_guess = "2" num-integer = "0.1" num-traits = "0.2" otlp-embedded = { workspace = true } -parking_lot = { version = "0.12", features = ["arc_lock"] } +parking_lot = { workspace = true } prometheus = "0.13" prometheus-http-query = "0.8" prost = { workspace = true } -rand = "0.8" +rand = { workspace = true } risingwave_backup = { workspace = true } risingwave_common = { workspace = true } risingwave_common_heap_profiling = { workspace = true } @@ -97,7 +97,7 @@ workspace-hack = { path = "../workspace-hack" } [dev-dependencies] assert_matches = "1" expect-test = "1.5" -rand = "0.8" +rand = { workspace = true } risingwave_hummock_sdk = { workspace = true } risingwave_test_runner = { workspace = true } diff --git a/src/meta/node/Cargo.toml b/src/meta/node/Cargo.toml index 122cf0618a11c..d0ab59edee998 100644 --- a/src/meta/node/Cargo.toml +++ b/src/meta/node/Cargo.toml @@ -15,11 +15,11 @@ normal = ["workspace-hack"] [dependencies] anyhow = "1" -clap = { version = "4", features = ["derive", "env"] } +clap = { workspace = true } either = "1" etcd-client = { workspace = true } futures = { version = "0.3", default-features = false, features = ["alloc"] } -itertools = "0.12" +itertools = { workspace = true } otlp-embedded = { workspace = true } prometheus-http-query = "0.8" redact = "0.1.5" diff --git a/src/meta/service/Cargo.toml b/src/meta/service/Cargo.toml index 47a984b175857..654ecee0e6a32 100644 --- a/src/meta/service/Cargo.toml +++ b/src/meta/service/Cargo.toml @@ -18,8 +18,8 @@ anyhow = "1" async-trait = "0.1" either = "1" futures = { version = "0.3", default-features = false, features = ["alloc"] } -itertools = "0.12" -rand = "0.8" +itertools = { workspace = true } +rand = { workspace = true } regex = "1" risingwave_common = { workspace = true } risingwave_connector = { workspace = true } diff --git a/src/object_store/Cargo.toml b/src/object_store/Cargo.toml index 7147144cda49a..bda496ea24f80 100644 --- a/src/object_store/Cargo.toml +++ b/src/object_store/Cargo.toml @@ -26,7 +26,7 @@ futures = { version = "0.3", default-features = false, features = ["alloc"] } hyper = { version = "0.14", features = ["tcp", "client"] } # required by aws sdk hyper-rustls = { version = "0.24.2", features = ["webpki-roots"] } hyper-tls = "0.5.0" -itertools = "0.12" +itertools = { workspace = true } madsim = "0.2.22" opendal = "0.45.1" prometheus = { version = "0.13", features = ["process"] } diff --git a/src/risedevtool/Cargo.toml b/src/risedevtool/Cargo.toml index f911a8ddebb61..a73fb078dd963 100644 --- a/src/risedevtool/Cargo.toml +++ b/src/risedevtool/Cargo.toml @@ -15,14 +15,17 @@ normal = ["workspace-hack"] [dependencies] anyhow = { version = "1", features = ["backtrace"] } -chrono = { version = "0.4", default-features = false, features = ["clock", "std"] } -clap = { version = "4", features = ["derive"] } +chrono = { version = "0.4", default-features = false, features = [ + "clock", + "std", +] } +clap = { workspace = true } console = "0.15" fs-err = "2.11.0" glob = "0.3" google-cloud-pubsub = "0.23" indicatif = "0.17" -itertools = "0.12" +itertools = { workspace = true } rdkafka = { workspace = true } redis = "0.25" regex = "1" @@ -40,7 +43,7 @@ tokio = { version = "0.2", package = "madsim-tokio", features = [ "macros", "time", "signal", - "fs" + "fs", ] } tracing = "0.1" tracing-subscriber = "0.3" diff --git a/src/risedevtool/config/Cargo.toml b/src/risedevtool/config/Cargo.toml index 3b9972c82916b..08775c624dc0b 100644 --- a/src/risedevtool/config/Cargo.toml +++ b/src/risedevtool/config/Cargo.toml @@ -9,12 +9,12 @@ repository = { workspace = true } [dependencies] anyhow = { version = "1", features = ["backtrace"] } -clap = { version = "4", features = ["derive"] } +clap = { workspace = true } console = "0.15" dialoguer = "0.11" enum-iterator = "2" fs-err = "2.11.0" -itertools = "0.12" +itertools = { workspace = true } [lints] workspace = true diff --git a/src/rpc_client/Cargo.toml b/src/rpc_client/Cargo.toml index 9c9f8d8dab845..5a85c2ac4bdc0 100644 --- a/src/rpc_client/Cargo.toml +++ b/src/rpc_client/Cargo.toml @@ -21,10 +21,10 @@ either = "1.10.0" futures = { version = "0.3", default-features = false, features = ["alloc"] } http = "0.2" hyper = "0.14" # required by tonic -itertools = "0.12.0" +itertools = { workspace = true } lru = { workspace = true } moka = { version = "0.12", features = ["future"] } -rand = "0.8" +rand = { workspace = true } risingwave_common = { workspace = true } risingwave_error = { workspace = true } risingwave_hummock_sdk = { workspace = true } diff --git a/src/sqlparser/Cargo.toml b/src/sqlparser/Cargo.toml index e9fa3637b5459..ef57da9aa62f8 100644 --- a/src/sqlparser/Cargo.toml +++ b/src/sqlparser/Cargo.toml @@ -25,7 +25,7 @@ ignored = ["workspace-hack"] normal = ["workspace-hack"] [dependencies] -itertools = "0.12" +itertools = { workspace = true } serde = { version = "1.0", features = ["derive"], optional = true } tracing = "0.1" tracing-subscriber = "0.3" diff --git a/src/storage/Cargo.toml b/src/storage/Cargo.toml index 97c36cc04a3ee..76004ef7b3f75 100644 --- a/src/storage/Cargo.toml +++ b/src/storage/Cargo.toml @@ -18,7 +18,7 @@ ahash = "0.8" anyhow = "1" arc-swap = "1" async-trait = "0.1" -auto_enums = { version = "0.8", features = ["futures03"] } +auto_enums = { workspace = true } await-tree = { workspace = true } bytes = { version = "1", features = ["serde"] } crossbeam = "0.8.2" @@ -31,16 +31,16 @@ foyer = { workspace = true } futures = { version = "0.3", default-features = false, features = ["alloc"] } futures-async-stream = { workspace = true } hex = "0.4" -itertools = "0.12" +itertools = { workspace = true } libc = "0.2" lz4 = "1.24.0" memcomparable = "0.2" more-asserts = "0.3" num-integer = "0.1" -parking_lot = "0.12" +parking_lot = { workspace = true } prometheus = { version = "0.13", features = ["process"] } prost = { workspace = true } -rand = "0.8" +rand = { workspace = true } risingwave_backup = { workspace = true } risingwave_common = { workspace = true } risingwave_common_estimate_size = { workspace = true } diff --git a/src/storage/backup/Cargo.toml b/src/storage/backup/Cargo.toml index 1516e2363b05f..ef994a38c4a15 100644 --- a/src/storage/backup/Cargo.toml +++ b/src/storage/backup/Cargo.toml @@ -18,8 +18,8 @@ anyhow = "1" async-trait = "0.1" bincode = "1.3" bytes = { version = "1", features = ["serde"] } -itertools = "0.12" -parking_lot = { version = "0.12", features = ["arc_lock"] } +itertools = { workspace = true } +parking_lot = { workspace = true } prost = { workspace = true } risingwave_common = { workspace = true } risingwave_hummock_sdk = { workspace = true } diff --git a/src/storage/compactor/Cargo.toml b/src/storage/compactor/Cargo.toml index 6c7669379850e..f9d943be27964 100644 --- a/src/storage/compactor/Cargo.toml +++ b/src/storage/compactor/Cargo.toml @@ -17,8 +17,8 @@ normal = ["workspace-hack"] [dependencies] async-trait = "0.1" await-tree = { workspace = true } -clap = { version = "4", features = ["derive"] } -parking_lot = "0.12" +clap = { workspace = true } +parking_lot = { workspace = true } prost = { workspace = true } risingwave_common = { workspace = true } risingwave_common_heap_profiling = { workspace = true } diff --git a/src/storage/hummock_sdk/Cargo.toml b/src/storage/hummock_sdk/Cargo.toml index 09f4ddfafbeaa..76f7913127f58 100644 --- a/src/storage/hummock_sdk/Cargo.toml +++ b/src/storage/hummock_sdk/Cargo.toml @@ -17,7 +17,7 @@ normal = ["workspace-hack"] bytes = "1" easy-ext = "1" hex = "0.4" -itertools = "0.12" +itertools = { workspace = true } parse-display = "0.9" prost = { workspace = true } risingwave_common = { workspace = true } diff --git a/src/storage/hummock_test/Cargo.toml b/src/storage/hummock_test/Cargo.toml index 1596ea6356ee9..63993240d32a2 100644 --- a/src/storage/hummock_test/Cargo.toml +++ b/src/storage/hummock_test/Cargo.toml @@ -17,14 +17,14 @@ normal = ["workspace-hack"] [dependencies] async-trait = "0.1" bytes = { version = "1" } -clap = { version = "4", features = ["derive"] } +clap = { workspace = true } fail = "0.5" foyer = { workspace = true } futures = { version = "0.3", default-features = false, features = ["alloc"] } futures-async-stream = "0.2.9" -itertools = "0.12" -parking_lot = "0.12" -rand = "0.8" +itertools = { workspace = true } +parking_lot = { workspace = true } +rand = { workspace = true } risingwave_common = { workspace = true } risingwave_common_service = { workspace = true } risingwave_hummock_sdk = { workspace = true } diff --git a/src/storage/hummock_trace/Cargo.toml b/src/storage/hummock_trace/Cargo.toml index ec6c9aa5ed8b9..dfcb189a45500 100644 --- a/src/storage/hummock_trace/Cargo.toml +++ b/src/storage/hummock_trace/Cargo.toml @@ -15,7 +15,7 @@ byteorder = "1" bytes = { version = "1", features = ["serde"] } futures = { version = "0.3", default-features = false, features = ["alloc"] } futures-async-stream = "0.2.9" -parking_lot = "0.12" +parking_lot = { workspace = true } prost = { workspace = true } risingwave_common = { workspace = true } risingwave_hummock_sdk = { workspace = true } @@ -23,10 +23,10 @@ risingwave_pb = { workspace = true } thiserror = "1.0" tokio = { version = "0.2", package = "madsim-tokio" } tracing = "0.1" -foyer ={ workspace = true } +foyer = { workspace = true } [dev-dependencies] -itertools = "0.12" +itertools = { workspace = true } mockall = "0.11.4" risingwave_hummock_sdk = { workspace = true } diff --git a/src/stream/Cargo.toml b/src/stream/Cargo.toml index 24e84178ce1d0..2b67865d1c8a3 100644 --- a/src/stream/Cargo.toml +++ b/src/stream/Cargo.toml @@ -19,7 +19,7 @@ anyhow = "1" async-recursion = "1" async-stream = "0.3" async-trait = "0.1" -auto_enums = "0.8" +auto_enums = { workspace = true } await-tree = { workspace = true } bytes = "1" cfg-if = "1" @@ -37,18 +37,18 @@ governor = { version = "0.6", default-features = false, features = [ "jitter", ] } hytra = "0.1.2" -itertools = "0.12" +itertools = { workspace = true } local_stats_alloc = { path = "../utils/local_stats_alloc" } lru = { workspace = true } maplit = "1.0.2" memcomparable = "0.2" multimap = "0.10" -parking_lot = "0.12" +parking_lot = { workspace = true } pin-project = "1" prehash = "1" prometheus = { version = "0.13", features = ["process"] } prost = { workspace = true } -rand = "0.8" +rand = { workspace = true } risingwave_common = { workspace = true } risingwave_common_estimate_size = { workspace = true } risingwave_connector = { workspace = true } diff --git a/src/tests/compaction_test/Cargo.toml b/src/tests/compaction_test/Cargo.toml index e73798830d237..330e8b2a3637f 100644 --- a/src/tests/compaction_test/Cargo.toml +++ b/src/tests/compaction_test/Cargo.toml @@ -18,11 +18,11 @@ normal = ["workspace-hack"] anyhow = "1" async-trait = "0.1" bytes = "1" -clap = { version = "4", features = ["derive"] } +clap = { workspace = true } foyer = { workspace = true } futures = { version = "0.3", default-features = false, features = ["alloc"] } prometheus = { version = "0.13" } -rand = "0.8" +rand = { workspace = true } risingwave_common = { workspace = true } risingwave_compactor = { workspace = true } risingwave_hummock_sdk = { workspace = true } diff --git a/src/tests/e2e_extended_mode/Cargo.toml b/src/tests/e2e_extended_mode/Cargo.toml index 4871d14108e8a..ecbf751fe1004 100644 --- a/src/tests/e2e_extended_mode/Cargo.toml +++ b/src/tests/e2e_extended_mode/Cargo.toml @@ -16,10 +16,14 @@ normal = ["workspace-hack"] [dependencies] anyhow = { version = "1", features = ["backtrace"] } chrono = { version = "0.4", features = ['serde'] } -clap = { version = "4", features = ["derive"] } +clap = { workspace = true } pg_interval = "0.4" -rust_decimal ={ version = "1.35", features = ["db-postgres"] } -tokio = { version = "0.2.24", package = "madsim-tokio", features = ["rt", "macros","rt-multi-thread"] } +rust_decimal = { version = "1.35", features = ["db-postgres"] } +tokio = { version = "0.2.24", package = "madsim-tokio", features = [ + "rt", + "macros", + "rt-multi-thread", +] } tokio-postgres = { version = "0.7", features = ["with-chrono-0_4"] } tracing = "0.1" tracing-subscriber = "0.3.17" diff --git a/src/tests/libpq_test/Cargo.toml b/src/tests/libpq_test/Cargo.toml index 846a2e1059d66..84cefac33ef6e 100644 --- a/src/tests/libpq_test/Cargo.toml +++ b/src/tests/libpq_test/Cargo.toml @@ -9,4 +9,4 @@ edition = "2021" [dependencies] anyhow = "1" libpq = "3.0" -clap = { version = "4", features = ["derive"] } +clap = { workspace = true } diff --git a/src/tests/regress/Cargo.toml b/src/tests/regress/Cargo.toml index 97b33bb0f2794..8c5478d13d52e 100644 --- a/src/tests/regress/Cargo.toml +++ b/src/tests/regress/Cargo.toml @@ -15,10 +15,18 @@ normal = ["workspace-hack"] [dependencies] anyhow = { version = "1", features = ["backtrace"] } -clap = { version = "4", features = ["derive"] } +clap = { workspace = true } path-absolutize = "3.1" similar = "2" -tokio = { version = "0.2", package = "madsim-tokio", features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal", "process"] } +tokio = { version = "0.2", package = "madsim-tokio", features = [ + "rt", + "rt-multi-thread", + "sync", + "macros", + "time", + "signal", + "process", +] } tracing = "0.1" tracing-subscriber = "0.3.17" diff --git a/src/tests/simulation/Cargo.toml b/src/tests/simulation/Cargo.toml index 4b2f9f5926efa..59fee3a7c77f1 100644 --- a/src/tests/simulation/Cargo.toml +++ b/src/tests/simulation/Cargo.toml @@ -15,21 +15,21 @@ anyhow = "1.0" async-trait = "0.1" aws-sdk-s3 = { version = "0.5", package = "madsim-aws-sdk-s3" } cfg-or-panic = "0.2" -clap = { version = "4", features = ["derive"] } +clap = { workspace = true } console = "0.15" etcd-client = { workspace = true } expect-test = "1" fail = { version = "0.5" } futures = { version = "0.3", default-features = false, features = ["alloc"] } glob = "0.3" -itertools = "0.12" +itertools = { workspace = true } lru = { workspace = true } madsim = "0.2.22" paste = "1" pin-project = "1.1" pretty_assertions = "1" prometheus = { version = "0.13" } -rand = "0.8" +rand = { workspace = true } rand_chacha = { version = "0.3.1" } rdkafka = { workspace = true } risingwave_common = { workspace = true } diff --git a/src/tests/sqlsmith/Cargo.toml b/src/tests/sqlsmith/Cargo.toml index 8b6047467777d..f0b4b425a2af5 100644 --- a/src/tests/sqlsmith/Cargo.toml +++ b/src/tests/sqlsmith/Cargo.toml @@ -16,8 +16,8 @@ normal = ["workspace-hack"] [dependencies] anyhow = "1" chrono = "0.4" -clap = { version = "4", features = ["derive"] } -itertools = "0.12" +clap = { workspace = true } +itertools = { workspace = true } rand = { version = "0.8", features = ["small_rng"] } rand_chacha = { version = "0.3.1" } regex = "1" diff --git a/src/tests/state_cleaning_test/Cargo.toml b/src/tests/state_cleaning_test/Cargo.toml index d9154309f4a99..a105360a68f6b 100644 --- a/src/tests/state_cleaning_test/Cargo.toml +++ b/src/tests/state_cleaning_test/Cargo.toml @@ -15,7 +15,7 @@ normal = ["workspace-hack"] [dependencies] anyhow = "1" -clap = { version = "4", features = ["derive"] } +clap = { workspace = true } futures = { version = "0.3", default-features = false, features = ["alloc"] } prometheus = { version = "0.13" } regex = "1" diff --git a/src/utils/iter_util/Cargo.toml b/src/utils/iter_util/Cargo.toml index e87a3ec355ece..d730c1cbc908e 100644 --- a/src/utils/iter_util/Cargo.toml +++ b/src/utils/iter_util/Cargo.toml @@ -12,7 +12,7 @@ ignored = ["workspace-hack"] normal = ["workspace-hack"] [dependencies] -itertools = "0.12" +itertools = { workspace = true } [lints] workspace = true diff --git a/src/utils/pgwire/Cargo.toml b/src/utils/pgwire/Cargo.toml index bcbfd7ecdbe38..1744fab18d250 100644 --- a/src/utils/pgwire/Cargo.toml +++ b/src/utils/pgwire/Cargo.toml @@ -16,15 +16,15 @@ normal = ["workspace-hack"] [dependencies] anyhow = { version = "1.0", default-features = false } -auto_enums = { version = "0.8", features = ["tokio1"] } +auto_enums = { workspace = true } byteorder = "1.5" bytes = "1" futures = { version = "0.3", default-features = false, features = ["alloc"] } -itertools = "0.12" +itertools = { workspace = true } jsonwebtoken = "9" openssl = "0.10.60" panic-message = "0.3" -parking_lot = "0.12" +parking_lot = { workspace = true } reqwest = "0.12.2" risingwave_common = { workspace = true } risingwave_sqlparser = { workspace = true } @@ -32,7 +32,10 @@ serde = { version = "1", features = ["derive"] } serde_json = "1" thiserror = "1" thiserror-ext = { workspace = true } -tokio = { version = "0.2", package = "madsim-tokio", features = ["rt", "macros"] } +tokio = { version = "0.2", package = "madsim-tokio", features = [ + "rt", + "macros", +] } tokio-openssl = "0.6.3" tracing = "0.1" diff --git a/src/utils/runtime/Cargo.toml b/src/utils/runtime/Cargo.toml index 0e5a156361fb7..a9ade03a9a46a 100644 --- a/src/utils/runtime/Cargo.toml +++ b/src/utils/runtime/Cargo.toml @@ -21,7 +21,7 @@ console-subscriber = "0.2.0" either = "1" futures = { version = "0.3", default-features = false, features = ["alloc"] } hostname = "0.4" -parking_lot = { version = "0.12", features = ["deadlock_detection"] } +parking_lot = { workspace = true } pprof = { version = "0.13", features = ["flamegraph"] } risingwave_common = { workspace = true } risingwave_variables = { workspace = true } @@ -35,17 +35,26 @@ tokio = { version = "0.2", package = "madsim-tokio", features = [ "macros", "time", "signal", - "fs" + "fs", ] } tracing = "0.1" tracing-opentelemetry = { workspace = true } -tracing-subscriber = { version = "0.3", features = ["fmt", "parking_lot", "std", "time", "local-time", "json"] } +tracing-subscriber = { version = "0.3", features = [ + "fmt", + "parking_lot", + "std", + "time", + "local-time", + "json", +] } [target.'cfg(not(madsim))'.dependencies] opentelemetry = { workspace = true } opentelemetry-otlp = { workspace = true } opentelemetry-semantic-conventions = { workspace = true } -opentelemetry_sdk = { workspace = true, features = ["rt-tokio"] } # only enable `rt-tokio` feature under non-madsim target +opentelemetry_sdk = { workspace = true, features = [ + "rt-tokio", +] } # only enable `rt-tokio` feature under non-madsim target workspace-hack = { path = "../../workspace-hack" } [lints]