fix(bigquery-jdbc): normalize setTime from Calendar zone to JVM zone

Author: keshavdandeva

java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryCallableStatement.java

@@ -858,7 +858,7 @@ public void setTime(String parameterName, Time value, Calendar calendar) throws
     checkClosed();
     this.parameterHandler.setParameter(
         parameterName,
-        value == null ? null : BigQueryTemporalUtility.convertTimeWithCalendar(value, calendar),
+        value == null ? null : BigQueryTemporalUtility.convertTimeToCalendar(value, calendar),
         Time.class,
         BigQueryStatementParameterType.IN,
         0);

java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryPreparedStatement.java

@@ -633,7 +633,7 @@ public void setDate(int parameterIndex, Date value, Calendar calendar) throws SQ
   @Override
   public void setTime(int parameterIndex, Time value, Calendar calendar) throws SQLException {
     checkClosed();
-    setTime(parameterIndex, BigQueryTemporalUtility.convertTimeWithCalendar(value, calendar));
+    setTime(parameterIndex, BigQueryTemporalUtility.convertTimeToCalendar(value, calendar));
   }
 
   @Override

java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryTemporalUtility.java

@@ -478,4 +478,28 @@ static Time convertTimeWithCalendar(Time time, Calendar cal) {
     targetCal.set(Calendar.MILLISECOND, defaultCal.get(Calendar.MILLISECOND));
     return new Time(targetCal.getTimeInMillis());
   }
+
+  /**
+   * Converts a {@link Time} for writing/inbound parameter setting operations (e.g., {@code
+   * setTime(..., Calendar)}) by extracting its local time fields as interpreted in the target
+   * {@link Calendar}'s timezone and normalizing them back into 1970-01-01 in the system-default
+   * timezone.
+   *
+   * @param time the time instant specified relative to the target Calendar
+   * @param cal the Calendar containing the source timezone
+   * @return the normalized Time on 1970-01-01 in the system-default timezone
+   */
+  static Time convertTimeToCalendar(Time time, Calendar cal) {
+    if (time == null || cal == null) {
+      return time;
+    }
+    ZoneId systemZone = ZoneId.systemDefault();
+    ZoneId targetZone = cal.getTimeZone().toZoneId();
+    if (systemZone.equals(targetZone)) {
+      return time;
+    }
+    LocalTime localTime = Instant.ofEpochMilli(time.getTime()).atZone(targetZone).toLocalTime();
+    ZonedDateTime zdt = localTime.atDate(LocalDate.of(1970, 1, 1)).atZone(systemZone);
+    return new Time(zdt.toInstant().toEpochMilli());
+  }
 }

java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryCallableStatementTest.java

@@ -1029,19 +1029,22 @@ public void testSetTimeParamByName() throws SQLException {
     assertEquals(expected, actual);
   }
 
