You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2023/06/28 12:31:46 UTC
[shardingsphere] branch master updated: Fix sonar issue on NewRuleDefinitionBackendHandler (#26669)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 a8652ca5254 Fix sonar issue on NewRuleDefinitionBackendHandler (#26669)
a8652ca5254 is described below
commit a8652ca5254a5cc4d02a8d1f3c4f0ac682bbdf86
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Wed Jun 28 20:31:39 2023 +0800
Fix sonar issue on NewRuleDefinitionBackendHandler (#26669)
---
.../distsql/rdl/rule/NewRuleDefinitionBackendHandler.java | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/NewRuleDefinitionBackendHandler.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/NewRuleDefinitionBackendHandler.java
index eef8476ccfb..f7adaa5ac5c 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/NewRuleDefinitionBackendHandler.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/NewRuleDefinitionBackendHandler.java
@@ -85,19 +85,20 @@ public final class NewRuleDefinitionBackendHandler<T extends RuleDefinitionState
final T sqlStatement, final RuleDefinitionUpdater updater, final RuleConfiguration currentRuleConfig) {
if (updater instanceof RuleDefinitionCreateUpdater) {
return processCreate(database, sqlStatement, (RuleDefinitionCreateUpdater) updater, currentRuleConfig);
- } else if (updater instanceof RuleDefinitionAlterUpdater) {
+ }
+ if (updater instanceof RuleDefinitionAlterUpdater) {
return processAlter(database, sqlStatement, (RuleDefinitionAlterUpdater) updater, currentRuleConfig);
- } else if (updater instanceof RuleDefinitionDropUpdater) {
+ }
+ if (updater instanceof RuleDefinitionDropUpdater) {
return processDrop(database, sqlStatement, (RuleDefinitionDropUpdater) updater, currentRuleConfig);
- } else {
- throw new UnsupportedSQLOperationException(String.format("Cannot support RDL updater type `%s`", updater.getClass().getName()));
}
+ throw new UnsupportedSQLOperationException(String.format("Cannot support RDL updater type `%s`", updater.getClass().getName()));
}
@SuppressWarnings({"rawtypes", "unchecked"})
private Collection<MetaDataVersion> processCreate(final ShardingSphereDatabase database, final T sqlStatement, final RuleDefinitionCreateUpdater updater,
final RuleConfiguration currentRuleConfig) {
- final RuleConfiguration toBeCreatedRuleConfig = updater.buildToBeCreatedRuleConfiguration(currentRuleConfig, sqlStatement);
+ RuleConfiguration toBeCreatedRuleConfig = updater.buildToBeCreatedRuleConfiguration(currentRuleConfig, sqlStatement);
if (null != currentRuleConfig) {
updater.updateCurrentRuleConfiguration(currentRuleConfig, toBeCreatedRuleConfig);
}
@@ -110,12 +111,12 @@ public final class NewRuleDefinitionBackendHandler<T extends RuleDefinitionState
@SuppressWarnings({"rawtypes", "unchecked"})
private Collection<MetaDataVersion> processAlter(final ShardingSphereDatabase database, final T sqlStatement, final RuleDefinitionAlterUpdater updater, final RuleConfiguration currentRuleConfig) {
- final RuleConfiguration toBeAlteredRuleConfig = updater.buildToBeAlteredRuleConfiguration(sqlStatement);
- final RuleConfiguration toBeDroppedRuleConfig = updater.buildToBeDroppedRuleConfiguration(currentRuleConfig, toBeAlteredRuleConfig);
+ RuleConfiguration toBeAlteredRuleConfig = updater.buildToBeAlteredRuleConfiguration(sqlStatement);
updater.updateCurrentRuleConfiguration(currentRuleConfig, toBeAlteredRuleConfig);
if (sqlStatement instanceof UnloadSingleTableStatement) {
return ProxyContext.getInstance().getContextManager().getInstanceContext().getModeContextManager().alterRuleConfiguration(database.getName(), currentRuleConfig);
}
+ RuleConfiguration toBeDroppedRuleConfig = updater.buildToBeDroppedRuleConfiguration(currentRuleConfig, toBeAlteredRuleConfig);
ProxyContext.getInstance().getContextManager().getInstanceContext().getModeContextManager().removeRuleConfiguration(database.getName(), toBeDroppedRuleConfig);
return ProxyContext.getInstance().getContextManager().getInstanceContext().getModeContextManager().alterRuleConfiguration(database.getName(), toBeAlteredRuleConfig);
}