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

Support microsecond and nanosecond in interval parsing #3916

Merged
merged 1 commit into from
Mar 23, 2023
Merged

Support microsecond and nanosecond in interval parsing #3916

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
39 changes: 29 additions & 10 deletions arrow-cast/src/parse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,19 +751,22 @@ const NANOS_PER_HOUR: f64 = 60_f64 * NANOS_PER_MINUTE;
#[cfg(test)]
const NANOS_PER_DAY: f64 = 24_f64 * NANOS_PER_HOUR;

#[rustfmt::skip]
#[derive(Clone, Copy)]
#[repr(u16)]
enum IntervalType {
Century = 0b_00_0000_0001,
Decade = 0b_00_0000_0010,
Year = 0b_00_0000_0100,
Month = 0b_00_0000_1000,
Week = 0b_00_0001_0000,
Day = 0b_00_0010_0000,
Hour = 0b_00_0100_0000,
Minute = 0b_00_1000_0000,
Second = 0b_01_0000_0000,
Millisecond = 0b_10_0000_0000,
Century = 0b_0000_0000_0001,
Decade = 0b_0000_0000_0010,
Year = 0b_0000_0000_0100,
Month = 0b_0000_0000_1000,
Week = 0b_0000_0001_0000,
Day = 0b_0000_0010_0000,
Hour = 0b_0000_0100_0000,
Minute = 0b_0000_1000_0000,
Second = 0b_0001_0000_0000,
Millisecond = 0b_0010_0000_0000,
Microsecond = 0b_0100_0000_0000,
Nanosecond = 0b_1000_0000_0000,
}

impl FromStr for IntervalType {
Expand All @@ -781,6 +784,8 @@ impl FromStr for IntervalType {
"minute" | "minutes" => Ok(Self::Minute),
"second" | "seconds" => Ok(Self::Second),
"millisecond" | "milliseconds" => Ok(Self::Millisecond),
"microsecond" | "microseconds" => Ok(Self::Microsecond),
"nanosecond" | "nanoseconds" => Ok(Self::Nanosecond),
_ => Err(ArrowError::NotYetImplemented(format!(
"Unknown interval type: {s}"
))),
Expand Down Expand Up @@ -861,6 +866,10 @@ fn parse_interval(leading_field: &str, value: &str) -> Result<MonthDayNano, Arro
IntervalType::Millisecond => {
Ok((0, 0, (interval_period.mul_checked(1_000_000f64))? as i64))
}
IntervalType::Microsecond => {
Ok((0, 0, (interval_period.mul_checked(1_000f64)?) as i64))
}
IntervalType::Nanosecond => Ok((0, 0, interval_period as i64)),
}
};

Expand Down Expand Up @@ -1629,6 +1638,16 @@ mod tests {
parse_interval("months", "1 year 1 day 0.1 milliseconds").unwrap(),
);

assert_eq!(
(12i32, 1i32, 1000i64),
parse_interval("months", "1 year 1 day 1 microsecond").unwrap(),
);

assert_eq!(
(12i32, 1i32, 1i64),
parse_interval("months", "1 year 1 day 1 nanoseconds").unwrap(),
);

assert_eq!(
(1i32, 0i32, (-NANOS_PER_SECOND) as i64),
parse_interval("months", "1 month -1 second").unwrap(),
Expand Down