Merge pull request #1344 from zhicwu/main

Fix deserialization issue of nested array in other nested types

Author: zhicwu

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 ### Bug Fixes
 * NoClassDefFoundError with clickhouse-apache-http-client-jdbc. [#1319](https://github.com/ClickHouse/clickhouse-java/issues/1319)
+* Nested array in tuple array is incorrectly deserialized. [#1324](https://github.com/ClickHouse/clickhouse-java/issues/1324)
 * client certificate password exposure in exception. [#1331](https://github.com/ClickHouse/clickhouse-java/issues/1331)
 
 ## 0.4.5, 2023-04-25

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

@@ -12,19 +12,6 @@
  */
 @FunctionalInterface
 public interface ClickHouseDeserializer {
-    static final class ResetValueDeserializer implements ClickHouseDeserializer {
-        private final ClickHouseDeserializer deserializer;
-
-        public ResetValueDeserializer(ClickHouseDeserializer deserializer) {
-            this.deserializer = deserializer;
-        }
-
-        @Override
-        public ClickHouseValue deserialize(ClickHouseValue ref, ClickHouseInputStream input) throws IOException {
-            return deserializer.deserialize(ref.resetToDefault(), input);
-        }
-    }
-
     static class CompositeDeserializer implements ClickHouseDeserializer {
         protected final ClickHouseDeserializer[] deserializers;
 

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

@@ -483,8 +483,7 @@ public ClickHouseDeserializer getDeserializer(ClickHouseDataConfig config, Click
                     }
                 } else {
                     deserializer = new BinaryDataProcessor.ArrayDeserializer(config, column, true,
-                            new ClickHouseDeserializer.ResetValueDeserializer(
-                                    getDeserializer(config, column.getNestedColumns().get(0))));
+                            getDeserializer(config, column.getNestedColumns().get(0)));
                 }
                 break;
             }

clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseArrayValue.java

@@ -573,7 +573,7 @@ public ClickHouseArraySequence allocate(int length, Class<?> clazz, int level) {
                         ? ClickHouseValues.createPrimitiveArray(clazz, 0, level)
                         : ClickHouseValues.createObjectArray(clazz, 0, level)));
             }
-        } else if (length() != length) {
+        } else {
             set((T[]) (clazz.isPrimitive()
                     ? ClickHouseValues.createPrimitiveArray(clazz, length, level)
                     : ClickHouseValues.createObjectArray(clazz, length, level)));

clickhouse-data/src/main/java/com/clickhouse/data/value/array/ClickHouseBoolArrayValue.java

@@ -519,7 +519,7 @@ public int hashCode() {
     public ClickHouseArraySequence allocate(int length, Class<?> clazz, int level) {
         if (length < 1) {
             resetToDefault();
-        } else if (length() != length) {
+        } else {
             set(new boolean[length]);
         }
         return this;

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

@@ -605,7 +605,7 @@ public int hashCode() {
     public ClickHouseArraySequence allocate(int length, Class<?> clazz, int level) {
         if (length < 1) {
             resetToDefault();
-        } else if (length() != length) {
+        } else {
             set(new byte[length]);
         }
         return this;

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

@@ -497,7 +497,7 @@ public int hashCode() {
     public ClickHouseArraySequence allocate(int length, Class<?> clazz, int level) {
         if (length < 1) {
             resetToDefault();
-        } else if (length() != length) {
+        } else {
             set(new double[length]);
         }
         return this;

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

@@ -497,7 +497,7 @@ public int hashCode() {
     public ClickHouseArraySequence allocate(int length, Class<?> clazz, int level) {
         if (length < 1) {
             resetToDefault();
-        } else if (length() != length) {
+        } else {
             set(new float[length]);
         }
         return this;

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

@@ -583,7 +583,7 @@ public int hashCode() {
     public ClickHouseArraySequence allocate(int length, Class<?> clazz, int level) {
         if (length < 1) {
             resetToDefault();
-        } else if (length() != length) {
+        } else {
             set(new int[length]);
         }
         return this;

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

@@ -595,7 +595,7 @@ public int hashCode() {
     public ClickHouseArraySequence allocate(int length, Class<?> clazz, int level) {
         if (length < 1) {
             resetToDefault();
-        } else if (length() != length) {
+        } else {
             set(new long[length]);
         }
         return this;