test: fix OneOf error expectations in CI

Signed-off-by: yaommen <myanstu@163.com>

Author: myandpr

datafusion/expr/src/type_coercion/functions.rs

@@ -27,7 +27,8 @@ use datafusion_common::utils::{
     ListCoercion, base_type, coerced_fixed_size_list_to_list,
 };
 use datafusion_common::{
-    Result, exec_err, internal_err, plan_err, types::NativeType, utils::list_ndims,
+    DataFusionError, Result, exec_err, internal_err, plan_err, types::NativeType,
+    utils::list_ndims,
 };
 use datafusion_expr_common::signature::ArrayFunctionArgument;
 use datafusion_expr_common::type_coercion::binary::type_union_resolution;
@@ -325,23 +326,30 @@ fn get_valid_types_with_udf<F: UDFCoercionExt>(
         },
         TypeSignature::OneOf(signatures) => {
             let mut res = vec![];
+            let mut deferred_err = None;
             for sig in signatures {
-                if let Ok(valid_types) =
-                    get_valid_types_with_udf(sig, current_types, func)
-                {
-                    res.extend(valid_types);
+                match get_valid_types_with_udf(sig, current_types, func) {
+                    Ok(valid_types) => res.extend(valid_types),
+                    Err(DataFusionError::Plan(_)) => {}
+                    Err(err) => {
+                        if deferred_err.is_none() {
+                            deferred_err = Some(err);
+                        }
+                    }
                 }
             }
 
-            // Every signature failed, return a neutral planning error rather than
-            // a branch-specific error that may not match the best overload.
-            if res.is_empty() {
+            if !res.is_empty() {
+                res
+            } else if let Some(err) = deferred_err {
+                return Err(err);
+            } else {
+                // Every signature failed, return a neutral planning error rather than
+                // a branch-specific error that may not match the best overload.
                 return plan_err!(
                     "Function '{}' failed to match any signature",
                     func.name()
                 );
-            } else {
-                res
             }
         }
         _ => get_valid_types(func.name(), signature, current_types)?,
@@ -1224,29 +1232,22 @@ mod tests {
         let current_fields = vec![Arc::new(Field::new("t", DataType::Boolean, true))];
         let signature = Signature::one_of(
             vec![
-                Signature::coercible(
-                    vec![Coercion::new_exact(TypeSignatureClass::Decimal)],
-                    Volatility::Immutable,
-                )
-                .type_signature
-                .clone(),
-                Signature::coercible(
-                    vec![Coercion::new_exact(TypeSignatureClass::Duration)],
-                    Volatility::Immutable,
-                )
-                .type_signature
-                .clone(),
+                TypeSignature::Coercible(vec![Coercion::new_exact(
+                    TypeSignatureClass::Decimal,
+                )]),
+                TypeSignature::Coercible(vec![Coercion::new_exact(
+                    TypeSignatureClass::Duration,
+                )]),
             ],
             Volatility::Immutable,
         );
 
         let err = fields_with_udf(&current_fields, &MockUdf(signature)).unwrap_err();
         let err = err.to_string();
 
-        assert_eq!(
-            err,
+        assert!(err.starts_with(
             "Error during planning: Function 'test' failed to match any signature"
-        );
+        ));
         assert!(!err.contains("Internal error"));
         assert!(!err.contains("TypeSignatureClass"));
     }
@@ -1262,13 +1263,58 @@ mod tests {
         let err = fields_with_udf(&current_fields, &MockUdf(signature)).unwrap_err();
         let err = err.to_string();
 
-        assert_eq!(
-            err,
+        assert!(err.starts_with(
             "Error during planning: Function 'test' failed to match any signature"
-        );
+        ));
         assert!(!err.contains("Internal error"));
     }
 
+    struct AlwaysExecErrUdf(Signature);
+
+    impl UDFCoercionExt for AlwaysExecErrUdf {
+        fn name(&self) -> &str {
+            "test"
+        }
+
+        fn signature(&self) -> &Signature {
+            &self.0
+        }
+
+        fn coerce_types(&self, _arg_types: &[DataType]) -> Result<Vec<DataType>> {
+            exec_err!("boom")
+        }
+    }
+
+    #[test]
+    fn test_one_of_propagates_non_plan_errors() {
+        let current_fields = vec![Arc::new(Field::new("t", DataType::Int32, true))];
+        let signature =
+            Signature::one_of(vec![TypeSignature::UserDefined], Volatility::Immutable);
+
+        let err =
+            fields_with_udf(&current_fields, &AlwaysExecErrUdf(signature)).unwrap_err();
+
+        assert_eq!(
+            err.to_string(),
+            "Execution error: Function 'test' user-defined coercion failed with: Execution error: boom"
+        );
+    }
+
+    #[test]
+    fn test_one_of_preserves_success_when_later_branch_errors() -> Result<()> {
+        let current_fields = vec![Arc::new(Field::new("t", DataType::Int32, true))];
+        let signature = Signature::one_of(
+            vec![TypeSignature::Exact(vec![DataType::Int32]), TypeSignature::UserDefined],
+            Volatility::Immutable,
+        );
+
+        let fields = fields_with_udf(&current_fields, &AlwaysExecErrUdf(signature))?;
+
+        assert_eq!(fields.len(), 1);
+        assert_eq!(fields[0].data_type(), &DataType::Int32);
+        Ok(())
+    }
+
     #[test]
     fn test_nested_wildcard_fixed_size_lists() -> Result<()> {
         let type_into = DataType::FixedSizeList(

datafusion/sqllogictest/test_files/array.slt

@@ -7798,17 +7798,17 @@ select generate_series(arrow_cast('2021-01-01T00:00:00', 'Timestamp(Nanosecond,
 [2021-01-01T00:00:00-05:00, 2021-01-01T01:29:54.500-05:00, 2021-01-01T02:59:49-05:00, 2021-01-01T04:29:43.500-05:00, 2021-01-01T05:59:38-05:00]
 
 ## mixing types for timestamps is not supported
-query error DataFusion error: Error during planning: Function 'generate_series' failed to match any signature(.|\n)*generate_series\(Timestamp\(ns, "-05:00"\), Date32, Interval\(MonthDayNano\)\)(.|\n)*Candidate functions:
+query error DataFusion error: Error during planning: Function 'generate_series' failed to match any signature
 select generate_series(arrow_cast('2021-01-01T00:00:00', 'Timestamp(Nanosecond, Some("-05:00"))'), DATE '2021-01-02', INTERVAL '1' HOUR);
 
 ## mixing types not allowed even if an argument is null
-query error DataFusion error: Error during planning: Function 'generate_series' failed to match any signature(.|\n)*generate_series\(Timestamp\(ns\), Date32, Null\)(.|\n)*Candidate functions:
+query error DataFusion error: Error during planning: Function 'generate_series' failed to match any signature
 select generate_series(TIMESTAMP '1992-09-01', DATE '1993-03-01', NULL);
 
-query error DataFusion error: Error during planning: Function 'generate_series' failed to match any signature(.|\n)*generate_series\(Int64, Utf8, Utf8\)(.|\n)*Candidate functions:
+query error DataFusion error: Error during planning: Function 'generate_series' failed to match any signature
 select generate_series(1, '2024-01-01', '2025-01-02');
 
-query error DataFusion error: Error during planning: Function 'generate_series' failed to match any signature(.|\n)*generate_series\(Timestamp\(ns\), Utf8, Interval\(MonthDayNano\)\)(.|\n)*Candidate functions:
+query error DataFusion error: Error during planning: Function 'generate_series' failed to match any signature
 select generate_series('2024-01-01'::timestamp, '2025-01-02', interval '1 day');
 
 ## should return NULL

datafusion/sqllogictest/test_files/errors.slt

@@ -125,14 +125,14 @@ from aggregate_test_100
 order by c9
 
 # WindowFunction wrong signature
-statement error DataFusion error: Error during planning: Function 'nth_value' failed to match any signature(.|\n)*nth_value\(Int32, Int64, Int64\)(.|\n)*Candidate functions:
+statement error DataFusion error: Error during planning: Function 'nth_value' failed to match any signature
 select
 c9,
 nth_value(c5, 2, 3) over (order by c9) as nv1
 from aggregate_test_100
 order by c9
 
-query error DataFusion error: Error during planning: Function 'sum' failed to match any signature(.|\n)*sum\(Boolean\)(.|\n)*Candidate functions:
+query error DataFusion error: Error during planning: Function 'sum' failed to match any signature
 select sum(bool_col) from (values (true), (false), (null)) as t(bool_col);
 
 

datafusion/sqllogictest/test_files/functions.slt

@@ -208,10 +208,10 @@ SELECT substr('alphabet', NULL, 2)
 ----
 NULL
 
-statement error DataFusion error: Error during planning: Function 'substr' failed to match any signature(.|\n)*Candidate functions:
+statement error DataFusion error: Error during planning: Function 'substr' failed to match any signature
 SELECT substr(1, 3)
 
-statement error DataFusion error: Error during planning: Function 'substr' failed to match any signature(.|\n)*Candidate functions:
+statement error DataFusion error: Error during planning: Function 'substr' failed to match any signature
 SELECT substr(1, 3, 4)
 
 query T

datafusion/sqllogictest/test_files/named_arguments.slt

@@ -86,7 +86,7 @@ SELECT substr("STR" => 'hello world', "start_pos" => 7);
 
 # Error: wrong number of arguments
 # This query provides only 1 argument but substr requires 2 or 3
-query error DataFusion error: Error during planning: Function 'substr' failed to match any signature(.|\n)*Candidate functions:
+query error DataFusion error: Error during planning: Function 'substr' failed to match any signature
 SELECT substr(str => 'hello world');
 
 #############

datafusion/sqllogictest/test_files/spark/math/hex.slt

@@ -56,7 +56,7 @@ SELECT hex(column1) FROM VALUES (arrow_cast('hello', 'LargeBinary')), (NULL), (a
 NULL
 776F726C64
 
-statement error Function 'hex' expects 1 arguments but received 2
+statement error DataFusion error: Error during planning: Function 'hex' failed to match any signature
 SELECT hex(1, 2);
 
 query T

datafusion/sqllogictest/test_files/string/string_literal.slt

@@ -132,10 +132,10 @@ SELECT substr('Hello🌏世界', 5, 3)
 ----
 o🌏世
 
-statement error DataFusion error: Error during planning: Function 'substr' failed to match any signature(.|\n)*Candidate functions:
+statement error DataFusion error: Error during planning: Function 'substr' failed to match any signature
 SELECT substr(1, 3)
 
-statement error DataFusion error: Error during planning: Function 'substr' failed to match any signature(.|\n)*Candidate functions:
+statement error DataFusion error: Error during planning: Function 'substr' failed to match any signature
 SELECT substr(1, 3, 4)
 
 statement error Execution error: negative substring length not allowed