alamb commented on code in PR #3788:
URL: https://github.com/apache/arrow-rs/pull/3788#discussion_r1125020931
##########
arrow-flight/src/sql/client.rs:
##########
@@ -44,85 +45,29 @@ use arrow_ipc::{root_as_message, MessageHeader};
use arrow_schema::{ArrowError, Schema, SchemaRef};
use futures::{stream, TryStreamExt};
use prost::Message;
-#[cfg(feature = "tls")]
-use tonic::transport::{Certificate, ClientTlsConfig, Identity};
-use tonic::transport::{Channel, Endpoint};
-use tonic::Streaming;
+use tonic::transport::Channel;
+use tonic::{IntoRequest, Streaming};
/// A FlightSQLServiceClient is an endpoint for retrieving or storing Arrow
data
/// by FlightSQL protocol.
#[derive(Debug, Clone)]
pub struct FlightSqlServiceClient {
token: Option<String>,
+ headers: HashMap<String, String>,
flight_client: FlightServiceClient<Channel>,
}
/// A FlightSql protocol client that can run queries against FlightSql servers
/// This client is in the "experimental" stage. It is not guaranteed to follow
the spec in all instances.
/// Github issues are welcomed.
impl FlightSqlServiceClient {
- /// Creates a new FlightSql Client that connects via TCP to a server
- #[cfg(not(feature = "tls"))]
- pub async fn new_with_endpoint(host: &str, port: u16) -> Result<Self,
ArrowError> {
- let addr = format!("http://{}:{}";, host, port);
- let endpoint = Endpoint::new(addr)
- .map_err(|_| ArrowError::IoError("Cannot create
endpoint".to_string()))?
- .connect_timeout(Duration::from_secs(20))
- .timeout(Duration::from_secs(20))
- .tcp_nodelay(true) // Disable Nagle's Algorithm since we don't
want packets to wait
- .tcp_keepalive(Option::Some(Duration::from_secs(3600)))
- .http2_keep_alive_interval(Duration::from_secs(300))
- .keep_alive_timeout(Duration::from_secs(20))
- .keep_alive_while_idle(true);
-
- let channel = endpoint.connect().await.map_err(|e| {
- ArrowError::IoError(format!("Cannot connect to endpoint: {}", e))
- })?;
- Ok(Self::new(channel))
- }
-
- /// Creates a new HTTPs FlightSql Client that connects via TCP to a server
- #[cfg(feature = "tls")]
- pub async fn new_with_endpoint(
- client_ident: Identity,
- server_ca: Certificate,
- domain: &str,
- host: &str,
- port: u16,
- ) -> Result<Self, ArrowError> {
- let addr = format!("https://{host}:{port}";);
-
- let endpoint = Endpoint::new(addr)
- .map_err(|_| ArrowError::IoError("Cannot create
endpoint".to_string()))?
- .connect_timeout(Duration::from_secs(20))
- .timeout(Duration::from_secs(20))
- .tcp_nodelay(true) // Disable Nagle's Algorithm since we don't
want packets to wait
- .tcp_keepalive(Option::Some(Duration::from_secs(3600)))
- .http2_keep_alive_interval(Duration::from_secs(300))
- .keep_alive_timeout(Duration::from_secs(20))
- .keep_alive_while_idle(true);
-
- let tls_config = ClientTlsConfig::new()
- .domain_name(domain)
- .ca_certificate(server_ca)
- .identity(client_ident);
-
- let endpoint = endpoint
- .tls_config(tls_config)
- .map_err(|_| ArrowError::IoError("Cannot create
endpoint".to_string()))?;
-
- let channel = endpoint.connect().await.map_err(|e| {
- ArrowError::IoError(format!("Cannot connect to endpoint: {e}"))
- })?;
- Ok(Self::new(channel))
- }
-
/// Creates a new FlightSql client that connects to a server over an
arbitrary tonic `Channel`
pub fn new(channel: Channel) -> Self {
Review Comment:
❤️
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
