Skip to content

branch-4.0: [fix](fe) Align convert_tz folding with BE DST handling #64029 - #64194

Merged
morningman merged 1 commit into
branch-4.0from
auto-pick-64029-branch-4.0
Jun 25, 2026
Merged

branch-4.0: [fix](fe) Align convert_tz folding with BE DST handling #64029#64194
morningman merged 1 commit into
branch-4.0from
auto-pick-64029-branch-4.0

Conversation

@github-actions

@github-actionsgithub-actionsBot commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

Cherry-picked from #64029

@hello-stephen

hello-stephen commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See 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?

@hello-stephen

hello-stephen commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

run buildall

@hello-stephen

hello-stephen commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

FE UT Coverage Report

Increment line coverage 100.00% (13/13) 🎉
Increment coverage report
Complete coverage report

@hello-stephen

hello-stephen commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

BE Regression && UT Coverage Report

Increment line coverage 100.00% (10/10) 🎉

Increment coverage report
Complete coverage report

CategoryCoverage
Function Coverage71.47% (25518/35703)
Line Coverage54.30% (270230/497621)
Region Coverage52.05% (224572/431476)
Branch Coverage53.35% (96410/180721)

@github-actionsgithub-actionsBot added the approved Indicates a PR has been approved by one committer. label Jun 24, 2026
@github-actions

github-actionsBot commented Jun 24, 2026

Copy link
Copy Markdown
ContributorAuthor

PR approved by at least one committer and no changes requested.

@github-actions

github-actionsBot commented Jun 24, 2026

Copy link
Copy Markdown
ContributorAuthor

PR approved by anyone and no changes requested.

@feiniaofeiafei@morningman
[fix](fe) Align convert_tz folding with BE DST handling (#64029)
920229a
Related PR: #63853
Problem Summary:
FE constant folding for convert_tz() used Java LocalDateTime.atZone()
semantics. For source local times inside daylight-saving skipped
intervals, Java preserves the minute and second while shifting to the
post-transition offset, while BE executes convert_tz() through
cctz::convert() and maps skipped civil times to the transition instant.
This mismatch can make FE partition pruning reason about a different
folded value from BE execution. This PR makes FE convert_tz() constant
folding use ZoneRules transition information to match BE behavior for
skipped and repeated local times.
@morningman
morningmanforce-pushed the auto-pick-64029-branch-4.0 branch from 2098e2e to 920229aCompareJune 24, 2026 09:47
@morningman

morningman commented Jun 24, 2026

Copy link
Copy Markdown
Contributor

run buildall

@hello-stephen

hello-stephen commented Jun 24, 2026

Copy link
Copy Markdown
Contributor

FE UT Coverage Report

Increment line coverage 100.00% (13/13) 🎉
Increment coverage report
Complete coverage report

@hello-stephen

hello-stephen commented Jun 24, 2026

Copy link
Copy Markdown
Contributor

BE UT Coverage Report

Increment line coverage 90.00% (9/10) 🎉

Increment coverage report
Complete coverage report

CategoryCoverage
Function Coverage53.35% (19463/36484)
Line Coverage36.47% (181985/498940)
Region Coverage33.05% (141328/427611)
Branch Coverage33.93% (61191/180368)

@hello-stephen

hello-stephen commented Jun 24, 2026

Copy link
Copy Markdown
Contributor

BE Regression && UT Coverage Report

Increment line coverage 90.00% (9/10) 🎉

Increment coverage report
Complete coverage report

CategoryCoverage
Function Coverage57.56% (20576/35744)
Line Coverage40.27% (200706/498370)
Region Coverage37.06% (160238/432320)
Branch Coverage37.72% (68342/181189)

@feiniaofeiafei

feiniaofeiafei commented Jun 25, 2026

Copy link
Copy Markdown
Collaborator

run p0

@feiniaofeiafei

feiniaofeiafei commented Jun 25, 2026

Copy link
Copy Markdown
Collaborator

run cloud_p0

@hello-stephen

hello-stephen commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

BE Regression && UT Coverage Report

Increment line coverage 90.00% (9/10) 🎉

Increment coverage report
Complete coverage report

CategoryCoverage
Function Coverage57.56% (20576/35744)
Line Coverage40.27% (200706/498370)
Region Coverage37.06% (160238/432320)
Branch Coverage37.72% (68342/181189)

@hello-stephen

hello-stephen commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

BE Regression && UT Coverage Report

Increment line coverage 90.00% (9/10) 🎉

Increment coverage report
Complete coverage report

CategoryCoverage
Function Coverage57.62% (20595/35744)
Line Coverage40.31% (200896/498370)
Region Coverage37.13% (160530/432320)
Branch Coverage37.76% (68422/181189)

@morningman
morningman merged commit e905761 into branch-4.0Jun 25, 2026
28 of 32 checks passed
@github-actions
github-actionsBot deleted the auto-pick-64029-branch-4.0 branch June 25, 2026 06:10
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@morningmanmorningmanmorningman approved these changes

Assignees

No one assigned

Labels

approvedIndicates a PR has been approved by one committer.reviewed

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@hello-stephen@morningman@feiniaofeiafei