almost all types are working

Author: chernser

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

@@ -97,6 +97,13 @@ public <T> T readValue(ClickHouseColumn column, Class<?> typeHint) throws IOExce
         int estimatedLen = column.getEstimatedLength();
         int precision = column.getPrecision();
         int scale = column.getScale();
+        if (dataType == ClickHouseDataType.Decimal || dataType == ClickHouseDataType.Decimal32 ||
+            dataType == ClickHouseDataType.Decimal64 || dataType == ClickHouseDataType.Decimal128 ||
+            dataType == ClickHouseDataType.Decimal256) {
+            precision = readByte();
+            scale = readByte();
+            System.out.println("p: " + precision + " " +scale);
+        }
         TimeZone timezone = column.getTimeZoneOrDefault(timeZone);
 
         try {
@@ -138,7 +145,7 @@ public <T> T readValue(ClickHouseColumn column, Class<?> typeHint) throws IOExce
                 case UInt256:
                     return (T) readBigIntegerLE(INT256_SIZE, true);
                 case Decimal:
-                    return (T) readDecimal(column.getPrecision(), column.getScale());
+                    return (T) readDecimal(precision, scale);
                 case Decimal32:
                     return (T) readDecimal(ClickHouseDataType.Decimal32.getMaxPrecision(), scale);
                 case Decimal64:
@@ -462,7 +469,6 @@ public BigDecimal readDecimal(int precision, int scale) throws IOException {
         } else {
             v = new BigDecimal(readBigIntegerLE(INT256_SIZE, false), scale);
         }
-
         return v;
     }
 
@@ -1010,31 +1016,14 @@ private ClickHouseDataType readDynamicData() throws IOException {
         } else if (tag == ClickHouseDataType.CUSTOM_TYPE_BIN_TAG) {
             String typeName = readString(input);
             return ClickHouseDataType.valueOf(typeName);
-        } else if (tag == ClickHouseDataType.Decimal.getBinTag()) {
-            byte precision = readByte();
-            byte scale = readByte();
-            System.out.println("precision: " + precision + " scale: " + scale);
-            return ClickHouseDataType.Decimal;
         } else if (tag == ClickHouseDataType.Decimal32.getBinTag()) {
-            byte precision = readByte();
-            byte scale = readByte();
-            System.out.println("precision: " + precision + " scale: " + scale);
             return ClickHouseDataType.Decimal;
         } else if (tag == ClickHouseDataType.Decimal64.getBinTag()) {
-            byte precision = readByte();
-            byte scale = readByte();
-            System.out.println("precision: " + precision + " scale: " + scale);
-            return ClickHouseDataType.Decimal64;
+            return ClickHouseDataType.Decimal;
         } else if (tag == ClickHouseDataType.Decimal128.getBinTag()) {
-            byte precision = readByte();
-            byte scale = readByte();
-            System.out.println("precision: " + precision + " scale: " + scale);
-            return ClickHouseDataType.Decimal128;
+            return ClickHouseDataType.Decimal;
         } else if (tag == ClickHouseDataType.Decimal256.getBinTag()) {
-            byte precision = readByte();
-            byte scale = readByte();
-            System.out.println("precision: " + precision + " scale: " + scale);
-            return ClickHouseDataType.Decimal256;
+            return ClickHouseDataType.Decimal;
         } else {
             type = ClickHouseDataType.binTag2Type.get(tag);
             if (type == null) {

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

@@ -168,7 +168,17 @@ public static ClickHouseColumn valueToColumnForDynamicType(Object value) {
             column = ClickHouseColumn.of("v", "DateTime(" + dt.getZone().getId() + ")");
         } else if (value instanceof BigDecimal) {
             BigDecimal d = (BigDecimal) value;
-            column = ClickHouseColumn.of("v", "Decimal256(" + d.precision() + ", " + d.scale() + ")");
+            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()) {
+                decType = "Decimal128";
+            } else {
+                decType = "Decimal256";
+            }
+            column = ClickHouseColumn.of("v", decType + "(" + d.precision() +"," + d.scale() + ")");
         } else if (value instanceof Map<?,?>) {
             Map<?, ?> map = (Map<?, ?>) value;
             // TODO: handle empty map?

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

@@ -466,6 +466,10 @@ 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()) {