Skip to content

Move query to request body along with external data #637

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
zhicwu merged 1 commit into from
Apr 21, 2021
Merged

Move query to request body along with external data #637

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
29 changes: 8 additions & 21 deletions clickhouse-jdbc/src/main/java/ru/yandex/clickhouse/ClickHouseStatementImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,27 +731,13 @@ private InputStream getInputStream(
? new EnumMap<ClickHouseQueryParam, String>(ClickHouseQueryParam.class)
: additionalClickHouseDBParams);

URI uri;
if (externalData == null || externalData.isEmpty()) {
uri = buildRequestUri(
null,
null,
additionalClickHouseDBParams,
additionalRequestParams,
ignoreDatabase
);
} else {
// write sql in query params when there is external data
// as it is impossible to pass both external data and sql in body
// TODO move sql to request body when it is supported in clickhouse
uri = buildRequestUri(
sql,
externalData,
additionalClickHouseDBParams,
additionalRequestParams,
ignoreDatabase
);
}
URI uri = buildRequestUri(
null,
externalData,
additionalClickHouseDBParams,
additionalRequestParams,
ignoreDatabase
);
log.debug("Request url: {}", uri);


Expand All @@ -760,6 +746,7 @@ private InputStream getInputStream(
requestEntity = new StringEntity(sql, StandardCharsets.UTF_8);
} else {
MultipartEntityBuilder entityBuilder = MultipartEntityBuilder.create();
entityBuilder.addTextBody("query", sql);

try {
for (ClickHouseExternalData externalDataItem : externalData) {
Expand Down
1 change: 1 addition & 0 deletions ...ouse-jdbc/src/test/java/ru/yandex/clickhouse/integration/ClickHouseStatementImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ public void testExternalData() throws SQLException, UnsupportedEncodingException
}

// reproduce issue #634
@Test
public void testLargeQueryWithExternalData() throws Exception {
String serverVersion = connection.getServerVersion();
String[] rows = ClickHouseVersionNumberUtil.getMajorVersion(serverVersion) >= 21
Expand Down