You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by "Mryange (via GitHub)" <gi...@apache.org> on 2026/04/24 08:58:01 UTC
[PR] [fix](nereids) Fix DST spring-forward gap handling in datetime literal timezone conversion [doris]
Mryange opened a new pull request, #62814:
URL: https://github.com/apache/doris/pull/62814
## What problem does this PR solve?
Issue Number: N/A
Problem Summary:
When inserting a `TIMESTAMPTZ` value whose civil time falls in a DST spring-forward gap
(e.g. `'2024-03-10 02:30:00 America/New_York'` — a time that does not exist because
clocks jump from 02:00 EST to 03:00 EDT), the two FE literal-parsing paths produced
**different UTC instants**:
| Path | Input | Stored (UTC) |
|------|-------|--------------|
| Named-TZ suffix (`'... America/New_York'`) | `02:30:00 NY` | ❌ `06:30 UTC` |
| Implicit session TZ (`SET time_zone='America/New_York'`) | `02:30:00` | ✅ `07:30 UTC` |
The correct answer is `07:30 UTC`: Java's `ZonedDateTime.of()` snaps the non-existent
gap time to 03:30 EDT (= 07:30 UTC), but the old code then queried
`zoneId.getRules().getOffset(thatTime)` which returned the **post-snap** EDT offset
(`-04:00`) instead of the pre-gap EST offset (`-05:00`). Applying this wrong offset
to the original pre-snap civil time `02:30` yielded the incorrect `06:30 UTC`.
### Root cause
Both `parseDateTimeLiteral()` and `init()` in `DateTimeLiteral.java` used the pattern:
```java
Instant thatTime = ZonedDateTime.of(civil, zoneId).toInstant(); // correct snap
int offset = sessionTz.getOffset(thatTime) - zoneId.getOffset(thatTime); // wrong: uses post-snap offset
// ... apply offset to pre-snap civil fields → wrong result
```
### Fix
Replace the offset-delta arithmetic with a direct zone projection of the correctly
snapped absolute instant:
```java
Instant thatTime = ZonedDateTime.of(civil, zoneId).toInstant(); // correct snap
ZonedDateTime inTarget = thatTime.atZone(targetZone); // project, don't compute delta
// read fields from inTarget
```
This applies to both the session-timezone path (for `DateTimeLiteral`) and the
UTC-storage path (for `TimestampTzLiteral`).
## Changes
- `fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DateTimeLiteral.java`:
Fix `parseDateTimeLiteral()` and `init()` to convert via `Instant.atZone()` instead
of an offset delta.
- `fe/fe-core/src/test/java/org/apache/doris/nereids/trees/expressions/literal/TimestampTzLiteralTest.java`:
Add `testSpringForwardGapConsistency()` unit test.
- `regression-test/suites/datatype_p0/timestamptz/test_timestamptz_dst_gap.groovy`:
Add regression test covering both named-TZ and implicit session-TZ paths for a
spring-forward gap time, asserting they produce the same UTC instant.
### Release note
None
### Check List (For Author)
- Test <!-- At least one of them must be included. -->
- [ ] Regression test
- [ ] Unit Test
- [ ] Manual test (add detailed scripts or steps below)
- [ ] No need to test or manual test. Explain why:
- [ ] This is a refactor/code format and no logic has been changed.
- [ ] Previous test can cover this change.
- [ ] No code files have been changed.
- [ ] Other reason <!-- Add your reason? -->
- Behavior changed:
- [ ] No.
- [ ] Yes. <!-- Explain the behavior change -->
- Does this need documentation?
- [ ] No.
- [ ] Yes. <!-- Add document PR link here. eg: https://github.com/apache/doris-website/pull/1214 -->
### Check List (For Reviewer who merge this PR)
- [ ] Confirm the release note
- [ ] Confirm test cases
- [ ] Confirm document
- [ ] Add branch pick label <!-- Add branch pick label that this PR should merge into -->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
Re: [PR] [fix](nereids) Fix DST spring-forward gap handling in datetime literal timezone conversion [doris]
Posted by "zclllyybb (via GitHub)" <gi...@apache.org>.
zclllyybb commented on PR #62814:
URL: https://github.com/apache/doris/pull/62814#issuecomment-4342423039
replaced by https://github.com/apache/doris/pull/62945
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
Re: [PR] [fix](nereids) Fix DST spring-forward gap handling in datetime literal timezone conversion [doris]
Posted by "hello-stephen (via GitHub)" <gi...@apache.org>.
hello-stephen commented on PR #62814:
URL: https://github.com/apache/doris/pull/62814#issuecomment-4311914919
Thank you for your contribution to Apache Doris.
Don't know what should be done next? See [How to process your PR](https://cwiki.apache.org/confluence/display/DORIS/How+to+process+your+PR).
Please clearly describe your PR:
1. What problem was fixed (it's best to include specific error reporting information). How it was fixed.
2. Which behaviors were modified. What was the previous behavior, what is it now, why was it modified, and what possible impacts might there be.
3. What features were added. Why was this function added?
4. Which code was refactored and why was this part of the code refactored?
5. Which functions were optimized and what is the difference before and after the optimization?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
Re: [PR] [fix](nereids) Fix DST spring-forward gap handling in datetime literal timezone conversion [doris]
Posted by "zclllyybb (via GitHub)" <gi...@apache.org>.
zclllyybb closed pull request #62814: [fix](nereids) Fix DST spring-forward gap handling in datetime literal timezone conversion
URL: https://github.com/apache/doris/pull/62814
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org