You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@flink.apache.org by GitBox <gi...@apache.org> on 2018/11/27 06:11:22 UTC
[GitHub] asfgit closed pull request #7155: [FLINK-10009] [table] Fix the
casting problem for function TIMESTAMPADD in Table
asfgit closed pull request #7155: [FLINK-10009] [table] Fix the casting problem for function TIMESTAMPADD in Table
URL: https://github.com/apache/flink/pull/7155
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/ScalarOperators.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/ScalarOperators.scala
index 282b167e914..5a185da4922 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/ScalarOperators.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/ScalarOperators.scala
@@ -839,8 +839,15 @@ object ScalarOperators {
generateArithmeticOperator(op, nullCheck, l, left, right, config)
case (SqlTimeTypeInfo.DATE, TimeIntervalTypeInfo.INTERVAL_MILLIS) =>
- generateOperatorIfNotNull(nullCheck, SqlTimeTypeInfo.DATE, left, right) {
- (l, r) => s"$l $op ((int) ($r / ${MILLIS_PER_DAY}L))"
+ resultType match {
+ case SqlTimeTypeInfo.DATE =>
+ generateOperatorIfNotNull(nullCheck, SqlTimeTypeInfo.DATE, left, right) {
+ (l, r) => s"$l $op ((int) ($r / ${MILLIS_PER_DAY}L))"
+ }
+ case SqlTimeTypeInfo.TIMESTAMP =>
+ generateOperatorIfNotNull(nullCheck, SqlTimeTypeInfo.TIMESTAMP, left, right) {
+ (l, r) => s"$l * ${MILLIS_PER_DAY}L $op $r"
+ }
}
case (SqlTimeTypeInfo.DATE, TimeIntervalTypeInfo.INTERVAL_MONTHS) =>
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarFunctionsTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarFunctionsTest.scala
index 60cdda1f4e4..31c9b6c3d01 100644
--- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarFunctionsTest.scala
+++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarFunctionsTest.scala
@@ -2702,17 +2702,68 @@ class ScalarFunctionsTest extends ScalarTypesTestBase {
"TIMESTAMPADD(HOUR, -200, CAST(NULL AS TIMESTAMP))",
"null")
- testAllApis(
- "2016-06-15".toDate + 1.day,
- "'2016-06-15'.toDate + 1.day",
- "TIMESTAMPADD(DAY, 1, DATE '2016-06-15')",
- "2016-06-16")
-
testAllApis(
Null(Types.SQL_TIMESTAMP) + 3.months,
"Null(SQL_TIMESTAMP) + 3.months",
"TIMESTAMPADD(MONTH, 3, CAST(NULL AS TIMESTAMP))",
"null")
+
+ // TIMESTAMPADD with DATE returns a TIMESTAMP value for sub-day intervals.
+ testAllApis("2016-06-15".toDate + 1.month,
+ "'2016-06-15'.toDate + 1.month",
+ "timestampadd(MONTH, 1, date '2016-06-15')",
+ "2016-07-15")
+
+ testAllApis("2016-06-15".toDate + 1.day,
+ "'2016-06-15'.toDate + 1.day",
+ "timestampadd(DAY, 1, date '2016-06-15')",
+ "2016-06-16")
+
+ testAllApis("2016-06-15".toTimestamp - 1.hour,
+ "'2016-06-15'.toTimestamp - 1.hour",
+ "timestampadd(HOUR, -1, date '2016-06-15')",
+ "2016-06-14 23:00:00.0")
+
+ testAllApis("2016-06-15".toTimestamp + 1.minute,
+ "'2016-06-15'.toTimestamp + 1.minute",
+ "timestampadd(MINUTE, 1, date '2016-06-15')",
+ "2016-06-15 00:01:00.0")
+
+ testAllApis("2016-06-15".toTimestamp - 1.second,
+ "'2016-06-15'.toTimestamp - 1.second",
+ "timestampadd(SQL_TSI_SECOND, -1, date '2016-06-15')",
+ "2016-06-14 23:59:59.0")
+
+ testAllApis("2016-06-15".toTimestamp + 1.second,
+ "'2016-06-15'.toTimestamp + 1.second",
+ "timestampadd(SECOND, 1, date '2016-06-15')",
+ "2016-06-15 00:00:01.0")
+
+ testAllApis(Null(Types.SQL_TIMESTAMP) + 1.second,
+ "Null(SQL_TIMESTAMP) + 1.second",
+ "timestampadd(SECOND, 1, cast(null as date))",
+ "null")
+
+ testAllApis(Null(Types.SQL_TIMESTAMP) + 1.day,
+ "Null(SQL_TIMESTAMP) + 1.day",
+ "timestampadd(DAY, 1, cast(null as date))",
+ "null")
+
+ // Round to the last day of previous month
+ testAllApis("2016-05-31".toDate + 1.month,
+ "'2016-05-31'.toDate + 1.month",
+ "timestampadd(MONTH, 1, date '2016-05-31')",
+ "2016-06-30")
+
+ testAllApis("2016-01-31".toDate + 5.month,
+ "'2016-01-31'.toDate + 5.month",
+ "timestampadd(MONTH, 5, date '2016-01-31')",
+ "2016-06-30")
+
+ testAllApis("2016-03-31".toDate - 1.month,
+ "'2016-03-31'.toDate - 1.month",
+ "timestampadd(MONTH, -1, date '2016-03-31')",
+ "2016-02-29")
}
// ----------------------------------------------------------------------------------------------
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services