Skip to content

Update dependencies: prost to 0.8 and tonic to 0.5 #818

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 2, 2021
Merged

Update dependencies: prost to 0.8 and tonic to 0.5 #818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ballista-examples/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ publish = false
arrow-flight = { version = "5.0" }
datafusion = { path = "../datafusion" }
ballista = { path = "../ballista/rust/client" }
prost = "0.7"
tonic = "0.4"
prost = "0.8"
tonic = "0.5"
tokio = { version = "1.0", features = ["macros", "rt", "rt-multi-thread", "sync"] }
futures = "0.3"
num_cpus = "1.13.0"
6 changes: 3 additions & 3 deletions ballista/rust/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ async-trait = "0.1.36"
futures = "0.3"
hashbrown = "0.11"
log = "0.4"
prost = "0.7"
prost = "0.8"
serde = {version = "1", features = ["derive"]}
sqlparser = "0.9.0"
tokio = "1.0"
tonic = "0.4"
tonic = "0.5"
uuid = { version = "0.8", features = ["v4"] }

arrow-flight = { version = "5.0" }
Expand All @@ -50,4 +50,4 @@ datafusion = { path = "../../../datafusion" }
tempfile = "3"

[build-dependencies]
tonic-build = { version = "0.4" }
tonic-build = { version = "0.5" }
2 changes: 1 addition & 1 deletion ballista/rust/executor/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ snmalloc-rs = {version = "0.2", features= ["cache-friendly"], optional = true}
tempfile = "3"
tokio = { version = "1.0", features = ["macros", "rt", "rt-multi-thread"] }
tokio-stream = { version = "0.1", features = ["net"] }
tonic = "0.4"
tonic = "0.5"
uuid = { version = "0.8", features = ["v4"] }

arrow = { version = "5.0" }
Expand Down
4 changes: 2 additions & 2 deletions ballista/rust/executor/src/flight_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,8 @@ where
let batch_flight_data: Vec<_> = batch
.map(|b| create_flight_iter(&b, &options).collect())
.map_err(|e| from_arrow_err(&e))?;
for batch in &batch_flight_data {
send_response(&tx, batch.clone()).await?;
for batch in batch_flight_data.into_iter() {
Copy link
Contributor Author

@alamb alamb Aug 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know why but this was causing a compiler error for me, so I fixed it to get the tests to all pass cleanly on my machine

send_response(&tx, batch).await?;
}
}
info!("FetchPartition streamed {} rows", row_count);
Expand Down
6 changes: 3 additions & 3 deletions ballista/rust/scheduler/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ http-body = "0.4"
hyper = "0.14.4"
log = "0.4"
parse_arg = "0.1.3"
prost = "0.7"
prost = "0.8"
rand = "0.8"
serde = {version = "1", features = ["derive"]}
sled_package = { package = "sled", version = "0.34", optional = true }
tokio = { version = "1.0", features = ["full"] }
tokio-stream = { version = "0.1", features = ["net"], optional = true }
tonic = "0.4"
tonic = "0.5"
tower = { version = "0.4" }
warp = "0.3"

Expand All @@ -61,7 +61,7 @@ uuid = { version = "0.8", features = ["v4"] }

[build-dependencies]
configure_me_codegen = "0.4.0"
tonic-build = { version = "0.4" }
tonic-build = { version = "0.5" }

[package.metadata.configure_me.bin]
scheduler = "scheduler_config_spec.toml"
4 changes: 2 additions & 2 deletions datafusion-examples/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ publish = false
[dev-dependencies]
arrow-flight = { version = "5.0" }
datafusion = { path = "../datafusion" }
prost = "0.7"
tonic = "0.4"
prost = "0.8"
tonic = "0.5"
tokio = { version = "1.0", features = ["macros", "rt", "rt-multi-thread", "sync"] }
futures = "0.3"
num_cpus = "1.13.0"