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

zhangliang 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 92710e4d428 Rename InUsedStorageUnitRetriever (#30056)
92710e4d428 is described below

commit 92710e4d428943a08fc3d280b4b6f0eae710deac
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Feb 7 21:06:54 2024 +0800

    Rename InUsedStorageUnitRetriever (#30056)
---
 ...r.java => InUsedEncryptStorageUnitRetriever.java} |  6 +++---
 ...dler.engine.query.rql.InUsedStorageUnitRetriever} |  2 +-
 ...lder.java => InUsedMaskStorageUnitRetriever.java} |  6 +++---
 ...dler.engine.query.rql.InUsedStorageUnitRetriever} |  2 +-
 ...nUsedReadwriteSplittingStorageUnitRetriever.java} |  6 +++---
 ...dler.engine.query.rql.InUsedStorageUnitRetriever} |  2 +-
 ...er.java => InUsedShadowStorageUnitRetriever.java} |  6 +++---
 ...dler.engine.query.rql.InUsedStorageUnitRetriever} |  2 +-
 ....java => InUsedShardingStorageUnitRetriever.java} |  6 +++---
 ...dler.engine.query.rql.InUsedStorageUnitRetriever} |  2 +-
 ...wBuilder.java => InUsedStorageUnitRetriever.java} |  4 ++--
 .../rql/ShowRulesUsedStorageUnitExecutor.java        | 20 ++++++++++----------
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git 
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRulesUsedStorageUnitRowBuilder.java
 
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/InUsedEncryptStorageUnitRetriever.java
similarity index 88%
rename from 
features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRulesUsedStorageUnitRowBuilder.java
rename to 
features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/InUsedEncryptStorageUnitRetriever.java
index 343404f57c1..cd501376776 100644
--- 
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRulesUsedStorageUnitRowBuilder.java
+++ 
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/InUsedEncryptStorageUnitRetriever.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.encrypt.distsql.handler.query;
 
-import 
org.apache.shardingsphere.distsql.handler.engine.query.rql.ShowRulesUsedStorageUnitRowBuilder;
+import 
org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever;
 import 
org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowRulesUsedStorageUnitStatement;
 import 
org.apache.shardingsphere.encrypt.api.config.rule.EncryptTableRuleConfiguration;
 import org.apache.shardingsphere.encrypt.rule.EncryptRule;
@@ -26,9 +26,9 @@ import java.util.Collection;
 import java.util.stream.Collectors;
 
 /**
- * Show encrypt rules used storage unit row builder.
+ * In used encrypt storage unit retriever.
  */
