Merge pull request #2288 from ClickHouse/add-ipaddress-support

Add IP conversion and encoding

Author: Paultagoras

jdbc-v2/src/main/java/com/clickhouse/jdbc/PreparedStatementImpl.java

@@ -8,6 +8,7 @@
 import java.io.InputStream;
 import java.io.Reader;
 import java.math.BigDecimal;
+import java.net.InetAddress;
 import java.net.URL;
 import java.sql.Array;
 import java.sql.Blob;
@@ -517,6 +518,8 @@ private static String encodeObject(Object x) throws SQLException {
                 return encodeObject(((ZonedDateTime) x).toInstant());
             } else if (x instanceof Instant) {
                 return "fromUnixTimestamp64Nano(" + (((Instant) x).getEpochSecond() * 1_000_000_000L + ((Instant) x).getNano())+ ")";
+            } else if (x instanceof InetAddress) {
+                return "'" + ((InetAddress) x).getHostAddress() + "'";
             } else if (x instanceof Array) {
                 StringBuilder listString = new StringBuilder();
                 listString.append("[");

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

@@ -4,6 +4,8 @@
 import com.clickhouse.data.ClickHouseDataType;
 import com.clickhouse.jdbc.types.Array;
 
+import java.net.Inet4Address;
+import java.net.Inet6Address;
 import java.sql.Date;
 import java.sql.JDBCType;
 import java.sql.SQLException;
@@ -233,6 +235,12 @@ public static Object convert(Object value, Class<?> type) throws SQLException {
                 return java.sql.Time.valueOf(LocalTime.from((TemporalAccessor) value));
             } else if (type == java.sql.Array.class && value instanceof BinaryStreamReader.ArrayValue) {//It's cleaner to use getList but this handles the more generic getObject
                 return new Array(((BinaryStreamReader.ArrayValue) value).asList(), "Object", JDBCType.JAVA_OBJECT.getVendorTypeNumber());
+            } else if (type == Inet4Address.class && value instanceof Inet6Address) {
+                // Convert Inet6Address to Inet4Address
+                return Inet4Address.getByName(value.toString());
+            } else if (type == Inet6Address.class && value instanceof Inet4Address) {
+                // Convert Inet4Address to Inet6Address
+                return Inet6Address.getByName(value.toString());
             }
         } catch (Exception e) {
             throw new SQLException("Failed to convert " + value + " to " + type.getName(), ExceptionUtils.SQL_STATE_DATA_EXCEPTION);

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

@@ -9,6 +9,10 @@
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.net.Inet4Address;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.sql.Connection;
 import java.sql.Date;
 import java.sql.JDBCType;
@@ -317,35 +321,29 @@ public void testStringTypes() throws SQLException {
         runQuery("CREATE TABLE test_strings (order Int8, "
                 + "str String, fixed FixedString(6), "
                 + "enum Enum8('a' = 6, 'b' = 7, 'c' = 8), enum8 Enum8('a' = 1, 'b' = 2, 'c' = 3), enum16 Enum16('a' = 1, 'b' = 2, 'c' = 3), "
-                + "uuid UUID, ipv4 IPv4, ipv6 IPv6, "
-                + "escaped String "
+                + "uuid UUID, escaped String "
                 + ") ENGINE = MergeTree ORDER BY ()");
 
         // Insert random (valid) values
         long seed = System.currentTimeMillis();
         Random rand = new Random(seed);
-        log.info("Random seed was: {}", seed);
 
         String str = "string" + rand.nextInt(1000);
         String fixed = "fixed" + rand.nextInt(10);
         String enum8 = "a";
         String enum16 = "b";
         String uuid = UUID.randomUUID().toString();
-        String ipv4 = rand.nextInt(256) + "." + rand.nextInt(256) + "." + rand.nextInt(256) + "." + rand.nextInt(256);
-        String ipv6 = "2001:adb8:85a3:1:2:8a2e:370:7334";
         String escaped = "\\xA3\\xA3\\x12\\xA0\\xDF\\x13\\x4E\\x8C\\x87\\x74\\xD4\\x53\\xDB\\xFC\\x34\\x95";
 
         try (Connection conn = getConnection()) {
-            try (PreparedStatement stmt = conn.prepareStatement("INSERT INTO test_strings VALUES ( 1, ?, ?, ?, ?, ?, ?, ?, ?, ? )")) {
+            try (PreparedStatement stmt = conn.prepareStatement("INSERT INTO test_strings VALUES ( 1, ?, ?, ?, ?, ?, ?, ? )")) {
                 stmt.setString(1, str);
                 stmt.setString(2, fixed);
                 stmt.setString(3, enum8);
                 stmt.setString(4, enum8);
                 stmt.setString(5, enum16);
                 stmt.setString(6, uuid);
-                stmt.setString(7, ipv4);
-                stmt.setString(8, ipv6);
-                stmt.setString(9, escaped);
+                stmt.setString(7, escaped);
                 stmt.executeUpdate();
             }
         }
@@ -364,15 +362,52 @@ public void testStringTypes() throws SQLException {
                     assertEquals(rs.getString("enum16"), "b");
                     assertEquals(rs.getInt("enum16"), 2);
                     assertEquals(rs.getString("uuid"), uuid);
-                    assertEquals(rs.getString("ipv4"), "/" + ipv4);
-                    assertEquals(rs.getString("ipv6"), "/" + ipv6);
                     assertEquals(rs.getString("escaped"), escaped);
                     assertFalse(rs.next());
                 }
             }
         }
     }
 
