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 2023/03/27 04:57:28 UTC
[shardingsphere] branch master updated: Refactor ShardingRoutingEngineFixtureBuilder (#24852)
This is an automated email from the ASF dual-hosted git repository.
zhaojinchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new dd3d1299636 Refactor ShardingRoutingEngineFixtureBuilder (#24852)
dd3d1299636 is described below
commit dd3d12996361dfdf8ef4a7f889e1ae5bb4e5ae1b
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Mon Mar 27 12:57:20 2023 +0800
Refactor ShardingRoutingEngineFixtureBuilder (#24852)
* Refactor ShardingRoutingEngineFixtureBuilder
* Fix checkstyle
---
...rUseDefaultInsertColumnsTokenGeneratorTest.java | 1 +
.../EncryptInsertValuesTokenGeneratorTest.java | 1 +
.../EncryptPredicateColumnTokenGeneratorTest.java | 5 +-
...cryptPredicateRightValueTokenGeneratorTest.java | 5 +-
.../InsertCipherNameTokenGeneratorTest.java | 1 +
.../EncryptGeneratorFixtureBuilder.java | 36 +++++--
...va => ShardingRoutingEngineFixtureBuilder.java} | 116 +++++++++++++++++----
.../ShardingTableBroadcastRoutingEngineTest.java | 3 +-
.../complex/ShardingComplexRoutingEngineTest.java | 20 ++--
.../engine/type/standard/AbstractSQLRouteTest.java | 10 +-
.../ShardingStandardRoutingEngineTest.java | 38 +++----
11 files changed, 170 insertions(+), 66 deletions(-)
diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptForUseDefaultInsertColumnsTokenGeneratorTest.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptForUseDefaultInsertColumnsTokenGeneratorTest.java
index 7228e0ddfe9..bdb22b1f431 100644
--- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptForUseDefaultInsertColumnsTokenGeneratorTest.java
+++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptForUseDefaultInsertColumnsTokenGeneratorTest.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.encrypt.rewrite.token.generator;
+import org.apache.shardingsphere.encrypt.rewrite.token.generator.fixture.EncryptGeneratorFixtureBuilder;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptInsertValuesTokenGeneratorTest.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptInsertValuesTokenGeneratorTest.java
index d1d3a56e488..b8952c90b71 100644
--- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptInsertValuesTokenGeneratorTest.java
+++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptInsertValuesTokenGeneratorTest.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.encrypt.rewrite.token.generator;
+import org.apache.shardingsphere.encrypt.rewrite.token.generator.fixture.EncryptGeneratorFixtureBuilder;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateColumnTokenGeneratorTest.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateColumnTokenGeneratorTest.java
index d09ac916a04..13635150093 100644
--- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateColumnTokenGeneratorTest.java
+++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateColumnTokenGeneratorTest.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.encrypt.rewrite.token.generator;
+import org.apache.shardingsphere.encrypt.rewrite.token.generator.fixture.EncryptGeneratorFixtureBuilder;
import org.apache.shardingsphere.infra.database.DefaultDatabase;
import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.generic.SubstitutableColumnNameToken;
import org.junit.jupiter.api.BeforeEach;
@@ -42,14 +43,14 @@ class EncryptPredicateColumnTokenGeneratorTest {
void assertIsGenerateSQLToken() {
generator.setDatabaseName(DefaultDatabase.LOGIC_NAME);
generator.setSchemas(Collections.emptyMap());
- assertTrue(generator.isGenerateSQLToken(EncryptGeneratorFixtureBuilder.createUpdatesStatementContext()));
+ assertTrue(generator.isGenerateSQLToken(EncryptGeneratorFixtureBuilder.createUpdateStatementContext()));
}
@Test
void assertGenerateSQLTokenFromGenerateNewSQLToken() {
generator.setDatabaseName(DefaultDatabase.LOGIC_NAME);
generator.setSchemas(Collections.emptyMap());
- Collection<SubstitutableColumnNameToken> substitutableColumnNameTokens = generator.generateSQLTokens(EncryptGeneratorFixtureBuilder.createUpdatesStatementContext());
+ Collection<SubstitutableColumnNameToken> substitutableColumnNameTokens = generator.generateSQLTokens(EncryptGeneratorFixtureBuilder.createUpdateStatementContext());
assertThat(substitutableColumnNameTokens.size(), is(1));
assertThat(substitutableColumnNameTokens.iterator().next().toString(null), is("pwd_plain"));
}
diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateRightValueTokenGeneratorTest.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateRightValueTokenGeneratorTest.java
index 2434e62fe36..6c65c08faa7 100644
--- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateRightValueTokenGeneratorTest.java
+++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateRightValueTokenGeneratorTest.java
@@ -19,6 +19,7 @@ package org.apache.shardingsphere.encrypt.rewrite.token.generator;
import org.apache.shardingsphere.encrypt.rewrite.condition.EncryptCondition;
import org.apache.shardingsphere.encrypt.rewrite.condition.EncryptConditionEngine;
+import org.apache.shardingsphere.encrypt.rewrite.token.generator.fixture.EncryptGeneratorFixtureBuilder;
import org.apache.shardingsphere.infra.binder.statement.dml.UpdateStatementContext;
import org.apache.shardingsphere.infra.database.DefaultDatabase;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
@@ -46,12 +47,12 @@ class EncryptPredicateRightValueTokenGeneratorTest {
@Test
void assertIsGenerateSQLToken() {
generator.setDatabaseName(DefaultDatabase.LOGIC_NAME);
- assertTrue(generator.isGenerateSQLToken(EncryptGeneratorFixtureBuilder.createUpdatesStatementContext()));
+ assertTrue(generator.isGenerateSQLToken(EncryptGeneratorFixtureBuilder.createUpdateStatementContext()));
}
@Test
void assertGenerateSQLTokenFromGenerateNewSQLToken() {
- UpdateStatementContext updateStatementContext = EncryptGeneratorFixtureBuilder.createUpdatesStatementContext();
+ UpdateStatementContext updateStatementContext = EncryptGeneratorFixtureBuilder.createUpdateStatementContext();
generator.setDatabaseName(DefaultDatabase.LOGIC_NAME);
generator.setEncryptConditions(getEncryptConditions(updateStatementContext));
Collection<SQLToken> sqlTokens = generator.generateSQLTokens(updateStatementContext);
diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/InsertCipherNameTokenGeneratorTest.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/InsertCipherNameTokenGeneratorTest.java
index bea7f235afd..a9f51eb2efd 100644
--- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/InsertCipherNameTokenGeneratorTest.java
+++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/InsertCipherNameTokenGeneratorTest.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.encrypt.rewrite.token.generator;
+import org.apache.shardingsphere.encrypt.rewrite.token.generator.fixture.EncryptGeneratorFixtureBuilder;
import org.apache.shardingsphere.infra.binder.statement.dml.SelectStatementContext;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptGeneratorFixtureBuilder.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/fixture/EncryptGeneratorFixtureBuilder.java
similarity index 91%
rename from features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptGeneratorFixtureBuilder.java
rename to features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/fixture/EncryptGeneratorFixtureBuilder.java
index a565b538691..30c2f05d181 100644
--- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptGeneratorFixtureBuilder.java
+++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/fixture/EncryptGeneratorFixtureBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.encrypt.rewrite.token.generator;
+package org.apache.shardingsphere.encrypt.rewrite.token.generator.fixture;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@@ -64,10 +64,18 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+/**
+ * Encrypt generator fixture builder.
+ */
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-class EncryptGeneratorFixtureBuilder {
+public final class EncryptGeneratorFixtureBuilder {
- static EncryptRule createEncryptRule() {
+ /**
+ * Create encrypt rule.
+ *
+ * @return created encrypt rule
+ */
+ public static EncryptRule createEncryptRule() {
EncryptColumnRuleConfiguration pwdColumnConfig =
new EncryptColumnRuleConfiguration("pwd", "pwd_cipher", "pwd_assist", "pwd_like", "pwd_plain", "test_encryptor", "test_encryptor", "like_encryptor", false);
Map<String, AlgorithmConfiguration> encryptors = new LinkedHashMap<>(2, 1);
@@ -76,7 +84,13 @@ class EncryptGeneratorFixtureBuilder {
return new EncryptRule(new EncryptRuleConfiguration(Collections.singleton(new EncryptTableRuleConfiguration("t_user", Collections.singletonList(pwdColumnConfig), null)), encryptors));
}
- static InsertStatementContext createInsertStatementContext(final List<Object> params) {
+ /**
+ * Create insert statement context.
+ *
+ * @param params parameters
+ * @return created insert statement context
+ */
+ public static InsertStatementContext createInsertStatementContext(final List<Object> params) {
InsertStatement insertStatement = createInsertStatement();
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
@@ -98,7 +112,12 @@ class EncryptGeneratorFixtureBuilder {
return result;
}
- static UpdateStatementContext createUpdatesStatementContext() {
+ /**
+ * Create update statement context.
+ *
+ * @return created update statement context
+ */
+ public static UpdateStatementContext createUpdateStatementContext() {
MySQLUpdateStatement updateStatement = new MySQLUpdateStatement();
updateStatement.setTable(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_user"))));
updateStatement.setWhere(createWhereSegment());
@@ -119,7 +138,12 @@ class EncryptGeneratorFixtureBuilder {
return new SetAssignmentSegment(0, 0, Collections.singletonList(new ColumnAssignmentSegment(0, 0, columnSegment, new LiteralExpressionSegment(0, 0, "654321"))));
}
- static List<SQLToken> getPreviousSQLTokens() {
+ /**
+ * Get previous SQL tokens.
+ *
+ * @return previous SQL tokens
+ */
+ public static List<SQLToken> getPreviousSQLTokens() {
EncryptInsertValuesToken encryptInsertValuesToken = new EncryptInsertValuesToken(0, 0);
encryptInsertValuesToken.getInsertValues().add(new InsertValue(createValueExpressions()));
return Collections.singletonList(encryptInsertValuesToken);
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/fixture/AbstractRoutingEngineTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/fixture/ShardingRoutingEngineFixtureBuilder.java
similarity index 83%
rename from features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/fixture/AbstractRoutingEngineTest.java
rename to features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/fixture/ShardingRoutingEngineFixtureBuilder.java
index 6f27aa0b10a..d469a9d090f 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/fixture/AbstractRoutingEngineTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/fixture/ShardingRoutingEngineFixtureBuilder.java
@@ -17,6 +17,8 @@
package org.apache.shardingsphere.sharding.route.engine.fixture;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
@@ -58,9 +60,18 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public abstract class AbstractRoutingEngineTest {
+/**
+ * Sharding routing engine fixture builder.
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class ShardingRoutingEngineFixtureBuilder {
- protected final ShardingRule createBasedShardingRule() {
+ /**
+ * Create based sharding rule.
+ *
+ * @return created sharding rule
+ */
+ public static ShardingRule createBasedShardingRule() {
ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
shardingRuleConfig.getTables().add(createInlineTableRuleConfig("t_order", "ds_${0..1}.t_order_${0..1}", "t_order_${order_id % 2}", "ds_${user_id % 2}"));
shardingRuleConfig.getShardingAlgorithms().put("ds_inline", new AlgorithmConfiguration("INLINE", PropertiesBuilder.build(new Property("algorithm-expression", "ds_${user_id % 2}"))));
@@ -69,7 +80,12 @@ public abstract class AbstractRoutingEngineTest {
return new ShardingRule(shardingRuleConfig, createDataSourceNames(), mock(InstanceContext.class));
}
- protected final ShardingRule createErrorShardingRule() {
+ /**
+ * Create error sharding rule.
+ *
+ * @return created sharding rule
+ */
+ public static ShardingRule createErrorShardingRule() {
ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
shardingRuleConfig.getTables().add(createInlineTableRuleConfig("t_order", "ds_${0..1}.t_order_${0..1}", "t_order_${order_id % 2}", "ds_${user_id % 2}"));
shardingRuleConfig.getShardingAlgorithms().put("ds_inline", new AlgorithmConfiguration("INLINE", PropertiesBuilder.build(new Property("algorithm-expression", "ds_${user_id % 2}"))));
@@ -78,7 +94,12 @@ public abstract class AbstractRoutingEngineTest {
return new ShardingRule(shardingRuleConfig, createDataSourceNames(), mock(InstanceContext.class));
}
- protected final ShardingRule createBindingShardingRule() {
+ /**
+ * Create binding sharding rule.
+ *
+ * @return created sharding rule
+ */
+ public static ShardingRule createBindingShardingRule() {
ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
shardingRuleConfig.getTables().add(createInlineTableRuleConfig("t_order", "ds_${0..1}.t_order_${0..1}", "t_order_${order_id % 2}", "ds_${user_id % 2}"));
shardingRuleConfig.getTables().add(createInlineTableRuleConfig("t_order_item", "ds_${0..1}.t_order_item_${0..1}", "t_order_item_${order_id % 2}", "ds_${user_id % 2}"));
@@ -91,7 +112,12 @@ public abstract class AbstractRoutingEngineTest {
return new ShardingRule(shardingRuleConfig, createDataSourceNames(), mock(InstanceContext.class));
}
- protected final ShardingRule createBroadcastShardingRule() {
+ /**
+ * Create broadcast sharding rule.
+ *
+ * @return created sharding rule
+ */
+ public static ShardingRule createBroadcastShardingRule() {
ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
shardingRuleConfig.getTables().add(createInlineTableRuleConfig("t_order", "ds_${0..1}.t_order_${0..1}", "t_order_${order_id % 2}", "ds_${user_id % 2}"));
shardingRuleConfig.getTables().add(createInlineTableRuleConfig("t_order_item", "ds_${0..1}.t_order_item_${0..1}", "t_order_item_${order_id % 2}", "ds_${user_id % 2}"));
@@ -104,14 +130,24 @@ public abstract class AbstractRoutingEngineTest {
return new ShardingRule(shardingRuleConfig, createDataSourceNames(), mock(InstanceContext.class));
}
- protected final ShardingRule createHintShardingRule() {
+ /**
+ * Create hint sharding rule.
+ *
+ * @return created sharding rule
+ */
+ public static ShardingRule createHintShardingRule() {
ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
shardingRuleConfig.getTables().add(createTableRuleWithHintConfig());
shardingRuleConfig.getShardingAlgorithms().put("core_hint_fixture", new AlgorithmConfiguration("CORE.HINT.FIXTURE", new Properties()));
return new ShardingRule(shardingRuleConfig, createDataSourceNames(), mock(InstanceContext.class));
}
- protected final ShardingRule createMixedShardingRule() {
+ /**
+ * Create mixed sharding rule.
+ *
+ * @return created sharding rule
+ */
+ public static 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("core_hint_fixture"), createStandardShardingStrategyConfiguration("t_hint_ds_test_inline", "t_hint_ds_test_${order_id % 2}")));
@@ -124,7 +160,12 @@ public abstract class AbstractRoutingEngineTest {
return new ShardingRule(shardingRuleConfig, createDataSourceNames(), mock(InstanceContext.class));
}
- protected final ShardingRule createAllShardingRule() {
+ /**
+ * Create all sharding rule.
+ *
+ * @return created sharding rule
+ */
+ public static ShardingRule createAllShardingRule() {
ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
shardingRuleConfig.getBroadcastTables().add("t_product");
shardingRuleConfig.setDefaultDatabaseShardingStrategy(new StandardShardingStrategyConfiguration("order_id", "ds_inline"));
@@ -143,7 +184,12 @@ public abstract class AbstractRoutingEngineTest {
return new ShardingRule(shardingRuleConfig, Arrays.asList("ds_0", "ds_1", "main"), mock(InstanceContext.class));
}
- protected final ShardingRule createIntervalTableShardingRule() {
+ /**
+ * Create interval table sharding rule.
+ *
+ * @return created sharding rule
+ */
+ public static ShardingRule createIntervalTableShardingRule() {
ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
shardingRuleConfig.getTables().add(createTableRuleConfig("t_interval_test", "ds_0.t_interval_test_202101,ds_1.t_interval_test_202102",
null, new StandardShardingStrategyConfiguration("create_at", "interval_test")));
@@ -158,26 +204,27 @@ public abstract class AbstractRoutingEngineTest {
return new ShardingRule(shardingRuleConfig, createDataSourceNames(), mock(InstanceContext.class));
}
- private ShardingTableRuleConfiguration createInlineTableRuleConfig(final String tableName, final String actualDataNodes, final String algorithmExpression, final String dsAlgorithmExpression) {
+ private static ShardingTableRuleConfiguration createInlineTableRuleConfig(final String tableName,
+ final String actualDataNodes, final String algorithmExpression, final String dsAlgorithmExpression) {
return createTableRuleConfig(tableName, actualDataNodes,
createStandardShardingStrategyConfiguration("ds_inline", dsAlgorithmExpression), createStandardShardingStrategyConfiguration(tableName + "_inline", algorithmExpression));
}
- private StandardShardingStrategyConfiguration createStandardShardingStrategyConfiguration(final String algorithmName, final String algorithmExpression) {
+ private static StandardShardingStrategyConfiguration createStandardShardingStrategyConfiguration(final String algorithmName, final String algorithmExpression) {
int startIndex = algorithmExpression.indexOf('{');
int endIndex = algorithmExpression.indexOf('%');
String shardingColumn = algorithmExpression.substring(startIndex + 1, endIndex).trim();
return new StandardShardingStrategyConfiguration(shardingColumn, algorithmName);
}
- private ShardingTableRuleConfiguration createTableRuleWithHintConfig() {
+ private static ShardingTableRuleConfiguration createTableRuleWithHintConfig() {
ShardingTableRuleConfiguration result = new ShardingTableRuleConfiguration("t_hint_test", "ds_${0..1}.t_hint_test_${0..1}");
result.setTableShardingStrategy(new HintShardingStrategyConfiguration("core_hint_fixture"));
result.setDatabaseShardingStrategy(new HintShardingStrategyConfiguration("core_hint_fixture"));
return result;
}
- private ShardingTableRuleConfiguration createTableRuleConfig(final String tableName, final String actualDataNodes,
+ private static ShardingTableRuleConfiguration createTableRuleConfig(final String tableName, final String actualDataNodes,
final ShardingStrategyConfiguration dsShardingStrategyConfig, final ShardingStrategyConfiguration tableShardingStrategyConfig) {
ShardingTableRuleConfiguration result = new ShardingTableRuleConfiguration(tableName, actualDataNodes);
result.setDatabaseShardingStrategy(dsShardingStrategyConfig);
@@ -185,7 +232,13 @@ public abstract class AbstractRoutingEngineTest {
return result;
}
- protected final ShardingConditions createShardingConditions(final String tableName) {
+ /**
+ * Create sharding conditions.
+ *
+ * @param tableName table name
+ * @return created sharding conditions
+ */
+ public static ShardingConditions createShardingConditions(final String tableName) {
List<ShardingCondition> result = new LinkedList<>();
ShardingConditionValue shardingConditionValue1 = new ListShardingConditionValue<>("user_id", tableName, Collections.singleton(1L));
ShardingConditionValue shardingConditionValue2 = new ListShardingConditionValue<>("order_id", tableName, Collections.singleton(1L));
@@ -196,7 +249,13 @@ public abstract class AbstractRoutingEngineTest {
return new ShardingConditions(result, mock(SQLStatementContext.class), mock(ShardingRule.class));
}
- protected final ShardingConditions createErrorShardingConditions(final String tableName) {
+ /**
+ * Create error sharding conditions.
+ *
+ * @param tableName table name
+ * @return created sharding conditions
+ */
+ public static ShardingConditions createErrorShardingConditions(final String tableName) {
List<ShardingCondition> result = new LinkedList<>();
ShardingConditionValue shardingConditionValue1 = new ListShardingConditionValue<>("user_id", tableName, Collections.singleton(1L));
ShardingConditionValue shardingConditionValue2 = new ListShardingConditionValue<>("order_id", tableName, Collections.singleton(2L));
@@ -207,7 +266,13 @@ public abstract class AbstractRoutingEngineTest {
return new ShardingConditions(result, mock(SQLStatementContext.class), mock(ShardingRule.class));
}
- protected final ShardingConditions createIntervalShardingConditions(final String tableName) {
+ /**
+ * Create interval sharding conditions.
+ *
+ * @param tableName table name
+ * @return created sharding conditions
+ */
+ public static ShardingConditions createIntervalShardingConditions(final String tableName) {
List<ShardingCondition> result = new LinkedList<>();
ShardingConditionValue shardingConditionValue = new ListShardingConditionValue<>("create_at", tableName, Collections.singleton("2021-01-01 20:20:20"));
ShardingCondition shardingCondition = new ShardingCondition();
@@ -216,23 +281,34 @@ public abstract class AbstractRoutingEngineTest {
return new ShardingConditions(result, mock(SQLStatementContext.class), mock(ShardingRule.class));
}
- private Collection<String> createDataSourceNames() {
+ private static Collection<String> createDataSourceNames() {
return Arrays.asList("ds_0", "ds_1");
}
- protected final SingleRule createSingleRule(final Collection<ShardingSphereRule> rules) {
+ /**
+ * Create single rule.
+ *
+ * @param rules rules
+ * @return created single rule
+ */
+ public static SingleRule createSingleRule(final Collection<ShardingSphereRule> rules) {
Map<String, DataSource> dataSourceMap = createDataSourceMap();
SingleRule result = new SingleRule(new SingleRuleConfiguration(), DefaultDatabase.LOGIC_NAME, dataSourceMap, rules);
result.put(dataSourceMap.keySet().iterator().next(), DefaultDatabase.LOGIC_NAME, "t_category");
return result;
}
- protected final TimeServiceRule createTimeServiceRule() {
+ /**
+ * Create time service rule.
+ *
+ * @return created time service rule
+ */
+ public static TimeServiceRule createTimeServiceRule() {
return new TimeServiceRule(new TimeServiceRuleConfiguration("System", new Properties()));
}
@SneakyThrows(SQLException.class)
- private Map<String, DataSource> createDataSourceMap() {
+ private static Map<String, DataSource> createDataSourceMap() {
Map<String, DataSource> result = new HashMap<>(3, 1);
Connection connection = mock(Connection.class, RETURNS_DEEP_STUBS);
when(connection.getMetaData().getURL()).thenReturn("jdbc:h2:mem:db");
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingTableBroadcastRoutingEngineTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingTableBroadcastRoutingEngineTest.java
index 2bbbdbdd9b7..088dcdc10a2 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingTableBroadcastRoutingEngineTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingTableBroadcastRoutingEngineTest.java
@@ -32,7 +32,6 @@ import org.apache.shardingsphere.infra.route.context.RouteMapper;
import org.apache.shardingsphere.infra.route.context.RouteUnit;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration;
-import org.apache.shardingsphere.sharding.route.engine.fixture.AbstractRoutingEngineTest;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndexSegment;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DropIndexStatement;
@@ -52,7 +51,7 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-class ShardingTableBroadcastRoutingEngineTest extends AbstractRoutingEngineTest {
+class ShardingTableBroadcastRoutingEngineTest {
@Test
void assertRouteForEmptyTable() {
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/complex/ShardingComplexRoutingEngineTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/complex/ShardingComplexRoutingEngineTest.java
index d73930cb272..c08f55be099 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/complex/ShardingComplexRoutingEngineTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/complex/ShardingComplexRoutingEngineTest.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.hint.HintValueContext;
import org.apache.shardingsphere.infra.route.context.RouteContext;
import org.apache.shardingsphere.infra.route.context.RouteUnit;
import org.apache.shardingsphere.sharding.exception.metadata.ShardingTableRuleNotFoundException;
-import org.apache.shardingsphere.sharding.route.engine.fixture.AbstractRoutingEngineTest;
+import org.apache.shardingsphere.sharding.route.engine.fixture.ShardingRoutingEngineFixtureBuilder;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.junit.jupiter.api.Test;
@@ -38,13 +38,13 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
-class ShardingComplexRoutingEngineTest extends AbstractRoutingEngineTest {
+class ShardingComplexRoutingEngineTest {
@Test
void assertRoutingForBindingTables() {
- ShardingComplexRoutingEngine complexRoutingEngine = new ShardingComplexRoutingEngine(createShardingConditions("t_order"), mock(SQLStatementContext.class),
- new HintValueContext(), new ConfigurationProperties(new Properties()), Arrays.asList("t_order", "t_order_item"));
- RouteContext routeContext = complexRoutingEngine.route(createBindingShardingRule());
+ ShardingComplexRoutingEngine complexRoutingEngine = new ShardingComplexRoutingEngine(ShardingRoutingEngineFixtureBuilder.createShardingConditions("t_order"),
+ mock(SQLStatementContext.class), new HintValueContext(), new ConfigurationProperties(new Properties()), Arrays.asList("t_order", "t_order_item"));
+ RouteContext routeContext = complexRoutingEngine.route(ShardingRoutingEngineFixtureBuilder.createBindingShardingRule());
List<RouteUnit> routeUnits = new ArrayList<>(routeContext.getRouteUnits());
assertThat(routeContext.getRouteUnits().size(), is(1));
assertThat(routeUnits.get(0).getDataSourceMapper().getActualName(), is("ds_1"));
@@ -55,9 +55,9 @@ class ShardingComplexRoutingEngineTest extends AbstractRoutingEngineTest {
@Test
void assertRoutingForShardingTableJoinBroadcastTable() {
- ShardingComplexRoutingEngine complexRoutingEngine = new ShardingComplexRoutingEngine(createShardingConditions("t_order"), mock(SQLStatementContext.class), new HintValueContext(),
- new ConfigurationProperties(new Properties()), Arrays.asList("t_order", "t_config"));
- RouteContext routeContext = complexRoutingEngine.route(createBroadcastShardingRule());
+ ShardingComplexRoutingEngine complexRoutingEngine = new ShardingComplexRoutingEngine(ShardingRoutingEngineFixtureBuilder.createShardingConditions("t_order"),
+ mock(SQLStatementContext.class), new HintValueContext(), new ConfigurationProperties(new Properties()), Arrays.asList("t_order", "t_config"));
+ RouteContext routeContext = complexRoutingEngine.route(ShardingRoutingEngineFixtureBuilder.createBroadcastShardingRule());
List<RouteUnit> routeUnits = new ArrayList<>(routeContext.getRouteUnits());
assertThat(routeContext.getRouteUnits().size(), is(1));
assertThat(routeUnits.get(0).getDataSourceMapper().getActualName(), is("ds_1"));
@@ -68,8 +68,8 @@ class ShardingComplexRoutingEngineTest extends AbstractRoutingEngineTest {
@Test
void assertRoutingForNonLogicTable() {
- ShardingComplexRoutingEngine complexRoutingEngine = new ShardingComplexRoutingEngine(
- createShardingConditions("t_order"), mock(SQLStatementContext.class), new HintValueContext(), new ConfigurationProperties(new Properties()), Collections.emptyList());
+ ShardingComplexRoutingEngine complexRoutingEngine = new ShardingComplexRoutingEngine(ShardingRoutingEngineFixtureBuilder.createShardingConditions("t_order"),
+ mock(SQLStatementContext.class), new HintValueContext(), new ConfigurationProperties(new Properties()), Collections.emptyList());
assertThrows(ShardingTableRuleNotFoundException.class, () -> complexRoutingEngine.route(mock(ShardingRule.class)));
}
}
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java
index db1d97b3c6b..2cd394daf7a 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java
@@ -36,7 +36,7 @@ import org.apache.shardingsphere.infra.parser.sql.SQLStatementParserEngine;
import org.apache.shardingsphere.infra.route.context.RouteContext;
import org.apache.shardingsphere.infra.route.engine.SQLRouteEngine;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
-import org.apache.shardingsphere.sharding.route.engine.fixture.AbstractRoutingEngineTest;
+import org.apache.shardingsphere.sharding.route.engine.fixture.ShardingRoutingEngineFixtureBuilder;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.single.rule.SingleRule;
import org.apache.shardingsphere.sql.parser.api.CacheOption;
@@ -54,12 +54,12 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public abstract class AbstractSQLRouteTest extends AbstractRoutingEngineTest {
+public abstract class AbstractSQLRouteTest {
protected final RouteContext assertRoute(final String sql, final List<Object> params) {
- ShardingRule shardingRule = createAllShardingRule();
- SingleRule singleRule = createSingleRule(Collections.singletonList(shardingRule));
- TimeServiceRule timeServiceRule = createTimeServiceRule();
+ ShardingRule shardingRule = ShardingRoutingEngineFixtureBuilder.createAllShardingRule();
+ SingleRule singleRule = ShardingRoutingEngineFixtureBuilder.createSingleRule(Collections.singletonList(shardingRule));
+ TimeServiceRule timeServiceRule = ShardingRoutingEngineFixtureBuilder.createTimeServiceRule();
Map<String, ShardingSphereSchema> schemas = buildSchemas();
ConfigurationProperties props = new ConfigurationProperties(new Properties());
SQLStatementParserEngine sqlStatementParserEngine = new SQLStatementParserEngine("MySQL",
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/ShardingStandardRoutingEngineTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/ShardingStandardRoutingEngineTest.java
index 60747f55136..6ec889b8fb9 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/ShardingStandardRoutingEngineTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/ShardingStandardRoutingEngineTest.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.infra.route.context.RouteContext;
import org.apache.shardingsphere.infra.route.context.RouteUnit;
import org.apache.shardingsphere.sharding.exception.algorithm.sharding.ShardingRouteAlgorithmException;
import org.apache.shardingsphere.sharding.route.engine.condition.ShardingConditions;
-import org.apache.shardingsphere.sharding.route.engine.fixture.AbstractRoutingEngineTest;
+import org.apache.shardingsphere.sharding.route.engine.fixture.ShardingRoutingEngineFixtureBuilder;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
@@ -42,7 +42,7 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-class ShardingStandardRoutingEngineTest extends AbstractRoutingEngineTest {
+class ShardingStandardRoutingEngineTest {
@AfterEach
void tearDown() {
@@ -53,7 +53,7 @@ class ShardingStandardRoutingEngineTest extends AbstractRoutingEngineTest {
void assertRouteByNonConditions() {
ShardingStandardRoutingEngine standardRoutingEngine = createShardingStandardRoutingEngine("t_order",
new ShardingConditions(Collections.emptyList(), mock(SQLStatementContext.class), mock(ShardingRule.class)), mock(SQLStatementContext.class), new HintValueContext());
- RouteContext routeContext = standardRoutingEngine.route(createBasedShardingRule());
+ RouteContext routeContext = standardRoutingEngine.route(ShardingRoutingEngineFixtureBuilder.createBasedShardingRule());
List<RouteUnit> routeUnits = new ArrayList<>(routeContext.getRouteUnits());
assertThat(routeContext.getRouteUnits().size(), is(4));
assertThat(routeUnits.get(0).getDataSourceMapper().getActualName(), is("ds_0"));
@@ -76,9 +76,9 @@ class ShardingStandardRoutingEngineTest extends AbstractRoutingEngineTest {
@Test
void assertRouteByShardingConditions() {
- ShardingStandardRoutingEngine standardRoutingEngine = createShardingStandardRoutingEngine("t_order", createShardingConditions("t_order"),
- mock(SQLStatementContext.class), new HintValueContext());
- RouteContext routeContext = standardRoutingEngine.route(createBasedShardingRule());
+ ShardingStandardRoutingEngine standardRoutingEngine = createShardingStandardRoutingEngine("t_order",
+ ShardingRoutingEngineFixtureBuilder.createShardingConditions("t_order"), mock(SQLStatementContext.class), new HintValueContext());
+ RouteContext routeContext = standardRoutingEngine.route(ShardingRoutingEngineFixtureBuilder.createBasedShardingRule());
List<RouteUnit> routeUnits = new ArrayList<>(routeContext.getRouteUnits());
assertThat(routeContext.getRouteUnits().size(), is(1));
assertThat(routeUnits.get(0).getDataSourceMapper().getActualName(), is("ds_1"));
@@ -89,9 +89,9 @@ class ShardingStandardRoutingEngineTest extends AbstractRoutingEngineTest {
@Test
void assertRouteByErrorShardingTableStrategy() {
- ShardingStandardRoutingEngine standardRoutingEngine = createShardingStandardRoutingEngine("t_order", createErrorShardingConditions("t_order"),
+ ShardingStandardRoutingEngine standardRoutingEngine = createShardingStandardRoutingEngine("t_order", ShardingRoutingEngineFixtureBuilder.createErrorShardingConditions("t_order"),
mock(SQLStatementContext.class), new HintValueContext());
- assertThrows(ShardingRouteAlgorithmException.class, () -> standardRoutingEngine.route(createErrorShardingRule()));
+ assertThrows(ShardingRouteAlgorithmException.class, () -> standardRoutingEngine.route(ShardingRoutingEngineFixtureBuilder.createErrorShardingRule()));
}
@Test
@@ -103,7 +103,7 @@ class ShardingStandardRoutingEngineTest extends AbstractRoutingEngineTest {
HintManager hintManager = HintManager.getInstance();
hintManager.addDatabaseShardingValue("t_hint_test", 1);
hintManager.addTableShardingValue("t_hint_test", 1);
- RouteContext routeContext = standardRoutingEngine.route(createHintShardingRule());
+ RouteContext routeContext = standardRoutingEngine.route(ShardingRoutingEngineFixtureBuilder.createHintShardingRule());
List<RouteUnit> routeUnits = new ArrayList<>(routeContext.getRouteUnits());
assertThat(routeContext.getRouteUnits().size(), is(1));
assertThat(routeUnits.get(0).getDataSourceMapper().getActualName(), is("ds_1"));
@@ -116,11 +116,11 @@ class ShardingStandardRoutingEngineTest extends AbstractRoutingEngineTest {
void assertRouteByMixedWithHintDataSource() {
SQLStatementContext sqlStatementContext = mock(SQLStatementContext.class, RETURNS_DEEP_STUBS);
when(sqlStatementContext.getTablesContext().getTableNames()).thenReturn(Collections.singletonList("t_hint_ds_test"));
- ShardingStandardRoutingEngine standardRoutingEngine = createShardingStandardRoutingEngine("t_hint_ds_test", createShardingConditions("t_hint_ds_test"),
- sqlStatementContext, new HintValueContext());
+ ShardingStandardRoutingEngine standardRoutingEngine = createShardingStandardRoutingEngine("t_hint_ds_test",
+ ShardingRoutingEngineFixtureBuilder.createShardingConditions("t_hint_ds_test"), sqlStatementContext, new HintValueContext());
HintManager hintManager = HintManager.getInstance();
hintManager.addDatabaseShardingValue("t_hint_ds_test", 1);
- RouteContext routeContext = standardRoutingEngine.route(createMixedShardingRule());
+ RouteContext routeContext = standardRoutingEngine.route(ShardingRoutingEngineFixtureBuilder.createMixedShardingRule());
List<RouteUnit> routeUnits = new ArrayList<>(routeContext.getRouteUnits());
assertThat(routeContext.getRouteUnits().size(), is(1));
assertThat(routeUnits.get(0).getDataSourceMapper().getActualName(), is("ds_1"));
@@ -137,7 +137,7 @@ class ShardingStandardRoutingEngineTest extends AbstractRoutingEngineTest {
new ShardingConditions(Collections.emptyList(), sqlStatementContext, mock(ShardingRule.class)), sqlStatementContext, new HintValueContext());
HintManager hintManager = HintManager.getInstance();
hintManager.addDatabaseShardingValue("t_hint_ds_test", 1);
- RouteContext routeContext = standardRoutingEngine.route(createMixedShardingRule());
+ RouteContext routeContext = standardRoutingEngine.route(ShardingRoutingEngineFixtureBuilder.createMixedShardingRule());
List<RouteUnit> routeUnits = new ArrayList<>(routeContext.getRouteUnits());
assertThat(routeContext.getRouteUnits().size(), is(2));
assertThat(routeUnits.get(0).getDataSourceMapper().getActualName(), is("ds_1"));
@@ -154,11 +154,11 @@ class ShardingStandardRoutingEngineTest extends AbstractRoutingEngineTest {
void assertRouteByMixedWithHintTable() {
SQLStatementContext sqlStatementContext = mock(SQLStatementContext.class, RETURNS_DEEP_STUBS);
when(sqlStatementContext.getTablesContext().getTableNames()).thenReturn(Collections.singletonList("t_hint_table_test"));
- ShardingStandardRoutingEngine standardRoutingEngine = createShardingStandardRoutingEngine("t_hint_table_test", createShardingConditions("t_hint_table_test"),
- sqlStatementContext, new HintValueContext());
+ ShardingStandardRoutingEngine standardRoutingEngine = createShardingStandardRoutingEngine("t_hint_table_test",
+ ShardingRoutingEngineFixtureBuilder.createShardingConditions("t_hint_table_test"), sqlStatementContext, new HintValueContext());
HintManager hintManager = HintManager.getInstance();
hintManager.addTableShardingValue("t_hint_table_test", 1);
- RouteContext routeContext = standardRoutingEngine.route(createMixedShardingRule());
+ RouteContext routeContext = standardRoutingEngine.route(ShardingRoutingEngineFixtureBuilder.createMixedShardingRule());
List<RouteUnit> routeUnits = new ArrayList<>(routeContext.getRouteUnits());
assertThat(routeContext.getRouteUnits().size(), is(1));
assertThat(routeUnits.get(0).getDataSourceMapper().getActualName(), is("ds_1"));
@@ -175,7 +175,7 @@ class ShardingStandardRoutingEngineTest extends AbstractRoutingEngineTest {
new ShardingConditions(Collections.emptyList(), sqlStatementContext, mock(ShardingRule.class)), sqlStatementContext, new HintValueContext());
HintManager hintManager = HintManager.getInstance();
hintManager.addTableShardingValue("t_hint_table_test", 1);
- RouteContext routeContext = standardRoutingEngine.route(createMixedShardingRule());
+ RouteContext routeContext = standardRoutingEngine.route(ShardingRoutingEngineFixtureBuilder.createMixedShardingRule());
List<RouteUnit> routeUnits = new ArrayList<>(routeContext.getRouteUnits());
assertThat(routeContext.getRouteUnits().size(), is(2));
assertThat(routeUnits.get(0).getDataSourceMapper().getActualName(), is("ds_0"));
@@ -193,8 +193,8 @@ class ShardingStandardRoutingEngineTest extends AbstractRoutingEngineTest {
SQLStatementContext sqlStatementContext = mock(SQLStatementContext.class, RETURNS_DEEP_STUBS);
when(sqlStatementContext.getTablesContext().getTableNames()).thenReturn(Collections.singletonList("t_interval_test"));
ShardingStandardRoutingEngine standardRoutingEngine = createShardingStandardRoutingEngine("t_interval_test",
- createIntervalShardingConditions("t_interval_test"), sqlStatementContext, new HintValueContext());
- RouteContext routeContext = standardRoutingEngine.route(createIntervalTableShardingRule());
+ ShardingRoutingEngineFixtureBuilder.createIntervalShardingConditions("t_interval_test"), sqlStatementContext, new HintValueContext());
+ RouteContext routeContext = standardRoutingEngine.route(ShardingRoutingEngineFixtureBuilder.createIntervalTableShardingRule());
List<RouteUnit> routeUnits = new ArrayList<>(routeContext.getRouteUnits());
assertThat(routeContext.getRouteUnits().size(), is(1));
assertThat(routeUnits.get(0).getDataSourceMapper().getActualName(), is("ds_0"));