-
Notifications
You must be signed in to change notification settings - Fork 1.1k
[Variant] Align cast logic for from/to_decimal for variant #9689
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.
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
base: main
Are you sure you want to change the base?
Changes from all commits
c9a092e
38dfe69
084872b
8f91b9e
9003a67
253f0b4
ce05fea
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -531,7 +531,7 @@ where | |
|
|
||
| /// Parses given string to specified decimal native (i128/i256) based on given | ||
| /// scale. Returns an `Err` if it cannot parse given string. | ||
| pub(crate) fn parse_string_to_decimal_native<T: DecimalType>( | ||
| pub fn parse_string_to_decimal_native<T: DecimalType>( | ||
| value_str: &str, | ||
| scale: usize, | ||
| ) -> Result<T::Native, ArrowError> | ||
|
|
@@ -777,15 +777,15 @@ where | |
| if cast_options.safe { | ||
| array | ||
| .unary_opt::<_, D>(|v| { | ||
| D::Native::from_f64((mul * v.as_()).round()) | ||
| single_float_to_decimal::<D>(v.as_(), mul) | ||
| .filter(|v| D::is_valid_decimal_precision(*v, precision)) | ||
| }) | ||
| .with_precision_and_scale(precision, scale) | ||
| .map(|a| Arc::new(a) as ArrayRef) | ||
| } else { | ||
| array | ||
| .try_unary::<_, D, _>(|v| { | ||
| D::Native::from_f64((mul * v.as_()).round()) | ||
| single_float_to_decimal::<D>(v.as_(), mul) | ||
| .ok_or_else(|| { | ||
| ArrowError::CastError(format!( | ||
| "Cannot cast to {}({}, {}). Overflowing on {:?}", | ||
|
|
@@ -802,6 +802,17 @@ where | |
| } | ||
| } | ||
|
|
||
| /// Cast a single floating point value to a decimal native with the given multiple. | ||
| /// Returns `None` if the value cannot be represented with the requested precision. | ||
| #[inline] | ||
| pub fn single_float_to_decimal<D>(input: f64, mul: f64) -> Option<D::Native> | ||
| where | ||
| D: DecimalType + ArrowPrimitiveType, | ||
| <D as ArrowPrimitiveType>::Native: DecimalCast, | ||
| { | ||
| D::Native::from_f64((mul * input).round()) | ||
| } | ||
|
|
||
| pub(crate) fn cast_decimal_to_integer<D, T>( | ||
| array: &dyn Array, | ||
| base: D::Native, | ||
|
|
@@ -833,11 +844,11 @@ where | |
| if array.is_null(i) { | ||
| value_builder.append_null(); | ||
| } else { | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Changed back to the if/esle and match pattern, because
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ah, I totally missed the spurious error allocation pitfall 🤦. Glad your benchmarking uncovered it!
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If you really wanted to unify without the overhead, a helper that returns But probably not worth it, especially given that the checked mul/div also produce |
||
| let v = array | ||
| .value(i) | ||
| .mul_checked(div) | ||
| .ok() | ||
| .and_then(<T::Native as NumCast>::from::<D::Native>); | ||
| let v = cast_single_decimal_to_integer_opt::<D, T::Native>( | ||
| array.value(i), | ||
| div, | ||
| true, | ||
| ); | ||
| value_builder.append_option(v); | ||
| } | ||
| } | ||
|
|
@@ -847,17 +858,12 @@ where | |
| if array.is_null(i) { | ||
| value_builder.append_null(); | ||
| } else { | ||
| let v = array.value(i).mul_checked(div)?; | ||
|
|
||
| let value = | ||
| <T::Native as NumCast>::from::<D::Native>(v).ok_or_else(|| { | ||
| ArrowError::CastError(format!( | ||
| "value of {:?} is out of range {}", | ||
| v, | ||
| T::DATA_TYPE | ||
| )) | ||
| })?; | ||
|
|
||
| let value = cast_single_decimal_to_integer_result::<D, T::Native>( | ||
| array.value(i), | ||
| div, | ||
| true, | ||
| T::DATA_TYPE, | ||
| )?; | ||
| value_builder.append_value(value); | ||
| } | ||
| } | ||
|
|
@@ -870,11 +876,11 @@ where | |
| if array.is_null(i) { | ||
| value_builder.append_null(); | ||
| } else { | ||
| let v = array | ||
| .value(i) | ||
| .div_checked(div) | ||
| .ok() | ||
| .and_then(<T::Native as NumCast>::from::<D::Native>); | ||
| let v = cast_single_decimal_to_integer_opt::<D, T::Native>( | ||
| array.value(i), | ||
| div, | ||
| false, | ||
| ); | ||
| value_builder.append_option(v); | ||
| } | ||
| } | ||
|
|
@@ -884,26 +890,66 @@ where | |
| if array.is_null(i) { | ||
| value_builder.append_null(); | ||
| } else { | ||
| let v = array.value(i).div_checked(div)?; | ||
|
|
||
| let value = | ||
| <T::Native as NumCast>::from::<D::Native>(v).ok_or_else(|| { | ||
| ArrowError::CastError(format!( | ||
| "value of {:?} is out of range {}", | ||
| v, | ||
| T::DATA_TYPE | ||
| )) | ||
| })?; | ||
|
|
||
| let value = cast_single_decimal_to_integer_result::<D, T::Native>( | ||
| array.value(i), | ||
| div, | ||
| false, | ||
| T::DATA_TYPE, | ||
| )?; | ||
| value_builder.append_value(value); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| Ok(Arc::new(value_builder.finish())) | ||
| } | ||
|
|
||
| /// Casting a given decimal to an integer based on given div and scale. | ||
| /// The value is scaled by multiplying or dividing with the div based on the scale sign. | ||
| /// Returns `None` if the value is overflow or cannot be represented with the requested precision. | ||
| #[inline] | ||
| pub fn cast_single_decimal_to_integer_opt<D, T>( | ||
| value: D::Native, | ||
| div: D::Native, | ||
| negative: bool, | ||
| ) -> Option<T> | ||
| where | ||
| T: NumCast + ToPrimitive, | ||
| D: DecimalType + ArrowPrimitiveType, | ||
| <D as ArrowPrimitiveType>::Native: ToPrimitive, | ||
| { | ||
| let v = if negative { | ||
| value.mul_checked(div).ok()? | ||
| } else { | ||
| value.div_checked(div).ok()? | ||
| }; | ||
| T::from::<D::Native>(v) | ||
| } | ||
|
|
||
| #[inline] | ||
| fn cast_single_decimal_to_integer_result<D, T>( | ||
| value: D::Native, | ||
| div: D::Native, | ||
| negative: bool, | ||
| type_name: DataType, | ||
| ) -> Result<T, ArrowError> | ||
| where | ||
| T: NumCast + ToPrimitive, | ||
| D: DecimalType + ArrowPrimitiveType, | ||
| <D as ArrowPrimitiveType>::Native: ToPrimitive, | ||
| { | ||
| let v = if negative { | ||
| value.mul_checked(div)? | ||
| } else { | ||
| value.div_checked(div)? | ||
| }; | ||
| T::from::<D::Native>(v).ok_or_else(|| { | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Did not unify these two functions, because if I unify them with a common function like Then, in the caller function, I can't the value of
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ah tricky indeed. |
||
| ArrowError::CastError(format!("value of {:?} is out of range {:?}", v, type_name)) | ||
| }) | ||
| } | ||
|
|
||
| /// Cast a decimal array to a floating point array. | ||
| /// | ||
| /// Conversion is lossy and follows standard floating point semantics. Values | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.