This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 dd33ac486d0 Refactor DatabaseRuleAlterExecutor (#29899)
dd33ac486d0 is described below
commit dd33ac486d0cff6846be5eaddf98e7250e6a8089
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Jan 29 13:27:52 2024 +0800
Refactor DatabaseRuleAlterExecutor (#29899)
---
.../handler/update/AlterEncryptRuleExecutor.java | 2 +-
.../distsql/handler/update/AlterMaskRuleExecutor.java | 2 +-
.../handler/update/AlterMaskRuleExecutorTest.java | 2 +-
.../update/AlterReadwriteSplittingRuleExecutor.java | 2 +-
.../update/AlterDefaultShadowAlgorithmExecutor.java | 2 +-
.../handler/update/AlterShadowRuleExecutor.java | 2 +-
.../update/AlterDefaultShardingStrategyExecutor.java | 2 +-
.../AlterShardingTableReferenceRuleExecutor.java | 4 ++--
.../handler/update/AlterShardingTableRuleExecutor.java | 2 +-
.../AlterDefaultShardingStrategyExecutorTest.java | 16 ++++++++--------
.../update/AlterShardingTableRuleExecutorTest.java | 18 +++++++++---------
.../database/type/AlterDatabaseRuleOperator.java | 2 +-
.../LegacyDatabaseRuleDefinitionExecuteEngine.java | 2 +-
.../rule/spi/database/DatabaseRuleAlterExecutor.java | 4 ++--
.../handler/update/UnloadSingleTableExecutor.java | 2 +-
15 files changed, 32 insertions(+), 32 deletions(-)
diff --git
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleExecutor.java
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleExecutor.java
index 578a39721da..94258e7f0d6 100644
---
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleExecutor.java
+++
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleExecutor.java
@@ -99,7 +99,7 @@ public final class AlterEncryptRuleExecutor implements
DatabaseRuleAlterExecutor
}
@Override
- public EncryptRuleConfiguration buildToBeAlteredRuleConfiguration(final
EncryptRuleConfiguration currentRuleConfig, final AlterEncryptRuleStatement
sqlStatement) {
+ public EncryptRuleConfiguration buildToBeAlteredRuleConfiguration(final
AlterEncryptRuleStatement sqlStatement, final EncryptRuleConfiguration
currentRuleConfig) {
return EncryptRuleStatementConverter.convert(sqlStatement.getRules());
}
diff --git
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleExecutor.java
b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleExecutor.java
index 18eceed6ce0..b2c7bab4096 100644
---
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleExecutor.java
+++
b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleExecutor.java
@@ -65,7 +65,7 @@ public final class AlterMaskRuleExecutor implements
DatabaseRuleAlterExecutor<Al
}
@Override
- public MaskRuleConfiguration buildToBeAlteredRuleConfiguration(final
MaskRuleConfiguration currentRuleConfig, final AlterMaskRuleStatement
sqlStatement) {
+ public MaskRuleConfiguration buildToBeAlteredRuleConfiguration(final
AlterMaskRuleStatement sqlStatement, final MaskRuleConfiguration
currentRuleConfig) {
return MaskRuleStatementConverter.convert(sqlStatement.getRules());
}
diff --git
a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleExecutorTest.java
b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleExecutorTest.java
index bf2b93b7c31..b9df3971f1d 100644
---
a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleExecutorTest.java
+++
b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleExecutorTest.java
@@ -81,7 +81,7 @@ class AlterMaskRuleExecutorTest {
new AlgorithmSegment("MD5", new Properties()));
MaskRuleSegment ruleSegment = new MaskRuleSegment("t_order",
Collections.singleton(columnSegment));
AlterMaskRuleStatement sqlStatement = new
AlterMaskRuleStatement(Collections.singleton(ruleSegment));
- MaskRuleConfiguration toBeAlteredRuleConfig =
executor.buildToBeAlteredRuleConfiguration(currentRuleConfig, sqlStatement);
+ MaskRuleConfiguration toBeAlteredRuleConfig =
executor.buildToBeAlteredRuleConfiguration(sqlStatement, currentRuleConfig);
executor.updateCurrentRuleConfiguration(currentRuleConfig,
toBeAlteredRuleConfig);
assertThat(currentRuleConfig.getMaskAlgorithms().size(), is(1));
assertTrue(currentRuleConfig.getMaskAlgorithms().containsKey("t_order_order_id_md5"));
diff --git
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleExecutor.java
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleExecutor.java
index ee65dd99381..5d33aafe5d6 100644
---
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleExecutor.java
+++
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleExecutor.java
@@ -50,7 +50,7 @@ public final class AlterReadwriteSplittingRuleExecutor
implements DatabaseRuleAl
}
@Override
- public ReadwriteSplittingRuleConfiguration
buildToBeAlteredRuleConfiguration(final ReadwriteSplittingRuleConfiguration
currentRuleConfig, final AlterReadwriteSplittingRuleStatement sqlStatement) {
+ public ReadwriteSplittingRuleConfiguration
buildToBeAlteredRuleConfiguration(final AlterReadwriteSplittingRuleStatement
sqlStatement, final ReadwriteSplittingRuleConfiguration currentRuleConfig) {
return
ReadwriteSplittingRuleStatementConverter.convert(sqlStatement.getRules());
}
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterDefaultShadowAlgorithmExecutor.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterDefaultShadowAlgorithmExecutor.java
index c1d47fd66c5..c7ca8ac07f6 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterDefaultShadowAlgorithmExecutor.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterDefaultShadowAlgorithmExecutor.java
@@ -67,7 +67,7 @@ public final class AlterDefaultShadowAlgorithmExecutor
implements DatabaseRuleAl
}
@Override
- public ShadowRuleConfiguration buildToBeAlteredRuleConfiguration(final
ShadowRuleConfiguration currentRuleConfig, final
AlterDefaultShadowAlgorithmStatement sqlStatement) {
+ public ShadowRuleConfiguration buildToBeAlteredRuleConfiguration(final
AlterDefaultShadowAlgorithmStatement sqlStatement, final
ShadowRuleConfiguration currentRuleConfig) {
ShadowRuleConfiguration result = new ShadowRuleConfiguration();
result.setShadowAlgorithms(buildAlgorithmMap(sqlStatement));
result.setDefaultShadowAlgorithmName(DEFAULT_ALGORITHM_NAME);
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleExecutor.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleExecutor.java
index a63ed78c2e4..d160aeb9f9c 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleExecutor.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleExecutor.java
@@ -73,7 +73,7 @@ public final class AlterShadowRuleExecutor implements
DatabaseRuleAlterExecutor<
}
@Override
- public ShadowRuleConfiguration buildToBeAlteredRuleConfiguration(final
ShadowRuleConfiguration currentRuleConfig, final AlterShadowRuleStatement
sqlStatement) {
+ public ShadowRuleConfiguration buildToBeAlteredRuleConfiguration(final
AlterShadowRuleStatement sqlStatement, final ShadowRuleConfiguration
currentRuleConfig) {
return ShadowRuleStatementConverter.convert(sqlStatement.getRules());
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterDefaultShardingStrategyExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterDefaultShardingStrategyExecutor.java
index 62ea9c0c187..5ff67833819 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterDefaultShardingStrategyExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterDefaultShardingStrategyExecutor.java
@@ -82,7 +82,7 @@ public final class AlterDefaultShardingStrategyExecutor
implements DatabaseRuleA
}
@Override
- public ShardingRuleConfiguration buildToBeAlteredRuleConfiguration(final
ShardingRuleConfiguration currentRuleConfig, final
AlterDefaultShardingStrategyStatement sqlStatement) {
+ public ShardingRuleConfiguration buildToBeAlteredRuleConfiguration(final
AlterDefaultShardingStrategyStatement sqlStatement, final
ShardingRuleConfiguration currentRuleConfig) {
ShardingRuleConfiguration result = new ShardingRuleConfiguration();
if ("none".equalsIgnoreCase(sqlStatement.getStrategyType())) {
setStrategyConfiguration(result, sqlStatement.getDefaultType(),
new NoneShardingStrategyConfiguration());
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableReferenceRuleExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableReferenceRuleExecutor.java
index db3055d9344..3cd8820a421 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableReferenceRuleExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableReferenceRuleExecutor.java
@@ -107,14 +107,14 @@ public final class
AlterShardingTableReferenceRuleExecutor implements DatabaseRu
}
private void checkShardingTableReferenceRulesValid(final
AlterShardingTableReferenceRuleStatement sqlStatement, final
ShardingRuleConfiguration currentRuleConfig) {
- Collection<ShardingTableReferenceRuleConfiguration>
toBeAlteredShardingTableReferenceRules =
buildToBeAlteredRuleConfiguration(currentRuleConfig,
sqlStatement).getBindingTableGroups();
+ Collection<ShardingTableReferenceRuleConfiguration>
toBeAlteredShardingTableReferenceRules =
buildToBeAlteredRuleConfiguration(sqlStatement,
currentRuleConfig).getBindingTableGroups();
Collection<String> ruleNames =
toBeAlteredShardingTableReferenceRules.stream().map(ShardingTableReferenceRuleConfiguration::getName).collect(Collectors.toList());
ShardingSpherePreconditions.checkState(ShardingTableRuleStatementChecker.isValidBindingTableGroups(toBeAlteredShardingTableReferenceRules,
currentRuleConfig),
() -> new InvalidRuleConfigurationException("sharding table",
ruleNames, Collections.singleton("invalid sharding table reference.")));
}
@Override
- public ShardingRuleConfiguration buildToBeAlteredRuleConfiguration(final
ShardingRuleConfiguration currentRuleConfig, final
AlterShardingTableReferenceRuleStatement sqlStatement) {
+ public ShardingRuleConfiguration buildToBeAlteredRuleConfiguration(final
AlterShardingTableReferenceRuleStatement sqlStatement, final
ShardingRuleConfiguration currentRuleConfig) {
ShardingRuleConfiguration result = new ShardingRuleConfiguration();
sqlStatement.getRules().forEach(each ->
result.getBindingTableGroups().add(new
ShardingTableReferenceRuleConfiguration(each.getName(), each.getReference())));
return result;
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableRuleExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableRuleExecutor.java
index dfc7d365c78..99f9bec1f04 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableRuleExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableRuleExecutor.java
@@ -47,7 +47,7 @@ public final class AlterShardingTableRuleExecutor implements
DatabaseRuleAlterEx
}
@Override
- public ShardingRuleConfiguration buildToBeAlteredRuleConfiguration(final
ShardingRuleConfiguration currentRuleConfig, final
AlterShardingTableRuleStatement sqlStatement) {
+ public ShardingRuleConfiguration buildToBeAlteredRuleConfiguration(final
AlterShardingTableRuleStatement sqlStatement, final ShardingRuleConfiguration
currentRuleConfig) {
return
ShardingTableRuleStatementConverter.convert(sqlStatement.getRules());
}
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterDefaultShardingStrategyExecutorTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterDefaultShardingStrategyExecutorTest.java
index f5a68b5fb20..7087d61919d 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterDefaultShardingStrategyExecutorTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterDefaultShardingStrategyExecutorTest.java
@@ -90,7 +90,7 @@ class AlterDefaultShardingStrategyExecutorTest {
currentRuleConfig.setDefaultTableShardingStrategy(new
StandardShardingStrategyConfiguration("order_id", "orderAlgorithm"));
currentRuleConfig.getShardingAlgorithms().put("order_id_algorithm",
null);
executor.checkBeforeUpdate(statement, currentRuleConfig);
- ShardingRuleConfiguration toBeAlteredRuleConfig =
executor.buildToBeAlteredRuleConfiguration(currentRuleConfig, statement);
+ ShardingRuleConfiguration toBeAlteredRuleConfig =
executor.buildToBeAlteredRuleConfiguration(statement, currentRuleConfig);
executor.updateCurrentRuleConfiguration(currentRuleConfig,
toBeAlteredRuleConfig);
StandardShardingStrategyConfiguration defaultTableShardingStrategy =
(StandardShardingStrategyConfiguration)
currentRuleConfig.getDefaultTableShardingStrategy();
assertThat(defaultTableShardingStrategy.getShardingAlgorithmName(),
is("default_table_order_id_algorithm"));
@@ -104,7 +104,7 @@ class AlterDefaultShardingStrategyExecutorTest {
ShardingRuleConfiguration currentRuleConfig = new
ShardingRuleConfiguration();
currentRuleConfig.setDefaultDatabaseShardingStrategy(new
StandardShardingStrategyConfiguration("order_id", "orderAlgorithm"));
executor.checkBeforeUpdate(statement, currentRuleConfig);
- ShardingRuleConfiguration toBeAlteredRuleConfig =
executor.buildToBeAlteredRuleConfiguration(currentRuleConfig, statement);
+ ShardingRuleConfiguration toBeAlteredRuleConfig =
executor.buildToBeAlteredRuleConfiguration(statement, currentRuleConfig);
executor.updateCurrentRuleConfiguration(currentRuleConfig,
toBeAlteredRuleConfig);
StandardShardingStrategyConfiguration defaultDatabaseShardingStrategy
= (StandardShardingStrategyConfiguration)
currentRuleConfig.getDefaultDatabaseShardingStrategy();
assertThat(defaultDatabaseShardingStrategy.getShardingAlgorithmName(),
is("default_database_inline"));
@@ -113,12 +113,12 @@ class AlterDefaultShardingStrategyExecutorTest {
@Test
void assertAlterDefaultTableShardingStrategyWithNoneShardingStrategyType()
{
- AlterDefaultShardingStrategyStatement statement = new
AlterDefaultShardingStrategyStatement("TABLE", "none", null, null);
+ AlterDefaultShardingStrategyStatement sqlStatement = new
AlterDefaultShardingStrategyStatement("TABLE", "none", null, null);
ShardingRuleConfiguration currentRuleConfig = new
ShardingRuleConfiguration();
currentRuleConfig.setDefaultTableShardingStrategy(new
StandardShardingStrategyConfiguration("order_id", "orderAlgorithm"));
currentRuleConfig.getShardingAlgorithms().put("order_id_algorithm",
null);
- executor.checkBeforeUpdate(statement, currentRuleConfig);
- ShardingRuleConfiguration toBeAlteredRuleConfig =
executor.buildToBeAlteredRuleConfiguration(currentRuleConfig, statement);
+ executor.checkBeforeUpdate(sqlStatement, currentRuleConfig);
+ ShardingRuleConfiguration toBeAlteredRuleConfig =
executor.buildToBeAlteredRuleConfiguration(sqlStatement, currentRuleConfig);
executor.updateCurrentRuleConfiguration(currentRuleConfig,
toBeAlteredRuleConfig);
NoneShardingStrategyConfiguration defaultTableShardingStrategy =
(NoneShardingStrategyConfiguration)
currentRuleConfig.getDefaultTableShardingStrategy();
assertThat(defaultTableShardingStrategy.getType(), is(""));
@@ -127,11 +127,11 @@ class AlterDefaultShardingStrategyExecutorTest {
@Test
void
assertAlterDefaultDatabaseShardingStrategyWithNoneShardingStrategyType() {
- AlterDefaultShardingStrategyStatement statement = new
AlterDefaultShardingStrategyStatement("DATABASE", "none", null, null);
+ AlterDefaultShardingStrategyStatement sqlStatement = new
AlterDefaultShardingStrategyStatement("DATABASE", "none", null, null);
ShardingRuleConfiguration currentRuleConfig = new
ShardingRuleConfiguration();
currentRuleConfig.setDefaultDatabaseShardingStrategy(new
StandardShardingStrategyConfiguration("order_id", "orderAlgorithm"));
- executor.checkBeforeUpdate(statement, currentRuleConfig);
- ShardingRuleConfiguration toBeAlteredRuleConfig =
executor.buildToBeAlteredRuleConfiguration(currentRuleConfig, statement);
+ executor.checkBeforeUpdate(sqlStatement, currentRuleConfig);
+ ShardingRuleConfiguration toBeAlteredRuleConfig =
executor.buildToBeAlteredRuleConfiguration(sqlStatement, currentRuleConfig);
executor.updateCurrentRuleConfiguration(currentRuleConfig,
toBeAlteredRuleConfig);
NoneShardingStrategyConfiguration defaultDatabaseShardingStrategy =
(NoneShardingStrategyConfiguration)
currentRuleConfig.getDefaultDatabaseShardingStrategy();
assertThat(defaultDatabaseShardingStrategy.getType(), is(""));
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableRuleExecutorTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableRuleExecutorTest.java
index 845acc2cfb6..3cb536ebabc 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableRuleExecutorTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableRuleExecutorTest.java
@@ -72,9 +72,9 @@ class AlterShardingTableRuleExecutorTest {
@Test
void assertUpdate() {
- AlterShardingTableRuleStatement statement = new
AlterShardingTableRuleStatement(Arrays.asList(createCompleteAutoTableRule("t_order_item"),
createCompleteTableRule("t_order")));
- executor.checkBeforeUpdate(statement, currentRuleConfig);
- ShardingRuleConfiguration toBeAlteredRuleConfig =
executor.buildToBeAlteredRuleConfiguration(currentRuleConfig, statement);
+ AlterShardingTableRuleStatement sqlStatement = new
AlterShardingTableRuleStatement(Arrays.asList(createCompleteAutoTableRule("t_order_item"),
createCompleteTableRule("t_order")));
+ executor.checkBeforeUpdate(sqlStatement, currentRuleConfig);
+ ShardingRuleConfiguration toBeAlteredRuleConfig =
executor.buildToBeAlteredRuleConfiguration(sqlStatement, currentRuleConfig);
executor.updateCurrentRuleConfiguration(currentRuleConfig,
toBeAlteredRuleConfig);
assertThat(currentRuleConfig.getTables().size(), is(1));
ShardingTableRuleConfiguration tableRule =
currentRuleConfig.getTables().iterator().next();
@@ -97,9 +97,9 @@ class AlterShardingTableRuleExecutorTest {
@Test
void assertUpdateWithDifferentCase() {
- AlterShardingTableRuleStatement statement = new
AlterShardingTableRuleStatement(Arrays.asList(createCompleteAutoTableRule("T_ORDER_ITEM"),
createCompleteTableRule("T_ORDER")));
- executor.checkBeforeUpdate(statement, currentRuleConfig);
- ShardingRuleConfiguration toBeAlteredRuleConfig =
executor.buildToBeAlteredRuleConfiguration(currentRuleConfig, statement);
+ AlterShardingTableRuleStatement sqlStatement = new
AlterShardingTableRuleStatement(Arrays.asList(createCompleteAutoTableRule("T_ORDER_ITEM"),
createCompleteTableRule("T_ORDER")));
+ executor.checkBeforeUpdate(sqlStatement, currentRuleConfig);
+ ShardingRuleConfiguration toBeAlteredRuleConfig =
executor.buildToBeAlteredRuleConfiguration(sqlStatement, currentRuleConfig);
executor.updateCurrentRuleConfiguration(currentRuleConfig,
toBeAlteredRuleConfig);
assertThat(currentRuleConfig.getTables().size(), is(1));
ShardingTableRuleConfiguration tableRule =
currentRuleConfig.getTables().iterator().next();
@@ -122,9 +122,9 @@ class AlterShardingTableRuleExecutorTest {
@Test
void assertUpdateTableType() {
- AlterShardingTableRuleStatement statement = new
AlterShardingTableRuleStatement(Arrays.asList(createCompleteAutoTableRule("t_order"),
createCompleteTableRule("t_order_item")));
- executor.checkBeforeUpdate(statement, currentRuleConfig);
- ShardingRuleConfiguration toBeAlteredRuleConfig =
executor.buildToBeAlteredRuleConfiguration(currentRuleConfig, statement);
+ AlterShardingTableRuleStatement sqlStatement = new
AlterShardingTableRuleStatement(Arrays.asList(createCompleteAutoTableRule("t_order"),
createCompleteTableRule("t_order_item")));
+ executor.checkBeforeUpdate(sqlStatement, currentRuleConfig);
+ ShardingRuleConfiguration toBeAlteredRuleConfig =
executor.buildToBeAlteredRuleConfiguration(sqlStatement, currentRuleConfig);
executor.updateCurrentRuleConfiguration(currentRuleConfig,
toBeAlteredRuleConfig);
assertThat(currentRuleConfig.getTables().size(), is(1));
ShardingTableRuleConfiguration tableRule =
currentRuleConfig.getTables().iterator().next();
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/rule/engine/database/type/AlterDatabaseRuleOperator.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/rule/engine/database/type/AlterDatabaseRuleOperator.java
index 48d585b0bf2..a6d7049030c 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/rule/engine/database/type/AlterDatabaseRuleOperator.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/rule/engine/database/type/AlterDatabaseRuleOperator.java
@@ -48,7 +48,7 @@ public final class AlterDatabaseRuleOperator implements
DatabaseRuleOperator {
@Override
@SuppressWarnings("unchecked")
public Collection<MetaDataVersion> operate(final RuleDefinitionStatement
sqlStatement, final ShardingSphereDatabase database, final RuleConfiguration
currentRuleConfig) {
- RuleConfiguration toBeAlteredRuleConfig =
executor.buildToBeAlteredRuleConfiguration(currentRuleConfig, sqlStatement);
+ RuleConfiguration toBeAlteredRuleConfig =
executor.buildToBeAlteredRuleConfiguration(sqlStatement, currentRuleConfig);
executor.updateCurrentRuleConfiguration(currentRuleConfig,
toBeAlteredRuleConfig);
ModeContextManager modeContextManager =
contextManager.getInstanceContext().getModeContextManager();
RuleConfiguration toBeDroppedRuleConfig =
executor.buildToBeDroppedRuleConfiguration(currentRuleConfig,
toBeAlteredRuleConfig);
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/rule/engine/legacy/LegacyDatabaseRuleDefinitionExecuteEngine.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/rule/engine/legacy/LegacyDatabaseRuleDefinitionExecuteEngine.java
index 75b3d55ae94..9924f3d1123 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/rule/engine/legacy/LegacyDatabaseRuleDefinitionExecuteEngine.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/rule/engine/legacy/LegacyDatabaseRuleDefinitionExecuteEngine.java
@@ -112,7 +112,7 @@ public final class
LegacyDatabaseRuleDefinitionExecuteEngine {
@SuppressWarnings({"rawtypes", "unchecked"})
private RuleConfiguration processAlter(final RuleDefinitionStatement
sqlStatement, final DatabaseRuleAlterExecutor executor, final RuleConfiguration
currentRuleConfig) {
- RuleConfiguration toBeAlteredRuleConfig =
executor.buildToBeAlteredRuleConfiguration(currentRuleConfig, sqlStatement);
+ RuleConfiguration toBeAlteredRuleConfig =
executor.buildToBeAlteredRuleConfiguration(sqlStatement, currentRuleConfig);
executor.updateCurrentRuleConfiguration(currentRuleConfig,
toBeAlteredRuleConfig);
return currentRuleConfig;
}
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/rule/spi/database/DatabaseRuleAlterExecutor.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/rule/spi/database/DatabaseRuleAlterExecutor.java
index 12adcda1b28..a902b41f3ec 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/rule/spi/database/DatabaseRuleAlterExecutor.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/rule/spi/database/DatabaseRuleAlterExecutor.java
@@ -31,11 +31,11 @@ public interface DatabaseRuleAlterExecutor<T extends
SQLStatement, R extends Rul
/**
* Build to be altered rule configuration.
*
- * @param currentRuleConfig current rule configuration
* @param sqlStatement SQL statement
+ * @param currentRuleConfig current rule configuration
* @return to be altered rule configuration
*/
- R buildToBeAlteredRuleConfiguration(R currentRuleConfig, T sqlStatement);
+ R buildToBeAlteredRuleConfiguration(T sqlStatement, R currentRuleConfig);
/**
* TODO Remove temporary default implementation
diff --git
a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/update/UnloadSingleTableExecutor.java
b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/update/UnloadSingleTableExecutor.java
index 49fe0436871..0410f3c6027 100644
---
a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/update/UnloadSingleTableExecutor.java
+++
b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/update/UnloadSingleTableExecutor.java
@@ -90,7 +90,7 @@ public final class UnloadSingleTableExecutor implements
DatabaseRuleAlterExecuto
}
@Override
- public SingleRuleConfiguration buildToBeAlteredRuleConfiguration(final
SingleRuleConfiguration currentRuleConfig, final UnloadSingleTableStatement
sqlStatement) {
+ public SingleRuleConfiguration buildToBeAlteredRuleConfiguration(final
UnloadSingleTableStatement sqlStatement, final SingleRuleConfiguration
currentRuleConfig) {
SingleRuleConfiguration result = new SingleRuleConfiguration();
currentRuleConfig.getDefaultDataSource().ifPresent(result::setDefaultDataSource);
if (!sqlStatement.isUnloadAllTables()) {
