Skip to content

Commit

Permalink
[SPARK-45891][FOLLOW-UP][VARIANT] Address post-merge comments
Browse files Browse the repository at this point in the history 
### What changes were proposed in this pull request?

The minor post-merge comments from #47473 have been addressed

### Why are the changes needed?

Improved code style.

### Does this PR introduce _any_ user-facing change?

No.

### How was this patch tested?

Existing VariantExpressionSuite passes

### Was this patch authored or co-authored using generative AI tooling?

No.

Closes #47792 from harshmotw-db/harshmotw-db/PR_fix.

Authored-by: Harsh Motwani <[email protected]>
Signed-off-by: Wenchen Fan <[email protected]>
  • Loading branch information
@harshmotw-db @cloud-fan
harshmotw-db authored and cloud-fan committed Aug 17, 2024
1 parent a767f5c commit 469ebcf
Showing 1 changed file with 76 additions and 79 deletions.
155 changes: 76 additions & 79 deletions common/utils/src/main/scala/org/apache/spark/util/DayTimeIntervalUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,31 +17,31 @@

package org.apache.spark.util;

import org.apache.spark.SparkException;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;

import org.apache.spark.SparkException;

// Replicating code from SparkIntervalUtils so code in the 'common' space can work with
// year-month intervals.
public class DayTimeIntervalUtils {
private static byte DAY = 0;
private static byte HOUR = 1;
private static byte MINUTE = 2;
private static byte SECOND = 3;
private static long HOURS_PER_DAY = 24;
private static long MINUTES_PER_HOUR = 60;
private static long SECONDS_PER_MINUTE = 60;
private static long MILLIS_PER_SECOND = 1000;
private static long MICROS_PER_MILLIS = 1000;
private static long MICROS_PER_SECOND = MICROS_PER_MILLIS * MILLIS_PER_SECOND;
private static long MICROS_PER_MINUTE = SECONDS_PER_MINUTE * MICROS_PER_SECOND;
private static long MICROS_PER_HOUR = MINUTES_PER_HOUR * MICROS_PER_MINUTE;
private static long MICROS_PER_DAY = HOURS_PER_DAY * MICROS_PER_HOUR;
private static long MAX_DAY = Long.MAX_VALUE / MICROS_PER_DAY;
private static long MAX_HOUR = Long.MAX_VALUE / MICROS_PER_HOUR;
private static long MAX_MINUTE = Long.MAX_VALUE / MICROS_PER_MINUTE;
private static long MAX_SECOND = Long.MAX_VALUE / MICROS_PER_SECOND;
private static final byte DAY = 0;
private static final byte HOUR = 1;
private static final byte MINUTE = 2;
private static final byte SECOND = 3;
private static final long HOURS_PER_DAY = 24;
private static final long MINUTES_PER_HOUR = 60;
private static final long SECONDS_PER_MINUTE = 60;
private static final long MILLIS_PER_SECOND = 1000;
private static final long MICROS_PER_MILLIS = 1000;
private static final long MICROS_PER_SECOND = MICROS_PER_MILLIS * MILLIS_PER_SECOND;
private static final long MICROS_PER_MINUTE = SECONDS_PER_MINUTE * MICROS_PER_SECOND;
private static final long MICROS_PER_HOUR = MINUTES_PER_HOUR * MICROS_PER_MINUTE;
private static final long MICROS_PER_DAY = HOURS_PER_DAY * MICROS_PER_HOUR;
private static final long MAX_HOUR = Long.MAX_VALUE / MICROS_PER_HOUR;
private static final long MAX_MINUTE = Long.MAX_VALUE / MICROS_PER_MINUTE;
private static final long MAX_SECOND = Long.MAX_VALUE / MICROS_PER_SECOND;

public static String fieldToString(byte field) throws SparkException {
if (field == DAY) {
Expand All @@ -65,70 +65,67 @@ public static String toDayTimeIntervalANSIString(long micros, byte startField, b
throws SparkException {
String sign = "";
long rest = micros;
try {
String from = fieldToString(startField).toUpperCase();
String to = fieldToString(endField).toUpperCase();
String prefix = "INTERVAL '";
String postfix = startField == endField ? "' " + from : "' " + from + " TO " + to;
if (micros < 0) {
if (micros == Long.MIN_VALUE) {
// Especial handling of minimum `Long` value because negate op overflows `Long`.
// seconds = 106751991 * (24 * 60 * 60) + 4 * 60 * 60 + 54 = 9223372036854
// microseconds = -9223372036854000000L-775808 == Long.MinValue
String baseStr = "-106751991 04:00:54.775808000";
String firstStr = "-" + (startField == DAY ? Long.toString(MAX_DAY) :
(startField == HOUR ? Long.toString(MAX_HOUR) :
(startField == MINUTE ? Long.toString(MAX_MINUTE) :
Long.toString(MAX_SECOND) + ".775808")));
if (startField == endField) {
return prefix + firstStr + postfix;
} else {
int substrStart = startField == DAY ? 10 : (startField == HOUR ? 13 : 16);
int substrEnd = endField == HOUR ? 13 : (endField == MINUTE ? 16 : 26);
return prefix + firstStr + baseStr.substring(substrStart, substrEnd) + postfix;
}
String from = fieldToString(startField).toUpperCase();
String to = fieldToString(endField).toUpperCase();
String prefix = "INTERVAL '";
String postfix = startField == endField ? "' " + from : "' " + from + " TO " + to;
if (micros < 0) {
if (micros == Long.MIN_VALUE) {
// Especial handling of minimum `Long` value because negate op overflows `Long`.
// seconds = 106751991 * (24 * 60 * 60) + 4 * 60 * 60 + 54 = 9223372036854
// microseconds = -9223372036854000000L-775808 == Long.MinValue
String baseStr = "-106751991 04:00:54.775808000";
long MAX_DAY = Long.MAX_VALUE / MICROS_PER_DAY;
String firstStr = "-" + (startField == DAY ? Long.toString(MAX_DAY) :
(startField == HOUR ? Long.toString(MAX_HOUR) :
(startField == MINUTE ? Long.toString(MAX_MINUTE) :
MAX_SECOND + ".775808")));
if (startField == endField) {
return prefix + firstStr + postfix;
} else {
sign = "-";
rest = -rest;
int substrStart = startField == DAY ? 10 : (startField == HOUR ? 13 : 16);
int substrEnd = endField == HOUR ? 13 : (endField == MINUTE ? 16 : 26);
return prefix + firstStr + baseStr.substring(substrStart, substrEnd) + postfix;
}
} else {
sign = "-";
rest = -rest;
}
StringBuilder formatBuilder = new StringBuilder(sign);
ArrayList<Long> formatArgs = new ArrayList<>();
if (startField == DAY) {
formatBuilder.append(rest / MICROS_PER_DAY);
rest %= MICROS_PER_DAY;
} else if (startField == HOUR) {
formatBuilder.append("%02d");
formatArgs.add(rest / MICROS_PER_HOUR);
rest %= MICROS_PER_HOUR;
} else if (startField == MINUTE) {
formatBuilder.append("%02d");
formatArgs.add(rest / MICROS_PER_MINUTE);
rest %= MICROS_PER_MINUTE;
} else if (startField == SECOND) {
String leadZero = rest < 10 * MICROS_PER_SECOND ? "0" : "";
formatBuilder.append(leadZero + BigDecimal.valueOf(rest, 6)
.stripTrailingZeros().toPlainString());
}
}
StringBuilder formatBuilder = new StringBuilder(sign);
List<Long> formatArgs = new ArrayList<>();
if (startField == DAY) {
formatBuilder.append(rest / MICROS_PER_DAY);
rest %= MICROS_PER_DAY;
} else if (startField == HOUR) {
formatBuilder.append("%02d");
formatArgs.add(rest / MICROS_PER_HOUR);
rest %= MICROS_PER_HOUR;
} else if (startField == MINUTE) {
formatBuilder.append("%02d");
formatArgs.add(rest / MICROS_PER_MINUTE);
rest %= MICROS_PER_MINUTE;
} else if (startField == SECOND) {
String leadZero = rest < 10 * MICROS_PER_SECOND ? "0" : "";
formatBuilder.append(leadZero).append(BigDecimal.valueOf(rest, 6)
.stripTrailingZeros().toPlainString());
}

if (startField < HOUR && HOUR <= endField) {
formatBuilder.append(" %02d");
formatArgs.add(rest / MICROS_PER_HOUR);
rest %= MICROS_PER_HOUR;
}
if (startField < MINUTE && MINUTE <= endField) {
formatBuilder.append(":%02d");
formatArgs.add(rest / MICROS_PER_MINUTE);
rest %= MICROS_PER_MINUTE;
}
if (startField < SECOND && SECOND <= endField) {
String leadZero = rest < 10 * MICROS_PER_SECOND ? "0" : "";
formatBuilder.append(":" + leadZero + BigDecimal.valueOf(rest, 6)
.stripTrailingZeros().toPlainString());
}
return prefix + String.format(formatBuilder.toString(), formatArgs.toArray()) + postfix;
} catch (SparkException e) {
throw e;
if (startField < HOUR && HOUR <= endField) {
formatBuilder.append(" %02d");
formatArgs.add(rest / MICROS_PER_HOUR);
rest %= MICROS_PER_HOUR;
}
if (startField < MINUTE && MINUTE <= endField) {
formatBuilder.append(":%02d");
formatArgs.add(rest / MICROS_PER_MINUTE);
rest %= MICROS_PER_MINUTE;
}
if (startField < SECOND && SECOND <= endField) {
String leadZero = rest < 10 * MICROS_PER_SECOND ? "0" : "";
formatBuilder.append(":").append(leadZero).append(BigDecimal.valueOf(rest, 6)
.stripTrailingZeros().toPlainString());
}
return prefix + String.format(formatBuilder.toString(), formatArgs.toArray()) + postfix;
}
}

0 comments on commit 469ebcf

Please sign in to comment.