+    @Test(groups = { "integration" })
+    public void testIpAddressTypes() throws SQLException, UnknownHostException {
+        runQuery("CREATE TABLE test_ips (order Int8, "
+                + "ipv4_ip IPv4, ipv4_name IPv4, ipv6 IPv6"
+                + ") ENGINE = MergeTree ORDER BY ()");
+
+        // Insert random (valid) values
+        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 ipv4AddressByName = Inet4Address.getByName("www.example.com");
+        InetAddress ipv6Address = Inet6Address.getByName("2001:adb8:85a3:1:2:8a2e:370:7334");
+
+        try (Connection conn = getConnection()) {
+            try (PreparedStatement stmt = conn.prepareStatement("INSERT INTO test_ips VALUES ( 1, ?, ?, ? )")) {
+                stmt.setObject(1, ipv4AddressByIp);
+                stmt.setObject(2, ipv4AddressByName);
+                stmt.setObject(3, ipv6Address);
+                stmt.executeUpdate();
+            }
+        }
+
+        // Check the results
+        try (Connection conn = getConnection()) {
+            try (Statement stmt = conn.createStatement()) {
+                try (ResultSet rs = stmt.executeQuery("SELECT * FROM test_ips ORDER BY order")) {
+                    assertTrue(rs.next());
+                    assertEquals(rs.getObject("ipv4_ip"), ipv4AddressByIp);
+                    assertEquals(rs.getString("ipv4_ip"), ipv4AddressByIp.toString());
+                    assertEquals(rs.getObject("ipv4_name"), ipv4AddressByName);
+                    assertEquals(rs.getObject("ipv6"), ipv6Address);
+                    assertEquals(rs.getString("ipv6"), ipv6Address.toString());
+                    assertFalse(rs.next());
+                }
+            }
+        }
+    }
+
     @Test(groups = { "integration" })
     public void testFloatTypes() throws SQLException {
         runQuery("CREATE TABLE test_floats (order Int8, "

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

@@ -1,6 +1,5 @@
 package com.clickhouse.jdbc;
 
-import com.clickhouse.client.api.data_formats.internal.BinaryStreamReader;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
@@ -10,11 +9,8 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Statement;
-import java.sql.Timestamp;
 import java.sql.Types;
-import java.time.ZoneId;
 import java.util.Arrays;
-import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.TimeZone;