Merge branch 'roaringbitmap' of github.com:zhicwu/clickhouse-jdbc into roaringbitmap

Author: zhicwu

.github/workflows/benchmark.yml

@@ -108,6 +108,7 @@ jobs:
         continue-on-error: true
       - name: Build project
         run: |
+          mvn --batch-mode --update-snapshots -DskipTests -pl clickhouse-benchmark -am package
           cd clickhouse-benchmark
           java -jar target/benchmarks.jar -rf json ${{ github.event.inputs.options }} > output.txt
           echo "BENCHMARK_REPORT<<EOF" >> $GITHUB_ENV

clickhouse-benchmark/src/main/java/tech/clickhouse/benchmark/Basic.java

@@ -3,12 +3,13 @@
 import java.sql.ResultSet;
 import java.sql.Statement;
 import java.util.Collections;
+import java.util.Random;
 import org.openjdk.jmh.annotations.Benchmark;
 
 public class Basic extends JdbcBenchmark {
     @Benchmark
     public int selectOneRandomNumber(ClientState state) throws Throwable {
-        final int num = (int) (Math.random() * 1000);
+        final int num = new Random().nextInt(1000);
 
         try (Statement stmt = executeQuery(state, "select ? as n", num)) {
             ResultSet rs = stmt.getResultSet();
@@ -25,7 +26,7 @@ public int selectOneRandomNumber(ClientState state) throws Throwable {
 
     @Benchmark
     public int insertOneRandomNumber(ClientState state) throws Throwable {
-        final int num = (int) (Math.random() * 1000);
+        final int num = new Random().nextInt(1000);
 
         return executeInsert(state, "insert into test_insert(i) values(?)",
                 Collections.enumeration(Collections.singletonList(new Object[] { num })));

clickhouse-benchmark/src/main/java/tech/clickhouse/benchmark/Insertion.java

@@ -3,20 +3,21 @@
 import java.sql.Timestamp;
 // import java.util.Collections;
 import java.util.Enumeration;
+import java.util.Random;
 import org.openjdk.jmh.annotations.Benchmark;
 
 public class Insertion extends JdbcBenchmark {
     // @Benchmark
     // public int insertOneNumber(ClientState state) throws Throwable {
     // return executeInsert(state, "insert into test_insert(i) values(?)",
-    // Collections.enumeration(Collections.singletonList(new Object[] { (int)
-    // (Math.random() * 1000) })));
+    // Collections.enumeration(Collections.singletonList(new Object[] { new
+    // Random().nextInt(1000) })));
     // }
 
     @Benchmark
     public int insert10kUInt64Rows(ClientState state) throws Throwable {
         final int rows = 10000;
-        final int num = (int) (Math.random() * rows);
+        final int num = new Random().nextInt(rows);
 
         return executeInsert(state, "insert into test_insert(i) values(?)", new Enumeration<Object[]>() {
             int counter = 0;
@@ -36,7 +37,7 @@ public Object[] nextElement() {
     @Benchmark
     public int insert10kStringRows(ClientState state) throws Throwable {
         final int rows = 10000;
-        final int num = (int) (Math.random() * rows);
+        final int num = new Random().nextInt(rows);
 
         return executeInsert(state, "insert into test_insert(s) values(?)", new Enumeration<Object[]>() {
             int counter = 0;
@@ -56,7 +57,7 @@ public Object[] nextElement() {
     @Benchmark
     public int insert10kTimestampRows(ClientState state) throws Throwable {
         final int rows = 10000;
-        final int num = (int) (Math.random() * rows);
+        final int num = new Random().nextInt(rows);
 
         return executeInsert(state, "insert into test_insert(t) values(?)", new Enumeration<Object[]>() {
             int counter = 0;
@@ -68,7 +69,7 @@ public boolean hasMoreElements() {
 
             @Override
             public Object[] nextElement() {
-                return new Object[] { new Timestamp(num + (counter++)) };
+                return new Object[] { new Timestamp((long) num + (counter++)) };
             }
         });
     }

clickhouse-benchmark/src/main/java/tech/clickhouse/benchmark/JdbcBenchmark.java

@@ -114,14 +114,17 @@ protected Statement executeQuery(ClientState state, String sql, Object... values
         final Connection conn = state.getConnection();
 
         if (state.usePreparedStatement()) {
-            PreparedStatement s = conn.prepareStatement(sql);
-            s.setFetchSize(fetchSize);
-            setParameters(s, values).executeQuery();
-            stmt = s;
+            try (PreparedStatement s = conn.prepareStatement(sql)) {
+                stmt = s;
+                s.setFetchSize(fetchSize);
+                setParameters(s, values).executeQuery();
+            }
         } else {
-            stmt = conn.createStatement();
-            stmt.setFetchSize(fetchSize);
-            stmt.executeQuery(replaceParameters(sql, values));
+            try (Statement s = conn.createStatement()) {
+                stmt = s;
+                stmt.setFetchSize(fetchSize);
+                stmt.executeQuery(replaceParameters(sql, values));
+            }
         }
 
         return stmt;

clickhouse-benchmark/src/main/java/tech/clickhouse/benchmark/Query.java

@@ -3,13 +3,14 @@
 import java.sql.ResultSet;
 import java.sql.Statement;
 import java.sql.Timestamp;
+import java.util.Random;
 import org.openjdk.jmh.annotations.Benchmark;
 
 public class Query extends JdbcBenchmark {
     @Benchmark
     public int select10kUInt64Rows(ClientState state) throws Throwable {
         int rows = 10000;
-        int num = (int) (Math.random() * rows);
+        int num = new Random().nextInt(rows);
         try (Statement stmt = executeQuery(state, "select * from system.numbers where number > ? limit " + rows, num)) {
             ResultSet rs = stmt.getResultSet();
 
@@ -30,7 +31,7 @@ public int select10kUInt64Rows(ClientState state) throws Throwable {
     @Benchmark
     public int select10kStringRows(ClientState state) throws Throwable {
         int rows = 10000;
-        int num = (int) (Math.random() * rows);
+        int num = new Random().nextInt(rows);
         try (Statement stmt = executeQuery(state,
                 "select toString(number) as s from system.numbers where number > ? limit " + rows, num)) {
             ResultSet rs = stmt.getResultSet();
@@ -53,7 +54,7 @@ public int select10kStringRows(ClientState state) throws Throwable {
     @Benchmark
     public int select10kTimestampRows(ClientState state) throws Throwable {
         int rows = 10000;
-        int num = (int) (Math.random() * rows);
+        int num = new Random().nextInt(rows);
         try (Statement stmt = executeQuery(state,
                 "select toDateTime('2021-02-20 13:15:20') + number as d from system.numbers where number > ? limit "
                         + rows,

clickhouse-jdbc/src/test/java/ru/yandex/clickhouse/integration/ClickHouseStatementImplTest.java

@@ -1,5 +1,6 @@
 package ru.yandex.clickhouse.integration;
 
+import static org.testng.Assert.assertEquals;
 import static org.testng.AssertJUnit.assertNotNull;
 import static org.testng.AssertJUnit.assertNull;
 import static org.testng.AssertJUnit.assertTrue;
@@ -43,6 +44,7 @@ public class ClickHouseStatementImplTest {
     public void setUp() throws Exception {
         dataSource = ClickHouseContainerForTest.newDataSource();
         connection = dataSource.getConnection();
+        connection.createStatement().execute("CREATE DATABASE IF NOT EXISTS test");
     }
 
     @AfterTest
@@ -165,6 +167,7 @@ private boolean genNextString() {
                 return true;
             }
 
+            @Override
             public int read() {
                 if (si >= s.length()) {
                     if (!genNextString()) {
@@ -384,6 +387,25 @@ public void testArrayMetaActualExecutiom() throws SQLException {
 
     }
 
+    @Test
+    public void testInsertQueryUUIDArray() throws SQLException {
+        // issue #569
+        connection.createStatement().execute(
+            "DROP TABLE IF EXISTS test.uuidArray");
+        connection.createStatement().execute(
+            "CREATE TABLE IF NOT EXISTS test.uuidArray"
+          + "(id UInt8, arr Array(UUID)) "
+          + "ENGINE = TinyLog");
+        connection.createStatement().execute(
+            "INSERT INTO test.uuidArray VALUES(1, ['5ff22319-793d-4e6c-bdc1-916095a5a496'])");
+        ResultSet rs = connection.createStatement().executeQuery(
+            "SELECT * FROM test.uuidArray");
+        rs.next();
+        assertEquals(
+            rs.getArray(2).getArray(),
+            new UUID[] {UUID.fromString("5ff22319-793d-4e6c-bdc1-916095a5a496")});
+    }
+
     private static Object readField(Object object, String fieldName, long timeoutSecs) {
         long start = System.currentTimeMillis();
         Object value;