-
Notifications
You must be signed in to change notification settings - Fork 138
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* Add `YEARWEEK` Function To OpenSearch SQL * Added Tests Signed-off-by: GabeFernandez310 <Gabriel.Fernandez@improving.com> * Added Implementation Signed-off-by: GabeFernandez310 <Gabriel.Fernandez@improving.com> * Fixed Implementation Signed-off-by: GabeFernandez310 <Gabriel.Fernandez@improving.com> * Added Documentation Signed-off-by: GabeFernandez310 <Gabriel.Fernandez@improving.com> * Fixed Tests Signed-off-by: GabeFernandez310 <Gabriel.Fernandez@improving.com> * Addressed PR Comments Signed-off-by: GabeFernandez310 <Gabriel.Fernandez@improving.com> * Cleaned YearweekTest File Signed-off-by: GabeFernandez310 <Gabriel.Fernandez@improving.com> * Added Tests and Fixed Docs Signed-off-by: GabeFernandez310 <Gabriel.Fernandez@improving.com> * Added And Modified Unit Tests Signed-off-by: GabeFernandez310 <Gabriel.Fernandez@improving.com> * Fixed Jacoco In Core Signed-off-by: GabeFernandez310 <Gabriel.Fernandez@improving.com> * Reworked convertWeekModeFromMySqlToJava Function Signed-off-by: GabeFernandez310 <Gabriel.Fernandez@improving.com> * Refactored To Remove Extra Function Signed-off-by: GabeFernandez310 <Gabriel.Fernandez@improving.com> --------- Signed-off-by: GabeFernandez310 <Gabriel.Fernandez@improving.com> * Fixed Magic Number Signed-off-by: GabeFernandez310 <Gabriel.Fernandez@improving.com> --------- Signed-off-by: GabeFernandez310 <Gabriel.Fernandez@improving.com> (cherry picked from commit 03e4f97)
- Loading branch information
1 parent
7122a55
commit b0fdab9
Showing
9 changed files
with
287 additions
and
1 deletion.
There are no files selected for viewing
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
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
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
171 changes: 171 additions & 0 deletions
171
core/src/test/java/org/opensearch/sql/expression/datetime/YearweekTest.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,171 @@ | ||
/* | ||
* Copyright OpenSearch Contributors | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
|
||
package org.opensearch.sql.expression.datetime; | ||
|
||
import static java.time.temporal.ChronoField.ALIGNED_WEEK_OF_YEAR; | ||
import static org.junit.jupiter.api.Assertions.assertAll; | ||
import static org.junit.jupiter.api.Assertions.assertEquals; | ||
import static org.junit.jupiter.api.Assertions.assertThrows; | ||
import static org.opensearch.sql.data.model.ExprValueUtils.integerValue; | ||
import static org.opensearch.sql.data.type.ExprCoreType.INTEGER; | ||
|
||
import java.time.LocalDate; | ||
import java.util.stream.Stream; | ||
import org.junit.jupiter.api.Test; | ||
import org.junit.jupiter.params.ParameterizedTest; | ||
import org.junit.jupiter.params.provider.Arguments; | ||
import org.junit.jupiter.params.provider.MethodSource; | ||
import org.opensearch.sql.data.model.ExprDateValue; | ||
import org.opensearch.sql.data.model.ExprDatetimeValue; | ||
import org.opensearch.sql.data.model.ExprTimeValue; | ||
import org.opensearch.sql.data.model.ExprValue; | ||
import org.opensearch.sql.exception.SemanticCheckException; | ||
import org.opensearch.sql.expression.DSL; | ||
import org.opensearch.sql.expression.Expression; | ||
import org.opensearch.sql.expression.ExpressionTestBase; | ||
import org.opensearch.sql.expression.FunctionExpression; | ||
|
||
class YearweekTest extends ExpressionTestBase { | ||
|
||
private void yearweekQuery(String date, int mode, int expectedResult) { | ||
FunctionExpression expression = DSL | ||
.yearweek( | ||
functionProperties, | ||
DSL.literal(new ExprDateValue(date)), DSL.literal(mode)); | ||
assertAll( | ||
() -> assertEquals(INTEGER, expression.type()), | ||
() -> assertEquals( | ||
String.format("yearweek(DATE '%s', %d)", date, mode), expression.toString()), | ||
() -> assertEquals(integerValue(expectedResult), eval(expression)) | ||
); | ||
} | ||
|
||
private static Stream<Arguments> getTestDataForYearweek() { | ||
//Test the behavior of different modes passed into the 'yearweek' function | ||
return Stream.of( | ||
Arguments.of("2019-01-05", 0, 201852), | ||
Arguments.of("2019-01-05", 1, 201901), | ||
Arguments.of("2019-01-05", 2, 201852), | ||
Arguments.of("2019-01-05", 3, 201901), | ||
Arguments.of("2019-01-05", 4, 201901), | ||
Arguments.of("2019-01-05", 5, 201853), | ||
Arguments.of("2019-01-05", 6, 201901), | ||
Arguments.of("2019-01-05", 7, 201853), | ||
Arguments.of("2019-01-06", 0, 201901), | ||
Arguments.of("2019-01-06", 1, 201901), | ||
Arguments.of("2019-01-06", 2, 201901), | ||
Arguments.of("2019-01-06", 3, 201901), | ||
Arguments.of("2019-01-06", 4, 201902), | ||
Arguments.of("2019-01-06", 5, 201853), | ||
Arguments.of("2019-01-06", 6, 201902), | ||
Arguments.of("2019-01-06", 7, 201853), | ||
Arguments.of("2019-01-07", 0, 201901), | ||
Arguments.of("2019-01-07", 1, 201902), | ||
Arguments.of("2019-01-07", 2, 201901), | ||
Arguments.of("2019-01-07", 3, 201902), | ||
Arguments.of("2019-01-07", 4, 201902), | ||
Arguments.of("2019-01-07", 5, 201901), | ||
Arguments.of("2019-01-07", 6, 201902), | ||
Arguments.of("2019-01-07", 7, 201901), | ||
Arguments.of("2000-01-01", 0, 199952), | ||
Arguments.of("2000-01-01", 2, 199952), | ||
Arguments.of("1999-12-31", 0, 199952), | ||
Arguments.of("1999-01-01", 0, 199852), | ||
Arguments.of("1999-01-01", 1, 199852), | ||
Arguments.of("1999-01-01", 4, 199852), | ||
Arguments.of("1999-01-01", 5, 199852), | ||
Arguments.of("1999-01-01", 6, 199852) | ||
); | ||
} | ||
|
||
@ParameterizedTest(name = "{0} | {1}") | ||
@MethodSource("getTestDataForYearweek") | ||
public void testYearweak(String date, int mode, int expected) { | ||
yearweekQuery(date, mode, expected); | ||
} | ||
|
||
@Test | ||
public void testYearweekWithoutMode() { | ||
LocalDate date = LocalDate.of(2019,1,05); | ||
|
||
FunctionExpression expression = DSL | ||
.yearweek( | ||
functionProperties, | ||
DSL.literal(new ExprDateValue(date)), DSL.literal(0)); | ||
|
||
FunctionExpression expressionWithoutMode = DSL | ||
.yearweek( | ||
functionProperties, | ||
DSL.literal(new ExprDateValue(date))); | ||
|
||
assertEquals(eval(expression), eval(expressionWithoutMode)); | ||
} | ||
|
||
@Test | ||
public void testYearweekWithTimeType() { | ||
int week = LocalDate.now(functionProperties.getQueryStartClock()).get(ALIGNED_WEEK_OF_YEAR); | ||
int year = LocalDate.now(functionProperties.getQueryStartClock()).getYear(); | ||
int expected = Integer.parseInt(String.format("%d%02d", year, week)); | ||
|
||
FunctionExpression expression = DSL | ||
.yearweek( | ||
functionProperties, | ||
DSL.literal(new ExprTimeValue("10:11:12")), DSL.literal(0)); | ||
|
||
FunctionExpression expressionWithoutMode = DSL | ||
.yearweek( | ||
functionProperties, | ||
DSL.literal(new ExprTimeValue("10:11:12"))); | ||
|
||
assertAll( | ||
() -> assertEquals(expected, eval(expression).integerValue()), | ||
() -> assertEquals(expected, eval(expressionWithoutMode).integerValue()) | ||
); | ||
} | ||
|
||
@Test | ||
public void testInvalidYearWeek() { | ||
assertAll( | ||
//test invalid month | ||
() -> assertThrows( | ||
SemanticCheckException.class, | ||
() -> yearweekQuery("2019-13-05 01:02:03", 0, 0)), | ||
//test invalid day | ||
() -> assertThrows( | ||
SemanticCheckException.class, | ||
() -> yearweekQuery("2019-01-50 01:02:03", 0, 0)), | ||
//test invalid leap year | ||
() -> assertThrows( | ||
SemanticCheckException.class, | ||
() -> yearweekQuery("2019-02-29 01:02:03", 0, 0)) | ||
); | ||
} | ||
|
||
@Test | ||
public void yearweekModeInUnsupportedFormat() { | ||
FunctionExpression expression1 = DSL | ||
.yearweek( | ||
functionProperties, | ||
DSL.literal(new ExprDatetimeValue("2019-01-05 10:11:12")), DSL.literal(8)); | ||
SemanticCheckException exception = | ||
assertThrows(SemanticCheckException.class, () -> eval(expression1)); | ||
assertEquals("mode:8 is invalid, please use mode value between 0-7", | ||
exception.getMessage()); | ||
|
||
FunctionExpression expression2 = DSL | ||
.yearweek( | ||
functionProperties, | ||
DSL.literal(new ExprDatetimeValue("2019-01-05 10:11:12")), DSL.literal(-1)); | ||
exception = assertThrows(SemanticCheckException.class, () -> eval(expression2)); | ||
assertEquals("mode:-1 is invalid, please use mode value between 0-7", | ||
exception.getMessage()); | ||
} | ||
|
||
private ExprValue eval(Expression expression) { | ||
return expression.valueOf(); | ||
} | ||
} |
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -489,6 +489,7 @@ dateTimeFunctionName | |
| WEEK_OF_YEAR | ||
| WEEKOFYEAR | ||
| YEAR | ||
| YEARWEEK | ||
; | ||
|
||
textFunctionName | ||
|
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