This is an automated email from the ASF dual-hosted git repository.
yx9o 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 7eaf773775b Move package of ShowSPIImplementationsExecutor (#30062)
7eaf773775b is described below
commit 7eaf773775b461d9f17927edabcb7ddacd9704da
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Feb 8 06:32:41 2024 +0800
Move package of ShowSPIImplementationsExecutor (#30062)
* Fix javadoc for ShowStorageUnitsStatement
* Move package of ShowSPIImplementationsExecutor
* Move package of ShowSPIImplementationsExecutor
* Refactor LockClusterExecutor
* Refactor RefreshDatabaseMetaDataExecutor
* Refactor RefreshDatabaseMetaDataExecutor
* Refactor UnlockClusterExecutor
---
.../distsql/handler/query/InUsedEncryptStorageUnitRetriever.java | 2 +-
...istsql.handler.executor.rql.resource.InUsedStorageUnitRetriever} | 0
.../mask/distsql/handler/query/InUsedMaskStorageUnitRetriever.java | 2 +-
...istsql.handler.executor.rql.resource.InUsedStorageUnitRetriever} | 0
.../handler/query/InUsedReadwriteSplittingStorageUnitRetriever.java | 2 +-
...istsql.handler.executor.rql.resource.InUsedStorageUnitRetriever} | 0
.../distsql/handler/query/InUsedShadowStorageUnitRetriever.java | 2 +-
...istsql.handler.executor.rql.resource.InUsedStorageUnitRetriever} | 0
.../distsql/handler/query/InUsedShardingStorageUnitRetriever.java | 2 +-
.../query/ShowShardingAlgorithmImplementationsResultRowBuilder.java | 2 +-
...dler.executor.rql.plugin.ShowSPIImplementationsResultRowBuilder} | 0
...istsql.handler.executor.rql.resource.InUsedStorageUnitRetriever} | 0
.../spi => executor/rql/plugin}/ShowSPIImplementationsExecutor.java | 2 +-
.../rql/plugin}/ShowSPIImplementationsResultRowBuilder.java | 2 +-
.../rql => executor/rql/resource}/InUsedStorageUnitRetriever.java | 2 +-
.../rql => executor/rql/resource}/ShowLogicalTableExecutor.java | 2 +-
.../rql/resource}/ShowRulesUsedStorageUnitExecutor.java | 2 +-
.../rql => executor/rql/resource}/ShowStorageUnitExecutor.java | 2 +-
...shardingsphere.distsql.handler.engine.query.DistSQLQueryExecutor | 5 ++++-
.../engine/query/rql/fixture/FixtureInUsedStorageUnitRetriever.java | 2 +-
.../rql => executor/rql/resource}/ShowLogicalTableExecutorTest.java | 2 +-
.../rql/resource}/ShowRulesUsedStorageUnitExecutorTest.java | 2 +-
.../rql => executor/rql/resource}/ShowStorageUnitExecutorTest.java | 2 +-
...istsql.handler.executor.rql.resource.InUsedStorageUnitRetriever} | 0
.../backend/handler/distsql/ral/updatable/LockClusterExecutor.java | 3 +--
.../distsql/ral/updatable/RefreshDatabaseMetaDataExecutor.java | 6 +-----
.../handler/distsql/ral/updatable/UnlockClusterExecutor.java | 2 +-
...shardingsphere.distsql.handler.engine.query.DistSQLQueryExecutor | 3 ---
28 files changed, 23 insertions(+), 28 deletions(-)
diff --git
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/InUsedEncryptStorageUnitRetriever.java
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/InUsedEncryptStorageUnitRetriever.java
index cd501376776..50c9f27c8e5 100644
---
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/InUsedEncryptStorageUnitRetriever.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.InUsedStorageUnitRetriever;
+import
org.apache.shardingsphere.distsql.handler.executor.rql.resource.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;
diff --git
a/features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever
b/features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.resource.InUsedStorageUnitRetriever
similarity index 100%
rename from
features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever
rename to
features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.resource.InUsedStorageUnitRetriever
diff --git
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/InUsedMaskStorageUnitRetriever.java
b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/InUsedMaskStorageUnitRetriever.java
index a85b979e961..e4cc5d27738 100644
---
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/InUsedMaskStorageUnitRetriever.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.InUsedStorageUnitRetriever;
+import
org.apache.shardingsphere.distsql.handler.executor.rql.resource.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;
diff --git
a/features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever
b/features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.resource.InUsedStorageUnitRetriever
similarity index 100%
rename from
features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever
rename to
features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.resource.InUsedStorageUnitRetriever
diff --git
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/InUsedReadwriteSplittingStorageUnitRetriever.java
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/InUsedReadwriteSplittingStorageUnitRetriever.java
index 72d5b83a968..17b397c9e2e 100644
---
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/InUsedReadwriteSplittingStorageUnitRetriever.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.InUsedStorageUnitRetriever;
+import
org.apache.shardingsphere.distsql.handler.executor.rql.resource.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;
diff --git
a/features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever
b/features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.resource.InUsedStorageUnitRetriever
similarity index 100%
rename from
features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever
rename to
features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.resource.InUsedStorageUnitRetriever
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/InUsedShadowStorageUnitRetriever.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/InUsedShadowStorageUnitRetriever.java
index fc4ff6c52f1..b3663acaae8 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/InUsedShadowStorageUnitRetriever.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.InUsedStorageUnitRetriever;
+import
org.apache.shardingsphere.distsql.handler.executor.rql.resource.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;
diff --git
a/features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever
b/features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.resource.InUsedStorageUnitRetriever
similarity index 100%
rename from
features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever
rename to
features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.resource.InUsedStorageUnitRetriever
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/InUsedShardingStorageUnitRetriever.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/InUsedShardingStorageUnitRetriever.java
index 13a4f127abf..299de5347b4 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/InUsedShardingStorageUnitRetriever.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.InUsedStorageUnitRetriever;
+import
org.apache.shardingsphere.distsql.handler.executor.rql.resource.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;
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAlgorithmImplementationsResultRowBuilder.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAlgorithmImplementationsResultRowBuilder.java
index ce17aa4e2f5..d0a9a86f006 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAlgorithmImplementationsResultRowBuilder.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAlgorithmImplementationsResultRowBuilder.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sharding.distsql.handler.query;
import
org.apache.shardingsphere.distsql.handler.engine.query.ral.algorithm.AlgorithmMetaDataQueryResultRows;
-import
org.apache.shardingsphere.distsql.handler.engine.query.rql.spi.ShowSPIImplementationsResultRowBuilder;
+import
org.apache.shardingsphere.distsql.handler.executor.rql.plugin.ShowSPIImplementationsResultRowBuilder;
import
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.sharding.spi.ShardingAlgorithm;
diff --git
a/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.spi.ShowSPIImplementationsResultRowBuilder
b/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.plugin.ShowSPIImplementationsResultRowBuilder
similarity index 100%
rename from
features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.spi.ShowSPIImplementationsResultRowBuilder
rename to
features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.plugin.ShowSPIImplementationsResultRowBuilder
diff --git
a/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever
b/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.resource.InUsedStorageUnitRetriever
similarity index 100%
rename from
features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever
rename to
features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.resource.InUsedStorageUnitRetriever
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/spi/ShowSPIImplementationsExecutor.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/plugin/ShowSPIImplementationsExecutor.java
similarity index 96%
rename from
infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/spi/ShowSPIImplementationsExecutor.java
rename to
infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/plugin/ShowSPIImplementationsExecutor.java
index 4a2c7afcca9..2cee5c05678 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/spi/ShowSPIImplementationsExecutor.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/plugin/ShowSPIImplementationsExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.query.rql.spi;
+package org.apache.shardingsphere.distsql.handler.executor.rql.plugin;
import lombok.Setter;
import
org.apache.shardingsphere.distsql.handler.engine.query.DistSQLQueryExecutor;
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/spi/ShowSPIImplementationsResultRowBuilder.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/plugin/ShowSPIImplementationsResultRowBuilder.java
similarity index 95%
rename from
infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/spi/ShowSPIImplementationsResultRowBuilder.java
rename to
infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/plugin/ShowSPIImplementationsResultRowBuilder.java
index 6d88c02a1f3..e9da662551e 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/spi/ShowSPIImplementationsResultRowBuilder.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/plugin/ShowSPIImplementationsResultRowBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.query.rql.spi;
+package org.apache.shardingsphere.distsql.handler.executor.rql.plugin;
import
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/InUsedStorageUnitRetriever.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/InUsedStorageUnitRetriever.java
similarity index 95%
rename from
infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/InUsedStorageUnitRetriever.java
rename to
infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/InUsedStorageUnitRetriever.java
index 47b174bbb01..7c644faccc8 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/InUsedStorageUnitRetriever.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/InUsedStorageUnitRetriever.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.query.rql;
+package org.apache.shardingsphere.distsql.handler.executor.rql.resource;
import
org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowRulesUsedStorageUnitStatement;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/ShowLogicalTableExecutor.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowLogicalTableExecutor.java
similarity index 97%
rename from
infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/ShowLogicalTableExecutor.java
rename to
infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowLogicalTableExecutor.java
index 8dffee9a311..5bfadebb549 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/ShowLogicalTableExecutor.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowLogicalTableExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.query.rql;
+package org.apache.shardingsphere.distsql.handler.executor.rql.resource;
import lombok.Setter;
import
org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorDatabaseAware;
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/ShowRulesUsedStorageUnitExecutor.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowRulesUsedStorageUnitExecutor.java
similarity index 98%
rename from
infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/ShowRulesUsedStorageUnitExecutor.java
rename to
infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowRulesUsedStorageUnitExecutor.java
index 48b6f13d9cc..9b275ed46cc 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/ShowRulesUsedStorageUnitExecutor.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowRulesUsedStorageUnitExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.query.rql;
+package org.apache.shardingsphere.distsql.handler.executor.rql.resource;
import com.google.common.base.CaseFormat;
import lombok.Setter;
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/ShowStorageUnitExecutor.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowStorageUnitExecutor.java
similarity index 98%
rename from
infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/ShowStorageUnitExecutor.java
rename to
infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowStorageUnitExecutor.java
index 3646f4724f5..67fb6c23d87 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/ShowStorageUnitExecutor.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowStorageUnitExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.query.rql;
+package org.apache.shardingsphere.distsql.handler.executor.rql.resource;
import lombok.Setter;
import
org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorDatabaseAware;
diff --git
a/infra/distsql-handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.DistSQLQueryExecutor
b/infra/distsql-handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.DistSQLQueryExecutor
index 287970a4e48..0b7739b8f18 100644
---
a/infra/distsql-handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.DistSQLQueryExecutor
+++
b/infra/distsql-handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.DistSQLQueryExecutor
@@ -15,5 +15,8 @@
# limitations under the License.
#
+org.apache.shardingsphere.distsql.handler.executor.rql.resource.ShowStorageUnitExecutor
+org.apache.shardingsphere.distsql.handler.executor.rql.resource.ShowRulesUsedStorageUnitExecutor
+org.apache.shardingsphere.distsql.handler.executor.rql.resource.ShowLogicalTableExecutor
org.apache.shardingsphere.distsql.handler.executor.rql.rule.RuleCountExecutor
-org.apache.shardingsphere.distsql.handler.engine.query.rql.spi.ShowSPIImplementationsExecutor
+org.apache.shardingsphere.distsql.handler.executor.rql.plugin.ShowSPIImplementationsExecutor
diff --git
a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/fixture/FixtureInUsedStorageUnitRetriever.java
b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/fixture/FixtureInUsedStorageUnitRetriever.java
index 06918dc0e22..f096045bdf0 100644
---
a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/fixture/FixtureInUsedStorageUnitRetriever.java
+++
b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/fixture/FixtureInUsedStorageUnitRetriever.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.distsql.handler.engine.query.rql.fixture;
-import
org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever;
+import
org.apache.shardingsphere.distsql.handler.executor.rql.resource.InUsedStorageUnitRetriever;
import
org.apache.shardingsphere.distsql.handler.fixture.DistSQLHandlerFixtureRule;
import
org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowRulesUsedStorageUnitStatement;
diff --git
a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/ShowLogicalTableExecutorTest.java
b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowLogicalTableExecutorTest.java
similarity index 97%
rename from
infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/ShowLogicalTableExecutorTest.java
rename to
infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowLogicalTableExecutorTest.java
index a99be0b1637..2f97644c0fe 100644
---
a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/ShowLogicalTableExecutorTest.java
+++
b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowLogicalTableExecutorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.query.rql;
+package org.apache.shardingsphere.distsql.handler.executor.rql.resource;
import
org.apache.shardingsphere.distsql.statement.rql.resource.ShowLogicalTablesStatement;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
diff --git
a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/ShowRulesUsedStorageUnitExecutorTest.java
b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowRulesUsedStorageUnitExecutorTest.java
similarity index 98%
rename from
infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/ShowRulesUsedStorageUnitExecutorTest.java
rename to
infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowRulesUsedStorageUnitExecutorTest.java
index d3c991aaa7b..0962f610aaa 100644
---
a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/ShowRulesUsedStorageUnitExecutorTest.java
+++
b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowRulesUsedStorageUnitExecutorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.query.rql;
+package org.apache.shardingsphere.distsql.handler.executor.rql.resource;
import
org.apache.shardingsphere.distsql.handler.fixture.DistSQLHandlerFixtureRule;
import
org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowRulesUsedStorageUnitStatement;
diff --git
a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/ShowStorageUnitExecutorTest.java
b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowStorageUnitExecutorTest.java
similarity index 98%
rename from
infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/ShowStorageUnitExecutorTest.java
rename to
infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowStorageUnitExecutorTest.java
index a28259c2dad..e763d5102e5 100644
---
a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/ShowStorageUnitExecutorTest.java
+++
b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowStorageUnitExecutorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.query.rql;
+package org.apache.shardingsphere.distsql.handler.executor.rql.resource;
import
org.apache.shardingsphere.distsql.statement.rql.resource.ShowStorageUnitsStatement;
import
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
diff --git
a/infra/distsql-handler/src/test/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever
b/infra/distsql-handler/src/test/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.resource.InUsedStorageUnitRetriever
similarity index 100%
rename from
infra/distsql-handler/src/test/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.rql.InUsedStorageUnitRetriever
rename to
infra/distsql-handler/src/test/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.resource.InUsedStorageUnitRetriever
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LockClusterExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LockClusterExecutor.java
index a371f6333b5..d371180e689 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LockClusterExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LockClusterExecutor.java
@@ -54,8 +54,7 @@ public final class LockClusterExecutor implements
DistSQLUpdateExecutor<LockClus
}
private void checkState(final ContextManager contextManager) {
- ClusterState currentState =
contextManager.getClusterStateContext().getCurrentState();
- ShardingSpherePreconditions.checkState(ClusterState.OK ==
currentState, () -> new IllegalStateException("Cluster is already locked"));
+ ShardingSpherePreconditions.checkState(ClusterState.OK ==
contextManager.getClusterStateContext().getCurrentState(), () -> new
IllegalStateException("Cluster is already locked"));
}
private void checkAlgorithm(final LockClusterStatement sqlStatement) {
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataExecutor.java
index 6781922397e..57453deaf62 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataExecutor.java
@@ -22,12 +22,10 @@ import
org.apache.shardingsphere.distsql.statement.ral.updatable.RefreshDatabase
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import
org.apache.shardingsphere.infra.metadata.database.schema.util.SystemSchemaUtils;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import java.sql.SQLException;
import java.util.Collections;
import java.util.Map;
-import java.util.Optional;
/**
* Refresh database meta data executor.
@@ -36,9 +34,7 @@ public final class RefreshDatabaseMetaDataExecutor implements
DistSQLUpdateExecu
@Override
public void executeUpdate(final RefreshDatabaseMetaDataStatement
sqlStatement, final ContextManager contextManager) throws SQLException {
- Optional<String> toBeRefreshedDatabaseName =
sqlStatement.getDatabaseName();
- Map<String, ShardingSphereDatabase> databases =
toBeRefreshedDatabaseName
- .map(optional -> Collections.singletonMap(optional,
ProxyContext.getInstance().getContextManager().getDatabase(optional)))
+ Map<String, ShardingSphereDatabase> databases =
sqlStatement.getDatabaseName().map(optional ->
Collections.singletonMap(optional, contextManager.getDatabase(optional)))
.orElseGet(() ->
contextManager.getMetaDataContexts().getMetaData().getDatabases());
for (ShardingSphereDatabase each : databases.values()) {
if (!SystemSchemaUtils.isSystemSchema(each)) {
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlockClusterExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlockClusterExecutor.java
index baf3968f0c4..f2f98d4bc5d 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlockClusterExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlockClusterExecutor.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable;
-import
org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorClusterModeRequired;
import
org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecutor;
+import
org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorClusterModeRequired;
import
org.apache.shardingsphere.distsql.statement.ral.updatable.UnlockClusterStatement;
import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.lock.GlobalLockNames;
diff --git
a/proxy/backend/core/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.DistSQLQueryExecutor
b/proxy/backend/core/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.DistSQLQueryExecutor
index f840821531f..3162e9d703f 100644
---
a/proxy/backend/core/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.DistSQLQueryExecutor
+++
b/proxy/backend/core/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.DistSQLQueryExecutor
@@ -15,9 +15,6 @@
# limitations under the License.
#
-org.apache.shardingsphere.distsql.handler.engine.query.rql.ShowStorageUnitExecutor
-org.apache.shardingsphere.distsql.handler.engine.query.rql.ShowRulesUsedStorageUnitExecutor
-org.apache.shardingsphere.distsql.handler.engine.query.rql.ShowLogicalTableExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.ShowComputeNodesExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.ShowComputeNodeInfoExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.ShowComputeNodeModeExecutor
