Skip to content

fix divide by zero not throwing proper error for decimal #3517

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
alamb merged 3 commits into from
Sep 17, 2022
Merged

fix divide by zero not throwing proper error for decimal #3517

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22b31d1
fix divide by zero for decimal, add tests
kmitchener Sep 16, 2022
e455c7b
check for actual error strings
kmitchener Sep 16, 2022
3ddffe0
move scalar divide by zero check out of the loop. fix precision in test.
kmitchener Sep 16, 2022
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
52 changes: 45 additions & 7 deletions datafusion/physical-expr/src/expressions/binary/kernels_arrow.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,9 @@ pub(crate) fn divide_decimal(
) -> Result<Decimal128Array> {
let mul = 10_f64.powi(left.scale() as i32);
let array = arith_decimal(left, right, |left, right| {
if right == 0 {
return Err(DataFusionError::ArrowError(ArrowError::DivideByZero));
}
let l_value = left as f64;
let r_value = right as f64;
let result = ((l_value / r_value) * mul) as i128;
Expand All @@ -391,6 +394,9 @@ pub(crate) fn divide_decimal_scalar(
left: &Decimal128Array,
right: i128,
) -> Result<Decimal128Array> {
if right == 0 {
return Err(DataFusionError::ArrowError(ArrowError::DivideByZero));
}
let mul = 10_f64.powi(left.scale() as i32);
let array = arith_decimal_scalar(left, right, |left, right| {
let l_value = left as f64;
Expand Down Expand Up @@ -615,34 +621,66 @@ mod tests {
assert_eq!(expect, result);
// divide
let left_decimal_array = create_decimal_array(
&[Some(1234567), None, Some(1234567), Some(1234567)],
&[
Some(1234567),
None,
Some(1234567),
Some(1234567),
Some(1234567),
],
25,
3,
);
let right_decimal_array = create_decimal_array(
&[Some(10), Some(100), Some(55), Some(-123), None],
25,
3,
);
let right_decimal_array =
create_decimal_array(&[Some(10), Some(100), Some(55), Some(-123)], 25, 3);
let result = divide_decimal(&left_decimal_array, &right_decimal_array)?;
let expect = create_decimal_array(
&[Some(123456700), None, Some(22446672), Some(-10037130)],
&[Some(123456700), None, Some(22446672), Some(-10037130), None],
25,
3,
);
assert_eq!(expect, result);
let result = divide_decimal_scalar(&left_decimal_array, 10)?;
let expect = create_decimal_array(
&[Some(123456700), None, Some(123456700), Some(123456700)],
&[
Some(123456700),
None,
Some(123456700),
Some(123456700),
Some(123456700),
],
25,
3,
);
assert_eq!(expect, result);
// modulus
let result = modulus_decimal(&left_decimal_array, &right_decimal_array)?;
let expect = create_decimal_array(&[Some(7), None, Some(37), Some(16)], 25, 3);
let expect =
create_decimal_array(&[Some(7), None, Some(37), Some(16), None], 25, 3);
assert_eq!(expect, result);
let result = modulus_decimal_scalar(&left_decimal_array, 10)?;
let expect = create_decimal_array(&[Some(7), None, Some(7), Some(7)], 25, 3);
let expect =
create_decimal_array(&[Some(7), None, Some(7), Some(7), Some(7)], 25, 3);
assert_eq!(expect, result);

Ok(())
}

#[test]
fn arithmetic_decimal_divide_by_zero() {
let left_decimal_array = create_decimal_array(&[Some(101)], 10, 1);
let right_decimal_array = create_decimal_array(&[Some(0)], 1, 1);

let err = divide_decimal(&left_decimal_array, &right_decimal_array).unwrap_err();
assert_eq!("Arrow error: Divide by zero error", err.to_string());
let err = divide_decimal_scalar(&left_decimal_array, 0).unwrap_err();
assert_eq!("Arrow error: Divide by zero error", err.to_string());
let err = modulus_decimal(&left_decimal_array, &right_decimal_array).unwrap_err();
assert_eq!("Arrow error: Divide by zero error", err.to_string());
let err = modulus_decimal_scalar(&left_decimal_array, 0).unwrap_err();
assert_eq!("Arrow error: Divide by zero error", err.to_string());
}
}