Skip to content

Commit

Permalink
Merge pull request #1021 from zhicwu/develop
Browse files Browse the repository at this point in the history
Prepare new release
  • Loading branch information
zhicwu authored Jul 28, 2022
2 parents a3a8995 + dea41df commit 27f8951
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 17 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Note: in general, the new driver(v0.3.2) is a few times faster with less memory
<groupId>com.clickhouse</groupId>
<!-- or clickhouse-grpc-client if you prefer gRPC -->
<artifactId>clickhouse-http-client</artifactId>
<version>0.3.2-patch10</version>
<version>0.3.2-patch11</version>
</dependency>
```

Expand Down Expand Up @@ -100,7 +100,7 @@ try (ClickHouseClient client = ClickHouseClient.newInstance(ClickHouseProtocol.H
<!-- please stop using ru.yandex.clickhouse as it's been deprecated -->
<groupId>com.clickhouse</groupId>
<artifactId>clickhouse-jdbc</artifactId>
<version>0.3.2-patch10</version>
<version>0.3.2-patch11</version>
<!-- use uber jar with all dependencies included, change classifier to http for smaller jar -->
<classifier>all</classifier>
<exclusions>
Expand Down
2 changes: 1 addition & 1 deletion clickhouse-cli-client/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Either [clickhouse](https://clickhouse.com/docs/en/interfaces/cli/) or [docker](
<!-- please stop using ru.yandex.clickhouse as it's been deprecated -->
<groupId>com.clickhouse</groupId>
<artifactId>clickhouse-cli-client</artifactId>
<version>0.3.2-patch10</version>
<version>0.3.2-patch11</version>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion clickhouse-client/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ client.connect("http://localhost/system")
<dependency>
<groupId>com.clickhouse</groupId>
<artifactId>clickhouse-http-client</artifactId>
<version>0.3.2-patch10</version>
<version>0.3.2-patch11</version>
</dependency>
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1973,20 +1973,36 @@ public ClickHouseResponse executeAndWait() throws ClickHouseException {
}

/**
* Executes the request within a transaction, wait until it's completed and
* the transaction being committed or rolled back. The transaction here is
* either an implicit transaction(using {@code implicit_transaction} server
* setting, with less overhead but requiring 22.7+) or auto-commit
* transaction(using clone of this request), depending on argument
* {@code useImplicitTransaction}.
*
* @param useImplicitTransaction use {@code implicit_transaction} server setting
* with minimum overhead(no session on server side
* and no additional objects on client side), or
* an auto-commit {@link ClickHouseTransaction}
* Executes the request within an implicit transaction. New transaction will be
* always created and started right before the query, and it will be committed
* or rolled back afterwards automatically.
*
* @return non-null response
* @throws ClickHouseException when error occurred during execution
*/
public ClickHouseResponse executeWithinTransaction() throws ClickHouseException {
return executeWithinTransaction(false);
}

/**
* Executes the request within an implicit transaction. When
* {@code useImplicitTransaction} is set to {@code true}, it enforces the client
* to use {@code implicit_transaction} setting which is only available in
* ClickHouse 22.7+. Otherwise, new transaction will be always created and
* started right before the query, and it will be committed or rolled back
* afterwards automatically.
*
* @param useImplicitTransaction {@code true} to use native implicit transaction
* requiring ClickHouse 22.7+ with minimum
* overhead(no session on server side and no
* additional objects on client side); false to
* use auto-commit transaction
* @return non-null response
* @throws ClickHouseException when error occurred during execution
* @deprecated will be removed in the future, once the minimum supported version
* of ClickHouse is 22.7 or above
*/
@Deprecated
public ClickHouseResponse executeWithinTransaction(boolean useImplicitTransaction) throws ClickHouseException {
if (useImplicitTransaction) {
return set(ClickHouseTransaction.SETTING_IMPLICIT_TRANSACTION, 1).transaction(null).executeAndWait();
Expand Down
4 changes: 2 additions & 2 deletions clickhouse-jdbc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Keep in mind that `clickhouse-jdbc` is synchronous, and in general it has more o
<!-- please stop using ru.yandex.clickhouse as it's been deprecated -->
<groupId>com.clickhouse</groupId>
<artifactId>clickhouse-jdbc</artifactId>
<version>0.3.2-patch10</version>
<version>0.3.2-patch11</version>
<!-- use uber jar with all dependencies included, change classifier to http for smaller jar -->
<classifier>all</classifier>
<exclusions>
Expand Down Expand Up @@ -300,7 +300,7 @@ Please refer to cheatsheet below to upgrade JDBC driver to 0.3.2.
<td><pre><code class="language-xml">&lt;dependency&gt;
&lt;groupId&gt;com.clickhouse&lt;/groupId&gt;
&lt;artifactId&gt;clickhouse-jdbc&lt;/artifactId&gt;
&lt;version&gt;0.3.2-patch10&lt;/version&gt;
&lt;version&gt;0.3.2-patch11&lt;/version&gt;
&lt;classifier&gt;all&lt;/classifier&gt;
&lt;exclusions&gt;
&lt;exclusion&gt;
Expand Down

0 comments on commit 27f8951

Please sign in to comment.