You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ji...@apache.org on 2023/06/16 07:35:21 UTC
[shardingsphere] branch master updated: Refactor ShardingRule RDL statement updater (#26384)
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 acf612d032c Refactor ShardingRule RDL statement updater (#26384)
acf612d032c is described below
commit acf612d032ccb95d5136494990113e8c574c52b5
Author: ChenJiaHao <Pa...@163.com>
AuthorDate: Fri Jun 16 15:35:14 2023 +0800
Refactor ShardingRule RDL statement updater (#26384)
---
.../AlterShardingTableRuleStatementUpdater.java | 19 +++++++++++++++++++
.../update/DropDefaultStrategyStatementUpdater.java | 12 ++++++++++++
.../update/DropShardingAlgorithmStatementUpdater.java | 9 +++++++++
.../update/DropShardingAuditorStatementUpdater.java | 9 +++++++++
.../DropShardingKeyGeneratorStatementUpdater.java | 9 +++++++++
...ropShardingTableReferenceRuleStatementUpdater.java | 9 +++++++++
.../update/DropShardingTableRuleStatementUpdater.java | 12 ++++++++++++
7 files changed, 79 insertions(+)
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableRuleStatementUpdater.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableRuleStatementUpdater.java
index 76feabd94bd..08a5a58aec1 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableRuleStatementUpdater.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableRuleStatementUpdater.java
@@ -47,6 +47,25 @@ public final class AlterShardingTableRuleStatementUpdater implements RuleDefinit
return ShardingTableRuleStatementConverter.convert(sqlStatement.getRules());
}
+ @Override
+ public ShardingRuleConfiguration buildToBeDroppedRuleConfiguration(final ShardingRuleConfiguration currentRuleConfig, final ShardingRuleConfiguration toBeAlteredRuleConfig) {
+ ShardingRuleConfiguration result = new ShardingRuleConfiguration();
+ Collection<String> toBeAlteredShardingTableNames = toBeAlteredRuleConfig.getTables().stream().map(ShardingTableRuleConfiguration::getLogicTable).collect(Collectors.toSet());
+ for (ShardingAutoTableRuleConfiguration each : currentRuleConfig.getAutoTables()) {
+ if (toBeAlteredShardingTableNames.contains(each.getLogicTable())) {
+ result.getAutoTables().add(each);
+ }
+ }
+ Collection<String> toBeAlteredAutoTableNames = toBeAlteredRuleConfig.getAutoTables().stream().map(ShardingAutoTableRuleConfiguration::getLogicTable).collect(Collectors.toSet());
+ for (ShardingTableRuleConfiguration each : currentRuleConfig.getTables()) {
+ if (toBeAlteredAutoTableNames.contains(each.getLogicTable())) {
+ result.getTables().add(each);
+ }
+ }
+ // TODO find unused algorithm
+ return result;
+ }
+
@Override
public void updateCurrentRuleConfiguration(final ShardingRuleConfiguration currentRuleConfig, final ShardingRuleConfiguration toBeAlteredRuleConfig) {
removeRuleConfiguration(currentRuleConfig, toBeAlteredRuleConfig);
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultStrategyStatementUpdater.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultStrategyStatementUpdater.java
index 02ac83f42f2..64ad50b59c4 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultStrategyStatementUpdater.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultStrategyStatementUpdater.java
@@ -72,6 +72,18 @@ public final class DropDefaultStrategyStatementUpdater implements RuleDefinition
return null != currentRuleConfig && null != currentRuleConfig.getDefaultDatabaseShardingStrategy();
}
+ @Override
+ public ShardingRuleConfiguration buildToBeDroppedRuleConfiguration(final ShardingRuleConfiguration currentRuleConfig, final DropDefaultShardingStrategyStatement sqlStatement) {
+ ShardingRuleConfiguration result = new ShardingRuleConfiguration();
+ if (sqlStatement.getDefaultType().equalsIgnoreCase(ShardingStrategyLevelType.TABLE.name())) {
+ result.setDefaultTableShardingStrategy(currentRuleConfig.getDefaultTableShardingStrategy());
+ } else {
+ result.setDefaultDatabaseShardingStrategy(currentRuleConfig.getDefaultDatabaseShardingStrategy());
+ }
+ // TODO find unused algorithm
+ return result;
+ }
+
@Override
public boolean updateCurrentRuleConfiguration(final DropDefaultShardingStrategyStatement sqlStatement, final ShardingRuleConfiguration currentRuleConfig) {
if (sqlStatement.getDefaultType().equalsIgnoreCase(ShardingStrategyLevelType.TABLE.name())) {
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmStatementUpdater.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmStatementUpdater.java
index 04fd46070b2..61e72e07776 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmStatementUpdater.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmStatementUpdater.java
@@ -93,6 +93,15 @@ public final class DropShardingAlgorithmStatementUpdater implements RuleDefiniti
return shardingRuleConfig.getShardingAlgorithms().keySet();
}
+ @Override
+ public ShardingRuleConfiguration buildToBeDroppedRuleConfiguration(final ShardingRuleConfiguration currentRuleConfig, final DropShardingAlgorithmStatement sqlStatement) {
+ ShardingRuleConfiguration result = new ShardingRuleConfiguration();
+ for (String each : sqlStatement.getNames()) {
+ result.getShardingAlgorithms().put(each, currentRuleConfig.getShardingAlgorithms().get(each));
+ }
+ return result;
+ }
+
@Override
public boolean updateCurrentRuleConfiguration(final DropShardingAlgorithmStatement sqlStatement, final ShardingRuleConfiguration currentRuleConfig) {
for (String each : sqlStatement.getNames()) {
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAuditorStatementUpdater.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAuditorStatementUpdater.java
index a91bdbb4bbe..93de7e7cbf5 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAuditorStatementUpdater.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAuditorStatementUpdater.java
@@ -72,6 +72,15 @@ public final class DropShardingAuditorStatementUpdater implements RuleDefinition
return result;
}
+ @Override
+ public ShardingRuleConfiguration buildToBeDroppedRuleConfiguration(final ShardingRuleConfiguration currentRuleConfig, final DropShardingAuditorStatement sqlStatement) {
+ ShardingRuleConfiguration result = new ShardingRuleConfiguration();
+ for (String each : sqlStatement.getNames()) {
+ result.getAuditors().put(each, currentRuleConfig.getAuditors().get(each));
+ }
+ return result;
+ }
+
@Override
public boolean updateCurrentRuleConfiguration(final DropShardingAuditorStatement sqlStatement, final ShardingRuleConfiguration currentRuleConfig) {
currentRuleConfig.getAuditors().keySet().removeIf(sqlStatement.getNames()::contains);
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorStatementUpdater.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorStatementUpdater.java
index 621f61f9e7f..c091bb74dad 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorStatementUpdater.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorStatementUpdater.java
@@ -74,6 +74,15 @@ public final class DropShardingKeyGeneratorStatementUpdater implements RuleDefin
return result;
}
+ @Override
+ public ShardingRuleConfiguration buildToBeDroppedRuleConfiguration(final ShardingRuleConfiguration currentRuleConfig, final DropShardingKeyGeneratorStatement sqlStatement) {
+ ShardingRuleConfiguration result = new ShardingRuleConfiguration();
+ for (String each : sqlStatement.getNames()) {
+ result.getKeyGenerators().put(each, currentRuleConfig.getKeyGenerators().get(each));
+ }
+ return result;
+ }
+
@Override
public boolean updateCurrentRuleConfiguration(final DropShardingKeyGeneratorStatement sqlStatement, final ShardingRuleConfiguration currentRuleConfig) {
currentRuleConfig.getKeyGenerators().keySet().removeIf(sqlStatement.getNames()::contains);
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableReferenceRuleStatementUpdater.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableReferenceRuleStatementUpdater.java
index 3dfe92f0d67..877e0eb5dde 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableReferenceRuleStatementUpdater.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableReferenceRuleStatementUpdater.java
@@ -66,6 +66,15 @@ public final class DropShardingTableReferenceRuleStatementUpdater implements Rul
return ruleNames.stream().anyMatch(each -> each.equalsIgnoreCase(name));
}
+ @Override
+ public ShardingRuleConfiguration buildToBeDroppedRuleConfiguration(final ShardingRuleConfiguration currentRuleConfig, final DropShardingTableReferenceRuleStatement sqlStatement) {
+ ShardingRuleConfiguration result = new ShardingRuleConfiguration();
+ for (String each : sqlStatement.getNames()) {
+ result.getBindingTableGroups().add(new ShardingTableReferenceRuleConfiguration(each, ""));
+ }
+ return result;
+ }
+
@Override
public boolean updateCurrentRuleConfiguration(final DropShardingTableReferenceRuleStatement sqlStatement, final ShardingRuleConfiguration currentRuleConfig) {
currentRuleConfig.getBindingTableGroups().removeIf(each -> sqlStatement.getNames().stream().anyMatch(each.getName()::equalsIgnoreCase));
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleStatementUpdater.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleStatementUpdater.java
index 220c3c408ed..d12a66b39fe 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleStatementUpdater.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleStatementUpdater.java
@@ -105,6 +105,18 @@ public final class DropShardingTableRuleStatementUpdater implements RuleDefiniti
return !getIdenticalData(currentTableNames, sqlStatement.getTableNames().stream().map(each -> each.getIdentifier().getValue()).collect(Collectors.toSet())).isEmpty();
}
+ @Override
+ public ShardingRuleConfiguration buildToBeDroppedRuleConfiguration(final ShardingRuleConfiguration currentRuleConfig, final DropShardingTableRuleStatement sqlStatement) {
+ ShardingRuleConfiguration result = new ShardingRuleConfiguration();
+ Collection<String> toBeDroppedShardingTableNames = getToBeDroppedShardingTableNames(sqlStatement);
+ for (String each : toBeDroppedShardingTableNames) {
+ result.getTables().addAll(currentRuleConfig.getTables().stream().filter(table -> each.equalsIgnoreCase(table.getLogicTable())).collect(Collectors.toList()));
+ result.getAutoTables().addAll(currentRuleConfig.getAutoTables().stream().filter(table -> each.equalsIgnoreCase(table.getLogicTable())).collect(Collectors.toList()));
+ }
+ // TODO find unused algorithm
+ return result;
+ }
+
@Override
public boolean updateCurrentRuleConfiguration(final DropShardingTableRuleStatement sqlStatement, final ShardingRuleConfiguration currentRuleConfig) {
Collection<String> toBeDroppedShardingTableNames = getToBeDroppedShardingTableNames(sqlStatement);