cloud-fan commented on a change in pull request #26491: [SPARK-29870][SQL]
Unify the logic of multi-units interval string to CalendarInterval
URL: https://github.com/apache/spark/pull/26491#discussion_r345578009
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala
##########
@@ -2075,22 +2071,21 @@ class AstBuilder(conf: SQLConf) extends
SqlBaseBaseVisitor[AnyRef] with Logging
*/
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
- }.map(IntervalUtils.IntervalUnit.withName).toArray
-
- val values = ctx.intervalValue().asScala.map { value =>
- if (value.STRING() != null) {
- string(value.STRING())
- } else {
- value.getText
- }
- }.toArray
-
+ val units = ctx.intervalUnit().asScala
+ val values = ctx.intervalValue().asScala
try {
- IntervalUtils.fromUnitStrings(units, values)
+ assert(units.length == values.length)
+ val kvs = units.indices.map { i =>
+ val u = units(i).getText
+ val v = if (values(i).STRING() != null) {
+ string(values(i).STRING())
+ } else {
+ values(i).getText
+ }
+ v + " " + u
+ }
+ val str = kvs.mkString(" ")
+ IntervalUtils.fromString(str)
Review comment:
when we at here, the parsing is already done by antlr, so this may make
things slower. But it's better to unify the code as the perf doesn't matter
that much for interval literals.
----------------------------------------------------------------
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]
