This is an automated email from the ASF dual-hosted git repository.

duanzhengqiang 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 431d3683229 Fix sonar issue for SingleRuleConfigurationDecorator 
(#32513)
431d3683229 is described below

commit 431d3683229d73f43d5333c5c605b8a2b5b8ac99
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Aug 15 11:00:13 2024 +0800

    Fix sonar issue for SingleRuleConfigurationDecorator (#32513)
---
 .../single/decorator/SingleRuleConfigurationDecorator.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/decorator/SingleRuleConfigurationDecorator.java
 
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/decorator/SingleRuleConfigurationDecorator.java
index 1661f06bd6c..836476368ab 100644
--- 
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/decorator/SingleRuleConfigurationDecorator.java
+++ 
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/decorator/SingleRuleConfigurationDecorator.java
@@ -66,11 +66,11 @@ public final class SingleRuleConfigurationDecorator 
implements RuleConfiguration
         DatabaseType databaseType = dataSources.isEmpty() ? 
DatabaseTypeEngine.getDefaultStorageType() : 
DatabaseTypeEngine.getStorageType(dataSources.values().iterator().next());
         Collection<String> excludedTables = 
SingleTableLoadUtils.getExcludedTables(builtRules);
         Map<String, Collection<DataNode>> actualDataNodes = 
SingleTableDataNodeLoader.load(databaseName, aggregatedDataSources, 
excludedTables);
-        Collection<DataNode> configuredDataNodes = 
SingleTableLoadUtils.convertToDataNodes(databaseName, databaseType, 
splitTables);
         boolean isSchemaSupportedDatabaseType = new 
DatabaseTypeRegistry(databaseType).getDialectDatabaseMetaData().getDefaultSchema().isPresent();
         if (splitTables.contains(SingleTableConstants.ALL_TABLES) || 
splitTables.contains(SingleTableConstants.ALL_SCHEMA_TABLES)) {
             return loadAllTables(isSchemaSupportedDatabaseType, 
actualDataNodes);
         }
+        Collection<DataNode> configuredDataNodes = 
SingleTableLoadUtils.convertToDataNodes(databaseName, databaseType, 
splitTables);
         return loadSpecifiedTables(isSchemaSupportedDatabaseType, 
actualDataNodes, builtRules, configuredDataNodes);
     }
     

Reply via email to