refactor

Author: zhaohehuhu

kyuubi-common/src/test/scala/org/apache/kyuubi/operation/SparkDataTypeTests.scala

@@ -18,7 +18,7 @@
 package org.apache.kyuubi.operation
 
 import java.sql.{Date, Timestamp}
-import java.util.{Calendar, TimeZone}
+import java.util.Calendar
 
 import org.apache.kyuubi.util.SparkVersionUtil
 
@@ -238,11 +238,11 @@ trait SparkDataTypeTests extends HiveJDBCTestHelper with SparkVersionUtil {
       assert(resultSet.next())
       assert(resultSet.getTimestamp(
         "col",
-        Calendar.getInstance(TimeZone.getTimeZone("UTC"))) === Timestamp.valueOf(
+        Calendar.getInstance()) === Timestamp.valueOf(
         "2018-11-17 13:33:33"))
       assert(resultSet.getTimestamp(
         1,
-        Calendar.getInstance(TimeZone.getTimeZone("UTC"))) === Timestamp.valueOf(
+        Calendar.getInstance()) === Timestamp.valueOf(
         "2018-11-17 13:33:33"))
       val metaData = resultSet.getMetaData
       assert(metaData.getColumnType(1) === java.sql.Types.TIMESTAMP)

kyuubi-hive-jdbc/src/main/java/org/apache/kyuubi/jdbc/hive/KyuubiArrowBasedResultSet.java

@@ -459,8 +459,8 @@ private Timestamp parseTimestamp(Timestamp timestamp, Calendar cal) {
       cal = Calendar.getInstance();
     }
     long v = timestamp.getTime();
-    v -= cal.getTimeZone().getOffset(v);
-    timestamp = new Timestamp(v);
+    cal.setTimeInMillis(v);
+    timestamp = new Timestamp(cal.getTime().getTime());
     return timestamp;
   }
 
@@ -508,8 +508,8 @@ private Time parseTime(Time date, Calendar cal) {
       cal = Calendar.getInstance();
     }
     long v = date.getTime();
-    v -= cal.getTimeZone().getOffset(v);
-    date = new Time(v);
+    cal.setTimeInMillis(v);
+    date = new Time(cal.getTime().getTime());
     return date;
   }
 

kyuubi-hive-jdbc/src/main/java/org/apache/kyuubi/jdbc/hive/KyuubiBaseResultSet.java

@@ -465,8 +465,8 @@ private Timestamp parseTimestamp(Timestamp timestamp, Calendar cal) {
       cal = Calendar.getInstance();
     }
     long v = timestamp.getTime();
-    v -= cal.getTimeZone().getOffset(v);
-    timestamp = new Timestamp(v);
+    cal.setTimeInMillis(v);
+    timestamp = new Timestamp(cal.getTime().getTime());
     return timestamp;
   }
 
@@ -514,8 +514,8 @@ private Time parseTime(Time date, Calendar cal) {
       cal = Calendar.getInstance();
     }
     long v = date.getTime();
-    v -= cal.getTimeZone().getOffset(v);
-    date = new Time(v);
+    cal.setTimeInMillis(v);
+    date = new Time(cal.getTime().getTime());
     return date;
   }