Skip to content

Fix FlightSQL client to display all batches from multi-partition queries #347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
matago wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix FlightSQL client to display all batches from multi-partition queries #347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
65 changes: 35 additions & 30 deletions src/tui/execution.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,37 +279,42 @@ impl TuiExecution {
if let Some(streams) =
self.flightsql_result_stream.lock().await.as_mut()
{
match streams.next().await {
Some((ticket, Ok(batch))) => {
info!("Received batch for {ticket}");
let duration = start.elapsed();
let results = ExecutionResultsBatch {
batch,
duration,
query: sql.to_string(),
};
sender.send(
AppEvent::FlightSQLExecutionResultsNextBatch(
results,
),
)?;
// Collect all batches from the stream
while let Some((ticket, result)) =
streams.next().await
{
match result {
Ok(batch) => {
info!("Received batch for {ticket}");
let duration = start.elapsed();
let results = ExecutionResultsBatch {
batch,
duration,
query: sql.to_string(),
};
sender.send(
AppEvent::FlightSQLExecutionResultsNextBatch(
results,
),
)?;
}
Err(e) => {
error!(
"Error executing stream for ticket {ticket}: {:?}",
e
);
let elapsed = start.elapsed();
let e = ExecutionError {
query: sql.to_string(),
error: e.to_string(),
duration: elapsed,
};
sender.send(
AppEvent::FlightSQLExecutionResultsError(e),
)?;
break;
}
}
Some((ticket, Err(e))) => {
error!(
"Error executing stream for ticket {ticket}: {:?}",
e
);
let elapsed = start.elapsed();
let e = ExecutionError {
query: sql.to_string(),
error: e.to_string(),
duration: elapsed,
};
sender.send(
AppEvent::FlightSQLExecutionResultsError(e),
)?;
}
None => {}
}
}
}
Expand Down
10 changes: 7 additions & 3 deletions src/tui/state/tabs/flightsql.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use std::sync::Arc;
use color_eyre::Result;
use datafusion::arrow::{
array::{Array, RecordBatch, UInt32Array},
compute::take_record_batch,
compute::{concat_batches, take_record_batch},
datatypes::Schema,
error::ArrowError,
};
Expand Down Expand Up @@ -316,7 +316,11 @@ fn take_record_batches(
match batches.len() {
0 => Ok(RecordBatch::new_empty(Arc::new(Schema::empty()))),
1 => take_record_batch(&batches[0], indices),
// For now we just get the first batch
_ => take_record_batch(&batches[0], indices),
_ => {
// Concatenate all batches into a single batch before taking indices
let schema = batches[0].schema();
let concatenated = concat_batches(&schema, batches)?;
take_record_batch(&concatenated, indices)
}
}
}