Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 14 additions & 3 deletions datafusion/common/src/cast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@

use crate::{downcast_value, Result};
use arrow::array::{
BinaryViewArray, DurationMicrosecondArray, DurationMillisecondArray,
DurationNanosecondArray, DurationSecondArray, Float16Array, Int16Array, Int8Array,
LargeBinaryArray, LargeStringArray, StringViewArray, UInt16Array,
BinaryViewArray, Decimal32Array, Decimal64Array, DurationMicrosecondArray,
DurationMillisecondArray, DurationNanosecondArray, DurationSecondArray, Float16Array,
Int16Array, Int8Array, LargeBinaryArray, LargeStringArray, StringViewArray,
UInt16Array,
};
use arrow::{
array::{
Expand Down Expand Up @@ -97,6 +98,16 @@ pub fn as_uint64_array(array: &dyn Array) -> Result<&UInt64Array> {
Ok(downcast_value!(array, UInt64Array))
}

// Downcast Array to Decimal32Array
pub fn as_decimal32_array(array: &dyn Array) -> Result<&Decimal32Array> {
Ok(downcast_value!(array, Decimal32Array))
}

// Downcast Array to Decimal64Array
pub fn as_decimal64_array(array: &dyn Array) -> Result<&Decimal64Array> {
Ok(downcast_value!(array, Decimal64Array))
}

// Downcast Array to Decimal128Array
pub fn as_decimal128_array(array: &dyn Array) -> Result<&Decimal128Array> {
Ok(downcast_value!(array, Decimal128Array))
Expand Down
39 changes: 39 additions & 0 deletions datafusion/common/src/dfschema.rs
Original file line number Diff line number Diff line change
Expand Up @@ -798,6 +798,14 @@ impl DFSchema {
.zip(iter2)
.all(|((t1, f1), (t2, f2))| t1 == t2 && Self::field_is_semantically_equal(f1, f2))
}
(
DataType::Decimal32(_l_precision, _l_scale),
DataType::Decimal32(_r_precision, _r_scale),
) => true,
(
DataType::Decimal64(_l_precision, _l_scale),
DataType::Decimal64(_r_precision, _r_scale),
) => true,
(
DataType::Decimal128(_l_precision, _l_scale),
DataType::Decimal128(_r_precision, _r_scale),
Expand Down Expand Up @@ -1056,6 +1064,12 @@ fn format_simple_data_type(data_type: &DataType) -> String {
DataType::Dictionary(_, value_type) => {
format_simple_data_type(value_type.as_ref())
}
DataType::Decimal32(precision, scale) => {
format!("decimal32({precision}, {scale})")
}
DataType::Decimal64(precision, scale) => {
format!("decimal64({precision}, {scale})")
}
DataType::Decimal128(precision, scale) => {
format!("decimal128({precision}, {scale})")
}
Expand Down Expand Up @@ -1794,6 +1808,27 @@ mod tests {
&DataType::Int16
));

// Succeeds if decimal precision and scale are different
assert!(DFSchema::datatype_is_semantically_equal(
&DataType::Decimal32(1, 2),
&DataType::Decimal32(2, 1),
));

assert!(DFSchema::datatype_is_semantically_equal(
&DataType::Decimal64(1, 2),
&DataType::Decimal64(2, 1),
));

assert!(DFSchema::datatype_is_semantically_equal(
&DataType::Decimal128(1, 2),
&DataType::Decimal128(2, 1),
));

assert!(DFSchema::datatype_is_semantically_equal(
&DataType::Decimal256(1, 2),
&DataType::Decimal256(2, 1),
));

// Test lists

// Succeeds if both have the same element type, disregards names and nullability
Expand Down Expand Up @@ -2377,6 +2412,8 @@ mod tests {
),
false,
),
Field::new("decimal32", DataType::Decimal32(9, 4), true),
Field::new("decimal64", DataType::Decimal64(9, 4), true),
Field::new("decimal128", DataType::Decimal128(18, 4), true),
Field::new("decimal256", DataType::Decimal256(38, 10), false),
Field::new("date32", DataType::Date32, true),
Expand Down Expand Up @@ -2408,6 +2445,8 @@ mod tests {
|-- fixed_size_binary: fixed_size_binary (nullable = true)
|-- fixed_size_list: fixed size list (nullable = false)
| |-- item: int32 (nullable = true)
|-- decimal32: decimal32(9, 4) (nullable = true)
|-- decimal64: decimal64(9, 4) (nullable = true)
|-- decimal128: decimal128(18, 4) (nullable = true)
|-- decimal256: decimal256(38, 10) (nullable = false)
|-- date32: date32 (nullable = true)
Expand Down
Loading