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 d052faa2d8e Refactor DatabaseRuleDropExecutor (#29900)
d052faa2d8e is described below
commit d052faa2d8e7533b88526d9e183d5d49531ba7d4
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Jan 29 13:41:11 2024 +0800
Refactor DatabaseRuleDropExecutor (#29900)
* Refactor DatabaseRuleAlterExecutor
* Refactor DatabaseRuleDropExecutor
---
.../distsql/handler/update/DropBroadcastTableRuleExecutor.java | 2 +-
.../encrypt/distsql/handler/update/DropEncryptRuleExecutor.java | 2 +-
.../mask/distsql/handler/update/DropMaskRuleExecutor.java | 2 +-
.../handler/update/DropReadwriteSplittingRuleExecutor.java | 2 +-
.../handler/update/DropDefaultShadowAlgorithmExecutor.java | 2 +-
.../distsql/handler/update/DropShadowAlgorithmExecutor.java | 2 +-
.../shadow/distsql/handler/update/DropShadowRuleExecutor.java | 4 ++--
.../handler/update/DropDefaultShardingStrategyExecutor.java | 2 +-
.../distsql/handler/update/DropShardingAlgorithmExecutor.java | 2 +-
.../distsql/handler/update/DropShardingAuditorExecutor.java | 2 +-
.../distsql/handler/update/DropShardingKeyGeneratorExecutor.java | 2 +-
.../handler/update/DropShardingTableReferenceExecutor.java | 2 +-
.../distsql/handler/update/DropShardingTableRuleExecutor.java | 2 +-
.../rdl/rule/engine/database/type/DropDatabaseRuleOperator.java | 4 ++--
.../type/rdl/rule/spi/database/DatabaseRuleDropExecutor.java | 8 ++++----
15 files changed, 20 insertions(+), 20 deletions(-)
diff --git
a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/update/DropBroadcastTableRuleExecutor.java
b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/update/DropBroadcastTableRuleExecutor.java
index 8eca31ab3a1..dcc6f177322 100644
---
a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/update/DropBroadcastTableRuleExecutor.java
+++
b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/update/DropBroadcastTableRuleExecutor.java
@@ -69,7 +69,7 @@ public final class DropBroadcastTableRuleExecutor implements
DatabaseRuleDropExe
}
@Override
- public BroadcastRuleConfiguration buildToBeAlteredRuleConfiguration(final
BroadcastRuleConfiguration currentRuleConfig, final
DropBroadcastTableRuleStatement sqlStatement) {
+ public BroadcastRuleConfiguration buildToBeAlteredRuleConfiguration(final
DropBroadcastTableRuleStatement sqlStatement, final BroadcastRuleConfiguration
currentRuleConfig) {
BroadcastRuleConfiguration result = new BroadcastRuleConfiguration(new
HashSet<>(currentRuleConfig.getTables()));
result.getTables().removeIf(each ->
containsIgnoreCase(sqlStatement.getTables(), each));
return result;
diff --git
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutor.java
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutor.java
index 8becbedffad..024d899915b 100644
---
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutor.java
+++
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutor.java
@@ -66,7 +66,7 @@ public final class DropEncryptRuleExecutor implements
DatabaseRuleDropExecutor<D
}
@Override
- public EncryptRuleConfiguration buildToBeDroppedRuleConfiguration(final
EncryptRuleConfiguration currentRuleConfig, final DropEncryptRuleStatement
sqlStatement) {
+ public EncryptRuleConfiguration buildToBeDroppedRuleConfiguration(final
DropEncryptRuleStatement sqlStatement, final EncryptRuleConfiguration
currentRuleConfig) {
Collection<EncryptTableRuleConfiguration> toBeDroppedTables = new
LinkedList<>();
Map<String, AlgorithmConfiguration> toBeDroppedEncryptors = new
HashMap<>();
for (String each : sqlStatement.getTables()) {
diff --git
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleExecutor.java
b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleExecutor.java
index eca3aadefb4..0358af84f04 100644
---
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleExecutor.java
+++
b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleExecutor.java
@@ -66,7 +66,7 @@ public final class DropMaskRuleExecutor implements
DatabaseRuleDropExecutor<Drop
}
@Override
- public MaskRuleConfiguration buildToBeDroppedRuleConfiguration(final
MaskRuleConfiguration currentRuleConfig, final DropMaskRuleStatement
sqlStatement) {
+ public MaskRuleConfiguration buildToBeDroppedRuleConfiguration(final
DropMaskRuleStatement sqlStatement, final MaskRuleConfiguration
currentRuleConfig) {
Collection<MaskTableRuleConfiguration> toBeDroppedTables = new
LinkedList<>();
Map<String, AlgorithmConfiguration> toBeDroppedAlgorithms = new
LinkedHashMap<>();
for (String each : sqlStatement.getTables()) {
diff --git
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleExecutor.java
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleExecutor.java
index bfd4160e507..1c09590a32e 100644
---
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleExecutor.java
+++
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleExecutor.java
@@ -98,7 +98,7 @@ public final class DropReadwriteSplittingRuleExecutor
implements DatabaseRuleDro
}
@Override
- public ReadwriteSplittingRuleConfiguration
buildToBeDroppedRuleConfiguration(final ReadwriteSplittingRuleConfiguration
currentRuleConfig, final DropReadwriteSplittingRuleStatement sqlStatement) {
+ public ReadwriteSplittingRuleConfiguration
buildToBeDroppedRuleConfiguration(final DropReadwriteSplittingRuleStatement
sqlStatement, final ReadwriteSplittingRuleConfiguration currentRuleConfig) {
Collection<ReadwriteSplittingDataSourceRuleConfiguration>
toBeDroppedDataSources = new LinkedList<>();
Map<String, AlgorithmConfiguration> toBeDroppedLoadBalancers = new
HashMap<>();
for (String each : sqlStatement.getNames()) {
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropDefaultShadowAlgorithmExecutor.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropDefaultShadowAlgorithmExecutor.java
index 2ed3a668af1..768478172c5 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropDefaultShadowAlgorithmExecutor.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropDefaultShadowAlgorithmExecutor.java
@@ -58,7 +58,7 @@ public final class DropDefaultShadowAlgorithmExecutor
implements DatabaseRuleDro
}
@Override
- public ShadowRuleConfiguration buildToBeDroppedRuleConfiguration(final
ShadowRuleConfiguration currentRuleConfig, final
DropDefaultShadowAlgorithmStatement sqlStatement) {
+ public ShadowRuleConfiguration buildToBeDroppedRuleConfiguration(final
DropDefaultShadowAlgorithmStatement sqlStatement, final ShadowRuleConfiguration
currentRuleConfig) {
ShadowRuleConfiguration result = new ShadowRuleConfiguration();
result.setShadowAlgorithms(Collections.singletonMap(currentRuleConfig.getDefaultShadowAlgorithmName(),
currentRuleConfig.getShadowAlgorithms().get(currentRuleConfig.getDefaultShadowAlgorithmName())));
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmExecutor.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmExecutor.java
index 0625fa7be77..11bc70b89fd 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmExecutor.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmExecutor.java
@@ -83,7 +83,7 @@ public final class DropShadowAlgorithmExecutor implements
DatabaseRuleDropExecut
}
@Override
- public ShadowRuleConfiguration buildToBeDroppedRuleConfiguration(final
ShadowRuleConfiguration currentRuleConfig, final DropShadowAlgorithmStatement
sqlStatement) {
+ public ShadowRuleConfiguration buildToBeDroppedRuleConfiguration(final
DropShadowAlgorithmStatement sqlStatement, final ShadowRuleConfiguration
currentRuleConfig) {
ShadowRuleConfiguration result = new ShadowRuleConfiguration();
for (String each : sqlStatement.getNames()) {
result.getShadowAlgorithms().put(each,
currentRuleConfig.getShadowAlgorithms().get(each));
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleExecutor.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleExecutor.java
index f508ba1837a..1fe73bedcdd 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleExecutor.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleExecutor.java
@@ -75,7 +75,7 @@ public final class DropShadowRuleExecutor implements
DatabaseRuleDropExecutor<Dr
}
@Override
- public ShadowRuleConfiguration buildToBeDroppedRuleConfiguration(final
ShadowRuleConfiguration currentRuleConfig, final DropShadowRuleStatement
sqlStatement) {
+ public ShadowRuleConfiguration buildToBeDroppedRuleConfiguration(final
DropShadowRuleStatement sqlStatement, final ShadowRuleConfiguration
currentRuleConfig) {
ShadowRuleConfiguration result = new ShadowRuleConfiguration();
for (String each : sqlStatement.getNames()) {
result.getDataSources().add(new
ShadowDataSourceConfiguration(each, null, null));
@@ -93,7 +93,7 @@ public final class DropShadowRuleExecutor implements
DatabaseRuleDropExecutor<Dr
}
@Override
- public ShadowRuleConfiguration buildToBeAlteredRuleConfiguration(final
ShadowRuleConfiguration currentRuleConfig, final DropShadowRuleStatement
sqlStatement) {
+ public ShadowRuleConfiguration buildToBeAlteredRuleConfiguration(final
DropShadowRuleStatement sqlStatement, final ShadowRuleConfiguration
currentRuleConfig) {
Map<String, ShadowTableConfiguration> tables = new LinkedHashMap<>();
Collection<String> toBeDroppedDataSourceNames =
sqlStatement.getNames();
for (Entry<String, ShadowTableConfiguration> each :
currentRuleConfig.getTables().entrySet()) {
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultShardingStrategyExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultShardingStrategyExecutor.java
index 3cc14be1bd5..39f51fd3a9a 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultShardingStrategyExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultShardingStrategyExecutor.java
@@ -75,7 +75,7 @@ public final class DropDefaultShardingStrategyExecutor
implements DatabaseRuleDr
}
@Override
- public ShardingRuleConfiguration buildToBeDroppedRuleConfiguration(final
ShardingRuleConfiguration currentRuleConfig, final
DropDefaultShardingStrategyStatement sqlStatement) {
+ public ShardingRuleConfiguration buildToBeDroppedRuleConfiguration(final
DropDefaultShardingStrategyStatement sqlStatement, final
ShardingRuleConfiguration currentRuleConfig) {
ShardingRuleConfiguration result = new ShardingRuleConfiguration();
if
(sqlStatement.getDefaultType().equalsIgnoreCase(ShardingStrategyLevelType.TABLE.name()))
{
result.setDefaultTableShardingStrategy(currentRuleConfig.getDefaultTableShardingStrategy());
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmExecutor.java
index 90afda28f08..05fc9fc40ee 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmExecutor.java
@@ -97,7 +97,7 @@ public final class DropShardingAlgorithmExecutor implements
DatabaseRuleDropExec
}
@Override
- public ShardingRuleConfiguration buildToBeDroppedRuleConfiguration(final
ShardingRuleConfiguration currentRuleConfig, final
DropShardingAlgorithmStatement sqlStatement) {
+ public ShardingRuleConfiguration buildToBeDroppedRuleConfiguration(final
DropShardingAlgorithmStatement sqlStatement, final ShardingRuleConfiguration
currentRuleConfig) {
ShardingRuleConfiguration result = new ShardingRuleConfiguration();
for (String each : sqlStatement.getNames()) {
result.getShardingAlgorithms().put(each,
currentRuleConfig.getShardingAlgorithms().get(each));
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAuditorExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAuditorExecutor.java
index ad4c9204187..958c9f61e60 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAuditorExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAuditorExecutor.java
@@ -76,7 +76,7 @@ public final class DropShardingAuditorExecutor implements
DatabaseRuleDropExecut
}
@Override
- public ShardingRuleConfiguration buildToBeDroppedRuleConfiguration(final
ShardingRuleConfiguration currentRuleConfig, final DropShardingAuditorStatement
sqlStatement) {
+ public ShardingRuleConfiguration buildToBeDroppedRuleConfiguration(final
DropShardingAuditorStatement sqlStatement, final ShardingRuleConfiguration
currentRuleConfig) {
ShardingRuleConfiguration result = new ShardingRuleConfiguration();
for (String each : sqlStatement.getNames()) {
result.getAuditors().put(each,
currentRuleConfig.getAuditors().get(each));
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorExecutor.java
index 4cfbedd013a..ad232fc837f 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorExecutor.java
@@ -77,7 +77,7 @@ public final class DropShardingKeyGeneratorExecutor
implements DatabaseRuleDropE
}
@Override
- public ShardingRuleConfiguration buildToBeDroppedRuleConfiguration(final
ShardingRuleConfiguration currentRuleConfig, final
DropShardingKeyGeneratorStatement sqlStatement) {
+ public ShardingRuleConfiguration buildToBeDroppedRuleConfiguration(final
DropShardingKeyGeneratorStatement sqlStatement, final ShardingRuleConfiguration
currentRuleConfig) {
ShardingRuleConfiguration result = new ShardingRuleConfiguration();
for (String each : sqlStatement.getNames()) {
result.getKeyGenerators().put(each,
currentRuleConfig.getKeyGenerators().get(each));
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableReferenceExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableReferenceExecutor.java
index fb7fa4cf153..5e6d17fbed3 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableReferenceExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableReferenceExecutor.java
@@ -69,7 +69,7 @@ public final class DropShardingTableReferenceExecutor
implements DatabaseRuleDro
}
@Override
- public ShardingRuleConfiguration buildToBeDroppedRuleConfiguration(final
ShardingRuleConfiguration currentRuleConfig, final
DropShardingTableReferenceRuleStatement sqlStatement) {
+ public ShardingRuleConfiguration buildToBeDroppedRuleConfiguration(final
DropShardingTableReferenceRuleStatement sqlStatement, final
ShardingRuleConfiguration currentRuleConfig) {
ShardingRuleConfiguration result = new ShardingRuleConfiguration();
for (String each : sqlStatement.getNames()) {
result.getBindingTableGroups().add(new
ShardingTableReferenceRuleConfiguration(each, ""));
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleExecutor.java
index fa23e557a68..a10d2d33771 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleExecutor.java
@@ -109,7 +109,7 @@ public final class DropShardingTableRuleExecutor implements
DatabaseRuleDropExec
}
@Override
- public ShardingRuleConfiguration buildToBeDroppedRuleConfiguration(final
ShardingRuleConfiguration currentRuleConfig, final
DropShardingTableRuleStatement sqlStatement) {
+ public ShardingRuleConfiguration buildToBeDroppedRuleConfiguration(final
DropShardingTableRuleStatement sqlStatement, final ShardingRuleConfiguration
currentRuleConfig) {
ShardingRuleConfiguration result = new ShardingRuleConfiguration();
Collection<String> toBeDroppedShardingTableNames =
getToBeDroppedShardingTableNames(sqlStatement);
for (String each : toBeDroppedShardingTableNames) {
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/rule/engine/database/type/DropDatabaseRuleOperator.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/rule/engine/database/type/DropDatabaseRuleOperator.java
index d7c41bf6148..ccf417e81a9 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/rule/engine/database/type/DropDatabaseRuleOperator.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/rule/engine/database/type/DropDatabaseRuleOperator.java
@@ -52,7 +52,7 @@ public final class DropDatabaseRuleOperator implements
DatabaseRuleOperator {
return Collections.emptyList();
}
ModeContextManager modeContextManager =
contextManager.getInstanceContext().getModeContextManager();
- RuleConfiguration toBeDroppedRuleConfig =
executor.buildToBeDroppedRuleConfiguration(currentRuleConfig, sqlStatement);
+ RuleConfiguration toBeDroppedRuleConfig =
executor.buildToBeDroppedRuleConfiguration(sqlStatement, currentRuleConfig);
// TODO remove updateCurrentRuleConfiguration after update refactor
completed.
if (executor.updateCurrentRuleConfiguration(sqlStatement,
currentRuleConfig) && ((DatabaseRuleConfiguration)
currentRuleConfig).isEmpty()) {
modeContextManager.removeRuleConfigurationItem(database.getName(),
toBeDroppedRuleConfig);
@@ -66,7 +66,7 @@ public final class DropDatabaseRuleOperator implements
DatabaseRuleOperator {
// TODO refactor to new metadata refresh way
}
modeContextManager.removeRuleConfigurationItem(database.getName(),
toBeDroppedRuleConfig);
- RuleConfiguration toBeAlteredRuleConfig =
executor.buildToBeAlteredRuleConfiguration(currentRuleConfig, sqlStatement);
+ RuleConfiguration toBeAlteredRuleConfig =
executor.buildToBeAlteredRuleConfiguration(sqlStatement, currentRuleConfig);
return modeContextManager.alterRuleConfiguration(database.getName(),
toBeAlteredRuleConfig);
}
}
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/rule/spi/database/DatabaseRuleDropExecutor.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/rule/spi/database/DatabaseRuleDropExecutor.java
index 7c700578ad2..aa8263edf1f 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/rule/spi/database/DatabaseRuleDropExecutor.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/rule/spi/database/DatabaseRuleDropExecutor.java
@@ -36,22 +36,22 @@ public interface DatabaseRuleDropExecutor<T extends
SQLStatement, R extends Rule
* TODO Remove temporary default implementation
* Build to be dropped rule configuration.
*
- * @param currentRuleConfig current rule configuration to be updated
* @param sqlStatement SQL statement
+ * @param currentRuleConfig current rule configuration to be updated
* @return to be dropped rule configuration
*/
- default R buildToBeDroppedRuleConfiguration(final R currentRuleConfig,
final T sqlStatement) {
+ default R buildToBeDroppedRuleConfiguration(final T sqlStatement, final R
currentRuleConfig) {
return null;
}
/**
* Build to be altered rule configuration.
*
- * @param currentRuleConfig current rule configuration to be updated
* @param sqlStatement SQL statement
+ * @param currentRuleConfig current rule configuration to be updated
* @return to be altered rule configuration
*/
- default R buildToBeAlteredRuleConfiguration(final R currentRuleConfig,
final T sqlStatement) {
+ default R buildToBeAlteredRuleConfiguration(final T sqlStatement, final R
currentRuleConfig) {
return null;
}
