tustvold commented on code in PR #2169:
URL: https://github.com/apache/arrow-rs/pull/2169#discussion_r930758125
##########
arrow/src/datatypes/native.rs:
##########
@@ -79,6 +79,18 @@ pub trait ArrowNativeType:
None
}
+ /// Convert native type to i128.
+ #[inline]
+ fn to_i128(&self) -> Option<i128> {
Review Comment:
I'm not a massive fan of more of these, when I hope to remove them in favour
of the standard NUM traits...
##########
arrow/src/compute/kernels/cast.rs:
##########
@@ -270,45 +269,62 @@ pub fn cast(array: &ArrayRef, to_type: &DataType) ->
Result<ArrayRef> {
cast_with_options(array, to_type, &DEFAULT_CAST_OPTIONS)
}
-// cast the integer array to defined decimal data type array
-macro_rules! cast_integer_to_decimal {
- ($ARRAY: expr, $ARRAY_TYPE: ident, $PRECISION : ident, $SCALE : ident) =>
{{
- let array = $ARRAY.as_any().downcast_ref::<$ARRAY_TYPE>().unwrap();
- let mul: i128 = 10_i128.pow(*$SCALE as u32);
- let decimal_array = array
- .iter()
- .map(|v| {
- v.map(|v| {
- let v = v as i128;
- // with_precision_and_scale validates the
- // value is within range for the output precision
- mul * v
- })
- })
- .collect::<Decimal128Array>()
- .with_precision_and_scale(*$PRECISION, *$SCALE)?;
- Ok(Arc::new(decimal_array))
- }};
+/// Cast the primitive array to defined decimal data type array
+fn cast_primitive_to_decimal<T: ArrayAccessor, F>(
+ array: T,
+ op: F,
+ precision: usize,
+ scale: usize,
+) -> Result<Arc<dyn Array>>
+where
+ F: Fn(T::Item) -> i128,
+{
+ #[allow(clippy::redundant_closure)]
+ let decimal_array = ArrayIter::new(array)
+ .map(|v| v.map(|v| op(v)))
+ .collect::<Decimal128Array>()
+ .with_precision_and_scale(precision, scale)?;
+
+ Ok(Arc::new(decimal_array))
}
-// cast the floating-point array to defined decimal data type array
-macro_rules! cast_floating_point_to_decimal {
- ($ARRAY: expr, $ARRAY_TYPE: ident, $PRECISION : ident, $SCALE : ident) =>
{{
- let array = $ARRAY.as_any().downcast_ref::<$ARRAY_TYPE>().unwrap();
- let mul = 10_f64.powi(*$SCALE as i32);
- let decimal_array = array
- .iter()
- .map(|v| {
- v.map(|v| {
- // with_precision_and_scale validates the
- // value is within range for the output precision
- ((v as f64) * mul) as i128
- })
- })
- .collect::<Decimal128Array>()
- .with_precision_and_scale(*$PRECISION, *$SCALE)?;
- Ok(Arc::new(decimal_array))
- }};
+fn cast_integer_to_decimal<T: ArrowNumericType>(
+ array: &PrimitiveArray<T>,
+ precision: usize,
+ scale: usize,
+) -> Result<Arc<dyn Array>> {
+ let mul: i128 = 10_i128.pow(scale as u32);
+
+ // with_precision_and_scale validates the
+ // value is within range for the output precision
+ cast_primitive_to_decimal(
+ array,
+ |v| v.to_isize().unwrap() as i128 * mul,
+ precision,
+ scale,
+ )
+}
+
+fn cast_floating_point_to_decimal<T: ArrowNumericType>(
+ array: &PrimitiveArray<T>,
+ precision: usize,
+ scale: usize,
+) -> Result<Arc<dyn Array>>
+where
+ <T as ArrowPrimitiveType>::Native: ToPrimitive,
+{
+ let mul = 10_f64.powi(scale as i32);
+
+ cast_primitive_to_decimal(
+ array,
+ |v| {
+ // with_precision_and_scale validates the
+ // value is within range for the output precision
+ ((num::ToPrimitive::to_f64(&v).unwrap()) * mul) as i128
Review Comment:
Why not use AsPrimitive instead of ToPrimitive?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
