Skip to content

ARROW-10476: [Rust] Allow string arrays to be built from Option<&str> or Option<String> #8575

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

Closed
jorgecarleitao wants to merge 1 commit into from
Closed

ARROW-10476: [Rust] Allow string arrays to be built from Option<&str> or Option<String> #8575

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
29 changes: 23 additions & 6 deletions rust/arrow/src/array/array.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1548,17 +1548,16 @@ impl<OffsetSize: StringOffsetSizeTrait> GenericStringArray<OffsetSize> {
}

pub(crate) fn from_opt_vec(v: Vec<Option<&str>>) -> Self {
let iter = v.iter().map(|e| e.map(|e| e.to_string()));
GenericStringArray::from_iter(iter)
GenericStringArray::from_iter(v.into_iter())
}
}

impl<'a, Ptr, OffsetSize: StringOffsetSizeTrait> FromIterator<Ptr>
impl<'a, Ptr, OffsetSize: StringOffsetSizeTrait> FromIterator<Option<Ptr>>
for GenericStringArray<OffsetSize>
where
Ptr: Borrow<Option<String>>,
Ptr: AsRef<str>,
{
fn from_iter<I: IntoIterator<Item = Ptr>>(iter: I) -> Self {
fn from_iter<I: IntoIterator<Item = Option<Ptr>>>(iter: I) -> Self {
let iter = iter.into_iter();
let (_, data_len) = iter.size_hint();
let data_len = data_len.expect("Iterator must be sized"); // panic if no upper bound.
Expand All @@ -1570,7 +1569,8 @@ where
offsets.push(length_so_far);

for (i, s) in iter.enumerate() {
if let Some(s) = s.borrow() {
if let Some(s) = s {
let s = s.as_ref();
// set null bit
let null_slice = null_buf.data_mut();
bit_util::set_bit(null_slice, i);
Expand Down Expand Up @@ -3916,6 +3916,23 @@ mod tests {
);
}

#[test]
fn test_string_array_from_iter() {
let data = vec![Some("hello"), None, Some("arrow")];
// from Vec<Option<&str>>
let array1 = StringArray::from(data.clone());
// from Iterator<Option<&str>>
let array2: StringArray = data.clone().into_iter().collect();
// from Iterator<Option<String>>
let array3: StringArray = data
.into_iter()
.map(|x| x.map(|s| format!("{}", s)))
.collect();

assert_eq!(array1, array2);
assert_eq!(array2, array3);
}

#[test]
fn test_struct_array_builder() {
let boolean_data = ArrayData::builder(DataType::Boolean)
Expand Down