fixed ip address conversion in JDBC. added more test for covner routine

Author: chernser

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

@@ -668,7 +668,7 @@ public static class ArrayValue {
 
         int nextPos = 0;
 
-        ArrayValue(Class<?> itemType, int length) {
+        public ArrayValue(Class<?> itemType, int length) {
             this.itemType = itemType;
             this.length = length;
 

jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/JdbcUtils.java

@@ -1,16 +1,19 @@
 package com.clickhouse.jdbc.internal;
 
 import com.clickhouse.client.api.data_formats.internal.BinaryStreamReader;
+import com.clickhouse.client.api.data_formats.internal.InetAddressConverter;
 import com.clickhouse.data.ClickHouseColumn;
 import com.clickhouse.data.ClickHouseDataType;
 import com.clickhouse.data.Tuple;
+import com.clickhouse.data.format.BinaryStreamUtils;
 import com.clickhouse.jdbc.types.Array;
 import com.google.common.collect.ImmutableMap;
 
 import java.awt.*;
 import java.math.BigInteger;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
+import java.net.InetAddress;
 import java.sql.Date;
 import java.sql.JDBCType;
 import java.sql.SQLException;
@@ -280,15 +283,15 @@ public static Object convert(Object value, Class<?> type, ClickHouseColumn colum
                 return new Array(((List<?>) value).toArray(), "Unknown", JDBCType.OTHER.getVendorTypeNumber());
             } else if (type == Inet4Address.class && value instanceof Inet6Address) {
                 // Convert Inet6Address to Inet4Address
-                return Inet4Address.getByName(value.toString());
+                return InetAddressConverter.convertToIpv4((InetAddress) value);
             } else if (type == Inet6Address.class && value instanceof Inet4Address) {
                 // Convert Inet4Address to Inet6Address
-                return Inet6Address.getByName(value.toString());
+                return InetAddressConverter.convertToIpv6((InetAddress) value);
             } else if (type == Tuple.class && value.getClass().isArray()) {
                 return new Tuple(true, value);
             }
         } catch (Exception e) {
-            throw new SQLException("Failed to convert " + value + " to " + type.getName(), ExceptionUtils.SQL_STATE_DATA_EXCEPTION);
+            throw new SQLException("Failed to convert " + value + " to " + type.getName(), ExceptionUtils.SQL_STATE_DATA_EXCEPTION, e);
         }
 
         throw new SQLException("Unsupported conversion from " + value.getClass().getName() + " to " + type.getName(), ExceptionUtils.SQL_STATE_DATA_EXCEPTION);

jdbc-v2/src/test/java/com/clickhouse/jdbc/DataTypeTests.java

@@ -2,11 +2,13 @@
 
 import com.clickhouse.client.api.ClientConfigProperties;
 import com.clickhouse.client.api.DataTypeUtils;
+import com.clickhouse.client.api.data_formats.internal.BinaryStreamReader;
 import com.clickhouse.client.api.internal.ServerSettings;
 import com.clickhouse.data.ClickHouseVersion;
 import com.clickhouse.data.Tuple;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
@@ -724,7 +726,7 @@ public void testIpAddressTypes() throws SQLException, UnknownHostException {
         long seed = System.currentTimeMillis();
         Random rand = new Random(seed);
 
-        InetAddress ipv4AddressByIp = Inet4Address.getByName(rand.nextInt(256) + "." + rand.nextInt(256) + "." + rand.nextInt(256) + "." + rand.nextInt(256));
+        InetAddress ipv4AddressByIp = Inet4Address.getByName("90.176.75.97");
         InetAddress ipv4AddressByName = Inet4Address.getByName("www.example.com");
         InetAddress ipv6Address = Inet6Address.getByName("2001:adb8:85a3:1:2:8a2e:370:7334");
         InetAddress ipv4AsIpv6 = Inet4Address.getByName("90.176.75.97");
@@ -745,11 +747,13 @@ public void testIpAddressTypes() throws SQLException, UnknownHostException {
                 try (ResultSet rs = stmt.executeQuery("SELECT * FROM test_ips ORDER BY order")) {
                     assertTrue(rs.next());
                     assertEquals(rs.getObject("ipv4_ip"), ipv4AddressByIp);
+                    assertEquals(rs.getObject("ipv4_ip", Inet6Address.class).toString(), "/0:0:0:0:0:ffff:5ab0:4b61");
                     assertEquals(rs.getString("ipv4_ip"), ipv4AddressByIp.toString());
                     assertEquals(rs.getObject("ipv4_name"), ipv4AddressByName);
                     assertEquals(rs.getObject("ipv6"), ipv6Address);
                     assertEquals(rs.getString("ipv6"), ipv6Address.toString());
                     assertEquals(rs.getObject("ipv4_as_ipv6"), ipv4AsIpv6);
+                    assertEquals(rs.getObject("ipv4_as_ipv6", Inet4Address.class), ipv4AsIpv6);
                     assertFalse(rs.next());
                 }
             }

jdbc-v2/src/test/java/com/clickhouse/jdbc/internal/JdbcUtilsTest.java

@@ -1,5 +1,43 @@
 package com.clickhouse.jdbc.internal;
 
+import com.clickhouse.client.api.data_formats.internal.BinaryStreamReader;
+import com.clickhouse.data.ClickHouseColumn;
+import org.testng.annotations.Test;
+
+import java.math.BigDecimal;
+import java.sql.SQLException;
+
+import static org.testng.Assert.assertEquals;
+
 public class JdbcUtilsTest {
 
+
+    @Test(groups = {"unit"})
+    public void testConvertPrimitiveTypes() throws SQLException {
+        assertEquals(JdbcUtils.convert(1, int.class), 1);
+        assertEquals(JdbcUtils.convert(1L, long.class), 1L);
+        assertEquals(JdbcUtils.convert("1", String.class), "1");
+        assertEquals(JdbcUtils.convert(1.0f, float.class), 1.0f);
+        assertEquals(JdbcUtils.convert(1.0, double.class), 1.0);
+        assertEquals(JdbcUtils.convert(true, boolean.class), true);
+        assertEquals(JdbcUtils.convert((short) 1, short.class), (short) 1);
+        assertEquals(JdbcUtils.convert((byte) 1, byte.class), (byte) 1);
+        assertEquals(JdbcUtils.convert(1.0d, BigDecimal.class), BigDecimal.valueOf(1.0d));
+    }
+
+
+    @Test(groups = {"unit"})
+    public void testConvertToArray() throws Exception {
+        ClickHouseColumn column = ClickHouseColumn.of("arr", "Array(Int32)");
+        BinaryStreamReader.ArrayValue arrayValue = new BinaryStreamReader.ArrayValue(int.class, 2);
+        arrayValue.set(0, 1);
+        arrayValue.set(1, 2);
+        java.sql.Array array = (java.sql.Array) JdbcUtils.convert(arrayValue, java.sql.Array.class, column);
+        Object arr = array.getArray();
+        assertEquals(array.getBaseTypeName(), "Int32");
+        assertEquals(arr.getClass().getComponentType(), Object.class);
+        Object[] arrs = (Object[]) arr;
+        assertEquals(arrs[0], 1);
+        assertEquals(arrs[1], 2);
+    }
 }