Skip to content

Commit b826fc6

Browse files
committed
chore: adopt suggestions
Signed-off-by: Chojan Shang <[email protected]>
1 parent 174a858 commit b826fc6

File tree

9 files changed

+11
-10
lines changed

9 files changed

+11
-10
lines changed

.github/workflows/rust.yml

-2
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,6 @@ jobs:
211211
- name: Build with wasm-pack
212212
working-directory: ./datafusion/wasmtest
213213
run: wasm-pack build --dev
214-
env:
215-
RUSTFLAGS: --cfg tokio_unstable
216214

217215
# verify that the benchmark queries return the correct results
218216
verify-benchmark-results:

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +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"] }
78+
tokio = { version = "1.36", features = ["macros", "rt", "sync"] }
7979
url = "2.2"
8080

8181
[profile.release]

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 = { workspace = true }
56+
tokio = { workspace = true , features = ["rt-multi-thread", "parking_lot"] }
5757
tonic = "0.11"
5858
url = { workspace = true }
5959
uuid = "1.2"

datafusion/core/Cargo.toml

+1-1
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 = { workspace = true }
93+
tokio = { workspace = true , feature = ["rt-multi-thread", "parking_lot"] }
9494
tokio-util = { version = "0.7.4", features = ["io"], optional = true }
9595
url = { workspace = true }
9696
uuid = { version = "1.0", features = ["v4"] }

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 = { workspace = true }
80+
tokio = { workspace = true , features = ["rt-multi-thread"] }
8181

8282
[[bench]]
8383
harness = false

datafusion/physical-plan/Cargo.toml

+5
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,8 @@ uuid = { version = "^1.2", features = ["v4"] }
6363
rstest = { workspace = true }
6464
rstest_reuse = "0.6.0"
6565
termtree = "0.4.1"
66+
tokio = { workspace = true, features = [
67+
"rt-multi-thread",
68+
"fs",
69+
"parking_lot",
70+
] }

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 = { workspace = true }
59+
tokio = { workspace = true, features = ["rt-multi-thread"] }

datafusion/sqllogictest/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ postgres = ["bytes", "chrono", "tokio-postgres", "postgres-types", "postgres-pro
6161
[dev-dependencies]
6262
env_logger = { workspace = true }
6363
num_cpus = { workspace = true }
64+
tokio = { workspace = true, features = ["rt-multi-thread"] }
6465

6566
[[test]]
6667
harness = false

datafusion/wasmtest/README.md

-3
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,9 @@ First, [install wasm-pack](https://rustwasm.github.io/wasm-pack/installer/)
3737
Then use wasm-pack to compile the crate from within this directory
3838

3939
```
40-
export RUSTFLAGS="--cfg tokio_unstable"
4140
wasm-pack build
4241
```
4342

44-
**Note:** Due to limited support for WASM in `tokio`, setup `RUSTFLAGS` to ensure that all features enabled in the workspace can be compiled.
45-
4643
## Try it out
4744

4845
The `datafusion-wasm-app` directory contains a simple app (created with [`create-wasm-app`](https://github.com/rustwasm/create-wasm-app) and then manually updated to WebPack 5) that invokes DataFusion and writes results to the browser console.

0 commit comments

Comments
 (0)