remove init ssl if no ssl endpoints

Author: chernser

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

@@ -172,7 +172,8 @@ private Client(Set<String> endpoints, Map<String,String> configuration, boolean
         }
         this.useNewImplementation = useNewImplementation;
         if (useNewImplementation) {
-            this.httpClientHelper = new HttpAPIClientHelper(configuration);
+            boolean initSslContext = getEndpoints().stream().anyMatch(s -> s.toLowerCase().contains("https://"));
+            this.httpClientHelper = new HttpAPIClientHelper(configuration, initSslContext);
             LOG.info("Using new http client implementation");
         } else {
             this.oldClient = ClientV1AdaptorHelper.createClient(configuration);
@@ -183,9 +184,9 @@ private Client(Set<String> endpoints, Map<String,String> configuration, boolean
 
     /**
      * Loads essential information about a server. Should be called after client creation.
-     * 
+     *
      */
-    public void updateServerContext() {
+    public void loadServerInfo() {
         try (QueryResponse response = this.query("SELECT currentUser() AS user, timezone() AS timezone, version() AS version LIMIT 1").get()) {
             try (ClickHouseBinaryFormatReader reader = this.newBinaryFormatReader(response)) {
                 if (reader.next() != null) {

client-v2/src/main/java/com/clickhouse/client/api/internal/HttpAPIClientHelper.java

@@ -3,10 +3,10 @@
 import com.clickhouse.client.ClickHouseNode;
 import com.clickhouse.client.ClickHouseSslContextProvider;
 import com.clickhouse.client.api.Client;
+import com.clickhouse.client.api.ClientConfigProperties;
 import com.clickhouse.client.api.ClientException;
 import com.clickhouse.client.api.ClientFaultCause;
 import com.clickhouse.client.api.ClientMisconfigurationException;
-import com.clickhouse.client.api.ClientConfigProperties;
 import com.clickhouse.client.api.ConnectionInitiationException;
 import com.clickhouse.client.api.ConnectionReuseStrategy;
 import com.clickhouse.client.api.ServerException;
@@ -25,6 +25,7 @@
 import org.apache.hc.client5.http.io.HttpClientConnectionManager;
 import org.apache.hc.client5.http.protocol.HttpClientContext;
 import org.apache.hc.client5.http.socket.ConnectionSocketFactory;
+import org.apache.hc.client5.http.socket.LayeredConnectionSocketFactory;
 import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory;
 import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
 import org.apache.hc.core5.http.ClassicHttpResponse;
@@ -43,6 +44,7 @@
 import org.apache.hc.core5.http.impl.io.DefaultHttpResponseParserFactory;
 import org.apache.hc.core5.http.io.SocketConfig;
 import org.apache.hc.core5.http.io.entity.EntityTemplate;
+import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.io.CloseMode;
 import org.apache.hc.core5.io.IOCallback;
 import org.apache.hc.core5.net.URIBuilder;
@@ -60,6 +62,7 @@
 import java.net.ConnectException;
 import java.net.InetSocketAddress;
 import java.net.NoRouteToHostException;
+import java.net.Socket;
 import java.net.SocketTimeoutException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -93,9 +96,9 @@ public class HttpAPIClientHelper {
 
     private String defaultUserAgent;
 
-    public HttpAPIClientHelper(Map<String, String> configuration) {
+    public HttpAPIClientHelper(Map<String, String> configuration, boolean initSslContext) {
         this.chConfiguration = configuration;
-        this.httpClient = createHttpClient();
+        this.httpClient = createHttpClient(initSslContext);
 
         RequestConfig.Builder reqConfBuilder = RequestConfig.custom();
         MapUtils.applyLong(chConfiguration, "connection_request_timeout",
@@ -170,11 +173,10 @@ private ConnectionConfig createConnectionConfig() {
         return connConfig.build();
     }
 
-    private HttpClientConnectionManager basicConnectionManager(SSLContext sslContext, SocketConfig socketConfig) {
+    private HttpClientConnectionManager basicConnectionManager(LayeredConnectionSocketFactory sslConnectionSocketFactory, SocketConfig socketConfig) {
         RegistryBuilder<ConnectionSocketFactory> registryBuilder = RegistryBuilder.create();
         registryBuilder.register("http", PlainConnectionSocketFactory.getSocketFactory());
-        registryBuilder.register("https", new SSLConnectionSocketFactory(sslContext));
-
+        registryBuilder.register("https", sslConnectionSocketFactory);
 
         BasicHttpClientConnectionManager connManager = new BasicHttpClientConnectionManager(registryBuilder.build());
         connManager.setConnectionConfig(createConnectionConfig());
@@ -183,7 +185,7 @@ private HttpClientConnectionManager basicConnectionManager(SSLContext sslContext
         return connManager;
     }
 
-    private HttpClientConnectionManager poolConnectionManager(SSLContext sslContext, SocketConfig socketConfig) {
+    private HttpClientConnectionManager poolConnectionManager(LayeredConnectionSocketFactory sslConnectionSocketFactory, SocketConfig socketConfig) {
         PoolingHttpClientConnectionManagerBuilder connMgrBuilder = PoolingHttpClientConnectionManagerBuilder.create()
                 .setPoolConcurrencyPolicy(PoolConcurrencyPolicy.LAX);
 
@@ -217,17 +219,17 @@ private HttpClientConnectionManager poolConnectionManager(SSLContext sslContext,
                 DefaultHttpResponseParserFactory.INSTANCE);
 
         connMgrBuilder.setConnectionFactory(connectionFactory);
-        connMgrBuilder.setSSLSocketFactory(new SSLConnectionSocketFactory(sslContext));
+        connMgrBuilder.setSSLSocketFactory(sslConnectionSocketFactory);
         connMgrBuilder.setDefaultSocketConfig(socketConfig);
         return connMgrBuilder.build();
     }
 
-    public CloseableHttpClient createHttpClient() {
-
+    public CloseableHttpClient createHttpClient(boolean initSslContext) {
         // Top Level builders
         HttpClientBuilder clientBuilder = HttpClientBuilder.create();
-        SSLContext sslContext = createSSLContext();
-
+        SSLContext sslContext = initSslContext ? createSSLContext() : null;
+        LayeredConnectionSocketFactory sslConnectionSocketFactory = sslContext == null ? new DummySSLConnectionSocketFactory()
+                : new SSLConnectionSocketFactory(sslContext);
         // Socket configuration
         SocketConfig.Builder soCfgBuilder = SocketConfig.custom();
         MapUtils.applyInt(chConfiguration, ClientConfigProperties.SOCKET_OPERATION_TIMEOUT.getKey(),
@@ -271,9 +273,9 @@ public CloseableHttpClient createHttpClient() {
         // Connection manager
         boolean isConnectionPooling = MapUtils.getFlag(chConfiguration, "connection_pool_enabled");
         if (isConnectionPooling) {
-            clientBuilder.setConnectionManager(poolConnectionManager(sslContext, socketConfig));
+            clientBuilder.setConnectionManager(poolConnectionManager(sslConnectionSocketFactory, socketConfig));
         } else {
-            clientBuilder.setConnectionManager(basicConnectionManager(sslContext, socketConfig));
+            clientBuilder.setConnectionManager(basicConnectionManager(sslConnectionSocketFactory, socketConfig));
         }
         long keepAliveTimeout = MapUtils.getLong(chConfiguration, ClientConfigProperties.HTTP_KEEP_ALIVE_TIMEOUT.getKey());
         if (keepAliveTimeout > 0) {
@@ -713,4 +715,26 @@ private  String buildDefaultUserAgent() {
     public void close() {
         httpClient.close(CloseMode.IMMEDIATE);
     }
+
+
+    /**
+     * This factory is used only when no ssl connections are required (no https endpoints).
+     * Internally http client would create factory and spend time if no supplied.
+     */
+    private static class DummySSLConnectionSocketFactory implements LayeredConnectionSocketFactory {
+        @Override
+        public Socket createLayeredSocket(Socket socket, String target, int port, HttpContext context) throws IOException {
+            return null;
+        }
+
+        @Override
+        public Socket createSocket(HttpContext context) throws IOException {
+            return null;
+        }
+
+        @Override
+        public Socket connectSocket(TimeValue connectTimeout, Socket socket, HttpHost host, InetSocketAddress remoteAddress, InetSocketAddress localAddress, HttpContext context) throws IOException {
+            return null;
+        }
+    }
 }

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

@@ -1,7 +1,6 @@
 package com.clickhouse.client;
 
 import com.clickhouse.client.api.Client;
-import com.clickhouse.client.api.ClientConfigProperties;
 import com.clickhouse.client.api.ClientException;
 import com.clickhouse.client.api.enums.Protocol;
 import com.clickhouse.client.api.query.GenericRecord;
@@ -16,7 +15,6 @@
 
 import java.net.ConnectException;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
@@ -131,10 +129,14 @@ public void testSetOptions() {
     }
 
     @Test
-    public void testSkipServerLoadInfo() throws Exception {
+    public void testLoadingServerContext() throws Exception {
+
+        long start = System.nanoTime();
         try (Client client = newClient().build()) {
+            long initTime = System.nanoTime() - start;
+            System.out.println("init time " + (initTime / 1_000_000));
             Assert.assertNull(client.getServerVersion());
-            client.updateServerContext();
+            client.loadServerInfo();
             Assert.assertNotNull(client.getServerVersion());
         }
     }

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

@@ -1,15 +1,13 @@
 package com.clickhouse.jdbc;
 
 import com.clickhouse.client.api.Client;
-import com.clickhouse.client.api.ClientConfigProperties;
 import com.clickhouse.client.api.internal.ServerSettings;
 import com.clickhouse.client.api.query.GenericRecord;
 import com.clickhouse.client.api.query.QuerySettings;
 import com.clickhouse.data.ClickHouseDataType;
 import com.clickhouse.jdbc.internal.ClientInfoProperties;
 import com.clickhouse.jdbc.internal.JdbcConfiguration;
 import com.clickhouse.jdbc.internal.ExceptionUtils;
-import com.clickhouse.jdbc.internal.JdbcConfiguration;
 import com.clickhouse.jdbc.internal.JdbcUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -32,8 +30,6 @@
 import java.sql.ShardingKey;
 import java.sql.Statement;
 import java.sql.Struct;
-import java.sql.Types;
-import java.time.temporal.ChronoUnit;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -76,7 +72,7 @@ public ConnectionImpl(String url, Properties info) throws SQLException {
         this.client =  this.config.applyClientProperties(new Client.Builder())
                 .setClientName(clientName)
                 .build();
-        this.client.updateServerContext();
+        this.client.loadServerInfo();
         this.schema = client.getDefaultDatabase();
         this.defaultQuerySettings = new QuerySettings()
                 .serverSetting(ServerSettings.ASYNC_INSERT, "0")