-  @Test
-  public void testSetTimeCalParamByName() throws SQLException {
+  @ParameterizedTest
+  @ValueSource(strings = {"UTC", "America/New_York", "Asia/Tokyo"})
+  public void testSetTimeCalParamByName(String zoneId) throws SQLException {
     BigQueryCallableStatement statement =
         new BigQueryCallableStatement(bigQueryConnection, "call testProc('?')");
     assertNotNull(statement);
-    Time expectedTime = Time.valueOf("12:34:56");
-    Calendar expectedCal = Calendar.getInstance();
+    Calendar expectedCal = Calendar.getInstance(TimeZone.getTimeZone(zoneId));
+    expectedCal.clear();
+    expectedCal.set(1970, Calendar.JANUARY, 1, 12, 34, 56);
+    Time expectedTime = new Time(expectedCal.getTimeInMillis());
 
     statement.setTime(PARAM_KEY, expectedTime, expectedCal);
     Time actual = statement.getTime(PARAM_KEY);
-    assertNotNull(actual);
+    assertEquals("12:34:56", actual.toString());
     actual = statement.getTime(PARAM_KEY, expectedCal);
-    assertNotNull(actual);
+    assertEquals(expectedTime, actual);
   }
 
   @Test

java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryPreparedStatementSettersTest.java

@@ -224,15 +224,20 @@ public void testSetDateWithCalendar() throws Exception {
     assertEquals(originalMillis, cal.getTimeInMillis());
   }
 
-  @Test
-  public void testSetTimeWithCalendar() throws Exception {
-    Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+  @ParameterizedTest
+  @ValueSource(strings = {"UTC", "America/New_York", "Asia/Tokyo"})
+  public void testSetTimeWithCalendar(String zoneId) throws Exception {
+    Calendar cal = Calendar.getInstance(TimeZone.getTimeZone(zoneId));
     cal.setTimeInMillis(1000000L);
     long originalMillis = cal.getTimeInMillis();
-    Time time = new Time(43200000L); // 12:00:00
+    Calendar sourceCal = Calendar.getInstance(TimeZone.getTimeZone(zoneId));
+    sourceCal.clear();
+    sourceCal.set(1970, Calendar.JANUARY, 1, 12, 34, 56);
+    Time time = new Time(sourceCal.getTimeInMillis());
 
     preparedStatement.setTime(1, time, cal);
     assertEquals(Time.class, preparedStatement.parameterHandler.getType(1));
+    assertEquals("12:34:56", preparedStatement.parameterHandler.getParameter(1).toString());
     assertEquals(originalMillis, cal.getTimeInMillis());
   }
 

java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryTemporalUtilityTest.java

@@ -148,6 +148,65 @@ public void testConvertTimeWithCalendar() {
     assertThat(resultCal.get(Calendar.SECOND)).isEqualTo(45);
   }
 
+  @Test
+  public void testConvertTimeToCalendar() {
+    Time time = Time.valueOf("15:30:45");
+    Calendar cal = Calendar.getInstance();
+
+    // Null checks
+    assertThat(BigQueryTemporalUtility.convertTimeToCalendar(null, cal)).isNull();
+    assertThat(BigQueryTemporalUtility.convertTimeToCalendar(time, null)).isSameInstanceAs(time);
+
+    // Same timezone fast-path
+    Calendar sameZoneCal = Calendar.getInstance(TimeZone.getDefault());
+    assertThat(BigQueryTemporalUtility.convertTimeToCalendar(time, sameZoneCal))
+        .isSameInstanceAs(time);
+
+    // Different timezone
+    ZoneId tokyoZone = ZoneId.of("Asia/Tokyo");
+    Calendar tokyoCal = Calendar.getInstance(TimeZone.getTimeZone(tokyoZone));
+    long tokyoTimeMillis =
+        LocalTime.of(15, 30, 45)
+            .atDate(LocalDate.of(1970, 1, 1))
+            .atZone(tokyoZone)
+            .toInstant()
+            .toEpochMilli();
+    Time result =
+        BigQueryTemporalUtility.convertTimeToCalendar(new Time(tokyoTimeMillis), tokyoCal);
+    long expectedSystemMillis =
+        LocalTime.of(15, 30, 45)
+            .atDate(LocalDate.of(1970, 1, 1))
+            .atZone(ZoneId.systemDefault())
+            .toInstant()
+            .toEpochMilli();
+    assertThat(result.getTime()).isEqualTo(expectedSystemMillis);
+    assertThat(result.toString()).isEqualTo("15:30:45");
+  }
+
+  @Test
+  public void testCrossTimezoneTimeRoundtrip() {
+    ZoneId writeZone = ZoneId.of("America/Los_Angeles");
+    ZoneId readZone = ZoneId.of("Asia/Tokyo");
+    Calendar writeCal = Calendar.getInstance(TimeZone.getTimeZone(writeZone));
+    Calendar readCal = Calendar.getInstance(TimeZone.getTimeZone(readZone));
+
+    Time inputTime =
+        new Time(
+            LocalTime.of(23, 15, 30)
+                .atDate(LocalDate.of(1970, 1, 1))
+                .atZone(writeZone)
+                .toInstant()
+                .toEpochMilli());
+    Time normalizedTime = BigQueryTemporalUtility.convertTimeToCalendar(inputTime, writeCal);
+    Time readTime = BigQueryTemporalUtility.convertTimeWithCalendar(normalizedTime, readCal);
+
+    Calendar verifyCal = Calendar.getInstance(TimeZone.getTimeZone(readZone));
+    verifyCal.setTime(readTime);
+    assertThat(verifyCal.get(Calendar.HOUR_OF_DAY)).isEqualTo(23);
+    assertThat(verifyCal.get(Calendar.MINUTE)).isEqualTo(15);
+    assertThat(verifyCal.get(Calendar.SECOND)).isEqualTo(30);
+  }
+
   @Test
   public void testBoxDateTimeAndDate() {
     Timestamp ts =