Merge branch 'main' into feat_clientv2_timezone

Author: chernser

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

@@ -122,6 +122,7 @@ public class Client implements AutoCloseable {
 
     private boolean useNewImplementation = false;
 
+    private ClickHouseClient oldClient = null;
 
     private Client(Set<String> endpoints, Map<String,String> configuration, boolean useNewImplementation) {
         this.endpoints = endpoints;
@@ -139,6 +140,7 @@ private Client(Set<String> endpoints, Map<String,String> configuration, boolean
             this.httpClientHelper = new HttpAPIClientHelper(configuration);
             LOG.info("Using new http client implementation");
         } else {
+            this.oldClient = ClientV1AdaptorHelper.createClient(configuration);
             LOG.info("Using old http client implementation");
         }
     }
@@ -168,6 +170,10 @@ public void close() {
         } catch (Exception e) {
             LOG.error("Failed to close shared operation executor", e);
         }
+
+        if (oldClient != null) {
+            oldClient.close();
+        }
     }
 
     public static class Builder {
@@ -663,8 +669,14 @@ public boolean ping() {
      * @return true if the server is alive, false otherwise
      */
     public boolean ping(long timeout) {
-        try (ClickHouseClient client = ClientV1AdaptorHelper.createClient(configuration)) {
-            return client.ping(getServerNode(), Math.toIntExact(timeout));
+        if (useNewImplementation) {
+            try (QueryResponse response = query("SELECT 1 FORMAT TabSeparated").get(timeout, TimeUnit.MILLISECONDS)) {
+                return true;
+            } catch (Exception e) {
+                return false;
+            }
+        } else {
+            return oldClient.ping(getServerNode(), Math.toIntExact(timeout));
         }
     }
 
@@ -986,43 +998,41 @@ public CompletableFuture<InsertResponse> insert(String tableName,
         } else {
             CompletableFuture<InsertResponse> responseFuture = new CompletableFuture<>();
 
-            try (ClickHouseClient client = ClientV1AdaptorHelper.createClient(configuration)) {
-                ClickHouseRequest.Mutation request = ClientV1AdaptorHelper
-                        .createMutationRequest(client.write(getServerNode()), tableName, settings, configuration).format(format);
+            ClickHouseRequest.Mutation request = ClientV1AdaptorHelper
+                    .createMutationRequest(oldClient.write(getServerNode()), tableName, settings, configuration).format(format);
 
-                CompletableFuture<ClickHouseResponse> future = null;
-                try (ClickHousePipedOutputStream stream = ClickHouseDataStreamFactory.getInstance().createPipedOutputStream(request.getConfig())) {
-                    future = request.data(stream.getInputStream()).execute();
+            CompletableFuture<ClickHouseResponse> future = null;
+            try (ClickHousePipedOutputStream stream = ClickHouseDataStreamFactory.getInstance().createPipedOutputStream(request.getConfig())) {
+                future = request.data(stream.getInputStream()).execute();
 
-                    //Copy the data from the input stream to the output stream
-                    byte[] buffer = new byte[settings.getInputStreamCopyBufferSize()];
-                    int bytesRead;
-                    while ((bytesRead = data.read(buffer)) != -1) {
-                        stream.write(buffer, 0, bytesRead);
-                    }
-                } catch (IOException e) {
-                    responseFuture.completeExceptionally(new ClientException("Failed to write data to the output stream", e));
+                //Copy the data from the input stream to the output stream
+                byte[] buffer = new byte[settings.getInputStreamCopyBufferSize()];
+                int bytesRead;
+                while ((bytesRead = data.read(buffer)) != -1) {
+                    stream.write(buffer, 0, bytesRead);
                 }
+            } catch (IOException e) {
+                responseFuture.completeExceptionally(new ClientException("Failed to write data to the output stream", e));
+            }
 
-                if (!responseFuture.isCompletedExceptionally()) {
-                    try {
-                        int operationTimeout = getOperationTimeout();
-                        ClickHouseResponse clickHouseResponse;
-                        if (operationTimeout > 0) {
-                            clickHouseResponse = future.get(operationTimeout, TimeUnit.MILLISECONDS);
-                        } else {
-                            clickHouseResponse = future.get();
-                        }
-                        InsertResponse response = new InsertResponse(client, clickHouseResponse, clientStats);
-                        responseFuture.complete(response);
-                    } catch (ExecutionException e) {
-                        responseFuture.completeExceptionally(new ClientException("Failed to get insert response", e.getCause()));
-                    } catch (InterruptedException | TimeoutException e) {
-                        responseFuture.completeExceptionally(new ClientException("Operation has likely timed out.", e));
+            if (!responseFuture.isCompletedExceptionally()) {
+                try {
+                    int operationTimeout = getOperationTimeout();
+                    ClickHouseResponse clickHouseResponse;
+                    if (operationTimeout > 0) {
+                        clickHouseResponse = future.get(operationTimeout, TimeUnit.MILLISECONDS);
+                    } else {
+                        clickHouseResponse = future.get();
                     }
+                    InsertResponse response = new InsertResponse(clickHouseResponse, clientStats);
+                    responseFuture.complete(response);
+                } catch (ExecutionException e) {
+                    responseFuture.completeExceptionally(new ClientException("Failed to get insert response", e.getCause()));
+                } catch (InterruptedException | TimeoutException e) {
+                    responseFuture.completeExceptionally(new ClientException("Operation has likely timed out.", e));
                 }
-                LOG.debug("Total insert (InputStream) time: {}", clientStats.getElapsedTime("insert"));
             }
+            LOG.debug("Total insert (InputStream) time: {}", clientStats.getElapsedTime("insert"));
 
             return responseFuture;
         }
@@ -1127,7 +1137,7 @@ public CompletableFuture<QueryResponse> query(String sqlQuery, Map<String, Objec
                         metrics.setQueryId(queryId);
                         metrics.operationComplete();
 
-                        return new QueryResponse(httpResponse, finalSettings, metrics);
+                        return new QueryResponse(httpResponse, finalSettings.getFormat(), metrics);
                     } catch (ClientException e) {
                         throw e;
                     } catch (Exception e) {
@@ -1138,8 +1148,7 @@ public CompletableFuture<QueryResponse> query(String sqlQuery, Map<String, Objec
             }, sharedOperationExecutor);
             return future;
         } else {
-            ClickHouseClient client = ClientV1AdaptorHelper.createClient(configuration);
-            ClickHouseRequest<?> request = client.read(getServerNode());
+            ClickHouseRequest<?> request = oldClient.read(getServerNode());
             request.options(SettingsConverter.toRequestOptions(settings.getAllSettings()));
             request.settings(SettingsConverter.toRequestSettings(settings.getAllSettings(), queryParams));
             request.option(ClickHouseClientOption.ASYNC, false); // we have own async handling
@@ -1160,7 +1169,7 @@ public CompletableFuture<QueryResponse> query(String sqlQuery, Map<String, Objec
                         clickHouseResponse = request.execute().get();
                     }
 
-                    return new QueryResponse(client, clickHouseResponse, finalSettings, format, clientStats);
+                    return new QueryResponse(clickHouseResponse, format, clientStats);
                 } catch (ClientException e) {
                     throw e;
                 } catch (Exception e) {

client-v2/src/main/java/com/clickhouse/client/api/insert/InsertResponse.java

@@ -6,18 +6,14 @@
 import com.clickhouse.client.api.internal.ClientV1AdaptorHelper;
 import com.clickhouse.client.api.metrics.OperationMetrics;
 import com.clickhouse.client.api.metrics.ServerMetrics;
-import org.apache.hc.core5.http.ClassicHttpResponse;
 
 public class InsertResponse implements AutoCloseable {
     private final ClickHouseResponse responseRef;
-    private final ClickHouseClient client;
-
     private OperationMetrics operationMetrics;
 
-    public InsertResponse(ClickHouseClient client, ClickHouseResponse responseRef,
+    public InsertResponse(ClickHouseResponse responseRef,
                           ClientStatisticsHolder clientStatisticsHolder) {
         this.responseRef = responseRef;
-        this.client = client;
         this.operationMetrics = new OperationMetrics(clientStatisticsHolder);
         this.operationMetrics.operationComplete();
         this.operationMetrics.setQueryId(responseRef.getSummary().getQueryId());
@@ -26,22 +22,13 @@ public InsertResponse(ClickHouseClient client, ClickHouseResponse responseRef,
 
     public InsertResponse(OperationMetrics metrics) {
         this.responseRef = null;
-        this.client = null;
         this.operationMetrics = metrics;
     }
 
     @Override
     public void close() {
         if (responseRef != null) {
-            try {
-                responseRef.close();
-            } finally {
-                client.close();
-            }
-        }
-
-        if (client != null) {
-            client.close();
+            responseRef.close();
         }
     }
 

client-v2/src/main/java/com/clickhouse/client/api/query/QueryResponse.java

@@ -1,6 +1,5 @@
 package com.clickhouse.client.api.query;
 
-import com.clickhouse.client.ClickHouseClient;
 import com.clickhouse.client.ClickHouseResponse;
 import com.clickhouse.client.api.ClientException;
 import com.clickhouse.client.api.internal.ClientStatisticsHolder;
@@ -32,7 +31,6 @@ public class QueryResponse implements AutoCloseable {
 
     private final ClickHouseResponse clickHouseResponse;
     private final ClickHouseFormat format;
-    private ClickHouseClient client;
 
     private QuerySettings settings;
 
@@ -41,13 +39,10 @@ public class QueryResponse implements AutoCloseable {
     private ClassicHttpResponse httpResponse;
 
     @Deprecated
-    public QueryResponse(ClickHouseClient client, ClickHouseResponse clickHouseResponse,
-                         QuerySettings settings, ClickHouseFormat format,
+    public QueryResponse(ClickHouseResponse clickHouseResponse, ClickHouseFormat format,
                          ClientStatisticsHolder clientStatisticsHolder) {
-        this.client = client;
         this.clickHouseResponse = clickHouseResponse;
         this.format = format;
-        this.settings = settings;
         this.operationMetrics = new OperationMetrics(clientStatisticsHolder);
         this.operationMetrics.operationComplete();
         this.operationMetrics.setQueryId(clickHouseResponse.getSummary().getQueryId());
@@ -56,11 +51,10 @@ public QueryResponse(ClickHouseClient client, ClickHouseResponse clickHouseRespo
         settings.setOption("server_timezone", clickHouseResponse.getTimeZone());
     }
 
-    public QueryResponse(ClassicHttpResponse response, QuerySettings settings, OperationMetrics operationMetrics) {
+    public QueryResponse(ClassicHttpResponse response, ClickHouseFormat format, OperationMetrics operationMetrics) {
         this.clickHouseResponse = null;
         this.httpResponse = response;
-        this.format = settings.getFormat();
-        this.settings = settings;
+        this.format = format;
         this.operationMetrics = operationMetrics;
 
         Header tzHeader = response.getFirstHeader(ClickHouseHttpProto.HEADER_TIMEZONE);
@@ -106,14 +100,6 @@ public void close() throws Exception {
                 throw new ClientException("Failed to close response", e);
             }
         }
-
-        if (client !=null) {
-            try {
-                client.close();
-            } catch (Exception e) {
-                throw new ClientException("Failed to close client", e);
-            }
-        }
     }
 
     public ClickHouseFormat getFormat() {

client-v2/src/test/java/com/clickhouse/client/ClientTests.java

@@ -115,5 +115,25 @@ public void testRawSettings() {
         }
     }
 
+    @Test
+    public void testPing() {
+        ClickHouseNode node = getServer(ClickHouseProtocol.HTTP);
+        try (Client client = new Client.Builder()
+                .addEndpoint(node.toUri().toString())
+                .setUsername("default")
+                .setPassword("")
+                .useNewImplementation(System.getProperty("client.tests.useNewImplementation", "false").equals("true"))
+                .build()) {
+            Assert.assertTrue(client.ping());
+        }
 
+        try (Client client = new Client.Builder()
+                .addEndpoint("http://localhost:12345")
+                .setUsername("default")
+                .setPassword("")
+                .useNewImplementation(System.getProperty("client.tests.useNewImplementation", "false").equals("true"))
+                .build()) {
+            Assert.assertFalse(client.ping(TimeUnit.SECONDS.toMillis(20)));
+        }
+    }
 }