Undo breaking change for ArrowFlightJdbcTimeStampVectorAccessor.getTimestamp

Author: aiguofer

flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeStampVectorAccessor.java

@@ -179,8 +179,19 @@ public Timestamp getTimestamp(Calendar calendar) {
     if (localDateTime == null) {
       return null;
     }
+    // to prevent breaking changes for those using this, apply the offset that was previously
+    // applied in getLocalDateTime
+    if (calendar != null && !isZoned) {
+      TimeZone timeZone = calendar.getTimeZone();
+      long millis = Timestamp.valueOf(localDateTime).getTime();
+      localDateTime =
+          localDateTime.minus(
+              timeZone.getOffset(millis) - this.timeZone.getOffset(millis), ChronoUnit.MILLIS);
 
-    return Timestamp.valueOf(localDateTime);
+      return Timestamp.valueOf(localDateTime);
+    } else {
+      return Timestamp.valueOf(localDateTime);
+    }
   }
 
   protected static TimeUnit getTimeUnitForVector(TimeStampVector vector) {

flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/SqlTypes.java

@@ -16,14 +16,13 @@
  */
 package org.apache.arrow.driver.jdbc.utils;
 
+import com.google.common.base.Strings;
 import java.sql.Types;
 import java.util.HashMap;
 import java.util.Map;
 import org.apache.arrow.vector.types.FloatingPointPrecision;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 
-import com.google.common.base.Strings;
-
 /** SQL Types utility functions. */
 public class SqlTypes {
   private static final Map<Integer, String> typeIdToName = new HashMap<>();

flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeStampVectorAccessorTest.java

@@ -182,22 +182,16 @@ public void testShouldGetTimestampReturnValidTimestampWithCalendar(
     Calendar calendar = Calendar.getInstance(timeZone);
 
     TimeZone timeZoneForVector = getTimeZoneForVector(vector);
-    boolean hasTz = getVectorIsZoned(vector);
 
     accessorIterator.iterate(
         vector,
         (accessor, currentRow) -> {
           final Timestamp resultWithoutCalendar = accessor.getTimestamp(null);
           final Timestamp result = accessor.getTimestamp(calendar);
 
-          long offset;
-          if (hasTz) {
-            offset =
-                (long) timeZone.getOffset(resultWithoutCalendar.getTime())
-                    - timeZoneForVector.getOffset(resultWithoutCalendar.getTime());
-          } else {
-            offset = 0;
-          }
+          long offset =
+              (long) timeZone.getOffset(resultWithoutCalendar.getTime())
+                  - timeZoneForVector.getOffset(resultWithoutCalendar.getTime());
 
           assertThat(resultWithoutCalendar.getTime() - result.getTime(), is(offset));
           assertThat(accessor.wasNull(), is(false));
@@ -236,22 +230,16 @@ public void testShouldGetDateReturnValidDateWithCalendar(Supplier<TimeStampVecto
     Calendar calendar = Calendar.getInstance(timeZone);
 
     TimeZone timeZoneForVector = getTimeZoneForVector(vector);
-    boolean hasTz = getVectorIsZoned(vector);
 
     accessorIterator.iterate(
         vector,
         (accessor, currentRow) -> {
           final Date resultWithoutCalendar = accessor.getDate(null);
           final Date result = accessor.getDate(calendar);
 
-          long offset;
-          if (hasTz) {
-            offset =
-                (long) timeZone.getOffset(resultWithoutCalendar.getTime())
-                    - timeZoneForVector.getOffset(resultWithoutCalendar.getTime());
-          } else {
-            offset = 0;
-          }
+          long offset =
+              (long) timeZone.getOffset(resultWithoutCalendar.getTime())
+                  - timeZoneForVector.getOffset(resultWithoutCalendar.getTime());
 
           assertThat(resultWithoutCalendar.getTime() - result.getTime(), is(offset));
           assertThat(accessor.wasNull(), is(false));
@@ -290,22 +278,16 @@ public void testShouldGetTimeReturnValidTimeWithCalendar(Supplier<TimeStampVecto
     Calendar calendar = Calendar.getInstance(timeZone);
 
     TimeZone timeZoneForVector = getTimeZoneForVector(vector);
-    boolean hasTz = getVectorIsZoned(vector);
 
     accessorIterator.iterate(
         vector,
         (accessor, currentRow) -> {
           final Time resultWithoutCalendar = accessor.getTime(null);
           final Time result = accessor.getTime(calendar);
 
-          long offset;
-          if (hasTz) {
-            offset =
-                (long) timeZone.getOffset(resultWithoutCalendar.getTime())
-                    - timeZoneForVector.getOffset(resultWithoutCalendar.getTime());
-          } else {
-            offset = 0;
-          }
+          long offset =
+              (long) timeZone.getOffset(resultWithoutCalendar.getTime())
+                  - timeZoneForVector.getOffset(resultWithoutCalendar.getTime());
 
           assertThat(resultWithoutCalendar.getTime() - result.getTime(), is(offset));
           assertThat(accessor.wasNull(), is(false));