Merge release 0.2.6

.github/workflows/release.yml

@@ -6,7 +6,7 @@ on:
       version:
         description: "Release version"
         required: true
-        default: "0.2.5-SNAPSHOT"
+        default: "0.2.6-SNAPSHOT"
 
 jobs:
   release:
@@ -20,11 +20,12 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
+      - run: sed -i -e 's|^\(    <version>\).*\(</version>\)$|\1${{ github.event.inputs.version }}\2|' pom.xml
       - name: Release Maven package
         uses: samuelmeuli/action-maven-publish@v1
         with:
           maven_profiles: release
-          maven_args: -Drevision=${{ github.event.inputs.version }} --batch-mode
+          maven_args: --batch-mode
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
           nexus_username: ${{ secrets.SONATYPE_USER }}

.gitignore

@@ -26,3 +26,12 @@ out/
 .antlr/
 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
+
+# Shell scripts
+*.sh

CHANGELOG

@@ -1,8 +1,19 @@
+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
+  * restore String[] getColumnNames() method for backward compatibility
+  * retry idempotent operation up to 3 times when server closed connection - set connection setting maxRetries to zero to disable
+  * return inserted rows(not accurate) when query parameter send_progress_in_http_headers is set to true
+  * set socket timeout in ClickHouseConnectionImpl.isValid()
+  * upgrade to lz4-java and improve performance of LZ4 stream
+  * use HTTP Basic Auth for credentials instead of query parameters
+  * use static version instead of property-based revision in pom.xml
 0.2.5
   * bump dependencies and include lz4 in shaded jar
   * new API: ClickHouseRowBinaryStream.writeUInt64Array(UnsignedLong[])
   * support column comments
   * support explain queries
+  * fix keep-alive timeout issue by reusing validated connection
   * fix ResultSet.findColumn(String) issue
   * fix the issue of not being able to use NULL constant in PreparedStatement
   * fix toLowerCase issue for Turkish

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.2.5</version>
+    <version>0.2.6</version>
 </dependency>
 ```
 
@@ -35,7 +35,7 @@ sth
     .write() // Write API entrypoint
     .table("default.my_table") // where to write data
     .option("format_csv_delimiter", ";") // specific param
-    .data(new File("/path/to/file.csv"), ClickHouseFormat.CSV) // specify input
+    .data(new File("/path/to/file.csv.gz"), ClickHouseFormat.CSV, ClickHouseCompression.gzip) // specify input     
     .send();
 ```
 #### Configurable send
@@ -46,6 +46,7 @@ sth
     .write()
     .sql("INSERT INTO default.my_table (a,b,c)")
     .data(new MyCustomInputStream(), ClickHouseFormat.JSONEachRow)
