This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 a52ad73 refactor xa transaction manager name. (#8642)
a52ad73 is described below
commit a52ad73b1cf66c9224dd2022340f586024d85985
Author: xiaoyu <[email protected]>
AuthorDate: Wed Dec 16 15:23:15 2020 +0800
refactor xa transaction manager name. (#8642)
* refactor xa transaction manager name.
---
.../shardingsphere-jdbc/configuration/props.cn.md | 2 +-
.../shardingsphere-jdbc/configuration/props.en.md | 2 +-
.../shardingsphere-jdbc/usage/transaction/narayana.cn.md | 6 +++---
.../shardingsphere-jdbc/usage/transaction/narayana.en.md | 6 +++---
.../shardingsphere-proxy/configuration/props.cn.md | 2 +-
.../shardingsphere-proxy/configuration/props.en.md | 2 +-
.../shardingsphere-proxy/usage/transaction.cn.md | 2 +-
.../shardingsphere-proxy/usage/transaction.en.md | 2 +-
.../main/resources/META-INF/sharding-databases-tables.yaml | 2 +-
.../main/resources/META-INF/sharding-databases-tables.yaml | 2 +-
.../infra/config/properties/ConfigurationPropertyKey.java | 14 +++++++-------
.../src/main/resources/conf/server.yaml | 2 +-
.../transaction/core/TransactionManagerType.java | 8 ++++----
13 files changed, 26 insertions(+), 26 deletions(-)
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/props.cn.md
b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/props.cn.md
index c983275..9a01523 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/props.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/props.cn.md
@@ -18,4 +18,4 @@ Apache ShardingSphere 提供属性配置的方式配置系统级配置。
| max-connections-size-per-query (?) | int |
一次查询请求在每个数据库实例中所能使用的最大连接数。
| 1 |
| check-table-metadata-enabled (?) | boolean | 是否在程序启动和更新时检查分片元数据的结构一致性。
| false |
| query-with-cipher-column (?) | boolean |
是否使用加密列进行查询。在有原文列的情况下，可以使用原文列进行查询。
|
true |
-| transaction-manager-type (?) | String |
事务管理器类型。列如：atomikos，narayana
| atomikos |
+| transaction-manager-type (?) | String |
事务管理器类型。列如：Atomikos，Narayana
| Atomikos |
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/props.en.md
b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/props.en.md
index 507e2bf..5ff8ca3 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/props.en.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/props.en.md
@@ -18,4 +18,4 @@ Apache ShardingSphere provides the way of property
configuration to configure sy
| max-connections-size-per-query (?) | int | Max opened connection
size for each query.
| 1
|
| check-table-metadata-enabled (?) | boolean | Whether validate table
meta data consistency when application startup or updated.
| false
|
| query-with-cipher-column (?) | boolean | Whether query with cipher
column for data encrypt. User you can use plaintext to query if have.
| true
|
-| transaction-manager-type (?) | String | Transaction manager type.
Include: atomikos, narayana.
| atomikos
|
+| transaction-manager-type (?) | String | Transaction manager type.
Include: Atomikos, Narayana.
| Atomikos
|
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/narayana.cn.md
b/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/narayana.cn.md
index 1b755fa..22c8534 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/narayana.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/narayana.cn.md
@@ -64,7 +64,7 @@ Yaml:
```yaml
props:
- transaction-manager-type: narayana
+ transaction-manager-type: Narayana
```
SpringBoot:
@@ -73,7 +73,7 @@ SpringBoot:
spring:
shardingsphere:
props:
- transaction-manager-type: narayana
+ transaction-manager-type: Narayana
```
Spring Namespace:
@@ -81,7 +81,7 @@ Spring Namespace:
```xml
<shardingsphere:data-source id="xxx" data-source-names="xxx" rule-refs="xxx">
<props>
- <prop key="transaction-manager-type">narayana</prop>
+ <prop key="transaction-manager-type">Narayana</prop>
</props>
</shardingsphere:data-source>
```
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/narayana.en.md
b/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/narayana.en.md
index 90174e9..2b01cd0 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/narayana.en.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/narayana.en.md
@@ -64,7 +64,7 @@ Yaml:
```yaml
props:
- transaction-manager-type: narayana
+ transaction-manager-type: Narayana
```
SpringBoot:
@@ -73,7 +73,7 @@ SpringBoot:
spring:
shardingsphere:
props:
- transaction-manager-type: narayana
+ transaction-manager-type: Narayana
```
Spring Namespace:
@@ -81,7 +81,7 @@ Spring Namespace:
```xml
<shardingsphere:data-source id="xxx" data-source-names="xxx" rule-refs="xxx">
<props>
- <prop key="transaction-manager-type">narayana</prop>
+ <prop key="transaction-manager-type">Narayana</prop>
</props>
</shardingsphere:data-source>
```
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/configuration/props.cn.md
b/docs/document/content/user-manual/shardingsphere-proxy/configuration/props.cn.md
index e9d8dd6..e037fc7 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/configuration/props.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/configuration/props.cn.md
@@ -23,4 +23,4 @@ Apache ShardingSphere 提供属性配置的方式配置系统级配置。
| proxy-transaction-type (?) | String | ShardingSphere-Proxy
中使用的默认事务类型。包括：LOCAL、XA 和 BASE。
| LOCAL
|
| proxy-opentracing-enabled (?) | boolean | 是否允许在
ShardingSphere-Proxy 中使用 OpenTracing。
| false |
| proxy-hint-enabled (?) | boolean | 是否允许在
ShardingSphere-Proxy 中使用 Hint。使用 Hint 会将 Proxy 的线程处理模型由 IO
多路复用变更为每个请求一个独立的线程，会降低 Proxy 的吞吐量。
| false |
-| transaction-manager-type (?) | String |
事务管理器类型。列如：atomikos，narayana。
| atomikos |
+| transaction-manager-type (?) | String |
事务管理器类型。列如：Atomikos，Narayana。
| Atomikos |
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/configuration/props.en.md
b/docs/document/content/user-manual/shardingsphere-proxy/configuration/props.en.md
index 09acb7e..8ee2113 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/configuration/props.en.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/configuration/props.en.md
@@ -23,4 +23,4 @@ Apache ShardingSphere provides the way of property
configuration to configure sy
| proxy-transaction-type (?) | String | Default transaction type
of ShardingSphere-Proxy. Include: LOCAL, XA and BASE.
| LOCAL
|
| proxy-opentracing-enabled (?) | boolean | Whether enable
opentracing for ShardingSphere-Proxy.
|
false |
| proxy-hint-enabled (?) | boolean | Whether enable hint for
ShardingSphere-Proxy. Using Hint will switch proxy thread mode from IO
multiplexing to per connection per thread, which will reduce system throughput.
|
false |
-| transaction-manager-type (?) | String | Transaction manager type.
Include: atomikos, narayana.
| atomikos
|
+| transaction-manager-type (?) | String | Transaction manager type.
Include: Atomikos, Narayana.
| Atomikos
|
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/usage/transaction.cn.md
b/docs/document/content/user-manual/shardingsphere-proxy/usage/transaction.cn.md
index b822e01..5273f2a 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/usage/transaction.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/usage/transaction.cn.md
@@ -47,7 +47,7 @@ ShardingSphere-Proxy 接入的分布式事务 API 同 ShardingSphere-JDBC 保持
```yaml
props:
- transaction-manager-type: narayana
+ transaction-manager-type: Narayana
```
3. 新增 `jbossts-properties.xml` 文件来定制化 Narayana 配置项，它的加载路径顺序：`user.dir (pwd)` >
`user.home` > `java.home` > `classpath`。
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/usage/transaction.en.md
b/docs/document/content/user-manual/shardingsphere-proxy/usage/transaction.en.md
index 3497349..d0f5707 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/usage/transaction.en.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/usage/transaction.en.md
@@ -45,7 +45,7 @@ Default XA transaction manager of ShardingSphere is Atomikos.
Users can customiz
```yaml
props:
- transaction-manager-type: narayana
+ transaction-manager-type: Narayana
```
3. Add `jbossts-properties.xml` to customize Narayana configuration.
diff --git
a/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-bitronix-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables.yaml
b/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-bitronix-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables.yaml
index 02285ab..0d597fd 100644
---
a/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-bitronix-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables.yaml
+++
b/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-bitronix-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables.yaml
@@ -67,4 +67,4 @@ rules:
props:
sql-show: false
- transaction-manager-type: bitronix
+ transaction-manager-type: Bitronix
diff --git
a/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-narayana-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables.yaml
b/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-narayana-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables.yaml
index 079f656..8d0d057 100644
---
a/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-narayana-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables.yaml
+++
b/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-narayana-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables.yaml
@@ -67,4 +67,4 @@ rules:
props:
sql-show: false
- transaction-manager-type: narayana
+ transaction-manager-type: Narayana
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/properties/ConfigurationPropertyKey.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/properties/ConfigurationPropertyKey.java
index 66f746d..9873b8a 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/properties/ConfigurationPropertyKey.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/properties/ConfigurationPropertyKey.java
@@ -97,21 +97,21 @@ public enum ConfigurationPropertyKey implements
TypedPropertyKey {
* XA transaction manager type of proxy.
*
* <p>
- * atomikos:
- * ShardingSphere-Proxy will run with XA transaction with atomikos.
+ * Atomikos:
+ * ShardingSphere-Proxy will run with XA transaction with Atomikos.
* </p>
*
* <p>
- * narayana:
- * ShardingSphere-Proxy will run with XA transaction with narayana.
+ * Narayana:
+ * ShardingSphere-Proxy will run with XA transaction with Narayana.
* </p>
*
* <p>
- * bitronix:
- * ShardingSphere-Proxy will run with XA transaction with bitronix.
+ * Bitronix:
+ * ShardingSphere-Proxy will run with XA transaction with Bitronix.
* </p>
*/
- TRANSACTION_MANAGER_TYPE("transaction-manager-type", "atomikos",
String.class),
+ TRANSACTION_MANAGER_TYPE("transaction-manager-type", "Atomikos",
String.class),
/**
* Whether enable opentracing for ShardingSphere-Proxy.
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/conf/server.yaml
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/conf/server.yaml
index cc8ddec..adc79e5 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/conf/server.yaml
+++
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/conf/server.yaml
@@ -50,7 +50,7 @@
# # XA: Proxy will run with XA transaction.
# # BASE: Proxy will run with B.A.S.E transaction.
# proxy-transaction-type: LOCAL
-# transaction-manager-type: atomikos
+# transaction-manager-type: Atomikos
# proxy-opentracing-enabled: false
# proxy-hint-enabled: false
# query-with-cipher-column: true
diff --git
a/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/core/TransactionManagerType.java
b/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/core/TransactionManagerType.java
index 754f0e4..e4dd360 100644
---
a/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/core/TransactionManagerType.java
+++
b/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/core/TransactionManagerType.java
@@ -28,13 +28,13 @@ import lombok.RequiredArgsConstructor;
@Getter
public enum TransactionManagerType {
- ATOMIKOS("atomikos"),
+ ATOMIKOS("Atomikos"),
- NARAYANA("narayana"),
+ NARAYANA("Narayana"),
- BITRONIX("bitronix"),
+ BITRONIX("Bitronix"),
- SEATA("seata");
+ SEATA("Seata");
private final String type;
