Add Support For TIME Type in "*_OF_YEAR" Functions
#199
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com>
Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com>
Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com>
Codecov Report
@@ Coverage Diff @@
## integ-add-support-for-time-type #199 +/- ##
==================================================================
Coverage ? 95.84%
Complexity ? 3563
==================================================================
Files ? 354
Lines ? 9438
Branches ? 674
==================================================================
Hits ? 9046
Misses ? 334
Partials ? 58
Flags with carried forward coverage won't be shown. Click here to find out more. 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com>
Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com>
Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com>
Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com>
Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com>
acarbonetto
approved these changes
Dec 29, 2022
core/src/main/java/org/opensearch/sql/expression/datetime/DateTimeFunction.java
Outdated
Show resolved
Hide resolved
core/src/main/java/org/opensearch/sql/expression/datetime/DateTimeFunction.java
Outdated
Show resolved
Hide resolved
core/src/test/java/org/opensearch/sql/expression/datetime/DateTimeFunctionTest.java
Outdated
Show resolved
Hide resolved
core/src/test/java/org/opensearch/sql/expression/datetime/DateTimeFunctionTest.java
Outdated
Show resolved
Hide resolved
core/src/test/java/org/opensearch/sql/expression/datetime/DateTimeFunctionTest.java
Outdated
Show resolved
Hide resolved
Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com>
Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com>
Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com>
Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com>
Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com>
GumpacG
approved these changes
Jan 3, 2023
Comment on lines
374
to
375
| implWithProperties((functionProperties, arg) -> DateTimeFunction.dayOfYearToday( | ||
| functionProperties.getQueryStartClock()), INTEGER, TIME), |
There was a problem hiding this comment.
Suggested change
| implWithProperties((functionProperties, arg) -> DateTimeFunction.dayOfYearToday( | |
| functionProperties.getQueryStartClock()), INTEGER, TIME), | |
| implWithProperties(nullMissingHandlingWithProperties((functionProperties, arg) -> DateTimeFunction.dayOfYearToday( | |
| functionProperties.getQueryStartClock())), INTEGER, TIME), |
Yury-Fridlyand
requested changes
Jan 3, 2023
Comment on lines
449
to
450
| implWithProperties((functionProperties, arg) -> DateTimeFunction.monthOfYearToday( | ||
| functionProperties.getQueryStartClock()), INTEGER, TIME), |
There was a problem hiding this comment.
Suggested change
| implWithProperties((functionProperties, arg) -> DateTimeFunction.monthOfYearToday( | |
| functionProperties.getQueryStartClock()), INTEGER, TIME), | |
| implWithProperties(nullMissingHandlingWithProperties((functionProperties, arg) -> DateTimeFunction.monthOfYearToday( | |
| functionProperties.getQueryStartClock())), INTEGER, TIME), |
Comment on lines
612
to
614
| implWithProperties((functionProperties, arg) -> DateTimeFunction.weekOfYearToday( | ||
| DEFAULT_WEEK_OF_YEAR_MODE, | ||
| functionProperties.getQueryStartClock()), INTEGER, TIME), |
There was a problem hiding this comment.
Suggested change
| implWithProperties((functionProperties, arg) -> DateTimeFunction.weekOfYearToday( | |
| DEFAULT_WEEK_OF_YEAR_MODE, | |
| functionProperties.getQueryStartClock()), INTEGER, TIME), | |
| implWithProperties(nullMissingHandlingWithProperties((functionProperties, arg) -> DateTimeFunction.weekOfYearToday( | |
| DEFAULT_WEEK_OF_YEAR_MODE, | |
| functionProperties.getQueryStartClock())), INTEGER, TIME), |
Comment on lines
619
to
621
| implWithProperties((functionProperties, time, modeArg) -> DateTimeFunction.weekOfYearToday( | ||
| modeArg, | ||
| functionProperties.getQueryStartClock()), INTEGER, TIME, INTEGER), |
There was a problem hiding this comment.
Suggested change
| implWithProperties((functionProperties, time, modeArg) -> DateTimeFunction.weekOfYearToday( | |
| modeArg, | |
| functionProperties.getQueryStartClock()), INTEGER, TIME, INTEGER), | |
| implWithProperties(nullMissingHandlingWithProperties((functionProperties, time, modeArg) -> DateTimeFunction.weekOfYearToday( | |
| modeArg, | |
| functionProperties.getQueryStartClock())), INTEGER, TIME, INTEGER), |
| @@ -646,6 +659,15 @@ private DefaultFunctionResolver date_format() { | |||
| ); | |||
| } | |||
|
|
|||
| private ExprValue dayOfYearToday(Clock clock) { | |||
| return new ExprIntegerValue((formatNow(clock).getDayOfYear())); | |||
There was a problem hiding this comment.
You can avoid extra actions made in formatNow
Suggested change
| return new ExprIntegerValue((formatNow(clock).getDayOfYear())); | |
| return new ExprIntegerValue(LocalDateTime.now(clock).getDayOfYear()); |
|
|
||
| private ExprValue weekOfYearToday(ExprValue mode, Clock clock) { | ||
| return new ExprIntegerValue( | ||
| CalendarLookup.getWeekNumber(mode.integerValue(), formatNow(clock).toLocalDate())); |
There was a problem hiding this comment.
Suggested change
| CalendarLookup.getWeekNumber(mode.integerValue(), formatNow(clock).toLocalDate())); | |
| CalendarLookup.getWeekNumber(mode.integerValue(), LocalDateTime.now(clock).toLocalDate())); |
| @@ -1241,6 +1263,10 @@ private ExprValue exprYear(ExprValue date) { | |||
| return new ExprIntegerValue(date.dateValue().getYear()); | |||
| } | |||
|
|
|||
| private ExprValue monthOfYearToday(Clock clock) { | |||
| return new ExprIntegerValue((formatNow(clock).getMonthValue())); | |||
There was a problem hiding this comment.
Suggested change
| return new ExprIntegerValue((formatNow(clock).getMonthValue())); | |
| return new ExprIntegerValue(LocalDateTime.now(clock).getMonthValue()); |
core/src/main/java/org/opensearch/sql/expression/function/FunctionDSL.java
Show resolved
Hide resolved
| assertEquals(INTEGER, expression.type()); | ||
| assertEquals("week(\"2019-01-05\")", expression.toString()); | ||
| assertEquals(integerValue(0), eval(expression)); | ||
|
|
||
| expression = DSL.week(DSL.literal("2019-01-05 00:01:00")); | ||
| expression = DSL.week(functionProperties, DSL.literal("2019-01-05 00:01:00")); |
There was a problem hiding this comment.
Is it possible to split tests or use assertAll?
| testWeek("2000-01-01", 0, 0); | ||
| testWeek("2000-01-01", 2, 52); | ||
| testWeek("1999-12-31", 0, 52); | ||
| weekQuery("2019-01-05", 0, 0); |
There was a problem hiding this comment.
Is it possible to use parametrized test?
| testWeekOfYear("2000-01-01", 0, 0); | ||
| testWeekOfYear("2000-01-01", 2, 52); | ||
| testWeekOfYear("1999-12-31", 0, 52); | ||
| weekOfYearQuery("2019-01-05", 0, 0); |
There was a problem hiding this comment.
The same as above - is it possible to split test cases and use parameterized test?
Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com>
Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com>
Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com>
Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com>
Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com>
Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com>
Yury-Fridlyand
approved these changes
Jan 5, 2023
Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com>
GabeFernandez310
added a commit
that referenced
this pull request
Jan 9, 2023
…ch-project#1223) Added Support And Tests For Time Type in day_of_year, week_of_year, month_of_year Functions Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com>
matthewryanwells
pushed a commit
that referenced
this pull request
Feb 1, 2023
…ch-project#1223) (opensearch-project#1258) Added Support And Tests For Time Type in day_of_year, week_of_year, month_of_year Functions Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com> (cherry picked from commit 6e72f18) Co-authored-by: GabeFernandez310 <Gabriel.Fernandez@improving.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Adds support for the
TIMEtype in the functionsday_of_year,week_of_year, andmonth_of_year. Uses the current local date to calculate the output of the function.Examples (Assuming the current date is
2022-12-28):Issues Resolved
[#722](https://github.com/opensearch-project/sql/issues/722)Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.