Skip to content

Commit a12558a

Browse files
authored
Fix Proxy's Seata integration config doc (#34941)
1 parent adf4ece commit a12558a

File tree

6 files changed

+10
-4
lines changed

6 files changed

+10
-4
lines changed

docs/document/content/user-manual/common-config/builtin-algorithm/keygen.cn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ weight = 3
2121
|-----------------------------------------------|--------|-------------------------------------------------------------------------------------------------------------------------------|-------|
2222
| worker-id (?) | long | 工作机器唯一标识 | 0 |
2323
| max-vibration-offset (?) | int | 最大抖动上限值,范围[0, 4096)。注:若使用此算法生成值作分片值,建议配置此属性。此算法在不同毫秒内所生成的 key 取模 2^n (2^n一般为分库或分表数) 之后结果总为 0 或 1。为防止上述分片问题,建议将此属性值配置为 (2^n)-1 | 1 |
24-
| max-tolerate-time-difference-milliseconds (?) | long | 最大容忍时钟回退时间,单位:毫秒 | 10 毫秒 |
24+
| max-tolerate-time-difference-milliseconds (?) | long | 最大容忍时钟回退时间,单位:毫秒 | 10 |
2525

2626
*注意*:worker-id 为选配项
2727
1. 在单机模式下支持用户自定义配置,如果用户不配置使用默认值为0。

docs/document/content/user-manual/common-config/builtin-algorithm/keygen.en.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Attributes:
2626
| *Name* | *DataType* | *Description* | *Default Value* |
2727
|-----------------------------------------------|------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------|
2828
| worker-id (?) | long | The unique ID for working machine | 0 |
29-
| max-tolerate-time-difference-milliseconds (?) | long | The max tolerate time for different server's time difference in milliseconds | 10 milliseconds |
29+
| max-tolerate-time-difference-milliseconds (?) | long | The max tolerate time for different server's time difference in milliseconds | 10 |
3030
| 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, its value is `(2^n)-1` | 1 |
3131

3232
*Note*: worker-id is optional

docs/document/content/user-manual/common-config/builtin-algorithm/sharding.cn.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@ Apache ShardingSphere 内置的标准分片算法实现类包括:
9090

9191
此算法主动忽视了 `datetime-pattern` 的时区信息。
9292
这意味着当 `datetime-lower`, `datetime-upper` 和传入的分片键含有时区信息时,不会因为时区不一致而发生时区转换。
93-
当传入的分片键为 `java.time.Instant` 时存在特例处理,其会携带上系统的时区信息后转化为 `datetime-pattern` 的字符串格式,再进行下一步分片。
93+
94+
当传入的分片键为 `java.time.Instant``java.util.Date` 时存在特例处理,
95+
其会携带上系统的时区信息后转化为 `datetime-pattern` 的字符串格式,再进行下一步分片。
9496

9597
类型:INTERVAL
9698

docs/document/content/user-manual/common-config/builtin-algorithm/sharding.en.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ Attributes:
9494

9595
This algorithm actively ignores the time zone information of `datetime-pattern`.
9696
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.
97-
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.
97+
98+
When the shard key passed in is `java.time.Instant` or `java.util.Date`, there is a special case.
99+
It will carry the system's time zone information and convert it into a string format of `datetime-pattern` before the next sharding.
98100

99101
Type: INTERVAL
100102

docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/seata-at/_index.cn.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ authority:
170170
users:
171171
- user: root@%
172172
password: root
173+
admin: true
173174
privilege:
174175
type: ALL_PERMITTED
175176
transaction:

docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/seata-at/_index.en.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ authority:
174174
users:
175175
- user: root@%
176176
password: root
177+
admin: true
177178
privilege:
178179
type: ALL_PERMITTED
179180
transaction:

0 commit comments

Comments
 (0)