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: parse string of scientific notation to decimal when the scale is 0 #5740

Merged
merged 2 commits into from
May 13, 2024
Merged

fix: parse string of scientific notation to decimal when the scale is 0 #5740

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc45466
fix: parse string to decimal when scale is 0
yjshen May 9, 2024
be548c7
fix fmt
yjshen May 9, 2024
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
28 changes: 16 additions & 12 deletions arrow-cast/src/parse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -860,7 +860,7 @@ pub fn parse_decimal<T: DecimalType>(
"can't parse the string value {s} to decimal"
)));
}
if fractionals == scale {
if fractionals == scale && scale != 0 {
Copy link
Contributor

@tustvold tustvold May 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

It took me quite a while to work out what was going on here, the issue appears to be that parse_e_notation uses a non-zero fractionals to skip over the decimal point.

I think this can now overflow, but I think that is a broader issue with the e parsing logic. I will file a ticket

// We have processed all the digits that we need. All that
// is left is to validate that the rest of the string contains
// valid digits.
Expand Down Expand Up @@ -2407,6 +2407,8 @@ mod tests {
("0.12e+6", "120000", 10),
("000000000001e0", "000000000001", 3),
("000001.1034567002e0", "000001.1034567002", 3),
("1.234e16", "12340000000000000", 0),
("123.4e16", "1234000000000000000", 0),
];
for (e, d, scale) in e_notation_tests {
let result_128_e = parse_decimal::<Decimal128Type>(e, 20, scale);
Expand Down Expand Up @@ -2445,17 +2447,19 @@ mod tests {
);
}
let overflow_parse_tests = [
"12345678",
"1.2345678e7",
"12345678.9",
"1.23456789e+7",
"99999999.99",
"9.999999999e7",
"12345678908765.123456",
"123456789087651234.56e-4",
("12345678", 3),
("1.2345678e7", 3),
("12345678.9", 3),
("1.23456789e+7", 3),
("99999999.99", 3),
("9.999999999e7", 3),
("12345678908765.123456", 3),
("123456789087651234.56e-4", 3),
("1234560000000", 0),
("1.23456e12", 0),
];
for s in overflow_parse_tests {
let result_128 = parse_decimal::<Decimal128Type>(s, 10, 3);
for (s, scale) in overflow_parse_tests {
let result_128 = parse_decimal::<Decimal128Type>(s, 10, scale);
let expected_128 = "Parser error: parse decimal overflow";
let actual_128 = result_128.unwrap_err().to_string();

Expand All @@ -2464,7 +2468,7 @@ mod tests {
"actual: '{actual_128}', expected: '{expected_128}'"
);

let result_256 = parse_decimal::<Decimal256Type>(s, 10, 3);
let result_256 = parse_decimal::<Decimal256Type>(s, 10, scale);
let expected_256 = "Parser error: parse decimal overflow";
let actual_256 = result_256.unwrap_err().to_string();

Expand Down
Loading