Skip to content

[SPARK-35112][SQL] Support Cast string to day-second interval #32271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
AngersZhuuuu wants to merge 15 commits into from
Closed

[SPARK-35112][SQL] Support Cast string to day-second interval #32271

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2af65de
[SPARK-35111][SQL] Support Cast string to day-second interval
AngersZhuuuu Apr 21, 2021
b41fd25
fix
AngersZhuuuu Apr 21, 2021
a82bfee
update
AngersZhuuuu Apr 28, 2021
e0b3b30
save
AngersZhuuuu Apr 29, 2021
616380e
save
AngersZhuuuu Apr 29, 2021
35dd9f4
update
AngersZhuuuu Apr 29, 2021
daa9675
done
AngersZhuuuu Apr 29, 2021
c2c7021
update
AngersZhuuuu Apr 30, 2021
700efa4
update
AngersZhuuuu Apr 30, 2021
6ff0522
Merge branch 'master' into SPARK-35112
AngersZhuuuu Apr 30, 2021
9fe4c38
save
AngersZhuuuu May 1, 2021
46fff9c
Update CastSuite.scala
AngersZhuuuu May 1, 2021
50addb4
Update IntervalUtils.scala
AngersZhuuuu May 1, 2021
4f8fc78
Update sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expr…
AngersZhuuuu May 1, 2021
4e2608c
Done
AngersZhuuuu May 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update
  • Loading branch information
@AngersZhuuuu
AngersZhuuuu committed Apr 28, 2021
commit a82bfeeaf36b19802caf760b127ff0eb72208d34
4 changes: 2 additions & 2 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Cast.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ abstract class CastBase extends UnaryExpression with TimeZoneAwareExpression wit

private[this] def castToDayTimeInterval(from: DataType): Any => Any = from match {
case StringType =>
buildCast[UTF8String](_, s => IntervalUtils.safeFromDayTimeString(s).orNull)
buildCast[UTF8String](_, s => IntervalUtils.castStringToDTInterval(s).microseconds)
}

// LongConverter
Expand Down Expand Up @@ -1369,7 +1369,7 @@ abstract class CastBase extends UnaryExpression with TimeZoneAwareExpression wit
val longOpt = ctx.freshVariable("intOpt", classOf[Option[Long]])
(c, evPrim, evNull) =>
code"""
scala.Option<Long> $longOpt = $util.safeFromDayTimeString($c);
scala.Option<Long> $longOpt = $util.castStringToDTInterval($c).microseconds;
if ($longOpt.isDefined()) {
$evPrim = ((Long) $longOpt.get()).longValue();
} else {
Expand Down
48 changes: 33 additions & 15 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/IntervalUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package org.apache.spark.sql.catalyst.util

import java.time.{Duration, Period}
import java.time.temporal.ChronoUnit
import java.util.Locale
import java.util.concurrent.TimeUnit

import scala.util.control.NonFatal
Expand Down Expand Up @@ -123,22 +124,39 @@ object IntervalUtils {
}
}

def safeFromDayTimeString(input: UTF8String): Option[Long] = {
try {
if (input == null || input.toString == null) {
throw new IllegalArgumentException("Interval day-second string must be not null")
} else {
val regex = "INTERVAL '([-|+]?[0-9]+ [0-9:]+)' DAY TO SECOND".r
// scalastyle:off caselocale .toLowerCase
val intervalString = input.trimAll().toUpperCase.toString
// scalastyle:on
val interval = regex.findFirstMatchIn(intervalString)
.map(_.group(1)).getOrElse(intervalString)
Some(fromDayTimeString(interval).microseconds)
}
} catch {
case _: IllegalArgumentException => None
private val daySecondStringPattern =
("(INTERVAL )?([+|-])*?(')?" +
"([+|-])?((\\d+) )?((\\d+):)?(\\d+):(\\d+)(\\.(\\d+))?(')?( DAY TO SECOND)?").r

def castStringToDTInterval(input: UTF8String): CalendarInterval = {
// scalastyle:off caselocale .toUpperCase
input.trimAll().toString.toUpperCase(Locale.ROOT) match {
case daySecondStringPattern("INTERVAL ", prefixSign, "'",
suffixSign, day, hour, minute, second, micro, "'", " DAY TO SECOND") =>
(prefixSign, suffixSign) match {
case ("-", "-") => fromYearMonthString(s"$day $hour:$minute:$second.$micro")
case ("-", _) => fromYearMonthString(s"-$day $hour:$minute:$second.$micro")
case (_, _) if suffixSign != null =>
fromYearMonthString(s"$suffixSign$day $hour:$minute:$second.$micro")
case (_, _) => fromYearMonthString(s"$day $hour:$minute:$second.$micro")
}
case daySecondStringPattern(
"INTERVAL ", null, "'", "-", day, hour, minute, second, micro, "'", " DAY TO SECOND") =>
fromYearMonthString(s"-$day $hour:$minute:$second.$micro")
case daySecondStringPattern(
"INTERVAL ", null, "'", _, day, hour, minute, second, micro, "'", " DAY TO SECOND") =>
fromYearMonthString(s"$day $hour:$minute:$second.$micro")
case daySecondStringPattern(
null, null, null, "-", day, hour, minute, second, micro, null, null) =>
fromYearMonthString(s"-$day $hour:$minute:$second.$micro")
case daySecondStringPattern(
null, null, null, _, day, hour, minute, second, micro, null, null) =>
fromYearMonthString(s"$day $hour:$minute:$second.$micro")
case daySecondStringPattern(_, _, _, _, _, _, _, _, _, _, _) =>
throw new IllegalArgumentException(
s"Interval string does not match year-month format of 'y-m': ${input.toString}")
}
// scalastyle:on
}

/**
Expand Down