You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/05/05 09:56:36 UTC
[shardingsphere] branch master updated: Refactor fixtures of ShardingAlgorithm (#17336)
This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng 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 45e762d35b3 Refactor fixtures of ShardingAlgorithm (#17336)
45e762d35b3 is described below
commit 45e762d35b3aa3e69fe1818a34079786a7a83796
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Thu May 5 17:56:16 2022 +0800
Refactor fixtures of ShardingAlgorithm (#17336)
* Refactor InlineShardingAlgorithm
* Refactor IntervalShardingAlgorithm
* Refactor StandardShardingAlgorithmFixture
* Rename DriverStandardShardingAlgorithmFixture
* Refactor DriverStandardShardingAlgorithmFixture
---
.../sharding/datetime/IntervalShardingAlgorithm.java | 14 +++++++-------
.../algorithm/sharding/inline/InlineShardingAlgorithm.java | 4 ++--
.../sharding/fixture/StandardShardingAlgorithmFixture.java | 2 +-
.../shardingsphere/sharding/rule/ShardingRuleTest.java | 12 ++++++------
.../src/test/resources/yaml/sharding-rule.yaml | 2 +-
.../{ => keygen}/DecrementKeyGenerateAlgorithm.java | 2 +-
.../{ => keygen}/IncrementKeyGenerateAlgorithm.java | 2 +-
.../DriverComplexKeysShardingAlgorithmFixture.java | 2 +-
.../DriverStandardShardingAlgorithmFixture.java} | 13 +++----------
...apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm | 4 ++--
...rg.apache.shardingsphere.sharding.spi.ShardingAlgorithm | 4 ++--
.../integrate/sharding/configWithDataSourceWithProps.yaml | 2 +-
.../sharding/configWithDataSourceWithoutProps.yaml | 2 +-
.../sharding/configWithoutDataSourceWithProps.yaml | 2 +-
.../sharding/configWithoutDataSourceWithoutProps.yaml | 2 +-
.../configWithDataSourceWithProps.yaml | 2 +-
.../configWithDataSourceWithoutProps.yaml | 2 +-
.../configWithoutDataSourceWithProps.yaml | 2 +-
.../configWithoutDataSourceWithoutProps.yaml | 2 +-
19 files changed, 35 insertions(+), 42 deletions(-)
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/datetime/IntervalShardingAlgorithm.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/datetime/IntervalShardingAlgorithm.java
index 5ad5f07827b..7ef231bf76f 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/datetime/IntervalShardingAlgorithm.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/datetime/IntervalShardingAlgorithm.java
@@ -60,19 +60,19 @@ public final class IntervalShardingAlgorithm implements StandardShardingAlgorith
@Setter
private Properties props;
- private DateTimeFormatter dateTimeFormatter;
+ private volatile DateTimeFormatter dateTimeFormatter;
- private int dateTimePatternLength;
+ private volatile int dateTimePatternLength;
- private LocalDateTime dateTimeLower;
+ private volatile LocalDateTime dateTimeLower;
- private LocalDateTime dateTimeUpper;
+ private volatile LocalDateTime dateTimeUpper;
- private DateTimeFormatter tableSuffixPattern;
+ private volatile DateTimeFormatter tableSuffixPattern;
- private int stepAmount;
+ private volatile int stepAmount;
- private ChronoUnit stepUnit;
+ private volatile ChronoUnit stepUnit;
@Override
public void init(final Properties props) {
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/inline/InlineShardingAlgorithm.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/inline/InlineShardingAlgorithm.java
index 0a47e17c54f..215870d7dea 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/inline/InlineShardingAlgorithm.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/inline/InlineShardingAlgorithm.java
@@ -45,9 +45,9 @@ public final class InlineShardingAlgorithm implements StandardShardingAlgorithm<
@Setter
private Properties props;
- private String algorithmExpression;
+ private volatile String algorithmExpression;
- private boolean allowRangeQuery;
+ private volatile boolean allowRangeQuery;
@Override
public void init(final Properties props) {
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/fixture/StandardShardingAlgorithmFixture.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/fixture/StandardShardingAlgorithmFixture.java
index ce636459609..a1f4c4cd0be 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/fixture/StandardShardingAlgorithmFixture.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/fixture/StandardShardingAlgorithmFixture.java
@@ -51,6 +51,6 @@ public final class StandardShardingAlgorithmFixture implements StandardShardingA
@Override
public String getType() {
- return "STANDARD_TEST";
+ return "STANDARD.FIXTURE";
}
}
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 f5da4c50fa4..bbfd12fc232 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
@@ -229,8 +229,8 @@ public final class ShardingRuleTest {
public void assertFindShardingColumnForDefaultDatabaseShardingStrategy() {
ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
shardingRuleConfig.getTables().add(createTableRuleConfigWithAllStrategies());
- shardingRuleConfig.setDefaultDatabaseShardingStrategy(new StandardShardingStrategyConfiguration("column", "STANDARD_TEST"));
- shardingRuleConfig.getShardingAlgorithms().put("standard", new ShardingSphereAlgorithmConfiguration("STANDARD_TEST", new Properties()));
+ shardingRuleConfig.setDefaultDatabaseShardingStrategy(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());
assertThat(actual.get(), is("column"));
@@ -241,7 +241,7 @@ public final class ShardingRuleTest {
ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
shardingRuleConfig.getTables().add(createTableRuleConfigWithAllStrategies());
shardingRuleConfig.setDefaultTableShardingStrategy(new StandardShardingStrategyConfiguration("column", "STANDARD_TEST"));
- shardingRuleConfig.getShardingAlgorithms().put("standard", new ShardingSphereAlgorithmConfiguration("STANDARD_TEST", new Properties()));
+ shardingRuleConfig.getShardingAlgorithms().put("standard", new ShardingSphereAlgorithmConfiguration("STANDARD.FIXTURE", new Properties()));
Optional<String> actual = new ShardingRule(shardingRuleConfig, createDataSourceNames()).findShardingColumn("column", "LOGIC_TABLE");
assertTrue(actual.isPresent());
assertThat(actual.get(), is("column"));
@@ -251,7 +251,7 @@ public final class ShardingRuleTest {
public void assertFindShardingColumnForDatabaseShardingStrategy() {
ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
shardingRuleConfig.getTables().add(createTableRuleConfigWithAllStrategies());
- shardingRuleConfig.getShardingAlgorithms().put("standard", new ShardingSphereAlgorithmConfiguration("STANDARD_TEST", new Properties()));
+ shardingRuleConfig.getShardingAlgorithms().put("standard", new ShardingSphereAlgorithmConfiguration("STANDARD.FIXTURE", new Properties()));
Optional<String> actual = new ShardingRule(shardingRuleConfig, createDataSourceNames()).findShardingColumn("column", "logic_Table");
assertTrue(actual.isPresent());
assertThat(actual.get(), is("column"));
@@ -261,7 +261,7 @@ public final class ShardingRuleTest {
public void assertFindShardingColumnForTableShardingStrategy() {
ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
shardingRuleConfig.getTables().add(createTableRuleConfigWithTableStrategies());
- shardingRuleConfig.getShardingAlgorithms().put("standard", new ShardingSphereAlgorithmConfiguration("STANDARD_TEST", new Properties()));
+ shardingRuleConfig.getShardingAlgorithms().put("standard", new ShardingSphereAlgorithmConfiguration("STANDARD.FIXTURE", new Properties()));
Optional<String> actual = new ShardingRule(shardingRuleConfig, createDataSourceNames()).findShardingColumn("column", "logic_Table");
assertTrue(actual.isPresent());
assertThat(actual.get(), is("column"));
@@ -490,7 +490,7 @@ public final class ShardingRuleTest {
shardingRuleConfig.setDefaultTableShardingStrategy(new StandardShardingStrategyConfiguration("table_id", "standard"));
shardingRuleConfig.setDefaultShardingColumn("table_id");
shardingRuleConfig.setDefaultKeyGenerateStrategy(new KeyGenerateStrategyConfiguration("id", "default"));
- shardingRuleConfig.getShardingAlgorithms().put("standard", new ShardingSphereAlgorithmConfiguration("STANDARD_TEST", new Properties()));
+ shardingRuleConfig.getShardingAlgorithms().put("standard", new ShardingSphereAlgorithmConfiguration("STANDARD.FIXTURE", new Properties()));
shardingRuleConfig.getKeyGenerators().put("increment", new ShardingSphereAlgorithmConfiguration("INCREMENT", new Properties()));
shardingRuleConfig.getKeyGenerators().put("default", new ShardingSphereAlgorithmConfiguration("INCREMENT", new Properties()));
return new ShardingRule(shardingRuleConfig, createDataSourceNames());
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 4ed5679bcf4..b8e0d0cc7b3 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
@@ -73,7 +73,7 @@ rules:
shardingAlgorithms:
standard_test:
- type: STANDARD_TEST
+ type: STANDARD.FIXTURE
complex_test:
type: COMPLEX.FIXTURE
hint_test:
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/DecrementKeyGenerateAlgorithm.java b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/keygen/DecrementKeyGenerateAlgorithm.java
similarity index 95%
rename from shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/DecrementKeyGenerateAlgorithm.java
rename to shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/keygen/DecrementKeyGenerateAlgorithm.java
index 8404d655860..ab9a24da3ac 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/DecrementKeyGenerateAlgorithm.java
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/keygen/DecrementKeyGenerateAlgorithm.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.fixture.algorithm;
+package org.apache.shardingsphere.driver.fixture.algorithm.keygen;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/IncrementKeyGenerateAlgorithm.java b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/keygen/IncrementKeyGenerateAlgorithm.java
similarity index 95%
rename from shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/IncrementKeyGenerateAlgorithm.java
rename to shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/keygen/IncrementKeyGenerateAlgorithm.java
index 72d4df2df94..2e7c814cccc 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/IncrementKeyGenerateAlgorithm.java
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/keygen/IncrementKeyGenerateAlgorithm.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.fixture.algorithm;
+package org.apache.shardingsphere.driver.fixture.algorithm.keygen;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/DriverComplexKeysShardingAlgorithmFixture.java b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/sharding/DriverComplexKeysShardingAlgorithmFixture.java
similarity index 95%
rename from shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/DriverComplexKeysShardingAlgorithmFixture.java
rename to shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/sharding/DriverComplexKeysShardingAlgorithmFixture.java
index 903b0acc416..6742f022846 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/DriverComplexKeysShardingAlgorithmFixture.java
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/sharding/DriverComplexKeysShardingAlgorithmFixture.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.fixture.algorithm;
+package org.apache.shardingsphere.driver.fixture.algorithm.sharding;
import org.apache.shardingsphere.sharding.api.sharding.complex.ComplexKeysShardingAlgorithm;
import org.apache.shardingsphere.sharding.api.sharding.complex.ComplexKeysShardingValue;
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/StandardAlgorithm.java b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/sharding/DriverStandardShardingAlgorithmFixture.java
similarity index 85%
rename from shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/StandardAlgorithm.java
rename to shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/sharding/DriverStandardShardingAlgorithmFixture.java
index 20e5a5d5103..94d39630757 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/StandardAlgorithm.java
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/sharding/DriverStandardShardingAlgorithmFixture.java
@@ -15,22 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.fixture.algorithm;
+package org.apache.shardingsphere.driver.fixture.algorithm.sharding;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingValue;
import org.apache.shardingsphere.sharding.api.sharding.standard.RangeShardingValue;
import org.apache.shardingsphere.sharding.api.sharding.standard.StandardShardingAlgorithm;
import java.util.Collection;
-import java.util.Properties;
-public final class StandardAlgorithm implements StandardShardingAlgorithm<Integer> {
-
- @Getter
- @Setter
- private Properties props;
+public final class DriverStandardShardingAlgorithmFixture implements StandardShardingAlgorithm<Integer> {
@Override
public String doSharding(final Collection<String> availableTargetNames, final PreciseShardingValue<Integer> shardingValue) {
@@ -49,6 +42,6 @@ public final class StandardAlgorithm implements StandardShardingAlgorithm<Intege
@Override
public String getType() {
- return "STANDARD_TEST";
+ return "DRIVER.STANDARD.FIXTURE";
}
}
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm
index 306303878da..58008f8b36f 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm
@@ -17,5 +17,5 @@
org.apache.shardingsphere.sharding.algorithm.keygen.SnowflakeKeyGenerateAlgorithm
org.apache.shardingsphere.sharding.algorithm.keygen.UUIDKeyGenerateAlgorithm
-org.apache.shardingsphere.driver.fixture.algorithm.IncrementKeyGenerateAlgorithm
-org.apache.shardingsphere.driver.fixture.algorithm.DecrementKeyGenerateAlgorithm
+org.apache.shardingsphere.driver.fixture.algorithm.keygen.IncrementKeyGenerateAlgorithm
+org.apache.shardingsphere.driver.fixture.algorithm.keygen.DecrementKeyGenerateAlgorithm
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.ShardingAlgorithm b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.ShardingAlgorithm
index 80f2a5bd15d..4698a59b4c0 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.ShardingAlgorithm
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.ShardingAlgorithm
@@ -15,5 +15,5 @@
# limitations under the License.
#
-org.apache.shardingsphere.driver.fixture.algorithm.StandardAlgorithm
-org.apache.shardingsphere.driver.fixture.algorithm.DriverComplexKeysShardingAlgorithmFixture
+org.apache.shardingsphere.driver.fixture.algorithm.sharding.DriverStandardShardingAlgorithmFixture
+org.apache.shardingsphere.driver.fixture.algorithm.sharding.DriverComplexKeysShardingAlgorithmFixture
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
index 54dcb4e10ec..da04419b745 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
@@ -72,7 +72,7 @@ rules:
shardingAlgorithms:
standard_test:
- type: STANDARD_TEST
+ type: DRIVER.STANDARD.FIXTURE
complex_test:
type: DRIVER.COMPLEX.FIXTURE
t_order_inline:
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml
index 1729cb9c5f5..b3828b0077b 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml
@@ -70,7 +70,7 @@ rules:
shardingAlgorithms:
standard_test:
- type: STANDARD_TEST
+ type: DRIVER.STANDARD.FIXTURE
complex_test:
type: DRIVER.COMPLEX.FIXTURE
t_order_inline:
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml
index 0b74b7c55ce..96f5ff05689 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml
@@ -67,7 +67,7 @@ rules:
shardingAlgorithms:
standard_test:
- type: STANDARD_TEST
+ type: DRIVER.STANDARD.FIXTURE
t_order_inline:
type: INLINE
props:
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml
index 2d6e8fc4406..5d8c7dc100e 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml
@@ -67,7 +67,7 @@ rules:
shardingAlgorithms:
standard_test:
- type: STANDARD_TEST
+ type: DRIVER.STANDARD.FIXTURE
complex_test:
type: DRIVER.COMPLEX.FIXTURE
t_order_inline:
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithProps.yaml b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithProps.yaml
index 6f48a08eb21..8ea5f0bebe3 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithProps.yaml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithProps.yaml
@@ -84,7 +84,7 @@ rules:
shardingAlgorithms:
standard_test:
- type: STANDARD_TEST
+ type: DRIVER.STANDARD.FIXTURE
complex_test:
type: DRIVER.COMPLEX.FIXTURE
database_inline:
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutProps.yaml b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutProps.yaml
index c77e1717f7d..94b67f57c12 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutProps.yaml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutProps.yaml
@@ -84,7 +84,7 @@ rules:
shardingAlgorithms:
standard_test:
- type: STANDARD_TEST
+ type: DRIVER.STANDARD.FIXTURE
complex_test:
type: DRIVER.COMPLEX.FIXTURE
database_inline:
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithProps.yaml b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithProps.yaml
index ff68f2dd09f..10963266638 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithProps.yaml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithProps.yaml
@@ -67,7 +67,7 @@ rules:
shardingAlgorithms:
standard_test:
- type: STANDARD_TEST
+ type: DRIVER.STANDARD.FIXTURE
complex_test:
type: DRIVER.COMPLEX.FIXTURE
t_order_inline:
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithoutProps.yaml b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithoutProps.yaml
index b86ad00b645..fcc944f9104 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithoutProps.yaml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithoutProps.yaml
@@ -67,7 +67,7 @@ rules:
shardingAlgorithms:
standard_test:
- type: STANDARD_TEST
+ type: DRIVER.STANDARD.FIXTURE
complex_test:
type: DRIVER.COMPLEX.FIXTURE
t_order_inline: