Skip to content

ARROW-10907: [Rust] Fix Cast UTF8 to Date64 #8918

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
seddonm1 wants to merge 1 commit into from
Closed

ARROW-10907: [Rust] Fix Cast UTF8 to Date64 #8918

Show file tree
Hide file tree
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
44 changes: 21 additions & 23 deletions rust/arrow/src/compute/kernels/cast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,16 +380,14 @@ pub fn cast(array: &ArrayRef, to_type: &DataType) -> Result<ArrayRef> {
Float32 => cast_string_to_numeric::<Float32Type>(array),
Float64 => cast_string_to_numeric::<Float64Type>(array),
Date32(DateUnit::Day) => {
use chrono::{NaiveDate, NaiveTime};
let zero_time = NaiveTime::from_hms(0, 0, 0);
let zero_time = chrono::NaiveTime::from_hms(0, 0, 0);
let string_array = array.as_any().downcast_ref::<StringArray>().unwrap();
let mut builder = PrimitiveBuilder::<Date32Type>::new(string_array.len());
for i in 0..string_array.len() {
if string_array.is_null(i) {
builder.append_null()?;
} else {
match NaiveDate::parse_from_str(string_array.value(i), "%Y-%m-%d")
{
match string_array.value(i).parse::<chrono::NaiveDate>() {
Ok(date) => builder.append_value(
(date.and_time(zero_time).timestamp() / SECONDS_IN_DAY)
as i32,
Expand All @@ -401,19 +399,16 @@ pub fn cast(array: &ArrayRef, to_type: &DataType) -> Result<ArrayRef> {
Ok(Arc::new(builder.finish()) as ArrayRef)
}
Date64(DateUnit::Millisecond) => {
use chrono::{NaiveDate, NaiveTime};
let zero_time = NaiveTime::from_hms(0, 0, 0);
let string_array = array.as_any().downcast_ref::<StringArray>().unwrap();
let mut builder = PrimitiveBuilder::<Date64Type>::new(string_array.len());
for i in 0..string_array.len() {
if string_array.is_null(i) {
builder.append_null()?;
} else {
match NaiveDate::parse_from_str(string_array.value(i), "%Y-%m-%d")
{
Ok(date) => builder.append_value(
date.and_time(zero_time).timestamp_millis() as i64,
)?,
match string_array.value(i).parse::<chrono::NaiveDateTime>() {
Ok(date_time) => {
builder.append_value(date_time.timestamp_millis())?
}
Err(_) => builder.append_null()?, // not a valid date
};
}
Expand Down Expand Up @@ -2804,26 +2799,29 @@ mod tests {
#[test]
fn test_cast_utf8_to_date64() {
let a = StringArray::from(vec![
"2000-01-01", // valid date with leading 0s
"2000-2-2", // valid date without leading 0s
"2000-00-00", // invalid month and day
"2000-01-01T12:00:00", // date + time is invalid
"2000", // just a year is invalid
"2000-01-01T12:00:00", // date + time valid
"2020-12-15T12:34:56", // date + time valid
"2020-2-2T12:34:56", // valid date time without leading 0s
"2000-00-00T12:00:00", // invalid month and day
"2000-01-01 12:00:00", // missing the 'T'
"2000-01-01", // just a date is invalid
]);
let array = Arc::new(a) as ArrayRef;
let b = cast(&array, &DataType::Date64(DateUnit::Millisecond)).unwrap();
let c = b.as_any().downcast_ref::<Date64Array>().unwrap();

// test valid inputs
assert_eq!(true, c.is_valid(0)); // "2000-01-01"
assert_eq!(946684800000, c.value(0));
assert_eq!(true, c.is_valid(1)); // "2000-2-2"
assert_eq!(949449600000, c.value(1));
assert_eq!(true, c.is_valid(0)); // "2000-01-01T12:00:00"
assert_eq!(946728000000, c.value(0));
assert_eq!(true, c.is_valid(1)); // "2020-12-15T12:34:56"
assert_eq!(1608035696000, c.value(1));
assert_eq!(true, c.is_valid(2)); // "2020-2-2T12:34:56"
assert_eq!(1580646896000, c.value(2));

// test invalid inputs
assert_eq!(false, c.is_valid(2)); // "2000-00-00"
assert_eq!(false, c.is_valid(3)); // "2000-01-01T12:00:00"
assert_eq!(false, c.is_valid(4)); // "2000"
assert_eq!(false, c.is_valid(3)); // "2000-00-00T12:00:00"
assert_eq!(false, c.is_valid(4)); // "2000-01-01 12:00:00"
assert_eq!(false, c.is_valid(5)); // "2000-01-01"
}

#[test]
Expand Down
8 changes: 4 additions & 4 deletions rust/datafusion/src/physical_plan/expressions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2683,10 +2683,10 @@ mod tests {
test_coercion!(
StringArray,
DataType::Utf8,
vec!["1994-12-13", "1995-01-26"],
vec!["1994-12-13T12:34:56", "1995-01-26T01:23:45"],
Date64Array,
DataType::Date64(DateUnit::Millisecond),
vec![787276800000, 791078400000],
vec![787322096000, 791083425000],
Operator::Eq,
BooleanArray,
DataType::Boolean,
Expand All @@ -2695,10 +2695,10 @@ mod tests {
test_coercion!(
StringArray,
DataType::Utf8,
vec!["1994-12-13", "1995-01-26"],
vec!["1994-12-13T12:34:56", "1995-01-26T01:23:45"],
Date64Array,
DataType::Date64(DateUnit::Millisecond),
vec![787276800001, 791078399999],
vec![787322096001, 791083424999],
Operator::Lt,
BooleanArray,
DataType::Boolean,
Expand Down