Skip to content

[WIP][SPARK-29669][SQL] Refactor IntervalUtils.fromDayTimeString() #26327

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
MaxGekk wants to merge 7 commits into from
Closed

[WIP][SPARK-29669][SQL] Refactor IntervalUtils.fromDayTimeString() #26327

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2e64de4
Refactor fromDayTimeString()
MaxGekk Oct 30, 2019
feee264
Use UnitName type
MaxGekk Oct 30, 2019
a1ab88d
Add unitValueProps
MaxGekk Oct 30, 2019
c3fe563
conv -> toMicros
MaxGekk Oct 30, 2019
3713abc
Refactor dayTimePattern
MaxGekk Oct 31, 2019
f381103
Merge remote-tracking branch 'remotes/origin/master' into refactor-fr…
MaxGekk Oct 31, 2019
140a26f
Special pattern for min-sec
MaxGekk Oct 31, 2019
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
Use UnitName type
  • Loading branch information
@MaxGekk
MaxGekk committed Oct 30, 2019
commit feee264606e67ec19da1426aefddaaf93afe0327
13 changes: 7 additions & 6 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import org.apache.spark.sql.catalyst.plans._
import org.apache.spark.sql.catalyst.plans.logical._
import org.apache.spark.sql.catalyst.util.DateTimeUtils.{getZoneId, stringToDate, stringToTimestamp}
import org.apache.spark.sql.catalyst.util.IntervalUtils
import org.apache.spark.sql.catalyst.util.IntervalUtils.UnitName
import org.apache.spark.sql.connector.expressions.{ApplyTransform, BucketTransform, DaysTransform, Expression => V2Expression, FieldReference, HoursTransform, IdentityTransform, LiteralValue, MonthsTransform, Transform, YearsTransform}
import org.apache.spark.sql.internal.SQLConf
import org.apache.spark.sql.types._
Expand Down Expand Up @@ -1967,17 +1968,17 @@ class AstBuilder(conf: SQLConf) extends SqlBaseBaseVisitor[AnyRef] with Logging
case ("year", Some("month")) =>
IntervalUtils.fromYearMonthString(s)
case ("day", Some("hour")) =>
IntervalUtils.fromDayTimeString(s, "day", "hour")
IntervalUtils.fromDayTimeString(s, UnitName.day, UnitName.hour)
case ("day", Some("minute")) =>
IntervalUtils.fromDayTimeString(s, "day", "minute")
IntervalUtils.fromDayTimeString(s, UnitName.day, UnitName.minute)
case ("day", Some("second")) =>
IntervalUtils.fromDayTimeString(s, "day", "second")
IntervalUtils.fromDayTimeString(s, UnitName.day, UnitName.second)
case ("hour", Some("minute")) =>
IntervalUtils.fromDayTimeString(s, "hour", "minute")
IntervalUtils.fromDayTimeString(s, UnitName.hour, UnitName.minute)
case ("hour", Some("second")) =>
IntervalUtils.fromDayTimeString(s, "hour", "second")
IntervalUtils.fromDayTimeString(s, UnitName.hour, UnitName.second)
case ("minute", Some("second")) =>
IntervalUtils.fromDayTimeString(s, "minute", "second")
IntervalUtils.fromDayTimeString(s, UnitName.minute, UnitName.second)
case (from, Some(t)) =>
throw new ParseException(s"Intervals FROM $from TO $t are not supported.", ctx)
}
Expand Down
11 changes: 7 additions & 4 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 @@ -175,7 +175,7 @@ object IntervalUtils {
* adapted from HiveIntervalDayTime.valueOf
*/
def fromDayTimeString(s: String): CalendarInterval = {
fromDayTimeString(s, "day", "second")
fromDayTimeString(s, UnitName.day, UnitName.second)
}

private val dayTimePattern = ("^(?<sign>[+|-])?((?<day>\\d+) )?" +
Expand All @@ -193,8 +193,8 @@ object IntervalUtils {
val year = Value(8, "year")
}

private def unitsRange(start: String, end: String): Seq[UnitName.Value] = {
(UnitName.withName(start).id to UnitName.withName(end).id).map(UnitName(_))
private def unitsRange(start: UnitName.Value, end: UnitName.Value): Seq[UnitName.Value] = {
(start.id to end.id).map(UnitName(_))
}

/**
Expand All @@ -206,7 +206,10 @@ object IntervalUtils {
* - HOUR TO (MINUTE|SECOND)
* - MINUTE TO SECOND
*/
def fromDayTimeString(input: String, from: String, to: String): CalendarInterval = {
def fromDayTimeString(
input: String,
from: UnitName.Value,
to: UnitName.Value): CalendarInterval = {
require(input != null, "Interval day-time string must be not null")
assert(input.length == input.trim.length)
val m = dayTimePattern.pattern.matcher(input)
Expand Down
4 changes: 2 additions & 2 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/IntervalUtilsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package org.apache.spark.sql.catalyst.util

import org.apache.spark.SparkFunSuite
import org.apache.spark.sql.catalyst.util.IntervalUtils.{fromDayTimeString, fromString, fromYearMonthString}
import org.apache.spark.sql.catalyst.util.IntervalUtils.{fromDayTimeString, fromString, fromYearMonthString, UnitName}
import org.apache.spark.unsafe.types.CalendarInterval
import org.apache.spark.unsafe.types.CalendarInterval._

Expand Down Expand Up @@ -141,7 +141,7 @@ class IntervalUtilsSuite extends SparkFunSuite {
}

try {
fromDayTimeString("5 1:12:20", "hour", "microsecond")
fromDayTimeString("5 1:12:20", UnitName.hour, UnitName.microsecond)
fail("Expected to throw an exception for the invalid convention type")
} catch {
case e: IllegalArgumentException =>
Expand Down