Skip to content

ARROW-10677: [Rust] Fix CSV Boolean parsing + add tests to demonstrate supported csv parsing #8733

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

Closed
alamb wants to merge 1 commit into from
Closed

ARROW-10677: [Rust] Fix CSV Boolean parsing + add tests to demonstrate supported csv parsing #8733

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
52 changes: 46 additions & 6 deletions rust/arrow/src/csv/reader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,7 @@ fn parse(
arrays.and_then(|arr| RecordBatch::try_new(projected_schema, arr))
}

/// Specialized parsing implementations
trait Parser: ArrowPrimitiveType {
fn parse(string: &str) -> Option<Self::Native> {
string.parse::<Self::Native>().ok()
Expand All @@ -454,13 +455,13 @@ trait Parser: ArrowPrimitiveType {

impl Parser for BooleanType {
fn parse(string: &str) -> Option<bool> {
if string == "false" || string == "FALSE" || string == "False" {
return Some(true);
Copy link
Contributor Author

@alamb alamb Nov 22, 2020

Choose a reason for hiding this comment

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

note the condition was inverted here ("False" --> Some(true)) -- this was introduced in #8714 by accident

if string.eq_ignore_ascii_case("false") {
Some(false)
} else if string.eq_ignore_ascii_case("true") {
Some(true)
} else {
None
}
if string == "true" || string == "TRUE" || string == "True" {
return Some(false);
}
None
}
}

Expand Down Expand Up @@ -1037,4 +1038,43 @@ mod tests {
assert!(csv.next().is_none());
Ok(())
}

#[test]
fn test_parsing_bool() {
// Encode the expected behavior of boolean parsing
assert_eq!(Some(true), parse_item::<BooleanType>("true"));
assert_eq!(Some(true), parse_item::<BooleanType>("tRUe"));
assert_eq!(Some(true), parse_item::<BooleanType>("True"));
assert_eq!(Some(true), parse_item::<BooleanType>("TRUE"));
assert_eq!(None, parse_item::<BooleanType>("t"));
assert_eq!(None, parse_item::<BooleanType>("T"));
assert_eq!(None, parse_item::<BooleanType>(""));

assert_eq!(Some(false), parse_item::<BooleanType>("false"));
assert_eq!(Some(false), parse_item::<BooleanType>("fALse"));
assert_eq!(Some(false), parse_item::<BooleanType>("False"));
assert_eq!(Some(false), parse_item::<BooleanType>("FALSE"));
assert_eq!(None, parse_item::<BooleanType>("f"));
assert_eq!(None, parse_item::<BooleanType>("F"));
assert_eq!(None, parse_item::<BooleanType>(""));
}

#[test]
fn test_parsing_float() {
assert_eq!(Some(12.34), parse_item::<Float64Type>("12.34"));
assert_eq!(Some(-12.34), parse_item::<Float64Type>("-12.34"));
assert_eq!(Some(12.0), parse_item::<Float64Type>("12"));
assert_eq!(Some(0.0), parse_item::<Float64Type>("0"));
assert!(parse_item::<Float64Type>("nan").unwrap().is_nan());
assert!(parse_item::<Float64Type>("NaN").unwrap().is_nan());
assert!(parse_item::<Float64Type>("inf").unwrap().is_infinite());
assert!(parse_item::<Float64Type>("inf").unwrap().is_sign_positive());
assert!(parse_item::<Float64Type>("-inf").unwrap().is_infinite());
assert!(parse_item::<Float64Type>("-inf")
.unwrap()
.is_sign_negative());
assert_eq!(None, parse_item::<Float64Type>(""));
assert_eq!(None, parse_item::<Float64Type>("dd"));
assert_eq!(None, parse_item::<Float64Type>("12.34.56"));
}
}