[CLEANUP]: Update clickhouse libs & actualise benchmarks (#443)

housepower · Aug 26, 2023 · dfe7ca6 · dfe7ca6
1 parent 21f2906
commit dfe7ca6
Show file tree

Hide file tree

Showing 15 changed files with 94 additions and 85 deletions.
diff --git a/clickhouse-integration/clickhouse-integration-spark/pom.xml b/clickhouse-integration/clickhouse-integration-spark/pom.xml
@@ -61,9 +61,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>ru.yandex.clickhouse</groupId>
+            <groupId>com.clickhouse</groupId>
             <artifactId>clickhouse-jdbc</artifactId>
-            <classifier>shaded</classifier>
+            <classifier>all</classifier>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/clickhouse-native-jdbc/pom.xml b/clickhouse-native-jdbc/pom.xml
@@ -57,9 +57,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>ru.yandex.clickhouse</groupId>
+            <groupId>com.clickhouse</groupId>
             <artifactId>clickhouse-jdbc</artifactId>
-            <classifier>shaded</classifier>
+            <classifier>all</classifier>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/clickhouse-native-jdbc/src/test/java/com/github/housepower/jdbc/AbstractITest.java b/clickhouse-native-jdbc/src/test/java/com/github/housepower/jdbc/AbstractITest.java
@@ -17,7 +17,7 @@
 import com.github.housepower.misc.StrUtil;
 import com.github.housepower.misc.SystemUtil;
 import org.junit.jupiter.api.BeforeAll;
-import org.testcontainers.containers.ClickHouseContainer;
+import org.testcontainers.clickhouse.ClickHouseContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 import org.testcontainers.utility.MountableFile;
@@ -35,33 +35,32 @@ public abstract class AbstractITest implements Serializable {
     protected static final ZoneId SERVER_TZ = ZoneId.of("UTC");
     protected static final String DRIVER_CLASS_NAME = "com.github.housepower.jdbc.ClickHouseDriver";
 
-    public static final String CLICKHOUSE_IMAGE = System.getProperty("CLICKHOUSE_IMAGE", "yandex/clickhouse-server:21.9");
+    public static final String CLICKHOUSE_IMAGE = System.getProperty("CLICKHOUSE_IMAGE", "clickhouse/clickhouse-server:21.9");
 
     protected static final String CLICKHOUSE_USER = SystemUtil.loadProp("CLICKHOUSE_USER", "default");
     protected static final String CLICKHOUSE_PASSWORD = SystemUtil.loadProp("CLICKHOUSE_PASSWORD", "");
     protected static final String CLICKHOUSE_DB = SystemUtil.loadProp("CLICKHOUSE_DB", "");
 
     protected static final int CLICKHOUSE_GRPC_PORT = 9100;
+    protected static final int CLICKHOUSE_HTTP_PORT = 8123;
+    protected static final int CLICKHOUSE_NATIVE_PORT = 9000;
 
     @Container
-    public static ClickHouseContainer container = (ClickHouseContainer) new ClickHouseContainer(CLICKHOUSE_IMAGE)
+    public static ClickHouseContainer container = new ClickHouseContainer(CLICKHOUSE_IMAGE)
             .withEnv("CLICKHOUSE_USER", CLICKHOUSE_USER)
             .withEnv("CLICKHOUSE_PASSWORD", CLICKHOUSE_PASSWORD)
             .withEnv("CLICKHOUSE_DB", CLICKHOUSE_DB)
-            .withExposedPorts(CLICKHOUSE_GRPC_PORT)
+            .withExposedPorts(CLICKHOUSE_HTTP_PORT, CLICKHOUSE_NATIVE_PORT, CLICKHOUSE_GRPC_PORT)
             .withCopyFileToContainer(MountableFile.forClasspathResource("grpc_config.xml"), "/etc/clickhouse-server/config.d/grpc_config.xml");
 
-
     protected static String CK_HOST;
-    protected static String CK_IP;
     protected static int CK_PORT;
     protected static int CK_GRPC_PORT;
 
     @BeforeAll
     public static void extractContainerInfo() {
         CK_HOST = container.getHost();
-        CK_IP = container.getContainerIpAddress();
-        CK_PORT = container.getMappedPort(ClickHouseContainer.NATIVE_PORT);
+        CK_PORT = container.getMappedPort(CLICKHOUSE_NATIVE_PORT);
         CK_GRPC_PORT = container.getMappedPort(CLICKHOUSE_GRPC_PORT);
     }
 
@@ -74,7 +73,7 @@ protected String getJdbcUrl() {
 
     protected String getJdbcUrl(Object... params) {
         StringBuilder sb = new StringBuilder();
-        int port = container.getMappedPort(ClickHouseContainer.NATIVE_PORT);
+        int port = container.getMappedPort(CLICKHOUSE_NATIVE_PORT);
         sb.append("jdbc:clickhouse://").append(container.getHost()).append(":").append(port);
         if (StrUtil.isNotEmpty(CLICKHOUSE_DB)) {
             sb.append("/").append(container.getDatabaseName());

diff --git a/...tive-jdbc/src/test/java/com/github/housepower/jdbc/BalancedClickhouseDataSourceITest.java b/...tive-jdbc/src/test/java/com/github/housepower/jdbc/BalancedClickhouseDataSourceITest.java
@@ -34,7 +34,7 @@ public class BalancedClickhouseDataSourceITest extends AbstractITest {
     @BeforeEach
     public void reset() {
         singleDs = new BalancedClickhouseDataSource(String.format(Locale.ROOT, "jdbc:clickhouse://%s:%s", CK_HOST, CK_PORT));
-        dualDs = new BalancedClickhouseDataSource(String.format(Locale.ROOT, "jdbc:clickhouse://%s:%s,%s:%s", CK_HOST, CK_PORT, CK_IP, CK_PORT));
+        dualDs = new BalancedClickhouseDataSource(String.format(Locale.ROOT, "jdbc:clickhouse://%s:%s,%s:%s", CK_HOST, CK_PORT, CK_HOST, CK_PORT));
     }
 
     @Test
@@ -121,7 +121,7 @@ public void testDisableConnection() {
     @Test
     public void testWorkWithEnabledUrl() throws Exception {
         BalancedClickhouseDataSource halfDatasource = new BalancedClickhouseDataSource(
-                String.format(Locale.ROOT, "jdbc:clickhouse://%s:%s,%s:%s", "not.existed.url", CK_PORT, CK_IP, CK_PORT), new Properties());
+                String.format(Locale.ROOT, "jdbc:clickhouse://%s:%s,%s:%s", "not.existed.url", CK_PORT, CK_HOST, CK_PORT), new Properties());
 
         halfDatasource.actualize();
 
@@ -173,20 +173,20 @@ public void testConstructWithProperties() {
 
         // without connection parameters
         BalancedClickhouseDataSource dataSource = new BalancedClickhouseDataSource(
-                String.format(Locale.ROOT, "jdbc:clickhouse://%s:%s,%s:%s/click", CK_HOST, CK_PORT, CK_IP, CK_PORT), properties);
+                String.format(Locale.ROOT, "jdbc:clickhouse://%s:%s,%s:%s/click", CK_HOST, CK_PORT, CK_HOST, CK_PORT), properties);
         ClickHouseConfig cfg = dataSource.getCfg();
         assertEquals(Duration.ofSeconds(6789), cfg.queryTimeout());
         assertEquals("888888", cfg.password());
         assertEquals("click", cfg.database());
         assertEquals(2, dataSource.getAllClickhouseUrls().size());
         assertEquals(String.format(Locale.ROOT, "jdbc:clickhouse://%s:%s/click", CK_HOST, CK_PORT),
                 dataSource.getAllClickhouseUrls().get(0));
-        assertEquals(String.format(Locale.ROOT, "jdbc:clickhouse://%s:%s/click", CK_IP, CK_PORT),
+        assertEquals(String.format(Locale.ROOT, "jdbc:clickhouse://%s:%s/click", CK_HOST, CK_PORT),
                 dataSource.getAllClickhouseUrls().get(1));
 
         // with connection parameters
         dataSource = new BalancedClickhouseDataSource(
-                String.format(Locale.ROOT, "jdbc:clickhouse://%s:%s,%s:%s/click?query_timeout=12345&user=readonly", CK_HOST, CK_PORT, CK_IP, CK_PORT), properties);
+                String.format(Locale.ROOT, "jdbc:clickhouse://%s:%s,%s:%s/click?query_timeout=12345&user=readonly", CK_HOST, CK_PORT, CK_HOST, CK_PORT), properties);
         cfg = dataSource.getCfg();
         assertEquals(Duration.ofSeconds(6789), cfg.queryTimeout());
         assertEquals("readonly", cfg.user());
@@ -195,7 +195,7 @@ public void testConstructWithProperties() {
         assertEquals(2, dataSource.getAllClickhouseUrls().size());
         assertEquals(String.format(Locale.ROOT, "jdbc:clickhouse://%s:%s/click?query_timeout=12345&user=readonly", CK_HOST, CK_PORT),
                 dataSource.getAllClickhouseUrls().get(0));
-        assertEquals(String.format(Locale.ROOT, "jdbc:clickhouse://%s:%s/click?query_timeout=12345&user=readonly", CK_IP, CK_PORT),
+        assertEquals(String.format(Locale.ROOT, "jdbc:clickhouse://%s:%s/click?query_timeout=12345&user=readonly", CK_HOST, CK_PORT),
                 dataSource.getAllClickhouseUrls().get(1));
     }
 }
diff --git a/...se-native-jdbc/src/test/java/com/github/housepower/jdbc/benchmark/AbstractIBenchmark.java b/...se-native-jdbc/src/test/java/com/github/housepower/jdbc/benchmark/AbstractIBenchmark.java
@@ -20,7 +20,7 @@
 import org.openjdk.jmh.runner.RunnerException;
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
-import org.testcontainers.containers.ClickHouseContainer;
+import org.testcontainers.clickhouse.ClickHouseContainer;
 
 import java.sql.*;
 import java.util.Enumeration;
@@ -31,14 +31,20 @@
 @State(Scope.Thread)
 public class AbstractIBenchmark {
 
+    /*
+    * HTTP API Port for http requests. used by JDBC, ODBC and web interfaces.
+    * */
+    protected static final int CLICKHOUSE_HTTP_PORT = 8123;
+    protected static final int CLICKHOUSE_NATIVE_PORT = 9000;
+
     public static final ClickHouseContainer container;
 
     static {
         container = new ClickHouseContainer(AbstractITest.CLICKHOUSE_IMAGE);
         container.start();
     }
 
-    private final Driver httpDriver = new ru.yandex.clickhouse.ClickHouseDriver();
+    private final Driver clickhouseJdbcDriver = new com.clickhouse.jdbc.ClickHouseDriver();
     private final Driver nativeDriver = new com.github.housepower.jdbc.ClickHouseDriver();
 
     public static void main(String[] args) throws RunnerException {
@@ -64,13 +70,13 @@ protected void withConnection(WithConnection withConnection, ConnectionType conn
             case NATIVE:
                 Class.forName("com.github.housepower.jdbc.ClickHouseDriver");
                 DriverManager.registerDriver(nativeDriver);
-                port = container.getMappedPort(ClickHouseContainer.NATIVE_PORT);
+                port = container.getMappedPort(CLICKHOUSE_NATIVE_PORT);
                 break;
 
-            case HTTP:
-                Class.forName("ru.yandex.clickhouse.ClickHouseDriver");
-                DriverManager.registerDriver(httpDriver);
-                port = container.getMappedPort(ClickHouseContainer.HTTP_PORT);
+            case JDBC:
+                Class.forName("com.clickhouse.jdbc.ClickHouseDriver");
+                DriverManager.registerDriver(clickhouseJdbcDriver);
+                port = container.getMappedPort(CLICKHOUSE_HTTP_PORT);
                 break;
 
             default:
@@ -111,6 +117,6 @@ public interface WithPreparedStatement {
     }
 
     public enum ConnectionType {
-        NATIVE, HTTP
+        NATIVE, JDBC
     }
 }
diff --git a/.../benchmark/RowBinaryDoubleIBenchmark.java → ...ower/jdbc/benchmark/DoubleIBenchmark.java b/.../benchmark/RowBinaryDoubleIBenchmark.java → ...ower/jdbc/benchmark/DoubleIBenchmark.java
@@ -16,12 +16,10 @@
 
 import com.google.common.base.Strings;
 import org.openjdk.jmh.annotations.Benchmark;
-import ru.yandex.clickhouse.ClickHouseStatement;
-import ru.yandex.clickhouse.domain.ClickHouseFormat;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class RowBinaryDoubleIBenchmark extends AbstractInsertIBenchmark {
+public class DoubleIBenchmark extends AbstractInsertIBenchmark {
     private final String columnType = "Float64";
 
     @Benchmark
@@ -46,20 +44,23 @@ public void benchInsertNative() throws Exception {
     }
 
     @Benchmark
-    public void benchInsertHttpRowBinary() throws Exception {
+    public void benchInsertJdbc() throws Exception {
         withConnection(connection -> {
             wideColumnPrepare(connection, columnType);
-            withStatement(connection, stmt -> {
-                ClickHouseStatement sth = (ClickHouseStatement) stmt;
-                sth.write().send("INSERT INTO " + getTableName(), stream -> {
-                    for (int i = 0; i < batchSize; i++) {
-                        for (int j = 0; j < columnNum; j++) {
-                            stream.writeFloat64(j + 1.0);
+            String params = Strings.repeat("?, ", columnNum);
+            withPreparedStatement(connection,
+                    "INSERT INTO " + getTableName() + " values(" + params.substring(0, params.length() - 2) + ")",
+                    pstmt -> {
+                        for (int i = 0; i < batchSize; i++) {
+                            for (int j = 0; j < columnNum; j++) {
+                                pstmt.setDouble(j + 1, j + 1.0);
+                            }
+                            pstmt.addBatch();
                         }
-                    }
-                }, ClickHouseFormat.RowBinary);
-            });
+                        int[] res = pstmt.executeBatch();
+                        assertEquals(res.length, batchSize);
+                    });
             wideColumnAfter(connection);
-        }, ConnectionType.HTTP);
+        }, ConnectionType.JDBC);
     }
 }
diff --git a/...ouse-native-jdbc/src/test/java/com/github/housepower/jdbc/benchmark/InsertIBenchmark.java b/...ouse-native-jdbc/src/test/java/com/github/housepower/jdbc/benchmark/InsertIBenchmark.java
@@ -61,7 +61,7 @@ public void benchInsertNative() throws Exception {
     }
 
     @Benchmark
-    public void benchInsertHttp() throws Exception {
-        withConnection(benchInsert, ConnectionType.HTTP);
+    public void benchInsertJdbc() throws Exception {
+        withConnection(benchInsert, ConnectionType.JDBC);
     }
 }
diff --git a/...dbc/benchmark/RowBinaryIntIBenchmark.java → ...sepower/jdbc/benchmark/IntIBenchmark.java b/...dbc/benchmark/RowBinaryIntIBenchmark.java → ...sepower/jdbc/benchmark/IntIBenchmark.java
@@ -16,12 +16,10 @@
 
 import com.google.common.base.Strings;
 import org.openjdk.jmh.annotations.Benchmark;
-import ru.yandex.clickhouse.ClickHouseStatement;
-import ru.yandex.clickhouse.domain.ClickHouseFormat;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class RowBinaryIntIBenchmark extends AbstractInsertIBenchmark {
+public class IntIBenchmark extends AbstractInsertIBenchmark {
     private final String columnType = "Int32";
 
     @Benchmark
@@ -46,21 +44,24 @@ public void benchInsertNative() throws Exception {
     }
 
     @Benchmark
-    public void benchInsertHttpRowBinary() throws Exception {
+    public void benchInsertJdbc() throws Exception {
         withConnection(connection -> {
             wideColumnPrepare(connection, columnType);
-            withStatement(connection, stmt -> {
-                ClickHouseStatement sth = (ClickHouseStatement) stmt;
-                sth.write().send("INSERT INTO " + getTableName(), stream -> {
-                    for (int i = 0; i < batchSize; i++) {
-                        for (int j = 0; j < columnNum; j++) {
-                            stream.writeInt32(j + 1);
+            String params = Strings.repeat("?, ", columnNum);
+            withPreparedStatement(connection,
+                    "INSERT INTO " + getTableName() + " values(" + params.substring(0, params.length() - 2) + ")",
+                    pstmt -> {
+                        for (int i = 0; i < batchSize; i++) {
+                            for (int j = 0; j < columnNum; j++) {
+                                pstmt.setObject(j + 1, j + 1);
+                            }
+                            pstmt.addBatch();
                         }
-                    }
-                }, ClickHouseFormat.RowBinary);
-            });
+                        int[] res = pstmt.executeBatch();
+                        assertEquals(res.length, batchSize);
+                    });
             wideColumnAfter(connection);
-        }, ConnectionType.HTTP);
+        }, ConnectionType.JDBC);
     }
 
 }
diff --git a/...ouse-native-jdbc/src/test/java/com/github/housepower/jdbc/benchmark/SelectIBenchmark.java b/...ouse-native-jdbc/src/test/java/com/github/housepower/jdbc/benchmark/SelectIBenchmark.java
@@ -47,7 +47,7 @@ public void benchSelectNative() throws Exception {
     }
 
     @Benchmark
-    public void benchSelectHTTP() throws Exception {
-        withConnection(benchSelect, ConnectionType.HTTP);
+    public void benchSelectJdbc() throws Exception {
+        withConnection(benchSelect, ConnectionType.JDBC);
     }
 }
diff --git a/.../benchmark/RowBinaryStringIBenchmark.java → ...ower/jdbc/benchmark/StringIBenchmark.java b/.../benchmark/RowBinaryStringIBenchmark.java → ...ower/jdbc/benchmark/StringIBenchmark.java
@@ -16,12 +16,10 @@
 
 import com.google.common.base.Strings;
 import org.openjdk.jmh.annotations.Benchmark;
-import ru.yandex.clickhouse.ClickHouseStatement;
-import ru.yandex.clickhouse.domain.ClickHouseFormat;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class RowBinaryStringIBenchmark extends AbstractInsertIBenchmark {
+public class StringIBenchmark extends AbstractInsertIBenchmark {
     private final String columnType = "String";
 
     @Benchmark
@@ -46,21 +44,24 @@ public void benchInsertNative() throws Exception {
     }
 
     @Benchmark
-    public void benchInsertHttpRowBinary() throws Exception {
+    public void benchInsertJdbc() throws Exception {
         withConnection(connection -> {
             wideColumnPrepare(connection, columnType);
-            withStatement(connection, stmt -> {
-                ClickHouseStatement sth = (ClickHouseStatement) stmt;
-                sth.write().send("INSERT INTO " + getTableName(), stream -> {
-                    for (int i = 0; i < batchSize; i++) {
-                        for (int j = 0; j < columnNum; j++) {
-                            stream.writeString(j + 1 + "");
+            String params = Strings.repeat("?, ", columnNum);
+            withPreparedStatement(connection,
+                    "INSERT INTO " + getTableName() + " values(" + params.substring(0, params.length() - 2) + ")",
+                    pstmt -> {
+                        for (int i = 0; i < batchSize; i++) {
+                            for (int j = 0; j < columnNum; j++) {
+                                pstmt.setObject(j + 1, j + 1 + "");
+                            }
+                            pstmt.addBatch();
                         }
-                    }
-                }, ClickHouseFormat.RowBinary);
-            });
+                        int[] res = pstmt.executeBatch();
+                        assertEquals(res.length, batchSize);
+                    });
             wideColumnAfter(connection);
-        }, ConnectionType.HTTP);
+        }, ConnectionType.JDBC);
     }
 
 }
diff --git a/.../src/test/java/com/github/housepower/jdbc/benchmark/WideColumnDoubleInsertIBenchmark.java b/.../src/test/java/com/github/housepower/jdbc/benchmark/WideColumnDoubleInsertIBenchmark.java
@@ -27,8 +27,8 @@ public void benchInsertNative() throws Exception {
     }
 
     @Benchmark
-    public void benchInsertHttp() throws Exception {
-        withConnection(benchInsert, ConnectionType.HTTP);
+    public void benchInsertJdbc() throws Exception {
+        withConnection(benchInsert, ConnectionType.JDBC);
     }
 
     public WithConnection benchInsert = connection -> {

diff --git a/...dbc/src/test/java/com/github/housepower/jdbc/benchmark/WideColumnIntInsertIBenchmark.java b/...dbc/src/test/java/com/github/housepower/jdbc/benchmark/WideColumnIntInsertIBenchmark.java
@@ -27,8 +27,8 @@ public void benchInsertNative() throws Exception {
     }
 
     @Benchmark
-    public void benchInsertHttp() throws Exception {
-        withConnection(benchInsert, ConnectionType.HTTP);
+    public void benchInsertJdbc() throws Exception {
+        withConnection(benchInsert, ConnectionType.JDBC);
     }
 
     public WithConnection benchInsert = connection -> {

diff --git a/.../src/test/java/com/github/housepower/jdbc/benchmark/WideColumnStringInsertIBenchmark.java b/.../src/test/java/com/github/housepower/jdbc/benchmark/WideColumnStringInsertIBenchmark.java
@@ -27,8 +27,8 @@ public void benchInsertNative() throws Exception {
     }
 
     @Benchmark
-    public void benchInsertHttp() throws Exception {
-        withConnection(benchInsert, ConnectionType.HTTP);
+    public void benchInsertJdbc() throws Exception {
+        withConnection(benchInsert, ConnectionType.JDBC);
     }
 
     public WithConnection benchInsert = connection -> {