Merge pull request #2438 from ClickHouse/fix_2436

[client-v2] Fix not passing query parameter

Author: chernser

client-v2/src/main/java/com/clickhouse/client/api/Client.java

@@ -1671,8 +1671,8 @@ public List<GenericRecord> queryAll(String sqlQuery, Map<String, Object> params,
             int operationTimeout = getOperationTimeout();
             settings.setFormat(ClickHouseFormat.RowBinaryWithNamesAndTypes)
                     .waitEndOfQuery(true);
-            try (QueryResponse response = operationTimeout == 0 ? query(sqlQuery, params, settings).get() :
-                    query(sqlQuery, settings).get(operationTimeout, TimeUnit.MILLISECONDS)) {
+            CompletableFuture<QueryResponse> f = query(sqlQuery, params, settings);
+            try (QueryResponse response = operationTimeout == 0 ? f.get() : f.get(operationTimeout, TimeUnit.MILLISECONDS)) {
                 List<GenericRecord> records = new ArrayList<>();
                 if (response.getResultRows() > 0) {
                     RowBinaryWithNamesAndTypesFormatReader reader =
@@ -1738,8 +1738,8 @@ public <T> List<T> queryAll(String sqlQuery, Class<T> clazz, TableSchema schema,
         try {
             int operationTimeout = getOperationTimeout();
             QuerySettings settings = new QuerySettings().setFormat(ClickHouseFormat.RowBinaryWithNamesAndTypes);
-            try (QueryResponse response = operationTimeout == 0 ? query(sqlQuery, settings).get() :
-                    query(sqlQuery, settings).get(operationTimeout, TimeUnit.MILLISECONDS)) {
+            CompletableFuture<QueryResponse> f = query(sqlQuery, settings);
+            try (QueryResponse response = operationTimeout == 0 ? f.get() : f.get(operationTimeout, TimeUnit.MILLISECONDS)) {
                 List<T> records = new ArrayList<>();
                 RowBinaryWithNamesAndTypesFormatReader reader =
                         (RowBinaryWithNamesAndTypesFormatReader) newBinaryFormatReader(response);