akashrn5 commented on a change in pull request #3905:
URL: https://github.com/apache/carbondata/pull/3905#discussion_r484752262
##########
File path:
integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithDiffTimestampFormat.scala
##########
@@ -318,48 +318,65 @@ class TestLoadDataWithDiffTimestampFormat extends
QueryTest with BeforeAndAfterA
test("test load, update data with setlenient carbon property for daylight " +
"saving time from different timezone") {
CarbonProperties.getInstance().addProperty(CarbonCommonConstants.CARBON_LOAD_DATEFORMAT_SETLENIENT_ENABLE,
"true")
- TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai"))
sql("DROP TABLE IF EXISTS test_time")
+ sql("DROP TABLE IF EXISTS testhivetable")
+ // Create test_time and hive table
sql("CREATE TABLE IF NOT EXISTS test_time (ID Int, date Date, time
Timestamp) STORED AS carbondata " +
"TBLPROPERTIES('dateformat'='yyyy-MM-dd',
'timestampformat'='yyyy-MM-dd HH:mm:ss') ")
- sql(s" LOAD DATA LOCAL INPATH '$resourcesPath/differentZoneTimeStamp.csv'
into table test_time")
- sql(s"insert into test_time select 11, '2016-7-24', '1941-3-15 00:00:00' ")
- sql("update test_time set (time) = ('1941-3-15 00:00:00') where ID='2'")
- checkAnswer(sql("SELECT time FROM test_time WHERE ID = 1"),
Seq(Row(Timestamp.valueOf("1941-3-15 01:00:00"))))
- checkAnswer(sql("SELECT time FROM test_time WHERE ID = 11"),
Seq(Row(Timestamp.valueOf("1941-3-15 01:00:00"))))
- checkAnswer(sql("SELECT time FROM test_time WHERE ID = 2"),
Seq(Row(Timestamp.valueOf("1941-3-15 01:00:00"))))
+ sql("CREATE TABLE testhivetable (ID Int, date Date, time TIMESTAMP) row
format delimited fields terminated by ',' ")
+ // load data into test_time and hive table and validate query result
+ sql(s" LOAD DATA LOCAL INPATH '$resourcesPath/differentZoneTimeStamp.csv'
into table test_time options('fileheader'='ID,date,time')")
+ sql(s"LOAD DATA local inpath '$resourcesPath/differentZoneTimeStamp.csv'
overwrite INTO table testhivetable")
+ checkAnswer(sql("select * from test_time"), sql("select * from
testhivetable"))
+ sql(s"insert into test_time select 11, '2016-7-24', '2019-3-10 02:00:00' ")
+ sql("update test_time set (time) = ('2019-3-10 02:00:00') where ID='2'")
+ // Using America/Los_Angeles timezone (timezone is fixed to
America/Los_Angeles for all tests)
+ // Here, 2019-3-10 02:00:00 is invalid data in America/Los_Angeles zone,
as DST is observed and
+ // clocks were turned forward 1 hour to 2019-3-10 03:00:00. With lenience
property enabled, can parse the time according to DST.
+ checkAnswer(sql("SELECT time FROM test_time WHERE ID = 1"),
Seq(Row(Timestamp.valueOf("2019-3-10 03:00:00"))))
+ checkAnswer(sql("SELECT time FROM test_time WHERE ID = 11"),
Seq(Row(Timestamp.valueOf("2019-3-10 03:00:00"))))
+ checkAnswer(sql("SELECT time FROM test_time WHERE ID = 2"),
Seq(Row(Timestamp.valueOf("2019-3-10 03:00:00"))))
sql("DROP TABLE test_time")
CarbonProperties.getInstance().removeProperty(CarbonCommonConstants.CARBON_LOAD_DATEFORMAT_SETLENIENT_ENABLE)
}
test("test load, update data with setlenient session level property for
daylight " +
"saving time from different timezone") {
sql("set carbon.load.dateformat.setlenient.enable = true")
- TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai"))
sql("DROP TABLE IF EXISTS test_time")
- sql("CREATE TABLE IF NOT EXISTS test_time (ID Int, date Date, time
Timestamp) STORED AS carbondata " +
+ sql("DROP TABLE IF EXISTS testhivetable")
+ // Create test_time and hive table
+ sql("CREATE TABLE test_time (ID Int, date Date, time Timestamp) STORED AS
carbondata " +
"TBLPROPERTIES('dateformat'='yyyy-MM-dd',
'timestampformat'='yyyy-MM-dd HH:mm:ss') ")
- sql(s" LOAD DATA LOCAL INPATH '$resourcesPath/differentZoneTimeStamp.csv'
into table test_time")
- sql(s"insert into test_time select 11, '2016-7-24', '1941-3-15 00:00:00' ")
- sql("update test_time set (time) = ('1941-3-15 00:00:00') where ID='2'")
- checkAnswer(sql("SELECT time FROM test_time WHERE ID = 1"),
Seq(Row(Timestamp.valueOf("1941-3-15 01:00:00"))))
- checkAnswer(sql("SELECT time FROM test_time WHERE ID = 11"),
Seq(Row(Timestamp.valueOf("1941-3-15 01:00:00"))))
- checkAnswer(sql("SELECT time FROM test_time WHERE ID = 2"),
Seq(Row(Timestamp.valueOf("1941-3-15 01:00:00"))))
+ sql("CREATE TABLE testhivetable (ID Int, date Date, time TIMESTAMP) row
format delimited fields terminated by ',' ")
+ // load data into test_time and hive table and validate query result
+ sql(s"LOAD DATA LOCAL INPATH '$resourcesPath/differentZoneTimeStamp.csv'
into table test_time options('fileheader'='ID,date,time')")
+ sql(s"LOAD DATA local inpath '$resourcesPath/differentZoneTimeStamp.csv'
overwrite INTO table testhivetable")
+ checkAnswer(sql("select * from test_time"), sql("select * from
testhivetable"))
+ sql(s"insert into test_time select 11, '2016-7-24', '2019-3-10 02:00:00' ")
+ sql("update test_time set (time) = ('2019-3-10 02:00:00') where ID='2'")
+ // Using America/Los_Angeles timezone (timezone is fixed to
America/Los_Angeles for all tests)
+ // Here, 2019-3-10 02:00:00 is invalid data in America/Los_Angeles zone,
as DST is observed and
+ // clocks were turned forward 1 hour to 2019-3-10 03:00:00. With lenience
property enabled, can parse the time according to DST.
+ checkAnswer(sql("SELECT time FROM test_time WHERE ID = 1"),
Seq(Row(Timestamp.valueOf("2019-3-10 03:00:00"))))
+ checkAnswer(sql("SELECT time FROM test_time WHERE ID = 11"),
Seq(Row(Timestamp.valueOf("2019-3-10 03:00:00"))))
+ checkAnswer(sql("SELECT time FROM test_time WHERE ID = 2"),
Seq(Row(Timestamp.valueOf("2019-3-10 03:00:00"))))
+ sql("DROP TABLE testhivetable")
sql("DROP TABLE test_time")
- defaultConfig()
+ sql("set carbon.load.dateformat.setlenient.enable = false")
}
def generateCSVFile(): Unit = {
val rows = new ListBuffer[Array[String]]
- rows += Array("ID", "date", "time")
- rows += Array("1", "1941-3-15", "1941-3-15 00:00:00")
+ rows += Array("1", "1941-3-15", "2019-3-10 02:00:00")
rows += Array("2", "2016-7-24", "2016-7-24 01:02:30")
BadRecordUtil.createCSV(rows, csvPath)
}
override def afterAll {
sql("DROP TABLE IF EXISTS t3")
FileUtils.forceDelete(new File(csvPath))
- TimeZone.setDefault(defaultTimeZone)
+
CarbonProperties.getInstance().removeProperty(CarbonCommonConstants.CARBON_LOAD_DATEFORMAT_SETLENIENT_ENABLE)
+ sql("set carbon.load.dateformat.setlenient.enable = false")
}
-}
+}
Review comment:
add new line at end of the file
----------------------------------------------------------------
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
