VenuReddy2103 commented on a change in pull request #3896:
URL: https://github.com/apache/carbondata/pull/3896#discussion_r472332314
##########
File path: core/src/main/java/org/apache/carbondata/core/util/DataTypeUtil.java
##########
@@ -434,20 +434,59 @@ public static Object
getDataDataTypeForNoDictionaryColumn(String dimensionValue,
}
private static Object parseTimestamp(String dimensionValue, String
dateFormat) {
- Date dateToStr;
- DateFormat dateFormatter;
+ Date dateToStr = null;
+ DateFormat dateFormatter = null;
try {
if (null != dateFormat && !dateFormat.trim().isEmpty()) {
dateFormatter = new SimpleDateFormat(dateFormat);
- dateFormatter.setLenient(false);
} else {
dateFormatter = timestampFormatter.get();
}
+ dateFormatter.setLenient(false);
dateToStr = dateFormatter.parse(dimensionValue);
- return dateToStr.getTime();
+ return validateTimeStampRange(dateToStr.getTime());
} catch (ParseException e) {
- throw new NumberFormatException(e.getMessage());
+ // If the parsing fails, try to parse again with setLenient to true if
the property is set
+ if (CarbonProperties.getInstance().isSetLenientEnabled()) {
+ try {
+ LOGGER.info("Changing setLenient to true for TimeStamp: " +
dimensionValue);
+ dateFormatter.setLenient(true);
+ dateToStr = dateFormatter.parse(dimensionValue);
+ LOGGER.info(
+ "Changing setLenient to true for TimeStamp: " + dimensionValue +
". Changing "
+ + dimensionValue + " to " + dateToStr);
+ dateFormatter.setLenient(false);
+ LOGGER.info("Changing setLenient back to false");
+ return validateTimeStampRange(dateToStr.getTime());
+ } catch (ParseException ex) {
Review comment:
`validateTimeStampRange()` throws `NumberFormatException`. Your would
want to do `dateFormatter.setLenient(false);` in that case too..
----------------------------------------------------------------
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
