You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ji...@apache.org on 2022/12/03 07:43:42 UTC
[shardingsphere] branch master updated: Change minus to underscore in yaml (#22605)
This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 f7234d70434 Change minus to underscore in yaml (#22605)
f7234d70434 is described below
commit f7234d7043451b53228a3fe64d6c273b6f6ce5b0
Author: Zichao <57...@users.noreply.github.com>
AuthorDate: Sat Dec 3 20:43:29 2022 +1300
Change minus to underscore in yaml (#22605)
* Change minus to underscore
* Change minus to underscore
* Change minus to underscore
* Change minus to underscore
* Change minus to underscore
* Change minus to underscore
* Change minus to underscore
---
.../common-config/builtin-algorithm/encrypt.cn.md | 8 ++--
.../common-config/builtin-algorithm/encrypt.en.md | 8 ++--
.../common-config/builtin-algorithm/sharding.cn.md | 16 ++++----
.../common-config/builtin-algorithm/sharding.en.md | 16 ++++----
.../yaml-config/data-source.cn.md | 2 +-
.../yaml-config/data-source.en.md | 2 +-
.../yaml-config/rules/encrypt.cn.md | 6 +--
.../yaml-config/rules/encrypt.en.md | 6 +--
.../shardingsphere-jdbc/yaml-config/rules/ha.cn.md | 14 +++----
.../shardingsphere-jdbc/yaml-config/rules/ha.en.md | 14 +++----
.../yaml-config/rules/mix.cn.md | 32 +++++++--------
.../yaml-config/rules/mix.en.md | 32 +++++++--------
.../yaml-config/rules/readwrite-splitting.cn.md | 20 ++++-----
.../yaml-config/rules/readwrite-splitting.en.md | 20 ++++-----
.../yaml-config/rules/shadow.cn.md | 16 ++++----
.../yaml-config/rules/shadow.en.md | 16 ++++----
.../yaml-config/rules/sharding.cn.md | 32 +++++++--------
.../yaml-config/rules/sharding.en.md | 32 +++++++--------
.../sharding/conf/config-sharding.yaml | 12 +++---
.../resources/META-INF/sharding-auto-tables.yaml | 10 ++---
.../META-INF/sharding-databases-interval.yaml | 4 +-
.../META-INF/sharding-databases-range.yaml | 6 +--
.../META-INF/sharding-databases-tables-range.yaml | 12 +++---
.../META-INF/sharding-databases-tables.yaml | 24 +++++------
.../resources/META-INF/sharding-databases.yaml | 6 +--
.../META-INF/sharding-hint-databases-only.yaml | 4 +-
.../META-INF/sharding-hint-databases-tables.yaml | 14 +++----
.../resources/META-INF/sharding-tables-range.yaml | 8 ++--
.../main/resources/META-INF/sharding-tables.yaml | 12 +++---
.../resources/conf/config-database-discovery.yaml | 8 ++--
.../src/main/resources/conf/config-shadow.yaml | 48 +++++++++++-----------
31 files changed, 230 insertions(+), 230 deletions(-)
diff --git a/docs/document/content/user-manual/common-config/builtin-algorithm/encrypt.cn.md b/docs/document/content/user-manual/common-config/builtin-algorithm/encrypt.cn.md
index 7d6c9d795dd..4bfa58340a8 100644
--- a/docs/document/content/user-manual/common-config/builtin-algorithm/encrypt.cn.md
+++ b/docs/document/content/user-manual/common-config/builtin-algorithm/encrypt.cn.md
@@ -89,13 +89,13 @@ rules:
username:
plainColumn: username_plain
cipherColumn: username
- encryptorName: name-encryptor
+ encryptorName: name_encryptor
likeQueryColumn: name_like
- likeQueryEncryptorName: like-encryptor
+ likeQueryEncryptorName: like_encryptor
encryptors:
- like-encryptor:
+ like_encryptor:
type: CHAR_DIGEST_LIKE
- name-encryptor:
+ name_encryptor:
type: AES
props:
aes-key-value: 123456abc
diff --git a/docs/document/content/user-manual/common-config/builtin-algorithm/encrypt.en.md b/docs/document/content/user-manual/common-config/builtin-algorithm/encrypt.en.md
index 032eb5c3876..99044037493 100644
--- a/docs/document/content/user-manual/common-config/builtin-algorithm/encrypt.en.md
+++ b/docs/document/content/user-manual/common-config/builtin-algorithm/encrypt.en.md
@@ -89,13 +89,13 @@ rules:
username:
plainColumn: username_plain
cipherColumn: username
- encryptorName: name-encryptor
+ encryptorName: name_encryptor
likeQueryColumn: name_like
- likeQueryEncryptorName: like-encryptor
+ likeQueryEncryptorName: like_encryptor
encryptors:
- like-encryptor:
+ like_encryptor:
type: CHAR_DIGEST_LIKE
- name-encryptor:
+ name_encryptor:
type: AES
props:
aes-key-value: 123456abc
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 3bfbd87bac6..127dc062367 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
@@ -214,7 +214,7 @@ rules:
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: t-order-inline
+ shardingAlgorithmName: t_order_inline
keyGenerateStrategy:
column: order_id
keyGeneratorName: snowflake
@@ -223,7 +223,7 @@ rules:
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: t_order-item-inline
+ shardingAlgorithmName: t_order_item_inline
keyGenerateStrategy:
column: order_item_id
keyGeneratorName: snowflake
@@ -231,7 +231,7 @@ rules:
actualDataNodes: ds_${0..1}.t_account_${0..1}
tableStrategy:
standard:
- shardingAlgorithmName: t-account-inline
+ shardingAlgorithmName: t_account_inline
keyGenerateStrategy:
column: account_id
keyGeneratorName: snowflake
@@ -243,24 +243,24 @@ rules:
defaultDatabaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: database-inline
+ shardingAlgorithmName: database_inline
defaultTableStrategy:
none:
shardingAlgorithms:
- database-inline:
+ database_inline:
type: INLINE
props:
algorithm-expression: ds_${user_id % 2}
- t-order-inline:
+ t_order_inline:
type: INLINE
props:
algorithm-expression: t_order_${order_id % 2}
- t_order-item-inline:
+ t_order_item_inline:
type: INLINE
props:
algorithm-expression: t_order_item_${order_id % 2}
- t-account-inline:
+ t_account_inline:
type: INLINE
props:
algorithm-expression: t_account_${account_id % 2}
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 d578bdb2fd3..3359be9c44d 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
@@ -218,7 +218,7 @@ rules:
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: t-order-inline
+ shardingAlgorithmName: t_order_inline
keyGenerateStrategy:
column: order_id
keyGeneratorName: snowflake
@@ -227,7 +227,7 @@ rules:
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: t_order-item-inline
+ shardingAlgorithmName: t_order_item_inline
keyGenerateStrategy:
column: order_item_id
keyGeneratorName: snowflake
@@ -235,7 +235,7 @@ rules:
actualDataNodes: ds_${0..1}.t_account_${0..1}
tableStrategy:
standard:
- shardingAlgorithmName: t-account-inline
+ shardingAlgorithmName: t_account_inline
keyGenerateStrategy:
column: account_id
keyGeneratorName: snowflake
@@ -247,24 +247,24 @@ rules:
defaultDatabaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: database-inline
+ shardingAlgorithmName: database_inline
defaultTableStrategy:
none:
shardingAlgorithms:
- database-inline:
+ database_inline:
type: INLINE
props:
algorithm-expression: ds_${user_id % 2}
- t-order-inline:
+ t_order_inline:
type: INLINE
props:
algorithm-expression: t_order_${order_id % 2}
- t_order-item-inline:
+ t_order_item_inline:
type: INLINE
props:
algorithm-expression: t_order_item_${order_id % 2}
- t-account-inline:
+ t_account_inline:
type: INLINE
props:
algorithm-expression: t_account_${account_id % 2}
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/data-source.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/data-source.cn.md
index d2491567086..9e0c0a6020d 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/data-source.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/data-source.cn.md
@@ -14,7 +14,7 @@ ShardingSphere-JDBC 支持所有的数据库 JDBC 驱动和连接池。
```yaml
dataSources: # 数据源配置，可配置多个 <data-source-name>
- <data-source-name>: # 数据源名称
+ <data_source_name>: # 数据源名称
dataSourceClassName: # 数据源完整类名
driverClassName: # 数据库驱动类名，以数据库连接池自身配置为准
jdbcUrl: # 数据库 URL 连接，以数据库连接池自身配置为准
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/data-source.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/data-source.en.md
index c3a10b4c73b..d5bf857296f 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/data-source.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/data-source.en.md
@@ -16,7 +16,7 @@ For example, with Alibaba Druid 1.2.9, using url instead of jdbcUrl in the examp
```yaml
dataSources: # Data sources configuration, multiple <data-source-name> available
- <data-source-name>: # Data source name
+ <data_source_name>: # Data source name
dataSourceClassName: # Data source class name
driverClassName: # The database driver class name is subject to the configuration of the database connection pool itself
jdbcUrl: # The database URL connection is subject to the configuration of the database connection pool itself
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/encrypt.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/encrypt.cn.md
index 1065987deaf..e92821f2c26 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/encrypt.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/encrypt.cn.md
@@ -13,9 +13,9 @@ weight = 5
rules:
- !ENCRYPT
tables:
- <table-name> (+): # 加密表名称
+ <table_name> (+): # 加密表名称
columns:
- <column-name> (+): # 加密列名称
+ <column_name> (+): # 加密列名称
plainColumn (?): # 原文列名称
cipherColumn: # 密文列名称
encryptorName: # 密文列加密算法名称
@@ -27,7 +27,7 @@ rules:
# 加密算法配置
encryptors:
- <encrypt-algorithm-name> (+): # 加解密算法名称
+ <encrypt_algorithm_name> (+): # 加解密算法名称
type: # 加解密算法类型
props: # 加解密算法属性配置
# ...
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/encrypt.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/encrypt.en.md
index f86f35d6b4e..3da9969f350 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/encrypt.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/encrypt.en.md
@@ -14,9 +14,9 @@ Based on the YAML configuration, ShardingSphere automatically completes the crea
rules:
- !ENCRYPT
tables:
- <table-name> (+): # Encrypt table name
+ <table_name> (+): # Encrypt table name
columns:
- <column-name> (+): # Encrypt logic column name
+ <column_name> (+): # Encrypt logic column name
plainColumn (?): # Plain column name
cipherColumn: # Cipher column name
encryptorName: # Cipher encrypt algorithm name
@@ -28,7 +28,7 @@ rules:
# Encrypt algorithm configuration
encryptors:
- <encrypt-algorithm-name> (+): # Encrypt algorithm name
+ <encrypt_algorithm_name> (+): # Encrypt algorithm name
type: # Encrypt algorithm type
props: # Encrypt algorithm properties
# ...
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/ha.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/ha.cn.md
index 0be16bd5eae..c8eb6ed3609 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/ha.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/ha.cn.md
@@ -19,22 +19,22 @@ rules:
- !DB_DISCOVERY
dataSources:
- <data-source-name> (+): # 逻辑数据源名称
+ <data_source_name> (+): # 逻辑数据源名称
dataSourceNames: # 数据源名称列表
- - <data-source>
- - <data-source>
+ - <data_source>
+ - <data_source>
discoveryHeartbeatName: # 检测心跳名称
discoveryTypeName: # 数据库发现类型名称
# 心跳检测配置
discoveryHeartbeats:
- <discovery-heartbeat-name> (+): # 心跳名称
+ <discovery_heartbeat_name> (+): # 心跳名称
props:
keep-alive-cron: # cron 表达式，如：'0/5 * * * * ?'
# 数据库发现类型配置
discoveryTypes:
- <discovery-type-name> (+): # 数据库发现类型名称
+ <discovery_type_name> (+): # 数据库发现类型名称
type: # 数据库发现类型，如：MySQL.MGR，MySQL.NORMAL_REPLICATION，openGauss.NORMAL_REPLICATION
props (?):
group-name: 92504d5b-6dec-11e8-91ea-246e9612aaf1 # 数据库发现类型必要参数，如 MGR 的 group-name
@@ -88,10 +88,10 @@ rules:
- ds_0
- ds_1
- ds_2
- discoveryHeartbeatName: mgr-heartbeat
+ discoveryHeartbeatName: mgr_heartbeat
discoveryTypeName: mgr
discoveryHeartbeats:
- mgr-heartbeat:
+ mgr_heartbeat:
props:
keep-alive-cron: '0/5 * * * * ?'
discoveryTypes:
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/ha.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/ha.en.md
index 4ac2234be6d..a888220afcc 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/ha.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/ha.en.md
@@ -19,22 +19,22 @@ rules:
- !DB_DISCOVERY
dataSources:
- <data-source-name> (+): # Logic data source name
+ <data_source_name> (+): # Logic data source name
dataSourceNames: # Data source names
- - <data-source>
- - <data-source>
+ - <data_source>
+ - <data_source>
discoveryHeartbeatName: # Detect heartbeat name
discoveryTypeName: # Database discovery type name
# Heartbeat Configuration
discoveryHeartbeats:
- <discovery-heartbeat-name> (+): # heartbeat name
+ <discovery_heartbeat_name> (+): # heartbeat name
props:
keep-alive-cron: # This is cron expression, such as：'0/5 * * * * ?'
# Database Discovery Configuration
discoveryTypes:
- <discovery-type-name> (+): # Database discovery type name
+ <discovery_type_name> (+): # Database discovery type name
type: # Database discovery type, such as: MySQL.MGR, MySQL.NORMAL_REPLICATION, openGauss.NORMAL_REPLICATION
props (?):
group-name: 92504d5b-6dec-11e8-91ea-246e9612aaf1 # Required parameters for database discovery types, such as MGR's group-name
@@ -87,10 +87,10 @@ rules:
- ds_0
- ds_1
- ds_2
- discoveryHeartbeatName: mgr-heartbeat
+ discoveryHeartbeatName: mgr_heartbeat
discoveryTypeName: mgr
discoveryHeartbeats:
- mgr-heartbeat:
+ mgr_heartbeat:
props:
keep-alive-cron: '0/5 * * * * ?'
discoveryTypes:
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/mix.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/mix.cn.md
index bf51869ac98..ef1555f78d7 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/mix.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/mix.cn.md
@@ -13,7 +13,7 @@ ShardingSphere 涵盖了很多功能，例如，分库分片、读写分离、
rules:
- !SHARDING
tables:
- <logic-table-name>: # 逻辑表名称:
+ <logic_table_name>: # 逻辑表名称:
actualDataNodes: # 由逻辑数据源名 + 表名组成（参考 Inline 语法规则）
tableStrategy: # 分表策略，同分库策略
standard:
@@ -27,7 +27,7 @@ rules:
shardingColumn: # 分片列名称
shardingAlgorithmName: # 分片算法名称
shardingAlgorithms:
- <sharding-algorithm-name>: # 分片算法名称
+ <sharding_algorithm_name>: # 分片算法名称
type: INLINE
props:
algorithm-expression: # INLINE 表达式
@@ -36,27 +36,27 @@ rules:
props:
algorithm-expression: # INLINE 表达式
keyGenerators:
- <key-generate-algorithm-name> (+): # 分布式序列算法名称
+ <key_generate_algorithm_name> (+): # 分布式序列算法名称
type: # 分布式序列算法类型
props: # 分布式序列算法属性配置
- !READWRITE_SPLITTING
dataSources:
- <data-source-name>: # 读写分离逻辑数据源名称
+ <data_source_name>: # 读写分离逻辑数据源名称
dynamicStrategy: # 读写分离类型
autoAwareDataSourceName: # 数据库发现逻辑数据源名称
- <data-source-name>: # 读写分离逻辑数据源名称
+ <data_source_name>: # 读写分离逻辑数据源名称
dynamicStrategy: # 读写分离类型
autoAwareDataSourceName: # 数据库发现逻辑数据源名称
- !DB_DISCOVERY
dataSources:
- <data-source-name>:
+ <data_source_name>:
dataSourceNames: # 数据源名称列表
- ds_0
- ds_1
- ds_2
discoveryHeartbeatName: # 检测心跳名称
discoveryTypeName: # 数据库发现类型名称
- <data-source-name>:
+ <data_source_name>:
dataSourceNames: # 数据源名称列表
- ds_3
- ds_4
@@ -64,25 +64,25 @@ rules:
discoveryHeartbeatName: # 检测心跳名称
discoveryTypeName: # 数据库发现类型名称
discoveryHeartbeats:
- <discovery-heartbeat-name>: # 心跳名称
+ <discovery_heartbeat_name>: # 心跳名称
props:
keep-alive-cron: # cron 表达式，如：'0/5 * * * * ?'
discoveryTypes:
- <discovery-type-name>: # 数据库发现类型名称
+ <discovery_type_name>: # 数据库发现类型名称
type: # 数据库发现类型，如：MySQL.MGR
props:
group-name: # 数据库发现类型必要参数，如 MGR 的 group-name
- !ENCRYPT
encryptors:
- <encrypt-algorithm-name> (+): # 加解密算法名称
+ <encrypt_algorithm_name> (+): # 加解密算法名称
type: # 加解密算法类型
props: # 加解密算法属性配置
- <encrypt-algorithm-name> (+): # 加解密算法名称
+ <encrypt_algorithm_name> (+): # 加解密算法名称
type: # 加解密算法类型
tables:
- <table-name>: # 加密表名称
+ <table_name>: # 加密表名称
columns:
- <column-name> (+): # 加密列名称
+ <column_name> (+): # 加密列名称
plainColumn (?): # 原文列名称
cipherColumn: # 密文列名称
encryptorName: # 密文列加密算法名称
@@ -143,17 +143,17 @@ rules:
- ds_0
- ds_1
- ds_2
- discoveryHeartbeatName: mgr-heartbeat
+ discoveryHeartbeatName: mgr_heartbeat
discoveryTypeName: mgr
readwrite_ds_1:
dataSourceNames:
- ds_3
- ds_4
- ds_5
- discoveryHeartbeatName: mgr-heartbeat
+ discoveryHeartbeatName: mgr_heartbeat
discoveryTypeName: mgr
discoveryHeartbeats:
- mgr-heartbeat:
+ mgr_heartbeat:
props:
keep-alive-cron: '0/5 * * * * ?'
discoveryTypes:
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/mix.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/mix.en.md
index c980400316e..ea0f35b163c 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/mix.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/mix.en.md
@@ -14,7 +14,7 @@ Below, you will find the parameters' explanation and configuration samples based
rules:
- !SHARDING
tables:
- <logic-table-name>: # Logical table name:
+ <logic_table_name>: # Logical table name:
actualDataNodes: # consists of logical data source name plus table name (refer to Inline syntax rules)
tableStrategy: # Table shards strategy. The same as database shards strategy
standard:
@@ -28,7 +28,7 @@ rules:
shardingColumn: # Sharding column name
shardingAlgorithmName: # Sharding algorithm name
shardingAlgorithms:
- <sharding-algorithm-name>: # Sharding algorithm name
+ <sharding_algorithm_name>: # Sharding algorithm name
type: INLINE
props:
algorithm-expression: # INLINE expression
@@ -37,27 +37,27 @@ rules:
props:
algorithm-expression: # INLINE expression
keyGenerators:
- <key-generate-algorithm-name> (+): # Distributed sequence algorithm name
+ <key_generate_algorithm_name> (+): # Distributed sequence algorithm name
type: # Distributed sequence algorithm type
props: # Property configuration of distributed sequence algorithm
- !READWRITE_SPLITTING
dataSources:
- <data-source-name>: # Read/write splitting logical data source name
+ <data_source_name>: # Read/write splitting logical data source name
dynamicStrategy: # Read/write splitting type
autoAwareDataSourceName: # Database discovery logical data source name
- <data-source-name>: # Read/write splitting logical data source name
+ <data_source_name>: # Read/write splitting logical data source name
dynamicStrategy: # Read/write splitting type
autoAwareDataSourceName: # Database discovery logical data source name
- !DB_DISCOVERY
dataSources:
- <data-source-name>:
+ <data_source_name>:
dataSourceNames: # Data source name list
- ds_0
- ds_1
- ds_2
discoveryHeartbeatName: # Detect heartbeat name
discoveryTypeName: # Database discovery type name
- <data-source-name>:
+ <data_source_name>:
dataSourceNames: # Data source name list
- ds_3
- ds_4
@@ -65,25 +65,25 @@ rules:
discoveryHeartbeatName: # Detect heartbeat name
discoveryTypeName: # Database discovery type name
discoveryHeartbeats:
- <discovery-heartbeat-name>: # Heartbeat name
+ <discovery_heartbeat_name>: # Heartbeat name
props:
keep-alive-cron: # cron expression, such as '0/5 * * * * ?'
discoveryTypes:
- <discovery-type-name>: # Database discovery type name
+ <discovery_type_name>: # Database discovery type name
type: # Database discovery type, such as MySQL.MGR.
props:
group-name: # Required parameter of database discovery type, such as MGR's group-name.
- !ENCRYPT
encryptors:
- <encrypt-algorithm-name> (+): # Encryption and decryption algorithm name
+ <encrypt_algorithm_name> (+): # Encryption and decryption algorithm name
type: # Encryption and decryption algorithm type
props: # Encryption and decryption algorithm property configuration
- <encrypt-algorithm-name> (+): # Encryption and decryption algorithm name
+ <encrypt_algorithm_name> (+): # Encryption and decryption algorithm name
type: # Encryption and decryption algorithm type
tables:
- <table-name>: # Encryption table name
+ <table_name>: # Encryption table name
columns:
- <column-name> (+): # Encrypt logic column name
+ <column_name> (+): # Encrypt logic column name
plainColumn (?): # Plain column name
cipherColumn: # Cipher column name
encryptorName: # Cipher encrypt algorithm name
@@ -144,17 +144,17 @@ rules:
- ds_0
- ds_1
- ds_2
- discoveryHeartbeatName: mgr-heartbeat
+ discoveryHeartbeatName: mgr_heartbeat
discoveryTypeName: mgr
readwrite_ds_1:
dataSourceNames:
- ds_3
- ds_4
- ds_5
- discoveryHeartbeatName: mgr-heartbeat
+ discoveryHeartbeatName: mgr_heartbeat
discoveryTypeName: mgr
discoveryHeartbeats:
- mgr-heartbeat:
+ mgr_heartbeat:
props:
keep-alive-cron: '0/5 * * * * ?'
discoveryTypes:
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/readwrite-splitting.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/readwrite-splitting.cn.md
index b89a99180a3..c30746c598f 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/readwrite-splitting.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/readwrite-splitting.cn.md
@@ -15,15 +15,15 @@ weight = 2
rules:
- !READWRITE_SPLITTING
dataSources:
- <data-source-name> (+): # 读写分离逻辑数据源名称
- static-strategy: # 读写分离类型
- write-data-source-name: # 写库数据源名称
- read-data-source-names: # 读库数据源名称，多个从数据源用逗号分隔
+ <data_source_name> (+): # 读写分离逻辑数据源名称
+ static_strategy: # 读写分离类型
+ write_data_source_name: # 写库数据源名称
+ read_data_source_names: # 读库数据源名称，多个从数据源用逗号分隔
loadBalancerName: # 负载均衡算法名称
# 负载均衡算法配置
loadBalancers:
- <load-balancer-name> (+): # 负载均衡算法名称
+ <load_balancer_name> (+): # 负载均衡算法名称
type: # 负载均衡算法类型
props: # 负载均衡算法属性配置
# ...
@@ -35,15 +35,15 @@ rules:
rules:
- !READWRITE_SPLITTING
dataSources:
- <data-source-name> (+): # 读写分离逻辑数据源名称
- dynamic-strategy: # 读写分离类型
- auto-aware-data-source-name: # 数据库发现逻辑数据源名称
- write-data-source-query-enabled: # 从库全部下线，主库是否承担读流量
+ <data_source_name> (+): # 读写分离逻辑数据源名称
+ dynamic_strategy: # 读写分离类型
+ auto_aware_data_source_name: # 数据库发现逻辑数据源名称
+ write_data_source_query_enabled: # 从库全部下线，主库是否承担读流量
loadBalancerName: # 负载均衡算法名称
# 负载均衡算法配置
loadBalancers:
- <load-balancer-name> (+): # 负载均衡算法名称
+ <load_balancer_name> (+): # 负载均衡算法名称
type: # 负载均衡算法类型
props: # 负载均衡算法属性配置
# ...
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/readwrite-splitting.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/readwrite-splitting.en.md
index 3f9ab20ede6..948cb0e7568 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/readwrite-splitting.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/readwrite-splitting.en.md
@@ -14,15 +14,15 @@ Read/write splitting YAML configuration is highly readable. The YAML format enab
rules:
- !READWRITE_SPLITTING
dataSources:
- <data-source-name> (+): # Logic data source name of readwrite-splitting
- static-strategy: # Readwrite-splitting type
- write-data-source-name: # Write data source name
- read-data-source-names: # Read data source names, multiple data source names separated with comma
+ <data_source_name> (+): # Logic data source name of readwrite-splitting
+ static_strategy: # Readwrite-splitting type
+ write_data_source_name: # Write data source name
+ read_data_source_names: # Read data source names, multiple data source names separated with comma
loadBalancerName: # Load balance algorithm name
# Load balance algorithm configuration
loadBalancers:
- <load-balancer-name> (+): # Load balance algorithm name
+ <load_balancer_name> (+): # Load balance algorithm name
type: # Load balance algorithm type
props: # Load balance algorithm properties
# ...
@@ -34,15 +34,15 @@ rules:
rules:
- !READWRITE_SPLITTING
dataSources:
- <data-source-name> (+): # Logic data source name of readwrite-splitting
- dynamic-strategy: # Readwrite-splitting type
- auto-aware-data-source-name: # Database discovery logic data source name
- write-data-source-query-enabled: # All read data source are offline, write data source whether the data source is responsible for read traffic
+ <data_source_name> (+): # Logic data source name of readwrite-splitting
+ dynamic_strategy: # Readwrite-splitting type
+ auto_aware_data_source_name: # Database discovery logic data source name
+ write_data_source_query_enabled: # All read data source are offline, write data source whether the data source is responsible for read traffic
loadBalancerName: # Load balance algorithm name
# Load balance algorithm configuration
loadBalancers:
- <load-balancer-name> (+): # Load balance algorithm name
+ <load_balancer_name> (+): # Load balance algorithm name
type: # Load balance algorithm type
props: # Load balance algorithm properties
# ...
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/shadow.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/shadow.cn.md
index 843dd11c359..6fd2877a3de 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/shadow.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/shadow.cn.md
@@ -16,14 +16,14 @@ rules:
productionDataSourceName: # 生产数据源名称
shadowDataSourceName: # 影子数据源名称
tables:
- <table-name>:
+ <table_name>:
dataSourceNames: # 影子表关联影子数据源名称列表
- - <shadow-data-source>
+ - <shadow_data_source>
shadowAlgorithmNames: # 影子表关联影子算法名称列表
- - <shadow-algorithm-name>
+ - <shadow_algorithm_name>
defaultShadowAlgorithmName: # 默认影子算法名称（选配项）
shadowAlgorithms:
- <shadow-algorithm-name> (+): # 影子算法名称
+ <shadow_algorithm_name> (+): # 影子算法名称
type: # 影子算法类型
props: # 影子算法属性配置
```
@@ -69,16 +69,16 @@ rules:
dataSourceNames:
- shadowDataSource
shadowAlgorithmNames:
- - user-id-insert-match-algorithm
- - simple-hint-algorithm
+ - user_id_insert_match_algorithm
+ - simple_hint_algorithm
shadowAlgorithms:
- user-id-insert-match-algorithm:
+ user_id_insert_match_algorithm:
type: REGEX_MATCH
props:
operation: insert
column: user_id
regex: "[1]"
- simple-hint-algorithm:
+ simple_hint_algorithm:
type: SIMPLE_HINT
props:
foo: bar
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/shadow.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/shadow.en.md
index ad204f70568..0de5671107d 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/shadow.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/shadow.en.md
@@ -16,14 +16,14 @@ rules:
productionDataSourceName: # production data source name
shadowDataSourceName: # shadow data source name
tables:
- <table-name>:
+ <table_name>:
dataSourceNames: # shadow table associates shadow data source name list
- - <shadow-data-source>
+ - <shadow_data_source>
shadowAlgorithmNames: # shadow table associates shadow algorithm name list
- - <shadow-algorithm-name>
+ - <shadow_algorithm_name>
defaultShadowAlgorithmName: # default shadow algorithm name (option)
shadowAlgorithms:
- <shadow-algorithm-name> (+): # shadow algorithm name
+ <shadow_algorithm_name> (+): # shadow algorithm name
type: # shadow algorithm type
props: # shadow algorithm attribute configuration
```
@@ -71,16 +71,16 @@ rules:
dataSourceNames:
- shadowDataSource
shadowAlgorithmNames:
- - user-id-insert-match-algorithm
- - simple-hint-algorithm
+ - user_id_insert_match_algorithm
+ - simple_hint_algorithm
shadowAlgorithms:
- user-id-insert-match-algorithm:
+ user_id_insert_match_algorithm:
type: REGEX_MATCH
props:
operation: insert
column: user_id
regex: "[1]"
- simple-hint-algorithm:
+ simple_hint_algorithm:
type: SIMPLE_HINT
props:
foo: bar
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/sharding.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/sharding.cn.md
index e561b350eff..3ca7dcd61a9 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/sharding.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/sharding.cn.md
@@ -13,7 +13,7 @@ weight = 1
rules:
- !SHARDING
tables: # 数据分片规则配置
- <logic-table-name> (+): # 逻辑表名称
+ <logic_table_name> (+): # 逻辑表名称
actualDataNodes (?): # 由数据源名 + 表名组成（参考 Inline 语法规则）
databaseStrategy (?): # 分库策略，缺省表示使用默认分库策略，以下的分片策略只能选其一
standard: # 用于单分片键的标准分片场景
@@ -31,8 +31,8 @@ rules:
keyGeneratorName: # 分布式序列算法名称
auditStrategy: # 分片审计策略
auditorNames: # 分片审计算法名称
- - <auditor-name>
- - <auditor-name>
+ - <auditor_name>
+ - <auditor_name>
allowHintDisable: true # 是否禁用分片审计hint
autoTables: # 自动分片表规则配置
t_order_auto: # 逻辑表名称
@@ -45,8 +45,8 @@ rules:
- <logic_table_name_1, logic_table_name_2, ...>
- <logic_table_name_1, logic_table_name_2, ...>
broadcastTables (+): # 广播表规则列表
- - <table-name>
- - <table-name>
+ - <table_name>
+ - <table_name>
defaultDatabaseStrategy: # 默认数据库分片策略
defaultTableStrategy: # 默认表分片策略
defaultKeyGenerateStrategy: # 默认的分布式序列策略
@@ -54,20 +54,20 @@ rules:
# 分片算法配置
shardingAlgorithms:
- <sharding-algorithm-name> (+): # 分片算法名称
+ <sharding_algorithm_name> (+): # 分片算法名称
type: # 分片算法类型
props: # 分片算法属性配置
# ...
# 分布式序列算法配置
keyGenerators:
- <key-generate-algorithm-name> (+): # 分布式序列算法名称
+ <key_generate_algorithm_name> (+): # 分布式序列算法名称
type: # 分布式序列算法类型
props: # 分布式序列算法属性配置
# ...
# 分片审计算法配置
auditors:
- <sharding-audit-algorithm-name> (+): # 分片审计算法名称
+ <sharding_audit_algorithm_name> (+): # 分片审计算法名称
type: # 分片审计算法类型
props: # 分片审计算法属性配置
# ...
@@ -105,7 +105,7 @@ rules:
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: t-order-inline
+ shardingAlgorithmName: t_order_inline
keyGenerateStrategy:
column: order_id
keyGeneratorName: snowflake
@@ -118,7 +118,7 @@ rules:
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: t_order-item-inline
+ shardingAlgorithmName: t_order_item_inline
keyGenerateStrategy:
column: order_item_id
keyGeneratorName: snowflake
@@ -126,7 +126,7 @@ rules:
actualDataNodes: ds_${0..1}.t_account_${0..1}
tableStrategy:
standard:
- shardingAlgorithmName: t-account-inline
+ shardingAlgorithmName: t_account_inline
keyGenerateStrategy:
column: account_id
keyGeneratorName: snowflake
@@ -138,24 +138,24 @@ rules:
defaultDatabaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: database-inline
+ shardingAlgorithmName: database_inline
defaultTableStrategy:
none:
shardingAlgorithms:
- database-inline:
+ database_inline:
type: INLINE
props:
algorithm-expression: ds_${user_id % 2}
- t-order-inline:
+ t_order_inline:
type: INLINE
props:
algorithm-expression: t_order_${order_id % 2}
- t_order-item-inline:
+ t_order_item_inline:
type: INLINE
props:
algorithm-expression: t_order_item_${order_id % 2}
- t-account-inline:
+ t_account_inline:
type: INLINE
props:
algorithm-expression: t_account_${account_id % 2}
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/sharding.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/sharding.en.md
index 7c6ca1c8bd5..38e4eb33a58 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/sharding.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/sharding.en.md
@@ -13,7 +13,7 @@ Data sharding YAML configuration is highly readable. The dependencies between sh
rules:
- !SHARDING
tables: # Sharding table configuration
- <logic-table-name> (+): # Logic table name
+ <logic_table_name> (+): # Logic table name
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
@@ -31,8 +31,8 @@ rules:
keyGeneratorName: # Key generator name
auditStrategy: # Sharding audit strategy
auditorNames: # Sharding auditor name
- - <auditor-name>
- - <auditor-name>
+ - <auditor_name>
+ - <auditor_name>
allowHintDisable: true # Enable or disable sharding audit hint
autoTables: # Auto Sharding table configuration
t_order_auto: # Logic table name
@@ -45,8 +45,8 @@ rules:
- <logic_table_name_1, logic_table_name_2, ...>
- <logic_table_name_1, logic_table_name_2, ...>
broadcastTables (+): # Broadcast tables
- - <table-name>
- - <table-name>
+ - <table_name>
+ - <table_name>
defaultDatabaseStrategy: # Default strategy for database sharding
defaultTableStrategy: # Default strategy for table sharding
defaultKeyGenerateStrategy: # Default Key generator strategy
@@ -54,21 +54,21 @@ rules:
# Sharding algorithm configuration
shardingAlgorithms:
- <sharding-algorithm-name> (+): # Sharding algorithm name
+ <sharding_algorithm_name> (+): # Sharding algorithm name
type: # Sharding algorithm type
props: # Sharding algorithm properties
# ...
# Key generate algorithm configuration
keyGenerators:
- <key-generate-algorithm-name> (+): # Key generate algorithm name
+ <key_generate_algorithm_name> (+): # Key generate algorithm name
type: # Key generate algorithm type
props: # Key generate algorithm properties
# ...
# Sharding audit algorithm configuration
auditors:
- <sharding-audit-algorithm-name> (+): # Sharding audit algorithm name
+ <sharding_audit_algorithm_name> (+): # Sharding audit algorithm name
type: # Sharding audit algorithm type
props: # Sharding audit algorithm properties
# ...
@@ -106,7 +106,7 @@ rules:
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: t-order-inline
+ shardingAlgorithmName: t_order_inline
keyGenerateStrategy:
column: order_id
keyGeneratorName: snowflake
@@ -119,7 +119,7 @@ rules:
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: t_order-item-inline
+ shardingAlgorithmName: t_order_item_inline
keyGenerateStrategy:
column: order_item_id
keyGeneratorName: snowflake
@@ -127,7 +127,7 @@ rules:
actualDataNodes: ds_${0..1}.t_account_${0..1}
tableStrategy:
standard:
- shardingAlgorithmName: t-account-inline
+ shardingAlgorithmName: t_account_inline
keyGenerateStrategy:
column: account_id
keyGeneratorName: snowflake
@@ -139,24 +139,24 @@ rules:
defaultDatabaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: database-inline
+ shardingAlgorithmName: database_inline
defaultTableStrategy:
none:
shardingAlgorithms:
- database-inline:
+ database_inline:
type: INLINE
props:
algorithm-expression: ds_${user_id % 2}
- t-order-inline:
+ t_order_inline:
type: INLINE
props:
algorithm-expression: t_order_${order_id % 2}
- t_order-item-inline:
+ t_order_item_inline:
type: INLINE
props:
algorithm-expression: t_order_item_${order_id % 2}
- t-account-inline:
+ t_account_inline:
type: INLINE
props:
algorithm-expression: t_account_${account_id % 2}
diff --git a/examples/docker/shardingsphere-proxy/sharding/conf/config-sharding.yaml b/examples/docker/shardingsphere-proxy/sharding/conf/config-sharding.yaml
index fcdc3e48287..4a9a1b5531c 100644
--- a/examples/docker/shardingsphere-proxy/sharding/conf/config-sharding.yaml
+++ b/examples/docker/shardingsphere-proxy/sharding/conf/config-sharding.yaml
@@ -50,7 +50,7 @@ rules:
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: t-order-inline
+ shardingAlgorithmName: t_order_inline
keyGenerateStrategy:
column: order_id
keyGeneratorName: snowflake
@@ -59,7 +59,7 @@ rules:
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: t-order-item-inline
+ shardingAlgorithmName: t_order_item_inline
keyGenerateStrategy:
column: order_id
keyGeneratorName: snowflake
@@ -70,21 +70,21 @@ rules:
defaultDatabaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: database-inline
+ shardingAlgorithmName: database_inline
defaultTableStrategy:
none:
shardingAlgorithms:
- database-inline:
+ database_inline:
type: INLINE
props:
algorithm-expression: ds_${user_id % 2}
- t-order-inline:
+ t_order_inline:
type: INLINE
props:
algorithm-expression: t_order_${order_id % 2}
- t-order-item-inline:
+ t_order_item_inline:
type: INLINE
props:
algorithm-expression: t_order_item_${order_id % 2}
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-auto-tables.yaml b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-auto-tables.yaml
index 6ccd07773c7..79d078ec814 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-auto-tables.yaml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-auto-tables.yaml
@@ -37,7 +37,7 @@ rules:
shardingStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: auto-mod
+ shardingAlgorithmName: auto_mod
keyGenerateStrategy:
column: order_id
keyGeneratorName: snowflake
@@ -46,7 +46,7 @@ rules:
shardingStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: auto-mod
+ shardingAlgorithmName: auto_mod
keyGenerateStrategy:
column: order_item_id
keyGeneratorName: snowflake
@@ -54,16 +54,16 @@ rules:
actualDataSources: ds_0,ds_1
shardingStrategy:
standard:
- shardingAlgorithmName: auto-mod
+ shardingAlgorithmName: auto_mod
keyGenerateStrategy:
column: account_id
keyGeneratorName: snowflake
defaultShardingColumn: account_id
shardingAlgorithms:
- auto-mod:
+ auto_mod:
type: MOD
props:
- sharding-count: 4
+ sharding_count: 4
keyGenerators:
snowflake:
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-interval.yaml b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-interval.yaml
index b7083402237..d77c3a4348c 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-interval.yaml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-interval.yaml
@@ -34,10 +34,10 @@ rules:
tableStrategy:
standard:
shardingColumn: order_date
- shardingAlgorithmName: database-interval
+ shardingAlgorithmName: database_interval
shardingAlgorithms:
- database-interval:
+ database_interval:
type: INTERVAL
props:
datetime-pattern: 'yyyy-MM-dd HH:mm:ss'
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-range.yaml b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-range.yaml
index e3b712226da..89f4320fc38 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-range.yaml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-range.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-databaseName: sharding-databases-range
+databaseName: sharding_databases_range
dataSources:
ds_0:
@@ -56,13 +56,13 @@ rules:
defaultDatabaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard-test-db
+ shardingAlgorithmName: standard_test_db
defaultTableStrategy:
none:
defaultShardingColumn: user_id
shardingAlgorithms:
- standard-test-db:
+ standard_test_db:
type: STANDARD_TEST_DB
keyGenerators:
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables-range.yaml b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables-range.yaml
index e52dfaf3144..5a9f0437ae4 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables-range.yaml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables-range.yaml
@@ -37,7 +37,7 @@ rules:
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: standard-test-tbl
+ shardingAlgorithmName: standard_test_tbl
keyGenerateStrategy:
column: order_id
keyGeneratorName: snowflake
@@ -46,7 +46,7 @@ rules:
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: standard-test-tbl
+ shardingAlgorithmName: standard_test_tbl
keyGenerateStrategy:
column: order_item_id
keyGeneratorName: snowflake
@@ -54,7 +54,7 @@ rules:
actualDataNodes: ds_${0..1}.t_account_${0..1}
tableStrategy:
standard:
- shardingAlgorithmName: standard-test-tbl
+ shardingAlgorithmName: standard_test_tbl
keyGenerateStrategy:
column: account_id
keyGeneratorName: snowflake
@@ -66,14 +66,14 @@ rules:
defaultDatabaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard-test-db
+ shardingAlgorithmName: standard_test_db
defaultTableStrategy:
none:
shardingAlgorithms:
- standard-test-db:
+ standard_test_db:
type: STANDARD_TEST_DB
- standard-test-tbl:
+ standard_test_tbl:
type: STANDARD_TEST_TBL
keyGenerators:
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables.yaml b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables.yaml
index 2458c7009cb..974289d17e0 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables.yaml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables.yaml
@@ -37,7 +37,7 @@ rules:
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: t-order-inline
+ shardingAlgorithmName: t_order_inline
keyGenerateStrategy:
column: order_id
keyGeneratorName: snowflake
@@ -46,7 +46,7 @@ rules:
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: t_order-item-inline
+ shardingAlgorithmName: t_order_item_inline
keyGenerateStrategy:
column: order_item_id
keyGeneratorName: snowflake
@@ -54,7 +54,7 @@ rules:
actualDataNodes: ds_${0..1}.t_account_${0..1}
tableStrategy:
standard:
- shardingAlgorithmName: t-account-inline
+ shardingAlgorithmName: t_account_inline
keyGenerateStrategy:
column: account_id
keyGeneratorName: snowflake
@@ -66,27 +66,27 @@ rules:
defaultDatabaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: database-inline
+ shardingAlgorithmName: database_inline
defaultTableStrategy:
none:
shardingAlgorithms:
- database-inline:
+ database_inline:
type: INLINE
props:
- algorithm-expression: ds_${user_id % 2}
- t-order-inline:
+ algorithm_expression: ds_${user_id % 2}
+ t_order_inline:
type: INLINE
props:
- algorithm-expression: t_order_${order_id % 2}
- t_order-item-inline:
+ algorithm_expression: t_order_${order_id % 2}
+ t_order_item_inline:
type: INLINE
props:
- algorithm-expression: t_order_item_${order_id % 2}
- t-account-inline:
+ algorithm_expression: t_order_item_${order_id % 2}
+ t_account_inline:
type: INLINE
props:
- algorithm-expression: t_account_${account_id % 2}
+ algorithm_expression: t_account_${account_id % 2}
keyGenerators:
snowflake:
type: SNOWFLAKE
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases.yaml b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases.yaml
index f3a7b57f5e8..21db4780f1a 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases.yaml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases.yaml
@@ -59,15 +59,15 @@ rules:
defaultDatabaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: database-inline
+ shardingAlgorithmName: database_inline
defaultTableStrategy:
none:
shardingAlgorithms:
- database-inline:
+ database_inline:
type: INLINE
props:
- algorithm-expression: ds_${user_id % 2}
+ algorithm_expression: ds_${user_id % 2}
keyGenerators:
snowflake:
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-hint-databases-only.yaml b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-hint-databases-only.yaml
index 2505c472825..082ff15846c 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-hint-databases-only.yaml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-hint-databases-only.yaml
@@ -43,12 +43,12 @@ rules:
defaultDatabaseStrategy:
hint:
- shardingAlgorithmName: hint-test
+ shardingAlgorithmName: hint_test
defaultTableStrategy:
none:
shardingAlgorithms:
- hint-test:
+ hint_test:
type: HINT_TEST
props:
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-hint-databases-tables.yaml b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-hint-databases-tables.yaml
index cc4f1945b54..bb5a7a6056d 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-hint-databases-tables.yaml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-hint-databases-tables.yaml
@@ -36,10 +36,10 @@ rules:
actualDataNodes: ds_${0..1}.t_order_${0..1}
databaseStrategy:
hint:
- shardingAlgorithmName: hint-test
+ shardingAlgorithmName: hint_test
tableStrategy:
hint:
- shardingAlgorithmName: hint-test
+ shardingAlgorithmName: hint_test
keyGenerateStrategy:
column: order_id
keyGeneratorName: snowflake
@@ -47,10 +47,10 @@ rules:
actualDataNodes: ds_${0..1}.t_order_item_${0..1}
databaseStrategy:
hint:
- shardingAlgorithmName: hint-test
+ shardingAlgorithmName: hint_test
tableStrategy:
hint:
- shardingAlgorithmName: hint-test
+ shardingAlgorithmName: hint_test
keyGenerateStrategy:
column: order_item_id
keyGeneratorName: snowflake
@@ -62,14 +62,14 @@ rules:
defaultDatabaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: database-inline
+ shardingAlgorithmName: database_inline
defaultTableStrategy:
none:
shardingAlgorithms:
- hint-test:
+ hint_test:
type: HINT_TEST
- database-inline:
+ database_inline:
type: INLINE
props:
algorithm-expression: ds_${user_id % 2}
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-tables-range.yaml b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-tables-range.yaml
index d4677ebf653..cb51ac78b0b 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-tables-range.yaml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-tables-range.yaml
@@ -31,7 +31,7 @@ rules:
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: standard-test-tbl
+ shardingAlgorithmName: standard_test_tbl
keyGenerateStrategy:
column: order_id
keyGeneratorName: snowflake
@@ -40,7 +40,7 @@ rules:
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: standard-test-tbl
+ shardingAlgorithmName: standard_test_tbl
keyGenerateStrategy:
column: order_item_id
keyGeneratorName: snowflake
@@ -48,7 +48,7 @@ rules:
actualDataNodes: ds.t_account_${0..1}
tableStrategy:
standard:
- shardingAlgorithmName: standard-test-tbl
+ shardingAlgorithmName: standard_test_tbl
keyGenerateStrategy:
column: account_id
keyGeneratorName: snowflake
@@ -59,7 +59,7 @@ rules:
- t_address
shardingAlgorithms:
- standard-test-tbl:
+ standard_test_tbl:
type: STANDARD_TEST_TBL
keyGenerators:
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-tables.yaml b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-tables.yaml
index 1b3cba44997..eeea15c7b18 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-tables.yaml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-tables.yaml
@@ -31,7 +31,7 @@ rules:
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: t-order-inline
+ shardingAlgorithmName: t_order_inline
keyGenerateStrategy:
column: order_id
keyGeneratorName: snowflake
@@ -40,7 +40,7 @@ rules:
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: t-order-item-inline
+ shardingAlgorithmName: t_order_item_inline
keyGenerateStrategy:
column: order_item_id
keyGeneratorName: snowflake
@@ -48,7 +48,7 @@ rules:
actualDataNodes: ds.t_account_${0..1}
tableStrategy:
standard:
- shardingAlgorithmName: t-account-inline
+ shardingAlgorithmName: t_account_inline
keyGenerateStrategy:
column: account_id
keyGeneratorName: snowflake
@@ -59,15 +59,15 @@ rules:
- t_address
shardingAlgorithms:
- t-order-inline:
+ t_order_inline:
type: INLINE
props:
algorithm-expression: t_order_${order_id % 2}
- t-order-item-inline:
+ t_order_item_inline:
type: INLINE
props:
algorithm-expression: t_order_item_${order_id % 2}
- t-account-inline:
+ t_account_inline:
type: INLINE
props:
algorithm-expression: t_account_${account_id % 2}
diff --git a/proxy/bootstrap/src/main/resources/conf/config-database-discovery.yaml b/proxy/bootstrap/src/main/resources/conf/config-database-discovery.yaml
index 41bc5f044e7..1e541e74a16 100644
--- a/proxy/bootstrap/src/main/resources/conf/config-database-discovery.yaml
+++ b/proxy/bootstrap/src/main/resources/conf/config-database-discovery.yaml
@@ -61,10 +61,10 @@
# - ds_0
# - ds_1
# - ds_2
-# discoveryHeartbeatName: mgr-heartbeat
+# discoveryHeartbeatName: mgr_heartbeat
# discoveryTypeName: mgr
# discoveryHeartbeats:
-# mgr-heartbeat:
+# mgr_heartbeat:
# props:
# keep-alive-cron: '0/5 * * * * ?'
# discoveryTypes:
@@ -118,10 +118,10 @@
# - ds_0
# - ds_1
# - ds_2
-# discoveryHeartbeatName: mgr-heartbeat
+# discoveryHeartbeatName: mgr_heartbeat
# discoveryTypeName: mgr
# discoveryHeartbeats:
-# mgr-heartbeat:
+# mgr_heartbeat:
# props:
# keep-alive-cron: '0/5 * * * * ?'
# discoveryTypes:
diff --git a/proxy/bootstrap/src/main/resources/conf/config-shadow.yaml b/proxy/bootstrap/src/main/resources/conf/config-shadow.yaml
index a1969f48388..f2f11241ca1 100644
--- a/proxy/bootstrap/src/main/resources/conf/config-shadow.yaml
+++ b/proxy/bootstrap/src/main/resources/conf/config-shadow.yaml
@@ -55,42 +55,42 @@
# dataSourceNames:
# - shadowDataSource
# shadowAlgorithmNames:
-# - user-id-insert-match-algorithm
-# - user-id-select-match-algorithm
+# - user_id_insert_match_algorithm
+# - user_id_select_match_algorithm
# t_order_item:
# dataSourceNames:
# - shadowDataSource
# shadowAlgorithmNames:
-# - user-id-insert-match-algorithm
-# - user-id-update-match-algorithm
-# - user-id-select-match-algorithm
+# - user_id_insert_match_algorithm
+# - user_id_update_match_algorithm
+# - user_id_select_match_algorithm
# t_address:
# dataSourceNames:
# - shadowDataSource
# shadowAlgorithmNames:
-# - user-id-insert-match-algorithm
-# - user-id-select-match-algorithm
-# - simple-hint-algorithm
+# - user_id_insert_match_algorithm
+# - user_id_select_match_algorithm
+# - simple_hint_algorithm
# shadowAlgorithms:
-# user-id-insert-match-algorithm:
+# user_id_insert_match_algorithm:
# type: REGEX_MATCH
# props:
# operation: insert
# column: user_id
# regex: "[1]"
-# user-id-update-match-algorithm:
+# user_id_update_match_algorithm:
# type: REGEX_MATCH
# props:
# operation: update
# column: user_id
# regex: "[1]"
-# user-id-select-match-algorithm:
+# user_id_select_match_algorithm:
# type: REGEX_MATCH
# props:
# operation: select
# column: user_id
# regex: "[1]"
-# simple-hint-algorithm:
+# simple_hint_algorithm:
# type: SIMPLE_HINT
# props:
# foo: bar
@@ -134,42 +134,42 @@
# dataSourceNames:
# - shadowDataSource
# shadowAlgorithmNames:
-# - user-id-insert-match-algorithm
-# - user-id-select-match-algorithm
+# - user_id_insert_match_algorithm
+# - user_id_select_match_algorithm
# t_order_item:
# dataSourceNames:
# - shadowDataSource
# shadowAlgorithmNames:
-# - user-id-insert-match-algorithm
-# - user-id-update-match-algorithm
-# - user-id-select-match-algorithm
+# - user_id_insert_match_algorithm
+# - user_id_update_match_algorithm
+# - user_id_select_match_algorithm
# t_address:
# dataSourceNames:
# - shadowDataSource
# shadowAlgorithmNames:
-# - user-id-insert-match-algorithm
-# - user-id-select-match-algorithm
-# - simple-hint-algorithm
+# - user_id_insert_match_algorithm
+# - user_id_select_match_algorithm
+# - simple_hint_algorithm
# shadowAlgorithms:
-# user-id-insert-match-algorithm:
+# user_id_insert_match_algorithm:
# type: REGEX_MATCH
# props:
# operation: insert
# column: user_id
# regex: "[1]"
-# user-id-update-match-algorithm:
+# user_id_update_match_algorithm:
# type: REGEX_MATCH
# props:
# operation: update
# column: user_id
# regex: "[1]"
-# user-id-select-match-algorithm:
+# user_id_select_match_algorithm:
# type: REGEX_MATCH
# props:
# operation: select
# column: user_id
# regex: "[1]"
-# simple-hint-algorithm:
+# simple_hint_algorithm:
# type: SIMPLE_HINT
# props:
# foo: bar