Merge branch develop into failed-to-respond

Author: zhicwu

.github/workflows/release.yml

@@ -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 }}

README.md

@@ -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,7 +52,6 @@
     </developers>
 
     <properties>
-        <revision>0.2.6</revision>
         <slf4j.version>1.7.30</slf4j.version>
         <project.current.year>2021</project.current.year>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -155,7 +154,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock</artifactId>
+            <artifactId>wiremock-jre8</artifactId>
             <version>${wiremock.version}</version>
             <scope>test</scope>
         </dependency>

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;
     }

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

@@ -1,26 +1,48 @@
 package ru.yandex.clickhouse;
 
-import org.apache.http.entity.AbstractHttpEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import ru.yandex.clickhouse.response.ClickHouseResponse;
-import ru.yandex.clickhouse.settings.ClickHouseProperties;
-import ru.yandex.clickhouse.settings.ClickHouseQueryParam;
-import ru.yandex.clickhouse.util.ClickHouseArrayUtil;
-import ru.yandex.clickhouse.util.ClickHouseValueFormatter;
-import ru.yandex.clickhouse.util.guava.StreamUtils;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Reader;
 import java.math.BigDecimal;
 import java.net.URL;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.Clob;
 import java.sql.Date;
-import java.sql.*;
-import java.util.*;
+import java.sql.NClob;
+import java.sql.ParameterMetaData;
+import java.sql.Ref;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.RowId;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.sql.SQLSyntaxErrorException;
+import java.sql.SQLXML;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.TimeZone;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.http.entity.AbstractHttpEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+
+import ru.yandex.clickhouse.response.ClickHouseResponse;
+import ru.yandex.clickhouse.settings.ClickHouseProperties;
+import ru.yandex.clickhouse.settings.ClickHouseQueryParam;
+import ru.yandex.clickhouse.util.ClickHouseArrayUtil;
+import ru.yandex.clickhouse.util.ClickHouseValueFormatter;
+import ru.yandex.clickhouse.util.guava.StreamUtils;
+
 
 public class ClickHousePreparedStatementImpl extends ClickHouseStatementImpl implements ClickHousePreparedStatement {
 
@@ -36,11 +58,11 @@ public class ClickHousePreparedStatementImpl extends ClickHouseStatementImpl imp
     private final ClickHousePreparedStatementParameter[] binds;
     private final List<List<String>> parameterList;
     private final boolean insertBatchMode;
-    private List<byte[]> batchRows = new ArrayList<byte[]>();
+    private List<byte[]> batchRows = new ArrayList<>();
 
-    public ClickHousePreparedStatementImpl(CloseableHttpClient client, ClickHouseConnection connection,
-                                           ClickHouseProperties properties, String sql, TimeZone serverTimeZone,
-                                           int resultSetType) throws SQLException
+    public ClickHousePreparedStatementImpl(CloseableHttpClient client,
+        ClickHouseConnection connection, ClickHouseProperties properties, String sql,
+        TimeZone serverTimeZone, int resultSetType) throws SQLException
     {
         super(client, connection, properties, resultSetType);
         this.sql = sql;
@@ -295,7 +317,7 @@ public void addBatch() throws SQLException {
 
     private List<byte[]> buildBatch() throws SQLException {
         checkBinded();
-        List<byte[]> newBatches = new ArrayList<byte[]>(parameterList.size());
+        List<byte[]> newBatches = new ArrayList<>(parameterList.size());
         StringBuilder sb = new StringBuilder();
         for (int i = 0, p = 0; i < parameterList.size(); i++) {
             List<String> pList = parameterList.get(i);
@@ -338,7 +360,7 @@ public int[] executeBatch(Map<ClickHouseQueryParam, String> additionalDBParams)
         sendStream(entity, insertSql, additionalDBParams);
         int[] result = new int[batchRows.size()];
         Arrays.fill(result, 1);
-        batchRows = new ArrayList<byte[]>();
+        batchRows = new ArrayList<>();
         return result;
     }
 

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

@@ -1,6 +1,7 @@
 package ru.yandex.clickhouse;
 
 import ru.yandex.clickhouse.response.ClickHouseResponse;
+import ru.yandex.clickhouse.response.ClickHouseResponseSummary;
 import ru.yandex.clickhouse.settings.ClickHouseQueryParam;
 import ru.yandex.clickhouse.util.ClickHouseRowBinaryInputStream;
 import ru.yandex.clickhouse.util.ClickHouseStreamCallback;
@@ -105,4 +106,6 @@ ResultSet executeQuery(String sql,
      * Returns extended write-API
      */
     Writer write();
+
+    ClickHouseResponseSummary getResponseSummary();
 }