Skip to content

Support different scales for decimal binary math functions #19874

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
theirix wants to merge 4 commits into
base: main
Choose a base branch
from
+936 −107
Open

Support different scales for decimal binary math functions #19874

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
d276167
Enhance calculate_binary_math functions
theirix Jan 18, 2026
3c2cd10
Update power, log, round with new helpers
theirix Jan 18, 2026
31ade61
Add more SLTs
theirix Jan 18, 2026
f9ffc82
Correct length for null arrays
theirix Jan 18, 2026
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
82 changes: 55 additions & 27 deletions datafusion/functions/src/math/log.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use std::any::Any;

use super::power::PowerFunc;

use crate::utils::calculate_binary_math;
use crate::utils::calculate_binary_math_numeric;
use arrow::array::{Array, ArrayRef};
use arrow::datatypes::{
DataType, Decimal32Type, Decimal64Type, Decimal128Type, Decimal256Type, Float16Type,
Expand Down Expand Up @@ -272,56 +272,84 @@ impl ScalarUDFImpl for LogFunc {
};
let value = value.to_array(args.number_rows)?;

// Get return type
let arg_types: Vec<DataType> =
args.args.iter().map(|arg| arg.data_type()).collect();
let out_type: &DataType = &self.return_type(&arg_types)?;

// Safety: all `dec_scale.expect` calls below are infallible since the left argument
// is decimal array as per `calculate_binary_math` contract.
let output: ArrayRef = match value.data_type() {
DataType::Float16 => {
calculate_binary_math::<Float16Type, Float16Type, Float16Type, _>(
calculate_binary_math_numeric::<Float16Type, Float16Type, Float16Type, _>(
&value,
&base,
|value, base| Ok(value.log(base)),
|value, base, _| Ok(value.log(base)),
out_type,
)?
}
DataType::Float32 => {
calculate_binary_math::<Float32Type, Float32Type, Float32Type, _>(
calculate_binary_math_numeric::<Float32Type, Float32Type, Float32Type, _>(
&value,
&base,
|value, base| Ok(value.log(base)),
|value, base, _| Ok(value.log(base)),
out_type,
)?
}
DataType::Float64 => {
calculate_binary_math::<Float64Type, Float64Type, Float64Type, _>(
&value,
&base,
|value, base| Ok(value.log(base)),
)?
}
DataType::Decimal32(_, scale) => {
calculate_binary_math::<Decimal32Type, Float64Type, Float64Type, _>(
calculate_binary_math_numeric::<Float64Type, Float64Type, Float64Type, _>(
&value,
&base,
|value, base| log_decimal32(value, *scale, base),
|value, base, _| Ok(value.log(base)),
out_type,
)?
}
DataType::Decimal64(_, scale) => {
calculate_binary_math::<Decimal64Type, Float64Type, Float64Type, _>(
DataType::Decimal32(_, _) => {
calculate_binary_math_numeric::<Decimal32Type, Float64Type, Float64Type, _>(
&value,
&base,
|value, base| log_decimal64(value, *scale, base),
|value, base, dec_scale| {
log_decimal32(value, dec_scale.expect("value is decimal").1, base)
},
out_type,
)?
}
DataType::Decimal128(_, scale) => {
calculate_binary_math::<Decimal128Type, Float64Type, Float64Type, _>(
DataType::Decimal64(_, _) => {
calculate_binary_math_numeric::<Decimal64Type, Float64Type, Float64Type, _>(
&value,
&base,
|value, base| log_decimal128(value, *scale, base),
)?
}
DataType::Decimal256(_, scale) => {
calculate_binary_math::<Decimal256Type, Float64Type, Float64Type, _>(
&value,
&base,
|value, base| log_decimal256(value, *scale, base),
|value, base, dec_scale| {
log_decimal64(value, dec_scale.expect("value is decimal").1, base)
},
out_type,
)?
}
DataType::Decimal128(_, _) => calculate_binary_math_numeric::<
Decimal128Type,
Float64Type,
Float64Type,
_,
>(
&value,
&base,
|value, base, dec_scale| {
log_decimal128(value, dec_scale.expect("value is decimal").1, base)
},
out_type,
)?,
DataType::Decimal256(_, _) => calculate_binary_math_numeric::<
Decimal256Type,
Float64Type,
Float64Type,
_,
>(
&value,
&base,
|value, base, dec_scale| {
log_decimal256(value, dec_scale.expect("value is decimal").1, base)
},
out_type,
)?,
other => {
return exec_err!("Unsupported data type {other:?} for function log");
}
Expand Down
100 changes: 57 additions & 43 deletions datafusion/functions/src/math/power.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ use std::any::Any;

use super::log::LogFunc;

use crate::utils::{calculate_binary_decimal_math, calculate_binary_math};
use crate::utils::{
calculate_binary_math, calculate_binary_math_decimal, calculate_binary_math_numeric,
};
use arrow::array::{Array, ArrayRef};
use arrow::datatypes::i256;
use arrow::datatypes::{
Expand Down Expand Up @@ -437,114 +439,126 @@ impl ScalarUDFImpl for PowerFunc {
return pow_decimal_with_float_fallback(&base, exponent, args.number_rows);
}

let out_type = base.data_type();
// Safety: all `dec_scale.expect` calls below are infallible since the left argument
// is decimal array as per `calculate_binary_math` contract.
let arr: ArrayRef = match (base.data_type(), exponent.data_type()) {
(DataType::Float64, DataType::Float64) => {
calculate_binary_math::<Float64Type, Float64Type, Float64Type, _>(
calculate_binary_math_numeric::<Float64Type, Float64Type, Float64Type, _>(
&base,
exponent,
|b, e| Ok(f64::powf(b, e)),
|b, e, _| Ok(f64::powf(b, e)),
out_type,
)?
}
(DataType::Decimal32(precision, scale), DataType::Int64) => {
calculate_binary_decimal_math::<Decimal32Type, Int64Type, Decimal32Type, _>(
(DataType::Decimal32(_, _), DataType::Int64) => {
calculate_binary_math_decimal::<Decimal32Type, Int64Type, Decimal32Type, _>(
&base,
exponent,
|b, e| pow_decimal_int(b, *scale, e),
*precision,
*scale,
|b, e, dec_scale| {
pow_decimal_int(b, dec_scale.expect("left is decimal").1, e)
},
out_type,
)?
}
(DataType::Decimal32(precision, scale), DataType::Float64) => {
calculate_binary_decimal_math::<
(DataType::Decimal32(_, _), DataType::Float64) => {
calculate_binary_math_decimal::<
Decimal32Type,
Float64Type,
Decimal32Type,
_,
>(
&base,
exponent,
|b, e| pow_decimal_float(b, *scale, e),
*precision,
*scale,
|b, e, dec_scale| {
pow_decimal_float(b, dec_scale.expect("left is decimal").1, e)
},
out_type,
)?
}
(DataType::Decimal64(precision, scale), DataType::Int64) => {
calculate_binary_decimal_math::<Decimal64Type, Int64Type, Decimal64Type, _>(
(DataType::Decimal64(_, _), DataType::Int64) => {
calculate_binary_math_decimal::<Decimal64Type, Int64Type, Decimal64Type, _>(
&base,
exponent,
|b, e| pow_decimal_int(b, *scale, e),
*precision,
*scale,
|b, e, dec_scale| {
pow_decimal_int(b, dec_scale.expect("left is decimal").1, e)
},
out_type,
)?
}
(DataType::Decimal64(precision, scale), DataType::Float64) => {
calculate_binary_decimal_math::<
(DataType::Decimal64(_, _), DataType::Float64) => {
calculate_binary_math_decimal::<
Decimal64Type,
Float64Type,
Decimal64Type,
_,
>(
&base,
exponent,
|b, e| pow_decimal_float(b, *scale, e),
*precision,
*scale,
|b, e, dec_scale| {
pow_decimal_float(b, dec_scale.expect("left is decimal").1, e)
},
out_type,
)?
}
(DataType::Decimal128(precision, scale), DataType::Int64) => {
calculate_binary_decimal_math::<
(DataType::Decimal128(_, _), DataType::Int64) => {
calculate_binary_math_decimal::<
Decimal128Type,
Int64Type,
Decimal128Type,
_,
>(
&base,
exponent,
|b, e| pow_decimal_int(b, *scale, e),
*precision,
*scale,
|b, e, dec_scale| {
pow_decimal_int(b, dec_scale.expect("left is decimal").1, e)
},
out_type,
)?
}
(DataType::Decimal128(precision, scale), DataType::Float64) => {
calculate_binary_decimal_math::<
(DataType::Decimal128(_, _), DataType::Float64) => {
calculate_binary_math_decimal::<
Decimal128Type,
Float64Type,
Decimal128Type,
_,
>(
&base,
exponent,
|b, e| pow_decimal_float(b, *scale, e),
*precision,
*scale,
|b, e, dec_scale| {
pow_decimal_float(b, dec_scale.expect("left is decimal").1, e)
},
out_type,
)?
}
(DataType::Decimal256(precision, scale), DataType::Int64) => {
calculate_binary_decimal_math::<
(DataType::Decimal256(_, _), DataType::Int64) => {
calculate_binary_math_decimal::<
Decimal256Type,
Int64Type,
Decimal256Type,
_,
>(
&base,
exponent,
|b, e| pow_decimal256_int(b, *scale, e),
*precision,
*scale,
|b, e, dec_scale| {
pow_decimal256_int(b, dec_scale.expect("left is decimal").1, e)
},
out_type,
)?
}
(DataType::Decimal256(precision, scale), DataType::Float64) => {
calculate_binary_decimal_math::<
(DataType::Decimal256(_, _), DataType::Float64) => {
calculate_binary_math_decimal::<
Decimal256Type,
Float64Type,
Decimal256Type,
_,
>(
&base,
exponent,
|b, e| pow_decimal256_float(b, *scale, e),
*precision,
*scale,
|b, e, dec_scale| {
pow_decimal256_float(b, dec_scale.expect("left is decimal").1, e)
},
out_type,
)?
}
(base_type, exp_type) => {
Expand Down
Loading