alamb commented on code in PR #12228:
URL: https://github.com/apache/arrow-rs/pull/12228#discussion_r4636055135
##########
arrow-array/src/builder/primitive_builder.rs:
##########
@@ -350,31 +349,16 @@ impl<T: ArrowPrimitiveType> PrimitiveBuilder<T> {
/// Builds the [`PrimitiveArray`] and reset this builder.
pub fn finish(&mut self) -> PrimitiveArray<T> {
- let len = self.len();
let nulls = self.null_buffer_builder.finish();
Review Comment:
let's do that in a follow on PR as I think this one stands alone as is
##########
arrow-array/src/builder/generic_bytes_builder.rs:
##########
@@ -201,33 +202,46 @@ impl<T: ByteArrayType> GenericByteBuilder<T> {
/// Builds the [`GenericByteArray`] and reset this builder.
pub fn finish(&mut self) -> GenericByteArray<T> {
- let array_type = T::DATA_TYPE;
- let array_builder = ArrayDataBuilder::new(array_type)
- .len(self.len())
- .add_buffer(std::mem::take(&mut self.offsets_builder).into())
- .add_buffer(std::mem::take(&mut self.value_builder).into())
- .nulls(self.null_buffer_builder.finish());
+ debug_assert!(self.offsets_builder.is_sorted());
+ // SAFETY: offsets start at 0 and every append pushes the current end
of
+ // `value_builder`, so they are non-empty and monotonically increasing.
+ let offsets = unsafe {
+ OffsetBuffer::new_unchecked(std::mem::take(&mut
self.offsets_builder).into())
+ };
+ let values = std::mem::take(&mut self.value_builder).into();
+ let nulls = self.null_buffer_builder.finish();
- self.offsets_builder.push(self.next_offset());
- // SAFETY: builder is constructed from valid offset and value buffers
maintained by the builder
- let array_data = unsafe { array_builder.build_unchecked() };
- GenericByteArray::from(array_data)
+ self.offsets_builder.push(T::Offset::usize_as(0));
+
+ // SAFETY: `try_new` would not error. No append pushes an offset past
+ // the end of `value_builder`, which only grows, so the last offset is
+ // at most `values.len()` (`write!` can leave bytes after it). `nulls`
+ // has one entry per value. For strings, every append, `write!`
+ // included, copies whole UTF-8 sequences, so each offset pair bounds
+ // valid UTF-8.
+ unsafe { GenericByteArray::new_unchecked(offsets, values, nulls) }
}
/// Builds the [`GenericByteArray`] without resetting the builder.
pub fn finish_cloned(&self) -> GenericByteArray<T> {
- let array_type = T::DATA_TYPE;
- let offset_buffer =
Buffer::from_slice_ref(self.offsets_builder.as_slice());
- let value_buffer =
Buffer::from_slice_ref(self.value_builder.as_slice());
- let array_builder = ArrayDataBuilder::new(array_type)
- .len(self.len())
- .add_buffer(offset_buffer)
- .add_buffer(value_buffer)
- .nulls(self.null_buffer_builder.finish_cloned());
+ debug_assert!(self.offsets_builder.is_sorted());
+ // SAFETY: offsets start at 0 and every append pushes the current end
of
+ // `value_builder`, so they are non-empty and monotonically increasing.
+ let offsets = unsafe {
+ OffsetBuffer::new_unchecked(
+ Buffer::from_slice_ref(self.offsets_builder.as_slice()).into(),
+ )
+ };
+ let values = Buffer::from_slice_ref(self.value_builder.as_slice());
+ let nulls = self.null_buffer_builder.finish_cloned();
- // SAFETY: builder is constructed from valid offset and value buffers
maintained by the builder
- let array_data = unsafe { array_builder.build_unchecked() };
- GenericByteArray::from(array_data)
+ // SAFETY: `try_new` would not error. No append pushes an offset past
Review Comment:
a nit is this "try_new would not error" doesn't add any additional
information
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]