This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 3551b90 revise docs
new 05d3d3a Merge pull request #7463 from kimmking/docs
3551b90 is described below
commit 3551b90ad039da6de7b6fec5c927e74561b1af7a
Author: kimmking <[email protected]>
AuthorDate: Tue Sep 15 18:39:57 2020 +0800
revise docs
---
.../user-manual/shardingsphere-jdbc/usage/governance/java-api.cn.md | 2 +-
.../user-manual/shardingsphere-jdbc/usage/governance/java-api.en.md | 2 +-
.../content/user-manual/shardingsphere-proxy/configuration/props.cn.md | 1 -
.../content/user-manual/shardingsphere-proxy/configuration/props.en.md | 1 -
4 files changed, 2 insertions(+), 4 deletions(-)
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/java-api.cn.md
b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/java-api.cn.md
index 3964aaa..8827a9e 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/java-api.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/java-api.cn.md
@@ -57,7 +57,7 @@ DataSource dataSource =
GovernanceShardingSphereDataSourceFactory.createDataSour
```java
DataSource dataSource =
GovernanceShardingSphereDataSourceFactory.createDataSource(
- createDataSourceMap(), createShardingRuleConfig(), new HashMap<String,
Object>(), new Properties(),
+ createDataSourceMap(), createShardingRuleConfig(), new Properties(),
new GovernanceConfiguration("shardingsphere-governance",
configurationMap, true));
String sql = "SELECT i.* FROM t_order o JOIN t_order_item i ON
o.order_id=i.order_id WHERE o.user_id=? AND o.order_id=?";
try (
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/java-api.en.md
b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/java-api.en.md
index 126c443..b4d65bd 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/java-api.en.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/java-api.en.md
@@ -57,7 +57,7 @@ Take native JDBC usage as an example:
```java
DataSource dataSource =
GovernanceShardingSphereDataSourceFactory.createDataSource(
- createDataSourceMap(), createShardingRuleConfig(), new HashMap<String,
Object>(), new Properties(),
+ createDataSourceMap(), createShardingRuleConfig(), new Properties(),
new GovernanceConfiguration("shardingsphere-governance",
configurationMap, true));
String sql = "SELECT i.* FROM t_order o JOIN t_order_item i ON
o.order_id=i.order_id WHERE o.user_id=? AND o.order_id=?";
try (
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 87ca3fe..5dacb18 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,3 @@ 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 |
-| proxy-cluster-enabled (?) | boolean | 是否允许在
ShardingSphere-Proxy 中使用心跳检测。
| false |
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 d35bafc..7ec75eb 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,3 @@ 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 |
-| proxy-cluster-enabled (?) | boolean | Whether enable
Heartbeat Detection for ShardingSphere-Proxy.
| false |
