codegen epochDaysToMicros => daysToMicros

Author: TJX2014

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/collectionOperations.scala

@@ -2623,8 +2623,6 @@ object Sequence {
         // about a month length in days and a day length in microseconds
         val intervalStepInMicros =
           stepMicros + stepMonths * microsPerMonth + stepDays * microsPerDay
-        val startMicros: Long = num.toLong(start) * scale
-        val stopMicros: Long = num.toLong(stop) * scale
 
         // Date to timestamp is not equal from GMT and Chicago timezones
         val (startMicros, stopMicros) = if (scale == 1) {
@@ -2699,8 +2697,19 @@ object Sequence {
          |} else if ($stepMonths == 0 && $stepDays == 0 && ${scale}L == 1) {
          |  ${backedSequenceImpl.genCode(ctx, start, stop, stepMicros, arr, elemType)};
          |} else {
-         |  final long $startMicros = $start * ${scale}L;
-         |  final long $stopMicros = $stop * ${scale}L;
+         |  long $startMicros;
+         |  long $stopMicros;
+         |  if (${scale}L == 1L) {
+         |    $startMicros = $start;
+         |    $stopMicros = $stop;
+         |  } else {
+         |    $startMicros =
+         |      org.apache.spark.sql.catalyst.util.DateTimeUtils.daysToMicros(
+         |        (int)$start, $zid);
+         |    $stopMicros =
+         |      org.apache.spark.sql.catalyst.util.DateTimeUtils.daysToMicros(
+         |        (int)$stop, $zid);
+         |  }
          |
          |  $sequenceLengthCode
          |

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/CollectionExpressionsSuite.scala

@@ -1837,7 +1837,6 @@ class CollectionExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper
     checkEvaluation(ArrayIntersect(oneNull, empty), Seq.empty)
   }
 
-<<<<<<< HEAD
   test("SPARK-31980: Start and end equal in month range") {
     checkEvaluation(new Sequence(
       Literal(Date.valueOf("2018-01-01")),
@@ -1854,17 +1853,17 @@ class CollectionExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper
       Literal(Date.valueOf("2018-01-01")),
       Literal(stringToInterval("interval 1 year"))),
       Seq(Date.valueOf("2018-01-01")))
+  }
 
   test("SPARK-31982: sequence doesn't handle date increments that cross DST") {
-    Array("America/Chicago", "GMT", "Asia/Shanghai").foreach(tz => {
-      DateTimeTestUtils.withDefaultTimeZone(DateTimeUtils.getTimeZone(tz).toZoneId) {
-        checkEvaluation(Sequence(
-          Cast(Literal("2011-03-01"), DateType),
-          Cast(Literal("2011-04-01"), DateType),
-          Option(Literal(stringToInterval("interval 1 month"))),
-          Option(tz)),
-          Seq(Date.valueOf("2011-03-01"), Date.valueOf("2011-04-01")))
-      }
+    Array("America/Chicago", "GMT").foreach(tz => {
+      checkEvaluation(Sequence(
+        Cast(Literal("2011-03-01"), DateType),
+        Cast(Literal("2011-04-01"), DateType),
+        Option(Literal(stringToInterval("interval 1 month"))),
+        Option(tz)),
+        Seq(
+          Date.valueOf("2011-03-01"), Date.valueOf("2011-04-01")))
     })
   }
 }