Skip to content

ARROW-12165: [Rust] inline append functions of builders #9860

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
ritchie46 wants to merge 1 commit into from
Closed

ARROW-12165: [Rust] inline append functions of builders #9860

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
30 changes: 30 additions & 0 deletions rust/arrow/src/array/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,20 +433,23 @@ impl BooleanBuilder {
}

/// Appends a value of type `T` into the builder
#[inline]
pub fn append_value(&mut self, v: bool) -> Result<()> {
self.bitmap_builder.append(true);
self.values_builder.append(v);
Ok(())
}

/// Appends a null slot into the builder
#[inline]
pub fn append_null(&mut self) -> Result<()> {
self.bitmap_builder.append(false);
self.values_builder.advance(1);
Ok(())
}

/// Appends an `Option<T>` into the builder
#[inline]
pub fn append_option(&mut self, v: Option<bool>) -> Result<()> {
match v {
None => self.append_null()?,
Expand All @@ -456,13 +459,15 @@ impl BooleanBuilder {
}

/// Appends a slice of type `T` into the builder
#[inline]
pub fn append_slice(&mut self, v: &[bool]) -> Result<()> {
self.bitmap_builder.append_n(v.len(), true);
self.values_builder.append_slice(v);
Ok(())
}

/// Appends values from a slice of type `T` and a validity boolean slice
#[inline]
pub fn append_values(&mut self, values: &[bool], is_valid: &[bool]) -> Result<()> {
if values.len() != is_valid.len() {
return Err(ArrowError::InvalidArgumentError(
Expand Down Expand Up @@ -578,6 +583,7 @@ impl<T: ArrowPrimitiveType> PrimitiveBuilder<T> {
}

/// Appends a value of type `T` into the builder
#[inline]
pub fn append_value(&mut self, v: T::Native) -> Result<()> {
if let Some(b) = self.bitmap_builder.as_mut() {
b.append(true);
Expand All @@ -587,6 +593,7 @@ impl<T: ArrowPrimitiveType> PrimitiveBuilder<T> {
}

/// Appends a null slot into the builder
#[inline]
pub fn append_null(&mut self) -> Result<()> {
self.materialize_bitmap_builder();
self.bitmap_builder.as_mut().unwrap().append(false);
Expand All @@ -595,6 +602,7 @@ impl<T: ArrowPrimitiveType> PrimitiveBuilder<T> {
}

/// Appends an `Option<T>` into the builder
#[inline]
pub fn append_option(&mut self, v: Option<T::Native>) -> Result<()> {
match v {
None => self.append_null()?,
Expand All @@ -604,6 +612,7 @@ impl<T: ArrowPrimitiveType> PrimitiveBuilder<T> {
}

/// Appends a slice of type `T` into the builder
#[inline]
pub fn append_slice(&mut self, v: &[T::Native]) -> Result<()> {
if let Some(b) = self.bitmap_builder.as_mut() {
b.append_n(v.len(), true);
Expand All @@ -613,6 +622,7 @@ impl<T: ArrowPrimitiveType> PrimitiveBuilder<T> {
}

/// Appends values from a slice of type `T` and a validity boolean slice
#[inline]
pub fn append_values(
&mut self,
values: &[T::Native],
Expand Down Expand Up @@ -766,6 +776,7 @@ where
}

/// Finish the current variable-length list array slot
#[inline]
pub fn append(&mut self, is_valid: bool) -> Result<()> {
self.offsets_builder
.append(OffsetSize::from_usize(self.values_builder.len()).unwrap());
Expand Down Expand Up @@ -897,6 +908,7 @@ where
}

/// Finish the current variable-length list array slot
#[inline]
pub fn append(&mut self, is_valid: bool) -> Result<()> {
self.bitmap_builder.append(is_valid);
self.len += 1;
Expand Down Expand Up @@ -1115,6 +1127,7 @@ impl<OffsetSize: BinaryOffsetSizeTrait> GenericBinaryBuilder<OffsetSize> {
///
/// Note, when appending individual byte values you must call `append` to delimit each
/// distinct list value.
#[inline]
pub fn append_byte(&mut self, value: u8) -> Result<()> {
self.builder.values().append_value(value)?;
Ok(())
Expand All @@ -1124,18 +1137,21 @@ impl<OffsetSize: BinaryOffsetSizeTrait> GenericBinaryBuilder<OffsetSize> {
///
/// Automatically calls the `append` method to delimit the slice appended in as a
/// distinct array element.
#[inline]
pub fn append_value(&mut self, value: impl AsRef<[u8]>) -> Result<()> {
self.builder.values().append_slice(value.as_ref())?;
self.builder.append(true)?;
Ok(())
}

/// Finish the current variable-length list array slot.
#[inline]
pub fn append(&mut self, is_valid: bool) -> Result<()> {
self.builder.append(is_valid)
}

/// Append a null value to the array.
#[inline]
pub fn append_null(&mut self) -> Result<()> {
self.append(false)
}
Expand Down Expand Up @@ -1170,6 +1186,7 @@ impl<OffsetSize: StringOffsetSizeTrait> GenericStringBuilder<OffsetSize> {
///
/// Automatically calls the `append` method to delimit the string appended in as a
/// distinct array element.
#[inline]
pub fn append_value(&mut self, value: impl AsRef<str>) -> Result<()> {
self.builder
.values()
Expand All @@ -1179,11 +1196,13 @@ impl<OffsetSize: StringOffsetSizeTrait> GenericStringBuilder<OffsetSize> {
}

/// Finish the current variable-length list array slot.
#[inline]
pub fn append(&mut self, is_valid: bool) -> Result<()> {
self.builder.append(is_valid)
}

/// Append a null value to the array.
#[inline]
pub fn append_null(&mut self) -> Result<()> {
self.append(false)
}
Expand All @@ -1208,6 +1227,7 @@ impl FixedSizeBinaryBuilder {
///
/// Automatically calls the `append` method to delimit the slice appended in as a
/// distinct array element.
#[inline]
pub fn append_value(&mut self, value: impl AsRef<[u8]>) -> Result<()> {
if self.builder.value_length() != value.as_ref().len() as i32 {
return Err(ArrowError::InvalidArgumentError(
Expand All @@ -1219,6 +1239,7 @@ impl FixedSizeBinaryBuilder {
}

/// Append a null value to the array.
#[inline]
pub fn append_null(&mut self) -> Result<()> {
let length: usize = self.builder.value_length() as usize;
self.builder.values().append_slice(&vec![0u8; length][..])?;
Expand Down Expand Up @@ -1248,6 +1269,7 @@ impl DecimalBuilder {
///
/// Automatically calls the `append` method to delimit the slice appended in as a
/// distinct array element.
#[inline]
pub fn append_value(&mut self, value: i128) -> Result<()> {
let value_as_bytes = Self::from_i128_to_fixed_size_bytes(
value,
Expand Down Expand Up @@ -1276,6 +1298,7 @@ impl DecimalBuilder {
}

/// Append a null value to the array.
#[inline]
pub fn append_null(&mut self) -> Result<()> {
let length: usize = self.builder.value_length() as usize;
self.builder.values().append_slice(&vec![0u8; length][..])?;
Expand Down Expand Up @@ -1465,13 +1488,15 @@ impl StructBuilder {

/// Appends an element (either null or non-null) to the struct. The actual elements
/// should be appended for each child sub-array in a consistent way.
#[inline]
pub fn append(&mut self, is_valid: bool) -> Result<()> {
self.bitmap_builder.append(is_valid);
self.len += 1;
Ok(())
}

/// Appends a null element to the struct.
#[inline]
pub fn append_null(&mut self) -> Result<()> {
self.append(false)
}
Expand Down Expand Up @@ -1649,6 +1674,7 @@ impl UnionBuilder {
}

/// Appends a null to this builder.
#[inline]
pub fn append_null(&mut self) -> Result<()> {
if self.bitmap_builder.is_none() {
let mut builder = BooleanBufferBuilder::new(self.len + 1);
Expand All @@ -1675,6 +1701,7 @@ impl UnionBuilder {
}

/// Appends a value to this builder.
#[inline]
pub fn append<T: ArrowPrimitiveType>(
&mut self,
type_name: &str,
Expand Down Expand Up @@ -1844,6 +1871,7 @@ where
/// Append a primitive value to the array. Return an existing index
/// if already present in the values array or a new index if the
/// value is appended to the values array.
#[inline]
pub fn append(&mut self, value: V::Native) -> Result<K::Native> {
if let Some(&key) = self.map.get(value.to_byte_slice()) {
// Append existing value.
Expand All @@ -1860,6 +1888,7 @@ where
}
}

#[inline]
pub fn append_null(&mut self) -> Result<()> {
self.keys_builder.append_null()
}
Expand Down Expand Up @@ -2047,6 +2076,7 @@ where
}
}

#[inline]
pub fn append_null(&mut self) -> Result<()> {
self.keys_builder.append_null()
}
Expand Down