fixed maps and decimals

Author: chernser

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

@@ -1029,6 +1029,10 @@ private ClickHouseColumn readDynamicData() throws IOException {
         } else if (tag == ClickHouseDataType.Array.getBinTag()) {
             ClickHouseColumn elementColumn = readDynamicData();
             return ClickHouseColumn.of("v", "Array(" + elementColumn.getOriginalTypeName() + ")");
+        } else if (tag == ClickHouseDataType.Map.getBinTag()) {
+            ClickHouseColumn keyInfo = readDynamicData();
+            ClickHouseColumn valueInfo = readDynamicData();
+            return ClickHouseColumn.of("v", "Map(" + keyInfo.getOriginalTypeName() + "," + valueInfo.getOriginalTypeName() + ")");
         } else {
             type = ClickHouseDataType.binTag2Type.get(tag);
             if (type == null) {

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

@@ -174,16 +174,22 @@ public static ClickHouseColumn valueToColumnForDynamicType(Object value) {
         } else if (value instanceof BigDecimal) {
             BigDecimal d = (BigDecimal) value;
             String decType;
-            if (d.scale() <= ClickHouseDataType.Decimal32.getMaxScale()) {
-                decType = "Decimal32";
-            } else if (d.scale() <= ClickHouseDataType.Decimal64.getMaxScale()) {
-                decType = "Decimal64";
-            } else if (d.scale() <= ClickHouseDataType.Decimal128.getMaxScale()) {
+            int scale;
+            if (d.precision() > ClickHouseDataType.Decimal128.getMaxScale()) {
+                decType = "Decimal256";
+                scale = ClickHouseDataType.Decimal128.getMaxScale();
+            } else if (d.precision() > ClickHouseDataType.Decimal64.getMaxScale()) {
                 decType = "Decimal128";
+                scale = ClickHouseDataType.Decimal128.getMaxScale();
+            } else if (d.precision() > ClickHouseDataType.Decimal32.getMaxScale()) {
+                decType = "Decimal64";
+                scale = ClickHouseDataType.Decimal128.getMaxScale();
             } else {
-                decType = "Decimal256";
+                decType = "Decimal32";
+                scale = ClickHouseDataType.Decimal128.getMaxScale();
             }
-            column = ClickHouseColumn.of("v", decType + "(" + d.precision() +"," + d.scale() + ")");
+
+            column = ClickHouseColumn.of("v", decType + "(" + scale + ")");
         } else if (value instanceof Map<?,?>) {
             Map<?, ?> map = (Map<?, ?>) value;
             // TODO: handle empty map?
@@ -279,11 +285,9 @@ public static void writeDynamicTypeTag(OutputStream stream, ClickHouseColumn typ
             case Decimal128:
             case Decimal256:
                 stream.write(binTag);
-                stream.write(dt.getMaxPrecision());
-                stream.write(dt.getMaxScale());
-                //<tag><uint8_precision><uint8_scale>
+                BinaryStreamUtils.writeUnsignedInt8(stream, dt.getMaxPrecision());
+                BinaryStreamUtils.writeUnsignedInt8(stream, dt.getMaxScale());
                 break;
-
             case IntervalNanosecond:
             case IntervalMillisecond:
             case IntervalSecond:
@@ -313,8 +317,10 @@ public static void writeDynamicTypeTag(OutputStream stream, ClickHouseColumn typ
                 writeDynamicTypeTag(stream, arrayElemColumn);
                 break;
             case Map:
-                    stream.write(binTag);
-                    ///0x0F<var_uint_size><key_encoding_1><value_encoding_1>...<key_encoding_N><value_encoding_N>
+                stream.write(binTag);
+                // 0x27<key_type_encoding><value_type_encoding>
+                writeDynamicTypeTag(stream, typeColumn.getKeyInfo());
+                writeDynamicTypeTag(stream, typeColumn.getValueInfo());
                 break;
             case Tuple:
                 // Tuple(T1, ..., TN)

client-v2/src/test/java/com/clickhouse/client/datatypes/DataTypeTests.java

@@ -388,8 +388,6 @@ public void testVariantWithTuple() throws Exception {
                 });
     }
 
-
-
     @Test(groups = {"integration"})
     public void testDynamicWithPrimitives() throws Exception {
 
@@ -416,11 +414,11 @@ public void testDynamicWithPrimitives() throws Exception {
                 case DateTime:
                 case DateTime32:
                 case DateTime64:
-                case Decimal:
-                case Decimal32:
-                case Decimal64:
-                case Decimal128:
-                case Decimal256:
+//                case Decimal:
+//                case Decimal32:
+//                case Decimal64:
+//                case Decimal128:
+//                case Decimal256:
                     // requires fix
                     continue;
                 case Array:
@@ -486,10 +484,6 @@ public void testDynamicWithPrimitives() throws Exception {
                     case MultiPolygon:
                         strValue = row.getGeoMultiPolygon("field").toString();
                         break;
-                    case Decimal32:
-                        double v = row.getDouble("field");
-                        System.out.println(v);
-                        break;
                 }
                 System.out.println("field: " + strValue + " value " + value);
                 if (value.getClass().isPrimitive()) {
@@ -538,6 +532,41 @@ public void testDynamicWithArrays() throws Exception {
                 });
     }
 
+    @Test(groups = {"integration"})
+    public void testDynamicWithMaps() throws Exception {
+        Map<String, Byte> map1 = new HashMap<>();
+        map1.put("key1", (byte) 1);
+        map1.put("key2", (byte) 2);
+        map1.put("key3", (byte) 3);
+
+        testDynamicWith("maps",
+                new Object[]{
+                        map1
+                },
+                new String[]{
+                        "{key1=1, key2=2, key3=3}",
+                });
+
+
+        Map<Integer, String> map2 = new HashMap<>();
+        map2.put(1, "a");
+        map2.put(2, "b");
+
+        Map<String, String> map3 = new HashMap<>();
+        map3.put("1", "a");
+        map3.put("2", "b");
+
+        testDynamicWith("maps",
+                new Object[]{
+                        map2,
+                        map3
+                },
+                new String[]{
+                        "{1=a, 2=b}",
+                        "{1=a, 2=b}",
+                });
+    }
+
     @Data
     @AllArgsConstructor
     public static class DTOForDynamicPrimitivesTests {