You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2022/05/06 09:52:59 UTC
[shardingsphere] branch master updated: Unify test algorithm names (#17381)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 86fd1e69884 Unify test algorithm names (#17381)
86fd1e69884 is described below
commit 86fd1e698841f5145833fe53a35d48fdc01fbe9d
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri May 6 17:52:51 2022 +0800
Unify test algorithm names (#17381)
* Rename complex_test to complex_fixture
* Rename hint_test to hint_fixture
* Unify test algorithm names
---
.../src/main/resources/conf/config-databases-only.yaml | 2 +-
.../route/engine/fixture/AbstractRoutingEngineTest.java | 14 +++++++-------
.../shardingsphere/sharding/rule/ShardingRuleTest.java | 2 +-
...nfigurationsForYamlShardingRuleConfigurationTest.java | 12 ++++++------
.../src/test/resources/yaml/sharding-rule.yaml | 16 ++++++++--------
.../src/test/resources/config/config-sharding.yaml | 6 +++---
.../resources/cases/rql/dataset/db/show_algorithms.xml | 2 +-
.../dbtbl_with_readwrite_splitting/show_algorithms.xml | 2 +-
.../show_algorithms.xml | 2 +-
.../resources/cases/rql/dataset/tbl/show_algorithms.xml | 2 +-
.../env/scenario/db/proxy/conf/mysql/config-db.yaml | 8 ++++----
.../env/scenario/db/proxy/conf/postgresql/config-db.yaml | 8 ++++----
.../src/test/resources/env/scenario/db/rules.yaml | 8 ++++----
.../mysql/config-dbtbl-with-readwrite-splitting.yaml | 14 +++++++-------
.../config-dbtbl-with-readwrite-splitting.yaml | 14 +++++++-------
.../scenario/dbtbl_with_readwrite_splitting/rules.yaml | 14 +++++++-------
...onfig-dbtbl-with-readwrite-splitting-and-encrypt.yaml | 14 +++++++-------
...onfig-dbtbl-with-readwrite-splitting-and-encrypt.yaml | 14 +++++++-------
.../rules.yaml | 14 +++++++-------
.../env/scenario/tbl/proxy/conf/mysql/config-tbl.yaml | 8 ++++----
.../scenario/tbl/proxy/conf/postgresql/config-tbl.yaml | 8 ++++----
.../src/test/resources/env/scenario/tbl/rules.yaml | 8 ++++----
22 files changed, 96 insertions(+), 96 deletions(-)
diff --git a/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-databases-only.yaml b/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-databases-only.yaml
index cefff562ead..d5ae9948be0 100644
--- a/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-databases-only.yaml
+++ b/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-databases-only.yaml
@@ -57,4 +57,4 @@ rules:
shardingAlgorithms:
hint_test:
- type: HINT_TEST
\ No newline at end of file
+ type: HINT_TEST
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/fixture/AbstractRoutingEngineTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/fixture/AbstractRoutingEngineTest.java
index 3d24737773f..00ced65eae9 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/fixture/AbstractRoutingEngineTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/fixture/AbstractRoutingEngineTest.java
@@ -112,17 +112,17 @@ public abstract class AbstractRoutingEngineTest {
protected final ShardingRule createHintShardingRule() {
ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
shardingRuleConfig.getTables().add(createTableRuleWithHintConfig());
- shardingRuleConfig.getShardingAlgorithms().put("hint_test", new ShardingSphereAlgorithmConfiguration("HINT.FIXTURE", new Properties()));
+ shardingRuleConfig.getShardingAlgorithms().put("hint_fixture", new ShardingSphereAlgorithmConfiguration("HINT.FIXTURE", new Properties()));
return new ShardingRule(shardingRuleConfig, createDataSourceNames());
}
protected final ShardingRule createMixedShardingRule() {
ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
shardingRuleConfig.getTables().add(createTableRuleConfig("t_hint_ds_test", "ds_${0..1}.t_hint_ds_test_${0..1}",
- new HintShardingStrategyConfiguration("hint_test"), createStandardShardingStrategyConfiguration("t_hint_ds_test_inline", "t_hint_ds_test_${order_id % 2}")));
+ new HintShardingStrategyConfiguration("hint_fixture"), createStandardShardingStrategyConfiguration("t_hint_ds_test_inline", "t_hint_ds_test_${order_id % 2}")));
shardingRuleConfig.getTables().add(createTableRuleConfig("t_hint_table_test", "ds_${0..1}.t_hint_table_test_${0..1}",
- createStandardShardingStrategyConfiguration("ds_inline", "ds_${user_id % 2}"), new HintShardingStrategyConfiguration("hint_test")));
- shardingRuleConfig.getShardingAlgorithms().put("hint_test", new ShardingSphereAlgorithmConfiguration("HINT.FIXTURE", new Properties()));
+ createStandardShardingStrategyConfiguration("ds_inline", "ds_${user_id % 2}"), new HintShardingStrategyConfiguration("hint_fixture")));
+ shardingRuleConfig.getShardingAlgorithms().put("hint_fixture", new ShardingSphereAlgorithmConfiguration("HINT.FIXTURE", new Properties()));
Properties props0 = new Properties();
props0.setProperty("algorithm-expression", "ds_${user_id % 2}");
shardingRuleConfig.getShardingAlgorithms().put("ds_inline", new ShardingSphereAlgorithmConfiguration("INLINE", props0));
@@ -153,7 +153,7 @@ public abstract class AbstractRoutingEngineTest {
Properties props3 = new Properties();
props3.setProperty("algorithm-expression", "t_user_${user_id % 2}");
shardingRuleConfig.getShardingAlgorithms().put("t_user_inline", new ShardingSphereAlgorithmConfiguration("INLINE", props3));
- shardingRuleConfig.getShardingAlgorithms().put("hint_test", new ShardingSphereAlgorithmConfiguration("HINT.FIXTURE", new Properties()));
+ shardingRuleConfig.getShardingAlgorithms().put("hint_fixture", new ShardingSphereAlgorithmConfiguration("HINT.FIXTURE", new Properties()));
return new ShardingRule(shardingRuleConfig, Arrays.asList("ds_0", "ds_1", "main"));
}
@@ -186,8 +186,8 @@ public abstract class AbstractRoutingEngineTest {
private ShardingTableRuleConfiguration createTableRuleWithHintConfig() {
ShardingTableRuleConfiguration result = new ShardingTableRuleConfiguration("t_hint_test", "ds_${0..1}.t_hint_test_${0..1}");
- result.setTableShardingStrategy(new HintShardingStrategyConfiguration("hint_test"));
- result.setDatabaseShardingStrategy(new HintShardingStrategyConfiguration("hint_test"));
+ result.setTableShardingStrategy(new HintShardingStrategyConfiguration("hint_fixture"));
+ result.setDatabaseShardingStrategy(new HintShardingStrategyConfiguration("hint_fixture"));
return result;
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/rule/ShardingRuleTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/rule/ShardingRuleTest.java
index e3fb58d1a67..da21023332f 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/rule/ShardingRuleTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/rule/ShardingRuleTest.java
@@ -240,7 +240,7 @@ public final class ShardingRuleTest {
public void assertFindShardingColumnForDefaultTableShardingStrategy() {
ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
shardingRuleConfig.getTables().add(createTableRuleConfigWithAllStrategies());
- shardingRuleConfig.setDefaultTableShardingStrategy(new StandardShardingStrategyConfiguration("column", "STANDARD_TEST"));
+ shardingRuleConfig.setDefaultTableShardingStrategy(new StandardShardingStrategyConfiguration("column", "standard_fixture"));
shardingRuleConfig.getShardingAlgorithms().put("standard", new ShardingSphereAlgorithmConfiguration("STANDARD.FIXTURE", new Properties()));
Optional<String> actual = new ShardingRule(shardingRuleConfig, createDataSourceNames()).findShardingColumn("column", "LOGIC_TABLE");
assertTrue(actual.isPresent());
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/swapper/YamlRootRuleConfigurationsForYamlShardingRuleConfigurationTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/swapper/YamlRootRuleConfigurationsForYamlShardingRuleConfigurationTest.java
index aaa7b4d2f28..f04043bd0fb 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/swapper/YamlRootRuleConfigurationsForYamlShardingRuleConfigurationTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/swapper/YamlRootRuleConfigurationsForYamlShardingRuleConfigurationTest.java
@@ -86,15 +86,15 @@ public final class YamlRootRuleConfigurationsForYamlShardingRuleConfigurationTes
private void assertTUser(final YamlShardingRuleConfiguration actual) {
assertThat(actual.getTables().get("t_user").getActualDataNodes(), is("ds_${0..1}.t_user_${0..15}"));
assertThat(actual.getTables().get("t_user").getDatabaseStrategy().getComplex().getShardingColumns(), is("region_id, user_id"));
- assertThat(actual.getTables().get("t_user").getDatabaseStrategy().getComplex().getShardingAlgorithmName(), is("complex_test"));
+ assertThat(actual.getTables().get("t_user").getDatabaseStrategy().getComplex().getShardingAlgorithmName(), is("complex_fixture"));
assertThat(actual.getTables().get("t_user").getTableStrategy().getComplex().getShardingColumns(), is("region_id, user_id"));
- assertThat(actual.getTables().get("t_user").getTableStrategy().getComplex().getShardingAlgorithmName(), is("complex_test"));
+ assertThat(actual.getTables().get("t_user").getTableStrategy().getComplex().getShardingAlgorithmName(), is("complex_fixture"));
}
private void assertTStock(final YamlShardingRuleConfiguration actual) {
assertThat(actual.getTables().get("t_stock").getActualDataNodes(), is("ds_${0..1}.t_stock{0..8}"));
- assertThat(actual.getTables().get("t_stock").getDatabaseStrategy().getHint().getShardingAlgorithmName(), is("hint_test"));
- assertThat(actual.getTables().get("t_stock").getTableStrategy().getHint().getShardingAlgorithmName(), is("hint_test"));
+ assertThat(actual.getTables().get("t_stock").getDatabaseStrategy().getHint().getShardingAlgorithmName(), is("hint_fixture"));
+ assertThat(actual.getTables().get("t_stock").getTableStrategy().getHint().getShardingAlgorithmName(), is("hint_fixture"));
}
private void assertTOrder(final YamlShardingRuleConfiguration actual) {
@@ -108,8 +108,8 @@ public final class YamlRootRuleConfigurationsForYamlShardingRuleConfigurationTes
private void assertTOrderItem(final YamlShardingRuleConfiguration actual) {
assertThat(actual.getTables().get("t_order_item").getActualDataNodes(), is("ds_${0..1}.t_order_item_${0..1}"));
assertThat(actual.getTables().get("t_order_item").getTableStrategy().getStandard().getShardingColumn(), is("order_id"));
- assertThat(actual.getTables().get("t_order_item").getTableStrategy().getStandard().getShardingAlgorithmName(), is("standard_test"));
- assertThat(actual.getTables().get("t_order_item").getTableStrategy().getStandard().getShardingAlgorithmName(), is("standard_test"));
+ assertThat(actual.getTables().get("t_order_item").getTableStrategy().getStandard().getShardingAlgorithmName(), is("standard_fixture"));
+ assertThat(actual.getTables().get("t_order_item").getTableStrategy().getStandard().getShardingAlgorithmName(), is("standard_fixture"));
}
private void assertBindingTable(final YamlShardingRuleConfiguration actual) {
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/resources/yaml/sharding-rule.yaml b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/resources/yaml/sharding-rule.yaml
index b8e0d0cc7b3..647c276534b 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/resources/yaml/sharding-rule.yaml
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/resources/yaml/sharding-rule.yaml
@@ -31,19 +31,19 @@ rules:
databaseStrategy:
complex:
shardingColumns: region_id, user_id
- shardingAlgorithmName: complex_test
+ shardingAlgorithmName: complex_fixture
tableStrategy:
complex:
shardingColumns: region_id, user_id
- shardingAlgorithmName: complex_test
+ shardingAlgorithmName: complex_fixture
t_stock:
actualDataNodes: ds_${0..1}.t_stock{0..8}
databaseStrategy:
hint:
- shardingAlgorithmName: hint_test
+ shardingAlgorithmName: hint_fixture
tableStrategy:
hint:
- shardingAlgorithmName: hint_test
+ shardingAlgorithmName: hint_fixture
t_order:
actualDataNodes: ds_${0..1}.t_order_${0..1}
tableStrategy:
@@ -58,7 +58,7 @@ rules:
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: standard_fixture
bindingTables:
- t_order, t_order_item
broadcastTables:
@@ -72,11 +72,11 @@ rules:
defaultShardingColumn: order_id
shardingAlgorithms:
- standard_test:
+ standard_fixture:
type: STANDARD.FIXTURE
- complex_test:
+ complex_fixture:
type: COMPLEX.FIXTURE
- hint_test:
+ hint_fixture:
type: HINT.FIXTURE
database_inline:
type: INLINE
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/config-sharding.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/config-sharding.yaml
index 4e0b7160ba0..a6c293f73a0 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/config-sharding.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/config-sharding.yaml
@@ -57,14 +57,14 @@ rules:
defaultTableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: jdbc_standard_fixture
defaultDatabaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: jdbc_standard_fixture
shardingAlgorithms:
- standard_test:
+ jdbc_standard_fixture:
type: JDBC.STANDARD.FIXTURE
table_inline:
type: INLINE
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/db/show_algorithms.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/db/show_algorithms.xml
index 4cc39b3cf7c..e01cf0ce48d 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/db/show_algorithms.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/db/show_algorithms.xml
@@ -21,7 +21,7 @@
<column name="type" />
<column name="props" />
</metadata>
- <row values="standard_test| IT.STANDARD.FIXTURE| " />
+ <row values="it_standard_fixture| IT.STANDARD.FIXTURE| " />
<row values="db_inline_order_id| INLINE| algorithm-expression=ds_${order_id_sharding % 2}" />
<row values="db_inline_item_id| INLINE| algorithm-expression=ds_${db_inline_item_id % 2}" />
</dataset>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_algorithms.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_algorithms.xml
index 628a25f28ea..e5082207c32 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_algorithms.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_algorithms.xml
@@ -21,7 +21,7 @@
<column name="type" />
<column name="props" />
</metadata>
- <row values="standard_test| IT.STANDARD.FIXTURE| " />
+ <row values="it_standard_fixture| IT.STANDARD.FIXTURE| " />
<row values="table_inline_item_id| INLINE| algorithm-expression=t_order_item_federate_sharding_${item_id % 2}" />
<row values="table_inline_order_id| INLINE| algorithm-expression=t_order_federate_sharding_${order_id_sharding % 2}" />
</dataset>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_algorithms.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_algorithms.xml
index 7ef36617b0d..cb963be61f0 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_algorithms.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_algorithms.xml
@@ -21,7 +21,7 @@
<column name="type" />
<column name="props" />
</metadata>
- <row values="standard_test| IT.STANDARD.FIXTURE| " />
+ <row values="it_standard_fixture| IT.STANDARD.FIXTURE| " />
<row values="table_inline_item_id| INLINE| algorithm-expression=t_order_item_federate_sharding_${item_id % 2}" />
<row values="table_inline_order_id| INLINE| algorithm-expression=t_order_federate_sharding_${order_id_sharding % 2}" />
<row values="table_inline_user_id| INLINE| algorithm-expression=t_user_encrypt_federate_sharding_${user_id % 2},allow-range-query-with-inline-sharding=true" />
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/tbl/show_algorithms.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/tbl/show_algorithms.xml
index 1c4bf2066a4..e446877c085 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/tbl/show_algorithms.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/tbl/show_algorithms.xml
@@ -21,7 +21,7 @@
<column name="type" />
<column name="props" />
</metadata>
- <row values="standard_test| IT.STANDARD.FIXTURE| " />
+ <row values="it_standard_fixture| IT.STANDARD.FIXTURE| " />
<row values="table_inline_item_id| INLINE| algorithm-expression=t_order_item_federate_sharding_${item_id % 2}" />
<row values="table_inline_order_id| INLINE| algorithm-expression=t_order_federate_sharding_${order_id_sharding % 2},allow-range-query-with-inline-sharding=true" />
</dataset>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/proxy/conf/mysql/config-db.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/proxy/conf/mysql/config-db.yaml
index 0b8a21caa23..7840063d0e4 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/proxy/conf/mysql/config-db.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/proxy/conf/mysql/config-db.yaml
@@ -117,13 +117,13 @@ rules:
databaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
t_order_item:
actualDataNodes: ds_${0..9}.t_order_item
databaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
keyGenerateStrategy:
column: item_id
keyGeneratorName: constant
@@ -132,7 +132,7 @@ rules:
databaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
t_order_federate_sharding:
actualDataNodes: ds_${0..1}.t_order_federate_sharding
databaseStrategy:
@@ -151,7 +151,7 @@ rules:
- t_broadcast_table
- t_broadcast_table_for_ddl
shardingAlgorithms:
- standard_test:
+ it_standard_fixture:
type: IT.STANDARD.FIXTURE
db_inline_order_id:
type: INLINE
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/proxy/conf/postgresql/config-db.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/proxy/conf/postgresql/config-db.yaml
index 899b5b7ae52..1f577ba884a 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/proxy/conf/postgresql/config-db.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/proxy/conf/postgresql/config-db.yaml
@@ -117,13 +117,13 @@ rules:
databaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
t_order_item:
actualDataNodes: ds_${0..9}.t_order_item
databaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
keyGenerateStrategy:
column: item_id
keyGeneratorName: constant
@@ -132,7 +132,7 @@ rules:
databaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
t_order_federate_sharding:
actualDataNodes: ds_${0..1}.t_order_federate_sharding
databaseStrategy:
@@ -151,7 +151,7 @@ rules:
- t_broadcast_table
- t_broadcast_table_for_ddl
shardingAlgorithms:
- standard_test:
+ it_standard_fixture:
type: IT.STANDARD.FIXTURE
db_inline_order_id:
type: INLINE
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/rules.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/rules.yaml
index a4edf4b23f4..1367f0ae0c5 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/rules.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/rules.yaml
@@ -23,13 +23,13 @@ rules:
databaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
t_order_item:
actualDataNodes: db_${0..9}.t_order_item
databaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
keyGenerateStrategy:
column: item_id
keyGeneratorName: constant
@@ -38,7 +38,7 @@ rules:
databaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
t_order_federate_sharding:
actualDataNodes: db_${0..1}.t_order_federate_sharding
databaseStrategy:
@@ -59,7 +59,7 @@ rules:
- t_broadcast_table_for_ddl
shardingAlgorithms:
- standard_test:
+ it_standard_fixture:
type: IT.STANDARD.FIXTURE
db_inline_order_id:
type: INLINE
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/mysql/config-dbtbl-with-readwrite-splitting.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/mysql/config-dbtbl-with-readwrite-splitting.yaml
index e316c6e863a..48bb5120ae2 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/mysql/config-dbtbl-with-readwrite-splitting.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/mysql/config-dbtbl-with-readwrite-splitting.yaml
@@ -207,21 +207,21 @@ rules:
databaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
t_order_item:
actualDataNodes: readwrite_ds_${0..9}.t_order_item_${0..9}
databaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
keyGenerateStrategy:
column: item_id
keyGeneratorName: constant
@@ -230,11 +230,11 @@ rules:
databaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
t_order_item_federate_sharding:
actualDataNodes: readwrite_ds_1.t_order_item_federate_sharding_${0..1}
tableStrategy:
@@ -253,7 +253,7 @@ rules:
- t_broadcast_table
- t_broadcast_table_for_ddl
shardingAlgorithms:
- standard_test:
+ it_standard_fixture:
type: IT.STANDARD.FIXTURE
table_inline_item_id:
type: INLINE
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/postgresql/config-dbtbl-with-readwrite-splitting.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/postgresql/config-dbtbl-with-readwrite-splitting.yaml
index cf3d2c46e1b..6e67815fed8 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/postgresql/config-dbtbl-with-readwrite-splitting.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/postgresql/config-dbtbl-with-readwrite-splitting.yaml
@@ -207,21 +207,21 @@ rules:
databaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
t_order_item:
actualDataNodes: readwrite_ds_${0..9}.t_order_item_${0..9}
databaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
keyGenerateStrategy:
column: item_id
keyGeneratorName: constant
@@ -230,11 +230,11 @@ rules:
databaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
t_order_item_federate_sharding:
actualDataNodes: readwrite_ds_1.t_order_item_federate_sharding_${0..1}
tableStrategy:
@@ -253,7 +253,7 @@ rules:
- t_broadcast_table
- t_broadcast_table_for_ddl
shardingAlgorithms:
- standard_test:
+ it_standard_fixture:
type: IT.STANDARD.FIXTURE
table_inline_item_id:
type: INLINE
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/rules.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/rules.yaml
index 4f49a60bd13..13cb4e427d1 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/rules.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/rules.yaml
@@ -23,21 +23,21 @@ rules:
databaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
t_order_item:
actualDataNodes: readwrite_ds_${0..9}.t_order_item_${0..9}
databaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
keyGenerateStrategy:
column: item_id
keyGeneratorName: constant
@@ -46,11 +46,11 @@ rules:
databaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
t_order_item_federate_sharding:
actualDataNodes: readwrite_ds_1.t_order_item_federate_sharding_${0..1}
tableStrategy:
@@ -70,7 +70,7 @@ rules:
- t_broadcast_table_for_ddl
shardingAlgorithms:
- standard_test:
+ it_standard_fixture:
type: IT.STANDARD.FIXTURE
table_inline_item_id:
type: INLINE
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/mysql/config-dbtbl-with-readwrite-splitting-and-encrypt.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/mysql/config-dbtbl-with-readwrite-splitting-and-encrypt.yaml
index 80ada34b5ad..e89a0e30582 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/mysql/config-dbtbl-with-readwrite-splitting-and-encrypt.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/mysql/config-dbtbl-with-readwrite-splitting-and-encrypt.yaml
@@ -207,11 +207,11 @@ rules:
databaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
tableStrategy:
standard:
shardingColumn: item_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
keyGenerateStrategy:
column: item_id
keyGeneratorName: constant
@@ -220,11 +220,11 @@ rules:
databaseStrategy:
standard:
shardingColumn: address_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
tableStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
keyGenerateStrategy:
column: user_id
keyGeneratorName: constant
@@ -233,11 +233,11 @@ rules:
databaseStrategy:
standard:
shardingColumn: address_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
tableStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
t_order_item_federate_sharding:
actualDataNodes: readwrite_ds_1.t_order_item_federate_sharding_${0..1}
tableStrategy:
@@ -260,7 +260,7 @@ rules:
- t_user,t_user_item,t_user_details
shardingAlgorithms:
- standard_test:
+ it_standard_fixture:
type: IT.STANDARD.FIXTURE
table_inline_item_id:
type: INLINE
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/postgresql/config-dbtbl-with-readwrite-splitting-and-encrypt.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/postgresql/config-dbtbl-with-readwrite-splitting-and-encrypt.yaml
index 6a5df7ddbc6..77a8682c7fb 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/postgresql/config-dbtbl-with-readwrite-splitting-and-encrypt.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/postgresql/config-dbtbl-with-readwrite-splitting-and-encrypt.yaml
@@ -207,11 +207,11 @@ rules:
databaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
tableStrategy:
standard:
shardingColumn: item_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
keyGenerateStrategy:
column: item_id
keyGeneratorName: constant
@@ -220,11 +220,11 @@ rules:
databaseStrategy:
standard:
shardingColumn: address_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
tableStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
keyGenerateStrategy:
column: user_id
keyGeneratorName: constant
@@ -233,11 +233,11 @@ rules:
databaseStrategy:
standard:
shardingColumn: address_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
tableStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
t_order_item_federate_sharding:
actualDataNodes: readwrite_ds_1.t_order_item_federate_sharding_${0..1}
tableStrategy:
@@ -260,7 +260,7 @@ rules:
- t_user,t_user_item,t_user_details
shardingAlgorithms:
- standard_test:
+ it_standard_fixture:
type: IT.STANDARD.FIXTURE
table_inline_item_id:
type: INLINE
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/rules.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/rules.yaml
index 0b1ce5ea3c2..fbb1af0f0a7 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/rules.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/rules.yaml
@@ -23,11 +23,11 @@ rules:
databaseStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
tableStrategy:
standard:
shardingColumn: item_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
keyGenerateStrategy:
column: item_id
keyGeneratorName: constant
@@ -36,11 +36,11 @@ rules:
databaseStrategy:
standard:
shardingColumn: address_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
tableStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
keyGenerateStrategy:
column: user_id
keyGeneratorName: constant
@@ -49,11 +49,11 @@ rules:
databaseStrategy:
standard:
shardingColumn: address_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
tableStrategy:
standard:
shardingColumn: user_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
t_order_item_federate_sharding:
actualDataNodes: readwrite_ds_1.t_order_item_federate_sharding_${0..1}
tableStrategy:
@@ -76,7 +76,7 @@ rules:
- t_user,t_user_details
shardingAlgorithms:
- standard_test:
+ it_standard_fixture:
type: IT.STANDARD.FIXTURE
table_inline_item_id:
type: INLINE
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/proxy/conf/mysql/config-tbl.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/proxy/conf/mysql/config-tbl.yaml
index e26df3a846a..ae9915a03d8 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/proxy/conf/mysql/config-tbl.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/proxy/conf/mysql/config-tbl.yaml
@@ -36,13 +36,13 @@ rules:
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
t_order_item:
actualDataNodes: tbl.t_order_item_${0..9}
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
keyGenerateStrategy:
column: item_id
keyGeneratorName: constant
@@ -51,7 +51,7 @@ rules:
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
t_order_federate_sharding:
actualDataNodes: tbl.t_order_federate_sharding_${0..1}
tableStrategy:
@@ -71,7 +71,7 @@ rules:
- t_broadcast_table_for_ddl
shardingAlgorithms:
- standard_test:
+ it_standard_fixture:
type: IT.STANDARD.FIXTURE
table_inline_item_id:
type: INLINE
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/proxy/conf/postgresql/config-tbl.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/proxy/conf/postgresql/config-tbl.yaml
index 82c7839296c..a4af5378d24 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/proxy/conf/postgresql/config-tbl.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/proxy/conf/postgresql/config-tbl.yaml
@@ -36,13 +36,13 @@ rules:
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
t_order_item:
actualDataNodes: tbl.t_order_item_${0..9}
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
keyGenerateStrategy:
column: item_id
keyGeneratorName: constant
@@ -51,7 +51,7 @@ rules:
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
t_order_federate_sharding:
actualDataNodes: tbl.t_order_federate_sharding_${0..1}
tableStrategy:
@@ -71,7 +71,7 @@ rules:
- t_broadcast_table_for_ddl
shardingAlgorithms:
- standard_test:
+ it_standard_fixture:
type: IT.STANDARD.FIXTURE
table_inline_item_id:
type: INLINE
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/rules.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/rules.yaml
index a1aabed37d5..2d2c7e47ad3 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/rules.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/rules.yaml
@@ -23,13 +23,13 @@ rules:
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
t_order_item:
actualDataNodes: tbl.t_order_item_${0..9}
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
keyGenerateStrategy:
column: item_id
keyGeneratorName: constant
@@ -38,7 +38,7 @@ rules:
tableStrategy:
standard:
shardingColumn: order_id
- shardingAlgorithmName: standard_test
+ shardingAlgorithmName: it_standard_fixture
t_order_federate_sharding:
actualDataNodes: tbl.t_order_federate_sharding_${0..1}
tableStrategy:
@@ -58,7 +58,7 @@ rules:
- t_broadcast_table_for_ddl
shardingAlgorithms:
- standard_test:
+ it_standard_fixture:
type: IT.STANDARD.FIXTURE
table_inline_item_id:
type: INLINE