Skip to content
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

fix: issue introduced in #6833 - less than equal check for scale in decimal conversion #7070

Merged
merged 3 commits into from
Feb 5, 2025
Merged

fix: issue introduced in #6833 - less than equal check for scale in decimal conversion #7070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2915cb
fix <= check for scale in decimal conversion
himadripal Feb 3, 2025
521f4d9
Update arrow-cast/src/cast/mod.rs
himadripal Feb 4, 2025
1bd3c00
remove incorrect comment
himadripal Feb 4, 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
3 changes: 1 addition & 2 deletions arrow-cast/src/cast/decimal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,7 @@ where
let array: PrimitiveArray<T> =
if input_scale == output_scale && input_precision <= output_precision {
array.clone()
} else if input_scale < output_scale {
// the scale doesn't change, but precision may change and cause overflow
} else if input_scale <= output_scale {
convert_to_bigger_or_equal_scale_decimal::<T, T>(
Copy link
Member

Choose a reason for hiding this comment

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

As the call is to convert_to_bigger_or_equal_scale_decimal, looks like the condition was not correct before. Btw, the above comment is "the scale doesn't change...", however, the scale is actually changed, no?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes. Previous PR introduced this bug and this is to fixing it. Removed comment.

array,
input_scale,
Expand Down
21 changes: 20 additions & 1 deletion arrow-cast/src/cast/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9980,7 +9980,26 @@ mod tests {
};
let result = cast_with_options(&array, &output_type, &options);
assert_eq!(result.unwrap_err().to_string(),
"Invalid argument error: 123456790 is too large to store in a Decimal128 of precision 6. Max is 999999");
"Invalid argument error: 123456789 is too large to store in a Decimal128 of precision 6. Max is 999999");
}

#[test]
fn test_decimal_to_decimal_same_scale() {
let array = vec![Some(520)];
let array = create_decimal_array(array, 4, 2).unwrap();
let input_type = DataType::Decimal128(4, 2);
let output_type = DataType::Decimal128(3, 2);
assert!(can_cast_types(&input_type, &output_type));

let options = CastOptions {
safe: false,
..Default::default()
};
let result = cast_with_options(&array, &output_type, &options);
assert_eq!(
result.unwrap().as_primitive::<Decimal128Type>().value(0),
520
);
}

#[test]
Expand Down
Loading