This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new a12558a7ab1 Fix Proxy's Seata integration config doc (#34941)
a12558a7ab1 is described below
commit a12558a7ab10118ae508e8cad053a383f71c82f6
Author: Ling Hengqian <linghengq...@outlook.com>
AuthorDate: Tue Mar 11 09:57:23 2025 +0800
Fix Proxy's Seata integration config doc (#34941)
---
.../content/user-manual/common-config/builtin-algorithm/keygen.cn.md | 2 +-
.../content/user-manual/common-config/builtin-algorithm/keygen.en.md | 2 +-
.../user-manual/common-config/builtin-algorithm/sharding.cn.md | 4 +++-
.../user-manual/common-config/builtin-algorithm/sharding.en.md | 4 +++-
.../shardingsphere-proxy/optional-plugins/seata-at/_index.cn.md | 1 +
.../shardingsphere-proxy/optional-plugins/seata-at/_index.en.md | 1 +
6 files changed, 10 insertions(+), 4 deletions(-)
diff --git
a/docs/document/content/user-manual/common-config/builtin-algorithm/keygen.cn.md
b/docs/document/content/user-manual/common-config/builtin-algorithm/keygen.cn.md
index 2e44efa2c80..1f7b7cef383 100644
---
a/docs/document/content/user-manual/common-config/builtin-algorithm/keygen.cn.md
+++
b/docs/document/content/user-manual/common-config/builtin-algorithm/keygen.cn.md
@@ -21,7 +21,7 @@ weight = 3
|-----------------------------------------------|--------|-------------------------------------------------------------------------------------------------------------------------------|-------|
| worker-id (?) | long | 工作机器唯一标识
| 0 |
| max-vibration-offset (?) | int | 最大抖动上限值，范围[0,
4096)。注：若使用此算法生成值作分片值，建议配置此属性。此算法在不同毫秒内所生成的 key 取模 2^n (2^n一般为分库或分表数) 之后结果总为 0
或 1。为防止上述分片问题，建议将此属性值配置为 (2^n)-1 | 1 |
-| max-tolerate-time-difference-milliseconds (?) | long | 最大容忍时钟回退时间，单位：毫秒
| 10 毫秒 |
+| max-tolerate-time-difference-milliseconds (?) | long | 最大容忍时钟回退时间，单位：毫秒
| 10 |
*注意*：worker-id 为选配项
1. 在单机模式下支持用户自定义配置，如果用户不配置使用默认值为0。
diff --git
a/docs/document/content/user-manual/common-config/builtin-algorithm/keygen.en.md
b/docs/document/content/user-manual/common-config/builtin-algorithm/keygen.en.md
index 4913ad026ed..7328bbdbdc7 100644
---
a/docs/document/content/user-manual/common-config/builtin-algorithm/keygen.en.md
+++
b/docs/document/content/user-manual/common-config/builtin-algorithm/keygen.en.md
@@ -26,7 +26,7 @@ Attributes:
| *Name* | *DataType* | *Description*
[...]
|-----------------------------------------------|------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
[...]
| worker-id (?) | long | The unique ID
for working machine
[...]
-| max-tolerate-time-difference-milliseconds (?) | long | The max
tolerate time for different server's time difference in milliseconds
[...]
+| max-tolerate-time-difference-milliseconds (?) | long | The max
tolerate time for different server's time difference in milliseconds
[...]
| max-vibration-offset (?) | int | The max upper
limit value of vibrate number, range `[0, 4096)`. Notice: To use the generated
value of this algorithm as sharding value, it is recommended to configure this
property. The algorithm generates key mod `2^n` (`2^n` is usually the sharding
amount of tables or databases) in different milliseconds and the result is
always `0` or `1`. To prevent the above sharding problem, it is recommended to
configure this property, [...]
*Note*: worker-id is optional
diff --git
a/docs/document/content/user-manual/common-config/builtin-algorithm/sharding.cn.md
b/docs/document/content/user-manual/common-config/builtin-algorithm/sharding.cn.md
index f71f6800df3..de4979ec3de 100644
---
a/docs/document/content/user-manual/common-config/builtin-algorithm/sharding.cn.md
+++
b/docs/document/content/user-manual/common-config/builtin-algorithm/sharding.cn.md
@@ -90,7 +90,9 @@ Apache ShardingSphere 内置的标准分片算法实现类包括：
此算法主动忽视了 `datetime-pattern` 的时区信息。
这意味着当 `datetime-lower`, `datetime-upper` 和传入的分片键含有时区信息时，不会因为时区不一致而发生时区转换。
-当传入的分片键为 `java.time.Instant` 时存在特例处理，其会携带上系统的时区信息后转化为 `datetime-pattern`
的字符串格式，再进行下一步分片。
+
+当传入的分片键为 `java.time.Instant` 或 `java.util.Date` 时存在特例处理，
+其会携带上系统的时区信息后转化为 `datetime-pattern` 的字符串格式，再进行下一步分片。
类型：INTERVAL
diff --git
a/docs/document/content/user-manual/common-config/builtin-algorithm/sharding.en.md
b/docs/document/content/user-manual/common-config/builtin-algorithm/sharding.en.md
index c8419361856..c5987af34f1 100644
---
a/docs/document/content/user-manual/common-config/builtin-algorithm/sharding.en.md
+++
b/docs/document/content/user-manual/common-config/builtin-algorithm/sharding.en.md
@@ -94,7 +94,9 @@ Attributes:
This algorithm actively ignores the time zone information of
`datetime-pattern`.
This means that when `datetime-lower`, `datetime-upper` and the incoming shard
key contain time zone information, time zone conversion will not occur due to
time zone inconsistencies.
-When the incoming sharding key is `java.time.Instant`, there is a special
case, which will carry the time zone information of the system and convert it
into the string format of `datetime-pattern`, and then proceed to the next
sharding.
+
+When the shard key passed in is `java.time.Instant` or `java.util.Date`, there
is a special case.
+It will carry the system's time zone information and convert it into a string
format of `datetime-pattern` before the next sharding.
Type: INTERVAL
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/seata-at/_index.cn.md
b/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/seata-at/_index.cn.md
index 1212ce88be6..5aba46e9ca5 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/seata-at/_index.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/seata-at/_index.cn.md
@@ -170,6 +170,7 @@ authority:
users:
- user: root@%
password: root
+ admin: true
privilege:
type: ALL_PERMITTED
transaction:
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/seata-at/_index.en.md
b/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/seata-at/_index.en.md
index 6ce1b049de1..a46121265c0 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/seata-at/_index.en.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/seata-at/_index.en.md
@@ -174,6 +174,7 @@ authority:
users:
- user: root@%
password: root
+ admin: true
privilege:
type: ALL_PERMITTED
transaction:
