merge 0.3.0 release

.github/workflows/analysis.yml

@@ -6,7 +6,10 @@ on:
       - master
       - develop
       - 0.2.x
-  pull_request:
+  pull_request_target:
+    branches:
+      - master
+      - develop
     types:
       - opened
       - synchronize
@@ -28,7 +31,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           ref: ${{ github.event.pull_request.head.sha }}
-        if: github.event_name == 'pull_request'
+        if: github.event_name == 'pull_request_target'
       - name: Check out PR
         run: |
           git fetch --no-tags --prune --progress --no-recurse-submodules --depth=1 \
@@ -57,11 +60,18 @@ jobs:
           reporter: 'github-pr-check'
           # added,diff_context,file,nofilter
           filter_mode: 'added'
-        if: github.event_name == 'pull_request' || github.event.inputs.pr != ''
+        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|' \
+            -e 's|^\(.*<sonar.organization>\).*\(</sonar.organization>\)$|\1clickhouse-java\2|' pom.xml
+        if: github.repository_owner == 'ClickHouse'
       - name: Build and analyze
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         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/benchmark.yml

@@ -1,7 +1,10 @@
 name: Benchmark
 
 on:
-  pull_request:
+  pull_request_target:
+    branches:
+      - master
+      - develop
     types:
       - opened
       - synchronize
@@ -36,7 +39,7 @@ jobs:
   benchmark-pull-request:
     runs-on: ubuntu-latest
     name: Benchmark pull request
-    if: github.event_name == 'pull_request'
+    if: github.event_name == 'pull_request_target'
     steps:
       - name: Check out repository
         uses: actions/checkout@v2
@@ -69,13 +72,10 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
-            if (process.env.BENCHMARK_REPORT) {
-              github.issues.createComment({
-                issue_number: context.issue.number,
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                body: '```\n' + process.env.BENCHMARK_REPORT + '\n```'
-              });
+            const report = process.env.BENCHMARK_REPORT;
+            const { issue: { number: issue_number }, repo: { owner, repo } } = context;
+            if (report) {
+              github.issues.createComment({issue_number, owner, repo, body: '```\n' + report + '\n```'});
             }
 
   benchmark-on-demand:
@@ -108,8 +108,8 @@ jobs:
         continue-on-error: true
       - name: Build project
         run: |
+          mvn --batch-mode --update-snapshots -DskipTests -pl clickhouse-benchmark -am package
           cd clickhouse-benchmark
-          mvn --batch-mode --update-snapshots -DclickhouseVersion=${{ github.event.inputs.clickhouse }} install
           java -jar target/benchmarks.jar -rf json ${{ github.event.inputs.options }} > output.txt
           echo "BENCHMARK_REPORT<<EOF" >> $GITHUB_ENV
           tail -n +$(grep -n '^REMEMBER:' output.txt | tail -1 | awk -F: '{print $1+6}') output.txt | head -n -2 | grep -v ':·' >> $GITHUB_ENV

.github/workflows/build.yml

@@ -32,9 +32,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11]
+        java: [8, 11, 15]
         # most recent LTS releases as well as latest stable builds
