You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by al...@apache.org on 2021/11/24 22:18:10 UTC
[arrow-rs] 01/01: add more error test case and change the code style (#952)
This is an automated email from the ASF dual-hosted git repository.
alamb pushed a commit to branch cherry_pick_32d8c0a0
in repository https://gitbox.apache.org/repos/asf/arrow-rs.git
commit 79b7fe2510752b8399609d535e016f45f1855ded
Author: Kun Liu <li...@apache.org>
AuthorDate: Wed Nov 17 20:15:18 2021 +0800
add more error test case and change the code style (#952)
---
arrow/src/csv/reader.rs | 35 +++++++++++++----------------------
1 file changed, 13 insertions(+), 22 deletions(-)
diff --git a/arrow/src/csv/reader.rs b/arrow/src/csv/reader.rs
index ac72939..b4151c1 100644
--- a/arrow/src/csv/reader.rs
+++ b/arrow/src/csv/reader.rs
@@ -779,7 +779,6 @@ fn parse_decimal_with_parameter(s: &str, precision: usize, scale: usize) -> Resu
if PARSE_DECIMAL_RE.is_match(s) {
let mut offset = s.len();
let len = s.len();
- // each byte is digit、'-' or '.'
let mut base = 1;
// handle the value after the '.' and meet the scale
@@ -801,31 +800,23 @@ fn parse_decimal_with_parameter(s: &str, precision: usize, scale: usize) -> Resu
}
};
+ // each byte is digit、'-' or '.'
let bytes = s.as_bytes();
let mut negative = false;
let mut result: i128 = 0;
- while offset > 0 {
- match bytes[offset - 1] {
- b'-' => {
- negative = true;
- }
- b'.' => {
- // do nothing
- }
- b'0'..=b'9' => {
- result += i128::from(bytes[offset - 1] - b'0') * base;
- base *= 10;
- }
- _ => {
- return Err(ArrowError::ParseError(format!(
- "can't match byte {}",
- bytes[offset - 1]
- )));
- }
+ bytes[0..offset].iter().rev().for_each(|&byte| match byte {
+ b'-' => {
+ negative = true;
}
- offset -= 1;
- }
+ b'0'..=b'9' => {
+ result += i128::from(byte - b'0') * base;
+ base *= 10;
+ }
+ // because of the PARSE_DECIMAL_RE, bytes just contains digit、'-' and '.'.
+ _ => {}
+ });
+
if negative {
result = result.neg();
}
@@ -1614,7 +1605,7 @@ mod tests {
let result = parse_decimal_with_parameter(s, 20, 3);
assert_eq!(i, result.unwrap())
}
- let can_not_parse_tests = ["123,123", "."];
+ let can_not_parse_tests = ["123,123", ".", "123.123.123"];
for s in can_not_parse_tests {
let result = parse_decimal_with_parameter(s, 20, 3);
assert_eq!(