Skip to content
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.

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

expression: fix ADD_DATE daylight saving time change (#20871) #20888

Merged
merged 5 commits into from
Nov 6, 2020

Conversation

ti-srebot
Copy link
Contributor

cherry-pick #20871 to release-4.0


What problem does this PR solve?

Issue Number: close #19667

Problem Summary: golang's time api considers daylight saving time for time arithematics, but time in UTC won't be affected.

What is changed and how it works?

Proposal: xxx

What's Changed: change use of time.Locale to time.UTC.

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Integration test

Side effects

N/A

Release note

  • No release note

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor Author

/run-all-tests

Copy link
Contributor

@lzmhhh123 lzmhhh123 left a comment

Choose a reason for hiding this comment

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

@ichn-hu Please resolve conflicts.

Comment on lines 2855 to 2856
func (du *baseDateArithmitical) addDate(ctx sessionctx.Context, date types.Time, year, month, day, nano int64) (types.Time, bool, error) {
goTime, err := date.GoTime(time.UTC)
Copy link
Contributor

Choose a reason for hiding this comment

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

It seems that's not the correct change.

Copy link
Contributor

Choose a reason for hiding this comment

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

Okay, I see, I'll fix them.

Copy link
Contributor

@lzmhhh123 lzmhhh123 left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 6, 2020
@ichn-hu
Copy link
Contributor

ichn-hu commented Nov 6, 2020

@qw4990 PTAL

Copy link
Contributor

@qw4990 qw4990 left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-srebot ti-srebot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Nov 6, 2020
@qw4990
Copy link
Contributor

qw4990 commented Nov 6, 2020

/run-all-tests

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/expression sig/execution SIG execution status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug. type/4.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants