Merge pull request #1707 from ClickHouse/feat_draft_transport_skeleton

[client-v2] New http implementation

Author: chernser

clickhouse-http-client/src/main/java/com/clickhouse/client/http/ApacheHttpConnectionImpl.java

@@ -113,23 +113,22 @@ private ClickHouseHttpResponse buildResponse(ClickHouseConfig config, CloseableH
         // X-ClickHouse-Timezone: UTC
         // X-ClickHouse-Summary:
         // {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0"}
-        String displayName = getResponseHeader(response, "X-ClickHouse-Server-Display-Name", server.getHost());
-        String queryId = getResponseHeader(response, "X-ClickHouse-Query-Id", "");
-        Header hSum = response.getLastHeader("X-ClickHouse-Summary");
-        String summary = hSum == null ? "{}" : hSum.getValue(); // getResponseHeader(response, "X-ClickHouse-Summary", "{}");
+        String displayName = getResponseHeader(response, ClickHouseHttpProto.HEADER_SRV_DISPLAY_NAME, server.getHost());
+        String queryId = getResponseHeader(response, ClickHouseHttpProto.HEADER_QUERY_ID, "");
+        String summary= getResponseHeader(response, ClickHouseHttpProto.HEADER_SRV_SUMMARY, "{}");
 
         ClickHouseFormat format = config.getFormat();
         TimeZone timeZone = config.getServerTimeZone();
         boolean hasCustomOutput = output != null && output.getUnderlyingStream().hasOutput();
         boolean hasQueryResult = false;
         // queryId, format and timeZone are only available for queries
         if (!ClickHouseChecker.isNullOrEmpty(queryId)) {
-            String value = getResponseHeader(response, "X-ClickHouse-Format", "");
+            String value = getResponseHeader(response, ClickHouseHttpProto.HEADER_FORMAT, "");
             if (!ClickHouseChecker.isNullOrEmpty(value)) {
                 format = ClickHouseFormat.valueOf(value);
                 hasQueryResult = true;
             }
-            value = getResponseHeader(response, "X-ClickHouse-Timezone", "");
+            value = getResponseHeader(response, ClickHouseHttpProto.HEADER_TIMEZONE, "");
             timeZone = !ClickHouseChecker.isNullOrEmpty(value) ? TimeZone.getTimeZone(value)
                     : timeZone;
         }
@@ -179,8 +178,8 @@ private void checkResponse(ClickHouseConfig config, CloseableHttpResponse respon
             return;
         }
 
-        final Header errorCode = response.getFirstHeader("X-ClickHouse-Exception-Code");
-        final Header serverName = response.getFirstHeader("X-ClickHouse-Server-Display-Name");
+        final Header errorCode = response.getFirstHeader(ClickHouseHttpProto.HEADER_EXCEPTION_CODE);
+        final Header serverName = response.getFirstHeader(ClickHouseHttpProto.HEADER_SRV_DISPLAY_NAME);
         if (response.getEntity() == null) {
             throw new ConnectException(
                     ClickHouseUtils.format("HTTP response %d %s(code %s returned from server %s)",

clickhouse-http-client/src/main/java/com/clickhouse/client/http/ClickHouseHttpProto.java

@@ -0,0 +1,19 @@
+package com.clickhouse.client.http;
+
+public class ClickHouseHttpProto {
+
+    public static final String HEADER_SRV_DISPLAY_NAME = "X-ClickHouse-Server-Display-Name";
+
+    public static final String HEADER_QUERY_ID = "X-ClickHouse-Query-Id";
+
+    public static final String HEADER_SRV_SUMMARY = "X-ClickHouse-Summary";
+
+    public static final String HEADER_FORMAT = "X-ClickHouse-Format";
+
+    public static final String HEADER_TIMEZONE = "X-ClickHouse-Timezone";
+
+    public static final String HEADER_EXCEPTION_CODE = "X-ClickHouse-Exception-Code";
+
+    public static final String QPARAM_QUERY_ID = "query_id";
+
+}

client-v2/pom.xml

@@ -42,11 +42,6 @@
             <artifactId>httpcore5</artifactId>
             <version>${apache.httpclient.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents.core5</groupId>
-            <artifactId>httpcore5-h2</artifactId>
-            <version>${apache.httpclient.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.github.luben</groupId>
             <artifactId>zstd-jni</artifactId>
@@ -57,6 +52,14 @@
             <artifactId>lz4-pure-java</artifactId>
             <optional>true</optional>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.17.2</version>
+        </dependency>
+
+        <!-- Test Dependencies -->
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
@@ -68,7 +71,7 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
             <scope>test</scope>
-            <version>2.17.0</version>
+            <version>2.17.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>