Merge pull request #855 from zhicwu/prepare-patch

Prepare patch6

Author: zhicwu

README.md

@@ -112,7 +112,7 @@ Note: in general, the new driver(v0.3.2) is a few times faster with less memory
     <groupId>com.clickhouse</groupId>
     <!-- or clickhouse-grpc-client if you prefer gRPC -->
     <artifactId>clickhouse-http-client</artifactId>
-    <version>0.3.2-patch5</version>
+    <version>0.3.2-patch6</version>
 </dependency>
 ```
 
@@ -148,7 +148,7 @@ try (ClickHouseClient client = ClickHouseClient.newInstance(preferredProtocol);
     <!-- will stop using ru.yandex.clickhouse starting from 0.4.0  -->
     <groupId>com.clickhouse</groupId>
     <artifactId>clickhouse-jdbc</artifactId>
-    <version>0.3.2-patch5</version>
+    <version>0.3.2-patch6</version>
     <!-- below is only needed when all you want is a shaded jar -->
     <classifier>http</classifier>
     <exclusions>

clickhouse-client/README.md

@@ -9,7 +9,7 @@ Async Java client for ClickHouse. `clickhouse-client` is an abstract module, so
 <dependency>
     <groupId>com.clickhouse</groupId>
     <artifactId>clickhouse-http-client</artifactId>
-    <version>0.3.2-patch5</version>
+    <version>0.3.2-patch6</version>
 </dependency>
 ```
 

clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseOffsetDateTimeValue.java

@@ -356,7 +356,8 @@ public ClickHouseOffsetDateTimeValue update(String value) {
         if (value == null) {
             resetToNullOrEmpty();
         } else {
-            set(OffsetDateTime.parse(value, ClickHouseValues.DATETIME_FORMATTER));
+            set(LocalDateTime.parse(value, ClickHouseValues.DATETIME_FORMATTER).atZone(tz.toZoneId())
+                    .toOffsetDateTime());
         }
         return this;
     }

clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseRowBinaryProcessor.java

@@ -286,7 +286,7 @@ private void buildMappingsForDataTypes() {
             buildMappings(deserializers, serializers,
                     (r, f, c, i) -> ClickHouseDateValue.of(r,
                             BinaryStreamUtils.readDate32(i, f.getTimeZoneForDate())),
-                    (v, f, c, o) -> BinaryStreamUtils.writeDate(o, v.asDate(), f.getTimeZoneForDate()),
+                    (v, f, c, o) -> BinaryStreamUtils.writeDate32(o, v.asDate(), f.getTimeZoneForDate()),
                     ClickHouseDataType.Date32);
             buildMappings(deserializers, serializers, (r, f, c, i) -> c.getTimeZone() == null
                     ? ClickHouseDateTimeValue.of(r,

clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseByteArrayValue.java

@@ -414,7 +414,7 @@ public ClickHouseByteArrayValue update(String value) {
                 byte[] arr = new byte[list.size()];
                 int index = 0;
                 for (String v : list) {
-                    arr[index++] = Byte.parseByte(v);
+                    arr[index++] = v == null ? (byte) 0 : Byte.parseByte(v);
                 }
                 set(arr);
             }

clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseDoubleArrayValue.java

@@ -410,7 +410,7 @@ public ClickHouseDoubleArrayValue update(String value) {
                 double[] arr = new double[list.size()];
                 int index = 0;
                 for (String v : list) {
-                    arr[index++] = Double.parseDouble(v);
+                    arr[index++] = v == null ? 0D : Double.parseDouble(v);
                 }
                 set(arr);
             }

clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseFloatArrayValue.java

@@ -410,7 +410,7 @@ public ClickHouseFloatArrayValue update(String value) {
                 float[] arr = new float[list.size()];
                 int index = 0;
                 for (String v : list) {
-                    arr[index++] = Float.parseFloat(v);
+                    arr[index++] = v == null ? 0F : Float.parseFloat(v);
                 }
                 set(arr);
             }

clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseIntArrayValue.java

@@ -410,7 +410,7 @@ public ClickHouseIntArrayValue update(String value) {
                 int[] arr = new int[list.size()];
                 int index = 0;
                 for (String v : list) {
-                    arr[index++] = Integer.parseInt(v);
+                    arr[index++] = v == null ? 0 : Integer.parseInt(v);
                 }
                 set(arr);
             }

clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseLongArrayValue.java

@@ -410,7 +410,7 @@ public ClickHouseLongArrayValue update(String value) {
                 long[] arr = new long[list.size()];
                 int index = 0;
                 for (String v : list) {
-                    arr[index++] = Long.parseLong(v);
+                    arr[index++] = v == null ? 0L : Long.parseLong(v);
                 }
                 set(arr);
             }

clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseShortArrayValue.java

@@ -410,7 +410,7 @@ public ClickHouseShortArrayValue update(String value) {
                 short[] arr = new short[list.size()];
                 int index = 0;
                 for (String v : list) {
-                    arr[index++] = Short.parseShort(v);
+                    arr[index++] = v == null ? (short) 0 : Short.parseShort(v);
                 }
                 set(arr);
             }