Skip to content

[AURON #1708] Fix spark_normalize_nan_and_zero None #1709

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
cxzl25 merged 1 commit into from
Dec 11, 2025
Merged

[AURON #1708] Fix spark_normalize_nan_and_zero None #1709

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 30 additions & 1 deletion native-engine/datafusion-ext-functions/src/spark_normalize_nan_and_zero.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ pub fn spark_normalize_nan_and_zero(args: &[ColumnarValue]) -> Result<ColumnarVa
ColumnarValue::Scalar(ScalarValue::Float64(Some(v))) => Ok(ColumnarValue::Scalar(
ScalarValue::Float64(Some(normalize_float(*v))),
)),
ColumnarValue::Scalar(ScalarValue::Float32(None)) => {
Ok(ColumnarValue::Scalar(ScalarValue::Float32(None)))
}
ColumnarValue::Scalar(ScalarValue::Float64(None)) => {
Ok(ColumnarValue::Scalar(ScalarValue::Float64(None)))
}
ColumnarValue::Array(array) => match array.as_ref().data_type() {
DataType::Float32 => Ok(ColumnarValue::Array(Arc::new(Float32Array::from_iter(
as_float32_array(array)?
Expand All @@ -54,7 +60,7 @@ pub fn spark_normalize_nan_and_zero(args: &[ColumnarValue]) -> Result<ColumnarVa
),
},
other_dt => df_execution_err!(
"spark_normalize_nan_and_zero only supports non-null Float32/Float64 scalars or Float32/Float64 arrays, not: {:?}",
"spark_normalize_nan_and_zero only supports Float32/Float64 scalars or Float32/Float64 arrays, not: {:?}",
other_dt.data_type()
),
}
Expand Down Expand Up @@ -152,4 +158,27 @@ mod test {
Float32,
Float32Array
);

macro_rules! test_normalize_nan_and_zero_null_scalar {
($test_name:ident, $scalar_variant:ident) => {
#[test]
fn $test_name() -> Result<(), Box<dyn Error>> {
let input_columnar_value =
ColumnarValue::Scalar(ScalarValue::$scalar_variant(None));
let result = spark_normalize_nan_and_zero(&vec![input_columnar_value])?;
match result {
ColumnarValue::Scalar(ScalarValue::$scalar_variant(None)) => Ok(()),
other => panic!(
"Expected null {} scalar, got: {:?}",
stringify!($scalar_variant),
other
),
}
}
};
}

test_normalize_nan_and_zero_null_scalar!(test_normalize_nan_and_zero_null_scalar_f64, Float64);

test_normalize_nan_and_zero_null_scalar!(test_normalize_nan_and_zero_null_scalar_f32, Float32);
}
Loading