Merge pull request #1955 from ClickHouse/v2_fix_number_conversion

[client-v2] removed float/double overflow check

Author: chernser

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

@@ -99,14 +99,16 @@ public interface ClickHouseBinaryFormatReader extends AutoCloseable {
 
     /**
      * Reads column with name `colName` as a float.
-     *
+     * Warning: this method may lose precision for float values.
+     * 
      * @param colName
      * @return
      */
     float getFloat(String colName);
 
     /**
      * Reads column with name `colName` as a double.
+     * Warning: this method may lose precision for double values.
      *
      * @param colName
      * @return
@@ -321,6 +323,7 @@ public interface ClickHouseBinaryFormatReader extends AutoCloseable {
 
     /**
      * Reads column with name `colName` as a float.
+     * Warning: this method may lose precision for float values.
      *
      * @param index
      * @return
@@ -329,6 +332,7 @@ public interface ClickHouseBinaryFormatReader extends AutoCloseable {
 
     /**
      * Reads column with name `colName` as a double.
+     * Warning: this method may lose precision for double values.
      *
      * @param index
      * @return

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

@@ -682,12 +682,7 @@ public static float toFloat(Object value) {
             if (value instanceof Float) {
                 return (Float) value;
             } else if (value instanceof Number) {
-                Number number = (Number) value;
-                 if (number.floatValue() == number.doubleValue()) {
-                    return number.floatValue();
-                } else {
-                    throw new ArithmeticException("float overflow: " + value + " cannot be presented as float");
-                }
+                return ((Number) value).floatValue();
             } else if (value instanceof Boolean) {
                 return (Boolean) value ? 1.0f : 0.0f;
             } else if (value instanceof String ) {
@@ -701,12 +696,7 @@ public static double toDouble(Object value) {
             if (value instanceof Double) {
                 return (Double) value;
             } else if (value instanceof Number) {
-                Number number = (Number) value;
-                if (number.doubleValue() == number.floatValue()) {
-                    return number.doubleValue();
-                } else {
-                    throw new ArithmeticException("double overflow: " + value + " cannot be presented as double");
-                }
+                return ((Number) value).doubleValue();
             } else if (value instanceof Boolean) {
                 return (Boolean) value ? 1.0 : 0.0;
             } else if (value instanceof String) {

client-v2/src/main/java/com/clickhouse/client/api/query/GenericRecord.java

@@ -288,6 +288,7 @@ public interface GenericRecord {
 
     /**
      * Reads column with name `colName` as a float.
+     * Warning: there is no overflow check for float.
      *
      * @param index
      * @return
@@ -296,6 +297,7 @@ public interface GenericRecord {
 
     /**
      * Reads column with name `colName` as a double.
+     * Warning: there is no overflow check for double.
      *
      * @param index
      * @return

client-v2/src/test/java/com/clickhouse/client/api/data_formats/ClickHouseBinaryFormatReaderTest.java

@@ -86,10 +86,10 @@ public void testReadingNumbersWithOverflow() throws IOException {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
 
         String[] names = new String[]{ "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p",
-                "q", "r"};
+                "q", "r", "s"};
         String[] types = new String[]{"Int8", "Int16", "Int32", "Int64", "UInt8", "UInt16", "UInt32", "UInt64",
                 "Int128", "Int256", "UInt128", "UInt256", "Float32", "Float64",
-                "Decimal32(3)", "Decimal64(3)", "Decimal128(4)", "Decimal256(4)"};
+                "Decimal32(3)", "Decimal64(3)", "Decimal128(4)", "Decimal256(4)", "Float64"};
 
         BinaryStreamUtils.writeVarInt(out, names.length);
         for (String name : names) {
@@ -117,7 +117,7 @@ public void testReadingNumbersWithOverflow() throws IOException {
         BinaryStreamUtils.writeDecimal64(out, BigDecimal.valueOf(10000000.10000), 3); // p
         BinaryStreamUtils.writeDecimal128(out, BigDecimal.valueOf(1000000000.1000000), 4); // q
         BinaryStreamUtils.writeDecimal256(out, BigDecimal.valueOf(1000000000.1000000), 4); // r
-
+        BinaryStreamUtils.writeFloat64(out, 123.456); // s
 
         InputStream in = new ByteArrayInputStream(out.toByteArray());
         QuerySettings querySettings = new QuerySettings().setUseTimeZone(TimeZone.getTimeZone("UTC").toZoneId().getId());
@@ -130,15 +130,23 @@ public void testReadingNumbersWithOverflow() throws IOException {
         Consumer<String> shortConsumer = name -> Assert.expectThrows(ArithmeticException.class, () -> reader.getShort(name));
         Consumer<String> integerConsumer = name -> Assert.expectThrows(ArithmeticException.class, () -> reader.getInteger(name));
         Consumer<String> longConsumer = name -> Assert.expectThrows(ArithmeticException.class, () -> reader.getLong(name));
-        Consumer<String> floatConsumer = name -> Assert.expectThrows(ArithmeticException.class, () -> reader.getFloat(name));
-        Consumer<String> doubleConsumer = name -> Assert.expectThrows(ArithmeticException.class, () -> reader.getDouble(name));
+//        Consumer<String> floatConsumer = name -> Assert.expectThrows(ArithmeticException.class, () -> reader.getFloat(name));
+//        Consumer<String> doubleConsumer = name -> Assert.expectThrows(ArithmeticException.class, () -> reader.getDouble(name));
 
         Arrays.stream("b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r".split(",")).forEach(byteConsumer);
         Arrays.stream("c,d,f,g,h,i,j,k,l,m,n,o,p,q,r".split(",")).forEach(shortConsumer);
         Arrays.stream("d,g,h,i,j,k,l".split(",")).forEach(integerConsumer);
         Arrays.stream("h,i,j,k,l".split(",")).forEach(longConsumer);
-        Arrays.stream("h,i,j,k,l,n,p,q,r".split(",")).forEach(floatConsumer);
-        Arrays.stream("h,i,j,k,l,p,q,r".split(",")).forEach(doubleConsumer);
+//        Arrays.stream("h,i,j,k,l,n,p,q,r".split(",")).forEach(floatConsumer);
+//        Arrays.stream("h,i,j,k,l,p,q,r".split(",")).forEach(doubleConsumer);
+
+        Assert.assertEquals(reader.getFloat("m"), 900000.123f);
+        Assert.assertEquals(reader.getDouble("m"), 900000.123f);
+
+        Assert.assertEquals(reader.getBigDecimal("n"), BigDecimal.valueOf(1000000.333));
+        Assert.assertEquals(reader.getBigDecimal("n"), BigDecimal.valueOf(1000000.333));
+
+        Assert.assertEquals(reader.getFloat("s"), 123.456f);
     }
 
     @Test

client-v2/src/test/java/com/clickhouse/client/internal/SmallTests.java

@@ -6,6 +6,8 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import java.math.BigDecimal;
+
 public class SmallTests {