Skip to content

Commit 79352e8

Browse files
authored
Bump the minimum Seata Client version for Seata AT integration to 2.2.0 (#33872)
1 parent 0406b05 commit 79352e8

File tree

31 files changed

+559
-272
lines changed

31 files changed

+559
-272
lines changed

RELEASE-NOTES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
1. Proxy Native: Support local transactions of ClickHouse under GraalVM Native Image - [#33801](https://github.com/apache/shardingsphere/pull/33801)
3232
1. Doc: Adds documentation for ClickHouse support - [#33779](https://github.com/apache/shardingsphere/pull/33779)
3333
1. Doc: Removes use of `iceberg.mr.schema.auto.conversion` from documentation due to HIVE-26507 - [#33828](https://github.com/apache/shardingsphere/pull/33828)
34+
1. Kernel: Bump the minimum Seata Client version for Seata AT integration to 2.2.0 - [#33872](https://github.com/apache/shardingsphere/pull/33872)
3435

3536
### Bug Fixes
3637

docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/clickhouse/_index.cn.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ ShardingSphere 对 ClickHouse JDBC Driver 的支持位于可选模块中。
4343
```yaml
4444
services:
4545
clickhouse-server:
46-
image: clickhouse/clickhouse-server:24.10.2.80
46+
image: clickhouse/clickhouse-server:24.11.1.2557
4747
ports:
4848
- "8123:8123"
4949
```
@@ -221,11 +221,11 @@ ClickHouse 支持 ShardingSphere 集成级别的本地事务,但需要对 Clic
221221
```yaml
222222
services:
223223
clickhouse-keeper-01:
224-
image: clickhouse/clickhouse-keeper:24.10.2.80
224+
image: clickhouse/clickhouse-keeper:24.11.1.2557
225225
volumes:
226226
- ./keeper_config.xml:/etc/clickhouse-keeper/keeper_config.xml
227227
clickhouse-server:
228-
image: clickhouse/clickhouse-server:24.10.2.80
228+
image: clickhouse/clickhouse-server:24.11.1.2557
229229
depends_on:
230230
- clickhouse-keeper-01
231231
ports:

docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/clickhouse/_index.en.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Write a Docker Compose file to start ClickHouse.
4343
```yaml
4444
services:
4545
clickhouse-server:
46-
image: clickhouse/clickhouse-server:24.10.2.80
46+
image: clickhouse/clickhouse-server:24.11.1.2557
4747
ports:
4848
- "8123:8123"
4949
```
@@ -227,11 +227,11 @@ Introduce the discussion of writing a Docker Compose file to start ClickHouse an
227227
```yaml
228228
services:
229229
clickhouse-keeper-01:
230-
image: clickhouse/clickhouse-keeper:24.10.2.80
230+
image: clickhouse/clickhouse-keeper:24.11.1.2557
231231
volumes:
232232
- ./keeper_config.xml:/etc/clickhouse-keeper/keeper_config.xml
233233
clickhouse-server:
234-
image: clickhouse/clickhouse-server:24.10.2.80
234+
image: clickhouse/clickhouse-server:24.11.1.2557
235235
depends_on:
236236
- clickhouse-keeper-01
237237
ports:

docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/testcontainers/_index.cn.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ShardingSphere 默认情况下不提供对 `org.testcontainers.jdbc.ContainerDat
99

1010
## 前提条件
1111

12-
要在 ShardingSphere 的配置文件为数据节点使用类似 `jdbc:tc:postgresql:17.1-bookworm://test/demo_ds_0``jdbcUrl`
12+
要在 ShardingSphere 的配置文件为数据节点使用类似 `jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_0``jdbcUrl`
1313
可能的 Maven 依赖关系如下,
1414

1515
```xml
@@ -49,15 +49,15 @@ dataSources:
4949
ds_0:
5050
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
5151
driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
52-
jdbcUrl: jdbc:tc:postgresql:17.1-bookworm://test/demo_ds_0
52+
jdbcUrl: jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_0
5353
ds_1:
5454
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
5555
driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
56-
jdbcUrl: jdbc:tc:postgresql:17.1-bookworm://test/demo_ds_1
56+
jdbcUrl: jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_1
5757
ds_2:
5858
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
5959
driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
60-
jdbcUrl: jdbc:tc:postgresql:17.1-bookworm://test/demo_ds_2
60+
jdbcUrl: jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_2
6161
```
6262
6363
`org.apache.shardingsphere:shardingsphere-infra-database-testcontainers` 为 testcontainers-java 风格的 jdbcURL 提供支持,
@@ -82,13 +82,13 @@ dataSources:
8282
ds_0:
8383
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
8484
driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
85-
jdbcUrl: jdbc:tc:postgresql:17.1-bookworm://test/demo_ds_0
85+
jdbcUrl: jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_0
8686
```
8787

88-
testcontainers 默认情况下仅在对 `jdbc:tc:postgresql:17.1-bookworm://test/demo_ds_0` 的最后一个 `java.sql.Connection` 关闭后,
89-
停止`jdbc:tc:postgresql:17.1-bookworm://test/demo_ds_0`创建的 Docker Container。
88+
testcontainers 默认情况下仅在对 `jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_0` 的最后一个 `java.sql.Connection` 关闭后,
89+
停止`jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_0`创建的 Docker Container。
9090
但 ShardingSphere 的内部类会缓存 `java.sql.Connection`。这导致直到 JVM 关闭,
91-
`jdbc:tc:postgresql:17.1-bookworm://test/demo_ds_0` 创建的 Docker Container 才会被关闭。
91+
`jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_0` 创建的 Docker Container 才会被关闭。
9292
若有避免 Container 被长期开启的必要,
9393
`org.testcontainers.jdbc.ContainerDatabaseDriver` 存在可用方法来在单元测试中快速关闭相关 Container,
9494
示例如下,

docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/testcontainers/_index.en.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ShardingSphere does not provide support for `driverClassName` of `org.testcontai
99

1010
## Prerequisites
1111

12-
To use `jdbcUrl` like `jdbc:tc:postgresql:17.1-bookworm://test/demo_ds_0` for data nodes in ShardingSphere's configuration file,
12+
To use `jdbcUrl` like `jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_0` for data nodes in ShardingSphere's configuration file,
1313
the possible Maven dependencies are as follows,
1414

1515
```xml
@@ -52,15 +52,15 @@ dataSources:
5252
ds_0:
5353
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
5454
driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
55-
jdbcUrl: jdbc:tc:postgresql:17.1-bookworm://test/demo_ds_0
55+
jdbcUrl: jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_0
5656
ds_1:
5757
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
5858
driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
59-
jdbcUrl: jdbc:tc:postgresql:17.1-bookworm://test/demo_ds_1
59+
jdbcUrl: jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_1
6060
ds_2:
6161
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
6262
driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
63-
jdbcUrl: jdbc:tc:postgresql:17.1-bookworm://test/demo_ds_2
63+
jdbcUrl: jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_2
6464
```
6565
6666
1. Maven module `org.testcontainers:clickhouse:1.20.3` that provides support for jdbcURL prefixes for `jdbc:tc:clickhouse:`
@@ -82,13 +82,13 @@ dataSources:
8282
ds_0:
8383
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
8484
driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
85-
jdbcUrl: jdbc:tc:postgresql:17.1-bookworm://test/demo_ds_0
85+
jdbcUrl: jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_0
8686
```
8787

8888
testcontainers, by default,
89-
stops the Docker Container created by `jdbc:tc:postgresql:17.1-bookworm://test/demo_ds_0` only after the last `java.sql.Connection` of `jdbc:tc:postgresql:17.1-bookworm://test/demo_ds_0` is closed.
89+
stops the Docker Container created by `jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_0` only after the last `java.sql.Connection` of `jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_0` is closed.
9090
But ShardingSphere's internal class will cache `java.sql.Connection`.
91-
As a result, the Docker Container created by `jdbc:tc:postgresql:17.1-bookworm://test/demo_ds_0` will not be closed until the JVM is closed.
91+
As a result, the Docker Container created by `jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_0` will not be closed until the JVM is closed.
9292
If it is necessary to prevent the Container from being opened for a long time, `org.testcontainers.jdbc.ContainerDatabaseDriver` has a method available to quickly close the relevant Container in the unit test.
9393
The example is as follows,
9494

0 commit comments

Comments
 (0)