Skip to content

fix: rescale decimal results in floor and ceil to scale 0 #20793

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
skushagra wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: rescale decimal results in floor and ceil to scale 0 #20793

Show file tree
Hide file tree
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
12 changes: 12 additions & 0 deletions datafusion/functions/src/math/ceil.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,18 @@ impl ScalarUDFImpl for CeilFunc {

fn return_type(&self, arg_types: &[DataType]) -> Result<DataType> {
match &arg_types[0] {
DataType::Decimal32(precision, _scale) => {
Ok(DataType::Decimal32(*precision, 0))
}
DataType::Decimal64(precision, _scale) => {
Ok(DataType::Decimal64(*precision, 0))
}
DataType::Decimal128(precision, _scale) => {
Ok(DataType::Decimal128(*precision, 0))
}
DataType::Decimal256(precision, _scale) => {
Ok(DataType::Decimal256(*precision, 0))
}
DataType::Null => Ok(DataType::Float64),
other => Ok(other.clone()),
}
Expand Down
7 changes: 4 additions & 3 deletions datafusion/functions/src/math/decimal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,15 @@ where

let factor = decimal_scale_factor::<T>(scale, fn_name)?;
let decimal = array.as_primitive::<T>();
let data_type = array.data_type().clone();
let data_type = T::TYPE_CONSTRUCTOR(precision, 0);

let result: PrimitiveArray<T> = decimal.try_unary(|value| {
let new_value = op(value, factor);
T::validate_decimal_precision(new_value, precision, scale).map_err(|_| {
let rescaled = new_value.div_wrapping(factor);
T::validate_decimal_precision(rescaled, precision, 0).map_err(|_| {
ArrowError::ComputeError(format!("Decimal overflow while applying {fn_name}"))
})?;
Ok::<_, ArrowError>(new_value)
Ok::<_, ArrowError>(rescaled)
})?;

let result = result.with_data_type(data_type);
Expand Down
12 changes: 12 additions & 0 deletions datafusion/functions/src/math/floor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,18 @@ impl ScalarUDFImpl for FloorFunc {

fn return_type(&self, arg_types: &[DataType]) -> Result<DataType> {
match &arg_types[0] {
DataType::Decimal32(precision, _scale) => {
Ok(DataType::Decimal32(*precision, 0))
}
DataType::Decimal64(precision, _scale) => {
Ok(DataType::Decimal64(*precision, 0))
}
DataType::Decimal128(precision, _scale) => {
Ok(DataType::Decimal128(*precision, 0))
}
DataType::Decimal256(precision, _scale) => {
Ok(DataType::Decimal256(*precision, 0))
}
DataType::Null => Ok(DataType::Float64),
other => Ok(other.clone()),
}
Expand Down
Loading