You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ro...@apache.org on 2019/12/07 18:37:26 UTC

[flink] 02/02: [FLINK-11120][table] Fix timestampadd on non-zero, negative interaval that cross over day boundary, refine documentation.

This is an automated email from the ASF dual-hosted git repository.

rongr pushed a commit to branch release-1.9
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 86d518395b8e2236047181ad940a77a6c4d57ecb
Author: Rong Rong <ro...@apache.org>
AuthorDate: Fri Dec 6 15:39:23 2019 -0800

    [FLINK-11120][table] Fix timestampadd on non-zero, negative interaval that cross over day boundary, refine documentation.
    
    This closes #8746.
    
    (cherry picked from commit 9320f344f37019b9b389ef06477c8049e9fa3218)
---
 .../flink/table/planner/codegen/calls/ScalarOperatorGens.scala      | 3 ++-
 .../flink/table/planner/expressions/ScalarFunctionsTest.scala       | 6 ++++--
 .../org/apache/flink/table/codegen/calls/ScalarOperators.scala      | 6 ++----
 .../org/apache/flink/table/expressions/ScalarFunctionsTest.scala    | 6 ++++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/planner/codegen/calls/ScalarOperatorGens.scala b/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/planner/codegen/calls/ScalarOperatorGens.scala
index 48027c2..f6164da 100644
--- a/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/planner/codegen/calls/ScalarOperatorGens.scala
+++ b/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/planner/codegen/calls/ScalarOperatorGens.scala
@@ -186,7 +186,8 @@ object ScalarOperatorGens {
 
       case (TIME_WITHOUT_TIME_ZONE, INTERVAL_DAY_TIME) =>
         generateOperatorIfNotNull(ctx, new TimeType(), left, right) {
-          (l, r) => s"java.lang.Math.toIntExact(($l $op $r) % ${MILLIS_PER_DAY}L)"
+          (l, r) => s"java.lang.Math.toIntExact((($l + ${MILLIS_PER_DAY}L) $op (" +
+            s"java.lang.Math.toIntExact($r % ${MILLIS_PER_DAY}L))) % ${MILLIS_PER_DAY}L)"
         }
 
       case (TIME_WITHOUT_TIME_ZONE, INTERVAL_YEAR_MONTH) =>
diff --git a/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/planner/expressions/ScalarFunctionsTest.scala b/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/planner/expressions/ScalarFunctionsTest.scala
index d6ce515..577d298 100644
--- a/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/planner/expressions/ScalarFunctionsTest.scala
+++ b/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/planner/expressions/ScalarFunctionsTest.scala
@@ -3573,7 +3573,7 @@ class ScalarFunctionsTest extends ScalarTypesTestBase {
       "timestampadd(WEEK, -1, date '2016-03-31')",
       "2016-03-24")
 
-    // TIMESTAMPADD with time; returns a time value.The interval is positive.
+    // test TIMESTAMPADD with positive time interval in various granularity.
     testSqlApi("TIMESTAMPADD(SECOND, 1, time '23:59:59')", "00:00:00")
     testSqlApi("TIMESTAMPADD(MINUTE, 1, time '00:00:00')", "00:01:00")
     testSqlApi("TIMESTAMPADD(MINUTE, 1, time '23:59:59')", "00:00:59")
@@ -3583,9 +3583,11 @@ class ScalarFunctionsTest extends ScalarTypesTestBase {
     testSqlApi("TIMESTAMPADD(MONTH, 6, time '23:59:59')", "23:59:59")
     testSqlApi("TIMESTAMPADD(QUARTER, 1, time '23:59:59')", "23:59:59")
     testSqlApi("TIMESTAMPADD(YEAR, 10, time '23:59:59')", "23:59:59")
-    // TIMESTAMPADD with time; returns a time value .The interval is negative.
+
+    // test TIMESTAMPADD with negative time interval in various granularity.
     testSqlApi("TIMESTAMPADD(SECOND, -1, time '00:00:00')", "23:59:59")
     testSqlApi("TIMESTAMPADD(MINUTE, -1, time '00:00:00')", "23:59:00")
+    testSqlApi("TIMESTAMPADD(MINUTE, -1, time '00:00:59')", "23:59:59")
     testSqlApi("TIMESTAMPADD(HOUR, -1, time '00:00:00')", "23:00:00")
     testSqlApi("TIMESTAMPADD(DAY, -1, time '23:59:59')", "23:59:59")
     testSqlApi("TIMESTAMPADD(WEEK, -1, time '23:59:59')", "23:59:59")
diff --git a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/ScalarOperators.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/ScalarOperators.scala
index 65a798e..7ef9574 100644
--- a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/ScalarOperators.scala
+++ b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/ScalarOperators.scala
@@ -895,10 +895,8 @@ object ScalarOperators {
 
       case (SqlTimeTypeInfo.TIME, TimeIntervalTypeInfo.INTERVAL_MILLIS) =>
         generateOperatorIfNotNull(nullCheck, SqlTimeTypeInfo.TIME, left, right) {
-          (l, r) =>
-            s"java.lang.Math.toIntExact(((($l % ${MILLIS_PER_DAY}L == 0) ? " +
-              s"${MILLIS_PER_DAY}L : $l) $op java.lang.Math.toIntExact($r " +
-              s"% ${MILLIS_PER_DAY}L)) % ${MILLIS_PER_DAY}L)"
+          (l, r) => s"java.lang.Math.toIntExact((($l + ${MILLIS_PER_DAY}L) $op (" +
+            s"java.lang.Math.toIntExact($r % ${MILLIS_PER_DAY}L))) % ${MILLIS_PER_DAY}L)"
         }
 
       case (SqlTimeTypeInfo.TIME, TimeIntervalTypeInfo.INTERVAL_MONTHS) =>
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/ScalarFunctionsTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/ScalarFunctionsTest.scala
index c15d318..cec4e7b 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/ScalarFunctionsTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/ScalarFunctionsTest.scala
@@ -2858,7 +2858,7 @@ class ScalarFunctionsTest extends ScalarTypesTestBase {
       "timestampadd(WEEK, -1, date '2016-03-31')",
       "2016-03-24")
 
-    // TIMESTAMPADD with time; returns a time value.The interval is positive.
+    // test TIMESTAMPADD with positive time interval in various granularity.
     testSqlApi("TIMESTAMPADD(SECOND, 1, time '23:59:59')", "00:00:00")
     testSqlApi("TIMESTAMPADD(MINUTE, 1, time '00:00:00')", "00:01:00")
     testSqlApi("TIMESTAMPADD(MINUTE, 1, time '23:59:59')", "00:00:59")
@@ -2868,9 +2868,11 @@ class ScalarFunctionsTest extends ScalarTypesTestBase {
     testSqlApi("TIMESTAMPADD(MONTH, 6, time '23:59:59')", "23:59:59")
     testSqlApi("TIMESTAMPADD(QUARTER, 1, time '23:59:59')", "23:59:59")
     testSqlApi("TIMESTAMPADD(YEAR, 10, time '23:59:59')", "23:59:59")
-    // TIMESTAMPADD with time; returns a time value .The interval is negative.
+
+    // test TIMESTAMPADD with negative time interval in various granularity.
     testSqlApi("TIMESTAMPADD(SECOND, -1, time '00:00:00')", "23:59:59")
     testSqlApi("TIMESTAMPADD(MINUTE, -1, time '00:00:00')", "23:59:00")
+    testSqlApi("TIMESTAMPADD(MINUTE, -1, time '00:00:59')", "23:59:59")
     testSqlApi("TIMESTAMPADD(HOUR, -1, time '00:00:00')", "23:00:00")
     testSqlApi("TIMESTAMPADD(DAY, -1, time '23:59:59')", "23:59:59")
     testSqlApi("TIMESTAMPADD(WEEK, -1, time '23:59:59')", "23:59:59")