Skip to content

fix: add null_buffer length check to StringArrayBuilder/LargeStringArrayBuilder #13758

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

Merged
merged 4 commits into from
Dec 15, 2024
Merged

fix: add null_buffer length check to StringArrayBuilder/LargeStringArrayBuilder #13758

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d70de6b
fix: add `null_buffer` check for `LargeStringArray`
jdockerty Dec 13, 2024
19b538a
fix: remove value_buffer assertion
jdockerty Dec 13, 2024
3cdddc0
feat: add `null_buffer` check to `StringArray`
jdockerty Dec 13, 2024
a8a15fc
feat: use `row_count` var to avoid drift
jdockerty Dec 13, 2024
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
34 changes: 32 additions & 2 deletions datafusion/functions/src/strings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,24 @@ impl StringArrayBuilder {
unsafe { self.offsets_buffer.push_unchecked(next_offset) };
}

/// Finalise the builder into a concrete [`StringArray`].
///
/// # Panics
///
/// This method can panic when:
///
/// - the provided `null_buffer` is not the same length as the `offsets_buffer`.
pub fn finish(self, null_buffer: Option<NullBuffer>) -> StringArray {
let row_count = self.offsets_buffer.len() / size_of::<i32>() - 1;
Copy link
Contributor

@alamb alamb Dec 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👨‍🍳 👌

if let Some(ref null_buffer) = null_buffer {
assert_eq!(
null_buffer.len(),
row_count,
"Null buffer and offsets buffer must be the same length"
);
}
let array_builder = ArrayDataBuilder::new(DataType::Utf8)
.len(self.offsets_buffer.len() / size_of::<i32>() - 1)
.len(row_count)
.add_buffer(self.offsets_buffer.into())
.add_buffer(self.value_buffer.into())
.nulls(null_buffer);
Expand Down Expand Up @@ -335,9 +350,24 @@ impl LargeStringArrayBuilder {
unsafe { self.offsets_buffer.push_unchecked(next_offset) };
}

/// Finalise the builder into a concrete [`LargeStringArray`].
///
/// # Panics
///
/// This method can panic when:
///
/// - the provided `null_buffer` is not the same length as the `offsets_buffer`.
pub fn finish(self, null_buffer: Option<NullBuffer>) -> LargeStringArray {
let row_count = self.offsets_buffer.len() / size_of::<i64>() - 1;
if let Some(ref null_buffer) = null_buffer {
assert_eq!(
null_buffer.len(),
row_count,
"Null buffer and offsets buffer must be the same length"
);
}
let array_builder = ArrayDataBuilder::new(DataType::LargeUtf8)
.len(self.offsets_buffer.len() / size_of::<i64>() - 1)
.len(row_count)
.add_buffer(self.offsets_buffer.into())
.add_buffer(self.value_buffer.into())
.nulls(null_buffer);
Expand Down
Loading