Skip to content
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

Jump to bottom

Enable casting between Dictionary of DecimalArray and DecimalArray #3238

Merged
merged 5 commits into from
Dec 3, 2022
Merged

Enable casting between Dictionary of DecimalArray and DecimalArray #3238

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2d057c1
Enable casting between Dictionary of DecimalArray and DecimalArray
viirya Nov 29, 2022
706510d
Merge remote-tracking branch 'upstream/master' into cast_dictionary_d…
viirya Dec 1, 2022
42fb28b
Add tests and fix more issues
viirya Dec 1, 2022
6e1651d
Merge remote-tracking branch 'upstream/master' into cast_dictionary_d…
viirya Dec 1, 2022
54f4519
Move Dictionary matches to top
viirya Dec 3, 2022
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
88 changes: 88 additions & 0 deletions arrow-cast/src/cast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,6 +692,36 @@ pub fn cast_with_options(
Float64 => {
cast_decimal_to_float!(array, scale, Float64Builder, f64)
}
Dictionary(index_type, value_type) => match **index_type {
Copy link
Contributor

@tustvold tustvold Dec 2, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

These appear to duplicate a block lower down in the match tree

        (Dictionary(index_type, _), _) => match **index_type {
            Int8 => dictionary_cast::<Int8Type>(array, to_type, cast_options),
            Int16 => dictionary_cast::<Int16Type>(array, to_type, cast_options),
            Int32 => dictionary_cast::<Int32Type>(array, to_type, cast_options),
            Int64 => dictionary_cast::<Int64Type>(array, to_type, cast_options),
            UInt8 => dictionary_cast::<UInt8Type>(array, to_type, cast_options),
            UInt16 => dictionary_cast::<UInt16Type>(array, to_type, cast_options),
            UInt32 => dictionary_cast::<UInt32Type>(array, to_type, cast_options),
            UInt64 => dictionary_cast::<UInt64Type>(array, to_type, cast_options),
            _ => Err(ArrowError::CastError(format!(
                "Casting from dictionary type {:?} to {:?} not supported",
                from_type, to_type,
            ))),
        },
        (_, Dictionary(index_type, value_type)) => match **index_type {
            Int8 => cast_to_dictionary::<Int8Type>(array, value_type, cast_options),
            Int16 => cast_to_dictionary::<Int16Type>(array, value_type, cast_options),
            Int32 => cast_to_dictionary::<Int32Type>(array, value_type, cast_options),
            Int64 => cast_to_dictionary::<Int64Type>(array, value_type, cast_options),
            UInt8 => cast_to_dictionary::<UInt8Type>(array, value_type, cast_options),
            UInt16 => cast_to_dictionary::<UInt16Type>(array, value_type, cast_options),
            UInt32 => cast_to_dictionary::<UInt32Type>(array, value_type, cast_options),
            UInt64 => cast_to_dictionary::<UInt64Type>(array, value_type, cast_options),
            _ => Err(ArrowError::CastError(format!(
                "Casting from type {:?} to dictionary type {:?} not supported",
                from_type, to_type,
            ))),
        },

Perhaps we could just move the decimal matches lower?

Edit: In fact moving the dictionary matches to the top would also simplify the list handling as well, what do you think?

Copy link
Member Author

Choose a reason for hiding this comment

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

Good catch! Moved the dictionary matches to the top.

Int8 => {
cast_to_dictionary::<Int8Type>(array, value_type, cast_options)
}
Int16 => {
cast_to_dictionary::<Int16Type>(array, value_type, cast_options)
}
Int32 => {
cast_to_dictionary::<Int32Type>(array, value_type, cast_options)
}
Int64 => {
cast_to_dictionary::<Int64Type>(array, value_type, cast_options)
}
UInt8 => {
cast_to_dictionary::<UInt8Type>(array, value_type, cast_options)
}
UInt16 => {
cast_to_dictionary::<UInt16Type>(array, value_type, cast_options)
}
UInt32 => {
cast_to_dictionary::<UInt32Type>(array, value_type, cast_options)
}
UInt64 => {
cast_to_dictionary::<UInt64Type>(array, value_type, cast_options)
}
_ => Err(ArrowError::CastError(format!(
"Casting from type {:?} to dictionary type {:?} not supported",
from_type, to_type,
))),
},
Null => Ok(new_null_array(to_type, array.len())),
_ => Err(ArrowError::CastError(format!(
"Casting from {:?} to {:?} not supported",
Expand Down Expand Up @@ -726,6 +756,36 @@ pub fn cast_with_options(
*scale,
cast_options,
),
Dictionary(index_type, value_type) => match **index_type {
Int8 => {
cast_to_dictionary::<Int8Type>(array, value_type, cast_options)
}
Int16 => {
cast_to_dictionary::<Int16Type>(array, value_type, cast_options)
}
Int32 => {
cast_to_dictionary::<Int32Type>(array, value_type, cast_options)
}
Int64 => {
cast_to_dictionary::<Int64Type>(array, value_type, cast_options)
}
UInt8 => {
cast_to_dictionary::<UInt8Type>(array, value_type, cast_options)
}
UInt16 => {
cast_to_dictionary::<UInt16Type>(array, value_type, cast_options)
}
UInt32 => {
cast_to_dictionary::<UInt32Type>(array, value_type, cast_options)
}
UInt64 => {
cast_to_dictionary::<UInt64Type>(array, value_type, cast_options)
}
_ => Err(ArrowError::CastError(format!(
"Casting from type {:?} to dictionary type {:?} not supported",
from_type, to_type,
))),
},
Null => Ok(new_null_array(to_type, array.len())),
_ => Err(ArrowError::CastError(format!(
"Casting from {:?} to {:?} not supported",
Expand Down Expand Up @@ -804,6 +864,20 @@ pub fn cast_with_options(
*scale,
cast_options,
),
Dictionary(index_type, _) => match **index_type {
Int8 => dictionary_cast::<Int8Type>(array, to_type, cast_options),
Int16 => dictionary_cast::<Int16Type>(array, to_type, cast_options),
Int32 => dictionary_cast::<Int32Type>(array, to_type, cast_options),
Int64 => dictionary_cast::<Int64Type>(array, to_type, cast_options),
UInt8 => dictionary_cast::<UInt8Type>(array, to_type, cast_options),
UInt16 => dictionary_cast::<UInt16Type>(array, to_type, cast_options),
UInt32 => dictionary_cast::<UInt32Type>(array, to_type, cast_options),
UInt64 => dictionary_cast::<UInt64Type>(array, to_type, cast_options),
_ => Err(ArrowError::CastError(format!(
"Casting from dictionary type {:?} to {:?} not supported",
from_type, to_type,
))),
},
Null => Ok(new_null_array(to_type, array.len())),
_ => Err(ArrowError::CastError(format!(
"Casting from {:?} to {:?} not supported",
Expand Down Expand Up @@ -855,6 +929,20 @@ pub fn cast_with_options(
*scale,
cast_options,
),
Dictionary(index_type, _) => match **index_type {
Int8 => dictionary_cast::<Int8Type>(array, to_type, cast_options),
Int16 => dictionary_cast::<Int16Type>(array, to_type, cast_options),
Int32 => dictionary_cast::<Int32Type>(array, to_type, cast_options),
Int64 => dictionary_cast::<Int64Type>(array, to_type, cast_options),
UInt8 => dictionary_cast::<UInt8Type>(array, to_type, cast_options),
UInt16 => dictionary_cast::<UInt16Type>(array, to_type, cast_options),
UInt32 => dictionary_cast::<UInt32Type>(array, to_type, cast_options),
UInt64 => dictionary_cast::<UInt64Type>(array, to_type, cast_options),
_ => Err(ArrowError::CastError(format!(
"Casting from dictionary type {:?} to {:?} not supported",
from_type, to_type,
))),
},
Null => Ok(new_null_array(to_type, array.len())),
_ => Err(ArrowError::CastError(format!(
"Casting from {:?} to {:?} not supported",
Expand Down