Skip to content

add interval arithmetic for timestamp types #7758

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

Merged
merged 8 commits into from
Oct 9, 2023
Merged

add interval arithmetic for timestamp types #7758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d7436c7
add interval arithmetic for timestamp types
mhilton Oct 6, 2023
3ff2346
apply review suggestion
mhilton Oct 9, 2023
816d506
clippy fixes
mhilton Oct 9, 2023
d7506aa
Merge remote-tracking branch 'origin/main' into issue-7756
mhilton Oct 9, 2023
1d196bf
fix: edit clash
mhilton Oct 9, 2023
ee6fc48
Update datafusion/physical-expr/src/intervals/cp_solver.rs
alamb Oct 9, 2023
bfffc45
Merge remote-tracking branch 'apache/main' into issue-7756
alamb Oct 9, 2023
0fd4cf8
fmt
alamb Oct 9, 2023
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
8 changes: 4 additions & 4 deletions datafusion/common/src/scalar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,15 +833,15 @@ impl ScalarValue {
DataType::Interval(IntervalUnit::MonthDayNano) => {
ScalarValue::IntervalMonthDayNano(Some(0))
}
DataType::Duration(TimeUnit::Second) => ScalarValue::DurationSecond(None),
Copy link
Contributor

@alamb alamb Oct 9, 2023

Choose a reason for hiding this comment

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

👌

DataType::Duration(TimeUnit::Second) => ScalarValue::DurationSecond(Some(0)),
DataType::Duration(TimeUnit::Millisecond) => {
ScalarValue::DurationMillisecond(None)
ScalarValue::DurationMillisecond(Some(0))
}
DataType::Duration(TimeUnit::Microsecond) => {
ScalarValue::DurationMicrosecond(None)
ScalarValue::DurationMicrosecond(Some(0))
}
DataType::Duration(TimeUnit::Nanosecond) => {
ScalarValue::DurationNanosecond(None)
ScalarValue::DurationNanosecond(Some(0))
}
_ => {
return _not_impl_err!(
Expand Down
131 changes: 131 additions & 0 deletions datafusion/physical-expr/src/intervals/cp_solver.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,6 +688,7 @@ mod tests {

use crate::expressions::{BinaryExpr, Column};
use crate::intervals::test_utils::gen_conjunctive_numerical_expr;
use arrow::datatypes::TimeUnit;
use datafusion_common::ScalarValue;
use rand::rngs::StdRng;
use rand::{Rng, SeedableRng};
Expand Down Expand Up @@ -1414,4 +1415,134 @@ mod tests {

Ok(())
}

#[test]
fn test_propagate_comparison() {
// In the examples below:
// `left` is unbounded: [?, ?],
// `right` is known to be [1000,1000]
// so `left` < `right` results in no new knowledge of `right` but knowing that `left` is now < 1000:` [?, 1000)
let left = Interval::new(
IntervalBound::make_unbounded(DataType::Int64).unwrap(),
IntervalBound::make_unbounded(DataType::Int64).unwrap(),
);
let right = Interval::new(
IntervalBound::new(ScalarValue::Int64(Some(1000)), false),
IntervalBound::new(ScalarValue::Int64(Some(1000)), false),
);
assert_eq!(
(
Some(Interval::new(
IntervalBound::make_unbounded(DataType::Int64).unwrap(),
IntervalBound::new(ScalarValue::Int64(Some(1000)), true)
)),
Some(Interval::new(
IntervalBound::new(ScalarValue::Int64(Some(1000)), false),
IntervalBound::new(ScalarValue::Int64(Some(1000)), false)
)),
),
propagate_comparison(&Operator::Lt, &left, &right).unwrap()
);

let left = Interval::new(
IntervalBound::make_unbounded(DataType::Timestamp(
TimeUnit::Nanosecond,
None,
))
.unwrap(),
IntervalBound::make_unbounded(DataType::Timestamp(
TimeUnit::Nanosecond,
None,
))
.unwrap(),
);
let right = Interval::new(
IntervalBound::new(ScalarValue::TimestampNanosecond(Some(1000), None), false),
IntervalBound::new(ScalarValue::TimestampNanosecond(Some(1000), None), false),
);
assert_eq!(
(
Some(Interval::new(
IntervalBound::make_unbounded(DataType::Timestamp(
TimeUnit::Nanosecond,
None
))
.unwrap(),
IntervalBound::new(
ScalarValue::TimestampNanosecond(Some(1000), None),
true
)
)),
Some(Interval::new(
IntervalBound::new(
ScalarValue::TimestampNanosecond(Some(1000), None),
false
),
IntervalBound::new(
ScalarValue::TimestampNanosecond(Some(1000), None),
false
)
)),
),
propagate_comparison(&Operator::Lt, &left, &right).unwrap()
);

let left = Interval::new(
IntervalBound::make_unbounded(DataType::Timestamp(
TimeUnit::Nanosecond,
Some("+05:00".into()),
))
.unwrap(),
IntervalBound::make_unbounded(DataType::Timestamp(
TimeUnit::Nanosecond,
Some("+05:00".into()),
))
.unwrap(),
);
let right = Interval::new(
IntervalBound::new(
ScalarValue::TimestampNanosecond(Some(1000), Some("+05:00".into())),
false,
),
IntervalBound::new(
ScalarValue::TimestampNanosecond(Some(1000), Some("+05:00".into())),
false,
),
);
assert_eq!(
(
Some(Interval::new(
IntervalBound::make_unbounded(DataType::Timestamp(
TimeUnit::Nanosecond,
Some("+05:00".into()),
))
.unwrap(),
IntervalBound::new(
ScalarValue::TimestampNanosecond(
Some(1000),
Some("+05:00".into())
),
true
)
)),
Some(Interval::new(
IntervalBound::new(
ScalarValue::TimestampNanosecond(
Some(1000),
Some("+05:00".into())
),
false
),
IntervalBound::new(
ScalarValue::TimestampNanosecond(
Some(1000),
Some("+05:00".into())
),
false
)
)),
),
propagate_comparison(&Operator::Lt, &left, &right).unwrap()
);
}
}