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 2022/06/20 16:28:51 UTC
[shardingsphere] branch master updated: Refactor DropTrafficRuleStatement (#18468)
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 085264b578f Refactor DropTrafficRuleStatement (#18468)
085264b578f is described below
commit 085264b578f54969b72521459a4ec0cec7ab5390
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Tue Jun 21 00:28:44 2022 +0800
Refactor DropTrafficRuleStatement (#18468)
---
.../common/updatable/DropTrafficRuleStatement.java | 2 +-
.../common/updatable/DropTrafficRuleHandler.java | 2 +-
.../handler/ddl/DropTableStatementHandlerTest.java | 24 ++++++++--------------
3 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/updatable/DropTrafficRuleStatement.java b/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/updatable/DropTrafficRuleStatement.java
index 14d46611ec8..1e6f8fbd57a 100644
--- a/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/updatable/DropTrafficRuleStatement.java
+++ b/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/updatable/DropTrafficRuleStatement.java
@@ -32,5 +32,5 @@ public final class DropTrafficRuleStatement extends UpdatableRALStatement {
private final Collection<String> ruleNames;
- private final boolean containsIfExistClause;
+ private final boolean ifExist;
}
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 5f6deb709b0..f26d758babd 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
protected void update(final ContextManager contextManager) throws DistSQLException {
TrafficRule rule = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(TrafficRule.class);
TrafficRuleConfiguration config = rule.getConfiguration();
- if (!getSqlStatement().isContainsIfExistClause()) {
+ if (!getSqlStatement().isIfExist()) {
checkTrafficRuleConfiguration(config);
}
config.getTrafficStrategies().removeIf(each -> getSqlStatement().getRuleNames().contains(each.getName()));
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/DropTableStatementHandlerTest.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/DropTableStatementHandlerTest.java
index e83da522150..d0d74c6d8df 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/DropTableStatementHandlerTest.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/DropTableStatementHandlerTest.java
@@ -33,61 +33,53 @@ public final class DropTableStatementHandlerTest {
public void assertContainsIfExistClauseForMySQL() {
MySQLDropTableStatement dropTableStatement = new MySQLDropTableStatement();
dropTableStatement.setContainsExistClause(true);
- boolean containsIfExistClause = DropTableStatementHandler.containsExistClause(dropTableStatement);
- assertTrue(containsIfExistClause);
+ assertTrue(DropTableStatementHandler.containsExistClause(dropTableStatement));
}
@Test
public void assertContainsIfExistClauseForPostgreSQL() {
PostgreSQLDropTableStatement dropTableStatement = new PostgreSQLDropTableStatement();
dropTableStatement.setContainsExistClause(true);
- boolean containsIfExistClause = DropTableStatementHandler.containsExistClause(dropTableStatement);
- assertTrue(containsIfExistClause);
+ assertTrue(DropTableStatementHandler.containsExistClause(dropTableStatement));
}
@Test
public void assertContainsIfExistClauseForSQLServer() {
SQLServerDropTableStatement dropTableStatement = new SQLServerDropTableStatement();
dropTableStatement.setContainsExistClause(true);
- boolean containsIfExistClause = DropTableStatementHandler.containsExistClause(dropTableStatement);
- assertTrue(containsIfExistClause);
+ assertTrue(DropTableStatementHandler.containsExistClause(dropTableStatement));
}
@Test
public void assertNotContainsIfExistClauseForMySQL() {
MySQLDropTableStatement dropTableStatement = new MySQLDropTableStatement();
dropTableStatement.setContainsExistClause(false);
- boolean containsIfExistClause = DropTableStatementHandler.containsExistClause(dropTableStatement);
- assertFalse(containsIfExistClause);
+ assertFalse(DropTableStatementHandler.containsExistClause(dropTableStatement));
}
@Test
public void assertNotContainsIfExistClauseForOracle() {
OracleDropTableStatement dropTableStatement = new OracleDropTableStatement();
- boolean containsIfExistClause = DropTableStatementHandler.containsExistClause(dropTableStatement);
- assertFalse(containsIfExistClause);
+ assertFalse(DropTableStatementHandler.containsExistClause(dropTableStatement));
}
@Test
public void assertNotContainsIfExistClauseForPostgreSQL() {
PostgreSQLDropTableStatement dropTableStatement = new PostgreSQLDropTableStatement();
dropTableStatement.setContainsExistClause(false);
- boolean containsIfExistClause = DropTableStatementHandler.containsExistClause(dropTableStatement);
- assertFalse(containsIfExistClause);
+ assertFalse(DropTableStatementHandler.containsExistClause(dropTableStatement));
}
@Test
public void assertNotContainsIfExistClauseForSQL92() {
SQL92DropTableStatement dropTableStatement = new SQL92DropTableStatement();
- boolean containsIfExistClause = DropTableStatementHandler.containsExistClause(dropTableStatement);
- assertFalse(containsIfExistClause);
+ assertFalse(DropTableStatementHandler.containsExistClause(dropTableStatement));
}
@Test
public void assertNotContainsIfExistClauseForSQLServer() {
SQLServerDropTableStatement dropTableStatement = new SQLServerDropTableStatement();
dropTableStatement.setContainsExistClause(false);
- boolean containsIfExistClause = DropTableStatementHandler.containsExistClause(dropTableStatement);
- assertFalse(containsIfExistClause);
+ assertFalse(DropTableStatementHandler.containsExistClause(dropTableStatement));
}
}