Merge pull request #414 from arenadata/add_decimal_rowbinary_stream

add tests and add bytes to decimal convert in binary input stream

Author: alex-krash

src/main/java/ru/yandex/clickhouse/util/ClickHouseRowBinaryInputStream.java

@@ -9,6 +9,7 @@
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -386,6 +387,29 @@ public UUID readUUID() throws IOException {
 		return new UUID(bb.getLong(), bb.getLong());
 	}
 
+    public BigDecimal readDecimal32(int scale) throws IOException {
+        int i = in.readInt();
+        BigDecimal ten = BigDecimal.valueOf(10);
+        BigDecimal s = ten.pow(scale);
+        return new BigDecimal(i).divide(s);
+    }
+
+    public BigDecimal readDecimal64(int scale) throws IOException {
+        long i = in.readLong();
+        BigDecimal ten = BigDecimal.valueOf(10);
+        BigDecimal s = ten.pow(scale);
+        return new BigDecimal(i).divide(s);
+    }
+
+    public BigDecimal readDecimal128(int scale) throws IOException {
+        byte[] r = new byte[16];
+        for (int i = 16; i > 0; i--) {
+            r[i - 1] = in.readByte();
+        }
+        BigDecimal res = new BigDecimal(new BigInteger(r), scale);
+        return res;
+    }
+
 	@Override
 	public void close() throws IOException {
 		in.close();

src/test/java/ru/yandex/clickhouse/util/ClickHouseRowBinaryInputStreamTest.java

@@ -5,8 +5,7 @@
 import ru.yandex.clickhouse.settings.ClickHouseProperties;
 
 import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.nio.charset.Charset;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.TimeZone;
 
@@ -80,6 +79,26 @@ public void testUInt64AsLong() throws Exception {
 		assertEquals(input.readUInt64AsLong(), UnsignedLong.valueOf("18446744073709551615").longValue());
 	}
 
+	@Test
+	public void testDecimal128() throws Exception {
+		ClickHouseRowBinaryInputStream input = prepareStream(new byte[]{-10, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0});
+		assertEquals(input.readDecimal128(3), new BigDecimal("10.230"));
+		ClickHouseRowBinaryInputStream input2 = prepareStream(new byte[]{-2, 127, -58, -92, 126, -115, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0});
+		assertEquals(input2.readDecimal128(2), new BigDecimal("9999999999999.98"));
+	}
+
+	@Test
+	public void testDecimal64() throws Exception {
+		ClickHouseRowBinaryInputStream input = prepareStream(new byte[]{-10, 39, 0, 0, 0, 0, 0, 0});
+		assertEquals(input.readDecimal64(3), new BigDecimal("10.23"));
+	}
+
+	@Test
+	public void testDecimal32() throws Exception {
+		ClickHouseRowBinaryInputStream input = prepareStream(new byte[]{-10, 39, 0, 0});
+		assertEquals(input.readDecimal32(3), new BigDecimal("10.23"));
+	}
+
 	@Test
 	public void testFixedString() throws Exception {
 		ClickHouseRowBinaryInputStream input = prepareStream(new byte[]{48, 49, 48, 49, 55, 49, 50, 50, 48, 48});

src/test/java/ru/yandex/clickhouse/util/ClickHouseRowBinaryStreamTest.java

@@ -6,6 +6,7 @@
 import ru.yandex.clickhouse.settings.ClickHouseProperties;
 
 import java.io.ByteArrayOutputStream;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.TimeZone;
 import java.util.UUID;
@@ -76,6 +77,47 @@ public void write(ClickHouseRowBinaryStream stream) throws Exception {
         );
     }
 
+    @Test
+    public void testDecimal32() throws Exception {
+        check(
+                new StreamWriter() {
+                    @Override
+                    public void write(ClickHouseRowBinaryStream stream) throws Exception {
+                        stream.writeDecimal32(new BigDecimal(10.23), 3);
+                        stream.writeDecimal32(new BigDecimal(-99999.9998), 4);
+                    }
+                },
+                new byte[]{-10, 39, 0, 0, 2, 54, 101, -60}
+        );
+    }
+
+    @Test
+    public void testDecimal64() throws Exception {
+        check(
+                new StreamWriter() {
+                    @Override
+                    public void write(ClickHouseRowBinaryStream stream) throws Exception {
+                        stream.writeDecimal64(new BigDecimal(10.23), 3);
+                        stream.writeDecimal64(new BigDecimal(-9999999999.99999998), 8);
+                    }
+                },
+                new byte[]{-10, 39, 0, 0, 0, 0, 0, 0, 0, 0, -100, 88, 76, 73, 31, -14}
+        );
+    }
+
+    @Test
+    public void testDecimal128() throws Exception {
+        check(
+                new StreamWriter() {
+                    @Override
+                    public void write(ClickHouseRowBinaryStream stream) throws Exception {
+                        stream.writeDecimal128(new BigDecimal(10.23), 3);
+                    }
+                },
+                new byte[]{-10, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+        );
+    }
+
     @Test
     public void testOne() throws Exception {