Merge pull request #1922 from ClickHouse/add-query-settings

This exposes the QuerySettings for folks to use, and also closes the …

Author: Paultagoras

jdbc-v2/src/main/java/com/clickhouse/jdbc/ResultSetImpl.java

@@ -57,6 +57,12 @@ public boolean next() throws SQLException {
     public void close() throws SQLException {
         closed = true;
         if (reader != null) {
+            try {
+                reader.close();
+            } catch (Exception e) {
+                throw new SQLException(e);
+            }
+
             reader = null;
         }
 

jdbc-v2/src/main/java/com/clickhouse/jdbc/StatementImpl.java

@@ -4,6 +4,7 @@
 import com.clickhouse.client.api.metrics.OperationMetrics;
 import com.clickhouse.client.api.metrics.ServerMetrics;
 import com.clickhouse.client.api.query.QueryResponse;
+import com.clickhouse.client.api.query.QuerySettings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -102,10 +103,15 @@ protected static String parseJdbcEscapeSyntax(String sql) {
     @Override
     public ResultSet executeQuery(String sql) throws SQLException {
         checkClosed();
+        return executeQuery(sql, new QuerySettings());
+    }
+
+    public ResultSet executeQuery(String sql, QuerySettings settings) throws SQLException {
+        checkClosed();
 
         try {
             sql = parseJdbcEscapeSyntax(sql);
-            QueryResponse response = connection.client.query(sql).get(queryTimeout, TimeUnit.SECONDS);
+            QueryResponse response = connection.client.query(sql, settings).get(queryTimeout, TimeUnit.SECONDS);
             ClickHouseBinaryFormatReader reader = connection.client.newBinaryFormatReader(response);
             currentResultSet = new ResultSetImpl(response, reader);
             metrics = response.getMetrics();
@@ -119,16 +125,22 @@ public ResultSet executeQuery(String sql) throws SQLException {
     @Override
     public int executeUpdate(String sql) throws SQLException {
         checkClosed();
-        
+        return executeUpdate(sql, new QuerySettings());
+    }
+
+    public int executeUpdate(String sql, QuerySettings settings) throws SQLException {
+        checkClosed();
+
         if (parseStatementType(sql) == StatementType.SELECT) {
             throw new SQLException("executeUpdate() cannot be called with a SELECT statement");
         }
 
         try {
             sql = parseJdbcEscapeSyntax(sql);
-            QueryResponse response = connection.client.query(sql).get(queryTimeout, TimeUnit.SECONDS);
+            QueryResponse response = connection.client.query(sql, settings).get(queryTimeout, TimeUnit.SECONDS);
             currentResultSet = null;
             metrics = response.getMetrics();
+            response.close();
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -209,14 +221,19 @@ public void setCursorName(String name) throws SQLException {
 
     @Override
     public boolean execute(String sql) throws SQLException {
+        checkClosed();
+        return execute(sql, new QuerySettings());
+    }
+
+    public boolean execute(String sql, QuerySettings settings) throws SQLException {
         checkClosed();
         StatementType type = parseStatementType(sql);
 
         if (type == StatementType.SELECT) {
-            executeQuery(sql);
+            executeQuery(sql, settings);
             return true;
         } else {
-            executeUpdate(sql);
+            executeUpdate(sql, settings);
             return false;
         }
     }