diff --git a/arrow-array/src/array/binary_array.rs b/arrow-array/src/array/binary_array.rs index cb168daf072..41fd01c3c9a 100644 --- a/arrow-array/src/array/binary_array.rs +++ b/arrow-array/src/array/binary_array.rs @@ -290,6 +290,8 @@ impl From for GenericBinaryArray>> for BooleanArray { impl From for BooleanArray { fn from(data: ArrayData) -> Self { + assert_eq!( + data.data_type(), + &DataType::Boolean, + "BooleanArray expected ArrayData with type {} got {}", + DataType::Boolean, + data.data_type() + ); assert_eq!( data.buffers().len(), 1, @@ -209,6 +216,8 @@ impl From for BooleanArray { let ptr = data.buffers()[0].as_ptr(); Self { data, + // SAFETY: + // ArrayData must be valid, and validated data type above raw_values: unsafe { RawPtrBox::new(ptr) }, } } @@ -414,4 +423,12 @@ mod tests { }; drop(BooleanArray::from(data)); } + + #[test] + #[should_panic( + expected = "BooleanArray expected ArrayData with type Boolean got Int32" + )] + fn test_from_array_data_validation() { + let _ = BooleanArray::from(ArrayData::new_empty(&DataType::Int32)); + } } diff --git a/arrow-array/src/array/decimal_array.rs b/arrow-array/src/array/decimal_array.rs index 34b424092e4..5ca9b0715cf 100644 --- a/arrow-array/src/array/decimal_array.rs +++ b/arrow-array/src/array/decimal_array.rs @@ -407,13 +407,21 @@ impl From for DecimalArray { "DecimalArray data should contain 1 buffer only (values)" ); let values = data.buffers()[0].as_ptr(); - let (precision, scale) = match (data.data_type(), Self::VALUE_LENGTH) { - (DataType::Decimal128(precision, scale), 16) - | (DataType::Decimal256(precision, scale), 32) => (*precision, *scale), - _ => panic!("Expected data type to be Decimal"), + let (precision, scale) = match (data.data_type(), Self::DEFAULT_TYPE) { + (DataType::Decimal128(precision, scale), DataType::Decimal128(_, _)) + | (DataType::Decimal256(precision, scale), DataType::Decimal256(_, _)) => { + (*precision, *scale) + } + _ => panic!( + "Expected data type to match {} got {}", + Self::DEFAULT_TYPE, + data.data_type() + ), }; Self { data, + // SAFETY: + // ArrayData must be valid, and verified data type above value_data: unsafe { RawPtrBox::new(values) }, precision, scale, @@ -977,4 +985,13 @@ mod tests { array.value(4); } + + #[test] + #[should_panic( + expected = "Expected data type to match Decimal256(76, 10) got Decimal128(38, 10)" + )] + fn test_from_array_data_validation() { + let array = Decimal128Array::from_iter_values(vec![-100, 0, 101].into_iter()); + let _ = Decimal256Array::from(array.into_data()); + } } diff --git a/arrow-array/src/array/dictionary_array.rs b/arrow-array/src/array/dictionary_array.rs index 96e91f729ab..002ee6f4782 100644 --- a/arrow-array/src/array/dictionary_array.rs +++ b/arrow-array/src/array/dictionary_array.rs @@ -408,10 +408,17 @@ impl From for DictionaryArray { ); if let DataType::Dictionary(key_data_type, _) = data.data_type() { - if key_data_type.as_ref() != &T::DATA_TYPE { - panic!("DictionaryArray's data type must match.") - }; + assert_eq!( + &T::DATA_TYPE, + key_data_type.as_ref(), + "DictionaryArray's data type must match, expected {} got {}", + T::DATA_TYPE, + key_data_type + ); + // create a zero-copy of the keys' data + // SAFETY: + // ArrayData is valid and verified type above let keys = PrimitiveArray::::from(unsafe { ArrayData::new_unchecked( T::DATA_TYPE, @@ -925,4 +932,13 @@ mod tests { let keys: Float32Array = [Some(0_f32), None, Some(3_f32)].into_iter().collect(); DictionaryArray::::try_new(&keys, &values).unwrap(); } + + #[test] + #[should_panic( + expected = "DictionaryArray's data type must match, expected Int64 got Int32" + )] + fn test_from_array_data_validation() { + let a = DictionaryArray::::from_iter(["32"]); + let _ = DictionaryArray::::from(a.into_data()); + } } diff --git a/arrow-array/src/array/list_array.rs b/arrow-array/src/array/list_array.rs index b45a0f9257f..cde7d3746f9 100644 --- a/arrow-array/src/array/list_array.rs +++ b/arrow-array/src/array/list_array.rs @@ -241,6 +241,9 @@ impl GenericListArray { let values = make_array(values); let value_offsets = data.buffers()[0].as_ptr(); + + // SAFETY: + // Verified list type in call to `Self::get_type` let value_offsets = unsafe { RawPtrBox::::new(value_offsets) }; Ok(Self { data, @@ -346,6 +349,7 @@ pub type LargeListArray = GenericListArray; #[cfg(test)] mod tests { use super::*; + use crate::builder::{Int32Builder, ListBuilder}; use crate::types::Int32Type; use crate::Int32Array; use arrow_buffer::{bit_util, Buffer, ToByteSlice}; @@ -804,6 +808,18 @@ mod tests { drop(ListArray::from(list_data)); } + #[test] + #[should_panic( + expected = "[Large]ListArray's datatype must be [Large]ListArray(). It is List" + )] + fn test_from_array_data_validation() { + let mut builder = ListBuilder::new(Int32Builder::new()); + builder.values().append_value(1); + builder.append(true); + let array = builder.finish(); + let _ = LargeListArray::from(array.into_data()); + } + #[test] fn test_list_array_offsets_need_not_start_at_zero() { let value_data = ArrayData::builder(DataType::Int32) diff --git a/arrow-array/src/array/map_array.rs b/arrow-array/src/array/map_array.rs index bfe8d407274..0f3ae2e689a 100644 --- a/arrow-array/src/array/map_array.rs +++ b/arrow-array/src/array/map_array.rs @@ -109,6 +109,12 @@ impl From for ArrayData { impl MapArray { fn try_new_from_array_data(data: ArrayData) -> Result { + assert!( + matches!(data.data_type(), DataType::Map(_, _)), + "MapArray expected ArrayData with DataType::Map got {}", + data.data_type() + ); + if data.buffers().len() != 1 { return Err(ArrowError::InvalidArgumentError( format!("MapArray data should contain a single buffer only (value offsets), had {}", @@ -141,6 +147,8 @@ impl MapArray { let values = make_array(entries); let value_offsets = data.buffers()[0].as_ptr(); + // SAFETY: + // ArrayData is valid, and verified type above let value_offsets = unsafe { RawPtrBox::::new(value_offsets) }; unsafe { if (*value_offsets.as_ptr().offset(0)) != 0 { @@ -467,6 +475,21 @@ mod tests { map_array.value(map_array.len()); } + #[test] + #[should_panic( + expected = "MapArray expected ArrayData with DataType::Map got Dictionary" + )] + fn test_from_array_data_validation() { + // A DictionaryArray has similar buffer layout to a MapArray + // but the meaning of the values differs + let struct_t = DataType::Struct(vec![ + Field::new("keys", DataType::Int32, true), + Field::new("values", DataType::UInt32, true), + ]); + let dict_t = DataType::Dictionary(Box::new(DataType::Int32), Box::new(struct_t)); + let _ = MapArray::from(ArrayData::new_empty(&dict_t)); + } + #[test] fn test_new_from_strings() { let keys = vec!["a", "b", "c", "d", "e", "f", "g", "h"]; diff --git a/arrow-array/src/array/primitive_array.rs b/arrow-array/src/array/primitive_array.rs index e5f5cd481af..be770b1cfe0 100644 --- a/arrow-array/src/array/primitive_array.rs +++ b/arrow-array/src/array/primitive_array.rs @@ -809,6 +809,14 @@ impl PrimitiveArray { /// Constructs a `PrimitiveArray` from an array data reference. impl From for PrimitiveArray { fn from(data: ArrayData) -> Self { + // Use discriminant to allow for decimals + assert_eq!( + std::mem::discriminant(&T::DATA_TYPE), + std::mem::discriminant(data.data_type()), + "PrimitiveArray expected ArrayData with type {} got {}", + T::DATA_TYPE, + data.data_type() + ); assert_eq!( data.buffers().len(), 1, @@ -818,6 +826,8 @@ impl From for PrimitiveArray { let ptr = data.buffers()[0].as_ptr(); Self { data, + // SAFETY: + // ArrayData must be valid, and validated data type above raw_values: unsafe { RawPtrBox::new(ptr) }, } } @@ -1342,4 +1352,13 @@ mod tests { array.value(4); } + + #[test] + #[should_panic( + expected = "PrimitiveArray expected ArrayData with type Int64 got Int32" + )] + fn test_from_array_data_validation() { + let foo = PrimitiveArray::::from_iter([1, 2, 3]); + let _ = PrimitiveArray::::from(foo.into_data()); + } }