You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2021/01/14 11:00:19 UTC
[shardingsphere] branch master updated: prefect documents (#9032)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 3365951 prefect documents (#9032)
3365951 is described below
commit 33659510648ff525d90ae723148ab31de34e5287
Author: Jieker <ji...@163.com>
AuthorDate: Thu Jan 14 18:59:52 2021 +0800
prefect documents (#9032)
* fixed some errors about init.sql
* some problems need to solved
* problem has been fixed
* prefect docs
* prefect docs
---
.../user-manual/shardingsphere-jdbc/configuration/yaml/sharding.cn.md | 2 +-
.../user-manual/shardingsphere-jdbc/configuration/yaml/sharding.en.md | 2 +-
.../user-manual/shardingsphere-proxy/configuration/data-source.cn.md | 2 ++
.../user-manual/shardingsphere-proxy/configuration/data-source.en.md | 1 +
.../cases/dml/dataset/db/insert_without_generate_key_column.xml | 2 --
5 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/sharding.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/sharding.cn.md
index 6f94cb0..6783437 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/sharding.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/sharding.cn.md
@@ -12,7 +12,7 @@ rules:
- !SHARDING
tables: # 数据分片规则配置
<logic-table-name> (+): # 逻辑表名称
- actualDataNodes (?): #由数据源名 + 表名组成，以小数点分隔。多个表以逗号分隔，支持行表达式。缺省表示使用已知数据源与逻辑表名称生成数据节点，用于广播表（即每个库中都需要一个同样的表用于关联查询，多为字典表）或只分库不分表且所有库的表结构完全一致的情况
+ actualDataNodes (?): # 由数据源名 + 表名组成（参考Inline语法规则）
databaseStrategy (?): # 分库策略，缺省表示使用默认分库策略，以下的分片策略只能选其一
standard: # 用于单分片键的标准分片场景
shardingColumn: # 分片列名称
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/sharding.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/sharding.en.md
index 8025b12..942f43b 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/sharding.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/sharding.en.md
@@ -12,7 +12,7 @@ rules:
- !SHARDING
tables: # Sharding table configuration
<logic-table-name> (+): # Logic table name
- actualDataNodes (?): # Describe data source names and actual tables, delimiter as point, multiple data nodes separated with comma, support inline expression. Absent means sharding databases only.
+ actualDataNodes (?): # Describe data source names and actual tables (refer to Inline syntax rules)
databaseStrategy (?): # Databases sharding strategy, use default databases sharding strategy if absent. sharding strategy below can choose only one.
standard: # For single sharding column scenario
shardingColumn: # Sharding column name
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/configuration/data-source.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/configuration/data-source.cn.md
index 90c1859..02fedc8 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/configuration/data-source.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/configuration/data-source.cn.md
@@ -22,3 +22,5 @@ dataSources: # 数据源配置，可配置多个 <data-source-name>
rules: # 与 ShardingSphere-JDBC 配置一致
# ...
```
+
+更多的数据源配置参数详见[HikariCP](https://github.com/brettwooldridge/HikariCP) 。
\ No newline at end of file
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/configuration/data-source.en.md b/docs/document/content/user-manual/shardingsphere-proxy/configuration/data-source.en.md
index 3ab45cc..d53aba1 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/configuration/data-source.en.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/configuration/data-source.en.md
@@ -22,3 +22,4 @@ dataSources: # Data sources configuration, multiple <data-source-name> available
rules: # Keep consist with ShardingSphere-JDBC configuration
# ...
```
+For more data source configuration parameters, see [HikariCP](https://github.com/brettwooldridge/HikariCP).
\ No newline at end of file
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/db/insert_without_generate_key_column.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/db/insert_without_generate_key_column.xml
index 7d64098..3c559e0 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/db/insert_without_generate_key_column.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/db/insert_without_generate_key_column.xml
@@ -23,8 +23,6 @@
<column name="status" type="varchar" />
<column name="creation_date" type="datetime" />
</metadata>
- <!--TODO It will happened "Out of range value for column 'item_id'" when you execute all the statements at once -->
- <!--TODO Attempts to change all the type of autoincrement fields to BIGINT -->
<row data-node="db_0.t_order_item" values="100001, 1000, 10, init, 2017-08-08" />
<row data-node="db_0.t_order_item" values="100002, 1000, 10, init, 2017-08-08" />
<row data-node="db_0.t_order_item" values="100101, 1001, 10, init, 2017-08-08" />