Skip to content
This repository has been archived by the owner on Feb 18, 2024. It is now read-only.

Added extend_*values to MutablePrimitiveArray #383

Merged
Merged
Show file tree
Hide file tree
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
53 changes: 48 additions & 5 deletions src/array/primitive/mutable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -164,14 +164,57 @@ impl<T: NativeType> MutablePrimitiveArray<T> {
if let Some(validity) = self.validity.as_mut() {
extend_trusted_len_unzip(iterator, validity, &mut self.values)
} else {
let mut validity =
MutableBitmap::from_trusted_len_iter(std::iter::repeat(true).take(self.len()));
let mut validity = MutableBitmap::new();
jorgecarleitao marked this conversation as resolved.
Show resolved Hide resolved
validity.extend_constant(self.len(), true);
extend_trusted_len_unzip(iterator, &mut validity, &mut self.values);
if validity.null_count() > 0 {
self.validity = Some(validity);
}
}
}
/// Extends the [`MutablePrimitiveArray`] from an iterator of values of trusted len.
/// This differs from `extend_trusted_len` which accepts in iterator of optional values.
#[inline]
ritchie46 marked this conversation as resolved.
Show resolved Hide resolved
pub fn extend_trusted_len_values<I>(&mut self, iterator: I)
where
I: TrustedLen<Item = T>,
{
unsafe { self.extend_trusted_len_values_unchecked(iterator) }
}

/// Extends the [`MutablePrimitiveArray`] from an iterator of values of trusted len.
/// This differs from `extend_trusted_len_unchecked` which accepts in iterator of optional values.
/// # Safety
/// The iterator must be trusted len.
#[inline]
ritchie46 marked this conversation as resolved.
Show resolved Hide resolved
pub unsafe fn extend_trusted_len_values_unchecked<I>(&mut self, iterator: I)
where
I: Iterator<Item = T>,
{
self.values.extend_from_trusted_len_iter_unchecked(iterator);
self.update_all_valid();
}

#[inline]
ritchie46 marked this conversation as resolved.
Show resolved Hide resolved
/// Extends the [`MutablePrimitiveArray`] from a slice
pub fn extend_from_slice(&mut self, items: &[T]) {
self.values.extend_from_slice(items);
self.update_all_valid();
}

fn update_all_valid(&mut self) {
// get len before mutable borrow
let len = self.len();
if let Some(validity) = self.validity.as_mut() {
validity.extend_constant(len - validity.len(), true);
} else {
let mut validity = MutableBitmap::new();
validity.extend_constant(len, true);
if validity.null_count() > 0 {
self.validity = Some(validity);
}
}
}

fn init_validity(&mut self) {
let mut validity = MutableBitmap::new();
Expand Down Expand Up @@ -449,10 +492,10 @@ pub(crate) unsafe fn extend_trusted_len_unzip<I, P, T>(
I: Iterator<Item = Option<P>>,
{
let (_, upper) = iterator.size_hint();
let len = upper.expect("trusted_len_unzip requires an upper limit");
let additional = upper.expect("trusted_len_unzip requires an upper limit");

validity.reserve(len);
buffer.reserve(len);
validity.reserve(additional);
buffer.reserve(additional);

for item in iterator {
let item = if let Some(item) = item {
Expand Down
6 changes: 2 additions & 4 deletions src/bitmap/mutable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,8 @@ impl MutableBitmap {
if self.length % 8 == 0 {
self.buffer.push_unchecked(0);
}
if value {
let byte = self.buffer.as_mut_slice().last_mut().unwrap();
*byte = set(*byte, self.length % 8, true);
};
let byte = self.buffer.as_mut_slice().last_mut().unwrap();
*byte = set(*byte, self.length % 8, value);
self.length += 1;
}

Expand Down
5 changes: 4 additions & 1 deletion src/compute/like.rs
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,10 @@ fn a_like_binary_scalar<O: Offset, F: Fn(bool) -> bool>(
) -> Result<BooleanArray> {
let validity = lhs.validity();
let pattern = std::str::from_utf8(rhs).map_err(|e| {
ArrowError::InvalidArgumentError(format!("Unable to convert the LIKE pattern to string: {}", e))
ArrowError::InvalidArgumentError(format!(
"Unable to convert the LIKE pattern to string: {}",
e
))
})?;

let values = if !pattern.contains(is_like_pattern) {
Expand Down
32 changes: 32 additions & 0 deletions tests/it/array/primitive/mutable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,38 @@ fn extend_trusted_len() {
assert_eq!(a.values(), &MutableBuffer::<i32>::from([1, 2, 0, 4]));
}

#[test]
fn extend_trusted_len_values() {
let mut a = MutablePrimitiveArray::<i32>::new();
a.extend_trusted_len_values(vec![1, 2, 3].into_iter());
assert_eq!(a.validity(), &None);
assert_eq!(a.values(), &MutableBuffer::<i32>::from([1, 2, 3]));

let mut a = MutablePrimitiveArray::<i32>::new();
a.push(None);
a.extend_trusted_len_values(vec![1, 2].into_iter());
assert_eq!(
a.validity(),
&Some(MutableBitmap::from([false, true, true]))
);
}

#[test]
fn extend_from_slice() {
let mut a = MutablePrimitiveArray::<i32>::new();
a.extend_from_slice(&[1, 2, 3]);
assert_eq!(a.validity(), &None);
assert_eq!(a.values(), &MutableBuffer::<i32>::from([1, 2, 3]));

let mut a = MutablePrimitiveArray::<i32>::new();
a.push(None);
a.extend_from_slice(&[1, 2]);
assert_eq!(
a.validity(),
&Some(MutableBitmap::from([false, true, true]))
);
}

#[test]
fn set_validity() {
let mut a = MutablePrimitiveArray::<i32>::new();
Expand Down