Update DATE_ADD/ADDDATE and DATE_SUB/SUBDATE functions. (#122)
#1182
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -48,10 +48,14 @@ | |
| import java.time.format.DateTimeFormatter; | ||
| import java.time.format.DateTimeParseException; | ||
| import java.time.format.TextStyle; | ||
| import java.time.temporal.TemporalAmount; | ||
| import java.util.Arrays; | ||
| import java.util.Locale; | ||
| import java.util.TimeZone; | ||
| import java.util.concurrent.TimeUnit; | ||
| import java.util.stream.Stream; | ||
| import lombok.experimental.UtilityClass; | ||
| import org.apache.commons.lang3.tuple.Pair; | ||
| import org.opensearch.sql.data.model.ExprDateValue; | ||
| import org.opensearch.sql.data.model.ExprDatetimeValue; | ||
| import org.opensearch.sql.data.model.ExprDoubleValue; | ||
|
|
@@ -67,10 +71,14 @@ | |
| import org.opensearch.sql.expression.function.BuiltinFunctionName; | ||
| import org.opensearch.sql.expression.function.BuiltinFunctionRepository; | ||
| import org.opensearch.sql.expression.function.DefaultFunctionResolver; | ||
| import org.opensearch.sql.expression.function.FunctionBuilder; | ||
| import org.opensearch.sql.expression.function.FunctionDSL; | ||
| import org.opensearch.sql.expression.function.FunctionName; | ||
| import org.opensearch.sql.expression.function.FunctionProperties; | ||
| import org.opensearch.sql.expression.function.FunctionResolver; | ||
| import org.opensearch.sql.expression.function.FunctionSignature; | ||
| import org.opensearch.sql.expression.function.SerializableFunction; | ||
| import org.opensearch.sql.expression.function.SerializableTriFunction; | ||
| import org.opensearch.sql.utils.DateTimeUtils; | ||
|
|
||
| /** | ||
|
|
@@ -229,30 +237,51 @@ private FunctionResolver current_date() { | |
| } | ||
|
|
||
| /** | ||
| * A common signature for `date_add` and `date_sub`. | ||
| * Specify a start date and add/subtract a temporal amount to/from the date. | ||
| * The return type depends on the date type and the interval unit. Detailed supported signatures: | ||
| * (DATE/DATETIME/TIMESTAMP/TIME, INTERVAL) -> DATETIME | ||
| * MySQL has these signatures too | ||
| * (DATE, INTERVAL) -> DATE // when interval has no time part | ||
| * (TIME, INTERVAL) -> TIME // when interval has no date part | ||
| * (STRING, INTERVAL) -> STRING // when argument has date or datetime string, | ||
| * // result has date or datetime depending on interval type | ||
| */ | ||
| private Stream<SerializableFunction<?, ?>> get_date_add_date_sub_signatures( | ||
| SerializableTriFunction<FunctionProperties, ExprValue, ExprValue, ExprValue> function) { | ||
| return Stream.of( | ||
| implWithProperties(nullMissingHandlingWithProperties(function), DATETIME, DATE, INTERVAL), | ||
| implWithProperties(nullMissingHandlingWithProperties(function), | ||
| DATETIME, DATETIME, INTERVAL), | ||
| implWithProperties(nullMissingHandlingWithProperties(function), | ||
| DATETIME, TIMESTAMP, INTERVAL), | ||
| implWithProperties(nullMissingHandlingWithProperties(function), DATETIME, TIME, INTERVAL) | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * A common signature for `adddate` and `subdate`. | ||
| * Adds/subtracts an integer number of days to/from the first argument. | ||
| * (DATE, LONG) -> DATE | ||
| * (TIME/DATETIME/TIMESTAMP, LONG) -> DATETIME | ||
| */ | ||
| private Stream<SerializableFunction<?, ?>> get_adddate_subdate_signatures( | ||
|
There was a problem hiding this comment. seems cratedb normalized to arthemetic operation, https://github.com/crate/crate/blob/5.0/server/src/main/java/io/crate/expression/scalar/arithmetic/ArithmeticFunctions.java |
||
| SerializableTriFunction<FunctionProperties, ExprValue, ExprValue, ExprValue> function) { | ||
| return Stream.of( | ||
| implWithProperties(nullMissingHandlingWithProperties(function), DATE, DATE, LONG), | ||
| implWithProperties(nullMissingHandlingWithProperties(function), DATETIME, DATETIME, LONG), | ||
| implWithProperties(nullMissingHandlingWithProperties(function), DATETIME, TIMESTAMP, LONG), | ||
| implWithProperties(nullMissingHandlingWithProperties(function), DATETIME, TIME, LONG) | ||
| ); | ||
| } | ||
|
|
||
| private DefaultFunctionResolver adddate() { | ||
| return define(BuiltinFunctionName.ADDDATE.getName(), | ||
| (SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>>[]) | ||
| (Stream.concat( | ||
| get_date_add_date_sub_signatures(DateTimeFunction::exprAddDateInterval), | ||
| get_adddate_subdate_signatures(DateTimeFunction::exprAddDateDays)) | ||
| .toArray(SerializableFunction<?, ?>[]::new))); | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -385,34 +414,17 @@ private FunctionResolver datetime() { | |
| } | ||
|
|
||
| private DefaultFunctionResolver date_add() { | ||
| return define(BuiltinFunctionName.DATE_ADD.getName(), | ||
| (SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>>[]) | ||
| get_date_add_date_sub_signatures(DateTimeFunction::exprAddDateInterval) | ||
| .toArray(SerializableFunction<?, ?>[]::new)); | ||
| } | ||
|
|
||
| private DefaultFunctionResolver date_sub() { | ||
| return define(BuiltinFunctionName.DATE_SUB.getName(), | ||
| (SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>>[]) | ||
| get_date_add_date_sub_signatures(DateTimeFunction::exprSubDateInterval) | ||
| .toArray(SerializableFunction<?, ?>[]::new)); | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -637,7 +649,12 @@ private DefaultFunctionResolver second(BuiltinFunctionName name) { | |
| } | ||
|
|
||
| private DefaultFunctionResolver subdate() { | ||
| return define(BuiltinFunctionName.SUBDATE.getName(), | ||
| (SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>>[]) | ||
| (Stream.concat( | ||
| get_date_add_date_sub_signatures(DateTimeFunction::exprSubDateInterval), | ||
| get_adddate_subdate_signatures(DateTimeFunction::exprSubDateDays)) | ||
| .toArray(SerializableFunction<?, ?>[]::new))); | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -872,29 +889,65 @@ private ExprValue dayOfWeekToday(Clock clock) { | |
| } | ||
|
|
||
| /** | ||
| * DATE_ADD function implementation for ExprValue. | ||
| * | ||
| * @param functionProperties An FunctionProperties object. | ||
| * @param datetime ExprValue of Date/Time/Datetime/Timestamp type. | ||
| * @param interval ExprValue of Interval type, the temporal amount to add. | ||
| * @return Datetime resulted from `interval` added to `datetime`. | ||
| */ | ||
| private ExprValue exprAddDateInterval(FunctionProperties functionProperties, | ||
| ExprValue datetime, ExprValue interval) { | ||
| return exprDateApplyInterval(functionProperties, datetime, interval.intervalValue(), true); | ||
| } | ||
|
|
||
| /** | ||
| * Adds or subtracts `interval` to/from `datetime`. | ||
| * | ||
| * @param functionProperties An FunctionProperties object. | ||
| * @param datetime A Date/Time/Datetime/Timestamp value to change. | ||
| * @param interval An Interval to isAdd or subtract. | ||
| * @param isAdd A flag: true to isAdd, false to subtract. | ||
| * @return Datetime calculated. | ||
| */ | ||
| private ExprValue exprDateApplyInterval(FunctionProperties functionProperties, | ||
| ExprValue datetime, | ||
| TemporalAmount interval, | ||
| Boolean isAdd) { | ||
| var dt = extractDateTime(datetime, functionProperties); | ||
| return new ExprDatetimeValue(isAdd ? dt.plus(interval) : dt.minus(interval)); | ||
| } | ||
|
|
||
| /** | ||
| * ADDDATE function implementation for ExprValue. | ||
| * | ||
| * @param functionProperties An FunctionProperties object. | ||
| * @param datetime ExprValue of Time/Date/Datetime/Timestamp type. | ||
| * @param days ExprValue of Long type, representing the number of days to add. | ||
| * @return Date/Datetime resulted from days added to `datetime`. | ||
| */ | ||
| private ExprValue exprAddDateDays(FunctionProperties functionProperties, | ||
| ExprValue datetime, ExprValue days) { | ||
| return exprDateApplyDays(functionProperties, datetime, days.longValue(), true); | ||
| } | ||
|
|
||
| /** | ||
| * Adds or subtracts `days` to/from `datetime`. | ||
| * | ||
| * @param functionProperties An FunctionProperties object. | ||
| * @param datetime A Date/Time/Datetime/Timestamp value to change. | ||
| * @param days A days amount to add or subtract. | ||
| * @param isAdd A flag: true to add, false to subtract. | ||
| * @return Datetime calculated. | ||
| */ | ||
| private ExprValue exprDateApplyDays(FunctionProperties functionProperties, | ||
| ExprValue datetime, Long days, Boolean isAdd) { | ||
| if (datetime.type() == DATE) { | ||
| return new ExprDateValue(isAdd ? datetime.dateValue().plusDays(days) | ||
| : datetime.dateValue().minusDays(days)); | ||
| } | ||
| var dt = extractDateTime(datetime, functionProperties); | ||
| return new ExprDatetimeValue(isAdd ? dt.plusDays(days) : dt.minusDays(days)); | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -1320,27 +1373,27 @@ private ExprValue exprSecond(ExprValue time) { | |
| /** | ||
| * SUBDATE function implementation for ExprValue. | ||
| * | ||
| * @param functionProperties An FunctionProperties object. | ||
| * @param date ExprValue of Time/Date/Datetime/Timestamp type. | ||
| * @param days ExprValue of Long type, representing the number of days to subtract. | ||
| * @return Date/Datetime resulted from days subtracted to date. | ||
| */ | ||
| private ExprValue exprSubDateDays(FunctionProperties functionProperties, | ||
| ExprValue date, ExprValue days) { | ||
| return exprDateApplyDays(functionProperties, date, days.longValue(), false); | ||
| } | ||
|
|
||
| /** | ||
| * DATE_SUB function implementation for ExprValue. | ||
| * | ||
| * @param functionProperties An FunctionProperties object. | ||
| * @param datetime ExprValue of Time/Date/Datetime/Timestamp type. | ||
| * @param expr ExprValue of Interval type, the temporal amount to subtract. | ||
| * @return Datetime resulted from expr subtracted to `datetime`. | ||
| */ | ||
| private ExprValue exprSubDateInterval(FunctionProperties functionProperties, | ||
| ExprValue datetime, ExprValue expr) { | ||
| return exprDateApplyInterval(functionProperties, datetime, expr.intervalValue(), false); | ||
| } | ||
|
|
||
| /** | ||
|
|
||
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
Oops, something went wrong.
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.
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.
Does Datetime required? I found you post same concern in #1176.
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.
Unfortunately, yes, unless we have 4 types for date/time.