Merge pull request #1519 from enisoc/java-datetime

java: Fix time zone offset in DateTime.formatTime().

java/client/src/main/java/com/youtube/vitess/mysql/DateTime.java

@@ -165,15 +165,15 @@ public class DateTime {
   public static String formatTime(Time value, Calendar cal) {
     long millis = value.getTime();
 
+    // Adjust for time zone.
+    millis += cal.get(Calendar.ZONE_OFFSET);
+
     String sign = "";
     if (millis < 0) {
       sign = "-";
       millis = -millis;
     }
 
-    // Adjust for time zone.
-    millis += cal.get(Calendar.ZONE_OFFSET);
-
     long hours = millis / HOURS_TO_MILLIS;
     millis -= hours * HOURS_TO_MILLIS;
     long minutes = millis / MINUTES_TO_MILLIS;

java/client/src/test/java/com/youtube/vitess/mysql/DateTimeTest.java

@@ -20,6 +20,8 @@ import java.util.TimeZone;
 @RunWith(JUnit4.class)
 public class DateTimeTest {
   private static final Calendar GMT = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
+  private static final Calendar PST = Calendar.getInstance(TimeZone.getTimeZone("GMT-8"));
+  private static final Calendar IST = Calendar.getInstance(TimeZone.getTimeZone("GMT+0530"));
 
   private static final Map<String, Date> TEST_DATES =
       new ImmutableMap.Builder<String, Date>()
@@ -119,6 +121,40 @@ public class DateTimeTest {
     }
   }
 
+  @Test
+  public void testParseTimePST() throws Exception {
+    // Test absolute UNIX epoch values in a negative GMT offset.
+    final Map<String, Time> TEST_TIMES =
+        new ImmutableMap.Builder<String, Time>()
+            .put("-08:00:00", new Time(0))
+            .put("04:34:56", new Time(45296000L))
+            .put("-20:34:56", new Time(-45296000L))
+            .build();
+
+    for (Map.Entry<String, Time> entry : TEST_TIMES.entrySet()) {
+      String timeString = entry.getKey();
+      Time time = entry.getValue();
+      assertEquals(time, DateTime.parseTime(timeString, PST));
+    }
+  }
+
+  @Test
+  public void testParseTimeIST() throws Exception {
+    // Test absolute UNIX epoch values in a positive GMT offset.
+    final Map<String, Time> TEST_TIMES =
+        new ImmutableMap.Builder<String, Time>()
+            .put("05:30:00", new Time(0))
+            .put("18:04:56", new Time(45296000L))
+            .put("-07:04:56", new Time(-45296000L))
+            .build();
+
+    for (Map.Entry<String, Time> entry : TEST_TIMES.entrySet()) {
+      String timeString = entry.getKey();
+      Time time = entry.getValue();
+      assertEquals(time, DateTime.parseTime(timeString, IST));
+    }
+  }
+
   @Test
   public void testFormatTimeGMT() throws Exception {
     // Test absolute UNIX epoch values in GMT,
@@ -129,6 +165,7 @@ public class DateTimeTest {
             .put("12:34:00", new Time(45240000L))
             .put("01:23:00", new Time(4980000L))
             .put("12:34:56", new Time(45296000L))
+            .put("-01:23:00", new Time(-4980000L))
             .put("-12:34:56", new Time(-45296000L))
             .put("812:34:56", new Time(2925296000L))
             .put("-812:34:56", new Time(-2925296000L))
@@ -142,6 +179,40 @@ public class DateTimeTest {
     }
   }
 
+  @Test
+  public void testFormatTimePST() throws Exception {
+    // Test absolute UNIX epoch values in a negative GMT offset.
+    final Map<String, Time> TEST_TIMES =
+        new ImmutableMap.Builder<String, Time>()
+            .put("-08:00:00", new Time(0))
+            .put("04:34:56", new Time(45296000L))
+            .put("-20:34:56", new Time(-45296000L))
+            .build();
+
+    for (Map.Entry<String, Time> entry : TEST_TIMES.entrySet()) {
+      String timeString = entry.getKey();
+      Time time = entry.getValue();
+      assertEquals(timeString, DateTime.formatTime(time, PST));
+    }
+  }
+
+  @Test
+  public void testFormatTimeIST() throws Exception {
+    // Test absolute UNIX epoch values in a positive GMT offset.
+    final Map<String, Time> TEST_TIMES =
+        new ImmutableMap.Builder<String, Time>()
+            .put("05:30:00", new Time(0))
+            .put("18:04:56", new Time(45296000L))
+            .put("-07:04:56", new Time(-45296000L))
+            .build();
+
+    for (Map.Entry<String, Time> entry : TEST_TIMES.entrySet()) {
+      String timeString = entry.getKey();
+      Time time = entry.getValue();
+      assertEquals(timeString, DateTime.formatTime(time, IST));
+    }
+  }
+
   @Test
   public void testParseTimestamp() throws Exception {
     // Check that our default time zone matches valueOf().