Merge v0.3.1

.github/workflows/benchmark.yml

@@ -26,7 +26,7 @@ on:
       driver:
         description: "Driver version"
         required: true
-        default: "0.3.0-SNAPSHOT"
+        default: "0.3.1-SNAPSHOT"
       options:
         description: "Benchmark options"
         required: true
@@ -62,7 +62,7 @@ jobs:
           mvn --batch-mode --update-snapshots -q -DskipTests install
           cd clickhouse-benchmark
           mvn --batch-mode --update-snapshots install
-          java -jar target/benchmarks.jar -rf text -p client=clickhouse-jdbc Basic
+          java -DclickhouseVersion="21.3" -jar target/benchmarks.jar -rf text -p client=clickhouse-jdbc Basic
           echo "BENCHMARK_REPORT<<EOF" >> $GITHUB_ENV
           cat jmh-result.text >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV
@@ -110,7 +110,7 @@ jobs:
         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
+          java -DclickhouseVersion="21.3" -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
           echo "EOF" >> $GITHUB_ENV

.github/workflows/release.yml

@@ -6,7 +6,7 @@ on:
       version:
         description: "Release version"
         required: true
-        default: "0.3.0-SNAPSHOT"
+        default: "0.3.1-SNAPSHOT"
 
 jobs:
   release:

.github/workflows/timezone.yml

@@ -59,4 +59,5 @@ jobs:
           find . -type f -name "pom.xml" -exec sed -i -e 's|.*argLine.*timezone=.*||g' '{}' \;
           mvn --batch-mode --update-snapshots \
             -DclickhouseTimezone=${{ matrix.serverTz }} \
+            -DclickhouseVersion=21.3 \
             -Duser.timezone=${{ matrix.clientTz }} verify

.gitignore

@@ -29,10 +29,14 @@ log/
 target/
 
 # Generated files
+.flattened-pom.xml
 **/parser/*CharStream.java
-**/parser/ClickHouseSqlParser*.java
+**/parser/ClickHouseSqlParser.java
+**/parser/ClickHouseSqlParserConstants.java
+**/parser/ClickHouseSqlParserTokenManager.java
 **/parser/Token*.java
 **/parser/ParseException.java
+jmh-result.*
 
 # Shell scripts
 *.sh

CHANGELOG

@@ -1,3 +1,15 @@
+0.3.1
+  * BREAKING CHANGE - move query from url to request body
+  * BREAKING CHANGE - always parse SQL(use extended API to skip that)
+  * BREAKING CHANGE - remove keepAliveTimeout and useNewParser from ClickHouseProperties
+  * BREAKING CHANGE - exclude RoaringBitmap from shaded jar
+  * add new connection setting useSharedCookieStore for load balancing
+  * add new query parameters: allow_experimental_bigint_types, allow_experimental_map_type, and join_algorithm
+  * add new format: CustomSeparated and RowBinaryWithNamesAndTypes
+  * fix 400 bad request error when dealing with large query
+  * fix parser issue when DESC statement contains alias
+  * support batch processing with arbitrary query - update and delete are not recommended so there'll be warnings
+  * support multi-statement sql - session will be used automatically and only the last result will be returned
 0.3.0
   * BREAKING CHANGE - dropped JDK 7 support
   * BREAKING CHANGE - removed Guava dependency(and so is UnsignedLong)

README.md

