This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 5d929dca340 Optimize algorithm name in yaml (#27355)
5d929dca340 is described below
commit 5d929dca3400ca367373fe9a55ec3c8875f82887
Author: niu niu <[email protected]>
AuthorDate: Sat Jul 22 15:30:58 2023 +0800
Optimize algorithm name in yaml (#27355)
---
.../core/src/test/resources/config/driver/foo-driver-fixture.yaml | 4 ++--
.../core/src/test/resources/config/driver/foo-driver-fixture.yaml | 4 ++--
.../test/resources/config/factory/config-for-factory-test.yaml | 4 ++--
.../test/resources/conf/convert/config-sharding-auto-tables.yaml | 8 ++++----
.../test/resources/conf/import/config-duplicated-logic-table.yaml | 4 ++--
test/e2e/agent/jdbc-project/src/main/resources/config.yaml | 4 ++--
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/agent/plugins/metrics/core/src/test/resources/config/driver/foo-driver-fixture.yaml
b/agent/plugins/metrics/core/src/test/resources/config/driver/foo-driver-fixture.yaml
index 1942b9272c0..026cec85155 100644
---
a/agent/plugins/metrics/core/src/test/resources/config/driver/foo-driver-fixture.yaml
+++
b/agent/plugins/metrics/core/src/test/resources/config/driver/foo-driver-fixture.yaml
@@ -39,12 +39,12 @@ rules:
shardingStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: auto-mod
+ shardingAlgorithmName: auto_mod
keyGenerateStrategy:
column: user_id
keyGeneratorName: snowflake
shardingAlgorithms:
- auto-mod:
+ auto_mod:
type: HASH_MOD
props:
sharding-count: 2
diff --git a/jdbc/core/src/test/resources/config/driver/foo-driver-fixture.yaml
b/jdbc/core/src/test/resources/config/driver/foo-driver-fixture.yaml
index 1942b9272c0..026cec85155 100644
--- a/jdbc/core/src/test/resources/config/driver/foo-driver-fixture.yaml
+++ b/jdbc/core/src/test/resources/config/driver/foo-driver-fixture.yaml
@@ -39,12 +39,12 @@ rules:
shardingStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: auto-mod
+ shardingAlgorithmName: auto_mod
keyGenerateStrategy:
column: user_id
keyGeneratorName: snowflake
shardingAlgorithms:
- auto-mod:
+ auto_mod:
type: HASH_MOD
props:
sharding-count: 2
diff --git
a/jdbc/core/src/test/resources/config/factory/config-for-factory-test.yaml
b/jdbc/core/src/test/resources/config/factory/config-for-factory-test.yaml
index 68eb1479f86..ee9fa6ae732 100644
--- a/jdbc/core/src/test/resources/config/factory/config-for-factory-test.yaml
+++ b/jdbc/core/src/test/resources/config/factory/config-for-factory-test.yaml
@@ -33,9 +33,9 @@ rules:
shardingStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: auto-mod
+ shardingAlgorithmName: auto_mod
shardingAlgorithms:
- auto-mod:
+ auto_mod:
type: MOD
props:
sharding-count: 4
diff --git
a/proxy/backend/core/src/test/resources/conf/convert/config-sharding-auto-tables.yaml
b/proxy/backend/core/src/test/resources/conf/convert/config-sharding-auto-tables.yaml
index 2c1003804a5..2a09acb2de8 100644
---
a/proxy/backend/core/src/test/resources/conf/convert/config-sharding-auto-tables.yaml
+++
b/proxy/backend/core/src/test/resources/conf/convert/config-sharding-auto-tables.yaml
@@ -45,7 +45,7 @@ rules:
shardingStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: auto-mod
+ shardingAlgorithmName: auto_mod
keyGenerateStrategy:
column: order_id
keyGeneratorName: snowflake
@@ -58,7 +58,7 @@ rules:
shardingStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: auto-mod
+ shardingAlgorithmName: auto_mod
keyGenerateStrategy:
column: order_item_id
keyGeneratorName: snowflake
@@ -66,13 +66,13 @@ 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
diff --git
a/proxy/backend/core/src/test/resources/conf/import/config-duplicated-logic-table.yaml
b/proxy/backend/core/src/test/resources/conf/import/config-duplicated-logic-table.yaml
index d69b1c4625a..e1b64b99b38 100644
---
a/proxy/backend/core/src/test/resources/conf/import/config-duplicated-logic-table.yaml
+++
b/proxy/backend/core/src/test/resources/conf/import/config-duplicated-logic-table.yaml
@@ -64,7 +64,7 @@ rules:
shardingStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: auto-mod
+ shardingAlgorithmName: auto_mod
keyGenerateStrategy:
column: order_id
keyGeneratorName: snowflake
@@ -90,7 +90,7 @@ rules:
type: INLINE
props:
algorithm-expression: t_order_item_${order_id % 2}
- auto-mod:
+ auto_mod:
type: MOD
props:
sharding-count: 4
diff --git a/test/e2e/agent/jdbc-project/src/main/resources/config.yaml
b/test/e2e/agent/jdbc-project/src/main/resources/config.yaml
index d4827feb1ca..1b8311e542f 100644
--- a/test/e2e/agent/jdbc-project/src/main/resources/config.yaml
+++ b/test/e2e/agent/jdbc-project/src/main/resources/config.yaml
@@ -39,12 +39,12 @@ rules:
databaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: database-inline
+ shardingAlgorithmName: database_inline
keyGenerateStrategy:
column: id
keyGeneratorName: snowflake
shardingAlgorithms:
- database-inline:
+ database_inline:
type: INLINE
props:
algorithm-expression: ds_$->{user_id % 2}
