This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 753c55bbea1 Remove unused check (#23281)
753c55bbea1 is described below
commit 753c55bbea1de03518c5c71184e552044a9ad04d
Author: Chen Jiahao <[email protected]>
AuthorDate: Tue Jan 3 13:32:28 2023 +0800
Remove unused check (#23281)
* Remove unused check
* Remove unused check
---
.../handler/update/AlterDatabaseDiscoveryRuleStatementUpdater.java | 6 ++----
.../handler/update/CreateDatabaseDiscoveryRuleStatementUpdater.java | 6 ++----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git
a/features/db-discovery/distsql/handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryRuleStatementUpdater.java
b/features/db-discovery/distsql/handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryRuleStatementUpdater.java
index d748d39ef31..777ea1d6422 100644
---
a/features/db-discovery/distsql/handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryRuleStatementUpdater.java
+++
b/features/db-discovery/distsql/handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryRuleStatementUpdater.java
@@ -26,7 +26,6 @@ import
org.apache.shardingsphere.dbdiscovery.distsql.parser.segment.DatabaseDisc
import
org.apache.shardingsphere.dbdiscovery.distsql.parser.statement.AlterDatabaseDiscoveryRuleStatement;
import
org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm;
import
org.apache.shardingsphere.distsql.handler.exception.algorithm.InvalidAlgorithmConfigurationException;
-import
org.apache.shardingsphere.distsql.handler.exception.algorithm.MissingRequiredAlgorithmException;
import
org.apache.shardingsphere.distsql.handler.exception.rule.MissingRequiredRuleException;
import
org.apache.shardingsphere.distsql.handler.exception.storageunit.MissingRequiredStorageUnitsException;
import
org.apache.shardingsphere.distsql.handler.update.RuleDefinitionAlterUpdater;
@@ -56,7 +55,7 @@ public final class AlterDatabaseDiscoveryRuleStatementUpdater
implements RuleDef
checkCurrentRuleConfiguration(databaseName, currentRuleConfig);
checkToBeAlteredRules(databaseName, sqlStatement, currentRuleConfig);
checkToBeAlteredResources(databaseName, sqlStatement,
database.getResourceMetaData());
- checkDiscoverTypeAndHeartbeat(sqlStatement, currentRuleConfig);
+ checkDiscoverTypeAndHeartbeat(sqlStatement);
}
private void checkCurrentRuleConfiguration(final String databaseName,
final DatabaseDiscoveryRuleConfiguration currentRuleConfig) {
@@ -85,13 +84,12 @@ public final class
AlterDatabaseDiscoveryRuleStatementUpdater implements RuleDef
return result;
}
- private void checkDiscoverTypeAndHeartbeat(final
AlterDatabaseDiscoveryRuleStatement sqlStatement, final
DatabaseDiscoveryRuleConfiguration currentRuleConfig) {
+ private void checkDiscoverTypeAndHeartbeat(final
AlterDatabaseDiscoveryRuleStatement sqlStatement) {
Map<String, List<AbstractDatabaseDiscoverySegment>> segmentMap =
sqlStatement.getRules().stream().collect(Collectors.groupingBy(each ->
each.getClass().getSimpleName()));
Collection<String> invalidInput =
segmentMap.getOrDefault(DatabaseDiscoveryDefinitionSegment.class.getSimpleName(),
Collections.emptyList()).stream()
.map(each -> ((DatabaseDiscoveryDefinitionSegment)
each).getDiscoveryType().getName()).distinct()
.filter(each ->
!TypedSPIRegistry.findRegisteredService(DatabaseDiscoveryProviderAlgorithm.class,
each).isPresent()).collect(Collectors.toList());
ShardingSpherePreconditions.checkState(invalidInput.isEmpty(), () ->
new InvalidAlgorithmConfigurationException("database discovery", invalidInput));
- ShardingSpherePreconditions.checkState(invalidInput.isEmpty(), () ->
new MissingRequiredAlgorithmException("database discovery", invalidInput));
}
@Override
diff --git
a/features/db-discovery/distsql/handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryRuleStatementUpdater.java
b/features/db-discovery/distsql/handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryRuleStatementUpdater.java
index 1f79d5e006c..cff4776dc82 100644
---
a/features/db-discovery/distsql/handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryRuleStatementUpdater.java
+++
b/features/db-discovery/distsql/handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryRuleStatementUpdater.java
@@ -25,7 +25,6 @@ import
org.apache.shardingsphere.dbdiscovery.distsql.parser.segment.DatabaseDisc
import
org.apache.shardingsphere.dbdiscovery.distsql.parser.statement.CreateDatabaseDiscoveryRuleStatement;
import
org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm;
import
org.apache.shardingsphere.distsql.handler.exception.algorithm.InvalidAlgorithmConfigurationException;
-import
org.apache.shardingsphere.distsql.handler.exception.algorithm.MissingRequiredAlgorithmException;
import
org.apache.shardingsphere.distsql.handler.exception.rule.DuplicateRuleException;
import
org.apache.shardingsphere.distsql.handler.exception.storageunit.MissingRequiredStorageUnitsException;
import
org.apache.shardingsphere.distsql.handler.update.RuleDefinitionCreateUpdater;
@@ -60,7 +59,7 @@ public final class
CreateDatabaseDiscoveryRuleStatementUpdater implements RuleDe
checkDuplicateRuleNames(databaseName, sqlStatement,
currentRuleConfig);
}
checkResources(databaseName, sqlStatement,
database.getResourceMetaData());
- checkDiscoverTypeAndHeartbeat(databaseName, sqlStatement,
currentRuleConfig);
+ checkDiscoverTypeAndHeartbeat(sqlStatement);
}
private void checkDuplicateRuleNames(final String databaseName, final
CreateDatabaseDiscoveryRuleStatement sqlStatement, final
DatabaseDiscoveryRuleConfiguration currentRuleConfig) {
@@ -85,13 +84,12 @@ public final class
CreateDatabaseDiscoveryRuleStatementUpdater implements RuleDe
ShardingSpherePreconditions.checkState(notExistResources.isEmpty(), ()
-> new MissingRequiredStorageUnitsException(databaseName, notExistResources));
}
- private void checkDiscoverTypeAndHeartbeat(final String databaseName,
final CreateDatabaseDiscoveryRuleStatement sqlStatement, final
DatabaseDiscoveryRuleConfiguration currentRuleConfig) {
+ private void checkDiscoverTypeAndHeartbeat(final
CreateDatabaseDiscoveryRuleStatement sqlStatement) {
Map<String, List<AbstractDatabaseDiscoverySegment>> segmentMap =
sqlStatement.getRules().stream().collect(Collectors.groupingBy(each ->
each.getClass().getSimpleName()));
Collection<String> invalidInput =
segmentMap.getOrDefault(DatabaseDiscoveryDefinitionSegment.class.getSimpleName(),
Collections.emptyList()).stream()
.map(each -> ((DatabaseDiscoveryDefinitionSegment)
each).getDiscoveryType().getName()).distinct()
.filter(each ->
!TypedSPIRegistry.findRegisteredService(DatabaseDiscoveryProviderAlgorithm.class,
each).isPresent()).collect(Collectors.toList());
ShardingSpherePreconditions.checkState(invalidInput.isEmpty(), () ->
new InvalidAlgorithmConfigurationException(RULE_TYPE.toLowerCase(),
invalidInput));
- ShardingSpherePreconditions.checkState(invalidInput.isEmpty(), () ->
new MissingRequiredAlgorithmException(RULE_TYPE, databaseName, invalidInput));
}
@Override
