Apache DataFusion SQL Query Engine
fix sqrt(-1.0::float8) should error, not return NaN (#22308)
Zhen Chen7bcb61332830
diff --git a/datafusion/functions/src/macros.rs b/datafusion/functions/src/macros.rsindex 71528b4d16..79e1931369 100644--- a/datafusion/functions/src/macros.rs+++ b/datafusion/functions/src/macros.rs@@ -210,6 +210,17 @@ macro_rules! downcast_arg {/// $GET_DOC: the function to get the documentation of the UDFmacro_rules! make_math_unary_udf {($UDF:ident, $NAME:ident, $UNARY_FUNC:ident, $OUTPUT_ORDERING:expr, $EVALUATE_BOUNDS:expr, $GET_DOC:expr) => {+ make_math_unary_udf!(+ $UDF,+ $NAME,+ $UNARY_FUNC,+ $OUTPUT_ORDERING,+ $EVALUATE_BOUNDS,+ $GET_DOC,+ None::<fn(f64) -> Result<()>>+ );+ };+ ($UDF:ident, $NAME:ident, $UNARY_FUNC:ident, $OUTPUT_ORDERING:expr, $EVALUATE_BOUNDS:expr, $GET_DOC:expr, $VALIDATOR:expr) => {$crate::make_udf_function!($NAME::$UDF, $NAME);mod $NAME {@@ -218,6 +229,7 @@ macro_rules! make_math_unary_udf {use arrow::array::{ArrayRef, AsArray};use arrow::datatypes::{DataType, Float32Type, Float64Type};+ use arrow::error::ArrowError;use datafusion_common::{Result, exec_err};use datafusion_expr::interval_arithmetic::Interval;use datafusion_expr::sort_properties::{ExprProperties, SortProperties};@@ -280,16 +292,38 @@ macro_rules! make_math_unary_udf {) -> Result<ColumnarValue> {let args = ColumnarValue::values_to_arrays(&args.args)?;let arr: ArrayRef = match args[0].data_type() {- DataType::Float64 => Arc::new(- args[0]+ DataType::Float64 => {+ let values = args[0].as_primitive::<Float64Type>()- .unary::<_, Float64Type>(|x: f64| f64::$UNARY_FUNC(x)),- ) as ArrayRef,- DataType::Float32 => Arc::new(- args[0]+ .try_unary::<_, Float64Type, _>(+ |x: f64| -> std::result::Result<f64, ArrowError> {+ if let Some(validate) = $VALIDATOR {+ validate(x).map_err(|error| {+ ArrowError::ComputeError(error.to_string())+ })?;+ }++ Ok(f64::$UNARY_FUNC(x))+ },+ )?;+ Arc::new(values) as ArrayRef+ }+ DataType::Float32 => {+ let values = args[0].as_primitive::<Float32Type>()- .unary::<_, Float32Type>(|x: f32| f32::$UNARY_FUNC(x)),- ) as ArrayRef,+ .try_unary::<_, Float32Type, _>(+ |x: f32| -> std::result::Result<f32, ArrowError> {+ if let Some(validate) = $VALIDATOR {+ validate(x as f64).map_err(|error| {+ ArrowError::ComputeError(error.to_string())+ })?;+ }++ Ok(f32::$UNARY_FUNC(x))+ },+ )?;+ Arc::new(values) as ArrayRef+ }other => {return exec_err!("Unsupported data type {other:?} for function {}",diff --git a/datafusion/functions/src/math/mod.rs b/datafusion/functions/src/math/mod.rsindex 610e773d68..1754ccb434 100644--- a/datafusion/functions/src/math/mod.rs+++ b/datafusion/functions/src/math/mod.rs@@ -18,6 +18,7 @@//! "math" DataFusion functionsuse crate::math::monotonicity::*;+use datafusion_common::{Result, exec_err};use datafusion_expr::ScalarUDF;use std::sync::Arc;@@ -42,6 +43,14 @@ pub mod round;pub mod signum;pub mod trunc;+fn validate_sqrt_input(value: f64) -> Result<()> {+ if value < 0.0 {+ exec_err!("cannot take square root of a negative number")+ } else {+ Ok(())+ }+}+// Create UDFsmake_udf_function!(abs::AbsFunc, abs);make_math_unary_udf!(@@ -208,7 +217,8 @@ make_math_unary_udf!(sqrt,super::sqrt_order,super::bounds::sqrt_bounds,- super::get_sqrt_doc+ super::get_sqrt_doc,+ Some(super::validate_sqrt_input));make_math_unary_udf!(TanFunc,diff --git a/datafusion/sqllogictest/test_files/scalar.slt b/datafusion/sqllogictest/test_files/scalar.sltindex 2ac7a9ef36..38f76f1315 100644--- a/datafusion/sqllogictest/test_files/scalar.slt+++ b/datafusion/sqllogictest/test_files/scalar.slt@@ -1107,12 +1107,16 @@ NULL# sqrt with columns (round is needed to normalize the outputs of different operating systems)query RRR rowsort-select round(sqrt(a), 5), round(sqrt(b), 5), round(sqrt(c), 5) from signed_integers;+select round(sqrt(abs(a)), 5), round(sqrt(abs(b)), 5), round(sqrt(abs(c)), 5) from signed_integers;-----1.41421 NaN 11.09054+1 10 23.81176+1.41421 31.62278 11.09054+1.73205 100 31.272992 NULL NULL-NaN 10 NaN-NaN 100 NaN++# sqrt with negative column values should error+query error cannot take square root of a negative number+select round(sqrt(a), 5), round(sqrt(b), 5), round(sqrt(c), 5) from signed_integers;# sqrt scalar fractionquery RR rowsort@@ -1128,10 +1132,12 @@ select sqrt(cast(10e8 as double));# sqrt scalar negative-query R rowsort+query error cannot take square root of a negative numberselect sqrt(-1);------NaN++# sqrt scalar negative float8+query error cannot take square root of a negative number+select sqrt((-1.0)::float8);## tan