-        clickhouse: ["19.14", "20.3", "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
@@ -56,25 +57,6 @@ jobs:
           key: ${{ runner.os }}-build-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-build-
-      - name: Generate build properties
-        uses: actions/github-script@v3
-        id: props
-        env:
-          CURRENT_VERSION: ${{ steps.version.outputs.value }}
-        with:
-          script: |
-            const timezones = [
-              'Asia/Chongqing', 'America/Los_Angeles', 'Etc/UTC', 'Europe/Berlin', 'Europe/Moscow'
-            ];
-            // surprise me
-            return {
-                clickhouse: timezones[Math.floor(Math.random() * Math.floor(timezones.length))] || '',
-                java: timezones[Math.floor(Math.random() * Math.floor(timezones.length))] || ''
-            };
       - name: Build with Maven
         run: |
-          find . -type f -name "pom.xml" -exec sed -i -e 's|.*argLine.*timezone=.*||g' '{}' \;
-          mvn --batch-mode --update-snapshots \
-            -DclickhouseVersion=${{ matrix.clickhouse }} \
-            -DclickhouseTimezone=${{ fromJSON(steps.props.outputs.result).clickhouse }} \
-            -Duser.timezone=${{ fromJSON(steps.props.outputs.result).java }} verify
+          mvn --batch-mode --update-snapshots -DclickhouseVersion=${{ matrix.clickhouse }} verify

.github/workflows/timezone.yml

@@ -0,0 +1,62 @@
+name: TimeZone
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+    paths-ignore:
+      - "**.md"
+      - "docs/**"
+      - "**/CHANGELOG"
+
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+    paths-ignore:
+      - "**.md"
+      - "docs/**"
+      - "**/CHANGELOG"
+
+  workflow_dispatch:
+    inputs:
+      pr:
+        description: "Pull request#"
+        required: false
+
+jobs:
+  timezone:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        serverTz: ["Asia/Chongqing", "America/Los_Angeles", "Etc/UTC", "Europe/Berlin", "Europe/Moscow"]
+        clientTz: ["Asia/Chongqing", "America/Los_Angeles", "Etc/UTC", "Europe/Berlin", "Europe/Moscow"]
+      fail-fast: false
+    name: "Test TimeZones - Server: ${{ matrix.serverTz }}, Client: ${{ matrix.clientTz }}"
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v2
+      - name: Check out PR
+        run: |
+          git fetch --no-tags --prune --progress --no-recurse-submodules --depth=1 \
+            origin pull/${{ github.event.inputs.pr }}/merge:merged-pr && git checkout merged-pr
+        if: github.event.inputs.pr != ''
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Cache maven dependencies
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-build-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-build-
+      - name: Test using Maven
+        run: |
+          find . -type f -name "pom.xml" -exec sed -i -e 's|.*argLine.*timezone=.*||g' '{}' \;
+          mvn --batch-mode --update-snapshots \
+            -DclickhouseTimezone=${{ matrix.serverTz }} \
+            -Duser.timezone=${{ matrix.clientTz }} verify

.gitignore

@@ -29,10 +29,10 @@ log/
 target/
 
 # Generated files
-src/main/java/ru/yandex/clickhouse/jdbc/parser/*CharStream.java
-src/main/java/ru/yandex/clickhouse/jdbc/parser/ClickHouseSqlParser*.java
-src/main/java/ru/yandex/clickhouse/jdbc/parser/Token*.java
-src/main/java/ru/yandex/clickhouse/jdbc/parser/ParseException.java
+**/parser/*CharStream.java
+**/parser/ClickHouseSqlParser*.java
+**/parser/Token*.java
+**/parser/ParseException.java
 
 # Shell scripts
 *.sh

CHANGELOG

@@ -1,3 +1,16 @@
+0.3.0
+  * BREAKING CHANGE - dropped JDK 7 support
+  * BREAKING CHANGE - removed Guava dependency(and so is UnsignedLong)
+  * JDBC 4.2 support
+  * add connection setting client_name for load-balancing and troubleshooting
+  * add writeBytes & writeUUIDArray and remove UnsignedLong related methods in ClickHouseRowBinaryStream
+  * support more data types: IPv4, IPv6, Int128, UInt128, Int256, UInt256, Decimal256, DateTime*, and Map
+  * support ORC/Parquet streaming
+  * support read/write Bitmap from/into AggregateFunction(groupBitmap, UInt[8-64]) column
+  * throw SQLException instead of RuntimeException when instantiating ClickHouseConnectionImpl
+  * fix error when using ClickHouseCompression.none against 19.16
+  * fix NegativeArraySizeException when dealing with large array
+  * fix datetime/date display issue caused by timezone differences(between client and column/server)
 0.2.6
   * add new feature for sending compressed files/streams
   * introduce an experimental SQL parser to fix parsing related issues - set connection setting use_new_parser to false to disable

README.md

@@ -1,6 +1,6 @@
 ClickHouse JDBC driver
 ===============
-[![clickhouse-jdbc](https://maven-badges.herokuapp.com/maven-central/ru.yandex.clickhouse/clickhouse-jdbc/badge.svg)](https://maven-badges.herokuapp.com/maven-central/ru.yandex.clickhouse/clickhouse-jdbc) ![Build Status(https://github.com/ClickHouse/clickhouse-jdbc/workflows/Build/badge.svg)](https://github.com/ClickHouse/clickhouse-jdbc/workflows/Build/badge.svg)
+[![clickhouse-jdbc](https://maven-badges.herokuapp.com/maven-central/ru.yandex.clickhouse/clickhouse-jdbc/badge.svg)](https://maven-badges.herokuapp.com/maven-central/ru.yandex.clickhouse/clickhouse-jdbc) ![Build Status(https://github.com/ClickHouse/clickhouse-jdbc/workflows/Build/badge.svg)](https://github.com/ClickHouse/clickhouse-jdbc/workflows/Build/badge.svg) [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=ClickHouse_clickhouse-jdbc&metric=coverage)](https://sonarcloud.io/dashboard?id=ClickHouse_clickhouse-jdbc)
 
 This is a basic and restricted implementation of jdbc driver for ClickHouse.
 It has support of a minimal subset of features to be usable.
@@ -10,7 +10,7 @@ It has support of a minimal subset of features to be usable.
 <dependency>
     <groupId>ru.yandex.clickhouse</groupId>
     <artifactId>clickhouse-jdbc</artifactId>
-    <version>0.2.6</version>
+    <version>0.3.0</version>
 </dependency>
 ```
 

clickhouse-benchmark/pom.xml

@@ -2,24 +2,28 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>tech.clickhouse</groupId>
+    <parent>
+        <groupId>tech.clickhouse</groupId>
+        <artifactId>clickhouse-java</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <groupId>${parent.groupId}</groupId>
     <artifactId>clickhouse-benchmark</artifactId>
     <version>${revision}</version>
     <packaging>jar</packaging>
 
     <name>clickhouse-benchmark</name>
+    <description>Benchmarks for ClickHouse clients</description>
 
     <properties>
-        <revision>0.3.0-SNAPSHOT</revision>
         <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>
-        <javac.target>1.8</javac.target>
         <shade.name>benchmarks</shade.name>
     </properties>
 
@@ -96,7 +100,6 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>${testcontainers.version}</version>
         </dependency>
     </dependencies>
 
@@ -105,17 +108,15 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
                 <configuration>
-                    <compilerVersion>${javac.target}</compilerVersion>
-                    <source>${javac.target}</source>
-                    <target>${javac.target}</target>
+                    <compilerVersion>${jdk.version}</compilerVersion>
+                    <source>${jdk.version}</source>
+                    <target>${jdk.version}</target>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>

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

@@ -3,13 +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();
@@ -26,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/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

@@ -3,21 +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;
@@ -37,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;
@@ -57,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;
@@ -69,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++)) };
             }
         });
     }