Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chernser merged 1 commit into from
Jun 23, 2026
+23 −28
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions client-v2/src/main/java/com/clickhouse/client/api/Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
43 changes: 22 additions & 21 deletions client-v2/src/main/java/com/clickhouse/client/api/internal/HttpAPIClientHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading