sunkai-cai commented on code in PR #20777:
URL: https://github.com/apache/shardingsphere/pull/20777#discussion_r976636220
##########
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java:
##########
@@ -273,29 +273,50 @@ private static void checkTableRule(final String
databaseName, final ShardingRule
Optional<ShardingStrategySegment> anyTableRule =
tableRules.stream().map(each ->
Arrays.asList(each.getDatabaseStrategySegment(),
each.getTableStrategySegment()))
.flatMap(Collection::stream).filter(Objects::nonNull).findAny();
if (anyTableRule.isPresent()) {
- checkStrategy(databaseName, currentRuleConfig, tableRules);
+ checkStrategy(databaseName, tableRules);
+ checkAlgorithm(databaseName, currentRuleConfig, tableRules);
}
}
- private static void checkStrategy(final String databaseName, final
ShardingRuleConfiguration currentRuleConfig, final Collection<TableRuleSegment>
rules) throws DistSQLException {
- Collection<String> currentAlgorithms = null == currentRuleConfig ?
Collections.emptySet() : currentRuleConfig.getShardingAlgorithms().keySet();
+ private static void checkStrategy(final String databaseName, final
Collection<TableRuleSegment> rules) throws DistSQLException {
Collection<String> invalidAlgorithms = rules.stream().map(each ->
Arrays.asList(each.getDatabaseStrategySegment(),
each.getTableStrategySegment()))
-
.flatMap(Collection::stream).filter(Objects::nonNull).filter(each ->
isInvalidStrategy(currentAlgorithms, each))
+
.flatMap(Collection::stream).filter(Objects::nonNull).filter(ShardingTableRuleStatementChecker::isInvalidStrategy)
.map(ShardingStrategySegment::getShardingAlgorithmName).collect(Collectors.toList());
DistSQLException.predictionThrow(invalidAlgorithms.isEmpty(), () ->
new InvalidAlgorithmConfigurationException(databaseName, invalidAlgorithms));
}
- private static boolean isInvalidStrategy(final Collection<String>
currentAlgorithms, final ShardingStrategySegment shardingStrategySegment) {
+ private static boolean isInvalidStrategy(final ShardingStrategySegment
shardingStrategySegment) {
return !ShardingStrategyType.contain(shardingStrategySegment.getType())
- ||
!ShardingStrategyType.getValueOf(shardingStrategySegment.getType()).isValid(shardingStrategySegment.getShardingColumn())
- || !isAlgorithmExists(currentAlgorithms,
shardingStrategySegment);
+ ||
!ShardingStrategyType.getValueOf(shardingStrategySegment.getType()).isValid(shardingStrategySegment.getShardingColumn());
}
- private static boolean isAlgorithmExists(final Collection<String>
currentAlgorithms, final ShardingStrategySegment shardingStrategySegment) {
- if (null == shardingStrategySegment.getShardingAlgorithmName() && null
!= shardingStrategySegment.getAlgorithmSegment()) {
- return true;
+ private static void checkAlgorithm(final String databaseName, final
ShardingRuleConfiguration currentRuleConfig, final Collection<TableRuleSegment>
rules) throws DistSQLException {
+ Map<String, AlgorithmConfiguration> currentAlgorithms =
Optional.ofNullable(currentRuleConfig).map(ShardingRuleConfiguration::getShardingAlgorithms).orElse(Collections.emptyMap());
+ Collection<String> invalidAlgorithms = rules.stream().map(each ->
Arrays.asList(each.getDatabaseStrategySegment(),
each.getTableStrategySegment())).flatMap(Collection::stream)
+ .filter(Objects::nonNull).map(each ->
getInvalidAlgorithmName(currentAlgorithms,
each)).filter(Objects::nonNull).collect(Collectors.toList());
+ DistSQLException.predictionThrow(invalidAlgorithms.isEmpty(), () ->
new InvalidAlgorithmConfigurationException(databaseName, invalidAlgorithms));
+ }
+
+ private static String getInvalidAlgorithmName(final Map<String,
AlgorithmConfiguration> currentAlgorithms, final ShardingStrategySegment
shardingStrategySegment) {
+ ShardingAlgorithm shardingAlgorithm;
+ String shardingAlgorithmName;
+ if (null == shardingStrategySegment.getShardingAlgorithmName() && null
== shardingStrategySegment.getAlgorithmSegment()) {
+ return "ShardingAlgorithm is not fount";
Review Comment:
I change `getInvalidAlgorithmName` to `getInvalidAlgorithmError`, And make
it retrun ErrorMessage.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
