Skip to content

Commit

Permalink
Issue apache#1876: Explicitly declare the used features for each depe…
Browse files Browse the repository at this point in the history
…ndency in arrow-flight

Signed-off-by: Martin Tzvetanov Grigorov <mgrigorov@apache.org>
  • Loading branch information
martin-g committed Jun 15, 2022
1 parent 328c680 commit 8133746
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 24 deletions.
20 changes: 10 additions & 10 deletions arrow-flight/Cargo.toml
Expand Up @@ -27,14 +27,14 @@ repository = "https://github.com/apache/arrow-rs"
license = "Apache-2.0"

[dependencies]
arrow = { path = "../arrow", version = "16.0.0" }
base64 = "0.13"
tonic = "0.7"
bytes = "1"
prost = "0.10"
prost-types = { version = "0.10.0", optional = true }
prost-derive = "0.10"
tokio = { version = "1.0", features = ["macros", "rt", "rt-multi-thread"] }
arrow = { path = "../arrow", version = "16.0.0", default-features = false, features = ["ipc"] }
base64 = { version = "0.13", default-features = false }
tonic = { version = "0.7", default-features = false, features = ["transport", "codegen", "prost"] }
bytes = { version = "1", default-features = false }
prost = { version = "0.10", default-features = false }
prost-types = { version = "0.10.0", default-features = false, optional = true }
prost-derive = { version = "0.10", default-features = false }
tokio = { version = "1.0", default-features = false, features = ["macros", "rt", "rt-multi-thread"] }
futures = { version = "0.3", default-features = false, features = ["alloc"]}

[features]
Expand All @@ -44,10 +44,10 @@ flight-sql-experimental = ["prost-types"]
[dev-dependencies]

[build-dependencies]
tonic-build = "0.7"
tonic-build = { version = "0.7", default-features = false, features = ["prost"] }
# Pin specific version of the tonic-build dependencies to avoid auto-generated
# (and checked in) arrow.flight.protocol.rs from changing
proc-macro2 = ">1.0.30"
proc-macro2 = { version = ">1.0.30", default-features = false }

[[example]]
name = "flight_sql_server"
Expand Down
14 changes: 0 additions & 14 deletions arrow-flight/src/arrow.flight.protocol.rs
Expand Up @@ -214,17 +214,6 @@ pub mod flight_service_client {
pub struct FlightServiceClient<T> {
inner: tonic::client::Grpc<T>,
}
impl FlightServiceClient<tonic::transport::Channel> {
/// Attempt to create a new client by connecting to a given endpoint.
pub async fn connect<D>(dst: D) -> Result<Self, tonic::transport::Error>
where
D: std::convert::TryInto<tonic::transport::Endpoint>,
D::Error: Into<StdError>,
{
let conn = tonic::transport::Endpoint::new(dst)?.connect().await?;
Ok(Self::new(conn))
}
}
impl<T> FlightServiceClient<T>
where
T: tonic::client::GrpcService<tonic::body::BoxBody>,
Expand Down Expand Up @@ -1108,7 +1097,4 @@ pub mod flight_service_server {
write!(f, "{:?}", self.0)
}
}
impl<T: FlightService> tonic::transport::NamedService for FlightServiceServer<T> {
const NAME: &'static str = "arrow.flight.protocol.FlightService";
}
}

0 comments on commit 8133746

Please sign in to comment.