[Fix] datetime

src/main/java/com/alipay/oceanbase/rpc/protocol/payload/impl/ObObjType.java

@@ -26,9 +26,8 @@
 import io.netty.buffer.ByteBuf;
 
 import java.sql.Timestamp;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.time.*;
+import java.util.*;
 
 public enum ObObjType {
 
@@ -893,15 +892,18 @@ public Comparable parseToComparable(Object o, ObCollationType ct)
          */
         @Override
         public byte[] encode(Object obj) {
-            return Serialization.encodeVi64(((Date) obj).getTime() * 1000L);
+            // Date do not have timezone, when we use getTime, system will recognize it as our system timezone and transform it into UTC Time, which will changed the time.
+            // We should add back the lose part.
+            long targetTs = ((Date) obj).getTime() + OffsetDateTime.now().getOffset().getTotalSeconds() * 1000L;
+            return Serialization.encodeVi64(targetTs * 1000L);
         }
 
         /*
          * Decode.
          */
         @Override
         public Object decode(ByteBuf buf, ObCollationType type) {
-            return new Timestamp(Serialization.decodeVi64(buf) / 1000L);
+            return new Date(Serialization.decodeVi64(buf) / 1000L - OffsetDateTime.now().getOffset().getTotalSeconds() * 1000L);
         }
 
         /*

src/test/java/com/alipay/oceanbase/rpc/ObTableClientTest.java

@@ -52,6 +52,9 @@
 import org.junit.Test;
 
 import java.lang.reflect.Field;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -2238,27 +2241,38 @@ public void testDateTime() throws Exception {
         client.addRowKeyElement("test_datetime_table", new String[] { "c1" });
 
         SimpleDateFormat sdf = new SimpleDateFormat(" yyyy-MM-dd HH:mm:ss ");
-        Date date1 = sdf.parse(" 2001-07-10 19:20:00 ");
-        Date date2 = sdf.parse(" 2002-07-10 19:20:00 ");
-        Date date3 = sdf.parse(" 2003-07-10 19:20:00 ");
-
+        Date date1 = sdf.parse(" 2022-04-21 12:00:00 ");
+        // 1650513600000 -> 2022-04-21 4:00:00
+        Date date11 = new Date(1650513600000L);
+        Date date2 = sdf.parse(" 2022-04-21 15:00:00 ");
         try {
-            client.insert("test_datetime_table", "1", new String[] { "c2" }, new Object[] { date1 });
-            client.insert("test_datetime_table", "2", new String[] { "c2" }, new Object[] { date2 });
-            client.insert("test_datetime_table", "3", new String[] { "c2" }, new Object[] { date3 });
+            // client.insert("test_datetime_table", "0", new String[] { "c2" }, new Object[] { date1 });
+            Connection connection = ObTableClientTestUtil.getConnection();
+            Statement statement = connection.createStatement();
+            statement.execute("insert into test_datetime_table values (0, FROM_UNIXTIME(1650513600))");
 
-            Map res = client.get("test_datetime_table", "1", new String[] { "c2" });
+            // 2022-04-21 12:00:00 CST = 1650513600000 -> insert by sql, get by obkv client
+            Map<String, Object> res = client.get("test_datetime_table", "0", new String[] { "c2" });
             Assert.assertEquals(date1, res.get("c2"));
-            res = client.get("test_datetime_table", "2", new String[] { "c2" });
-            Assert.assertEquals(date2, res.get("c2"));
-            res = client.get("test_datetime_table", "3", new String[] { "c2" });
-            Assert.assertEquals(date3, res.get("c2"));
-
-
+            Assert.assertEquals(date11, res.get("c2"));
+            Assert.assertEquals(date1.getTime(), ((Date) res.get("c2")).getTime());
+            Assert.assertEquals(date11.getTime(), ((Date) res.get("c2")).getTime());
+            Assert.assertEquals(1650513600000L, ((Date) res.get("c2")).getTime());
+            System.out.println(date1);
+            System.out.println(date11);
+            System.out.println(res.get("c2"));
+
+            // 2022-04-21 15:00:00 CST = 1650524400000 -> insert by obkv client, get by sql
+            client.insert("test_datetime_table", "1", new String[] { "c2" }, new Object[] { date2 });
+            ResultSet resultSet = statement.executeQuery("select * from test_datetime_table where c1 = 1");
+            resultSet.next();
+            Assert.assertEquals(date2, resultSet.getTimestamp("c2"));
+            Assert.assertEquals(date2.getTime(), resultSet.getDate("c2").getTime());
+            Assert.assertEquals(1650524400000L, resultSet.getDate("c2").getTime());
+            System.out.println(date2);
         } finally {
+            client.delete("test_datetime_table").setRowKey(colVal("c1", "0")).execute();
             client.delete("test_datetime_table").setRowKey(colVal("c1", "1")).execute();
-            client.delete("test_datetime_table").setRowKey(colVal("c1", "2")).execute();
-            client.delete("test_datetime_table").setRowKey(colVal("c1", "3")).execute();
         }
     }