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

refer to #8781, convert the internal_err! in datetime_expression.rs to exec_err! #9083

Merged
merged 1 commit into from
Jan 31, 2024
Merged

refer to #8781, convert the internal_err! in datetime_expression.rs to exec_err! #9083

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 20 additions & 21 deletions datafusion/physical-expr/src/datetime_expressions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ use datafusion_common::cast::{
as_timestamp_nanosecond_array, as_timestamp_second_array,
};
use datafusion_common::{
exec_err, internal_err, not_impl_err, DataFusionError, Result, ScalarType,
ScalarValue,
exec_err, not_impl_err, DataFusionError, Result, ScalarType, ScalarValue,
};
use datafusion_expr::ColumnarValue;

Expand Down Expand Up @@ -165,7 +164,7 @@ where
F: Fn(&'a str) -> Result<O::Native>,
{
if args.len() != 1 {
return internal_err!(
return exec_err!(
"{:?} args were supplied but {} takes exactly one argument",
args.len(),
name
Expand Down Expand Up @@ -202,7 +201,7 @@ where
F2: Fn(O::Native) -> O::Native,
{
if args.len() < 2 {
return internal_err!(
return exec_err!(
"{:?} args were supplied but {} takes 2 or more arguments",
args.len(),
name
Expand All @@ -218,7 +217,7 @@ where
}
ColumnarValue::Scalar(s) => match s {
ScalarValue::Utf8(a) | ScalarValue::LargeUtf8(a) => Ok(Either::Right(a)),
other => internal_err!(
other => exec_err!(
"Unexpected scalar type encountered '{other}' for function '{name}'"
),
},
Expand Down Expand Up @@ -420,7 +419,7 @@ fn to_timestamp_impl<T: ArrowTimestampType + ScalarType<i64>>(
|n| n / factor,
name,
),
_ => internal_err!("Unsupported 0 argument count for function {name}"),
_ => exec_err!("Unsupported 0 argument count for function {name}"),
}
}

Expand Down Expand Up @@ -1190,7 +1189,7 @@ macro_rules! extract_date_part {
.map(|v| cast(&(Arc::new(v) as ArrayRef), &DataType::Float64))?)
}
},
datatype => internal_err!("Extract does not support datatype {:?}", datatype),
datatype => exec_err!("Extract does not support datatype {:?}", datatype),
}
};
}
Expand Down Expand Up @@ -1316,7 +1315,7 @@ where
let n: i64 = n.into();
n as f64 / 1_000_f64
}),
_ => return internal_err!("Can not convert {:?} to epoch", array.data_type()),
_ => return exec_err!("Can not convert {:?} to epoch", array.data_type()),
};
Ok(b)
}
Expand All @@ -1331,7 +1330,7 @@ fn validate_to_timestamp_data_types(
// all good
}
_ => {
return Some(internal_err!(
return Some(exec_err!(
"{name} function unsupported data type at index {}: {}",
idx + 1,
a.data_type()
Expand All @@ -1346,7 +1345,7 @@ fn validate_to_timestamp_data_types(
/// to_timestamp() SQL function implementation
pub fn to_timestamp_invoke(args: &[ColumnarValue]) -> Result<ColumnarValue> {
if args.is_empty() {
return internal_err!(
return exec_err!(
"to_timestamp function requires 1 or more arguments, got {}",
args.len()
);
Expand Down Expand Up @@ -1377,7 +1376,7 @@ pub fn to_timestamp_invoke(args: &[ColumnarValue]) -> Result<ColumnarValue> {
),
DataType::Utf8 => to_timestamp(args),
other => {
internal_err!(
exec_err!(
"Unsupported data type {:?} for function to_timestamp",
other
)
Expand All @@ -1388,7 +1387,7 @@ pub fn to_timestamp_invoke(args: &[ColumnarValue]) -> Result<ColumnarValue> {
/// to_timestamp_millis() SQL function implementation
pub fn to_timestamp_millis_invoke(args: &[ColumnarValue]) -> Result<ColumnarValue> {
if args.is_empty() {
return internal_err!(
return exec_err!(
"to_timestamp_millis function requires 1 or more arguments, got {}",
args.len()
);
Expand All @@ -1413,7 +1412,7 @@ pub fn to_timestamp_millis_invoke(args: &[ColumnarValue]) -> Result<ColumnarValu
),
DataType::Utf8 => to_timestamp_millis(args),
other => {
internal_err!(
exec_err!(
"Unsupported data type {:?} for function to_timestamp_millis",
other
)
Expand All @@ -1424,7 +1423,7 @@ pub fn to_timestamp_millis_invoke(args: &[ColumnarValue]) -> Result<ColumnarValu
/// to_timestamp_micros() SQL function implementation
pub fn to_timestamp_micros_invoke(args: &[ColumnarValue]) -> Result<ColumnarValue> {
if args.is_empty() {
return internal_err!(
return exec_err!(
"to_timestamp_micros function requires 1 or more arguments, got {}",
args.len()
);
Expand All @@ -1449,7 +1448,7 @@ pub fn to_timestamp_micros_invoke(args: &[ColumnarValue]) -> Result<ColumnarValu
),
DataType::Utf8 => to_timestamp_micros(args),
other => {
internal_err!(
exec_err!(
"Unsupported data type {:?} for function to_timestamp_micros",
other
)
Expand All @@ -1460,7 +1459,7 @@ pub fn to_timestamp_micros_invoke(args: &[ColumnarValue]) -> Result<ColumnarValu
/// to_timestamp_nanos() SQL function implementation
pub fn to_timestamp_nanos_invoke(args: &[ColumnarValue]) -> Result<ColumnarValue> {
if args.is_empty() {
return internal_err!(
return exec_err!(
"to_timestamp_nanos function requires 1 or more arguments, got {}",
args.len()
);
Expand All @@ -1485,7 +1484,7 @@ pub fn to_timestamp_nanos_invoke(args: &[ColumnarValue]) -> Result<ColumnarValue
),
DataType::Utf8 => to_timestamp_nanos(args),
other => {
internal_err!(
exec_err!(
"Unsupported data type {:?} for function to_timestamp_nanos",
other
)
Expand All @@ -1496,7 +1495,7 @@ pub fn to_timestamp_nanos_invoke(args: &[ColumnarValue]) -> Result<ColumnarValue
/// to_timestamp_seconds() SQL function implementation
pub fn to_timestamp_seconds_invoke(args: &[ColumnarValue]) -> Result<ColumnarValue> {
if args.is_empty() {
return internal_err!(
return exec_err!(
"to_timestamp_seconds function requires 1 or more arguments, got {}",
args.len()
);
Expand All @@ -1520,7 +1519,7 @@ pub fn to_timestamp_seconds_invoke(args: &[ColumnarValue]) -> Result<ColumnarVal
}
DataType::Utf8 => to_timestamp_seconds(args),
other => {
internal_err!(
exec_err!(
"Unsupported data type {:?} for function to_timestamp_seconds",
other
)
Expand All @@ -1531,7 +1530,7 @@ pub fn to_timestamp_seconds_invoke(args: &[ColumnarValue]) -> Result<ColumnarVal
/// from_unixtime() SQL function implementation
pub fn from_unixtime_invoke(args: &[ColumnarValue]) -> Result<ColumnarValue> {
if args.len() != 1 {
return internal_err!(
return exec_err!(
"from_unixtime function requires 1 argument, got {}",
args.len()
);
Expand All @@ -1542,7 +1541,7 @@ pub fn from_unixtime_invoke(args: &[ColumnarValue]) -> Result<ColumnarValue> {
cast_column(&args[0], &DataType::Timestamp(TimeUnit::Second, None), None)
}
other => {
internal_err!(
exec_err!(
"Unsupported data type {:?} for function from_unixtime",
other
)
Expand Down
Loading