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_r337026653
##########
File path:
common/unsafe/src/main/java/org/apache/spark/unsafe/types/CalendarInterval.java
##########
@@ -242,72 +159,60 @@ public static CalendarInterval fromDayTimeString(String
s, String from, String t
return result;
}
- public static CalendarInterval fromSingleUnitString(String unit, String s)
+ public static CalendarInterval fromUnitString(String[] units, String[]
values)
throws IllegalArgumentException {
+ assert units.length == values.length;
+ int months = 0;
+ long microseconds = 0;
- CalendarInterval result = null;
- if (s == null) {
- throw new IllegalArgumentException(String.format("Interval %s string was
null", unit));
- }
- s = s.trim();
- Matcher m = quoteTrimPattern.matcher(s);
- if (!m.matches()) {
- throw new IllegalArgumentException(
- "Interval string does not match day-time format of 'd h:m:s.n': " + s);
- } else {
+ for (int i = 0; i < units.length; i++) {
try {
- switch (unit) {
+ String value = values[i].trim();
+ switch (units[i]) {
case "year":
- int year = (int) toLongWithRange("year", m.group(1),
- Integer.MIN_VALUE / 12, Integer.MAX_VALUE / 12);
- result = new CalendarInterval(year * 12, 0L);
+ months = Math.addExact(months,
Math.multiplyExact(Integer.parseInt(value), 12));
break;
case "month":
- int month = (int) toLongWithRange("month", m.group(1),
- Integer.MIN_VALUE, Integer.MAX_VALUE);
- result = new CalendarInterval(month, 0L);
+ months = Math.addExact(months, Integer.parseInt(value));
Review comment:
it is add, just I use `Math.addExact` to be safe.
----------------------------------------------------------------
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]
