diff --git a/ballista-examples/Cargo.toml b/ballista-examples/Cargo.toml index b7d40223c469..dbcfad44f62f 100644 --- a/ballista-examples/Cargo.toml +++ b/ballista-examples/Cargo.toml @@ -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" diff --git a/ballista/rust/core/Cargo.toml b/ballista/rust/core/Cargo.toml index ce72d2fda92d..2495343b3e87 100644 --- a/ballista/rust/core/Cargo.toml +++ b/ballista/rust/core/Cargo.toml @@ -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" } @@ -50,4 +50,4 @@ datafusion = { path = "../../../datafusion" } tempfile = "3" [build-dependencies] -tonic-build = { version = "0.4" } +tonic-build = { version = "0.5" } diff --git a/ballista/rust/executor/Cargo.toml b/ballista/rust/executor/Cargo.toml index 428a5bb0f01f..5d6ecb986a15 100644 --- a/ballista/rust/executor/Cargo.toml +++ b/ballista/rust/executor/Cargo.toml @@ -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" } diff --git a/ballista/rust/executor/src/flight_service.rs b/ballista/rust/executor/src/flight_service.rs index 73dd1a946d55..27b1a33b7c87 100644 --- a/ballista/rust/executor/src/flight_service.rs +++ b/ballista/rust/executor/src/flight_service.rs @@ -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() { + send_response(&tx, batch).await?; } } info!("FetchPartition streamed {} rows", row_count); diff --git a/ballista/rust/scheduler/Cargo.toml b/ballista/rust/scheduler/Cargo.toml index 9bca8d969571..382f7c62af10 100644 --- a/ballista/rust/scheduler/Cargo.toml +++ b/ballista/rust/scheduler/Cargo.toml @@ -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" @@ -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" diff --git a/datafusion-examples/Cargo.toml b/datafusion-examples/Cargo.toml index 35aa3764d6dc..3ddcdf41bf21 100644 --- a/datafusion-examples/Cargo.toml +++ b/datafusion-examples/Cargo.toml @@ -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"