-public final class ShowEncryptRulesUsedStorageUnitRowBuilder implements 
ShowRulesUsedStorageUnitRowBuilder<EncryptRule> {
+public final class InUsedEncryptStorageUnitRetriever implements 
InUsedStorageUnitRetriever<EncryptRule> {
     
     @Override
     public Collection<String> getInUsedResources(final 
ShowRulesUsedStorageUnitStatement sqlStatement, final EncryptRule rule) {
diff --git 
a/features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.ShowRulesUsedStorageUnitRowBuilder
 
b/features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever
similarity index 89%
rename from 
features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.ShowRulesUsedStorageUnitRowBuilder
rename to 
features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever
index 87c5b172b25..e80d6304a5a 100644
--- 
a/features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.ShowRulesUsedStorageUnitRowBuilder
+++ 
b/features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.mask.distsql.handler.query.ShowMaskRulesUsedStorageUnitRowBuilder
+org.apache.shardingsphere.encrypt.distsql.handler.query.InUsedEncryptStorageUnitRetriever
diff --git 
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRulesUsedStorageUnitRowBuilder.java
 
b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/InUsedMaskStorageUnitRetriever.java
similarity index 88%
rename from 
features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRulesUsedStorageUnitRowBuilder.java
rename to 
features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/InUsedMaskStorageUnitRetriever.java
index 15ddfcf459c..a85b979e961 100644
--- 
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRulesUsedStorageUnitRowBuilder.java
+++ 
b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/InUsedMaskStorageUnitRetriever.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.mask.distsql.handler.query;
 
-import 
org.apache.shardingsphere.distsql.handler.engine.query.rql.ShowRulesUsedStorageUnitRowBuilder;
+import 
org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever;
 import 
org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowRulesUsedStorageUnitStatement;
 import 
org.apache.shardingsphere.mask.api.config.rule.MaskTableRuleConfiguration;
 import org.apache.shardingsphere.mask.rule.MaskRule;
@@ -26,9 +26,9 @@ import java.util.Collection;
 import java.util.stream.Collectors;
 
 /**
- * Show mask rules used storage unit row builder.
+ * In used mask storage unit retriever.
  */
-public final class ShowMaskRulesUsedStorageUnitRowBuilder implements 
ShowRulesUsedStorageUnitRowBuilder<MaskRule> {
+public final class InUsedMaskStorageUnitRetriever implements 
InUsedStorageUnitRetriever<MaskRule> {
     
     @Override
     public Collection<String> getInUsedResources(final 
ShowRulesUsedStorageUnitStatement sqlStatement, final MaskRule rule) {
diff --git 
a/features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.ShowRulesUsedStorageUnitRowBuilder
 
b/features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever
similarity index 89%
rename from 
features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.ShowRulesUsedStorageUnitRowBuilder
rename to 
features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever
index 7af069a0252..ca4a1e52b5f 100644
--- 
a/features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.ShowRulesUsedStorageUnitRowBuilder
+++ 
b/features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.shadow.distsql.handler.query.ShowShadowRulesUsedStorageUnitRowBuilder
+org.apache.shardingsphere.mask.distsql.handler.query.InUsedMaskStorageUnitRetriever
diff --git 
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRulesUsedStorageUnitRowBuilder.java
 
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/InUsedReadwriteSplittingStorageUnitRetriever.java
similarity index 90%
rename from 
features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRulesUsedStorageUnitRowBuilder.java
rename to 
features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/InUsedReadwriteSplittingStorageUnitRetriever.java
index 445223aec3a..72d5b83a968 100644
--- 
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRulesUsedStorageUnitRowBuilder.java
+++ 
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/InUsedReadwriteSplittingStorageUnitRetriever.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.readwritesplitting.distsql.handler.query;
 
 import com.cedarsoftware.util.CaseInsensitiveSet;
-import 
org.apache.shardingsphere.distsql.handler.engine.query.rql.ShowRulesUsedStorageUnitRowBuilder;
+import 
org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever;
 import 
org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowRulesUsedStorageUnitStatement;
 import 
org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration;
 import 
org.apache.shardingsphere.readwritesplitting.rule.ReadwriteSplittingRule;
@@ -28,9 +28,9 @@ import java.util.Collections;
 import java.util.LinkedList;
 
 /**
- * Show readwrite-splitting rules used storage unit row builder.
+ * In used readwrite-splitting storage unit retriever.
  */
-public final class ShowReadwriteSplittingRulesUsedStorageUnitRowBuilder 
implements ShowRulesUsedStorageUnitRowBuilder<ReadwriteSplittingRule> {
+public final class InUsedReadwriteSplittingStorageUnitRetriever implements 
InUsedStorageUnitRetriever<ReadwriteSplittingRule> {
     
     @Override
     public Collection<String> getInUsedResources(final 
ShowRulesUsedStorageUnitStatement sqlStatement, final ReadwriteSplittingRule 
rule) {
diff --git 
a/features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.ShowRulesUsedStorageUnitRowBuilder
 
b/features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever
similarity index 93%
rename from 
features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.ShowRulesUsedStorageUnitRowBuilder
rename to 
features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever
index f210c051245..38045de5251 100644
--- 
a/features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.ShowRulesUsedStorageUnitRowBuilder
+++ 
b/features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.readwritesplitting.distsql.handler.query.ShowReadwriteSplittingRulesUsedStorageUnitRowBuilder
+org.apache.shardingsphere.readwritesplitting.distsql.handler.query.InUsedReadwriteSplittingStorageUnitRetriever
diff --git 
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowRulesUsedStorageUnitRowBuilder.java
 
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/InUsedShadowStorageUnitRetriever.java
similarity index 90%
rename from 
features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowRulesUsedStorageUnitRowBuilder.java
rename to 
features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/InUsedShadowStorageUnitRetriever.java
index 2e5908bd66b..fc4ff6c52f1 100644
--- 
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowRulesUsedStorageUnitRowBuilder.java
+++ 
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/InUsedShadowStorageUnitRetriever.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.shadow.distsql.handler.query;
 
-import 
org.apache.shardingsphere.distsql.handler.engine.query.rql.ShowRulesUsedStorageUnitRowBuilder;
+import 
org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever;
 import 
org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowRulesUsedStorageUnitStatement;
 import 
org.apache.shardingsphere.shadow.api.config.datasource.ShadowDataSourceConfiguration;
 import org.apache.shardingsphere.shadow.rule.ShadowRule;
@@ -27,9 +27,9 @@ import java.util.Collections;
 import java.util.stream.Collectors;
 
 /**
- * Show shadow rules used storage unit row builder.
+ * In used shadow storage unit retriever.
  */
-public final class ShowShadowRulesUsedStorageUnitRowBuilder implements 
ShowRulesUsedStorageUnitRowBuilder<ShadowRule> {
+public final class InUsedShadowStorageUnitRetriever implements 
InUsedStorageUnitRetriever<ShadowRule> {
     
     @Override
     public Collection<String> getInUsedResources(final 
ShowRulesUsedStorageUnitStatement sqlStatement, final ShadowRule rule) {
diff --git 
a/features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.ShowRulesUsedStorageUnitRowBuilder
 
b/features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever
similarity index 88%
rename from 
features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.ShowRulesUsedStorageUnitRowBuilder
rename to 
features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever
index 27d56901da2..67f5041a1fe 100644
--- 
a/features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.ShowRulesUsedStorageUnitRowBuilder
+++ 
b/features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.encrypt.distsql.handler.query.ShowEncryptRulesUsedStorageUnitRowBuilder
+org.apache.shardingsphere.shadow.distsql.handler.query.InUsedShadowStorageUnitRetriever
diff --git 
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingRulesUsedStorageUnitRowBuilder.java
 
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/InUsedShardingStorageUnitRetriever.java
similarity index 90%
rename from 
features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingRulesUsedStorageUnitRowBuilder.java
rename to 
features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/InUsedShardingStorageUnitRetriever.java
index 5310a735501..13a4f127abf 100644
--- 
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingRulesUsedStorageUnitRowBuilder.java
+++ 
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/InUsedShardingStorageUnitRetriever.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.sharding.distsql.handler.query;
 
-import 
org.apache.shardingsphere.distsql.handler.engine.query.rql.ShowRulesUsedStorageUnitRowBuilder;
+import 
org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever;
 import 
org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowRulesUsedStorageUnitStatement;
 import 
org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration;
 import 
org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration;
@@ -27,9 +27,9 @@ import java.util.Collection;
 import java.util.LinkedList;
 
 /**
- * Show sharding rules used storage unit row builder.
+ * In used sharding storage unit retriever.
  */
-public final class ShowShardingRulesUsedStorageUnitRowBuilder implements 
ShowRulesUsedStorageUnitRowBuilder<ShardingRule> {
+public final class InUsedShardingStorageUnitRetriever implements 
InUsedStorageUnitRetriever<ShardingRule> {
     
     @Override
     public Collection<String> getInUsedResources(final 
ShowRulesUsedStorageUnitStatement sqlStatement, final ShardingRule rule) {
diff --git 
a/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.ShowRulesUsedStorageUnitRowBuilder
 
b/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever
similarity index 88%
rename from 
features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.ShowRulesUsedStorageUnitRowBuilder
rename to 
features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever
index 79b6abf85c2..65d6b49a195 100644
--- 
a/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.ShowRulesUsedStorageUnitRowBuilder
+++ 
b/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.sharding.distsql.handler.query.ShowShardingRulesUsedStorageUnitRowBuilder
+org.apache.shardingsphere.sharding.distsql.handler.query.InUsedShardingStorageUnitRetriever
diff --git 
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/ShowRulesUsedStorageUnitRowBuilder.java
 
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/InUsedStorageUnitRetriever.java
similarity index 91%
rename from 
infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/ShowRulesUsedStorageUnitRowBuilder.java
rename to 
infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/InUsedStorageUnitRetriever.java
index f78aea9507e..47b174bbb01 100644
--- 
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/ShowRulesUsedStorageUnitRowBuilder.java
+++ 
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/InUsedStorageUnitRetriever.java
@@ -25,12 +25,12 @@ import 
org.apache.shardingsphere.infra.spi.type.typed.TypedSPI;
 import java.util.Collection;
 
 /**
- * Show rules used storage unit executor.
+ * In used storage unit retriever.
  * 
  * @param <T> type of rule
  */
 @SingletonSPI
-public interface ShowRulesUsedStorageUnitRowBuilder<T extends 
ShardingSphereRule> extends TypedSPI {
+public interface InUsedStorageUnitRetriever<T extends ShardingSphereRule> 
extends TypedSPI {
     
     /**
      * Get in used resources.
diff --git 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/ShowRulesUsedStorageUnitExecutor.java
 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/ShowRulesUsedStorageUnitExecutor.java
index 0434ecb7dc3..ddf31bc8769 100644
--- 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/ShowRulesUsedStorageUnitExecutor.java
+++ 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/ShowRulesUsedStorageUnitExecutor.java
@@ -21,7 +21,7 @@ import com.google.common.base.CaseFormat;
 import lombok.Setter;
 import 
org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorDatabaseAware;
 import 
org.apache.shardingsphere.distsql.handler.engine.query.DistSQLQueryExecutor;
-import 
org.apache.shardingsphere.distsql.handler.engine.query.rql.ShowRulesUsedStorageUnitRowBuilder;
+import 
org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever;
 import 
org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowRulesUsedStorageUnitStatement;
 import 
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
 import 
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
@@ -33,7 +33,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -55,20 +54,21 @@ public final class ShowRulesUsedStorageUnitExecutor 
implements DistSQLQueryExecu
         return 
database.getResourceMetaData().getStorageUnits().containsKey(resourceName) ? 
getRows(sqlStatement) : Collections.emptyList();
     }
     
-    @SuppressWarnings({"rawtypes", "unchecked"})
+    @SuppressWarnings("unchecked")
     private Collection<LocalDataQueryResultRow> getRows(final 
ShowRulesUsedStorageUnitStatement sqlStatement) {
         Collection<LocalDataQueryResultRow> result = new LinkedList<>();
-        for (ShowRulesUsedStorageUnitRowBuilder each : 
ShardingSphereServiceLoader.getServiceInstances(ShowRulesUsedStorageUnitRowBuilder.class))
 {
-            Optional<ShardingSphereRule> rule = 
database.getRuleMetaData().findSingleRule(each.getType());
-            if (rule.isPresent()) {
-                String type = 
CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, 
each.getType().getSimpleName().substring(0, 
each.getType().getSimpleName().indexOf("Rule")));
-                Collection<String> inUsedResources = 
each.getInUsedResources(sqlStatement, rule.get());
-                result.addAll(inUsedResources.stream().map(resource -> new 
LocalDataQueryResultRow(type, resource)).collect(Collectors.toList()));
-            }
+        for (InUsedStorageUnitRetriever<ShardingSphereRule> each : 
ShardingSphereServiceLoader.getServiceInstances(InUsedStorageUnitRetriever.class))
 {
+            
database.getRuleMetaData().findSingleRule(each.getType()).ifPresent(optional -> 
result.addAll(getRows(sqlStatement, optional, each)));
         }
         return result;
     }
     
+    private Collection<LocalDataQueryResultRow> getRows(final 
ShowRulesUsedStorageUnitStatement sqlStatement,
+                                                        final 
ShardingSphereRule rule, final InUsedStorageUnitRetriever<ShardingSphereRule> 
retriever) {
+        String type = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, 
retriever.getType().getSimpleName().substring(0, 
retriever.getType().getSimpleName().indexOf("Rule")));
+        return retriever.getInUsedResources(sqlStatement, 
rule).stream().map(each -> new LocalDataQueryResultRow(type, 
each)).collect(Collectors.toList());
+    }
+    
     @Override
     public Class<ShowRulesUsedStorageUnitStatement> getType() {
         return ShowRulesUsedStorageUnitStatement.class;

Reply via email to