added tuple support

Author: chernser

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

@@ -3,7 +3,6 @@
 import com.clickhouse.client.api.Client;
 import com.clickhouse.client.api.ClientException;
 import com.clickhouse.client.api.data_formats.internal.BinaryStreamReader;
-import com.clickhouse.client.api.insert.POJOSerializer;
 import com.clickhouse.client.api.query.POJOSetter;
 import com.clickhouse.data.ClickHouseAggregateFunction;
 import com.clickhouse.data.ClickHouseColumn;
@@ -40,6 +39,7 @@
 import static org.objectweb.asm.Opcodes.ALOAD;
 import static org.objectweb.asm.Opcodes.CHECKCAST;
 import static org.objectweb.asm.Opcodes.INVOKESPECIAL;
+import static org.objectweb.asm.Opcodes.INVOKESTATIC;
 import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL;
 import static org.objectweb.asm.Opcodes.RETURN;
 
@@ -347,8 +347,18 @@ public static POJOSetter compilePOJOSetter(Method setterMethod, ClickHouseColumn
                                 Type.getType(ClickHouseColumn.class),
                                 Type.getType(Class.class)),
                         false);
-                mv.visitTypeInsn(CHECKCAST, Type.getInternalName(targetType));
-                // cast to target type
+
+                if (targetType.isAssignableFrom(List.class) && column.getDataType() == ClickHouseDataType.Tuple) {
+                    mv.visitTypeInsn(CHECKCAST, Type.getInternalName(Object[].class));
+                    mv.visitMethodInsn(INVOKESTATIC,
+                            Type.getInternalName(Arrays.class),
+                            "asList",
+                            Type.getMethodDescriptor(Type.getType(List.class), Type.getType(Object[].class)),
+                            false);
+                } else {
+                    mv.visitTypeInsn(CHECKCAST, Type.getInternalName(targetType));
+                    // cast to target type
+                }
             }
 
             // finally call setter with the result of target class

client-v2/src/test/java/com/clickhouse/client/query/QuerySamplePOJO.java

@@ -67,7 +67,7 @@ public class QuerySamplePOJO {
     private Inet6Address ipv6;
 
     private List<String> array;
-//    private List<?> tuple;
+    private List<?> tuple;
     private Map<String, Integer> map;
     private List<Integer> nestedInnerInt;
     private List<String> nestedInnerString;
@@ -142,7 +142,7 @@ public QuerySamplePOJO() {
         }
 
         array = Arrays.asList("a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z");
-//        tuple = Arrays.asList(new Object[]{random.nextInt(), random.nextDouble(), "a", "b" });
+        tuple = Arrays.asList(random.nextInt(), random.nextDouble(), "a", "b");
         map = new HashMap<>();
         for (int i = 0; i < 10; i++) {
             map.put(String.valueOf((char) ('a' + i)), i + 1);
@@ -429,13 +429,13 @@ public void setArray(List<String> array) {
         this.array = array;
     }
 
-//    public List<?> getTuple() {
-//        return tuple;
-//    }
+    public List<?> getTuple() {
+        return tuple;
+    }
 
-//    public void setTuple(List<?> tuple) {
-//        this.tuple = tuple;
-//    }
+    public void setTuple(List<?> tuple) {
+        this.tuple = tuple;
+    }
 
     public Map<String, Integer> getMap() {
         return map;
@@ -559,7 +559,7 @@ public static String generateTableCreateSQL(String tableName) {
                 "ipv4 IPv4, " +
                 "ipv6 IPv6, " +
                 "array Array(String), " +
-//                "tuple Tuple(Int32, Int32, Int32, Int32, Int32, Int32, Int32, Int32, Int32, Int32), " +
+                "tuple Tuple(Int32, Float64, String, String), " +
                 "map Map(String, Int32), " +
                 "nested Nested (innerInt Int32, innerString String)" +
                 ") ENGINE = Memory";