Merge pull request #2888 from ClickHouse/06/22/26/move_multipart_logic_to_transport

[client-v2] moved query send params in multipart body to transport layer

Author: chernser

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

@@ -1670,15 +1670,9 @@ public CompletableFuture<QueryResponse> query(String sqlQuery, Map<String, Objec
                 for (int i = 0; i <= retries; i++) {
                     ClassicHttpResponse httpResponse = null;
                     try {
-                        boolean  useMultipart = ClientConfigProperties.HTTP_SEND_PARAMS_IN_BODY.getOrDefault(requestSettings.getAllSettings());
-                        if (queryParams != null && useMultipart) {
-                            httpResponse = httpClientHelper.executeMultiPartRequest(selectedEndpoint,
-                                    requestSettings.getAllSettings(), sqlQuery);
-                        } else {
-                            httpResponse = httpClientHelper.executeRequest(selectedEndpoint,
+                        httpResponse = httpClientHelper.executeRequest(selectedEndpoint,
                                     requestSettings.getAllSettings(),
                                     sqlQuery);
-                        }
                         // Check response
                         if (httpResponse.getCode() == HttpStatus.SC_SERVICE_UNAVAILABLE) {
                             LOG.warn("Failed to get response. Server returned {}. Retrying. (Duration: {})", httpResponse.getCode(), durationSince(startTime));

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

@@ -516,35 +516,36 @@ private HttpPost createPostRequest(URI uri, Map<String, Object> requestConfig) {
     public ClassicHttpResponse executeRequest(Endpoint server, Map<String, Object> requestConfig,
                                               String body) throws Exception {
 
-        final URI uri = createRequestURI(server, requestConfig, true);
-        final HttpPost req = createPostRequest(uri, requestConfig);
-        final String contentEncoding = req.containsHeader(HttpHeaders.CONTENT_ENCODING) ? req.getHeader(HttpHeaders.CONTENT_ENCODING).getValue() : null;
-
-        HttpEntity httpEntity = new ByteArrayEntity(body.getBytes(StandardCharsets.UTF_8.name()), CONTENT_TYPE, contentEncoding);
-        req.setEntity(wrapRequestEntity(httpEntity, requestConfig));
-
-        return doPostRequest(requestConfig, req);
-    }
-
-        public ClassicHttpResponse executeMultiPartRequest(Endpoint server, Map<String, Object> requestConfig, String sqlQuery) throws Exception {
+        boolean useMultipart = ClientConfigProperties.HTTP_SEND_PARAMS_IN_BODY.<Boolean>getOrDefault(requestConfig) &&
+                requestConfig.containsKey(HttpAPIClientHelper.KEY_STATEMENT_PARAMS);
 
-        requestConfig.put(ClientConfigProperties.COMPRESS_CLIENT_REQUEST.getKey(), false);
+        // adjust configuration
+        if (useMultipart) {
+            requestConfig.put(ClientConfigProperties.COMPRESS_CLIENT_REQUEST.getKey(), false); // turn-off client-req compression
+        }
 
-        final URI uri = createRequestURI(server, requestConfig, false);
+        // create configuration dependent objects
+        final URI uri = createRequestURI(server, requestConfig, !useMultipart);
         final HttpPost req = createPostRequest(uri, requestConfig);
 
-        MultipartEntityBuilder multipartEntityBuilder = MultipartEntityBuilder.create();
-        addStatementParams(requestConfig, multipartEntityBuilder::addTextBody);
-        multipartEntityBuilder.addTextBody(ClickHouseHttpProto.QPARAM_QUERY_STMT, sqlQuery);
-
+        if (useMultipart) {
+            MultipartEntityBuilder multipartEntityBuilder = MultipartEntityBuilder.create();
+            addStatementParams(requestConfig, multipartEntityBuilder::addTextBody);
+            multipartEntityBuilder.addTextBody(ClickHouseHttpProto.QPARAM_QUERY_STMT, body);
 
-        HttpEntity httpEntity = multipartEntityBuilder.build();
-        req.setHeader(HttpHeaders.CONTENT_TYPE, httpEntity.getContentType()); // set proper content type with generated boundary value
-        req.setEntity(wrapRequestEntity(httpEntity, requestConfig));
+            HttpEntity httpEntity = multipartEntityBuilder.build();
+            req.setHeader(HttpHeaders.CONTENT_TYPE, httpEntity.getContentType()); // set proper content type with generated boundary value
+            req.setEntity(wrapRequestEntity(httpEntity, requestConfig));
 
-        return doPostRequest(requestConfig, req);
+        } else {
+            final String contentEncoding = req.containsHeader(HttpHeaders.CONTENT_ENCODING) ? req.getHeader(HttpHeaders.CONTENT_ENCODING).getValue() : null;
 
+            HttpEntity httpEntity = new ByteArrayEntity(body.getBytes(StandardCharsets.UTF_8.name()), CONTENT_TYPE, contentEncoding);
+            req.setEntity(wrapRequestEntity(httpEntity, requestConfig));
+        }
 
+        // execute
+        return doPostRequest(requestConfig, req);
     }
 
     public ClassicHttpResponse executeRequest(Endpoint server, Map<String, Object> requestConfig,