Merge pull request #596 from zhicwu/roaringbitmap

RoaringBitmap support

Author: zhicwu

.github/workflows/analysis.yml

@@ -61,6 +61,7 @@ jobs:
           # added,diff_context,file,nofilter
           filter_mode: 'added'
         if: github.event_name == 'pull_request_target' || github.event.inputs.pr != ''
+        continue-on-error: true
       - name: Update sonar config
         run: |
           sed -i -e 's|^\(.*<sonar.projectKey>\).*\(</sonar.projectKey>\)$|\1ClickHouse_clickhouse-jdbc\2|' \
@@ -73,3 +74,4 @@ jobs:
         run: |
           find . -type f -name "log4j.*" -exec rm -fv '{}' \;
           mvn -q --batch-mode -Panalysis verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
+        continue-on-error: true

.github/workflows/build.yml

@@ -34,7 +34,8 @@ jobs:
       matrix:
         java: [8, 11, 15]
         # most recent LTS releases as well as latest stable builds
-        clickhouse: ["20.8", "20.10", "20.12", "21.2", "latest"]
+        clickhouse: ["20.8", "21.3", "latest"]
+      fail-fast: false
     name: Build using JDK ${{ matrix.java }} against ClickHouse ${{ matrix.clickhouse }}
     steps:
       - name: Check out Git repository

.github/workflows/timezone.yml

@@ -1,4 +1,4 @@
-name: TimeZone Test
+name: TimeZone
 
 on:
   push:

clickhouse-benchmark/pom.xml

@@ -18,10 +18,9 @@
 
     <properties>
         <clickhouse4j-driver.version>1.4.4</clickhouse4j-driver.version>
-        <native-driver.version>2.5.3</native-driver.version>
         <mariadb-driver.version>2.7.2</mariadb-driver.version>
         <mysql-driver.version>8.0.23</mysql-driver.version>
-        <native-driver.version>2.5.3</native-driver.version>
+        <native-driver.version>2.5.4</native-driver.version>
         <testcontainers.version>1.15.2</testcontainers.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jmh.version>1.27</jmh.version>

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

@@ -4,7 +4,6 @@
 import java.sql.Statement;
 import java.util.Collections;
 import java.util.Random;
-
 import org.openjdk.jmh.annotations.Benchmark;
 
 public class Basic extends JdbcBenchmark {

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

@@ -4,7 +4,6 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Properties;
-
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Param;
 import org.openjdk.jmh.annotations.Scope;

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

@@ -1,5 +1,8 @@
 package tech.clickhouse.benchmark;
 
+/**
+ * Constant interface.
+ */
 public interface Constants {
     public static final String CLICKHOUSE_DRIVER = "clickhouse-jdbc";
 

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

@@ -4,7 +4,6 @@
 // import java.util.Collections;
 import java.util.Enumeration;
 import java.util.Random;
-
 import org.openjdk.jmh.annotations.Benchmark;
 
 public class Insertion extends JdbcBenchmark {

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

@@ -1,15 +1,25 @@
 package tech.clickhouse.benchmark;
 
-import org.openjdk.jmh.annotations.*;
-
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Enumeration;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
-
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Threads;
+import org.openjdk.jmh.annotations.Warmup;
+
+/**
+ * Base class for JDBC driver benchmarking.
+ */
 @State(Scope.Benchmark)
 @Warmup(iterations = 10, timeUnit = TimeUnit.SECONDS, time = 1)
 @Measurement(iterations = 10, timeUnit = TimeUnit.SECONDS, time = 1)

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

@@ -16,12 +16,14 @@ public enum JdbcDriver {
 
     // MariaDB Java Client
     MariadbJavaClient("org.mariadb.jdbc.Driver",
-            "jdbc:mariadb://%s:%s/%s?user=%s&password=%s&useSSL=false&useCompression=true&useServerPrepStmts=false&rewriteBatchedStatements=true&cachePrepStmts=true&serverTimezone=UTC",
+            "jdbc:mariadb://%s:%s/%s?user=%s&password=%s&useSSL=false&useCompression=true&useServerPrepStmts=false"
+                    + "&rewriteBatchedStatements=true&cachePrepStmts=true&serverTimezone=UTC",
             Constants.MYSQL_PORT),
 
     // MySQL Connector/J
     MysqlConnectorJava("com.mysql.cj.jdbc.Driver",
-            "jdbc:mysql://%s:%s/%s?user=%s&password=%s&useSSL=false&useCompression=true&useServerPrepStmts=false&rewriteBatchedStatements=true&cachePrepStmts=true&connectionTimeZone=UTC",
+            "jdbc:mysql://%s:%s/%s?user=%s&password=%s&useSSL=false&useCompression=true&useServerPrepStmts=false"
+                    + "&rewriteBatchedStatements=true&cachePrepStmts=true&connectionTimeZone=UTC",
             Constants.MYSQL_PORT);
 
     private final String className;