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

optimize the numeric_cast_with_error #2661

Merged
merged 4 commits into from
Sep 13, 2022
Merged

optimize the numeric_cast_with_error #2661

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f1ade46
optimize the numeric_cast_with_error
liukun4515 Sep 6, 2022
e3d97cf
Merge remote-tracking branch 'upstream/master' into optimize_#2649
liukun4515 Sep 11, 2022
278d276
Merge remote-tracking branch 'upstream/master' into optimize_#2649
liukun4515 Sep 12, 2022
9d60441
fix error message and change the function name
liukun4515 Sep 12, 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
37 changes: 15 additions & 22 deletions arrow/src/compute/kernels/cast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ use crate::compute::kernels::arity::unary;
use crate::compute::kernels::cast_utils::string_to_timestamp_nanos;
use crate::compute::kernels::temporal::extract_component_from_array;
use crate::compute::kernels::temporal::return_compute_error_with;
use crate::compute::using_chrono_tz_and_utc_naive_date_time;
use crate::compute::{try_unary, using_chrono_tz_and_utc_naive_date_time};
use crate::datatypes::*;
use crate::error::{ArrowError, Result};
use crate::temporal_conversions::{
Expand Down Expand Up @@ -1514,8 +1514,8 @@ fn cast_decimal_to_decimal<const BYTE_WIDTH1: usize, const BYTE_WIDTH2: usize>(
v.as_ref().and_then(|v| v.to_i128())
.ok_or_else(|| {
ArrowError::InvalidArgumentError(
format!("{:?} cannot be casted to 128-bit integer for Decimal128", v),
)
format!("{:?} cannot be casted to 128-bit integer for Decimal128", v),
)
})
.map(Some)
}
Expand Down Expand Up @@ -1569,8 +1569,8 @@ fn cast_decimal_to_decimal<const BYTE_WIDTH1: usize, const BYTE_WIDTH2: usize>(
v.as_ref().and_then(|v| v.to_i128())
.ok_or_else(|| {
ArrowError::InvalidArgumentError(
format!("{:?} cannot be casted to 128-bit integer for Decimal128", v),
)
format!("{:?} cannot be casted to 128-bit integer for Decimal128", v),
)
})
.map(Some)
}
Expand Down Expand Up @@ -1641,7 +1641,7 @@ where
)))
} else {
// If the value can't be casted to the `TO::Native`, return error
Ok(Arc::new(numeric_cast_with_error::<FROM, TO>(
Ok(Arc::new(try_numeric_cast::<FROM, TO>(
from.as_any()
.downcast_ref::<PrimitiveArray<FROM>>()
.unwrap(),
Expand All @@ -1651,29 +1651,22 @@ where

// Natural cast between numeric types
// If the value of T can't be casted to R, will throw error
fn numeric_cast_with_error<T, R>(from: &PrimitiveArray<T>) -> Result<PrimitiveArray<R>>
fn try_numeric_cast<T, R>(from: &PrimitiveArray<T>) -> Result<PrimitiveArray<R>>
where
T: ArrowNumericType,
R: ArrowNumericType,
T::Native: num::NumCast,
R::Native: num::NumCast,
{
let iter = from
.iter()
.map(|v| match v {
None => Ok(None),
Some(value) => match num::cast::cast::<T::Native, R::Native>(value) {
None => Err(ArrowError::CastError(format!(
"Can't cast value {:?} to type {}",
value,
R::DATA_TYPE
))),
Some(v) => Ok(Some(v)),
},
try_unary(from, |value| {
num::cast::cast::<T::Native, R::Native>(value).ok_or_else(|| {
ArrowError::CastError(format!(
"Can't cast value {:?} to type {}",
value,
R::DATA_TYPE
))
})
.collect::<Result<Vec<Option<R::Native>>>>()?;

Ok(unsafe { PrimitiveArray::<R>::from_trusted_len_iter(iter) })
})
}

// Natural cast between numeric types
Expand Down