Skip to content

Allocate a buffer of the correct length for ScalarValue::FixedSizeBinary in ScalarValue::to_array_of_size#18903

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
Jefffrey merged 4 commits into from
Nov 30, 2025
Merged

Allocate a buffer of the correct length for ScalarValue::FixedSizeBinary in ScalarValue::to_array_of_size #18903

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ae29cb
Allocate a buffer of the correct length for ScalarValue::FixedSizeBin…
tschwarzinger Nov 24, 2025
b79d122
Use FixedSizeBinaryBuilder instead of directly constructing the Fixed…
tschwarzinger Nov 26, 2025
b1b9e61
Merge remote-tracking branch 'origin/main' into fix-fixed-size-binary…
tschwarzinger Nov 30, 2025
9497e49
Fix merge conflicts
tschwarzinger Nov 30, 2025
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
41 changes: 30 additions & 11 deletions datafusion/common/src/scalar/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,16 +60,16 @@ use arrow::array::{
BinaryArray, BinaryViewArray, BooleanArray, Date32Array, Date64Array, Decimal32Array,
Decimal64Array, Decimal128Array, Decimal256Array, DictionaryArray,
DurationMicrosecondArray, DurationMillisecondArray, DurationNanosecondArray,
DurationSecondArray, FixedSizeBinaryArray, FixedSizeListArray, Float16Array,
Float32Array, Float64Array, GenericListArray, Int8Array, Int16Array, Int32Array,
Int64Array, IntervalDayTimeArray, IntervalMonthDayNanoArray, IntervalYearMonthArray,
LargeBinaryArray, LargeListArray, LargeStringArray, ListArray, MapArray,
MutableArrayData, OffsetSizeTrait, PrimitiveArray, Scalar, StringArray,
StringViewArray, StructArray, Time32MillisecondArray, Time32SecondArray,
Time64MicrosecondArray, Time64NanosecondArray, TimestampMicrosecondArray,
TimestampMillisecondArray, TimestampNanosecondArray, TimestampSecondArray,
UInt8Array, UInt16Array, UInt32Array, UInt64Array, UnionArray, new_empty_array,
new_null_array,
DurationSecondArray, FixedSizeBinaryArray, FixedSizeBinaryBuilder,
FixedSizeListArray, Float16Array, Float32Array, Float64Array, GenericListArray,
Int8Array, Int16Array, Int32Array, Int64Array, IntervalDayTimeArray,
IntervalMonthDayNanoArray, IntervalYearMonthArray, LargeBinaryArray, LargeListArray,
LargeStringArray, ListArray, MapArray, MutableArrayData, OffsetSizeTrait,
PrimitiveArray, Scalar, StringArray, StringViewArray, StructArray,
Time32MillisecondArray, Time32SecondArray, Time64MicrosecondArray,
Time64NanosecondArray, TimestampMicrosecondArray, TimestampMillisecondArray,
TimestampNanosecondArray, TimestampSecondArray, UInt8Array, UInt16Array, UInt32Array,
UInt64Array, UnionArray, new_empty_array, new_null_array,
};
use arrow::buffer::{BooleanBuffer, ScalarBuffer};
use arrow::compute::kernels::cast::{CastOptions, cast_with_options};
Expand DownExpand Up@@ -3059,7 +3059,14 @@ impl ScalarValue {
)
.unwrap(),
),
None => Arc::new(FixedSizeBinaryArray::new_null(*s, size)),
None => {
// TODO: Replace with FixedSizeBinaryArray::new_null once a fix for
// https://github.com/apache/arrow-rs/issues/8900 is in the used arrow-rs
// version.
let mut builder = FixedSizeBinaryBuilder::new(*s);
builder.append_nulls(size);
Arc::new(builder.finish())
}
},
ScalarValue::LargeBinary(e) => match e {
Some(value) => Arc::new(
Expand DownExpand Up@@ -5317,6 +5324,18 @@ mod tests {
assert_eq!(empty_array.len(), 0);
}

/// See https://github.com/apache/datafusion/issues/18870
#[test]
fn test_to_array_of_size_for_none_fsb() {
let sv = ScalarValue::FixedSizeBinary(5, None);
let result = sv
.to_array_of_size(2)
.expect("Failed to convert to array of size");
assert_eq!(result.len(), 2);
assert_eq!(result.null_count(), 2);
assert_eq!(result.as_fixed_size_binary().values().len(), 10);
}

#[test]
fn test_list_to_array_string() {
let scalars = vec![
Expand Down