SerializerUtils support OffsetDateTime and Instant

Author: abcfy2

clickhouse-data/src/main/java/com/clickhouse/data/ClickHouseUtils.java

@@ -362,7 +362,7 @@ public static List<Path> findFiles(String pattern, String... paths) throws IOExc
                 pattern.chars().anyMatch(
                         value -> {
                             if (value < ' ' || reservedCharsWindows.indexOf(value) != -1) {
-                                throw new IllegalArgumentException("File path contains reserved character <%s>".formatted((char) value));
+                                throw new IllegalArgumentException(String.format("File path contains reserved character <%s>", value));
                             }
                             return false;
                         }

client-v2/src/main/java/com/clickhouse/client/api/Client.java

@@ -1994,6 +1994,7 @@ private <T> CompletableFuture<T> runAsyncOperation(Supplier<T> resultSupplier, M
         return isAsync ? CompletableFuture.supplyAsync(resultSupplier, sharedOperationExecutor) : CompletableFuture.completedFuture(resultSupplier.get());
     }
 
+    @Override
     public String toString() {
         return "Client{" +
                 "endpoints=" + endpoints +

client-v2/src/main/java/com/clickhouse/client/api/data_formats/internal/SerializerUtils.java

@@ -23,10 +23,7 @@
 import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.sql.Timestamp;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
+import java.time.*;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -639,16 +636,22 @@ public static void writeDateTime32(OutputStream output, Object value, ZoneId tar
     }
 
     public static void writeDateTime(OutputStream output, Object value, ZoneId targetTz) throws IOException {
-        long ts = 0;
+        long ts;
         if (value instanceof LocalDateTime) {
             LocalDateTime dt = (LocalDateTime) value;
             ts = dt.atZone(targetTz).toEpochSecond();
         } else if (value instanceof ZonedDateTime) {
             ZonedDateTime dt = (ZonedDateTime) value;
-            ts = dt.withZoneSameInstant(targetTz).toEpochSecond();
+            ts = dt.toEpochSecond();
         } else if (value instanceof Timestamp) {
             Timestamp t = (Timestamp) value;
             ts = t.toLocalDateTime().atZone(targetTz).toEpochSecond();
+        } else if(value instanceof OffsetDateTime) {
+            OffsetDateTime dt = (OffsetDateTime) value;
+            ts = dt.toEpochSecond();
+        } else if (value instanceof Instant) {
+            Instant dt = (Instant) value;
+            ts = dt.getEpochSecond();
         } else {
             throw new IllegalArgumentException("Cannot convert " + value + " to DataTime");
         }
@@ -661,20 +664,30 @@ public static void writeDateTime64(OutputStream output, Object value, int scale,
             throw new IllegalArgumentException("Invalid scale value '" + scale + "'");
         }
 
-        long ts = 0;
-        long nano = 0;
+        long ts;
+        long nano;
         if (value instanceof LocalDateTime) {
-            ZonedDateTime dt = ((LocalDateTime) value).atZone(targetTz);
-            ts = dt.toEpochSecond();
-            nano = dt.getNano();
+            LocalDateTime dt = (LocalDateTime) value;
+            ZonedDateTime zdt = dt.atZone(targetTz);
+            ts = zdt.toEpochSecond();
+            nano = zdt.getNano();
         } else if (value instanceof ZonedDateTime) {
-            ZonedDateTime dt = ((ZonedDateTime) value).withZoneSameInstant(targetTz);
+            ZonedDateTime dt = (ZonedDateTime) value;
             ts = dt.toEpochSecond();
             nano = dt.getNano();
         } else if (value instanceof Timestamp) {
-            ZonedDateTime dt = ((Timestamp) value).toLocalDateTime().atZone(targetTz);
+            Timestamp dt = (Timestamp) value;
+            ZonedDateTime zdt = dt.toLocalDateTime().atZone(targetTz);
+            ts = zdt.toEpochSecond();
+            nano = zdt.getNano();
+        } else if (value instanceof OffsetDateTime) {
+            OffsetDateTime dt = (OffsetDateTime) value;
             ts = dt.toEpochSecond();
             nano = dt.getNano();
+        } else if (value instanceof Instant) {
+            Instant dt = (Instant) value;
+            ts = dt.getEpochSecond();
+            nano = dt.getNano();
         } else {
             throw new IllegalArgumentException("Cannot convert " + value + " to DataTime");
         }