Skip to content

Add RowBinaryWithNamesAndTypes #638

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 3 commits into from
Apr 22, 2021
Merged

Add RowBinaryWithNamesAndTypes #638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88e8aa4
Dedup code
zhicwu Apr 22, 2021
f528752
Reformat code
zhicwu Apr 22, 2021
f273e8f
Add RowBinaryWithNamesAndTypes
zhicwu Apr 22, 2021
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
51 changes: 19 additions & 32 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 @@ -207,6 +207,16 @@ protected ClickHouseSqlStatement applyFormat(ClickHouseSqlStatement stmt, ClickH
return stmt;
}

protected Map<ClickHouseQueryParam, String> importAdditionalDBParameters(Map<ClickHouseQueryParam, String> additionalDBParams) {
if (additionalDBParams == null || additionalDBParams.isEmpty()) {
additionalDBParams = new EnumMap<>(ClickHouseQueryParam.class);
} else { // in case the given additionalDBParams is immutable
additionalDBParams = new EnumMap<>(additionalDBParams);
}

return additionalDBParams;
}

protected ResultSet updateResult(ClickHouseSqlStatement stmt, InputStream is) throws IOException, ClickHouseException {
ResultSet rs = null;
if (stmt.isQuery()) {
Expand Down Expand Up @@ -239,12 +249,9 @@ protected int executeStatement(
Map<ClickHouseQueryParam, String> additionalDBParams,
List<ClickHouseExternalData> externalData,
Map<String, String> additionalRequestParams) throws SQLException {
additionalDBParams = importAdditionalDBParameters(additionalDBParams);
stmt = applyFormat(stmt, ClickHouseFormat.TabSeparatedWithNamesAndTypes);
if (additionalDBParams == null || additionalDBParams.isEmpty()) {
additionalDBParams = new EnumMap<>(ClickHouseQueryParam.class);
} else {
additionalDBParams = new EnumMap<>(additionalDBParams);
}

try (InputStream is = getInputStream(stmt, additionalDBParams, externalData, additionalRequestParams)) {
//noinspection StatementWithEmptyBody
} catch (IOException e) {
Expand All @@ -258,12 +265,8 @@ protected ResultSet executeQueryStatement(ClickHouseSqlStatement stmt,
Map<ClickHouseQueryParam, String> additionalDBParams,
List<ClickHouseExternalData> externalData,
Map<String, String> additionalRequestParams) throws SQLException {
additionalDBParams = importAdditionalDBParameters(additionalDBParams);
stmt = applyFormat(stmt, ClickHouseFormat.TabSeparatedWithNamesAndTypes);
if (additionalDBParams == null || additionalDBParams.isEmpty()) {
additionalDBParams = new EnumMap<>(ClickHouseQueryParam.class);
} else {
additionalDBParams = new EnumMap<>(additionalDBParams);
}

InputStream is = getInputStream(stmt, additionalDBParams, externalData, additionalRequestParams);
try {
Expand All @@ -282,11 +285,7 @@ protected ClickHouseResponse executeQueryClickhouseResponse(
ClickHouseSqlStatement stmt,
Map<ClickHouseQueryParam, String> additionalDBParams,
Map<String, String> additionalRequestParams) throws SQLException {
if (additionalDBParams == null || additionalDBParams.isEmpty()) {
additionalDBParams = new EnumMap<>(ClickHouseQueryParam.class);
} else {
additionalDBParams = new EnumMap<>(additionalDBParams);
}
additionalDBParams = importAdditionalDBParameters(additionalDBParams);
stmt = applyFormat(stmt, ClickHouseFormat.JSONCompact);

try (InputStream is = getInputStream(stmt, additionalDBParams, null, additionalRequestParams)) {
Expand Down Expand Up @@ -332,11 +331,7 @@ public ResultSet executeQuery(String sql,
Map<String, String> additionalRequestParams) throws SQLException {

// forcibly disable extremes for ResultSet queries
if (additionalDBParams == null || additionalDBParams.isEmpty()) {
additionalDBParams = new EnumMap<>(ClickHouseQueryParam.class);
} else {
additionalDBParams = new EnumMap<>(additionalDBParams);
}
additionalDBParams = importAdditionalDBParameters(additionalDBParams);
// FIXME respect the value set in additionalDBParams?
additionalDBParams.put(ClickHouseQueryParam.EXTREMES, "0");

Expand Down Expand Up @@ -371,11 +366,7 @@ public ClickHouseResponse executeQueryClickhouseResponse(String sql, Map<ClickHo
public ClickHouseResponse executeQueryClickhouseResponse(String sql,
Map<ClickHouseQueryParam, String> additionalDBParams,
Map<String, String> additionalRequestParams) throws SQLException {
if (additionalDBParams == null || additionalDBParams.isEmpty()) {
additionalDBParams = new EnumMap<>(ClickHouseQueryParam.class);
} else {
additionalDBParams = new EnumMap<>(additionalDBParams);
}
additionalDBParams = importAdditionalDBParameters(additionalDBParams);
parseSqlStatements(sql, ClickHouseFormat.JSONCompact, additionalDBParams);

try (InputStream is = getLastInputStream(additionalDBParams, null, additionalRequestParams)) {
Expand All @@ -398,12 +389,8 @@ public ClickHouseRowBinaryInputStream executeQueryClickhouseRowBinaryStream(Stri

@Override
public ClickHouseRowBinaryInputStream executeQueryClickhouseRowBinaryStream(String sql, Map<ClickHouseQueryParam, String> additionalDBParams, Map<String, String> additionalRequestParams) throws SQLException {
if (additionalDBParams == null || additionalDBParams.isEmpty()) {
additionalDBParams = new EnumMap<>(ClickHouseQueryParam.class);
} else {
additionalDBParams = new EnumMap<>(additionalDBParams);
}
parseSqlStatements(sql, ClickHouseFormat.RowBinary, additionalDBParams);
additionalDBParams = importAdditionalDBParameters(additionalDBParams);
parseSqlStatements(sql, ClickHouseFormat.RowBinaryWithNamesAndTypes, additionalDBParams);

InputStream is = getLastInputStream(
additionalDBParams,
Expand All @@ -417,7 +404,7 @@ public ClickHouseRowBinaryInputStream executeQueryClickhouseRowBinaryStream(Stri
currentUpdateCount = -1;
// FIXME get server timezone?
currentRowBinaryResult = new ClickHouseRowBinaryInputStream(properties.isCompress()
? new ClickHouseLZ4Stream(is) : is, getConnection().getTimeZone(), properties);
? new ClickHouseLZ4Stream(is) : is, getConnection().getTimeZone(), properties, true);
return currentRowBinaryResult;
} else {
currentUpdateCount = 0;
Expand Down
1 change: 1 addition & 0 deletions clickhouse-jdbc/src/main/java/ru/yandex/clickhouse/domain/ClickHouseFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public enum ClickHouseFormat {
PrettySpace,
Protobuf,
RowBinary,
RowBinaryWithNamesAndTypes,
Native,
Null,
XML,
Expand Down
Loading