Skip to content

Commit f3b393c

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 d3fcb4b commit f3b393c

File tree

8 files changed

+484
-340
lines changed

8 files changed

+484
-340
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.3", 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-array/chrono-tz", "arrow-cast/prettyprint", "clap", "tra
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
@@ -792,8 +792,7 @@ impl ProstMessageExt for FetchResults {
792792
#[cfg(test)]
793793
mod tests {
794794
use super::*;
795-
use futures::{TryFutureExt, TryStreamExt};
796-
use hyper_util::rt::TokioIo;
795+
use futures::TryStreamExt;
797796
use std::fs;
798797
use std::future::Future;
799798
use std::net::SocketAddr;
@@ -854,8 +853,7 @@ mod tests {
854853
.serve_with_incoming(stream);
855854

856855
let request_future = async {
857-
let connector =
858-
service_fn(move |_| UnixStream::connect(path.clone()).map_ok(TokioIo::new));
856+
let connector = service_fn(move |_| UnixStream::connect(path.clone()));
859857
let channel = Endpoint::try_from("http://example.com")
860858
.unwrap()
861859
.connect_with_connector(connector)

arrow-flight/gen/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ publish = false
3232
[dependencies]
3333
# Pin specific version of the tonic-build dependencies to avoid auto-generated
3434
# (and checked in) arrow.flight.protocol.rs from changing
35-
proc-macro2 = { version = "=1.0.89", default-features = false }
36-
prost-build = { version = "=0.13.3", default-features = false }
37-
tonic-build = { version = "=0.12.3", default-features = false, features = ["transport", "prost"] }
35+
proc-macro2 = { version = "=1.0.86", default-features = false }
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/gen/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
2929
// protoc in Ubuntu builder needs this option
3030
.protoc_arg("--experimental_allow_proto3_optional")
3131
.out_dir("src")
32-
.compile_protos_with_config(prost_config(), &[proto_path], &[proto_dir])?;
32+
.compile_with_config(prost_config(), &[proto_path], &[proto_dir])?;
3333

3434
// read file contents to string
3535
let mut file = OpenOptions::new()
@@ -52,7 +52,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
5252
// protoc in Ubuntu builder needs this option
5353
.protoc_arg("--experimental_allow_proto3_optional")
5454
.out_dir("src/sql")
55-
.compile_protos_with_config(prost_config(), &[proto_path], &[proto_dir])?;
55+
.compile_with_config(prost_config(), &[proto_path], &[proto_dir])?;
5656

5757
// read file contents to string
5858
let mut file = OpenOptions::new()

0 commit comments

Comments
 (0)