Skip to content

Commit 9fbdcc4

Browse files
committed
Revert "bump tonic to 0.12 and prost to 0.13 for arrow-flight (apache#6041)"
This reverts commit 741bbf6.
1 parent f07fecf commit 9fbdcc4

File tree

7 files changed

+86
-59
lines changed

7 files changed

+86
-59
lines changed

arrow-flight/Cargo.toml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ bytes = { version = "1", default-features = false }
4444
futures = { version = "0.3", default-features = false, features = ["alloc"] }
4545
once_cell = { version = "1", optional = true }
4646
paste = { version = "1.0" }
47-
prost = { version = "0.13.1", default-features = false, features = ["prost-derive"] }
47+
prost = { version = "0.12.3", default-features = false, features = ["prost-derive"] }
4848
# For Timestamp type
49-
prost-types = { version = "0.13.1", default-features = false }
49+
prost-types = { version = "0.12.3", default-features = false }
5050
tokio = { version = "1.0", default-features = false, features = ["macros", "rt", "rt-multi-thread"] }
51-
tonic = { version = "0.12.1", default-features = false, features = ["transport", "codegen", "prost"] }
51+
tonic = { version = "0.11.0", default-features = false, features = ["transport", "codegen", "prost"] }
5252

5353
# CLI-related dependencies
5454
anyhow = { version = "1.0", optional = true }
@@ -70,9 +70,8 @@ cli = ["anyhow", "arrow-cast/prettyprint", "clap", "tracing-log", "tracing-subsc
7070
[dev-dependencies]
7171
arrow-cast = { workspace = true, features = ["prettyprint"] }
7272
assert_cmd = "2.0.8"
73-
http = "1.1.0"
74-
http-body = "1.0.0"
75-
hyper-util = "0.1"
73+
http = "0.2.9"
74+
http-body = "0.4.5"
7675
pin-project-lite = "0.2"
7776
tempfile = "3.3"
7877
tokio-stream = { version = "0.1", features = ["net"] }

arrow-flight/examples/flight_sql_server.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -791,8 +791,7 @@ impl ProstMessageExt for FetchResults {
791791
#[cfg(test)]
792792
mod tests {
793793
use super::*;
794-
use futures::{TryFutureExt, TryStreamExt};
795-
use hyper_util::rt::TokioIo;
794+
use futures::TryStreamExt;
796795
use std::fs;
797796
use std::future::Future;
798797
use std::net::SocketAddr;
@@ -852,8 +851,7 @@ mod tests {
852851
.serve_with_incoming(stream);
853852

854853
let request_future = async {
855-
let connector =
856-
service_fn(move |_| UnixStream::connect(path.clone()).map_ok(TokioIo::new));
854+
let connector = service_fn(move |_| UnixStream::connect(path.clone()));
857855
let channel = Endpoint::try_from("http://example.com")
858856
.unwrap()
859857
.connect_with_connector(connector)

arrow-flight/gen/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ publish = false
3333
# Pin specific version of the tonic-build dependencies to avoid auto-generated
3434
# (and checked in) arrow.flight.protocol.rs from changing
3535
proc-macro2 = { version = "=1.0.86", default-features = false }
36-
prost-build = { version = "=0.13.1", default-features = false }
37-
tonic-build = { version = "=0.12.2", default-features = false, features = ["transport", "prost"] }
36+
prost-build = { version = "=0.12.6", default-features = false }
37+
tonic-build = { version = "=0.11.0", default-features = false, features = ["transport", "prost"] }

arrow-flight/src/arrow.flight.protocol.rs

Lines changed: 46 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

arrow-flight/src/sql/arrow.flight.protocol.sql.rs

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)