ShreelekhyaG commented on a change in pull request #3896:
URL:
https://github.com/apache/carbondata/pull/3896#discussion_r472380864##########
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:
ok added
##########
File path: integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithDiffTimestampFormat.scala
##########
@@ -306,6 +307,39 @@ class TestLoadDataWithDiffTimestampFormat extends QueryTest with BeforeAndAfterA
}
}
+ test("test load, update data with daylight saving time from different timezone") {
+ CarbonProperties.getInstance().addProperty(
+ CarbonCommonConstants.CARBON_LOAD_SETLENIENT_ENABLE, "true")
+ val defaultTimeZone = TimeZone.getDefault
+ TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai"))
+ sql("DROP TABLE IF EXISTS t3")
+ sql(
+ """
+ CREATE TABLE IF NOT EXISTS t3
+ (ID Int, date date, starttime Timestamp, country String,
+ name String, phonetype String, serialname String, salary Int)
+ STORED AS carbondata TBLPROPERTIES('dateformat'='yyyy/MM/dd',
+ 'timestampformat'='yyyy-MM-dd HH:mm')
+ """)
+ sql(s" LOAD DATA LOCAL INPATH '$resourcesPath/timeStampFormatData3.csv' into table t3")
+ sql(s"insert into t3 select 11,'2015-7-23','1941-3-15 00:00:00','china','aaa1','phone197'," +
+ s"'ASD69643',15000")
+ sql("update t3 set (starttime) = ('1941-3-15 00:00:00') where name='aaa2'")
+ checkAnswer(
+ sql("SELECT starttime FROM t3 WHERE ID = 1"),
+ Seq(Row(Timestamp.valueOf("1941-3-15 01:00:00")))
+ )
+ checkAnswer(
+ sql("SELECT starttime FROM t3 WHERE ID = 11"),
+ Seq(Row(Timestamp.valueOf("1941-3-15 01:00:00")))
+ )
+ checkAnswer(
+ sql("SELECT starttime FROM t3 WHERE ID = 2"),
+ Seq(Row(Timestamp.valueOf("1941-3-15 01:00:00")))
+ )
+ TimeZone.setDefault(defaultTimeZone)
Review comment:
done
----------------------------------------------------------------
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:
[hidden email]
Locked
