Skip to content

Fix ArrowArrayStreamReader for 0-columns record batch streams #9405

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

Merged
alamb merged 3 commits into from
Feb 13, 2026
Merged

Fix ArrowArrayStreamReader for 0-columns record batch streams #9405

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
49e539e
Fix `ArrowArrayStreamReader` for 0-column record batch streams
jonded94 Feb 12, 2026
1f5dd79
Refactor existing `stream_round_trip_tests` and include new `[...]_no…
jonded94 Feb 12, 2026
e57b61d
Merge branch 'main' into fix-ffi-record-batch-for-empty-columns
jonded94 Feb 13, 2026
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
75 changes: 39 additions & 36 deletions arrow-array/src/ffi_stream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ use std::{
use arrow_data::ffi::FFI_ArrowArray;
use arrow_schema::{ArrowError, Schema, SchemaRef, ffi::FFI_ArrowSchema};

use crate::RecordBatchOptions;
use crate::array::Array;
use crate::array::StructArray;
use crate::ffi::from_ffi_and_data_type;
Expand Down Expand Up @@ -365,7 +366,12 @@ impl Iterator for ArrowArrayStreamReader {
from_ffi_and_data_type(array, DataType::Struct(self.schema().fields().clone()))
};
Some(result.and_then(|data| {
RecordBatch::try_new(self.schema.clone(), StructArray::from(data).into_parts().1)
let len = data.len();
RecordBatch::try_new_with_options(
self.schema.clone(),
StructArray::from(data).into_parts().1,
&RecordBatchOptions::new().with_row_count(Some(len)),
)
}))
} else {
let last_error = self.get_stream_last_error();
Expand Down Expand Up @@ -419,20 +425,7 @@ mod tests {
}
}

fn _test_round_trip_export(arrays: Vec<Arc<dyn Array>>) -> Result<()> {
let metadata = HashMap::from([("foo".to_owned(), "bar".to_owned())]);
let schema = Arc::new(Schema::new_with_metadata(
vec![
Field::new("a", arrays[0].data_type().clone(), true)
.with_metadata(metadata.clone()),
Field::new("b", arrays[1].data_type().clone(), true)
.with_metadata(metadata.clone()),
Field::new("c", arrays[2].data_type().clone(), true)
.with_metadata(metadata.clone()),
],
metadata,
));
let batch = RecordBatch::try_new(schema.clone(), arrays).unwrap();
fn _test_round_trip_export(batch: RecordBatch, schema: Arc<Schema>) -> Result<()> {
let iter = Box::new(vec![batch.clone(), batch.clone()].into_iter().map(Ok)) as _;

let reader = TestRecordBatchReader::new(schema.clone(), iter);
Expand Down Expand Up @@ -461,10 +454,12 @@ mod tests {
}

let array = unsafe { from_ffi(ffi_array, &ffi_schema) }.unwrap();
let len = array.len();

let record_batch = RecordBatch::try_new(
let record_batch = RecordBatch::try_new_with_options(
SchemaRef::from(exported_schema.clone()),
StructArray::from(array).into_parts().1,
&RecordBatchOptions::new().with_row_count(Some(len)),
)
.unwrap();
produced_batches.push(record_batch);
Expand All @@ -475,20 +470,7 @@ mod tests {
Ok(())
}

fn _test_round_trip_import(arrays: Vec<Arc<dyn Array>>) -> Result<()> {
let metadata = HashMap::from([("foo".to_owned(), "bar".to_owned())]);
let schema = Arc::new(Schema::new_with_metadata(
vec![
Field::new("a", arrays[0].data_type().clone(), true)
.with_metadata(metadata.clone()),
Field::new("b", arrays[1].data_type().clone(), true)
.with_metadata(metadata.clone()),
Field::new("c", arrays[2].data_type().clone(), true)
.with_metadata(metadata.clone()),
],
metadata,
));
let batch = RecordBatch::try_new(schema.clone(), arrays).unwrap();
fn _test_round_trip_import(batch: RecordBatch, schema: Arc<Schema>) -> Result<()> {
let iter = Box::new(vec![batch.clone(), batch.clone()].into_iter().map(Ok)) as _;

let reader = TestRecordBatchReader::new(schema.clone(), iter);
Expand All @@ -511,19 +493,40 @@ mod tests {
}

#[test]
fn test_stream_round_trip_export() -> Result<()> {
fn test_stream_round_trip() {
let array = Int32Array::from(vec![Some(2), None, Some(1), None]);
let array: Arc<dyn Array> = Arc::new(array);
let metadata = HashMap::from([("foo".to_owned(), "bar".to_owned())]);

let schema = Arc::new(Schema::new_with_metadata(
vec![
Field::new("a", array.data_type().clone(), true).with_metadata(metadata.clone()),
Field::new("b", array.data_type().clone(), true).with_metadata(metadata.clone()),
Field::new("c", array.data_type().clone(), true).with_metadata(metadata.clone()),
],
metadata,
));
let batch = RecordBatch::try_new(schema.clone(), vec![array.clone(), array.clone(), array])
.unwrap();

_test_round_trip_export(vec![array.clone(), array.clone(), array])
_test_round_trip_export(batch.clone(), schema.clone()).unwrap();
_test_round_trip_import(batch, schema).unwrap();
}

#[test]
fn test_stream_round_trip_import() -> Result<()> {
let array = Int32Array::from(vec![Some(2), None, Some(1), None]);
let array: Arc<dyn Array> = Arc::new(array);
fn test_stream_round_trip_no_columns() {
let metadata = HashMap::from([("foo".to_owned(), "bar".to_owned())]);

let schema = Arc::new(Schema::new_with_metadata(Vec::<Field>::new(), metadata));
let batch = RecordBatch::try_new_with_options(
schema.clone(),
Vec::<Arc<dyn Array>>::new(),
&RecordBatchOptions::new().with_row_count(Some(10)),
)
.unwrap();

_test_round_trip_import(vec![array.clone(), array.clone(), array])
_test_round_trip_export(batch.clone(), schema.clone()).unwrap();
_test_round_trip_import(batch, schema).unwrap();
}

#[test]
Expand Down
Loading