-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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
evalengine: Implement LAST_DAY #15038
Conversation
Signed-off-by: Noble Mittal <[email protected]>
Review ChecklistHello reviewers! 👋 Please follow this checklist when reviewing this Pull Request. General
Tests
Documentation
New flags
If a workflow is added or modified:
Backward compatibility
|
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## main #15038 +/- ##
==========================================
+ Coverage 47.36% 47.49% +0.13%
==========================================
Files 1144 1149 +5
Lines 238995 239387 +392
==========================================
+ Hits 113197 113700 +503
+ Misses 117213 117092 -121
- Partials 8585 8595 +10 ☔ View full report in Codecov by Sentry. |
Hi @beingnoble03! You need to run That's why the static checks are failing |
go/vt/vtgate/evalengine/fn_time.go
Outdated
@@ -1200,6 +1205,54 @@ func (call *builtinMonthName) compile(c *compiler) (ctype, error) { | |||
return ctype{Type: sqltypes.VarChar, Col: col, Flag: arg.Flag | flagNullable}, nil | |||
} | |||
|
|||
func lastDay(dt datetime.DateTime) (datetime.Date, bool) { | |||
ts := dt.Date.ToStdTime(time.Local) | |||
firstDayOfNextMonth := time.Date(ts.Year(), ts.Month()+1, 1, 0, 0, 0, 0, time.Local) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
time.Local
here should be the current timezone from the environment. Looks like that is wrong in more places, we should fix those all up then.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@beingnoble03 If you want, I can also push up fixes for the other spots that use time.Local
, or you can do it, whatever you prefer really.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dbussink I think I can do that. I'll push the changes.
go/vt/vtgate/evalengine/fn_time.go
Outdated
func lastDay(dt datetime.DateTime) (datetime.Date, bool) { | ||
ts := dt.Date.ToStdTime(time.Local) | ||
firstDayOfNextMonth := time.Date(ts.Year(), ts.Month()+1, 1, 0, 0, 0, 0, time.Local) | ||
lastDayOfMonth := firstDayOfNextMonth.AddDate(0, 0, -1) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should do the addition with ts.AddDate(0, 1, -1)
as well and not do that in time.Date
(the ts.Month()+1
bit) to make it easier to follow and to avoid the question of "how does it work if the month is already December".
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
got it. done.
func FnLastDay(yield Query) { | ||
for _, d := range inputConversions { | ||
yield(fmt.Sprintf("LAST_DAY(%s)", d), nil) | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Next to these inputs, we should also test it against a few more inputs explicitly to test edge case behaviors here. Like last of December, January & February years (with / without leap years etc).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done.
Signed-off-by: Noble Mittal <[email protected]>
@systay thanks. done. |
go/vt/vtgate/evalengine/fn_time.go
Outdated
@@ -756,7 +756,7 @@ func (call *builtinHour) compile(c *compiler) (ctype, error) { | |||
return ctype{Type: sqltypes.Int64, Col: collationNumeric, Flag: arg.Flag | flagNullable}, nil | |||
} | |||
|
|||
func yearDayToTime(y, yd int64) time.Time { | |||
func yearDayToTime(env *ExpressionEnv, y, yd int64) time.Time { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it’s best to pass in the most specific type. So we should pass in the time zone itself here I think.
Same applies to lastday as well.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done.
Signed-off-by: Noble Mittal <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nice work!
go/vt/vtgate/evalengine/fn_time.go
Outdated
} | ||
|
||
d := lastDay(env.currentTimezone(), dt.dt) | ||
if d.IsZero() { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can this case happen? We already check above that it's not nil
or a zero date, so how could it be a zero date here? I think we can remove this check (and the equivalent one from the compiler)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hmm... true. This can not happen. Removed from here.
But I didn't add a check for zero datetime before calling lastDay in compiler_asm. And, there's no check in lastDay
func for checking that, so added a check before calling lastDay
and removed the check after that, as it was unnecessary.
Signed-off-by: Noble Mittal <[email protected]>
Description
This PR adds implementation of
LAST_DAY
func in evalengine.Related Issue(s)
Fixes part of #9647
Checklist
Deployment Notes