Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 8 additions & 14 deletions rust/datafusion/examples/flight_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ use futures::Stream;
use tonic::transport::Server;
use tonic::{Request, Response, Status, Streaming};

use datafusion::datasource::parquet::ParquetTable;
use datafusion::datasource::TableProvider;
use datafusion::prelude::*;
use datafusion::{datasource::parquet::ParquetTable, physical_plan::collect};

use arrow_flight::{
flight_service_server::FlightService, flight_service_server::FlightServiceServer,
Expand Down Expand Up @@ -80,7 +80,7 @@ impl FlightService for FlightServiceImpl {
request: Request<Ticket>,
) -> Result<Response<Self::DoGetStream>, Status> {
let ticket = request.into_inner();
match String::from_utf8(ticket.ticket.to_vec()) {
match std::str::from_utf8(&ticket.ticket) {
Ok(sql) => {
println!("do_get: {}", sql);

Expand All @@ -94,28 +94,22 @@ impl FlightService for FlightServiceImpl {
"alltypes_plain",
&format!("{}/alltypes_plain.parquet", testdata),
)
.map_err(|e| to_tonic_err(&e))?;
.map_err(to_tonic_err)?;

// create the query plan
let plan = ctx
.create_logical_plan(&sql)
.and_then(|plan| ctx.optimize(&plan))
.and_then(|plan| ctx.create_physical_plan(&plan))
.map_err(|e| to_tonic_err(&e))?;
// create the DataFrame
let df = ctx.sql(sql).map_err(to_tonic_err)?;

// execute the query
let results =
collect(plan.clone()).await.map_err(|e| to_tonic_err(&e))?;
let results = df.collect().await.map_err(to_tonic_err)?;
if results.is_empty() {
return Err(Status::internal("There were no results from ticket"));
}

// add an initial FlightData message that sends schema
let options = arrow::ipc::writer::IpcWriteOptions::default();
let schema = plan.schema();
let schema_flight_data =
arrow_flight::utils::flight_data_from_arrow_schema(
schema.as_ref(),
&df.schema().clone().into(),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❤️ -- looks great @Dandandan

&options,
);

Expand Down Expand Up @@ -197,7 +191,7 @@ impl FlightService for FlightServiceImpl {
}
}

fn to_tonic_err(e: &datafusion::error::DataFusionError) -> Status {
fn to_tonic_err(e: datafusion::error::DataFusionError) -> Status {
Status::internal(format!("{:?}", e))
}

Expand Down