This is an automated email from the ASF dual-hosted git repository.
alamb pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new 24bbae4529 chore: make tokio a workspace dependency (#9187)
24bbae4529 is described below
commit 24bbae4529dd4b1470e9bf441f83bebee415f43c
Author: Chojan Shang <[email protected]>
AuthorDate: Mon Feb 12 20:03:27 2024 +0800
chore: make tokio a workspace dependency (#9187)
* chore: make tokio a workspace dependency
Signed-off-by: Chojan Shang <[email protected]>
* chore: make some test happy
Signed-off-by: Chojan Shang <[email protected]>
* chore: try to make wasm-pack happy
Signed-off-by: Chojan Shang <[email protected]>
* chore: make ci happy
Signed-off-by: Chojan Shang <[email protected]>
* chore: adopt suggestions
Signed-off-by: Chojan Shang <[email protected]>
* chore: make fmt check happy
Signed-off-by: Chojan Shang <[email protected]>
* toml format
* more tomlfmt
---------
Signed-off-by: Chojan Shang <[email protected]>
Co-authored-by: Andrew Lamb <[email protected]>
---
Cargo.toml | 1 +
benchmarks/Cargo.toml | 2 +-
datafusion-examples/Cargo.toml | 2 +-
datafusion/core/Cargo.toml | 3 +--
datafusion/physical-expr/Cargo.toml | 2 +-
datafusion/physical-plan/Cargo.toml | 7 ++-----
datafusion/proto/Cargo.toml | 2 +-
datafusion/sqllogictest/Cargo.toml | 4 ++--
datafusion/substrait/Cargo.toml | 2 +-
9 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index e99618dd9f..20c3173064 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -75,6 +75,7 @@ serde_json = "1"
sqlparser = { version = "0.43.0", features = ["visitor"] }
tempfile = "3"
thiserror = "1.0.44"
+tokio = { version = "1.36", features = ["macros", "rt", "sync"] }
url = "2.2"
[profile.release]
diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml
index ced77c73f5..3ee5474107 100644
--- a/benchmarks/Cargo.toml
+++ b/benchmarks/Cargo.toml
@@ -46,7 +46,7 @@ serde_json = { workspace = true }
snmalloc-rs = { version = "0.3", optional = true }
structopt = { version = "0.3", default-features = false }
test-utils = { path = "../test-utils/", version = "0.1.0" }
-tokio = { version = "^1.0", features = ["macros", "rt", "rt-multi-thread",
"parking_lot"] }
+tokio = { workspace = true, features = ["rt-multi-thread", "parking_lot"] }
[dev-dependencies]
datafusion-proto = { path = "../datafusion/proto", version = "35.0.0" }
diff --git a/datafusion-examples/Cargo.toml b/datafusion-examples/Cargo.toml
index 6a9cd793d1..0fb49a20a8 100644
--- a/datafusion-examples/Cargo.toml
+++ b/datafusion-examples/Cargo.toml
@@ -53,7 +53,7 @@ prost-derive = { version = "0.12", default-features = false }
serde = { version = "1.0.136", features = ["derive"] }
serde_json = { workspace = true }
tempfile = { workspace = true }
-tokio = { version = "1.0", features = ["macros", "rt", "rt-multi-thread",
"sync", "parking_lot"] }
+tokio = { workspace = true, features = ["rt-multi-thread", "parking_lot"] }
tonic = "0.11"
url = { workspace = true }
uuid = "1.2"
diff --git a/datafusion/core/Cargo.toml b/datafusion/core/Cargo.toml
index 2d795d0f83..429cf35fcd 100644
--- a/datafusion/core/Cargo.toml
+++ b/datafusion/core/Cargo.toml
@@ -90,7 +90,7 @@ pin-project-lite = "^0.2.7"
rand = { workspace = true }
sqlparser = { workspace = true }
tempfile = { workspace = true }
-tokio = { version = "1.28", features = ["macros", "rt", "sync"] }
+tokio = { workspace = true, feature = ["rt-multi-thread", "parking_lot"] }
tokio-util = { version = "0.7.4", features = ["io"], optional = true }
url = { workspace = true }
uuid = { version = "1.0", features = ["v4"] }
@@ -116,7 +116,6 @@ rust_decimal = { version = "1.27.0", features =
["tokio-pg"] }
serde_json = { workspace = true }
test-utils = { path = "../../test-utils" }
thiserror = { workspace = true }
-tokio = { version = "1.28", features = ["macros", "rt", "rt-multi-thread",
"sync", "fs", "parking_lot"] }
tokio-postgres = "0.7.7"
[target.'cfg(not(target_os = "windows"))'.dev-dependencies]
nix = { version = "0.27.1", features = ["fs"] }
diff --git a/datafusion/physical-expr/Cargo.toml
b/datafusion/physical-expr/Cargo.toml
index 509fe778cc..e040e71233 100644
--- a/datafusion/physical-expr/Cargo.toml
+++ b/datafusion/physical-expr/Cargo.toml
@@ -77,7 +77,7 @@ criterion = "0.5"
datafusion = { workspace = true }
rand = { workspace = true }
rstest = { workspace = true }
-tokio = { version = "1.28", features = ["rt-multi-thread"] }
+tokio = { workspace = true, features = ["rt-multi-thread"] }
[[bench]]
harness = false
diff --git a/datafusion/physical-plan/Cargo.toml
b/datafusion/physical-plan/Cargo.toml
index 1c638d9c18..74650b5b06 100644
--- a/datafusion/physical-plan/Cargo.toml
+++ b/datafusion/physical-plan/Cargo.toml
@@ -56,18 +56,15 @@ once_cell = "1.18.0"
parking_lot = { workspace = true }
pin-project-lite = "^0.2.7"
rand = { workspace = true }
-tokio = { version = "1.28", features = ["sync"] }
+tokio = { workspace = true }
uuid = { version = "^1.2", features = ["v4"] }
[dev-dependencies]
rstest = { workspace = true }
rstest_reuse = "0.6.0"
termtree = "0.4.1"
-tokio = { version = "1.28", features = [
- "macros",
- "rt",
+tokio = { workspace = true, features = [
"rt-multi-thread",
- "sync",
"fs",
"parking_lot",
] }
diff --git a/datafusion/proto/Cargo.toml b/datafusion/proto/Cargo.toml
index 4d8d1c159f..a1032d28a2 100644
--- a/datafusion/proto/Cargo.toml
+++ b/datafusion/proto/Cargo.toml
@@ -56,4 +56,4 @@ serde_json = { workspace = true, optional = true }
[dev-dependencies]
doc-comment = { workspace = true }
strum = { version = "0.26.1", features = ["derive"] }
-tokio = { version = "1.18", features = ["rt-multi-thread"] }
+tokio = { workspace = true, features = ["rt-multi-thread"] }
diff --git a/datafusion/sqllogictest/Cargo.toml
b/datafusion/sqllogictest/Cargo.toml
index 7185508289..4f8d1b6ac4 100644
--- a/datafusion/sqllogictest/Cargo.toml
+++ b/datafusion/sqllogictest/Cargo.toml
@@ -51,7 +51,7 @@ sqllogictest = "0.19.0"
sqlparser = { workspace = true }
tempfile = { workspace = true }
thiserror = { workspace = true }
-tokio = { version = "1.0" }
+tokio = { workspace = true }
tokio-postgres = { version = "0.7.7", optional = true }
[features]
@@ -61,7 +61,7 @@ postgres = ["bytes", "chrono", "tokio-postgres",
"postgres-types", "postgres-pro
[dev-dependencies]
env_logger = { workspace = true }
num_cpus = { workspace = true }
-tokio = { version = "1.0", features = ["rt-multi-thread"] }
+tokio = { workspace = true, features = ["rt-multi-thread"] }
[[test]]
harness = false
diff --git a/datafusion/substrait/Cargo.toml b/datafusion/substrait/Cargo.toml
index 38414fc5e6..0acee20262 100644
--- a/datafusion/substrait/Cargo.toml
+++ b/datafusion/substrait/Cargo.toml
@@ -39,7 +39,7 @@ prost-types = "0.12"
substrait = "0.24.0"
[dev-dependencies]
-tokio = "1.17"
+tokio = { workspace = true }
[features]
protoc = ["substrait/protoc"]
