Skip to content

fix: date_bin() on timstamps before 1970 #13204

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
alamb merged 3 commits into from
Nov 1, 2024
Merged

fix: date_bin() on timstamps before 1970 #13204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b6884b
fix: date_bin() on timstamps before 1970
mhilton Oct 31, 2024
edbca34
Merge remote-tracking branch 'apache/main' into issue-13145
alamb Oct 31, 2024
7885310
fix clippy
alamb Oct 31, 2024
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
30 changes: 29 additions & 1 deletion datafusion/functions/src/datetime/date_bin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ fn date_bin_nanos_interval(stride_nanos: i64, source: i64, origin: i64) -> i64 {
fn compute_distance(time_diff: i64, stride: i64) -> i64 {
let time_delta = time_diff - (time_diff % stride);

if time_diff < 0 && stride > 1 {
if time_diff < 0 && stride > 1 && time_delta != time_diff {
// The origin is later than the source timestamp, round down to the previous bin
time_delta - stride
} else {
Expand Down Expand Up @@ -864,4 +864,32 @@ mod tests {
assert_eq!(result, expected1, "{source} = {expected}");
})
}

#[test]
fn test_date_bin_before_epoch() {
let cases = [
(
(TimeDelta::try_minutes(15), "1969-12-31T23:44:59.999999999"),
"1969-12-31T23:30:00",
),
(
(TimeDelta::try_minutes(15), "1969-12-31T23:45:00"),
"1969-12-31T23:45:00",
),
(
(TimeDelta::try_minutes(15), "1969-12-31T23:45:00.000000001"),
"1969-12-31T23:45:00",
),
];

cases.iter().for_each(|((stride, source), expected)| {
let stride = stride.unwrap();
let stride1 = stride.num_nanoseconds().unwrap();
let source1 = string_to_timestamp_nanos(source).unwrap();

let expected1 = string_to_timestamp_nanos(expected).unwrap();
let result = date_bin_nanos_interval(stride1, source1, 0);
assert_eq!(result, expected1, "{source} = {expected}");
})
}
}
17 changes: 17 additions & 0 deletions datafusion/sqllogictest/test_files/timestamps.slt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -980,6 +980,23 @@ SELECT DATE_BIN('3 years 1 months', '2022-09-01 00:00:00Z');
----
2022-06-01T00:00:00

# Times before the unix epoch
query P
select date_bin('1 hour', column1)
from (values
(timestamp '1969-01-01 00:00:00'),
(timestamp '1969-01-01 00:15:00'),
(timestamp '1969-01-01 00:30:00'),
(timestamp '1969-01-01 00:45:00'),
(timestamp '1969-01-01 01:00:00')
) as sq
----
1969-01-01T00:00:00
1969-01-01T00:00:00
1969-01-01T00:00:00
1969-01-01T00:00:00
1969-01-01T01:00:00

###
## test date_trunc function
###
Expand Down