Skip to content

Commit 27f8951

Browse files
authored
Merge pull request #1021 from zhicwu/develop
Prepare new release
2 parents a3a8995 + dea41df commit 27f8951

File tree

5 files changed

+33
-17
lines changed

5 files changed

+33
-17
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Note: in general, the new driver(v0.3.2) is a few times faster with less memory
6464
<groupId>com.clickhouse</groupId>
6565
<!-- or clickhouse-grpc-client if you prefer gRPC -->
6666
<artifactId>clickhouse-http-client</artifactId>
67-
<version>0.3.2-patch10</version>
67+
<version>0.3.2-patch11</version>
6868
</dependency>
6969
```
7070

@@ -100,7 +100,7 @@ try (ClickHouseClient client = ClickHouseClient.newInstance(ClickHouseProtocol.H
100100
<!-- please stop using ru.yandex.clickhouse as it's been deprecated -->
101101
<groupId>com.clickhouse</groupId>
102102
<artifactId>clickhouse-jdbc</artifactId>
103-
<version>0.3.2-patch10</version>
103+
<version>0.3.2-patch11</version>
104104
<!-- use uber jar with all dependencies included, change classifier to http for smaller jar -->
105105
<classifier>all</classifier>
106106
<exclusions>

clickhouse-cli-client/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Either [clickhouse](https://clickhouse.com/docs/en/interfaces/cli/) or [docker](
2121
<!-- please stop using ru.yandex.clickhouse as it's been deprecated -->
2222
<groupId>com.clickhouse</groupId>
2323
<artifactId>clickhouse-cli-client</artifactId>
24-
<version>0.3.2-patch10</version>
24+
<version>0.3.2-patch11</version>
2525
</dependency>
2626
```
2727

clickhouse-client/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ client.connect("http://localhost/system")
3838
<dependency>
3939
<groupId>com.clickhouse</groupId>
4040
<artifactId>clickhouse-http-client</artifactId>
41-
<version>0.3.2-patch10</version>
41+
<version>0.3.2-patch11</version>
4242
</dependency>
4343
```
4444

clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseRequest.java

+27-11
Original file line numberDiff line numberDiff line change
@@ -1973,20 +1973,36 @@ public ClickHouseResponse executeAndWait() throws ClickHouseException {
19731973
}
19741974

19751975
/**
1976-
* Executes the request within a transaction, wait until it's completed and
1977-
* the transaction being committed or rolled back. The transaction here is
1978-
* either an implicit transaction(using {@code implicit_transaction} server
1979-
* setting, with less overhead but requiring 22.7+) or auto-commit
1980-
* transaction(using clone of this request), depending on argument
1981-
* {@code useImplicitTransaction}.
1982-
*
1983-
* @param useImplicitTransaction use {@code implicit_transaction} server setting
1984-
* with minimum overhead(no session on server side
1985-
* and no additional objects on client side), or
1986-
* an auto-commit {@link ClickHouseTransaction}
1976+
* Executes the request within an implicit transaction. New transaction will be
1977+
* always created and started right before the query, and it will be committed
1978+
* or rolled back afterwards automatically.
1979+
*
1980+
* @return non-null response
1981+
* @throws ClickHouseException when error occurred during execution
1982+
*/
1983+
public ClickHouseResponse executeWithinTransaction() throws ClickHouseException {
1984+
return executeWithinTransaction(false);
1985+
}
1986+
1987+
/**
1988+
* Executes the request within an implicit transaction. When
1989+
* {@code useImplicitTransaction} is set to {@code true}, it enforces the client
1990+
* to use {@code implicit_transaction} setting which is only available in
1991+
* ClickHouse 22.7+. Otherwise, new transaction will be always created and
1992+
* started right before the query, and it will be committed or rolled back
1993+
* afterwards automatically.
1994+
*
1995+
* @param useImplicitTransaction {@code true} to use native implicit transaction
1996+
* requiring ClickHouse 22.7+ with minimum
1997+
* overhead(no session on server side and no
1998+
* additional objects on client side); false to
1999+
* use auto-commit transaction
19872000
* @return non-null response
19882001
* @throws ClickHouseException when error occurred during execution
2002+
* @deprecated will be removed in the future, once the minimum supported version
2003+
* of ClickHouse is 22.7 or above
19892004
*/
2005+
@Deprecated
19902006
public ClickHouseResponse executeWithinTransaction(boolean useImplicitTransaction) throws ClickHouseException {
19912007
if (useImplicitTransaction) {
19922008
return set(ClickHouseTransaction.SETTING_IMPLICIT_TRANSACTION, 1).transaction(null).executeAndWait();

clickhouse-jdbc/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Keep in mind that `clickhouse-jdbc` is synchronous, and in general it has more o
1111
<!-- please stop using ru.yandex.clickhouse as it's been deprecated -->
1212
<groupId>com.clickhouse</groupId>
1313
<artifactId>clickhouse-jdbc</artifactId>
14-
<version>0.3.2-patch10</version>
14+
<version>0.3.2-patch11</version>
1515
<!-- use uber jar with all dependencies included, change classifier to http for smaller jar -->
1616
<classifier>all</classifier>
1717
<exclusions>
@@ -300,7 +300,7 @@ Please refer to cheatsheet below to upgrade JDBC driver to 0.3.2.
300300
<td><pre><code class="language-xml">&lt;dependency&gt;
301301
&lt;groupId&gt;com.clickhouse&lt;/groupId&gt;
302302
&lt;artifactId&gt;clickhouse-jdbc&lt;/artifactId&gt;
303-
&lt;version&gt;0.3.2-patch10&lt;/version&gt;
303+
&lt;version&gt;0.3.2-patch11&lt;/version&gt;
304304
&lt;classifier&gt;all&lt;/classifier&gt;
305305
&lt;exclusions&gt;
306306
&lt;exclusion&gt;

0 commit comments

Comments
 (0)