Skip to content

Refactor duplicate code in type_coercion/functions.rs #19518

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

Open
Jefffrey wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Refactor duplicate code in type_coercion/functions.rs #19518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
48d5063
Refactor duplicate code in `type_coercion/functions.rs`
Jefffrey Dec 28, 2025
9d922f4
make diff easier
Jefffrey Dec 28, 2025
bed669d
clippy
Jefffrey Dec 28, 2025
76e9a25
fix test
Jefffrey Dec 28, 2025
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
4 changes: 2 additions & 2 deletions datafusion/core/tests/fuzz_cases/window_fuzz.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ use datafusion::prelude::{SessionConfig, SessionContext};
use datafusion_common::HashMap;
use datafusion_common::{Result, ScalarValue};
use datafusion_common_runtime::SpawnedTask;
use datafusion_expr::type_coercion::functions::fields_with_aggregate_udf;
use datafusion_expr::type_coercion::functions::fields_with_udf;
use datafusion_expr::{
WindowFrame, WindowFrameBound, WindowFrameUnits, WindowFunctionDefinition,
};
Expand Down Expand Up @@ -451,7 +451,7 @@ fn get_random_function(
// Do type coercion first argument
let a = args[0].clone();
let dt = a.return_field(schema.as_ref()).unwrap();
let coerced = fields_with_aggregate_udf(&[dt], udf).unwrap();
let coerced = fields_with_udf(&[dt], udf.as_ref()).unwrap();
args[0] = cast(a, schema, coerced[0].data_type().clone()).unwrap();
}

Expand Down
24 changes: 9 additions & 15 deletions datafusion/expr/src/expr_schema.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,11 @@ use crate::expr::{
InSubquery, Placeholder, ScalarFunction, TryCast, Unnest, WindowFunction,
WindowFunctionParams,
};
use crate::type_coercion::functions::{
data_types_with_scalar_udf, fields_with_aggregate_udf, fields_with_window_udf,
};
use crate::type_coercion::functions::fields_with_udf;
use crate::udf::ReturnFieldArgs;
use crate::{LogicalPlan, Projection, Subquery, WindowFunctionDefinition, utils};
use arrow::compute::can_cast_types;
use arrow::datatypes::{DataType, Field, FieldRef};
use arrow::datatypes::{DataType, Field};
use datafusion_common::datatype::FieldExt;
use datafusion_common::metadata::FieldMetadata;
use datafusion_common::{
Expand Down Expand Up @@ -169,7 +167,7 @@ impl ExprSchemable for Expr {
.iter()
.map(|e| e.to_field(schema).map(|(_, f)| f))
.collect::<Result<Vec<_>>>()?;
let new_fields = fields_with_aggregate_udf(&fields, func)
let new_fields = fields_with_udf(&fields, func.as_ref())
.map_err(|err| {
let data_types = fields
.iter()
Expand Down Expand Up @@ -554,7 +552,7 @@ impl ExprSchemable for Expr {
.map(|e| e.to_field(schema).map(|(_, f)| f))
.collect::<Result<Vec<_>>>()?;
// Verify that function is invoked with correct number and type of arguments as defined in `TypeSignature`
let new_fields = fields_with_aggregate_udf(&fields, func)
let new_fields = fields_with_udf(&fields, func.as_ref())
.map_err(|err| {
let arg_types = fields
.iter()
Expand Down Expand Up @@ -588,8 +586,8 @@ impl ExprSchemable for Expr {
.map(|f| (f.data_type().clone(), f))
.unzip();
// Verify that function is invoked with correct number and type of arguments as defined in `TypeSignature`
let new_data_types = data_types_with_scalar_udf(&arg_types, func)
.map_err(|err| {
let new_fields =
fields_with_udf(&fields, func.as_ref()).map_err(|err| {
plan_datafusion_err!(
"{} {}",
match err {
Expand All @@ -603,11 +601,6 @@ impl ExprSchemable for Expr {
)
)
})?;
let new_fields = fields
.into_iter()
.zip(new_data_types)
.map(|(f, d)| f.retyped(d))
.collect::<Vec<FieldRef>>();

let arguments = args
.iter()
Expand Down Expand Up @@ -727,7 +720,7 @@ impl Expr {
.map(|f| f.data_type())
.cloned()
.collect::<Vec<_>>();
let new_fields = fields_with_aggregate_udf(&fields, udaf)
let new_fields = fields_with_udf(&fields, udaf.as_ref())
.map_err(|err| {
plan_datafusion_err!(
"{} {}",
Expand Down Expand Up @@ -755,7 +748,7 @@ impl Expr {
.map(|f| f.data_type())
.cloned()
.collect::<Vec<_>>();
let new_fields = fields_with_window_udf(&fields, udwf)
let new_fields = fields_with_udf(&fields, udwf.as_ref())
.map_err(|err| {
plan_datafusion_err!(
"{} {}",
Expand Down Expand Up @@ -828,6 +821,7 @@ mod tests {
use super::*;
use crate::{and, col, lit, not, or, out_ref_col_with_metadata, when};

use arrow::datatypes::FieldRef;
use datafusion_common::{DFSchema, ScalarValue, assert_or_internal_err};

macro_rules! test_is_expr_nullable {
Expand Down
Loading