Skip to content

Commit 72ab479

Browse files
committed
chore: make tokio a workspace dependency
Signed-off-by: Chojan Shang <[email protected]>
1 parent f97a208 commit 72ab479

File tree

10 files changed

+11
-20
lines changed

10 files changed

+11
-20
lines changed

Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ serde_json = "1"
7575
sqlparser = { version = "0.43.0", features = ["visitor"] }
7676
tempfile = "3"
7777
thiserror = "1.0.44"
78+
tokio = { version = "1.36", features = ["macros", "rt", "rt-multi-thread", "sync", "fs", "parking_lot"] }
7879
url = "2.2"
7980

8081
[profile.release]

benchmarks/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ serde_json = { workspace = true }
4646
snmalloc-rs = { version = "0.3", optional = true }
4747
structopt = { version = "0.3", default-features = false }
4848
test-utils = { path = "../test-utils/", version = "0.1.0" }
49-
tokio = { version = "^1.0", features = ["macros", "rt", "rt-multi-thread", "parking_lot"] }
49+
tokio = { workspace = true }
5050

5151
[dev-dependencies]
5252
datafusion-proto = { path = "../datafusion/proto", version = "35.0.0" }

datafusion-cli/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ parking_lot = { version = "0.12" }
4646
parquet = { version = "50.0.0", default-features = false }
4747
regex = "1.8"
4848
rustyline = "11.0"
49-
tokio = { version = "1.24", features = ["macros", "rt", "rt-multi-thread", "sync", "parking_lot", "signal"] }
49+
tokio = { workspace = true }
5050
url = "2.2"
5151

5252
[dev-dependencies]

datafusion-examples/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ prost-derive = { version = "0.12", default-features = false }
5353
serde = { version = "1.0.136", features = ["derive"] }
5454
serde_json = { workspace = true }
5555
tempfile = { workspace = true }
56-
tokio = { version = "1.0", features = ["macros", "rt", "rt-multi-thread", "sync", "parking_lot"] }
56+
tokio = { workspace = true }
5757
tonic = "0.11"
5858
url = { workspace = true }
5959
uuid = "1.2"

datafusion/core/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ pin-project-lite = "^0.2.7"
9090
rand = { workspace = true }
9191
sqlparser = { workspace = true }
9292
tempfile = { workspace = true }
93-
tokio = { version = "1.28", features = ["macros", "rt", "sync"] }
93+
tokio = { workspace = true }
9494
tokio-util = { version = "0.7.4", features = ["io"], optional = true }
9595
url = { workspace = true }
9696
uuid = { version = "1.0", features = ["v4"] }
@@ -116,7 +116,6 @@ rust_decimal = { version = "1.27.0", features = ["tokio-pg"] }
116116
serde_json = { workspace = true }
117117
test-utils = { path = "../../test-utils" }
118118
thiserror = { workspace = true }
119-
tokio = { version = "1.28", features = ["macros", "rt", "rt-multi-thread", "sync", "fs", "parking_lot"] }
120119
tokio-postgres = "0.7.7"
121120
[target.'cfg(not(target_os = "windows"))'.dev-dependencies]
122121
nix = { version = "0.27.1", features = ["fs"] }

datafusion/physical-expr/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ criterion = "0.5"
7777
datafusion = { workspace = true }
7878
rand = { workspace = true }
7979
rstest = { workspace = true }
80-
tokio = { version = "1.28", features = ["rt-multi-thread"] }
80+
tokio = { workspace = true }
8181

8282
[[bench]]
8383
harness = false

datafusion/physical-plan/Cargo.toml

+2-10
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,10 @@ once_cell = "1.18.0"
5656
parking_lot = { workspace = true }
5757
pin-project-lite = "^0.2.7"
5858
rand = { workspace = true }
59-
tokio = { version = "1.28", features = ["sync"] }
59+
tokio = { workspace = true }
6060
uuid = { version = "^1.2", features = ["v4"] }
6161

6262
[dev-dependencies]
6363
rstest = { workspace = true }
6464
rstest_reuse = "0.6.0"
65-
termtree = "0.4.1"
66-
tokio = { version = "1.28", features = [
67-
"macros",
68-
"rt",
69-
"rt-multi-thread",
70-
"sync",
71-
"fs",
72-
"parking_lot",
73-
] }
65+
termtree = "0.4.1"

datafusion/proto/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ serde_json = { workspace = true, optional = true }
5656
[dev-dependencies]
5757
doc-comment = { workspace = true }
5858
strum = { version = "0.26.1", features = ["derive"] }
59-
tokio = { version = "1.18", features = ["rt-multi-thread"] }
59+
tokio = { workspace = true }

datafusion/sqllogictest/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ sqllogictest = "0.19.0"
5151
sqlparser = { workspace = true }
5252
tempfile = { workspace = true }
5353
thiserror = { workspace = true }
54-
tokio = { version = "1.0" }
54+
tokio = { workspace = true }
5555
tokio-postgres = { version = "0.7.7", optional = true }
5656

5757
[features]
@@ -61,7 +61,6 @@ postgres = ["bytes", "chrono", "tokio-postgres", "postgres-types", "postgres-pro
6161
[dev-dependencies]
6262
env_logger = { workspace = true }
6363
num_cpus = { workspace = true }
64-
tokio = { version = "1.0", features = ["rt-multi-thread"] }
6564

6665
[[test]]
6766
harness = false

datafusion/substrait/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ prost-types = "0.12"
3939
substrait = "0.24.0"
4040

4141
[dev-dependencies]
42-
tokio = "1.17"
42+
tokio = { workspace = true }
4343

4444
[features]
4545
protoc = ["substrait/protoc"]

0 commit comments

Comments
 (0)