Refactor duplicate code in type_coercion/functions.rs
#19518
+179
−200
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
logical-expr
Jefffrey
commented
Dec 28, 2025
Comment on lines
+143
to
+152
| let arg_fields = arg_types | ||
| .iter() | ||
| .map(|dt| Field::new("f", dt.clone(), true)) | ||
| .map(Arc::new) | ||
| .collect::<Vec<_>>(); | ||
| let return_types = | ||
| rresult_return!(data_types_with_scalar_udf(&arg_types, udf.inner())); | ||
| rresult_return!(fields_with_udf(&arg_fields, udf.inner().as_ref())) | ||
| .into_iter() | ||
| .map(|f| f.data_type().to_owned()) | ||
| .collect::<Vec<_>>(); |
Contributor
Author
There was a problem hiding this comment.
Same as how UDAF handles this:
datafusion/datafusion/ffi/src/udaf/mod.rs
Lines 329 to 350 in e5ca510
| /// | ||
| /// For more details on coercion in general, please see the | ||
| /// [`type_coercion`](crate::type_coercion) module. | ||
| #[deprecated(since = "52.0.0", note = "use fields_with_udf")] |
Contributor
Author
There was a problem hiding this comment.
Personally I'm of the mind to just remove these functions completely
| /// For more details on coercion in general, please see the | ||
| /// [`type_coercion`](crate::type_coercion) module. | ||
| #[deprecated(since = "52.0.0", note = "use fields_with_udf")] | ||
| pub fn data_types( |
Contributor
Author
There was a problem hiding this comment.
This function was only ever used in unit tests below 🤔
|
|
||
| matches!( | ||
| type_signature, | ||
| match type_signature { |
Contributor
Author
There was a problem hiding this comment.
Using match here makes it more obvious which variants are not well supported
| ); | ||
| } | ||
| }, | ||
| TypeSignature::OneOf(signatures) => signatures |
Contributor
Author
There was a problem hiding this comment.
The scalar fn version actually has extra functionality in that it collects the errors together for oneof; unifying this code with aggregate/window udfs brings in this functionality for them, hence SLT fix was needed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Which issue does this PR close?
Rationale for this change
Found lots of code duplicated here, so unifying them.
What changes are included in this PR?
Introduce new trait
UDFCoercionExtto unify functions across scalar/aggregate/window UDFs for use in a single generic implementation. New unified functionsfields_with_udfandget_valid_types_with_udfwhich are generic across this new trait.Are these changes tested?
Existing tests.
Are there any user-facing changes?
Yes, deprecating functions.