add timezoneId in ColumnarUnixTimestamp (#1035)

oap-project · Jul 20, 2022 · e7f239a · e7f239a
1 parent 697e0de
commit e7f239a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...ve-sql-engine/core/src/main/scala/com/intel/oap/expression/ColumnarBinaryExpression.scala b/...ve-sql-engine/core/src/main/scala/com/intel/oap/expression/ColumnarBinaryExpression.scala
@@ -121,7 +121,7 @@ object ColumnarBinaryExpression {
       case s: DateDiff =>
         new ColumnarDateDiff(left, right)
       case a: UnixTimestamp =>
-        new ColumnarUnixTimestamp(left, right)
+        new ColumnarUnixTimestamp(left, right, a.timeZoneId, a.failOnError)
       // To match GetTimestamp (a private class).
       case _ if (original.isInstanceOf[ToTimestamp] && original.dataType == TimestampType) =>
         // Convert a string to Timestamp. Default timezone is used.

diff --git a/...sql-engine/core/src/main/scala/com/intel/oap/expression/ColumnarDateTimeExpressions.scala b/...sql-engine/core/src/main/scala/com/intel/oap/expression/ColumnarDateTimeExpressions.scala
@@ -445,8 +445,12 @@ object ColumnarDateTimeExpressions {
     * The input is the date/time for local timezone (can be configured in spark) and the result is
     * the timestamp for UTC. So we need consider timezone difference.
     * */
-  class ColumnarUnixTimestamp(left: Expression, right: Expression)
-      extends UnixTimestamp(left, right) with
+  class ColumnarUnixTimestamp(
+      left: Expression,
+      right: Expression,
+      timeZoneId: Option[String] = None,
+      failOnError: Boolean = SQLConf.get.ansiEnabled)
+      extends UnixTimestamp(left, right, timeZoneId, failOnError) with
       ColumnarExpression {
 
     val yearMonthDayFormat = "yyyy-MM-dd"