You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/06/25 03:56:35 UTC
[shardingsphere] branch master updated: Remove ShardingSphereRuleMetaData.configuration update operators (#18579)
This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng 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 21d9aa95378 Remove ShardingSphereRuleMetaData.configuration update operators (#18579)
21d9aa95378 is described below
commit 21d9aa9537815f1ec2617dd3b7e0c5656b2d6754
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Jun 25 11:56:25 2022 +0800
Remove ShardingSphereRuleMetaData.configuration update operators (#18579)
---
.../distsql/ral/common/updatable/AlterSQLParserRuleHandler.java | 7 ++-----
.../text/distsql/ral/common/updatable/AlterTrafficRuleHandler.java | 7 ++-----
.../distsql/ral/common/updatable/AlterTransactionRuleHandler.java | 3 ---
.../distsql/ral/common/updatable/CreateTrafficRuleHandler.java | 7 ++-----
.../text/distsql/ral/common/updatable/DropTrafficRuleHandler.java | 7 ++-----
5 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterSQLParserRuleHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterSQLParserRuleHandler.java
index 3ffe46e3c8f..23dc73b8074 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterSQLParserRuleHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterSQLParserRuleHandler.java
@@ -37,18 +37,15 @@ public final class AlterSQLParserRuleHandler extends UpdatableRALBackendHandler<
@Override
protected void update(final ContextManager contextManager) {
- replaceNewRule(contextManager);
+ replaceNewRule();
persistNewRuleConfigurations();
}
- private void replaceNewRule(final ContextManager contextManager) {
+ private void replaceNewRule() {
SQLParserRuleConfiguration toBeAlteredRuleConfig = createToBeAlteredRuleConfiguration();
Collection<ShardingSphereRule> globalRules = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getRules();
globalRules.removeIf(each -> each instanceof SQLParserRule);
globalRules.add(new SQLParserRule(toBeAlteredRuleConfig));
- // TODO remove me after ShardingSphereRuleMetaData.configuration removed
- contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getConfigurations().removeIf(each -> each instanceof SQLParserRuleConfiguration);
- contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getConfigurations().add(toBeAlteredRuleConfig);
}
private SQLParserRuleConfiguration createToBeAlteredRuleConfiguration() {
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterTrafficRuleHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterTrafficRuleHandler.java
index bf802910797..0a09079d8ab 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterTrafficRuleHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterTrafficRuleHandler.java
@@ -50,7 +50,7 @@ public final class AlterTrafficRuleHandler extends UpdatableRALBackendHandler<Al
@Override
protected void update(final ContextManager contextManager) throws DistSQLException {
check();
- replaceNewRule(contextManager);
+ replaceNewRule();
persistNewRuleConfigurations();
}
@@ -88,14 +88,11 @@ public final class AlterTrafficRuleHandler extends UpdatableRALBackendHandler<Al
return result;
}
- private void replaceNewRule(final ContextManager contextManager) {
+ private void replaceNewRule() {
TrafficRuleConfiguration toBeAlteredRuleConfig = createToBeAlteredRuleConfiguration();
Collection<ShardingSphereRule> globalRules = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getRules();
globalRules.removeIf(each -> each instanceof TrafficRule);
globalRules.add(new TrafficRule(toBeAlteredRuleConfig));
- // TODO remove me after ShardingSphereRuleMetaData.configuration removed
- contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getConfigurations().removeIf(each -> each instanceof TrafficRuleConfiguration);
- contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getConfigurations().add(toBeAlteredRuleConfig);
}
private TrafficRuleConfiguration createToBeAlteredRuleConfiguration() {
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterTransactionRuleHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterTransactionRuleHandler.java
index 4a11b7a5085..ad174e86ccb 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterTransactionRuleHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterTransactionRuleHandler.java
@@ -51,9 +51,6 @@ public final class AlterTransactionRuleHandler extends UpdatableRALBackendHandle
transactionRule.addResource(databases.get(each));
}
globalRules.add(transactionRule);
- // TODO remove me after ShardingSphereRuleMetaData.configuration removed
- contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getConfigurations().removeIf(each -> each instanceof TransactionRuleConfiguration);
- contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getConfigurations().add(toBeAlteredRuleConfig);
}
private TransactionRuleConfiguration createToBeAlteredRuleConfiguration() {
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/CreateTrafficRuleHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/CreateTrafficRuleHandler.java
index b1bfd50f9a2..17657ad04c3 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/CreateTrafficRuleHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/CreateTrafficRuleHandler.java
@@ -50,7 +50,7 @@ public final class CreateTrafficRuleHandler extends UpdatableRALBackendHandler<C
@Override
protected void update(final ContextManager contextManager) throws DistSQLException {
check();
- replaceNewRule(contextManager);
+ replaceNewRule();
persistNewRuleConfigurations();
}
@@ -88,14 +88,11 @@ public final class CreateTrafficRuleHandler extends UpdatableRALBackendHandler<C
return result;
}
- private void replaceNewRule(final ContextManager contextManager) {
+ private void replaceNewRule() {
TrafficRuleConfiguration toBeAlteredRuleConfig = createToBeAlteredRuleConfiguration();
Collection<ShardingSphereRule> globalRules = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getRules();
globalRules.removeIf(each -> each instanceof TrafficRule);
globalRules.add(new TrafficRule(toBeAlteredRuleConfig));
- // TODO remove me after ShardingSphereRuleMetaData.configuration removed
- contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getConfigurations().removeIf(each -> each instanceof TrafficRuleConfiguration);
- contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getConfigurations().add(toBeAlteredRuleConfig);
}
private TrafficRuleConfiguration createToBeAlteredRuleConfiguration() {
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/DropTrafficRuleHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/DropTrafficRuleHandler.java
index 80b26c0b775..84443da17eb 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/DropTrafficRuleHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/DropTrafficRuleHandler.java
@@ -43,7 +43,7 @@ public final class DropTrafficRuleHandler extends UpdatableRALBackendHandler<Dro
@Override
protected void update(final ContextManager contextManager) throws DistSQLException {
check();
- replaceNewRule(contextManager);
+ replaceNewRule();
persistNewRuleConfigurations();
}
@@ -62,14 +62,11 @@ public final class DropTrafficRuleHandler extends UpdatableRALBackendHandler<Dro
DistSQLException.predictionThrow(notExistRuleNames.isEmpty(), () -> new RequiredRuleMissedException("Traffic"));
}
- private void replaceNewRule(final ContextManager contextManager) {
+ private void replaceNewRule() {
TrafficRuleConfiguration toBeAlteredRuleConfig = createToBeAlteredRuleConfiguration();
Collection<ShardingSphereRule> globalRules = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getRules();
globalRules.removeIf(each -> each instanceof TrafficRule);
globalRules.add(new TrafficRule(toBeAlteredRuleConfig));
- // TODO remove me after ShardingSphereRuleMetaData.configuration removed
- contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getConfigurations().removeIf(each -> each instanceof TrafficRuleConfiguration);
- contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getConfigurations().add(toBeAlteredRuleConfig);
}
private TrafficRuleConfiguration createToBeAlteredRuleConfiguration() {