cloud-fan commented on a change in pull request #26190: [SPARK-29532][SQL]
simplify interval string parsing
URL: https://github.com/apache/spark/pull/26190#discussion_r336963546
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala
##########
@@ -1930,15 +1941,12 @@ class AstBuilder(conf: SQLConf) extends
SqlBaseBaseVisitor[AnyRef] with Logging
*/
override def visitIntervalField(ctx: IntervalFieldContext): CalendarInterval
= withOrigin(ctx) {
import ctx._
- val s = value.getText
+ 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) if u.endsWith("s") =>
- // Handle plural forms, e.g:
yearS/monthS/weekS/dayS/hourS/minuteS/hourS/...
- CalendarInterval.fromSingleUnitString(u.substring(0, u.length - 1),
s)
case (u, None) =>
- CalendarInterval.fromSingleUnitString(u, s)
+ CalendarInterval.fromUnitString(Array(normalizeInternalUnit(u)),
Array(s))
Review comment:
We can improve this later, by separating the parser rules for `1 year 10
months` and `'1-10' year to month`.
----------------------------------------------------------------
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]
