Use Standard Algorithm instead of Old one (#5177)

* Use Standard Algorithm

* check style

examples/sharding-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-range.yaml

@@ -50,8 +50,8 @@ shardingRule:
   defaultDatabaseStrategy:
     standard:
       shardingColumn: user_id
-      preciseAlgorithmClassName: org.apache.shardingsphere.example.algorithm.PreciseModuloShardingDatabaseAlgorithm
-      rangeAlgorithmClassName: org.apache.shardingsphere.example.algorithm.RangeModuloShardingDatabaseAlgorithm
+      shardingAlgorithm:
+        type: STANDARD_TEST_DB
   defaultTableStrategy:
     none:
 

examples/sharding-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables-range.yaml

@@ -34,8 +34,8 @@ shardingRule:
       tableStrategy: 
         standard:
           shardingColumn: order_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.example.algorithm.PreciseModuloShardingTableAlgorithm
-          rangeAlgorithmClassName: org.apache.shardingsphere.example.algorithm.RangeModuloShardingTableAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST_TB
       keyGenerator:
         type: SNOWFLAKE
         column: order_id
@@ -46,8 +46,8 @@ shardingRule:
       tableStrategy:
         standard:
           shardingColumn: order_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.example.algorithm.PreciseModuloShardingTableAlgorithm
-          rangeAlgorithmClassName: org.apache.shardingsphere.example.algorithm.RangeModuloShardingTableAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST_TB
       keyGenerator:
         type: SNOWFLAKE
         column: order_item_id
@@ -60,8 +60,8 @@ shardingRule:
   defaultDatabaseStrategy:
     standard:
       shardingColumn: user_id
-      preciseAlgorithmClassName: org.apache.shardingsphere.example.algorithm.PreciseModuloShardingDatabaseAlgorithm
-      rangeAlgorithmClassName: org.apache.shardingsphere.example.algorithm.RangeModuloShardingDatabaseAlgorithm
+      shardingAlgorithm:
+        type: STANDARD_TEST_DB
   defaultTableStrategy:
     none:
 

examples/sharding-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-master-slave-range.yaml

@@ -54,8 +54,8 @@ shardingRule:
       tableStrategy: 
         standard:
           shardingColumn: order_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.example.algorithm.PreciseModuloShardingTableAlgorithm
-          rangeAlgorithmClassName: org.apache.shardingsphere.example.algorithm.RangeModuloShardingTableAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST_TB
       keyGenerator:
         type: SNOWFLAKE
         column: order_id
@@ -66,8 +66,8 @@ shardingRule:
       tableStrategy:
         standard:
           shardingColumn: order_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.example.algorithm.PreciseModuloShardingTableAlgorithm
-          rangeAlgorithmClassName: org.apache.shardingsphere.example.algorithm.RangeModuloShardingTableAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST_TB
       keyGenerator:
         type: SNOWFLAKE
         column: order_item_id
@@ -80,8 +80,8 @@ shardingRule:
   defaultDatabaseStrategy:
     standard:
       shardingColumn: user_id
-      preciseAlgorithmClassName: org.apache.shardingsphere.example.algorithm.PreciseModuloShardingDatabaseAlgorithm
-      rangeAlgorithmClassName: org.apache.shardingsphere.example.algorithm.RangeModuloShardingDatabaseAlgorithm
+      shardingAlgorithm:
+        type: STANDARD_TEST_DB
   masterSlaveRules:
     ds_0:
       masterDataSourceName: ds_master_0

examples/sharding-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-tables-range.yaml

@@ -29,8 +29,8 @@ shardingRule:
       tableStrategy: 
         standard:
           shardingColumn: order_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.example.algorithm.PreciseModuloShardingTableAlgorithm
-          rangeAlgorithmClassName: org.apache.shardingsphere.example.algorithm.RangeModuloShardingTableAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST_TB
       keyGenerator:
         type: SNOWFLAKE
         column: order_id
@@ -41,8 +41,8 @@ shardingRule:
       tableStrategy:
         standard:
           shardingColumn: order_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.example.algorithm.PreciseModuloShardingTableAlgorithm
-          rangeAlgorithmClassName: org.apache.shardingsphere.example.algorithm.RangeModuloShardingTableAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST_TB
       keyGenerator:
         type: SNOWFLAKE
         column: order_item_id

sharding-core/sharding-core-common/src/main/java/org/apache/shardingsphere/core/strategy/route/standard/StandardShardingStrategy.java

@@ -23,6 +23,7 @@ import org.apache.shardingsphere.api.sharding.standard.PreciseShardingAlgorithm;
 import org.apache.shardingsphere.api.sharding.standard.PreciseShardingValue;
 import org.apache.shardingsphere.api.sharding.standard.RangeShardingAlgorithm;
 import org.apache.shardingsphere.api.sharding.standard.RangeShardingValue;
+import org.apache.shardingsphere.api.sharding.standard.StandardShardingAlgorithm;
 import org.apache.shardingsphere.core.strategy.route.ShardingStrategy;
 import org.apache.shardingsphere.core.strategy.route.value.ListRouteValue;
 import org.apache.shardingsphere.core.strategy.route.value.RangeRouteValue;
@@ -44,12 +45,16 @@ public final class StandardShardingStrategy implements ShardingStrategy {
     
     private final RangeShardingAlgorithm rangeShardingAlgorithm;
     
+    private final StandardShardingAlgorithm shardingAlgorithm;
+    
     public StandardShardingStrategy(final StandardShardingStrategyConfiguration standardShardingStrategyConfig) {
         Preconditions.checkNotNull(standardShardingStrategyConfig.getShardingColumn(), "Sharding column cannot be null.");
-        Preconditions.checkNotNull(standardShardingStrategyConfig.getPreciseShardingAlgorithm(), "precise sharding algorithm cannot be null.");
+        Preconditions.checkState(null != standardShardingStrategyConfig.getShardingAlgorithm() 
+                        || null != standardShardingStrategyConfig.getPreciseShardingAlgorithm(), "sharding algorithm cannot be null.");
         shardingColumn = standardShardingStrategyConfig.getShardingColumn();
         preciseShardingAlgorithm = standardShardingStrategyConfig.getPreciseShardingAlgorithm();
         rangeShardingAlgorithm = standardShardingStrategyConfig.getRangeShardingAlgorithm();
+        shardingAlgorithm = standardShardingStrategyConfig.getShardingAlgorithm();
     }
     
     @Override
@@ -64,6 +69,10 @@ public final class StandardShardingStrategy implements ShardingStrategy {
     
     @SuppressWarnings("unchecked")
     private Collection<String> doSharding(final Collection<String> availableTargetNames, final RangeRouteValue<?> shardingValue) {
+        if (null != shardingAlgorithm) {
+            return shardingAlgorithm.doSharding(availableTargetNames,
+                    new RangeShardingValue(shardingValue.getTableName(), shardingValue.getColumnName(), shardingValue.getValueRange()));
+        }
         if (null == rangeShardingAlgorithm) {
             throw new UnsupportedOperationException("Cannot find range sharding strategy in sharding rule.");
         }
@@ -75,7 +84,12 @@ public final class StandardShardingStrategy implements ShardingStrategy {
     private Collection<String> doSharding(final Collection<String> availableTargetNames, final ListRouteValue<?> shardingValue) {
         Collection<String> result = new LinkedList<>();
         for (Comparable<?> each : shardingValue.getValues()) {
-            String target = preciseShardingAlgorithm.doSharding(availableTargetNames, new PreciseShardingValue(shardingValue.getTableName(), shardingValue.getColumnName(), each));
+            String target;
+            if (null != shardingAlgorithm) {
+                target = shardingAlgorithm.doSharding(availableTargetNames, new PreciseShardingValue(shardingValue.getTableName(), shardingValue.getColumnName(), each));
+            } else {
+                target = preciseShardingAlgorithm.doSharding(availableTargetNames, new PreciseShardingValue(shardingValue.getTableName(), shardingValue.getColumnName(), each));
+            }
             if (null != target) {
                 result.add(target);
             }

sharding-core/sharding-core-common/src/main/java/org/apache/shardingsphere/core/yaml/swapper/ShardingStrategyConfigurationYamlSwapper.java

@@ -113,7 +113,9 @@ public final class ShardingStrategyConfigurationYamlSwapper implements YamlSwapp
     private YamlStandardShardingStrategyConfiguration createYamlStandardShardingStrategyConfiguration(final StandardShardingStrategyConfiguration data) {
         YamlStandardShardingStrategyConfiguration result = new YamlStandardShardingStrategyConfiguration();
         result.setShardingColumn(data.getShardingColumn());
-        result.setPreciseAlgorithmClassName(data.getPreciseShardingAlgorithm().getClass().getName());
+        if (null != data.getPreciseShardingAlgorithm()) {
+            result.setPreciseAlgorithmClassName(data.getPreciseShardingAlgorithm().getClass().getName());
+        } 
         if (null != data.getRangeShardingAlgorithm()) {
             result.setRangeAlgorithmClassName(data.getRangeShardingAlgorithm().getClass().getName());
         }

sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/rule/ShardingRuleTest.java

@@ -24,7 +24,7 @@ import org.apache.shardingsphere.api.config.sharding.TableRuleConfiguration;
 import org.apache.shardingsphere.api.config.sharding.strategy.InlineShardingStrategyConfiguration;
 import org.apache.shardingsphere.api.config.sharding.strategy.NoneShardingStrategyConfiguration;
 import org.apache.shardingsphere.api.config.sharding.strategy.StandardShardingStrategyConfiguration;
-import org.apache.shardingsphere.core.shard.fixture.PreciseShardingAlgorithmFixture;
+import org.apache.shardingsphere.core.shard.fixture.StandardShardingAlgorithmFixture;
 import org.apache.shardingsphere.core.strategy.keygen.SnowflakeKeyGenerateAlgorithm;
 import org.apache.shardingsphere.core.strategy.keygen.fixture.IncrementKeyGenerateAlgorithm;
 import org.apache.shardingsphere.core.strategy.route.ShardingStrategy;
@@ -220,7 +220,7 @@ public final class ShardingRuleTest {
     public void assertIsShardingColumnForDefaultDatabaseShardingStrategy() {
         ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
         shardingRuleConfig.getTableRuleConfigs().add(createTableRuleConfigWithAllStrategies());
-        shardingRuleConfig.setDefaultDatabaseShardingStrategyConfig(new StandardShardingStrategyConfiguration("column", new PreciseShardingAlgorithmFixture()));
+        shardingRuleConfig.setDefaultDatabaseShardingStrategyConfig(new StandardShardingStrategyConfiguration("column", new StandardShardingAlgorithmFixture()));
         assertTrue(new ShardingRule(shardingRuleConfig, createDataSourceNames()).isShardingColumn("column", "LOGIC_TABLE"));
     }
     
@@ -228,7 +228,7 @@ public final class ShardingRuleTest {
     public void assertIsShardingColumnForDefaultTableShardingStrategy() {
         ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
         shardingRuleConfig.getTableRuleConfigs().add(createTableRuleConfigWithAllStrategies());
-        shardingRuleConfig.setDefaultTableShardingStrategyConfig(new StandardShardingStrategyConfiguration("column", new PreciseShardingAlgorithmFixture()));
+        shardingRuleConfig.setDefaultTableShardingStrategyConfig(new StandardShardingStrategyConfiguration("column", new StandardShardingAlgorithmFixture()));
         assertTrue(new ShardingRule(shardingRuleConfig, createDataSourceNames()).isShardingColumn("column", "LOGIC_TABLE"));
     }
     
@@ -380,14 +380,14 @@ public final class ShardingRuleTest {
     
     private TableRuleConfiguration createTableRuleConfigWithAllStrategies() {
         TableRuleConfiguration result = new TableRuleConfiguration("LOGIC_TABLE", "ds_${0..1}.table_${0..2}");
-        result.setDatabaseShardingStrategyConfig(new StandardShardingStrategyConfiguration("column", new PreciseShardingAlgorithmFixture()));
+        result.setDatabaseShardingStrategyConfig(new StandardShardingStrategyConfiguration("column", new StandardShardingAlgorithmFixture()));
         result.setTableShardingStrategyConfig(new NoneShardingStrategyConfiguration());
         return result;
     }
     
     private TableRuleConfiguration createTableRuleConfigWithTableStrategies() {
         TableRuleConfiguration result = new TableRuleConfiguration("LOGIC_TABLE", "ds_${0..1}.table_${0..2}");
-        result.setTableShardingStrategyConfig(new StandardShardingStrategyConfiguration("column", new PreciseShardingAlgorithmFixture()));
+        result.setTableShardingStrategyConfig(new StandardShardingStrategyConfiguration("column", new StandardShardingAlgorithmFixture()));
         return result;
     }
 }

sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/strategy/route/ShardingStrategyTest.java

@@ -24,8 +24,7 @@ import org.apache.shardingsphere.api.config.sharding.strategy.ComplexShardingStr
 import org.apache.shardingsphere.api.config.sharding.strategy.StandardShardingStrategyConfiguration;
 import org.apache.shardingsphere.core.strategy.route.complex.ComplexShardingStrategy;
 import org.apache.shardingsphere.core.strategy.route.fixture.ComplexKeysShardingAlgorithmFixture;
-import org.apache.shardingsphere.core.strategy.route.fixture.PreciseShardingAlgorithmFixture;
-import org.apache.shardingsphere.core.strategy.route.fixture.RangeShardingAlgorithmFixture;
+import org.apache.shardingsphere.core.strategy.route.fixture.StandardShardingAlgorithmFixture;
 import org.apache.shardingsphere.core.strategy.route.none.NoneShardingStrategy;
 import org.apache.shardingsphere.core.strategy.route.standard.StandardShardingStrategy;
 import org.apache.shardingsphere.core.strategy.route.value.ListRouteValue;
@@ -55,7 +54,7 @@ public final class ShardingStrategyTest {
     @Test
     public void assertDoShardingForBetweenSingleKey() {
         StandardShardingStrategy strategy = new StandardShardingStrategy(
-                new StandardShardingStrategyConfiguration("column", new PreciseShardingAlgorithmFixture(), new RangeShardingAlgorithmFixture()));
+                new StandardShardingStrategyConfiguration("column", new StandardShardingAlgorithmFixture()));
         assertThat(strategy.doSharding(targets, Collections.singletonList(new RangeRouteValue<>("column", "logicTable", Range.open(1, 3))), new ConfigurationProperties(new Properties())),
                 is(Sets.newHashSet("1")));
     }

sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/yaml/engine/YamlEngineShadowShardingConfigurationTest.java

@@ -109,8 +109,8 @@ public final class YamlEngineShadowShardingConfigurationTest {
     private void assertTOrderItem(final YamlRootShadowConfiguration actual) {
         assertThat(actual.getShadowRule().getShardingRule().getTables().get("t_order_item").getActualDataNodes(), is("ds_${0..1}.t_order_item_${0..1}"));
         assertThat(actual.getShadowRule().getShardingRule().getTables().get("t_order_item").getTableStrategy().getStandard().getShardingColumn(), is("order_id"));
-        assertThat(actual.getShadowRule().getShardingRule().getTables().get("t_order_item").getTableStrategy().getStandard().getPreciseAlgorithmClassName(), is("TestPreciseAlgorithmClassName"));
-        assertThat(actual.getShadowRule().getShardingRule().getTables().get("t_order_item").getTableStrategy().getStandard().getRangeAlgorithmClassName(), is("TestRangeAlgorithmClassName"));
+        assertThat(actual.getShadowRule().getShardingRule().getTables().get("t_order_item").getTableStrategy().getStandard().getShardingAlgorithm().getType(), is("STANDARD_TEST"));
+        assertThat(actual.getShadowRule().getShardingRule().getTables().get("t_order_item").getTableStrategy().getStandard().getShardingAlgorithm().getType(), is("STANDARD_TEST"));
     }
     
     private void assertBindingTable(final YamlRootShadowConfiguration actual) {

sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/yaml/engine/YamlEngineShardingConfigurationTest.java

@@ -108,8 +108,8 @@ public final class YamlEngineShardingConfigurationTest {
     private void assertTOrderItem(final YamlRootShardingConfiguration actual) {
         assertThat(actual.getShardingRule().getTables().get("t_order_item").getActualDataNodes(), is("ds_${0..1}.t_order_item_${0..1}"));
         assertThat(actual.getShardingRule().getTables().get("t_order_item").getTableStrategy().getStandard().getShardingColumn(), is("order_id"));
-        assertThat(actual.getShardingRule().getTables().get("t_order_item").getTableStrategy().getStandard().getPreciseAlgorithmClassName(), is("TestPreciseAlgorithmClassName"));
-        assertThat(actual.getShardingRule().getTables().get("t_order_item").getTableStrategy().getStandard().getRangeAlgorithmClassName(), is("TestRangeAlgorithmClassName"));
+        assertThat(actual.getShardingRule().getTables().get("t_order_item").getTableStrategy().getStandard().getShardingAlgorithm().getType(), is("STANDARD_TEST"));
+        assertThat(actual.getShardingRule().getTables().get("t_order_item").getTableStrategy().getStandard().getShardingAlgorithm().getType(), is("STANDARD_TEST"));
     }
     
     private void assertBindingTable(final YamlRootShardingConfiguration actual) {

sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/yaml/swapper/ShardingStrategyConfigurationYamlSwapperTest.java

@@ -28,8 +28,8 @@ import org.apache.shardingsphere.api.sharding.standard.PreciseShardingAlgorithm;
 import org.apache.shardingsphere.api.sharding.standard.RangeShardingAlgorithm;
 import org.apache.shardingsphere.core.shard.fixture.ComplexKeysShardingAlgorithmFixture;
 import org.apache.shardingsphere.core.shard.fixture.HintShardingAlgorithmFixture;
-import org.apache.shardingsphere.core.shard.fixture.PreciseShardingAlgorithmFixture;
 import org.apache.shardingsphere.core.shard.fixture.RangeShardingAlgorithmFixture;
+import org.apache.shardingsphere.core.shard.fixture.StandardShardingAlgorithmFixture;
 import org.apache.shardingsphere.core.yaml.config.sharding.YamlShardingStrategyConfiguration;
 import org.apache.shardingsphere.core.yaml.config.sharding.strategy.YamlComplexShardingStrategyConfiguration;
 import org.apache.shardingsphere.core.yaml.config.sharding.strategy.YamlHintShardingStrategyConfiguration;
@@ -114,22 +114,22 @@ public final class ShardingStrategyConfigurationYamlSwapperTest {
     public void assertSwapToObjectWithStandardWithRangeShardingAlgorithm() {
         StandardShardingStrategyConfiguration actual = (StandardShardingStrategyConfiguration) shardingStrategyConfigurationYamlSwapper.swap(createStandardShardingStrategyConfiguration(true));
         assertThat(actual.getShardingColumn(), is("id"));
-        assertThat(actual.getPreciseShardingAlgorithm(), instanceOf(PreciseShardingAlgorithmFixture.class));
-        assertThat(actual.getRangeShardingAlgorithm(), instanceOf(RangeShardingAlgorithmFixture.class));
+        assertThat(actual.getShardingAlgorithm(), instanceOf(StandardShardingAlgorithmFixture.class));
     }
     
     @Test
     public void assertSwapToObjectWithStandardWithoutRangeShardingAlgorithm() {
         StandardShardingStrategyConfiguration actual = (StandardShardingStrategyConfiguration) shardingStrategyConfigurationYamlSwapper.swap(createStandardShardingStrategyConfiguration(false));
         assertThat(actual.getShardingColumn(), is("id"));
-        assertThat(actual.getPreciseShardingAlgorithm(), instanceOf(PreciseShardingAlgorithmFixture.class));
-        assertNull(actual.getRangeShardingAlgorithm());
+        assertThat(actual.getShardingAlgorithm(), instanceOf(StandardShardingAlgorithmFixture.class));
     }
     
     private YamlShardingStrategyConfiguration createStandardShardingStrategyConfiguration(final boolean withRangeAlgorithmClassName) {
         YamlStandardShardingStrategyConfiguration yamlStandardShardingStrategyConfiguration = new YamlStandardShardingStrategyConfiguration();
         yamlStandardShardingStrategyConfiguration.setShardingColumn("id");
-        yamlStandardShardingStrategyConfiguration.setPreciseAlgorithmClassName(PreciseShardingAlgorithmFixture.class.getName());
+        YamlShardingAlgorithmConfiguration shardingAlgorithmConfiguration = new YamlShardingAlgorithmConfiguration();
+        shardingAlgorithmConfiguration.setType("STANDARD_TEST");
+        yamlStandardShardingStrategyConfiguration.setShardingAlgorithm(shardingAlgorithmConfiguration);
         if (withRangeAlgorithmClassName) {
             yamlStandardShardingStrategyConfiguration.setRangeAlgorithmClassName(RangeShardingAlgorithmFixture.class.getName());
         }

sharding-core/sharding-core-common/src/test/resources/yaml/shadow-sharding-rule.yaml

@@ -105,8 +105,8 @@ shadowRule:
         tableStrategy:
           standard:
             shardingColumn: order_id
-            preciseAlgorithmClassName: TestPreciseAlgorithmClassName
-            rangeAlgorithmClassName: TestRangeAlgorithmClassName
+            shardingAlgorithm:
+              type: STANDARD_TEST
     bindingTables:
       - t_order, t_order_item
     broadcastTables:

sharding-core/sharding-core-common/src/test/resources/yaml/sharding-rule.yaml

@@ -92,8 +92,8 @@ shardingRule:
       tableStrategy:
         standard:
           shardingColumn: order_id
-          preciseAlgorithmClassName: TestPreciseAlgorithmClassName
-          rangeAlgorithmClassName: TestRangeAlgorithmClassName
+          shardingAlgorithm:
+            type: STANDARD_TEST
   bindingTables:
     - t_order, t_order_item
   broadcastTables:

sharding-integration-test/sharding-jdbc-test/src/test/resources/integrate/env/db/sharding-rule.yaml

@@ -22,15 +22,15 @@ shardingRule:
       databaseStrategy:
         standard:
           shardingColumn: user_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.dbtest.fixture.PreciseModuloAlgorithm
-          rangeAlgorithmClassName: org.apache.shardingsphere.dbtest.fixture.RangeModuloAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST
     t_order_item:
       actualDataNodes: db_${0..9}.t_order_item
       databaseStrategy:
         standard:
           shardingColumn: user_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.dbtest.fixture.PreciseModuloAlgorithm
-          rangeAlgorithmClassName: org.apache.shardingsphere.dbtest.fixture.RangeModuloAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST
       keyGenerator:
         type: CONSTANT
         column: item_id

sharding-integration-test/sharding-jdbc-test/src/test/resources/integrate/env/dbtbl_with_masterslave/sharding-rule.yaml

@@ -24,25 +24,25 @@ shardingRule:
       databaseStrategy:
         standard:
           shardingColumn: user_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.dbtest.fixture.PreciseModuloAlgorithm
-          rangeAlgorithmClassName: org.apache.shardingsphere.dbtest.fixture.RangeModuloAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST
       tableStrategy:
         standard:
           shardingColumn: order_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.dbtest.fixture.PreciseModuloAlgorithm
-          rangeAlgorithmClassName: org.apache.shardingsphere.dbtest.fixture.RangeModuloAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST
     t_order_item:
       actualDataNodes: db_ms_${0..9}.t_order_item_${0..9}
       databaseStrategy:
         standard:
           shardingColumn: user_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.dbtest.fixture.PreciseModuloAlgorithm
-          rangeAlgorithmClassName: org.apache.shardingsphere.dbtest.fixture.RangeModuloAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST
       tableStrategy:
         standard:
           shardingColumn: order_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.dbtest.fixture.PreciseModuloAlgorithm
-          rangeAlgorithmClassName: org.apache.shardingsphere.dbtest.fixture.RangeModuloAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST
       keyGenerator:
         type: Constant
         column: item_id

sharding-integration-test/sharding-jdbc-test/src/test/resources/integrate/env/tbl/sharding-rule.yaml

@@ -22,15 +22,15 @@ shardingRule:
       tableStrategy:
         standard:
           shardingColumn: order_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.dbtest.fixture.PreciseModuloAlgorithm
-          rangeAlgorithmClassName: org.apache.shardingsphere.dbtest.fixture.RangeModuloAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST
     t_order_item:
       actualDataNodes: tbl.t_order_item_${0..9}
       tableStrategy:
         standard:
           shardingColumn: order_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.dbtest.fixture.PreciseModuloAlgorithm
-          rangeAlgorithmClassName: org.apache.shardingsphere.dbtest.fixture.RangeModuloAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST
       keyGenerator:
         type: Constant
         column: item_id

sharding-jdbc/sharding-jdbc-core/src/test/resources/config-sharding.yaml

@@ -33,10 +33,10 @@ shardingRule:
   defaultTableStrategy:
     standard:
       shardingColumn: order_id
-      preciseAlgorithmClassName: org.apache.shardingsphere.shardingjdbc.fixture.PreciseOrderShardingAlgorithm
-      rangeAlgorithmClassName: org.apache.shardingsphere.shardingjdbc.fixture.RangeOrderShardingAlgorithm
+      shardingAlgorithm:
+        type: STANDARD_TEST
   defaultDatabaseStrategy:
     standard:
       shardingColumn: user_id
-      preciseAlgorithmClassName: org.apache.shardingsphere.shardingjdbc.fixture.PreciseOrderShardingAlgorithm
-      rangeAlgorithmClassName: org.apache.shardingsphere.shardingjdbc.fixture.RangeOrderShardingAlgorithm
+      shardingAlgorithm:
+        type: STANDARD_TEST

sharding-jdbc/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml

@@ -39,7 +39,8 @@ shardingRule:
       databaseStrategy: 
         standard:
           shardingColumn: user_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.shardingjdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST
       tableStrategy: 
         inline:
           shardingColumn: order_id
@@ -52,7 +53,8 @@ shardingRule:
       databaseStrategy: 
         standard:
           shardingColumn: user_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.shardingjdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST
       tableStrategy: 
         inline:
           shardingColumn: order_id

sharding-jdbc/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml

@@ -39,7 +39,8 @@ shardingRule:
       databaseStrategy: 
         standard:
           shardingColumn: user_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.shardingjdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST
       tableStrategy: 
         inline:
           shardingColumn: order_id
@@ -52,7 +53,8 @@ shardingRule:
       databaseStrategy: 
         standard:
           shardingColumn: user_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.shardingjdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST
       tableStrategy: 
         inline:
           shardingColumn: order_id

sharding-jdbc/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml

@@ -25,7 +25,8 @@ shardingRule:
       databaseStrategy: 
         standard:
           shardingColumn: user_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.shardingjdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST
       tableStrategy: 
         inline:
           shardingColumn: order_id
@@ -38,7 +39,8 @@ shardingRule:
       databaseStrategy: 
         standard:
           shardingColumn: user_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.shardingjdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST
       tableStrategy: 
         inline:
           shardingColumn: order_id

sharding-jdbc/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml

@@ -24,7 +24,8 @@ shardingRule:
       databaseStrategy: 
         standard:
           shardingColumn: user_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.shardingjdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST
       tableStrategy: 
         inline:
           shardingColumn: order_id
@@ -37,7 +38,8 @@ shardingRule:
       databaseStrategy: 
         standard:
           shardingColumn: user_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.shardingjdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST
       tableStrategy: 
         inline:
           shardingColumn: order_id

sharding-jdbc/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithProps.yaml

@@ -51,7 +51,8 @@ shardingRule:
       databaseStrategy: 
         standard:
           shardingColumn: user_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.shardingjdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST
       tableStrategy: 
         inline:
           shardingColumn: order_id
@@ -64,7 +65,8 @@ shardingRule:
       databaseStrategy: 
         standard:
           shardingColumn: order_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.shardingjdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST
       tableStrategy: 
         inline:
           shardingColumn: id

sharding-jdbc/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithoutProps.yaml

@@ -51,7 +51,8 @@ shardingRule:
       databaseStrategy: 
         standard:
           shardingColumn: user_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.shardingjdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST
       tableStrategy: 
         inline:
           shardingColumn: order_id
@@ -64,7 +65,8 @@ shardingRule:
       databaseStrategy: 
         standard:
           shardingColumn: user_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.shardingjdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST
       tableStrategy: 
         inline:
           shardingColumn: order_id

sharding-jdbc/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithProps.yaml

@@ -25,7 +25,8 @@ shardingRule:
       databaseStrategy: 
         standard:
           shardingColumn: user_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.shardingjdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST
       tableStrategy: 
         inline:
           shardingColumn: order_id
@@ -38,7 +39,8 @@ shardingRule:
       databaseStrategy: 
         standard:
           shardingColumn: user_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.shardingjdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST
       tableStrategy: 
         inline:
           shardingColumn: order_id

sharding-jdbc/sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithoutProps.yaml

@@ -25,7 +25,8 @@ shardingRule:
       databaseStrategy: 
         standard:
           shardingColumn: user_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.shardingjdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST
       tableStrategy: 
         inline:
           shardingColumn: order_id
@@ -38,7 +39,8 @@ shardingRule:
       databaseStrategy:
         standard:
           shardingColumn: user_id
-          preciseAlgorithmClassName: org.apache.shardingsphere.shardingjdbc.orchestration.api.yaml.fixture.SingleAlgorithm
+          shardingAlgorithm:
+            type: STANDARD_TEST
       tableStrategy:
         inline:
           shardingColumn: order_id

sharding-spring/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/namespace/shardingDataSourceNamespace.xml

@@ -29,6 +29,9 @@
     <bean id="preciseModuloDatabaseShardingAlgorithm" class="org.apache.shardingsphere.shardingjdbc.orchestration.spring.algorithm.PreciseModuloDatabaseShardingAlgorithm" />
     <bean id="preciseModuloTableShardingAlgorithm" class="org.apache.shardingsphere.shardingjdbc.orchestration.spring.algorithm.PreciseModuloTableShardingAlgorithm" />
     <bean id="rangeModuloTableShardingAlgorithm" class="org.apache.shardingsphere.shardingjdbc.orchestration.spring.algorithm.RangeModuloTableShardingAlgorithm" />
+    
+    <bean id="standardModuloDatabaseShardingAlgorithm" class="org.apache.shardingsphere.shardingjdbc.orchestration.spring.algorithm.StandardModuloDatabaseShardingAlgorithm" />
+    <bean id="standardModuloTableShardingAlgorithm" class="org.apache.shardingsphere.shardingjdbc.orchestration.spring.algorithm.StandardModuloTableShardingAlgorithm" />
     <bean id="defaultComplexKeysShardingAlgorithm" class="org.apache.shardingsphere.shardingjdbc.orchestration.spring.algorithm.DefaultComplexKeysShardingAlgorithm" />
     <bean id="defaultHintShardingAlgorithm" class="org.apache.shardingsphere.shardingjdbc.orchestration.spring.algorithm.DefaultHintShardingAlgorithm" />
     <bean id="incrementAlgorithm" class="org.apache.shardingsphere.shardingjdbc.spring.namespace.factorybean.KeyGenerateAlgorithmFactoryBean">