Skip to content
Merged
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
46 changes: 34 additions & 12 deletions arrow-array/src/array/union_array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -794,18 +794,23 @@ unsafe impl Array for UnionArray {
};

if fields.len() <= 1 {
return self.fields.iter().find_map(|field_opt| {
field_opt
.as_ref()
.and_then(|field| field.logical_nulls())
.map(|logical_nulls| {
if self.is_dense() {
self.gather_nulls(vec![(0, logical_nulls)]).into()
} else {
logical_nulls
}
})
});
return self
.fields
.iter()
.enumerate()
.find_map(|(type_id, field_opt)| {
field_opt
.as_ref()
.and_then(|field| field.logical_nulls())
.map(|logical_nulls| {
if self.is_dense() {
self.gather_nulls(vec![(type_id as i8, logical_nulls)])
.into()
} else {
logical_nulls
}
})
});
}

let logical_nulls = self.fields_logical_nulls();
Expand Down Expand Up @@ -2012,6 +2017,23 @@ mod tests {
assert_eq!(expected, array.gather_nulls(array.fields_logical_nulls()));
}

#[test]
fn test_dense_union_one_field_nonzero_type_id_logical_nulls() {
let fields = UnionFields::try_new([5], [Field::new("a", DataType::Int32, true)]).unwrap();
let child = Arc::new(Int32Array::from(vec![None, Some(1)]));
let array = UnionArray::try_new(
fields,
vec![5, 5, 5].into(),
Some(vec![1, 0, 1].into()),
vec![child],
)
.unwrap();

let expected = NullBuffer::from(vec![true, false, true]);
assert_eq!(array.logical_nulls(), Some(expected));
assert_eq!(array.logical_null_count(), 1);
}

#[test]
fn test_sparse_union_logical_nulls_mask_all_nulls_skip_one() {
let fields: UnionFields = [
Expand Down
Loading