cloud-fan commented on a change in pull request #26261: [SPARK-29607][SQL] Move static methods from CalendarInterval to IntervalUtils URL: https://github.com/apache/spark/pull/26261#discussion_r339441969
########## File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/IntervalUtils.scala ########## @@ -119,4 +121,191 @@ object IntervalUtils { case _: IllegalArgumentException => null } } + + private val yearMonthPattern = Pattern.compile("^([+|-])?(\\d+)-(\\d+)$") + + private val dayTimePattern = Pattern.compile( + "^([+|-])?((\\d+) )?((\\d+):)?(\\d+):(\\d+)(\\.(\\d+))?$") + + private def toLongWithRange( + fieldName: String, + s: String, + minValue: Long, + maxValue: Long): Long = { + val result = if (s == null) 0L else s.toLong + require(minValue <= result && result <= maxValue, + s"$fieldName $result outside range [$minValue, $maxValue]") + + result + } + + /** + * Parse YearMonth string in form: [-]YYYY-MM + * + * adapted from HiveIntervalYearMonth.valueOf + */ + def fromYearMonthString(input: String): CalendarInterval = { + require(input != null, "Interval year-month string must be not null") + val s = input.trim + val m = yearMonthPattern.matcher(s) + require(m.matches, s"Interval string must match year-month format of 'y-m': $s") + + try { + val sign = if (m.group(1) != null && m.group(1) == "-") -1 else 1 Review comment: as @srowen suggested, we can make it more scala-like ``` input.trim match { case YearMonthPattern(signStr, yearStr, monthStr) => val sign = if (signStr != null && signStr == "-1") -1 else 1 ... } ``` ---------------------------------------------------------------- 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: us...@infra.apache.org With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org