KKcorps commented on code in PR #8779:
URL: https://github.com/apache/pinot/pull/8779#discussion_r884058744
##########
pinot-spi/src/main/java/org/apache/pinot/spi/data/DateTimeFormatSpec.java:
##########
@@ -47,28 +49,69 @@ public class DateTimeFormatSpec {
public static final int MIN_FORMAT_TOKENS = 3;
public static final int MAX_FORMAT_TOKENS = 4;
+ public static final int FORMAT_TIMEFORMAT_POSITION_PIPE = 0;
+ public static final int MIN_FORMAT_TOKENS_PIPE = 1;
+ public static final int MAX_FORMAT_TOKENS_PIPE = 3;
+
+ //Applicable for SDF|<timeFormat>(|<timezone>)
+ public static final int SDF_PATTERN_POSITION = 1;
+ public static final int SDF_TIMEZONE_POSITION = 2;
+
+ //Applicable for EPOCH|<timeUnit>(|<size>)
+ public static final int EPOCH_UNIT_POSITION = 1;
+ public static final int EPOCH_SIZE_POSITION = 2;
+
private final String _format;
private final int _size;
private final DateTimeFormatUnitSpec _unitSpec;
private final DateTimeFormatPatternSpec _patternSpec;
public DateTimeFormatSpec(String format) {
_format = format;
- validateFormat(format);
- String[] formatTokens = StringUtils.split(format, COLON_SEPARATOR,
MAX_FORMAT_TOKENS);
- if (formatTokens.length == MAX_FORMAT_TOKENS) {
- _patternSpec = new
DateTimeFormatPatternSpec(formatTokens[FORMAT_TIMEFORMAT_POSITION],
- formatTokens[FORMAT_PATTERN_POSITION]);
+ if (Character.isDigit(_format.charAt(0))) {
+ String[] formatTokens = validateFormat(format);
+ if (formatTokens.length == MAX_FORMAT_TOKENS) {
+ _patternSpec = new
DateTimeFormatPatternSpec(formatTokens[FORMAT_TIMEFORMAT_POSITION],
+ formatTokens[FORMAT_PATTERN_POSITION]);
+ } else {
+ _patternSpec = new
DateTimeFormatPatternSpec(formatTokens[FORMAT_TIMEFORMAT_POSITION]);
+ }
+ if (_patternSpec.getTimeFormat() == TimeFormat.TIMESTAMP) {
+ // TIMESTAMP type stores millis since epoch
+ _size = 1;
+ _unitSpec = new DateTimeFormatUnitSpec("MILLISECONDS");
+ } else {
+ _size = Integer.parseInt(formatTokens[FORMAT_SIZE_POSITION]);
+ _unitSpec = new
DateTimeFormatUnitSpec(formatTokens[FORMAT_UNIT_POSITION]);
+ }
} else {
- _patternSpec = new
DateTimeFormatPatternSpec(formatTokens[FORMAT_TIMEFORMAT_POSITION]);
- }
- if (_patternSpec.getTimeFormat() == TimeFormat.TIMESTAMP) {
- // TIMESTAMP type stores millis since epoch
- _size = 1;
- _unitSpec = new DateTimeFormatUnitSpec("MILLISECONDS");
- } else {
- _size = Integer.parseInt(formatTokens[FORMAT_SIZE_POSITION]);
- _unitSpec = new
DateTimeFormatUnitSpec(formatTokens[FORMAT_UNIT_POSITION]);
+ String[] formatTokens = validatePipeFormat(format);
+ if
(formatTokens[FORMAT_TIMEFORMAT_POSITION_PIPE].equals(TimeFormat.EPOCH.toString()))
{
+ _patternSpec = new
DateTimeFormatPatternSpec(formatTokens[FORMAT_TIMEFORMAT_POSITION_PIPE]);
+ _unitSpec = new
DateTimeFormatUnitSpec(formatTokens[EPOCH_UNIT_POSITION]);
+ if (formatTokens.length == MAX_FORMAT_TOKENS_PIPE) {
+ _size = Integer.parseInt(formatTokens[EPOCH_SIZE_POSITION]);
+ } else {
+ _size = 1;
+ }
+ } else if
(formatTokens[FORMAT_TIMEFORMAT_POSITION_PIPE].equals(TimeFormat.SIMPLE_DATE_FORMAT.toString()))
{
+ if (formatTokens.length == MAX_FORMAT_TOKENS_PIPE) {
+ _patternSpec = new DateTimeFormatPatternSpec(TimeFormat.valueOf(
+ formatTokens[FORMAT_TIMEFORMAT_POSITION_PIPE]),
+ formatTokens[SDF_PATTERN_POSITION],
+ formatTokens[SDF_TIMEZONE_POSITION]);
+ } else {
+ _patternSpec = new DateTimeFormatPatternSpec(TimeFormat.valueOf(
+ formatTokens[FORMAT_TIMEFORMAT_POSITION_PIPE]),
+ formatTokens[SDF_PATTERN_POSITION], DateTimeZone.UTC.toString());
Review Comment:
Use `DEFAULT_DATETIMEZONE` variable here.
--
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.
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
