Skip to content

Commit

Permalink
Revert "bump tonic to 0.12 and prost to 0.13 for arrow-flight (a…
Browse files Browse the repository at this point in the history
…pache#6041)"

This reverts commit 741bbf6.
  • Loading branch information
alamb committed Oct 25, 2024
1 parent f07fecf commit 9fbdcc4
Show file tree
Hide file tree
Showing 7 changed files with 86 additions and 59 deletions.
11 changes: 5 additions & 6 deletions arrow-flight/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ bytes = { version = "1", default-features = false }
futures = { version = "0.3", default-features = false, features = ["alloc"] }
once_cell = { version = "1", optional = true }
paste = { version = "1.0" }
prost = { version = "0.13.1", default-features = false, features = ["prost-derive"] }
prost = { version = "0.12.3", default-features = false, features = ["prost-derive"] }
# For Timestamp type
prost-types = { version = "0.13.1", default-features = false }
prost-types = { version = "0.12.3", default-features = false }
tokio = { version = "1.0", default-features = false, features = ["macros", "rt", "rt-multi-thread"] }
tonic = { version = "0.12.1", default-features = false, features = ["transport", "codegen", "prost"] }
tonic = { version = "0.11.0", default-features = false, features = ["transport", "codegen", "prost"] }

# CLI-related dependencies
anyhow = { version = "1.0", optional = true }
Expand All @@ -70,9 +70,8 @@ cli = ["anyhow", "arrow-cast/prettyprint", "clap", "tracing-log", "tracing-subsc
[dev-dependencies]
arrow-cast = { workspace = true, features = ["prettyprint"] }
assert_cmd = "2.0.8"
http = "1.1.0"
http-body = "1.0.0"
hyper-util = "0.1"
http = "0.2.9"
http-body = "0.4.5"
pin-project-lite = "0.2"
tempfile = "3.3"
tokio-stream = { version = "0.1", features = ["net"] }
Expand Down
6 changes: 2 additions & 4 deletions arrow-flight/examples/flight_sql_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -791,8 +791,7 @@ impl ProstMessageExt for FetchResults {
#[cfg(test)]
mod tests {
use super::*;
use futures::{TryFutureExt, TryStreamExt};
use hyper_util::rt::TokioIo;
use futures::TryStreamExt;
use std::fs;
use std::future::Future;
use std::net::SocketAddr;
Expand Down Expand Up @@ -852,8 +851,7 @@ mod tests {
.serve_with_incoming(stream);

let request_future = async {
let connector =
service_fn(move |_| UnixStream::connect(path.clone()).map_ok(TokioIo::new));
let connector = service_fn(move |_| UnixStream::connect(path.clone()));
let channel = Endpoint::try_from("http://example.com")
.unwrap()
.connect_with_connector(connector)
Expand Down
4 changes: 2 additions & 2 deletions arrow-flight/gen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ publish = false
# Pin specific version of the tonic-build dependencies to avoid auto-generated
# (and checked in) arrow.flight.protocol.rs from changing
proc-macro2 = { version = "=1.0.86", default-features = false }
prost-build = { version = "=0.13.1", default-features = false }
tonic-build = { version = "=0.12.2", default-features = false, features = ["transport", "prost"] }
prost-build = { version = "=0.12.6", default-features = false }
tonic-build = { version = "=0.11.0", default-features = false, features = ["transport", "prost"] }
74 changes: 46 additions & 28 deletions arrow-flight/src/arrow.flight.protocol.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions arrow-flight/src/sql/arrow.flight.protocol.sql.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 9fbdcc4

Please sign in to comment.