Skip to content

refactor: Refactor spark make_interval signature away from user defined #19027

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

Merged
Jefffrey merged 4 commits into from
Dec 4, 2025
Merged

refactor: Refactor spark make_interval signature away from user defined #19027

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8fe3018
Refactor spark make_interval signature away from user defined
kumarUjjawal Dec 1, 2025
7c90816
make int32 as variable
kumarUjjawal Dec 2, 2025
963aab5
store int32 and float64 coercion in variables
kumarUjjawal Dec 2, 2025
3ef503d
added comments
kumarUjjawal Dec 2, 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
62 changes: 36 additions & 26 deletions datafusion/spark/src/function/datetime/make_interval.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ use arrow::array::{Array, ArrayRef, IntervalMonthDayNanoBuilder, PrimitiveArray}
use arrow::datatypes::DataType::Interval;
use arrow::datatypes::IntervalUnit::MonthDayNano;
use arrow::datatypes::{DataType, IntervalMonthDayNano};
use datafusion_common::{
exec_err, plan_datafusion_err, DataFusionError, Result, ScalarValue,
};
use datafusion_common::types::{logical_float64, logical_int32, NativeType};
use datafusion_common::{plan_datafusion_err, DataFusionError, Result, ScalarValue};
use datafusion_expr::{
ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, Volatility,
Coercion, ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, TypeSignature,
TypeSignatureClass, Volatility,
};
use datafusion_functions::utils::make_scalar_function;

Expand All @@ -43,8 +43,39 @@ impl Default for SparkMakeInterval {

impl SparkMakeInterval {
pub fn new() -> Self {
fn int32_coercion() -> Coercion {
Coercion::new_implicit(
TypeSignatureClass::Native(logical_int32()),
vec![TypeSignatureClass::Integer],
NativeType::Int32,
)
}

fn float64_coercion() -> Coercion {
Coercion::new_implicit(
TypeSignatureClass::Native(logical_float64()),
vec![TypeSignatureClass::Numeric],
NativeType::Float64,
)
}

let mut variants = Vec::with_capacity(8);
variants.push(TypeSignature::Nullary);

for len in 1..=7 {
Copy link
Contributor

@Jefffrey Jefffrey Dec 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I would prefer inlining the signature instead of generating it via this for loop logic; for example:

Signature::one_of(
    vec![
        TypeSignature::Nullary,
        // year
        TypeSignature::Coercible(vec![float64.clone()]),
        // year, month
        TypeSignature::Coercible(vec![float64.clone(), float64.clone()]),
        // etc.
    ],
    Volatility::Immutable,
)

let mut args = Vec::with_capacity(len);
for idx in 0..len {
if idx == 6 {
args.push(float64_coercion());
} else {
args.push(int32_coercion());
}
}
variants.push(TypeSignature::Coercible(args));
}

Self {
signature: Signature::user_defined(Volatility::Immutable),
signature: Signature::one_of(variants, Volatility::Immutable),
}
}
}
Expand Down Expand Up @@ -74,27 +105,6 @@ impl ScalarUDFImpl for SparkMakeInterval {
}
make_scalar_function(make_interval_kernel, vec![])(&args.args)
}

fn coerce_types(&self, arg_types: &[DataType]) -> Result<Vec<DataType>> {
let length = arg_types.len();
match length {
x if x > 7 => {
exec_err!(
"make_interval expects between 0 and 7 arguments, got {}",
arg_types.len()
)
}
_ => Ok((0..arg_types.len())
.map(|i| {
if i == 6 {
DataType::Float64
} else {
DataType::Int32
}
})
.collect()),
}
}
}

fn make_interval_kernel(args: &[ArrayRef]) -> Result<ArrayRef, DataFusionError> {
Expand Down