You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by wu...@apache.org on 2021/06/24 14:31:48 UTC
[shardingsphere] branch master updated: Rename
RDLBackendHandler.check() method (#11001)
This is an automated email from the ASF dual-hosted git repository.
wuweijie 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 f56836e Rename RDLBackendHandler.check() method (#11001)
f56836e is described below
commit f56836ea888745ddc54a0aebb774464ddf702149
Author: Liang Zhang <te...@163.com>
AuthorDate: Thu Jun 24 22:31:19 2021 +0800
Rename RDLBackendHandler.check() method (#11001)
* Rename RDLBackendHandler.check() method
* Fix checkstyle
---
.../AlterDatabaseDiscoveryRuleBackendHandler.java | 56 ++++++++++++----------
.../rdl/impl/AlterEncryptRuleBackendHandler.java | 40 ++++++++--------
.../AlterReadwriteSplittingRuleBackendHandler.java | 40 ++++++++--------
...terShardingBindingTableRulesBackendHandler.java | 2 +-
...rShardingBroadcastTableRulesBackendHandler.java | 2 +-
.../impl/AlterShardingTableRuleBackendHandler.java | 2 +-
.../CreateDatabaseDiscoveryRuleBackendHandler.java | 34 ++++++-------
.../rdl/impl/CreateEncryptRuleBackendHandler.java | 34 ++++++-------
...CreateReadwriteSplittingRuleBackendHandler.java | 34 ++++++-------
...ateShardingBindingTableRulesBackendHandler.java | 2 +-
...eShardingBroadcastTableRulesBackendHandler.java | 2 +-
.../CreateShardingTableRuleBackendHandler.java | 2 +-
.../DropDatabaseDiscoveryRuleBackendHandler.java | 18 +++----
.../rdl/impl/DropEncryptRuleBackendHandler.java | 18 +++----
.../DropReadwriteSplittingRuleBackendHandler.java | 2 +-
...ropShardingBindingTableRulesBackendHandler.java | 2 +-
...pShardingBroadcastTableRulesBackendHandler.java | 2 +-
.../impl/DropShardingTableRuleBackendHandler.java | 2 +-
.../text/distsql/rdl/impl/RDLBackendHandler.java | 12 ++---
19 files changed, 155 insertions(+), 151 deletions(-)
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterDatabaseDiscoveryRuleBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterDatabaseDiscoveryRuleBackendHandler.java
index 1b0c7c5..4262b4b 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterDatabaseDiscoveryRuleBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterDatabaseDiscoveryRuleBackendHandler.java
@@ -54,32 +54,8 @@ public final class AlterDatabaseDiscoveryRuleBackendHandler extends RDLBackendHa
}
@Override
- public void before(final String schemaName, final AlterDatabaseDiscoveryRuleStatement sqlStatement) {
- Optional<DatabaseDiscoveryRuleConfiguration> ruleConfig = findRuleConfiguration(schemaName, DatabaseDiscoveryRuleConfiguration.class);
- if (!ruleConfig.isPresent()) {
- throw new DatabaseDiscoveryRulesNotExistedException(schemaName, getAlteredRuleNames(sqlStatement));
- }
- check(schemaName, sqlStatement, ruleConfig.get());
- }
-
- @Override
- public void doExecute(final String schemaName, final AlterDatabaseDiscoveryRuleStatement sqlStatement) {
- DatabaseDiscoveryRuleConfiguration ruleConfig = getRuleConfiguration(schemaName, DatabaseDiscoveryRuleConfiguration.class);
- DatabaseDiscoveryRuleConfiguration alteredDatabaseDiscoveryRuleConfiguration = new YamlRuleConfigurationSwapperEngine()
- .swapToRuleConfigurations(Collections.singletonList(DatabaseDiscoveryRuleStatementConverter.convert(sqlStatement.getRules()))).stream()
- .map(each -> (DatabaseDiscoveryRuleConfiguration) each).findFirst().get();
- drop(sqlStatement, ruleConfig);
- ruleConfig.getDataSources().addAll(alteredDatabaseDiscoveryRuleConfiguration.getDataSources());
- ruleConfig.getDiscoveryTypes().putAll(alteredDatabaseDiscoveryRuleConfiguration.getDiscoveryTypes());
- }
-
- private void drop(final AlterDatabaseDiscoveryRuleStatement sqlStatement, final DatabaseDiscoveryRuleConfiguration databaseDiscoveryRuleConfig) {
- getAlteredRuleNames(sqlStatement).forEach(each -> {
- DatabaseDiscoveryDataSourceRuleConfiguration databaseDiscoveryDataSourceRuleConfig = databaseDiscoveryRuleConfig.getDataSources()
- .stream().filter(dataSource -> dataSource.getName().equals(each)).findAny().get();
- databaseDiscoveryRuleConfig.getDataSources().remove(databaseDiscoveryDataSourceRuleConfig);
- databaseDiscoveryRuleConfig.getDiscoveryTypes().remove(databaseDiscoveryDataSourceRuleConfig.getDiscoveryTypeName());
- });
+ public void check(final String schemaName, final AlterDatabaseDiscoveryRuleStatement sqlStatement) {
+ check(schemaName, sqlStatement, getRuleConfiguration(schemaName, sqlStatement));
}
private void check(final String schemaName, final AlterDatabaseDiscoveryRuleStatement sqlStatement, final DatabaseDiscoveryRuleConfiguration databaseDiscoveryRuleConfig) {
@@ -115,6 +91,34 @@ public final class AlterDatabaseDiscoveryRuleBackendHandler extends RDLBackendHa
}
}
+ private DatabaseDiscoveryRuleConfiguration getRuleConfiguration(final String schemaName, final AlterDatabaseDiscoveryRuleStatement sqlStatement) {
+ Optional<DatabaseDiscoveryRuleConfiguration> result = findRuleConfiguration(schemaName, DatabaseDiscoveryRuleConfiguration.class);
+ if (!result.isPresent()) {
+ throw new DatabaseDiscoveryRulesNotExistedException(schemaName, getAlteredRuleNames(sqlStatement));
+ }
+ return result.get();
+ }
+
+ @Override
+ public void doExecute(final String schemaName, final AlterDatabaseDiscoveryRuleStatement sqlStatement) {
+ DatabaseDiscoveryRuleConfiguration ruleConfig = getRuleConfiguration(schemaName, DatabaseDiscoveryRuleConfiguration.class);
+ DatabaseDiscoveryRuleConfiguration alteredDatabaseDiscoveryRuleConfiguration = new YamlRuleConfigurationSwapperEngine()
+ .swapToRuleConfigurations(Collections.singletonList(DatabaseDiscoveryRuleStatementConverter.convert(sqlStatement.getRules()))).stream()
+ .map(each -> (DatabaseDiscoveryRuleConfiguration) each).findFirst().get();
+ drop(sqlStatement, ruleConfig);
+ ruleConfig.getDataSources().addAll(alteredDatabaseDiscoveryRuleConfiguration.getDataSources());
+ ruleConfig.getDiscoveryTypes().putAll(alteredDatabaseDiscoveryRuleConfiguration.getDiscoveryTypes());
+ }
+
+ private void drop(final AlterDatabaseDiscoveryRuleStatement sqlStatement, final DatabaseDiscoveryRuleConfiguration databaseDiscoveryRuleConfig) {
+ getAlteredRuleNames(sqlStatement).forEach(each -> {
+ DatabaseDiscoveryDataSourceRuleConfiguration databaseDiscoveryDataSourceRuleConfig = databaseDiscoveryRuleConfig.getDataSources()
+ .stream().filter(dataSource -> dataSource.getName().equals(each)).findAny().get();
+ databaseDiscoveryRuleConfig.getDataSources().remove(databaseDiscoveryDataSourceRuleConfig);
+ databaseDiscoveryRuleConfig.getDiscoveryTypes().remove(databaseDiscoveryDataSourceRuleConfig.getDiscoveryTypeName());
+ });
+ }
+
private Collection<String> getAlteredRuleNames(final AlterDatabaseDiscoveryRuleStatement sqlStatement) {
return sqlStatement.getRules().stream().map(DatabaseDiscoveryRuleSegment::getName).collect(Collectors.toList());
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterEncryptRuleBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterEncryptRuleBackendHandler.java
index 81bed2a..6900bb3 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterEncryptRuleBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterEncryptRuleBackendHandler.java
@@ -52,7 +52,7 @@ public final class AlterEncryptRuleBackendHandler extends RDLBackendHandler<Alte
}
@Override
- public void before(final String schemaName, final AlterEncryptRuleStatement sqlStatement) {
+ public void check(final String schemaName, final AlterEncryptRuleStatement sqlStatement) {
Optional<EncryptRuleConfiguration> ruleConfig = findRuleConfiguration(schemaName, EncryptRuleConfiguration.class);
if (!ruleConfig.isPresent()) {
throw new EncryptRulesNotExistedException(schemaName, getAlteredRuleNames(sqlStatement));
@@ -60,25 +60,6 @@ public final class AlterEncryptRuleBackendHandler extends RDLBackendHandler<Alte
check(schemaName, sqlStatement, ruleConfig.get());
}
- @Override
- public void doExecute(final String schemaName, final AlterEncryptRuleStatement sqlStatement) {
- EncryptRuleConfiguration ruleConfig = getRuleConfiguration(schemaName, EncryptRuleConfiguration.class);
- EncryptRuleConfiguration alteredEncryptRuleConfiguration = new YamlRuleConfigurationSwapperEngine()
- .swapToRuleConfigurations(Collections.singletonList(EncryptRuleStatementConverter.convert(sqlStatement.getRules()))).stream()
- .map(each -> (EncryptRuleConfiguration) each).findFirst().get();
- drop(sqlStatement, ruleConfig);
- ruleConfig.getTables().addAll(alteredEncryptRuleConfiguration.getTables());
- ruleConfig.getEncryptors().putAll(alteredEncryptRuleConfiguration.getEncryptors());
- }
-
- private void drop(final AlterEncryptRuleStatement sqlStatement, final EncryptRuleConfiguration encryptRuleConfig) {
- getAlteredRuleNames(sqlStatement).forEach(each -> {
- EncryptTableRuleConfiguration encryptTableRuleConfig = encryptRuleConfig.getTables().stream().filter(tableRule -> tableRule.getName().equals(each)).findAny().get();
- encryptRuleConfig.getTables().remove(encryptTableRuleConfig);
- encryptTableRuleConfig.getColumns().forEach(column -> encryptRuleConfig.getEncryptors().remove(column.getEncryptorName()));
- });
- }
-
private void check(final String schemaName, final AlterEncryptRuleStatement sqlStatement, final EncryptRuleConfiguration encryptRuleConfig) {
checkAlteredTables(schemaName, encryptRuleConfig, sqlStatement);
checkEncryptors(sqlStatement);
@@ -107,6 +88,25 @@ public final class AlterEncryptRuleBackendHandler extends RDLBackendHandler<Alte
}
}
+ @Override
+ public void doExecute(final String schemaName, final AlterEncryptRuleStatement sqlStatement) {
+ EncryptRuleConfiguration ruleConfig = getRuleConfiguration(schemaName, EncryptRuleConfiguration.class);
+ EncryptRuleConfiguration alteredEncryptRuleConfiguration = new YamlRuleConfigurationSwapperEngine()
+ .swapToRuleConfigurations(Collections.singleton(EncryptRuleStatementConverter.convert(sqlStatement.getRules()))).stream()
+ .map(each -> (EncryptRuleConfiguration) each).findFirst().get();
+ drop(sqlStatement, ruleConfig);
+ ruleConfig.getTables().addAll(alteredEncryptRuleConfiguration.getTables());
+ ruleConfig.getEncryptors().putAll(alteredEncryptRuleConfiguration.getEncryptors());
+ }
+
+ private void drop(final AlterEncryptRuleStatement sqlStatement, final EncryptRuleConfiguration encryptRuleConfig) {
+ getAlteredRuleNames(sqlStatement).forEach(each -> {
+ EncryptTableRuleConfiguration encryptTableRuleConfig = encryptRuleConfig.getTables().stream().filter(tableRule -> tableRule.getName().equals(each)).findAny().get();
+ encryptRuleConfig.getTables().remove(encryptTableRuleConfig);
+ encryptTableRuleConfig.getColumns().forEach(column -> encryptRuleConfig.getEncryptors().remove(column.getEncryptorName()));
+ });
+ }
+
private Collection<String> getAlteredRuleNames(final AlterEncryptRuleStatement sqlStatement) {
return sqlStatement.getRules().stream().map(EncryptRuleSegment::getTableName).collect(Collectors.toList());
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterReadwriteSplittingRuleBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterReadwriteSplittingRuleBackendHandler.java
index 8a0fc0f..080f3eb 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterReadwriteSplittingRuleBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterReadwriteSplittingRuleBackendHandler.java
@@ -55,7 +55,7 @@ public final class AlterReadwriteSplittingRuleBackendHandler extends RDLBackendH
}
@Override
- public void before(final String schemaName, final AlterReadwriteSplittingRuleStatement sqlStatement) {
+ public void check(final String schemaName, final AlterReadwriteSplittingRuleStatement sqlStatement) {
Optional<ReadwriteSplittingRuleConfiguration> ruleConfig = findRuleConfiguration(schemaName, ReadwriteSplittingRuleConfiguration.class);
if (!ruleConfig.isPresent()) {
throw new ReadwriteSplittingRulesNotExistedException(schemaName, getAlteredRuleNames(sqlStatement));
@@ -63,25 +63,6 @@ public final class AlterReadwriteSplittingRuleBackendHandler extends RDLBackendH
check(schemaName, sqlStatement, ruleConfig.get(), getAlteredRuleNames(sqlStatement));
}
- @Override
- public void doExecute(final String schemaName, final AlterReadwriteSplittingRuleStatement sqlStatement) {
- ReadwriteSplittingRuleConfiguration alterReadwriteSplittingRuleConfig = new YamlRuleConfigurationSwapperEngine()
- .swapToRuleConfigurations(Collections.singletonList(ReadwriteSplittingRuleStatementConverter.convert(sqlStatement))).stream()
- .map(each -> (ReadwriteSplittingRuleConfiguration) each).findFirst().get();
- ReadwriteSplittingRuleConfiguration readwriteSplittingRuleConfig = getRuleConfiguration(schemaName, ReadwriteSplittingRuleConfiguration.class);
- drop(sqlStatement, readwriteSplittingRuleConfig);
- readwriteSplittingRuleConfig.getDataSources().addAll(alterReadwriteSplittingRuleConfig.getDataSources());
- readwriteSplittingRuleConfig.getLoadBalancers().putAll(alterReadwriteSplittingRuleConfig.getLoadBalancers());
- }
-
- private void drop(final AlterReadwriteSplittingRuleStatement sqlStatement, final ReadwriteSplittingRuleConfiguration ruleConfig) {
- getAlteredRuleNames(sqlStatement).forEach(each -> {
- ReadwriteSplittingDataSourceRuleConfiguration dataSourceRuleConfig = ruleConfig.getDataSources().stream().filter(dataSource -> each.equals(dataSource.getName())).findAny().get();
- ruleConfig.getDataSources().remove(dataSourceRuleConfig);
- ruleConfig.getLoadBalancers().remove(dataSourceRuleConfig.getLoadBalancerName());
- });
- }
-
private void check(final String schemaName, final AlterReadwriteSplittingRuleStatement sqlStatement,
final ReadwriteSplittingRuleConfiguration ruleConfig, final Collection<String> alteredRuleNames) {
checkAlteredRules(schemaName, ruleConfig, alteredRuleNames);
@@ -119,6 +100,25 @@ public final class AlterReadwriteSplittingRuleBackendHandler extends RDLBackendH
}
}
+ @Override
+ public void doExecute(final String schemaName, final AlterReadwriteSplittingRuleStatement sqlStatement) {
+ ReadwriteSplittingRuleConfiguration alterReadwriteSplittingRuleConfig = new YamlRuleConfigurationSwapperEngine()
+ .swapToRuleConfigurations(Collections.singletonList(ReadwriteSplittingRuleStatementConverter.convert(sqlStatement))).stream()
+ .map(each -> (ReadwriteSplittingRuleConfiguration) each).findFirst().get();
+ ReadwriteSplittingRuleConfiguration readwriteSplittingRuleConfig = getRuleConfiguration(schemaName, ReadwriteSplittingRuleConfiguration.class);
+ drop(sqlStatement, readwriteSplittingRuleConfig);
+ readwriteSplittingRuleConfig.getDataSources().addAll(alterReadwriteSplittingRuleConfig.getDataSources());
+ readwriteSplittingRuleConfig.getLoadBalancers().putAll(alterReadwriteSplittingRuleConfig.getLoadBalancers());
+ }
+
+ private void drop(final AlterReadwriteSplittingRuleStatement sqlStatement, final ReadwriteSplittingRuleConfiguration ruleConfig) {
+ getAlteredRuleNames(sqlStatement).forEach(each -> {
+ ReadwriteSplittingDataSourceRuleConfiguration dataSourceRuleConfig = ruleConfig.getDataSources().stream().filter(dataSource -> each.equals(dataSource.getName())).findAny().get();
+ ruleConfig.getDataSources().remove(dataSourceRuleConfig);
+ ruleConfig.getLoadBalancers().remove(dataSourceRuleConfig.getLoadBalancerName());
+ });
+ }
+
private Collection<String> getAlteredRuleNames(final AlterReadwriteSplittingRuleStatement sqlStatement) {
return sqlStatement.getRules()
.stream().map(ReadwriteSplittingRuleSegment::getName).collect(Collectors.toSet());
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterShardingBindingTableRulesBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterShardingBindingTableRulesBackendHandler.java
index f96a498..69ba48f 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterShardingBindingTableRulesBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterShardingBindingTableRulesBackendHandler.java
@@ -43,7 +43,7 @@ public final class AlterShardingBindingTableRulesBackendHandler extends RDLBacke
}
@Override
- public void before(final String schemaName, final AlterShardingBindingTableRulesStatement sqlStatement) {
+ public void check(final String schemaName, final AlterShardingBindingTableRulesStatement sqlStatement) {
if (!findRuleConfiguration(schemaName, ShardingRuleConfiguration.class).isPresent()) {
throw new ShardingBindingTableRulesNotExistsException(schemaName);
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterShardingBroadcastTableRulesBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterShardingBroadcastTableRulesBackendHandler.java
index 967bf1a..d4f48be 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterShardingBroadcastTableRulesBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterShardingBroadcastTableRulesBackendHandler.java
@@ -35,7 +35,7 @@ public final class AlterShardingBroadcastTableRulesBackendHandler extends RDLBac
}
@Override
- public void before(final String schemaName, final AlterShardingBroadcastTableRulesStatement sqlStatement) {
+ public void check(final String schemaName, final AlterShardingBroadcastTableRulesStatement sqlStatement) {
Optional<ShardingRuleConfiguration> shardingRuleConfig = findRuleConfiguration(schemaName, ShardingRuleConfiguration.class);
if (!shardingRuleConfig.isPresent()) {
throw new ShardingBroadcastTableRulesNotExistsException(schemaName);
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterShardingTableRuleBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterShardingTableRuleBackendHandler.java
index 3cf85ec..db8c354 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterShardingTableRuleBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterShardingTableRuleBackendHandler.java
@@ -60,7 +60,7 @@ public final class AlterShardingTableRuleBackendHandler extends RDLBackendHandle
}
@Override
- public void before(final String schemaName, final AlterShardingTableRuleStatement sqlStatement) {
+ public void check(final String schemaName, final AlterShardingTableRuleStatement sqlStatement) {
Collection<String> notExistResources = getInvalidResources(schemaName, getResources(sqlStatement));
if (!notExistResources.isEmpty()) {
throw new ResourceNotExistedException(schemaName, notExistResources);
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateDatabaseDiscoveryRuleBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateDatabaseDiscoveryRuleBackendHandler.java
index b5dfe21..32147c9 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateDatabaseDiscoveryRuleBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateDatabaseDiscoveryRuleBackendHandler.java
@@ -56,28 +56,12 @@ public final class CreateDatabaseDiscoveryRuleBackendHandler extends RDLBackendH
}
@Override
- public void before(final String schemaName, final CreateDatabaseDiscoveryRuleStatement sqlStatement) {
+ public void check(final String schemaName, final CreateDatabaseDiscoveryRuleStatement sqlStatement) {
checkDuplicateRuleNames(schemaName, sqlStatement);
checkResources(schemaName, sqlStatement);
checkDiscoverTypes(sqlStatement);
}
- @Override
- public void doExecute(final String schemaName, final CreateDatabaseDiscoveryRuleStatement sqlStatement) {
- YamlDatabaseDiscoveryRuleConfiguration yamlDatabaseDiscoveryRuleConfig = DatabaseDiscoveryRuleStatementConverter.convert(sqlStatement.getRules());
- DatabaseDiscoveryRuleConfiguration createdDatabaseDiscoveryRuleConfiguration = new YamlRuleConfigurationSwapperEngine()
- .swapToRuleConfigurations(Collections.singleton(yamlDatabaseDiscoveryRuleConfig))
- .stream().filter(each -> each instanceof DatabaseDiscoveryRuleConfiguration).findAny().map(each -> (DatabaseDiscoveryRuleConfiguration) each).get();
- Optional<DatabaseDiscoveryRuleConfiguration> ruleConfig = findRuleConfiguration(schemaName, DatabaseDiscoveryRuleConfiguration.class);
- if (ruleConfig.isPresent()) {
- DatabaseDiscoveryRuleConfiguration existDatabaseDiscoveryRuleConfig = ruleConfig.get();
- existDatabaseDiscoveryRuleConfig.getDataSources().addAll(createdDatabaseDiscoveryRuleConfiguration.getDataSources());
- existDatabaseDiscoveryRuleConfig.getDiscoveryTypes().putAll(createdDatabaseDiscoveryRuleConfiguration.getDiscoveryTypes());
- } else {
- ProxyContext.getInstance().getMetaData(schemaName).getRuleMetaData().getConfigurations().add(createdDatabaseDiscoveryRuleConfiguration);
- }
- }
-
private void checkDuplicateRuleNames(final String schemaName, final CreateDatabaseDiscoveryRuleStatement sqlStatement) {
Optional<DatabaseDiscoveryRuleConfiguration> ruleConfig = findRuleConfiguration(schemaName, DatabaseDiscoveryRuleConfiguration.class);
if (ruleConfig.isPresent()) {
@@ -116,6 +100,22 @@ public final class CreateDatabaseDiscoveryRuleBackendHandler extends RDLBackendH
}
}
+ @Override
+ public void doExecute(final String schemaName, final CreateDatabaseDiscoveryRuleStatement sqlStatement) {
+ YamlDatabaseDiscoveryRuleConfiguration yamlDatabaseDiscoveryRuleConfig = DatabaseDiscoveryRuleStatementConverter.convert(sqlStatement.getRules());
+ DatabaseDiscoveryRuleConfiguration createdDatabaseDiscoveryRuleConfiguration = new YamlRuleConfigurationSwapperEngine()
+ .swapToRuleConfigurations(Collections.singleton(yamlDatabaseDiscoveryRuleConfig))
+ .stream().filter(each -> each instanceof DatabaseDiscoveryRuleConfiguration).findAny().map(each -> (DatabaseDiscoveryRuleConfiguration) each).get();
+ Optional<DatabaseDiscoveryRuleConfiguration> ruleConfig = findRuleConfiguration(schemaName, DatabaseDiscoveryRuleConfiguration.class);
+ if (ruleConfig.isPresent()) {
+ DatabaseDiscoveryRuleConfiguration existDatabaseDiscoveryRuleConfig = ruleConfig.get();
+ existDatabaseDiscoveryRuleConfig.getDataSources().addAll(createdDatabaseDiscoveryRuleConfiguration.getDataSources());
+ existDatabaseDiscoveryRuleConfig.getDiscoveryTypes().putAll(createdDatabaseDiscoveryRuleConfiguration.getDiscoveryTypes());
+ } else {
+ ProxyContext.getInstance().getMetaData(schemaName).getRuleMetaData().getConfigurations().add(createdDatabaseDiscoveryRuleConfiguration);
+ }
+ }
+
private Collection<String> getRuleNames(final DatabaseDiscoveryRuleConfiguration databaseDiscoveryRuleConfiguration) {
return databaseDiscoveryRuleConfiguration.getDataSources().stream().map(DatabaseDiscoveryDataSourceRuleConfiguration::getName).collect(Collectors.toList());
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateEncryptRuleBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateEncryptRuleBackendHandler.java
index da7bd17..b91f735 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateEncryptRuleBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateEncryptRuleBackendHandler.java
@@ -54,28 +54,12 @@ public final class CreateEncryptRuleBackendHandler extends RDLBackendHandler<Cre
}
@Override
- public void before(final String schemaName, final CreateEncryptRuleStatement sqlStatement) {
+ public void check(final String schemaName, final CreateEncryptRuleStatement sqlStatement) {
checkDuplicateRuleNames(schemaName, sqlStatement);
checkEncryptors(sqlStatement);
// TODO check resource
}
- @Override
- public void doExecute(final String schemaName, final CreateEncryptRuleStatement sqlStatement) {
- YamlEncryptRuleConfiguration yamlEncryptRuleConfiguration = EncryptRuleStatementConverter.convert(sqlStatement.getRules());
- EncryptRuleConfiguration createdEncryptRuleConfiguration = new YamlRuleConfigurationSwapperEngine()
- .swapToRuleConfigurations(Collections.singleton(yamlEncryptRuleConfiguration))
- .stream().filter(each -> each instanceof EncryptRuleConfiguration).findAny().map(each -> (EncryptRuleConfiguration) each).get();
- Optional<EncryptRuleConfiguration> ruleConfig = findRuleConfiguration(schemaName, EncryptRuleConfiguration.class);
- if (ruleConfig.isPresent()) {
- EncryptRuleConfiguration existEncryptRuleConfig = ruleConfig.get();
- existEncryptRuleConfig.getTables().addAll(createdEncryptRuleConfiguration.getTables());
- existEncryptRuleConfig.getEncryptors().putAll(createdEncryptRuleConfiguration.getEncryptors());
- } else {
- ProxyContext.getInstance().getMetaData(schemaName).getRuleMetaData().getConfigurations().add(createdEncryptRuleConfiguration);
- }
- }
-
private void checkDuplicateRuleNames(final String schemaName, final CreateEncryptRuleStatement sqlStatement) {
Optional<EncryptRuleConfiguration> ruleConfig = findRuleConfiguration(schemaName, EncryptRuleConfiguration.class);
if (ruleConfig.isPresent()) {
@@ -97,6 +81,22 @@ public final class CreateEncryptRuleBackendHandler extends RDLBackendHandler<Cre
}
}
+ @Override
+ public void doExecute(final String schemaName, final CreateEncryptRuleStatement sqlStatement) {
+ YamlEncryptRuleConfiguration yamlEncryptRuleConfiguration = EncryptRuleStatementConverter.convert(sqlStatement.getRules());
+ EncryptRuleConfiguration createdEncryptRuleConfiguration = new YamlRuleConfigurationSwapperEngine()
+ .swapToRuleConfigurations(Collections.singleton(yamlEncryptRuleConfiguration))
+ .stream().filter(each -> each instanceof EncryptRuleConfiguration).findAny().map(each -> (EncryptRuleConfiguration) each).get();
+ Optional<EncryptRuleConfiguration> ruleConfig = findRuleConfiguration(schemaName, EncryptRuleConfiguration.class);
+ if (ruleConfig.isPresent()) {
+ EncryptRuleConfiguration existEncryptRuleConfig = ruleConfig.get();
+ existEncryptRuleConfig.getTables().addAll(createdEncryptRuleConfiguration.getTables());
+ existEncryptRuleConfig.getEncryptors().putAll(createdEncryptRuleConfiguration.getEncryptors());
+ } else {
+ ProxyContext.getInstance().getMetaData(schemaName).getRuleMetaData().getConfigurations().add(createdEncryptRuleConfiguration);
+ }
+ }
+
private Collection<String> getRuleNames(final EncryptRuleConfiguration encryptRuleConfig) {
return encryptRuleConfig.getTables().stream().map(EncryptTableRuleConfiguration::getName).collect(Collectors.toList());
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateReadwriteSplittingRuleBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateReadwriteSplittingRuleBackendHandler.java
index d16d5dd..82bb5e6 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateReadwriteSplittingRuleBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateReadwriteSplittingRuleBackendHandler.java
@@ -56,28 +56,12 @@ public final class CreateReadwriteSplittingRuleBackendHandler extends RDLBackend
}
@Override
- public void before(final String schemaName, final CreateReadwriteSplittingRuleStatement sqlStatement) {
+ public void check(final String schemaName, final CreateReadwriteSplittingRuleStatement sqlStatement) {
checkDuplicateRuleNames(schemaName, sqlStatement);
checkResources(schemaName, sqlStatement);
checkLoadBalancers(sqlStatement);
}
- @Override
- public void doExecute(final String schemaName, final CreateReadwriteSplittingRuleStatement sqlStatement) {
- YamlReadwriteSplittingRuleConfiguration yamlReadwriteSplittingRuleConfig = ReadwriteSplittingRuleStatementConverter.convert(sqlStatement);
- ReadwriteSplittingRuleConfiguration createdReadwriteSplittingRuleConfig = new YamlRuleConfigurationSwapperEngine()
- .swapToRuleConfigurations(Collections.singleton(yamlReadwriteSplittingRuleConfig))
- .stream().filter(each -> each instanceof ReadwriteSplittingRuleConfiguration).findAny().map(each -> (ReadwriteSplittingRuleConfiguration) each).get();
- Optional<ReadwriteSplittingRuleConfiguration> ruleConfig = findRuleConfiguration(schemaName, ReadwriteSplittingRuleConfiguration.class);
- if (ruleConfig.isPresent()) {
- ReadwriteSplittingRuleConfiguration existReadwriteSplittingRuleConfig = ruleConfig.get();
- existReadwriteSplittingRuleConfig.getDataSources().addAll(createdReadwriteSplittingRuleConfig.getDataSources());
- existReadwriteSplittingRuleConfig.getLoadBalancers().putAll(createdReadwriteSplittingRuleConfig.getLoadBalancers());
- } else {
- ProxyContext.getInstance().getMetaData(schemaName).getRuleMetaData().getConfigurations().add(createdReadwriteSplittingRuleConfig);
- }
- }
-
private void checkDuplicateRuleNames(final String schemaName, final CreateReadwriteSplittingRuleStatement sqlStatement) {
Optional<ReadwriteSplittingRuleConfiguration> ruleConfig = findRuleConfiguration(schemaName, ReadwriteSplittingRuleConfiguration.class);
if (ruleConfig.isPresent()) {
@@ -117,4 +101,20 @@ public final class CreateReadwriteSplittingRuleBackendHandler extends RDLBackend
private Collection<String> getRuleNames(final ReadwriteSplittingRuleConfiguration readwriteSplittingRuleConfiguration) {
return readwriteSplittingRuleConfiguration.getDataSources().stream().map(ReadwriteSplittingDataSourceRuleConfiguration::getName).collect(Collectors.toList());
}
+
+ @Override
+ public void doExecute(final String schemaName, final CreateReadwriteSplittingRuleStatement sqlStatement) {
+ YamlReadwriteSplittingRuleConfiguration yamlReadwriteSplittingRuleConfig = ReadwriteSplittingRuleStatementConverter.convert(sqlStatement);
+ ReadwriteSplittingRuleConfiguration createdReadwriteSplittingRuleConfig = new YamlRuleConfigurationSwapperEngine()
+ .swapToRuleConfigurations(Collections.singleton(yamlReadwriteSplittingRuleConfig))
+ .stream().filter(each -> each instanceof ReadwriteSplittingRuleConfiguration).findAny().map(each -> (ReadwriteSplittingRuleConfiguration) each).get();
+ Optional<ReadwriteSplittingRuleConfiguration> ruleConfig = findRuleConfiguration(schemaName, ReadwriteSplittingRuleConfiguration.class);
+ if (ruleConfig.isPresent()) {
+ ReadwriteSplittingRuleConfiguration existReadwriteSplittingRuleConfig = ruleConfig.get();
+ existReadwriteSplittingRuleConfig.getDataSources().addAll(createdReadwriteSplittingRuleConfig.getDataSources());
+ existReadwriteSplittingRuleConfig.getLoadBalancers().putAll(createdReadwriteSplittingRuleConfig.getLoadBalancers());
+ } else {
+ ProxyContext.getInstance().getMetaData(schemaName).getRuleMetaData().getConfigurations().add(createdReadwriteSplittingRuleConfig);
+ }
+ }
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateShardingBindingTableRulesBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateShardingBindingTableRulesBackendHandler.java
index 8c05154..ca7ec1c 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateShardingBindingTableRulesBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateShardingBindingTableRulesBackendHandler.java
@@ -45,7 +45,7 @@ public final class CreateShardingBindingTableRulesBackendHandler extends RDLBack
}
@Override
- public void before(final String schemaName, final CreateShardingBindingTableRulesStatement sqlStatement) {
+ public void check(final String schemaName, final CreateShardingBindingTableRulesStatement sqlStatement) {
Optional<ShardingRuleConfiguration> ruleConfig = findRuleConfiguration(schemaName, ShardingRuleConfiguration.class);
if (!ruleConfig.isPresent()) {
throw new ShardingBindingTableRulesNotExistsException(schemaName);
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateShardingBroadcastTableRulesBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateShardingBroadcastTableRulesBackendHandler.java
index 1815691..88b37e7 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateShardingBroadcastTableRulesBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateShardingBroadcastTableRulesBackendHandler.java
@@ -35,7 +35,7 @@ public final class CreateShardingBroadcastTableRulesBackendHandler extends RDLBa
}
@Override
- public void before(final String schemaName, final CreateShardingBroadcastTableRulesStatement sqlStatement) {
+ public void check(final String schemaName, final CreateShardingBroadcastTableRulesStatement sqlStatement) {
}
@Override
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateShardingTableRuleBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateShardingTableRuleBackendHandler.java
index 4f5c3ec..798fba5 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateShardingTableRuleBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateShardingTableRuleBackendHandler.java
@@ -63,7 +63,7 @@ public final class CreateShardingTableRuleBackendHandler extends RDLBackendHandl
}
@Override
- public void before(final String schemaName, final CreateShardingTableRuleStatement sqlStatement) {
+ public void check(final String schemaName, final CreateShardingTableRuleStatement sqlStatement) {
Collection<String> notExistResources = getInvalidResources(schemaName, getResources(sqlStatement));
if (!notExistResources.isEmpty()) {
throw new ResourceNotExistedException(schemaName, notExistResources);
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropDatabaseDiscoveryRuleBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropDatabaseDiscoveryRuleBackendHandler.java
index 7947303..98e195e 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropDatabaseDiscoveryRuleBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropDatabaseDiscoveryRuleBackendHandler.java
@@ -38,7 +38,7 @@ public final class DropDatabaseDiscoveryRuleBackendHandler extends RDLBackendHan
}
@Override
- public void before(final String schemaName, final DropDatabaseDiscoveryRuleStatement sqlStatement) {
+ public void check(final String schemaName, final DropDatabaseDiscoveryRuleStatement sqlStatement) {
Optional<DatabaseDiscoveryRuleConfiguration> ruleConfig = findRuleConfiguration(schemaName, DatabaseDiscoveryRuleConfiguration.class);
if (!ruleConfig.isPresent()) {
throw new DatabaseDiscoveryRulesNotExistedException(schemaName, sqlStatement.getRuleNames());
@@ -46,6 +46,14 @@ public final class DropDatabaseDiscoveryRuleBackendHandler extends RDLBackendHan
check(schemaName, ruleConfig.get(), sqlStatement);
}
+ private void check(final String schemaName, final DatabaseDiscoveryRuleConfiguration databaseDiscoveryRuleConfig, final DropDatabaseDiscoveryRuleStatement sqlStatement) {
+ Collection<String> existRuleNames = databaseDiscoveryRuleConfig.getDataSources().stream().map(DatabaseDiscoveryDataSourceRuleConfiguration::getName).collect(Collectors.toList());
+ Collection<String> notExistedRuleNames = sqlStatement.getRuleNames().stream().filter(each -> !existRuleNames.contains(each)).collect(Collectors.toList());
+ if (!notExistedRuleNames.isEmpty()) {
+ throw new DatabaseDiscoveryRulesNotExistedException(schemaName, notExistedRuleNames);
+ }
+ }
+
@Override
public void doExecute(final String schemaName, final DropDatabaseDiscoveryRuleStatement sqlStatement) {
DatabaseDiscoveryRuleConfiguration ruleConfig = getRuleConfiguration(schemaName, DatabaseDiscoveryRuleConfiguration.class);
@@ -59,12 +67,4 @@ public final class DropDatabaseDiscoveryRuleBackendHandler extends RDLBackendHan
ProxyContext.getInstance().getMetaData(schemaName).getRuleMetaData().getConfigurations().remove(ruleConfig);
}
}
-
- private void check(final String schemaName, final DatabaseDiscoveryRuleConfiguration databaseDiscoveryRuleConfig, final DropDatabaseDiscoveryRuleStatement sqlStatement) {
- Collection<String> existRuleNames = databaseDiscoveryRuleConfig.getDataSources().stream().map(DatabaseDiscoveryDataSourceRuleConfiguration::getName).collect(Collectors.toList());
- Collection<String> notExistedRuleNames = sqlStatement.getRuleNames().stream().filter(each -> !existRuleNames.contains(each)).collect(Collectors.toList());
- if (!notExistedRuleNames.isEmpty()) {
- throw new DatabaseDiscoveryRulesNotExistedException(schemaName, notExistedRuleNames);
- }
- }
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropEncryptRuleBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropEncryptRuleBackendHandler.java
index 042588f..a362a4c4 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropEncryptRuleBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropEncryptRuleBackendHandler.java
@@ -38,7 +38,7 @@ public final class DropEncryptRuleBackendHandler extends RDLBackendHandler<DropE
}
@Override
- public void before(final String schemaName, final DropEncryptRuleStatement sqlStatement) {
+ public void check(final String schemaName, final DropEncryptRuleStatement sqlStatement) {
Optional<EncryptRuleConfiguration> ruleConfig = findRuleConfiguration(schemaName, EncryptRuleConfiguration.class);
if (!ruleConfig.isPresent()) {
throw new EncryptRulesNotExistedException(schemaName, sqlStatement.getTables());
@@ -46,6 +46,14 @@ public final class DropEncryptRuleBackendHandler extends RDLBackendHandler<DropE
check(schemaName, ruleConfig.get(), sqlStatement.getTables());
}
+ private void check(final String schemaName, final EncryptRuleConfiguration ruleConfig, final Collection<String> droppedTables) {
+ Collection<String> encryptTables = ruleConfig.getTables().stream().map(EncryptTableRuleConfiguration::getName).collect(Collectors.toList());
+ Collection<String> notExistedTables = droppedTables.stream().filter(each -> !encryptTables.contains(each)).collect(Collectors.toList());
+ if (!notExistedTables.isEmpty()) {
+ throw new EncryptRulesNotExistedException(schemaName, notExistedTables);
+ }
+ }
+
@Override
public void doExecute(final String schemaName, final DropEncryptRuleStatement sqlStatement) {
EncryptRuleConfiguration ruleConfig = getRuleConfiguration(schemaName, EncryptRuleConfiguration.class);
@@ -59,12 +67,4 @@ public final class DropEncryptRuleBackendHandler extends RDLBackendHandler<DropE
ProxyContext.getInstance().getMetaData(schemaName).getRuleMetaData().getConfigurations().remove(ruleConfig);
}
}
-
- private void check(final String schemaName, final EncryptRuleConfiguration ruleConfig, final Collection<String> droppedTables) {
- Collection<String> encryptTables = ruleConfig.getTables().stream().map(EncryptTableRuleConfiguration::getName).collect(Collectors.toList());
- Collection<String> notExistedTables = droppedTables.stream().filter(each -> !encryptTables.contains(each)).collect(Collectors.toList());
- if (!notExistedTables.isEmpty()) {
- throw new EncryptRulesNotExistedException(schemaName, notExistedTables);
- }
- }
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropReadwriteSplittingRuleBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropReadwriteSplittingRuleBackendHandler.java
index a79f3d7..cf0e5ee 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropReadwriteSplittingRuleBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropReadwriteSplittingRuleBackendHandler.java
@@ -38,7 +38,7 @@ public final class DropReadwriteSplittingRuleBackendHandler extends RDLBackendHa
}
@Override
- public void before(final String schemaName, final DropReadwriteSplittingRuleStatement sqlStatement) {
+ public void check(final String schemaName, final DropReadwriteSplittingRuleStatement sqlStatement) {
Optional<ReadwriteSplittingRuleConfiguration> ruleConfig = findRuleConfiguration(schemaName, ReadwriteSplittingRuleConfiguration.class);
if (!ruleConfig.isPresent()) {
throw new ReadwriteSplittingRulesNotExistedException(schemaName, sqlStatement.getRuleNames());
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropShardingBindingTableRulesBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropShardingBindingTableRulesBackendHandler.java
index cbd3abd..be4cc74 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropShardingBindingTableRulesBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropShardingBindingTableRulesBackendHandler.java
@@ -34,7 +34,7 @@ public final class DropShardingBindingTableRulesBackendHandler extends RDLBacken
}
@Override
- public void before(final String schemaName, final DropShardingBindingTableRulesStatement sqlStatement) {
+ public void check(final String schemaName, final DropShardingBindingTableRulesStatement sqlStatement) {
Optional<ShardingRuleConfiguration> ruleConfig = findRuleConfiguration(schemaName, ShardingRuleConfiguration.class);
if (!ruleConfig.isPresent() || ruleConfig.get().getBindingTableGroups().isEmpty()) {
throw new ShardingBindingTableRulesNotExistsException(schemaName);
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropShardingBroadcastTableRulesBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropShardingBroadcastTableRulesBackendHandler.java
index c34c6ec..004a39c 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropShardingBroadcastTableRulesBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropShardingBroadcastTableRulesBackendHandler.java
@@ -34,7 +34,7 @@ public final class DropShardingBroadcastTableRulesBackendHandler extends RDLBack
}
@Override
- public void before(final String schemaName, final DropShardingBroadcastTableRulesStatement sqlStatement) {
+ public void check(final String schemaName, final DropShardingBroadcastTableRulesStatement sqlStatement) {
Optional<ShardingRuleConfiguration> ruleConfig = findRuleConfiguration(schemaName, ShardingRuleConfiguration.class);
if (!ruleConfig.isPresent() || ruleConfig.get().getBroadcastTables().isEmpty()) {
throw new ShardingBroadcastTableRulesNotExistsException(schemaName);
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropShardingTableRuleBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropShardingTableRuleBackendHandler.java
index a1d067a..9995069 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropShardingTableRuleBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropShardingTableRuleBackendHandler.java
@@ -42,7 +42,7 @@ public final class DropShardingTableRuleBackendHandler extends RDLBackendHandler
}
@Override
- public void before(final String schemaName, final DropShardingTableRuleStatement sqlStatement) {
+ public void check(final String schemaName, final DropShardingTableRuleStatement sqlStatement) {
Collection<String> tableNames = sqlStatement.getTableNames().stream().map(each -> each.getIdentifier().getValue()).collect(Collectors.toList());
Optional<ShardingRuleConfiguration> ruleConfig = findRuleConfiguration(schemaName, ShardingRuleConfiguration.class);
if (!ruleConfig.isPresent()) {
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/RDLBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/RDLBackendHandler.java
index 9e9a1db..4869ec0 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/RDLBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/RDLBackendHandler.java
@@ -46,19 +46,19 @@ public abstract class RDLBackendHandler<T extends SQLStatement> extends SchemaRe
@Override
protected final ResponseHeader execute(final String schemaName, final T sqlStatement) {
- before(schemaName, sqlStatement);
+ check(schemaName, sqlStatement);
doExecute(schemaName, sqlStatement);
- after(schemaName);
+ postChange(schemaName);
return new UpdateResponseHeader(sqlStatement);
}
- protected abstract void before(String schemaName, T sqlStatement);
+ protected abstract void check(String schemaName, T sqlStatement);
protected abstract void doExecute(String schemaName, T sqlStatement);
- private void after(final String schemaName) {
- ShardingSphereEventBus.getInstance().post(new RuleConfigurationsAlteredSQLNotificationEvent(schemaName,
- ProxyContext.getInstance().getMetaData(schemaName).getRuleMetaData().getConfigurations()));
+ private void postChange(final String schemaName) {
+ ShardingSphereEventBus.getInstance().post(
+ new RuleConfigurationsAlteredSQLNotificationEvent(schemaName, ProxyContext.getInstance().getMetaData(schemaName).getRuleMetaData().getConfigurations()));
}
@SuppressWarnings("unchecked")