fix breakage after rebase 😠

findepi · Feb 18, 2025 · 73efaf3 · 73efaf3
1 parent 255c1fb
commit 73efaf3
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/datafusion/excalibur/lib/Cargo.toml b/datafusion/excalibur/lib/Cargo.toml
@@ -33,3 +33,4 @@ arrow = { workspace = true }
 datafusion-common = { workspace = true }
 datafusion-excalibur-macros = { workspace = true }
 datafusion-expr = { workspace = true }
+datafusion-expr-common = { workspace = true }
diff --git a/datafusion/excalibur/lib/src/signature.rs b/datafusion/excalibur/lib/src/signature.rs
@@ -21,6 +21,7 @@ use crate::ret_type::ExRetType;
 use arrow::datatypes::DataType;
 use datafusion_common::Result;
 use datafusion_expr::{Signature, Volatility};
+use datafusion_expr_common::signature::Coercion;
 
 pub fn create_excalibur_signature<T>() -> ExcaliburSignature
 where
@@ -30,7 +31,11 @@ where
 {
     ExcaliburSignature {
         signature: Signature::coercible(
-            T::ArgumentRustTypes::type_signature(),
+            T::ArgumentRustTypes::type_signature()
+                .into_iter()
+                // TODO this *exact* is unintentional, see https://github.com/apache/datafusion/pull/14440#discussion_r1959483130
+                .map(Coercion::new_exact)
+                .collect(),
             Volatility::Immutable,
         ),
         return_type: T::ReturnRustType::data_type(),

diff --git a/datafusion/excalibur/lib/tests/failing.rs b/datafusion/excalibur/lib/tests/failing.rs
@@ -24,6 +24,7 @@ use datafusion_excalibur_macros::excalibur_function;
 use datafusion_expr::{
     ColumnarValue, ScalarFunctionArgs, Signature, TypeSignatureClass, Volatility,
 };
+use datafusion_expr_common::signature::Coercion;
 use std::sync::Arc;
 
 #[excalibur_function]
@@ -43,7 +44,9 @@ fn test_function_signature() {
     assert_eq!(
         udf.signature(),
         &Signature::coercible(
-            vec![TypeSignatureClass::Native(Arc::new(NativeType::Boolean)),],
+            vec![Coercion::new_exact(TypeSignatureClass::Native(Arc::new(
+                NativeType::Boolean
+            )))],
             Volatility::Immutable
         )
     );

diff --git a/datafusion/excalibur/lib/tests/null_arg.rs b/datafusion/excalibur/lib/tests/null_arg.rs
@@ -23,6 +23,7 @@ use datafusion_excalibur_macros::excalibur_function;
 use datafusion_expr::{
     ColumnarValue, ScalarFunctionArgs, Signature, TypeSignatureClass, Volatility,
 };
+use datafusion_expr_common::signature::Coercion;
 use std::sync::Arc;
 
 #[excalibur_function]
@@ -39,8 +40,12 @@ fn test_function_signature() {
         udf.signature(),
         &Signature::coercible(
             vec![
-                TypeSignatureClass::Native(Arc::new(NativeType::Int32)),
-                TypeSignatureClass::Native(Arc::new(NativeType::Int32)),
+                Coercion::new_exact(TypeSignatureClass::Native(Arc::new(
+                    NativeType::Int32
+                ))),
+                Coercion::new_exact(TypeSignatureClass::Native(Arc::new(
+                    NativeType::Int32
+                ))),
             ],
             Volatility::Immutable
         )

diff --git a/datafusion/excalibur/lib/tests/null_result.rs b/datafusion/excalibur/lib/tests/null_result.rs
@@ -23,6 +23,7 @@ use datafusion_excalibur_macros::excalibur_function;
 use datafusion_expr::{
     ColumnarValue, ScalarFunctionArgs, Signature, TypeSignatureClass, Volatility,
 };
+use datafusion_expr_common::signature::Coercion;
 use std::sync::Arc;
 
 #[excalibur_function]
@@ -43,8 +44,12 @@ fn test_function_signature() {
         udf.signature(),
         &Signature::coercible(
             vec![
-                TypeSignatureClass::Native(Arc::new(NativeType::Int32)),
-                TypeSignatureClass::Native(Arc::new(NativeType::Int32)),
+                Coercion::new_exact(TypeSignatureClass::Native(Arc::new(
+                    NativeType::Int32
+                ))),
+                Coercion::new_exact(TypeSignatureClass::Native(Arc::new(
+                    NativeType::Int32
+                ))),
             ],
             Volatility::Immutable
         )

diff --git a/datafusion/excalibur/lib/tests/smoke_test.rs b/datafusion/excalibur/lib/tests/smoke_test.rs
@@ -23,6 +23,7 @@ use datafusion_excalibur_macros::excalibur_function;
 use datafusion_expr::{
     ColumnarValue, ScalarFunctionArgs, Signature, TypeSignatureClass, Volatility,
 };
+use datafusion_expr_common::signature::Coercion;
 use std::sync::Arc;
 
 #[excalibur_function]
@@ -38,7 +39,9 @@ fn test_function_signature() {
     assert_eq!(
         udf.signature(),
         &Signature::coercible(
-            vec![TypeSignatureClass::Native(Arc::new(NativeType::UInt64))],
+            vec![Coercion::new_exact(TypeSignatureClass::Native(Arc::new(
+                NativeType::UInt64
+            )))],
             Volatility::Immutable
         )
     );

diff --git a/datafusion/excalibur/lib/tests/str_arg.rs b/datafusion/excalibur/lib/tests/str_arg.rs
@@ -23,6 +23,7 @@ use datafusion_excalibur_macros::excalibur_function;
 use datafusion_expr::{
     ColumnarValue, ScalarFunctionArgs, Signature, TypeSignatureClass, Volatility,
 };
+use datafusion_expr_common::signature::Coercion;
 use std::sync::Arc;
 
 #[excalibur_function]
@@ -38,7 +39,9 @@ fn test_function_signature() {
     assert_eq!(
         udf.signature(),
         &Signature::coercible(
-            vec![TypeSignatureClass::Native(Arc::new(NativeType::String)),],
+            vec![Coercion::new_exact(TypeSignatureClass::Native(Arc::new(
+                NativeType::String
+            )))],
             Volatility::Immutable
         )
     );

diff --git a/datafusion/excalibur/lib/tests/two_args.rs b/datafusion/excalibur/lib/tests/two_args.rs
@@ -23,6 +23,7 @@ use datafusion_excalibur_macros::excalibur_function;
 use datafusion_expr::{
     ColumnarValue, ScalarFunctionArgs, Signature, TypeSignatureClass, Volatility,
 };
+use datafusion_expr_common::signature::Coercion;
 use std::sync::Arc;
 
 #[excalibur_function]
@@ -39,8 +40,12 @@ fn test_function_signature() {
         udf.signature(),
         &Signature::coercible(
             vec![
-                TypeSignatureClass::Native(Arc::new(NativeType::Int32)),
-                TypeSignatureClass::Native(Arc::new(NativeType::UInt32)),
+                Coercion::new_exact(TypeSignatureClass::Native(Arc::new(
+                    NativeType::Int32
+                ))),
+                Coercion::new_exact(TypeSignatureClass::Native(Arc::new(
+                    NativeType::UInt32
+                ))),
             ],
             Volatility::Immutable
         )