Skip to content

Revert Workround for Empty FixedSizeBinary Values Buffer After arrow-rs Upgrade #19801

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 1 commit into from
Jan 14, 2026
+10 −18
Merged

Revert Workround for Empty FixedSizeBinary Values Buffer After arrow-rs Upgrade #19801

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
28 changes: 10 additions & 18 deletions datafusion/common/src/scalar/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,15 @@ use arrow::array::{
Date64Array, Decimal32Array, Decimal64Array, Decimal128Array, Decimal256Array,
DictionaryArray, DurationMicrosecondArray, DurationMillisecondArray,
DurationNanosecondArray, 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, StringViewBuilder, StructArray, Time32MillisecondArray,
Time32SecondArray, Time64MicrosecondArray, Time64NanosecondArray,
TimestampMicrosecondArray, TimestampMillisecondArray, TimestampNanosecondArray,
TimestampSecondArray, UInt8Array, UInt16Array, UInt32Array, UInt64Array, UnionArray,
new_empty_array, new_null_array,
FixedSizeListArray, Float16Array, Float32Array, Float64Array, GenericListArray,
Int8Array, Int16Array, Int32Array, Int64Array, IntervalDayTimeArray,
IntervalMonthDayNanoArray, IntervalYearMonthArray, LargeBinaryArray, LargeListArray,
LargeStringArray, ListArray, MapArray, MutableArrayData, OffsetSizeTrait,
PrimitiveArray, Scalar, StringArray, StringViewArray, StringViewBuilder, 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 Down Expand Up @@ -3031,14 +3030,7 @@ impl ScalarValue {
)
.unwrap(),
),
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())
}
None => Arc::new(FixedSizeBinaryArray::new_null(*s, size)),
},
ScalarValue::LargeBinary(e) => match e {
Some(value) => {
Expand Down