@@ -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.3.0</version>
+    <version>0.3.1</version>
 </dependency>
 ```
 
@@ -20,8 +20,31 @@ URL syntax:
 JDBC Driver Class:
 `ru.yandex.clickhouse.ClickHouseDriver`
 
-additionally, if you have a few instances, you can use `BalancedClickhouseDataSource`.
+For example:
+```java
+String url = "jdbc:clickhouse://localhost:8123/test";
+ClickHouseProperties properties = new ClickHouseProperties();
+// set connection options - see more defined in ClickHouseConnectionSettings
+properties.setClientName("Agent #1");
+...
+// set default request options - more in ClickHouseQueryParam
+properties.setSessionId("default-session-id");
+...
+
+ClickHouseDataSource dataSource = new ClickHouseDataSource(url, properties)
+String sql = "select * from mytable";
+Map<ClickHouseQueryParam, String> additionalDBParams = new HashMap<>();
+// set request options, which will override the default ones in ClickHouseProperties
+additionalDBParams.put(ClickHouseQueryParam.SESSION_ID, "new-session-id");
+...
+try (ClickHouseConnection conn = dataSource.getConnection();
+    ClickHouseStatement stmt = conn.createStatement();
+    ResultSet rs = stmt.executeQuery(sql, additionalDBParams)) {
+    ...
+}
+```
 
+Additionally, if you have a few instances, you can use `BalancedClickhouseDataSource`.
 
 ### Extended API
 In order to provide non-JDBC complaint data manipulation functionality, proprietary API exists.

clickhouse-benchmark/pom.xml

@@ -8,13 +8,13 @@
         <version>${revision}</version>
     </parent>
 
-    <groupId>${parent.groupId}</groupId>
     <artifactId>clickhouse-benchmark</artifactId>
     <version>${revision}</version>
     <packaging>jar</packaging>
 
-    <name>clickhouse-benchmark</name>
+    <name>${project.artifactId}</name>
     <description>Benchmarks for ClickHouse clients</description>
+    <url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/clickhouse-benchmark</url>
 
     <properties>
         <clickhouse4j-driver.version>1.4.4</clickhouse4j-driver.version>

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

@@ -33,8 +33,7 @@ public void doSetup(ServerState serverState) throws Exception {
                             serverState.getUser(), serverState.getPassword()), new Properties());
 
             try (Statement s = conn.createStatement()) {
-                s.execute(
-                        "create table if not exists test_insert(i Nullable(UInt64), s Nullable(String), t Nullable(DateTime))engine=Memory");
+                s.execute("create table if not exists system.test_insert(i Nullable(UInt64), s Nullable(String), t Nullable(DateTime))engine=Memory");
             }
         } catch (SQLException e) {
             e.printStackTrace();
@@ -43,9 +42,9 @@ public void doSetup(ServerState serverState) throws Exception {
     }
 
     @TearDown(Level.Trial)
-    public void doTearDown() throws SQLException {
+    public void doTearDown(ServerState serverState) throws SQLException {
         try (Statement s = conn.createStatement()) {
-            s.execute("drop table if exists test_insert");
+            s.execute("drop table if exists system.test_insert");
         }
         conn.close();
     }

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

@@ -19,7 +19,7 @@ public int insert10kUInt64Rows(ClientState state) throws Throwable {
         final int rows = 10000;
         final int num = new Random().nextInt(rows);
 
-        return executeInsert(state, "insert into test_insert(i) values(?)", new Enumeration<Object[]>() {
+        return executeInsert(state, "insert into system.test_insert(i) values(?)", new Enumeration<Object[]>() {
             int counter = 0;
 
             @Override
@@ -39,7 +39,7 @@ public int insert10kStringRows(ClientState state) throws Throwable {
         final int rows = 10000;
         final int num = new Random().nextInt(rows);
 
-        return executeInsert(state, "insert into test_insert(s) values(?)", new Enumeration<Object[]>() {
+        return executeInsert(state, "insert into system.test_insert(s) values(?)", new Enumeration<Object[]>() {
             int counter = 0;
 
             @Override
@@ -59,7 +59,7 @@ public int insert10kTimestampRows(ClientState state) throws Throwable {
         final int rows = 10000;
         final int num = new Random().nextInt(rows);
 
-        return executeInsert(state, "insert into test_insert(t) values(?)", new Enumeration<Object[]>() {
+        return executeInsert(state, "insert into system.test_insert(t) values(?)", new Enumeration<Object[]>() {
             int counter = 0;
 
             @Override

clickhouse-client/pom.xml

@@ -8,20 +8,94 @@
         <version>${revision}</version>
     </parent>
 
-    <groupId>${parent.groupId}</groupId>
     <artifactId>clickhouse-client</artifactId>
     <version>${revision}</version>
     <packaging>jar</packaging>
 
+    <name>${project.artifactId}</name>
+    <description>Unified Java client for ClickHouse</description>
+    <url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/clickhouse-client</url>
+
+    <properties>
+        <javacc-plugin.version>4.1.4</javacc-plugin.version>
+    </properties>
+
     <dependencies>
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.lmax</groupId>
+            <artifactId>disruptor</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>dnsjava</groupId>
+            <artifactId>dnsjava</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.roaringbitmap</groupId>
+            <artifactId>RoaringBitmap</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.tomakehurst</groupId>
+            <artifactId>wiremock-jre8</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>com.helger.maven</groupId>
+                <artifactId>ph-javacc-maven-plugin</artifactId>
+                <version>${javacc-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>jjc</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>javacc</goal>
+                        </goals>
+                        <configuration>
+                            <jdkVersion>${jdk.version}</jdkVersion>
+                            <javadocFriendlyComments>true</javadocFriendlyComments>
+                            <packageName>tech.clickhouse.client.parser</packageName>
+                            <sourceDirectory>src/main/javacc</sourceDirectory>
+                            <outputDirectory>src/main/java</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -31,10 +105,32 @@
                     <showWarnings>true</showWarnings>
                     <compilerArgs>
                         <arg>-Xlint:all</arg>
-                        <arg>-Werror</arg>
+                        <!-- arg>-Werror</arg -->
                     </compilerArgs>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <environmentVariables>
+                        <TEST_ENV_STRING>env_str</TEST_ENV_STRING>
+                        <TEST_ENV_INTEGER>416</TEST_ENV_INTEGER>
+                        <TEST_ENV_BOOLEAN>false</TEST_ENV_BOOLEAN>
+                    </environmentVariables>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>

clickhouse-grpc-client/pom.xml

@@ -8,14 +8,17 @@
         <version>${revision}</version>
     </parent>
 
-    <groupId>${parent.groupId}</groupId>
     <artifactId>clickhouse-grpc-client</artifactId>
     <version>${revision}</version>
     <packaging>jar</packaging>
 
+    <name>${project.artifactId}</name>
+    <description>gRPC client for ClickHouse</description>
+    <url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/clickhouse-grpc-client</url>
+
     <dependencies>
         <dependency>
-            <groupId>${parent.groupId}</groupId>
+            <groupId>${project.parent.groupId}</groupId>
             <artifactId>clickhouse-client</artifactId>
             <version>${revision}</version>
         </dependency>