Fixed issue with mutating config

Author: chernser

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

@@ -84,6 +84,12 @@ public class ClickHouseHttpProto {
      */
     public static final String QPARAM_QUERY_STMT = "query";
 
+    public static final String QPARAM_ENABLE_HTTP_COMPRESSION = "enable_http_compression";
+
+    public static final String QPARAM_COMPRESS = "compress";
+
+    public static final String QPARAM_DECOMPRESS = "decompress";
+
     public static final int DEFAULT_HTTP_PORT = 8123;
 
     public static final int DEFAULT_HTTPS_PORT = 8443;

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

@@ -508,14 +508,16 @@ private HttpContext createRequestHttpContext(Map<String, Object> requestConfig)
         return context;
     }
 
-    private URI createRequestURI(Endpoint server, Map<String,Object> requestConfig, boolean addParameters) {
+    private URI createRequestURI(Endpoint server, Map<String,Object> requestConfig, boolean isMultipartRequest) {
         URI uri;
         try {
             URIBuilder uriBuilder = new URIBuilder(server.getURI());
             addRequestParams(requestConfig, uriBuilder::addParameter);
 
-            if (addParameters) {
+            if (!isMultipartRequest) {
                 addStatementParams(requestConfig, uriBuilder::addParameter);
+            } else {
+                uriBuilder.removeParameter(ClickHouseHttpProto.QPARAM_DECOMPRESS); // multipart request doesn't support compression yet
             }
 
             uri = uriBuilder.optimize().build();
@@ -573,35 +575,32 @@ public TransportRequest createRequest(Endpoint server, Map<String, Object> reque
         boolean useMultipart = ClientConfigProperties.HTTP_SEND_PARAMS_IN_BODY.<Boolean>getOrDefault(requestConfig) &&
                 requestConfig.containsKey(HttpAPIClientHelper.KEY_STATEMENT_PARAMS);
 
-        // adjust configuration
-        if (useMultipart) {
-            requestConfig.put(ClientConfigProperties.COMPRESS_CLIENT_REQUEST.getKey(), false); // turn-off client-req compression
-        }
-
         // create configuration dependent objects
-        final URI uri = createRequestURI(server, requestConfig, !useMultipart);
+        final URI uri = createRequestURI(server, requestConfig, useMultipart);
         final HttpPost req = createPostRequest(uri, requestConfig);
 
+        final HttpEntity httpEntity;
         if (useMultipart) {
             MultipartEntityBuilder multipartEntityBuilder = MultipartEntityBuilder.create();
             addStatementParams(requestConfig, multipartEntityBuilder::addTextBody);
             multipartEntityBuilder.addTextBody(ClickHouseHttpProto.QPARAM_QUERY_STMT, body);
 
-            HttpEntity httpEntity = multipartEntityBuilder.build();
+            httpEntity = multipartEntityBuilder.build();
             req.setHeader(HttpHeaders.CONTENT_TYPE, httpEntity.getContentType()); // set proper content type with generated boundary value
-            req.setEntity(wrapRequestEntity(httpEntity, requestConfig));
-
         } else {
-            final HttpEntity httpEntity;
             try {
                 final String contentEncoding = req.containsHeader(HttpHeaders.CONTENT_ENCODING) ? req.getHeader(HttpHeaders.CONTENT_ENCODING).getValue() : null;
                 httpEntity = new ByteArrayEntity(body.getBytes(StandardCharsets.UTF_8.name()), CONTENT_TYPE, contentEncoding);
             } catch (UnsupportedEncodingException | ProtocolException e) {
                 throw new ClientException("failed to create request body entity", e);
             }
+        }
+        // adjust configuration
+        if (useMultipart) {
+            req.setEntity(httpEntity); // multipart doesn't support compression right now
+        } else {
             req.setEntity(wrapRequestEntity(httpEntity, requestConfig));
         }
-
         return new TransportRequestImpl(req, requestConfig);
     }
 
@@ -723,7 +722,7 @@ public TransportResponse executeRequest(TransportRequest transportRequest) throw
     }
 
     public TransportRequest createRequest(Endpoint server, Map<String, Object> requestConfig, IOCallback<OutputStream> writeCallback) {
-        final URI uri = createRequestURI(server, requestConfig, true);
+        final URI uri = createRequestURI(server, requestConfig, false);
         final HttpPost req = createPostRequest(uri, requestConfig);
         try {
             String contentEncoding = req.containsHeader(HttpHeaders.CONTENT_ENCODING) ? req.getHeader(HttpHeaders.CONTENT_ENCODING).getValue() : null;
@@ -852,13 +851,13 @@ private void addRequestParams(Map<String, Object> requestConfig, BiConsumer<Stri
             // enable_http_compression make server react on http header
             // for client side compression Content-Encoding should be set
             // for server side compression Accept-Encoding should be set
-            consumer.accept("enable_http_compression", "1");
+            consumer.accept(ClickHouseHttpProto.QPARAM_ENABLE_HTTP_COMPRESSION, "1");
         } else {
             if (serverCompression) {
-                consumer.accept("compress", "1");
+                consumer.accept(ClickHouseHttpProto.QPARAM_COMPRESS, "1");
             }
             if (clientCompression) {
-                consumer.accept("decompress", "1");
+                consumer.accept(ClickHouseHttpProto.QPARAM_DECOMPRESS, "1");
             }
         }
 

client-v2/src/test/java/com/clickhouse/client/api/transport/TransportBaseTests.java

@@ -363,7 +363,6 @@ public void testCancelRequest(String name, boolean async, boolean isInsert) thro
                             new InsertSettings().setQueryId(queryId)).get(35, TimeUnit.SECONDS)) {
                         opFinished.set(true);
                     } catch (Throwable t) {
-                        t.printStackTrace();
                         opError.set(t);
                     }
                 };

docs/releases/0_10_0.md

@@ -85,11 +85,11 @@ This property (not a feature) is deprecated. Please use `com.clickhouse.jdbc.Dri
 
 ## CLIENT-V2: Service Unavailable Retry Behavior Changed
 
-Http status code `503 Service Unavailable` is handled now as `ConnectionException`. It means that if 
-retry is needed on this type of error than `client_retry_on_failures` should contain `ConnectTimeout`. 
-Previously it was under `ServerRetryable` failure cause. 
+HTTP status code `503 Service Unavailable` is now surfaced as a connection-initiation failure (`ConnectionInitiationException`). It means that if
+retry is needed on this type of error then `client_retry_on_failures` should contain `ConnectTimeout`.
+Previously it was categorized under the `ServerRetryable` failure cause.
 
 ## CLIENT-V2: Handling unknown status codes 
 
-New version will throw `ClientException` instead of `ServerException` on any unhandled status code. Previously 
-any such case was wrapped as `ServerException` what is not correct because it is client fails to process the code. 
+New version will throw `ClientException` instead of `ServerException` on any unhandled status code. Previously
+any such case was wrapped as `ServerException`, which is not correct because it is the client that fails to process the code.