Fix sonar issue (apache#29894)

* Rename DropReadwriteSplittingRuleExecutor * Keep DistSQLExecutor's test case consistent * Fix sonar issue
hunkier · Jan 29, 2024 · d185c20 · d185c20
1 parent cd9c360
commit d185c20
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...gsphere/sharding/route/engine/validator/ddl/impl/ShardingDropTableStatementValidator.java b/...gsphere/sharding/route/engine/validator/ddl/impl/ShardingDropTableStatementValidator.java
@@ -77,13 +77,13 @@ public void postValidate(final ShardingRule shardingRule, final SQLStatementCont
 
     private void checkTableInUsed(final ShardingRule shardingRule, final SQLStatementContext sqlStatementContext, final RouteContext routeContext) {
         Collection<String> dropTables = sqlStatementContext.getTablesContext().getTableNames();
-        Set<String> actualTables = routeContext.getRouteUnits().stream().flatMap(each -> each.getTableMappers().stream().map(RouteMapper::getActualName)).collect(Collectors.toSet());
-        // TODO check actual tables not be used in multi rules, and remove this check logic
         Collection<String> otherRuleActualTables = shardingRule.getTableRules().values().stream().filter(each -> !dropTables.contains(each.getLogicTable()))
                 .flatMap(each -> each.getActualDataNodes().stream().map(DataNode::getTableName)).collect(Collectors.toCollection(CaseInsensitiveSet::new));
         if (otherRuleActualTables.isEmpty()) {
             return;
         }
+        // TODO check actual tables not be used in multi rules, and remove this check logic
+        Set<String> actualTables = routeContext.getRouteUnits().stream().flatMap(each -> each.getTableMappers().stream().map(RouteMapper::getActualName)).collect(Collectors.toSet());
         Collection<String> inUsedTables = actualTables.stream().filter(otherRuleActualTables::contains).collect(Collectors.toList());
         ShardingSpherePreconditions.checkState(inUsedTables.isEmpty(), () -> new DropInUsedTablesException(inUsedTables));
     }