This is an automated email from the ASF dual-hosted git repository.
chengzhang 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 b84117716aa Refactor ShardingSQLFederationDecider and
ShardingRuleChecker logic (#37752)
b84117716aa is described below
commit b84117716aa7b9246ca23c3512137268d1751dc1
Author: Zhengqiang Duan <[email protected]>
AuthorDate: Fri Jan 16 13:40:01 2026 +0800
Refactor ShardingSQLFederationDecider and ShardingRuleChecker logic (#37752)
---
.../decider/ShardingSQLFederationDecider.java | 80 ++++++++++++++
.../rule/BindingTableCheckedConfiguration.java | 3 +
.../sharding/rule/checker/ShardingRuleChecker.java | 41 ++++++-
.../fixture/ModHashShardingAlgorithmFixture.java | 62 +++++++++++
.../route/checker/ShardingRuleCheckerTest.java | 119 +++++++++++++++++++++
...e.shardingsphere.sharding.spi.ShardingAlgorithm | 1 +
.../checker/ShardingTableRuleStatementChecker.java | 4 +-
7 files changed, 303 insertions(+), 7 deletions(-)
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/decider/ShardingSQLFederationDecider.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/decider/ShardingSQLFederationDecider.java
index bdc21d68463..15bf243cb47 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/decider/ShardingSQLFederationDecider.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/decider/ShardingSQLFederationDecider.java
@@ -17,6 +17,8 @@
package org.apache.shardingsphere.sharding.decider;
+import com.cedarsoftware.util.CaseInsensitiveSet;
+import com.google.common.base.Joiner;
import org.apache.shardingsphere.infra.annotation.HighFrequencyInvocation;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
import
org.apache.shardingsphere.infra.binder.context.statement.type.dal.ExplainStatementContext;
@@ -26,15 +28,26 @@ import org.apache.shardingsphere.infra.datanode.DataNodes;
import
org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData;
+import
org.apache.shardingsphere.sharding.api.config.rule.ShardingTableReferenceRuleConfiguration;
+import
org.apache.shardingsphere.sharding.api.config.strategy.sharding.NoneShardingStrategyConfiguration;
import org.apache.shardingsphere.sharding.constant.ShardingOrder;
import
org.apache.shardingsphere.sharding.route.engine.condition.ShardingCondition;
import
org.apache.shardingsphere.sharding.route.engine.condition.ShardingConditions;
import
org.apache.shardingsphere.sharding.route.engine.condition.engine.ShardingConditionEngine;
+import
org.apache.shardingsphere.sharding.route.engine.condition.value.AlwaysFalseShardingConditionValue;
+import
org.apache.shardingsphere.sharding.route.engine.condition.value.ListShardingConditionValue;
+import
org.apache.shardingsphere.sharding.route.engine.condition.value.RangeShardingConditionValue;
+import
org.apache.shardingsphere.sharding.route.engine.condition.value.ShardingConditionValue;
+import
org.apache.shardingsphere.sharding.rule.BindingTableCheckedConfiguration;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
+import org.apache.shardingsphere.sharding.rule.ShardingTable;
+import org.apache.shardingsphere.sharding.rule.checker.ShardingRuleChecker;
import org.apache.shardingsphere.sqlfederation.spi.SQLFederationDecider;
import java.util.Collection;
+import java.util.Collections;
import java.util.List;
+import java.util.Optional;
/**
* Sharding SQL federation decider.
@@ -64,6 +77,9 @@ public final class ShardingSQLFederationDecider implements
SQLFederationDecider<
if (isAllShardingTables(selectStatementContext, tableNames) &&
isSubqueryAllSameShardingConditions(selectStatementContext, parameters,
globalRuleMetaData, database, rule)) {
return false;
}
+ if (isAllShardingTables(selectStatementContext, tableNames) &&
isJoinWithSameEqualityShardingCondition(selectStatementContext, parameters,
globalRuleMetaData, database, rule, tableNames)) {
+ return false;
+ }
if (selectStatementContext.isContainsSubquery() ||
selectStatementContext.isContainsHaving()
|| selectStatementContext.isContainsCombine() ||
selectStatementContext.isContainsPartialDistinctAggregation()) {
return true;
@@ -77,6 +93,70 @@ public final class ShardingSQLFederationDecider implements
SQLFederationDecider<
return tableNames.size() > 1 &&
!rule.isBindingTablesUseShardingColumnsJoin(selectStatementContext, tableNames);
}
+ private boolean isJoinWithSameEqualityShardingCondition(final
SelectStatementContext selectStatementContext, final List<Object> parameters,
final RuleMetaData globalRuleMetaData,
+ final
ShardingSphereDatabase database, final ShardingRule rule, final
Collection<String> tableNames) {
+ if (!selectStatementContext.isContainsJoinQuery()) {
+ return false;
+ }
+ // TODO consider supporting JOIN optimization when config database and
table sharding strategy @duanzhengqiang
+ if (isConfigDatabaseAndTableShardingStrategy(tableNames, rule)) {
+ return false;
+ }
+ ShardingConditions shardingConditions =
createShardingConditions(selectStatementContext, parameters,
globalRuleMetaData, database, rule);
+ shardingConditions.merge();
+ if (!shardingConditions.isSameShardingCondition()) {
+ return false;
+ }
+ if (!isAllEqualitySameShardingValues(shardingConditions, tableNames)) {
+ return false;
+ }
+ Collection<ShardingTableReferenceRuleConfiguration> bindingTableGroups
= Collections.singleton(new ShardingTableReferenceRuleConfiguration("",
Joiner.on(",").join(tableNames)));
+ BindingTableCheckedConfiguration configuration = new
BindingTableCheckedConfiguration(rule.getDataSourceNames(),
rule.getShardingAlgorithms(), rule.getConfiguration().getShardingAlgorithms(),
+ bindingTableGroups,
rule.getDefaultDatabaseShardingStrategyConfig(),
rule.getDefaultTableShardingStrategyConfig(), rule.getDefaultShardingColumn());
+ return new
ShardingRuleChecker(rule).isValidBindingTableConfiguration(rule.getShardingTables(),
configuration);
+ }
+
+ private boolean isConfigDatabaseAndTableShardingStrategy(final
Collection<String> tableNames, final ShardingRule rule) {
+ for (String each : tableNames) {
+ Optional<ShardingTable> shardingTable =
rule.findShardingTable(each);
+ if (!shardingTable.isPresent()) {
+ continue;
+ }
+ boolean isConfigDatabaseShardingStrategy =
!(rule.getDatabaseShardingStrategyConfiguration(shardingTable.get()) instanceof
NoneShardingStrategyConfiguration);
+ boolean isConfigTableShardingStrategy =
!(rule.getTableShardingStrategyConfiguration(shardingTable.get()) instanceof
NoneShardingStrategyConfiguration);
+ if (isConfigDatabaseShardingStrategy &&
isConfigTableShardingStrategy) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private boolean isAllEqualitySameShardingValues(final ShardingConditions
shardingConditions, final Collection<String> tableNames) {
+ Object sampleValue = null;
+ Collection<String> shardingTableNames = new
CaseInsensitiveSet<>(tableNames);
+ for (ShardingCondition each : shardingConditions.getConditions()) {
+ for (ShardingConditionValue value : each.getValues()) {
+ if (value instanceof RangeShardingConditionValue || value
instanceof AlwaysFalseShardingConditionValue) {
+ return false;
+ }
+ if (value instanceof ListShardingConditionValue) {
+ ListShardingConditionValue<?> values =
(ListShardingConditionValue<?>) value;
+ if (1 != values.getValues().size()) {
+ return false;
+ }
+ Object currentValue = values.getValues().iterator().next();
+ if (null == sampleValue) {
+ sampleValue = currentValue;
+ } else if (!sampleValue.equals(currentValue)) {
+ return false;
+ }
+ shardingTableNames.remove(value.getTableName());
+ }
+ }
+ }
+ return shardingTableNames.isEmpty();
+ }
+
private boolean isSubqueryAllSameShardingConditions(final
SelectStatementContext selectStatementContext, final List<Object> parameters,
final RuleMetaData globalRuleMetaData,
final
ShardingSphereDatabase database, final ShardingRule rule) {
if (!selectStatementContext.isContainsSubquery()) {
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/BindingTableCheckedConfiguration.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/BindingTableCheckedConfiguration.java
index 38a1b4346ff..0d5b3de02c7 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/BindingTableCheckedConfiguration.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/BindingTableCheckedConfiguration.java
@@ -19,6 +19,7 @@ package org.apache.shardingsphere.sharding.rule;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
+import
org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import
org.apache.shardingsphere.sharding.api.config.rule.ShardingTableReferenceRuleConfiguration;
import
org.apache.shardingsphere.sharding.api.config.strategy.sharding.ShardingStrategyConfiguration;
import org.apache.shardingsphere.sharding.spi.ShardingAlgorithm;
@@ -37,6 +38,8 @@ public final class BindingTableCheckedConfiguration {
private final Map<String, ShardingAlgorithm> shardingAlgorithms;
+ private final Map<String, AlgorithmConfiguration> algorithmConfigs;
+
private final Collection<ShardingTableReferenceRuleConfiguration>
bindingTableGroups;
private final ShardingStrategyConfiguration
defaultDatabaseShardingStrategyConfig;
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/checker/ShardingRuleChecker.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/checker/ShardingRuleChecker.java
index f7abb48888f..e40d6cd30bb 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/checker/ShardingRuleChecker.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/checker/ShardingRuleChecker.java
@@ -19,6 +19,7 @@ package org.apache.shardingsphere.sharding.rule.checker;
import com.google.common.base.Splitter;
import lombok.RequiredArgsConstructor;
+import
org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
@@ -70,9 +71,9 @@ public class ShardingRuleChecker {
private void checkBindingTableConfiguration(final
ShardingRuleConfiguration ruleConfig) {
checkBindingTablesNumericSuffix(ruleConfig.getBindingTableGroups(),
shardingRule.getShardingTables());
- BindingTableCheckedConfiguration checkedConfig = new
BindingTableCheckedConfiguration(shardingRule.getDataSourceNames(),
shardingRule.getShardingAlgorithms(),
- ruleConfig.getBindingTableGroups(),
shardingRule.getDefaultDatabaseShardingStrategyConfig(),
shardingRule.getDefaultTableShardingStrategyConfig(),
- shardingRule.getDefaultShardingColumn());
+ BindingTableCheckedConfiguration checkedConfig =
+ new
BindingTableCheckedConfiguration(shardingRule.getDataSourceNames(),
shardingRule.getShardingAlgorithms(), ruleConfig.getShardingAlgorithms(),
ruleConfig.getBindingTableGroups(),
+
shardingRule.getDefaultDatabaseShardingStrategyConfig(),
shardingRule.getDefaultTableShardingStrategyConfig(),
shardingRule.getDefaultShardingColumn());
ShardingSpherePreconditions.checkState(isValidBindingTableConfiguration(shardingRule.getShardingTables(),
checkedConfig),
() -> new InvalidBindingTablesException("Invalid binding table
configuration."));
}
@@ -105,7 +106,14 @@ public class ShardingRuleChecker {
return true;
}
- private boolean isValidBindingTableConfiguration(final Map<String,
ShardingTable> shardingTables, final BindingTableCheckedConfiguration
checkedConfig) {
+ /**
+ * Judge whether binding table configuration is valid.
+ *
+ * @param shardingTables sharding tables
+ * @param checkedConfig checked configuration
+ * @return is valid binding table configuration
+ */
+ public boolean isValidBindingTableConfiguration(final Map<String,
ShardingTable> shardingTables, final BindingTableCheckedConfiguration
checkedConfig) {
for (ShardingTableReferenceRuleConfiguration each :
checkedConfig.getBindingTableGroups()) {
Collection<String> bindingTables =
Splitter.on(",").trimResults().splitToList(each.getReference());
if (bindingTables.size() <= 1) {
@@ -151,7 +159,30 @@ public class ShardingRuleChecker {
private boolean isBindingShardingAlgorithm(final ShardingTable
sampleShardingTable, final ShardingTable shardingTable, final boolean
databaseAlgorithm,
final
BindingTableCheckedConfiguration checkedConfig) {
- return getAlgorithmExpression(sampleShardingTable, databaseAlgorithm,
checkedConfig).equals(getAlgorithmExpression(shardingTable, databaseAlgorithm,
checkedConfig));
+ Optional<String> algorithmExpression1 =
getAlgorithmExpression(sampleShardingTable, databaseAlgorithm, checkedConfig);
+ Optional<String> algorithmExpression2 =
getAlgorithmExpression(shardingTable, databaseAlgorithm, checkedConfig);
+ if (algorithmExpression1.isPresent() &&
algorithmExpression2.isPresent()) {
+ return algorithmExpression1.equals(algorithmExpression2);
+ }
+ AlgorithmConfiguration algorithmConfiguration1 =
getAlgorithmConfiguration(sampleShardingTable, databaseAlgorithm,
checkedConfig);
+ AlgorithmConfiguration algorithmConfiguration2 =
getAlgorithmConfiguration(shardingTable, databaseAlgorithm, checkedConfig);
+ if (null == algorithmConfiguration1 && null ==
algorithmConfiguration2) {
+ return true;
+ }
+ if (null == algorithmConfiguration1 || null ==
algorithmConfiguration2) {
+ return false;
+ }
+ return algorithmConfiguration1.equals(algorithmConfiguration2);
+ }
+
+ private AlgorithmConfiguration getAlgorithmConfiguration(final
ShardingTable shardingTable, final boolean databaseAlgorithm, final
BindingTableCheckedConfiguration checkedConfig) {
+ ShardingStrategyConfiguration shardingStrategyConfig =
databaseAlgorithm
+ ?
shardingRule.getDatabaseShardingStrategyConfiguration(shardingTable)
+ :
shardingRule.getTableShardingStrategyConfiguration(shardingTable);
+ if (null == shardingStrategyConfig) {
+ return null;
+ }
+ return
checkedConfig.getAlgorithmConfigs().get(shardingStrategyConfig.getShardingAlgorithmName());
}
private Optional<String> getAlgorithmExpression(final ShardingTable
shardingTable, final boolean databaseAlgorithm, final
BindingTableCheckedConfiguration checkedConfig) {
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/fixture/ModHashShardingAlgorithmFixture.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/fixture/ModHashShardingAlgorithmFixture.java
new file mode 100644
index 00000000000..aed4a83c1ec
--- /dev/null
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/fixture/ModHashShardingAlgorithmFixture.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.sharding.fixture;
+
+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.HashSet;
+import java.util.Properties;
+
+public final class ModHashShardingAlgorithmFixture implements
StandardShardingAlgorithm<Comparable<?>> {
+
+ private int shardingCount = 8;
+
+ @Override
+ public void init(final Properties props) {
+ shardingCount = Integer.parseInt(props.getProperty("sharding-count",
"8"));
+ }
+
+ @Override
+ public String doSharding(final Collection<String> availableTargetNames,
final PreciseShardingValue<Comparable<?>> shardingValue) {
+ int hashCode = shardingValue.getValue().toString().hashCode();
+ int index = Math.abs(hashCode) % shardingCount;
+ int i = 0;
+ for (String each : availableTargetNames) {
+ if (i == index) {
+ return each;
+ }
+ i++;
+ }
+ return null;
+ }
+
+ @Override
+ public Collection<String> doSharding(final Collection<String>
availableTargetNames, final RangeShardingValue<Comparable<?>> shardingValue) {
+ Collection<String> result = new HashSet<>(availableTargetNames.size(),
1F);
+ result.addAll(availableTargetNames);
+ return result;
+ }
+
+ @Override
+ public String getType() {
+ return "MOD.HASH.FIXTURE";
+ }
+}
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/checker/ShardingRuleCheckerTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/checker/ShardingRuleCheckerTest.java
new file mode 100644
index 00000000000..13bf500d399
--- /dev/null
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/checker/ShardingRuleCheckerTest.java
@@ -0,0 +1,119 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.sharding.route.checker;
+
+import
org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
+import org.apache.shardingsphere.infra.instance.ComputeNodeInstanceContext;
+import org.apache.shardingsphere.infra.util.props.PropertiesBuilder;
+import org.apache.shardingsphere.infra.util.props.PropertiesBuilder.Property;
+import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
+import
org.apache.shardingsphere.sharding.api.config.rule.ShardingTableReferenceRuleConfiguration;
+import
org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration;
+import
org.apache.shardingsphere.sharding.api.config.strategy.sharding.NoneShardingStrategyConfiguration;
+import
org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration;
+import
org.apache.shardingsphere.sharding.rule.BindingTableCheckedConfiguration;
+import org.apache.shardingsphere.sharding.rule.ShardingRule;
+import org.apache.shardingsphere.sharding.rule.checker.ShardingRuleChecker;
+import org.apache.shardingsphere.test.infra.fixture.jdbc.MockedDataSource;
+import org.junit.jupiter.api.Test;
+
+import javax.sql.DataSource;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+
+class ShardingRuleCheckerTest {
+
+ @Test
+ void assertIsValidBindingTableConfigurationWithInlineAlgorithm() {
+ ShardingRuleConfiguration shardingRuleConfig = new
ShardingRuleConfiguration();
+
shardingRuleConfig.getTables().add(createTableRuleConfigurationWithInlineAlgorithm("t_order",
"ds_${0..1}.t_order_${0..1}", "ds_inline", "t_order_inline"));
+
shardingRuleConfig.getTables().add(createTableRuleConfigurationWithInlineAlgorithm("t_order_item",
"ds_${0..1}.t_order_item_${0..1}", "ds_inline", "t_order_item_inline"));
+ shardingRuleConfig.getShardingAlgorithms().put("ds_inline",
+ new AlgorithmConfiguration("INLINE",
PropertiesBuilder.build(new Property("algorithm-expression", "ds_${user_id %
2}"))));
+ shardingRuleConfig.getShardingAlgorithms().put("t_order_inline",
+ new AlgorithmConfiguration("INLINE",
PropertiesBuilder.build(new Property("algorithm-expression",
"t_order_${order_id % 2}"))));
+ shardingRuleConfig.getShardingAlgorithms().put("t_order_item_inline",
+ new AlgorithmConfiguration("INLINE",
PropertiesBuilder.build(new Property("algorithm-expression",
"t_order_item_${order_id % 2}"))));
+ shardingRuleConfig.setDefaultDatabaseShardingStrategy(new
NoneShardingStrategyConfiguration());
+ shardingRuleConfig.setDefaultTableShardingStrategy(new
NoneShardingStrategyConfiguration());
+ ShardingRule shardingRule = new ShardingRule(shardingRuleConfig,
createDataSourcesForInline(), mock(ComputeNodeInstanceContext.class,
RETURNS_DEEP_STUBS), Collections.emptyList());
+ ShardingTableReferenceRuleConfiguration bindingTableGroup = new
ShardingTableReferenceRuleConfiguration("", "t_order,t_order_item");
+ BindingTableCheckedConfiguration checkedConfig = new
BindingTableCheckedConfiguration(
+ shardingRule.getDataSourceNames(),
shardingRule.getShardingAlgorithms(),
shardingRuleConfig.getShardingAlgorithms(),
Collections.singleton(bindingTableGroup),
+ shardingRuleConfig.getDefaultDatabaseShardingStrategy(),
shardingRuleConfig.getDefaultTableShardingStrategy(),
shardingRule.getDefaultShardingColumn());
+ ShardingRuleChecker checker = new ShardingRuleChecker(shardingRule);
+
assertTrue(checker.isValidBindingTableConfiguration(shardingRule.getShardingTables(),
checkedConfig));
+ }
+
+ @Test
+ void
assertIsValidBindingTableConfigurationWithSameDatabaseShardingStrategy() {
+ ShardingRuleConfiguration shardingRuleConfig = new
ShardingRuleConfiguration();
+
shardingRuleConfig.getTables().add(createTableRuleConfiguration("t_order",
"ds_${0..7}.t_order"));
+
shardingRuleConfig.getTables().add(createTableRuleConfiguration("t_order_item",
"ds_${0..7}.t_order_item"));
+
shardingRuleConfig.getTables().add(createTableRuleConfiguration("t_product",
"ds_${0..7}.t_product"));
+ shardingRuleConfig.getShardingAlgorithms().put("mod_hash",
+ new AlgorithmConfiguration("MOD.HASH.FIXTURE",
PropertiesBuilder.build(new Property("sharding-count", "8"))));
+ shardingRuleConfig.setDefaultDatabaseShardingStrategy(new
NoneShardingStrategyConfiguration());
+ shardingRuleConfig.setDefaultTableShardingStrategy(new
NoneShardingStrategyConfiguration());
+ ShardingRule shardingRule =
+ new ShardingRule(shardingRuleConfig, createDataSources(),
mock(ComputeNodeInstanceContext.class, RETURNS_DEEP_STUBS),
Collections.emptyList());
+ ShardingTableReferenceRuleConfiguration bindingTableGroup = new
ShardingTableReferenceRuleConfiguration("",
+ "t_order,t_order_item,t_product");
+ BindingTableCheckedConfiguration checkedConfig = new
BindingTableCheckedConfiguration(
+ shardingRule.getDataSourceNames(),
shardingRule.getShardingAlgorithms(),
shardingRuleConfig.getShardingAlgorithms(),
+ Collections.singleton(bindingTableGroup),
shardingRuleConfig.getDefaultDatabaseShardingStrategy(),
shardingRuleConfig.getDefaultTableShardingStrategy(),
+ shardingRule.getDefaultShardingColumn());
+ ShardingRuleChecker checker = new ShardingRuleChecker(shardingRule);
+
assertTrue(checker.isValidBindingTableConfiguration(shardingRule.getShardingTables(),
checkedConfig));
+ }
+
+ private ShardingTableRuleConfiguration
createTableRuleConfigurationWithInlineAlgorithm(final String tableName, final
String actualDataNodes,
+
final String databaseAlgorithmName, final String
tableAlgorithmName) {
+ ShardingTableRuleConfiguration result = new
ShardingTableRuleConfiguration(tableName, actualDataNodes);
+ result.setDatabaseShardingStrategy(new
StandardShardingStrategyConfiguration("user_id", databaseAlgorithmName));
+ result.setTableShardingStrategy(new
StandardShardingStrategyConfiguration("order_id", tableAlgorithmName));
+ return result;
+ }
+
+ private ShardingTableRuleConfiguration createTableRuleConfiguration(final
String tableName, final String actualDataNodes) {
+ ShardingTableRuleConfiguration result = new
ShardingTableRuleConfiguration(tableName, actualDataNodes);
+ result.setDatabaseShardingStrategy(new
StandardShardingStrategyConfiguration("route_group_id", "mod_hash"));
+ result.setTableShardingStrategy(new
NoneShardingStrategyConfiguration());
+ return result;
+ }
+
+ private Map<String, DataSource> createDataSources() {
+ Map<String, DataSource> result = new HashMap<>(8);
+ for (int i = 0; i < 8; i++) {
+ result.put("ds_" + i, new MockedDataSource());
+ }
+ return result;
+ }
+
+ private Map<String, DataSource> createDataSourcesForInline() {
+ Map<String, DataSource> result = new HashMap<>(2);
+ result.put("ds_0", new MockedDataSource());
+ result.put("ds_1", new MockedDataSource());
+ return result;
+ }
+}
diff --git
a/features/sharding/core/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.ShardingAlgorithm
b/features/sharding/core/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.ShardingAlgorithm
index fb7e2336ab6..c74293d63a0 100644
---
a/features/sharding/core/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.ShardingAlgorithm
+++
b/features/sharding/core/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.ShardingAlgorithm
@@ -18,3 +18,4 @@
org.apache.shardingsphere.sharding.fixture.CoreComplexKeysShardingAlgorithmFixture
org.apache.shardingsphere.sharding.fixture.CoreHintShardingAlgorithmFixture
org.apache.shardingsphere.sharding.fixture.CoreStandardShardingAlgorithmFixture
+org.apache.shardingsphere.sharding.fixture.ModHashShardingAlgorithmFixture
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java
index 7d10cce0a1b..63f60263c62 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java
@@ -173,8 +173,8 @@ public final class ShardingTableRuleStatementChecker {
ShardingStrategyConfiguration defaultTableShardingStrategyConfig =
null == checkedConfig.getDefaultTableShardingStrategy()
? new NoneShardingStrategyConfiguration()
: checkedConfig.getDefaultTableShardingStrategy();
- return isValidBindingTableConfiguration(shardingTables, new
BindingTableCheckedConfiguration(allDataSourceNames, shardingAlgorithms,
checkedConfig.getBindingTableGroups(),
- defaultDatabaseShardingStrategyConfig,
defaultTableShardingStrategyConfig, checkedConfig.getDefaultShardingColumn()));
+ return isValidBindingTableConfiguration(shardingTables, new
BindingTableCheckedConfiguration(allDataSourceNames, shardingAlgorithms,
checkedConfig.getShardingAlgorithms(),
+ checkedConfig.getBindingTableGroups(),
defaultDatabaseShardingStrategyConfig, defaultTableShardingStrategyConfig,
checkedConfig.getDefaultShardingColumn()));
}
private static Collection<String> getDataSourceNames(final
Collection<ShardingTableRuleConfiguration> tableRuleConfigs,
