cloud-fan commented on a change in pull request #26283: [SPARK-29622][SQL] do
not allow leading 'interval' in the interval string format
URL: https://github.com/apache/spark/pull/26283#discussion_r339595980
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala
##########
@@ -1930,71 +1917,73 @@ class AstBuilder(conf: SQLConf) extends
SqlBaseBaseVisitor[AnyRef] with Logging
}
/**
- * Create a [[CalendarInterval]] literal expression. An interval expression
can contain multiple
- * unit value pairs, for instance: interval 2 months 2 days.
+ * Creates a [[CalendarInterval]] literal expression with multiple units,
e.g. 1 YEAR 2 DAYS.
*/
- override def visitInterval(ctx: IntervalContext): Literal = withOrigin(ctx) {
- val intervals = ctx.intervalField.asScala.map(visitIntervalField)
- validate(intervals.nonEmpty, "at least one time unit should be given for
interval literal", ctx)
- Literal(intervals.reduce(_.add(_)))
- }
+ override def visitMultiUnitsInterval(ctx: MultiUnitsIntervalContext):
CalendarInterval = {
+ withOrigin(ctx) {
+ val units = ctx.intervalUnit().asScala.map { unit =>
+ val u = unit.getText.toLowerCase(Locale.ROOT)
+ // Handle plural forms, e.g:
yearS/monthS/weekS/dayS/hourS/minuteS/hourS/...
+ if (u.endsWith("s")) u.substring(0, u.length - 1) else u
+ }.toArray
- /**
- * Create a [[CalendarInterval]] for a unit value pair. Two unit
configuration types are
- * supported:
- * - Single unit.
- * - From-To unit ('YEAR TO MONTH', 'DAY TO HOUR', 'DAY TO MINUTE', 'DAY TO
SECOND',
- * 'HOUR TO MINUTE', 'HOUR TO SECOND' and 'MINUTE TO SECOND' are supported).
- */
- override def visitIntervalField(ctx: IntervalFieldContext): CalendarInterval
= withOrigin(ctx) {
- import ctx._
- val s = getIntervalValue(value)
- try {
- val unitText = unit.getText.toLowerCase(Locale.ROOT)
- val interval = (unitText,
Option(to).map(_.getText.toLowerCase(Locale.ROOT))) match {
- case (u, None) =>
- CalendarInterval.fromUnitStrings(Array(normalizeInternalUnit(u)),
Array(s))
- case ("year", Some("month")) =>
- CalendarInterval.fromYearMonthString(s)
- case ("day", Some("hour")) =>
- CalendarInterval.fromDayTimeString(s, "day", "hour")
- case ("day", Some("minute")) =>
- CalendarInterval.fromDayTimeString(s, "day", "minute")
- case ("day", Some("second")) =>
- CalendarInterval.fromDayTimeString(s, "day", "second")
- case ("hour", Some("minute")) =>
- CalendarInterval.fromDayTimeString(s, "hour", "minute")
- case ("hour", Some("second")) =>
- CalendarInterval.fromDayTimeString(s, "hour", "second")
- case ("minute", Some("second")) =>
- CalendarInterval.fromDayTimeString(s, "minute", "second")
- case (from, Some(t)) =>
- throw new ParseException(s"Intervals FROM $from TO $t are not
supported.", ctx)
+ val values = ctx.intervalValue().asScala.map { value =>
+ if (value.STRING() != null) {
+ string(value.STRING())
+ } else {
+ value.getText
+ }
+ }.toArray
+
+ try {
+ CalendarInterval.fromUnitStrings(units, values)
+ } catch {
+ case i: IllegalArgumentException =>
+ val e = new ParseException(i.getMessage, ctx)
+ e.setStackTrace(i.getStackTrace)
+ throw e
}
- validate(interval != null, "No interval can be constructed", ctx)
- interval
- } catch {
- // Handle Exceptions thrown by CalendarInterval
- case e: IllegalArgumentException =>
- val pe = new ParseException(e.getMessage, ctx)
- pe.setStackTrace(e.getStackTrace)
- throw pe
}
}
- private def getIntervalValue(value: IntervalValueContext): String = {
- if (value.STRING() != null) {
- string(value.STRING())
- } else {
- value.getText
+ /**
+ * Creates a [[CalendarInterval]] literal expression with the unit TO unit
syntax,
+ * e.g. '2-1' YEAR TO MONTH.
+ */
+ override def visitUnitToUnitInterval(ctx: UnitToUnitIntervalContext):
CalendarInterval = {
+ withOrigin(ctx) {
+ val value = string(ctx.STRING())
+ try {
+ val interval = (ctx.from.getText, ctx.to.getText) match {
+ case ("YEAR", "MONTH") =>
Review comment:
these are copied from the original `visitIntervalField`.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
