Skip to content

fix: correct date_trunc for times before the epoch #18356

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
Oct 30, 2025
Merged

fix: correct date_trunc for times before the epoch #18356

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
f70abf1
fix: correct date_trunc for times before the epoch
mhilton Oct 29, 2025
0bd2f92
test: add additional date_trunc cases
mhilton Oct 30, 2025
587856d
feat: make date_trunc fast case faster
mhilton Oct 30, 2025
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
60 changes: 32 additions & 28 deletions datafusion/functions/src/datetime/date_trunc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
// under the License.

use std::any::Any;
use std::num::NonZeroI64;
use std::ops::{Add, Sub};
use std::str::FromStr;
use std::sync::Arc;
Expand All @@ -28,7 +29,7 @@ use arrow::array::types::{
ArrowTimestampType, TimestampMicrosecondType, TimestampMillisecondType,
TimestampNanosecondType, TimestampSecondType,
};
use arrow::array::{Array, ArrayRef, Int64Array, PrimitiveArray};
use arrow::array::{Array, ArrayRef, PrimitiveArray};
use arrow::datatypes::DataType::{self, Null, Timestamp, Utf8, Utf8View};
use arrow::datatypes::TimeUnit::{self, Microsecond, Millisecond, Nanosecond, Second};
use datafusion_common::cast::as_primitive_array;
Expand Down Expand Up @@ -456,37 +457,40 @@ fn general_date_trunc_array_fine_granularity<T: ArrowTimestampType>(
granularity: &str,
) -> Result<ArrayRef> {
let unit = match (tu, granularity) {
(Second, "minute") => Some(Int64Array::new_scalar(60)),
(Second, "hour") => Some(Int64Array::new_scalar(3600)),
(Second, "day") => Some(Int64Array::new_scalar(86400)),

(Millisecond, "second") => Some(Int64Array::new_scalar(1_000)),
(Millisecond, "minute") => Some(Int64Array::new_scalar(60_000)),
(Millisecond, "hour") => Some(Int64Array::new_scalar(3_600_000)),
(Millisecond, "day") => Some(Int64Array::new_scalar(86_400_000)),

(Microsecond, "millisecond") => Some(Int64Array::new_scalar(1_000)),
(Microsecond, "second") => Some(Int64Array::new_scalar(1_000_000)),
(Microsecond, "minute") => Some(Int64Array::new_scalar(60_000_000)),
(Microsecond, "hour") => Some(Int64Array::new_scalar(3_600_000_000)),
(Microsecond, "day") => Some(Int64Array::new_scalar(86_400_000_000)),

(Nanosecond, "microsecond") => Some(Int64Array::new_scalar(1_000)),
(Nanosecond, "millisecond") => Some(Int64Array::new_scalar(1_000_000)),
(Nanosecond, "second") => Some(Int64Array::new_scalar(1_000_000_000)),
(Nanosecond, "minute") => Some(Int64Array::new_scalar(60_000_000_000)),
(Nanosecond, "hour") => Some(Int64Array::new_scalar(3_600_000_000_000)),
(Nanosecond, "day") => Some(Int64Array::new_scalar(86_400_000_000_000)),
(Second, "minute") => NonZeroI64::new(60),
(Second, "hour") => NonZeroI64::new(3600),
(Second, "day") => NonZeroI64::new(86400),

(Millisecond, "second") => NonZeroI64::new(1_000),
(Millisecond, "minute") => NonZeroI64::new(60_000),
(Millisecond, "hour") => NonZeroI64::new(3_600_000),
(Millisecond, "day") => NonZeroI64::new(86_400_000),

(Microsecond, "millisecond") => NonZeroI64::new(1_000),
(Microsecond, "second") => NonZeroI64::new(1_000_000),
(Microsecond, "minute") => NonZeroI64::new(60_000_000),
(Microsecond, "hour") => NonZeroI64::new(3_600_000_000),
(Microsecond, "day") => NonZeroI64::new(86_400_000_000),

(Nanosecond, "microsecond") => NonZeroI64::new(1_000),
(Nanosecond, "millisecond") => NonZeroI64::new(1_000_000),
(Nanosecond, "second") => NonZeroI64::new(1_000_000_000),
(Nanosecond, "minute") => NonZeroI64::new(60_000_000_000),
(Nanosecond, "hour") => NonZeroI64::new(3_600_000_000_000),
(Nanosecond, "day") => NonZeroI64::new(86_400_000_000_000),
_ => None,
};

if let Some(unit) = unit {
let original_type = array.data_type();
let array = arrow::compute::cast(array, &DataType::Int64)?;
let array = arrow::compute::kernels::numeric::div(&array, &unit)?;
let array = arrow::compute::kernels::numeric::mul(&array, &unit)?;
let array = arrow::compute::cast(&array, original_type)?;
Ok(array)
let unit = unit.get();
let array = PrimitiveArray::<T>::from_iter_values_with_nulls(
array
.values()
.iter()
.map(|v| *v - i64::rem_euclid(*v, unit)),
Copy link
Contributor

@alamb alamb Oct 30, 2025

Choose a reason for hiding this comment

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

this is pretty fancy

Copy link
Member

@waynexia waynexia Oct 30, 2025

Choose a reason for hiding this comment

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

Interesting. Another example for LLVM understand SIMD better than developers 🙂‍↕️

array.nulls().cloned(),
);
Ok(Arc::new(array))
} else {
// truncate to the same or smaller unit
Ok(Arc::new(array.clone()))
Expand Down
24 changes: 24 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 @@ -1687,6 +1687,30 @@ SELECT DATE_TRUNC('second', '2022-08-03 14:38:50Z');
----
2022-08-03T14:38:50

# DATE_TRUNC handling of times before the unix epoch (issue 18334)
query PPPPPPPPPPP
SELECT
d,
DATE_TRUNC('year', d),
DATE_TRUNC('quarter', d),
DATE_TRUNC('month', d),
DATE_TRUNC('week', d),
DATE_TRUNC('day', d),
DATE_TRUNC('hour', d),
DATE_TRUNC('minute', d),
DATE_TRUNC('second', d),
DATE_TRUNC('millisecond', d),
DATE_TRUNC('microsecond', d),
FROM (VALUES
(TIMESTAMP '1900-06-15 07:09:00'),
(TIMESTAMP '1970-01-01 00:00:00'),
(TIMESTAMP '2024-12-31 23:39:01.123456789')
) AS t(d);
----
1900-06-15T07:09:00 1900-01-01T00:00:00 1900-04-01T00:00:00 1900-06-01T00:00:00 1900-06-11T00:00:00 1900-06-15T00:00:00 1900-06-15T07:00:00 1900-06-15T07:09:00 1900-06-15T07:09:00 1900-06-15T07:09:00 1900-06-15T07:09:00
1970-01-01T00:00:00 1970-01-01T00:00:00 1970-01-01T00:00:00 1970-01-01T00:00:00 1969-12-29T00:00:00 1970-01-01T00:00:00 1970-01-01T00:00:00 1970-01-01T00:00:00 1970-01-01T00:00:00 1970-01-01T00:00:00 1970-01-01T00:00:00
2024-12-31T23:39:01.123456789 2024-01-01T00:00:00 2024-10-01T00:00:00 2024-12-01T00:00:00 2024-12-30T00:00:00 2024-12-31T00:00:00 2024-12-31T23:00:00 2024-12-31T23:39:00 2024-12-31T23:39:01 2024-12-31T23:39:01.123 2024-12-31T23:39:01.123456

# Test that interval can add a timestamp
query P
SELECT timestamp '2013-07-01 12:00:00' + INTERVAL '8' DAY;
Expand Down