+    .dataCompression(ClickHouseCompression.brotli)    
     .addDbParam(ClickHouseQueryParam.MAX_PARALLEL_REPLICAS, 2)
     .send();
 ```

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>ru.yandex.clickhouse</groupId>
     <artifactId>clickhouse-jdbc</artifactId>
-    <version>${revision}</version>
+    <version>0.2.6</version>
     <packaging>jar</packaging>
 
     <name>clickhouse-jdbc</name>
@@ -52,12 +52,11 @@
     </developers>
 
     <properties>
-        <revision>0.2.5</revision>
         <slf4j.version>1.7.30</slf4j.version>
         <project.current.year>2021</project.current.year>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <httpclient.version>4.5.13</httpclient.version>
-        <lz4.version>1.3.0</lz4.version>
+        <lz4.version>1.7.1</lz4.version>
         <jackson-core.version>2.9.10</jackson-core.version>
         <jackson-databind.version>2.9.10.8</jackson-databind.version>
         <guava.version>29.0-jre</guava.version>
@@ -66,10 +65,12 @@
         <testcontainers.version>1.15.1</testcontainers.version>
         <testng.version>6.14.3</testng.version>
         <mockito.version>1.10.19</mockito.version>
+        <wiremock.version>2.27.2</wiremock.version>
         <helper-plugin.version>3.2.0</helper-plugin.version>
         <deploy-plugin.version>3.0.0-M1</deploy-plugin.version>
         <staging-plugin.version>1.6.8</staging-plugin.version>
         <gpg-plugin.version>1.6</gpg-plugin.version>
+        <javacc-plugin.version>4.1.4</javacc-plugin.version>
         <compiler-plugin.version>3.8.1</compiler-plugin.version>
         <source-plugin.version>3.2.1</source-plugin.version>
         <jar-plugin.version>3.2.0</jar-plugin.version>
@@ -98,8 +99,8 @@
             <version>${httpclient.version}</version>
         </dependency>
         <dependency>
-            <groupId>net.jpountz.lz4</groupId>
-            <artifactId>lz4</artifactId>
+            <groupId>org.lz4</groupId>
+            <artifactId>lz4-java</artifactId>
             <version>${lz4.version}</version>
         </dependency>
         <dependency>
@@ -152,6 +153,12 @@
             <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.github.tomakehurst</groupId>
+            <artifactId>wiremock-jre8</artifactId>
+            <version>${wiremock.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <distributionManagement>
@@ -282,6 +289,27 @@
                     <useSystemClassLoader>false</useSystemClassLoader>
                 </configuration>
             </plugin>
+            <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>ru.yandex.clickhouse.jdbc.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>

src/main/java/ru/yandex/clickhouse/ClickHouseConnectionImpl.java

@@ -111,7 +111,13 @@ public ClickHouseStatement createStatement() throws SQLException {
     }
 
     public ClickHouseStatement createStatement(int resultSetType) throws SQLException {
-        return LogProxy.wrap(ClickHouseStatement.class, new ClickHouseStatementImpl(httpclient, this, properties, resultSetType));
+        return LogProxy.wrap(
+            ClickHouseStatement.class,
+            new ClickHouseStatementImpl(
+                httpclient,
+                this,
+                properties,
+                resultSetType));
     }
 
     @Deprecated
@@ -126,15 +132,37 @@ public TimeZone getTimeZone() {
     }
 
     private ClickHouseStatement createClickHouseStatement(CloseableHttpClient httpClient) throws SQLException {
-        return LogProxy.wrap(ClickHouseStatement.class, new ClickHouseStatementImpl(httpClient, this, properties, DEFAULT_RESULTSET_TYPE));
+        return LogProxy.wrap(
+            ClickHouseStatement.class,
+            new ClickHouseStatementImpl(
+                httpClient,
+                this,
+                properties,
+                DEFAULT_RESULTSET_TYPE));
     }
 
     public PreparedStatement createPreparedStatement(String sql, int resultSetType) throws SQLException {
-        return LogProxy.wrap(PreparedStatement.class, new ClickHousePreparedStatementImpl(httpclient, this, properties, sql, getTimeZone(), resultSetType));
+        return LogProxy.wrap(
+            PreparedStatement.class,
+            new ClickHousePreparedStatementImpl(
+                httpclient,
+                this,
+                properties,
+                sql,
+                getTimeZone(),
+                resultSetType));
     }
 
     public ClickHousePreparedStatement createClickHousePreparedStatement(String sql, int resultSetType) throws SQLException {
-        return LogProxy.wrap(ClickHousePreparedStatement.class, new ClickHousePreparedStatementImpl(httpclient, this, properties, sql, getTimeZone(), resultSetType));
+        return LogProxy.wrap(
+            ClickHousePreparedStatement.class,
+            new ClickHousePreparedStatementImpl(
+                httpclient,
+                this,
+                properties,
+                sql,
+                getTimeZone(),
+                resultSetType));
     }
 
 
@@ -385,8 +413,10 @@ public boolean isValid(int timeout) throws SQLException {
                 closeableHttpClient = this.httpclient;
             } else {
                 ClickHouseProperties properties = new ClickHouseProperties(this.properties);
-                properties.setConnectionTimeout((int) TimeUnit.SECONDS.toMillis(timeout));
+                int timeoutMs = (int) TimeUnit.SECONDS.toMillis(timeout);
+                properties.setConnectionTimeout(timeoutMs);
                 properties.setMaxExecutionTime(timeout);
+                properties.setSocketTimeout(timeoutMs);
                 closeableHttpClient = new ClickHouseHttpClientBuilder(properties).buildClient();
                 isAnotherHttpClient = true;
             }
@@ -406,12 +436,13 @@ public boolean isValid(int timeout) throws SQLException {
 
             return false;
         } finally {
-            if (isAnotherHttpClient)
+            if (isAnotherHttpClient) {
                 try {
                     closeableHttpClient.close();
                 } catch (IOException e) {
                     log.warn("Can't close a http client", e);
                 }
+            }
         }
     }
 
@@ -460,22 +491,27 @@ public boolean isWrapperFor(Class<?> iface) throws SQLException {
         return iface.isAssignableFrom(getClass());
     }
 
+    @Override
     public void setSchema(String schema) throws SQLException {
         properties.setDatabase(schema);
     }
 
+    @Override
     public String getSchema() throws SQLException {
         return properties.getDatabase();
     }
 
+    @Override
     public void abort(Executor executor) throws SQLException {
         this.close();
     }
 
+    @Override
     public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
 
     }
 
+    @Override
     public int getNetworkTimeout() throws SQLException {
         return 0;
     }