This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 68ea49f8d80 Refactor RQLExecutor.getType() (#27969)
68ea49f8d80 is described below
commit 68ea49f8d8067340b9465faf662dce854d0217a2
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Aug 7 18:52:44 2023 +0800
Refactor RQLExecutor.getType() (#27969)
---
.../broadcast/distsql/handler/query/CountBroadcastRuleExecutor.java | 4 ++--
.../distsql/handler/query/ShowBroadcastTableRuleExecutor.java | 4 ++--
.../encrypt/distsql/handler/query/CountEncryptRuleExecutor.java | 4 ++--
.../encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java | 4 ++--
.../mask/distsql/handler/query/CountMaskRuleExecutor.java | 4 ++--
.../mask/distsql/handler/query/ShowMaskRuleExecutor.java | 4 ++--
.../distsql/handler/query/CountReadwriteSplittingRuleExecutor.java | 4 ++--
.../distsql/handler/query/ShowReadwriteSplittingRuleExecutor.java | 4 ++--
.../shadow/distsql/handler/query/CountShadowRuleExecutor.java | 4 ++--
.../distsql/handler/query/ShowDefaultShadowAlgorithmExecutor.java | 4 ++--
.../shadow/distsql/handler/query/ShowShadowAlgorithmsExecutor.java | 4 ++--
.../shadow/distsql/handler/query/ShowShadowRuleExecutor.java | 4 ++--
.../shadow/distsql/handler/query/ShowShadowTableRulesExecutor.java | 4 ++--
.../sharding/distsql/handler/query/CountShardingRuleExecutor.java | 4 ++--
.../distsql/handler/query/ShowDefaultShardingStrategyExecutor.java | 4 ++--
.../sharding/distsql/handler/query/ShowShardingAlgorithmExecutor.java | 4 ++--
.../sharding/distsql/handler/query/ShowShardingAuditorsExecutor.java | 4 ++--
.../distsql/handler/query/ShowShardingKeyGeneratorExecutor.java | 4 ++--
.../distsql/handler/query/ShowShardingTableNodesExecutor.java | 4 ++--
.../distsql/handler/query/ShowShardingTableReferenceRuleExecutor.java | 4 ++--
.../sharding/distsql/handler/query/ShowShardingTableRuleExecutor.java | 4 ++--
.../handler/query/ShowShardingTableRulesUsedAlgorithmExecutor.java | 4 ++--
.../handler/query/ShowShardingTableRulesUsedAuditorExecutor.java | 4 ++--
.../handler/query/ShowShardingTableRulesUsedKeyGeneratorExecutor.java | 4 ++--
.../distsql/handler/query/ShowUnusedShardingAlgorithmsExecutor.java | 4 ++--
.../distsql/handler/query/ShowUnusedShardingAuditorsExecutor.java | 4 ++--
.../distsql/handler/query/ShowUnusedShardingKeyGeneratorExecutor.java | 4 ++--
.../org/apache/shardingsphere/distsql/handler/query/RQLExecutor.java | 3 +++
.../single/distsql/handler/query/CountSingleTableExecutor.java | 4 ++--
.../handler/query/ShowDefaultSingleTableStorageUnitExecutor.java | 4 ++--
.../single/distsql/handler/query/ShowSingleTableExecutor.java | 4 ++--
.../single/distsql/handler/query/ShowUnloadedSingleTableExecutor.java | 4 ++--
.../proxy/backend/handler/distsql/rql/RQLBackendHandler.java | 2 +-
.../backend/handler/distsql/rql/rule/ShowLogicalTableExecutor.java | 4 ++--
.../handler/distsql/rql/rule/ShowRulesUsedStorageUnitExecutor.java | 4 ++--
.../handler/distsql/rql/storage/unit/ShowStorageUnitExecutor.java | 4 ++--
36 files changed, 72 insertions(+), 69 deletions(-)
diff --git
a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/CountBroadcastRuleExecutor.java
b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/CountBroadcastRuleExecutor.java
index 13f19f0256a..cbb41ab5285 100644
---
a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/CountBroadcastRuleExecutor.java
+++
b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/CountBroadcastRuleExecutor.java
@@ -47,7 +47,7 @@ public final class CountBroadcastRuleExecutor implements
RQLExecutor<CountBroadc
}
@Override
- public String getType() {
- return CountBroadcastRuleStatement.class.getName();
+ public Class<CountBroadcastRuleStatement> getType() {
+ return CountBroadcastRuleStatement.class;
}
}
diff --git
a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/ShowBroadcastTableRuleExecutor.java
b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/ShowBroadcastTableRuleExecutor.java
index 7a030f78588..bcb4baf2d23 100644
---
a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/ShowBroadcastTableRuleExecutor.java
+++
b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/ShowBroadcastTableRuleExecutor.java
@@ -47,7 +47,7 @@ public final class ShowBroadcastTableRuleExecutor implements
RQLExecutor<ShowBro
}
@Override
- public String getType() {
- return ShowBroadcastTableRulesStatement.class.getName();
+ public Class<ShowBroadcastTableRulesStatement> getType() {
+ return ShowBroadcastTableRulesStatement.class;
}
}
diff --git
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/CountEncryptRuleExecutor.java
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/CountEncryptRuleExecutor.java
index 957cbdd95a5..c40032a088e 100644
---
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/CountEncryptRuleExecutor.java
+++
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/CountEncryptRuleExecutor.java
@@ -51,7 +51,7 @@ public final class CountEncryptRuleExecutor implements
RQLExecutor<CountEncryptR
}
@Override
- public String getType() {
- return CountEncryptRuleStatement.class.getName();
+ public Class<CountEncryptRuleStatement> getType() {
+ return CountEncryptRuleStatement.class;
}
}
diff --git
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java
index 301226857c4..e5cfb3d6153 100644
---
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java
+++
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java
@@ -95,7 +95,7 @@ public final class ShowEncryptRuleExecutor implements
RQLExecutor<ShowEncryptRul
}
@Override
- public String getType() {
- return ShowEncryptRulesStatement.class.getName();
+ public Class<ShowEncryptRulesStatement> getType() {
+ return ShowEncryptRulesStatement.class;
}
}
diff --git
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleExecutor.java
b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleExecutor.java
index 53fb72454b0..7d46e14ad2c 100644
---
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleExecutor.java
+++
b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleExecutor.java
@@ -51,7 +51,7 @@ public final class CountMaskRuleExecutor implements
RQLExecutor<CountMaskRuleSta
}
@Override
- public String getType() {
- return CountMaskRuleStatement.class.getName();
+ public Class<CountMaskRuleStatement> getType() {
+ return CountMaskRuleStatement.class;
}
}
diff --git
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRuleExecutor.java
b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRuleExecutor.java
index 6c4d80d4ecf..1590cca8d3f 100644
---
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRuleExecutor.java
+++
b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRuleExecutor.java
@@ -70,7 +70,7 @@ public final class ShowMaskRuleExecutor implements
RQLExecutor<ShowMaskRulesStat
}
@Override
- public String getType() {
- return ShowMaskRulesStatement.class.getName();
+ public Class<ShowMaskRulesStatement> getType() {
+ return ShowMaskRulesStatement.class;
}
}
diff --git
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/CountReadwriteSplittingRuleExecutor.java
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/CountReadwriteSplittingRuleExecutor.java
index 331057244d1..0e579c3f51a 100644
---
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/CountReadwriteSplittingRuleExecutor.java
+++
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/CountReadwriteSplittingRuleExecutor.java
@@ -51,7 +51,7 @@ public final class CountReadwriteSplittingRuleExecutor
implements RQLExecutor<Co
}
@Override
- public String getType() {
- return CountReadwriteSplittingRuleStatement.class.getName();
+ public Class<CountReadwriteSplittingRuleStatement> getType() {
+ return CountReadwriteSplittingRuleStatement.class;
}
}
diff --git
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutor.java
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutor.java
index ba97d2fa4af..b06e099df18 100644
---
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutor.java
+++
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutor.java
@@ -106,7 +106,7 @@ public final class ShowReadwriteSplittingRuleExecutor
implements RQLExecutor<Sho
}
@Override
- public String getType() {
- return ShowReadwriteSplittingRulesStatement.class.getName();
+ public Class<ShowReadwriteSplittingRulesStatement> getType() {
+ return ShowReadwriteSplittingRulesStatement.class;
}
}
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/CountShadowRuleExecutor.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/CountShadowRuleExecutor.java
index a26b9264ad3..bb6725239ca 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/CountShadowRuleExecutor.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/CountShadowRuleExecutor.java
@@ -51,7 +51,7 @@ public final class CountShadowRuleExecutor implements
RQLExecutor<CountShadowRul
}
@Override
- public String getType() {
- return CountShadowRuleStatement.class.getName();
+ public Class<CountShadowRuleStatement> getType() {
+ return CountShadowRuleStatement.class;
}
}
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowDefaultShadowAlgorithmExecutor.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowDefaultShadowAlgorithmExecutor.java
index e7cc7baa2cf..db80eef366c 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowDefaultShadowAlgorithmExecutor.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowDefaultShadowAlgorithmExecutor.java
@@ -69,7 +69,7 @@ public final class ShowDefaultShadowAlgorithmExecutor
implements RQLExecutor<Sho
}
@Override
- public String getType() {
- return ShowDefaultShadowAlgorithmStatement.class.getName();
+ public Class<ShowDefaultShadowAlgorithmStatement> getType() {
+ return ShowDefaultShadowAlgorithmStatement.class;
}
}
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmsExecutor.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmsExecutor.java
index 3dc46912be8..eafea8f7e67 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmsExecutor.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmsExecutor.java
@@ -67,7 +67,7 @@ public final class ShowShadowAlgorithmsExecutor implements
RQLExecutor<ShowShado
}
@Override
- public String getType() {
- return ShowShadowAlgorithmsStatement.class.getName();
+ public Class<ShowShadowAlgorithmsStatement> getType() {
+ return ShowShadowAlgorithmsStatement.class;
}
}
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowRuleExecutor.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowRuleExecutor.java
index ba98afce781..07e4f85dc1a 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowRuleExecutor.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowRuleExecutor.java
@@ -89,7 +89,7 @@ public final class ShowShadowRuleExecutor implements
RQLExecutor<ShowShadowRules
}
@Override
- public String getType() {
- return ShowShadowRulesStatement.class.getName();
+ public Class<ShowShadowRulesStatement> getType() {
+ return ShowShadowRulesStatement.class;
}
}
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowTableRulesExecutor.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowTableRulesExecutor.java
index c212a3b7032..14981d56c2a 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowTableRulesExecutor.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowTableRulesExecutor.java
@@ -80,7 +80,7 @@ public final class ShowShadowTableRulesExecutor implements
RQLExecutor<ShowShado
}
@Override
- public String getType() {
- return ShowShadowTableRulesStatement.class.getName();
+ public Class<ShowShadowTableRulesStatement> getType() {
+ return ShowShadowTableRulesStatement.class;
}
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/CountShardingRuleExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/CountShardingRuleExecutor.java
index 3ef75052ad9..1c97bf44064 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/CountShardingRuleExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/CountShardingRuleExecutor.java
@@ -57,7 +57,7 @@ public final class CountShardingRuleExecutor implements
RQLExecutor<CountShardin
}
@Override
- public String getType() {
- return CountShardingRuleStatement.class.getName();
+ public Class<CountShardingRuleStatement> getType() {
+ return CountShardingRuleStatement.class;
}
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowDefaultShardingStrategyExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowDefaultShardingStrategyExecutor.java
index befd77baed6..abb07f6f919 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowDefaultShardingStrategyExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowDefaultShardingStrategyExecutor.java
@@ -74,7 +74,7 @@ public final class ShowDefaultShardingStrategyExecutor
implements RQLExecutor<Sh
}
@Override
- public String getType() {
- return ShowDefaultShardingStrategyStatement.class.getName();
+ public Class<ShowDefaultShardingStrategyStatement> getType() {
+ return ShowDefaultShardingStrategyStatement.class;
}
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAlgorithmExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAlgorithmExecutor.java
index 9242da1382a..9f271506b6b 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAlgorithmExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAlgorithmExecutor.java
@@ -63,7 +63,7 @@ public final class ShowShardingAlgorithmExecutor implements
RQLExecutor<ShowShar
}
@Override
- public String getType() {
- return ShowShardingAlgorithmsStatement.class.getName();
+ public Class<ShowShardingAlgorithmsStatement> getType() {
+ return ShowShardingAlgorithmsStatement.class;
}
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAuditorsExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAuditorsExecutor.java
index ef78fe3eee6..eab3cd72650 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAuditorsExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAuditorsExecutor.java
@@ -57,7 +57,7 @@ public final class ShowShardingAuditorsExecutor implements
RQLExecutor<ShowShard
}
@Override
- public String getType() {
- return ShowShardingAuditorsStatement.class.getName();
+ public Class<ShowShardingAuditorsStatement> getType() {
+ return ShowShardingAuditorsStatement.class;
}
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingKeyGeneratorExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingKeyGeneratorExecutor.java
index f2a80fdcc82..be662b18d12 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingKeyGeneratorExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingKeyGeneratorExecutor.java
@@ -59,7 +59,7 @@ public final class ShowShardingKeyGeneratorExecutor
implements RQLExecutor<ShowS
}
@Override
- public String getType() {
- return ShowShardingKeyGeneratorsStatement.class.getName();
+ public Class<ShowShardingKeyGeneratorsStatement> getType() {
+ return ShowShardingKeyGeneratorsStatement.class;
}
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableNodesExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableNodesExecutor.java
index f7391adc0c6..af10aac1bda 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableNodesExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableNodesExecutor.java
@@ -70,7 +70,7 @@ public final class ShowShardingTableNodesExecutor implements
RQLExecutor<ShowSha
}
@Override
- public String getType() {
- return ShowShardingTableNodesStatement.class.getName();
+ public Class<ShowShardingTableNodesStatement> getType() {
+ return ShowShardingTableNodesStatement.class;
}
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableReferenceRuleExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableReferenceRuleExecutor.java
index 53d3fcac0fa..de239d3fae6 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableReferenceRuleExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableReferenceRuleExecutor.java
@@ -57,7 +57,7 @@ public final class ShowShardingTableReferenceRuleExecutor
implements RQLExecutor
}
@Override
- public String getType() {
- return ShowShardingTableReferenceRulesStatement.class.getName();
+ public Class<ShowShardingTableReferenceRulesStatement> getType() {
+ return ShowShardingTableReferenceRulesStatement.class;
}
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRuleExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRuleExecutor.java
index 4f5d07f20d1..eef64955654 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRuleExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRuleExecutor.java
@@ -185,7 +185,7 @@ public final class ShowShardingTableRuleExecutor implements
RQLExecutor<ShowShar
}
@Override
- public String getType() {
- return ShowShardingTableRulesStatement.class.getName();
+ public Class<ShowShardingTableRulesStatement> getType() {
+ return ShowShardingTableRulesStatement.class;
}
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAlgorithmExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAlgorithmExecutor.java
index 67b5d4fbb76..52860953016 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAlgorithmExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAlgorithmExecutor.java
@@ -95,7 +95,7 @@ public final class
ShowShardingTableRulesUsedAlgorithmExecutor implements RQLExe
}
@Override
- public String getType() {
- return ShowShardingTableRulesUsedAlgorithmStatement.class.getName();
+ public Class<ShowShardingTableRulesUsedAlgorithmStatement> getType() {
+ return ShowShardingTableRulesUsedAlgorithmStatement.class;
}
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAuditorExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAuditorExecutor.java
index 4650f86f543..5b4a4be132a 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAuditorExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAuditorExecutor.java
@@ -63,7 +63,7 @@ public final class ShowShardingTableRulesUsedAuditorExecutor
implements RQLExecu
}
@Override
- public String getType() {
- return ShowShardingTableRulesUsedAuditorStatement.class.getName();
+ public Class<ShowShardingTableRulesUsedAuditorStatement> getType() {
+ return ShowShardingTableRulesUsedAuditorStatement.class;
}
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedKeyGeneratorExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedKeyGeneratorExecutor.java
index e5b487607ff..dea10fdddff 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedKeyGeneratorExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedKeyGeneratorExecutor.java
@@ -65,7 +65,7 @@ public final class
ShowShardingTableRulesUsedKeyGeneratorExecutor implements RQL
}
@Override
- public String getType() {
- return ShowShardingTableRulesUsedKeyGeneratorStatement.class.getName();
+ public Class<ShowShardingTableRulesUsedKeyGeneratorStatement> getType() {
+ return ShowShardingTableRulesUsedKeyGeneratorStatement.class;
}
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAlgorithmsExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAlgorithmsExecutor.java
index 8c459146638..da4b6dd0260 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAlgorithmsExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAlgorithmsExecutor.java
@@ -91,7 +91,7 @@ public final class ShowUnusedShardingAlgorithmsExecutor
implements RQLExecutor<S
}
@Override
- public String getType() {
- return ShowUnusedShardingAlgorithmsStatement.class.getName();
+ public Class<ShowUnusedShardingAlgorithmsStatement> getType() {
+ return ShowUnusedShardingAlgorithmsStatement.class;
}
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAuditorsExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAuditorsExecutor.java
index bb56a8a9625..674845d74ed 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAuditorsExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAuditorsExecutor.java
@@ -73,7 +73,7 @@ public final class ShowUnusedShardingAuditorsExecutor
implements RQLExecutor<Sho
}
@Override
- public String getType() {
- return ShowUnusedShardingAuditorsStatement.class.getName();
+ public Class<ShowUnusedShardingAuditorsStatement> getType() {
+ return ShowUnusedShardingAuditorsStatement.class;
}
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingKeyGeneratorExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingKeyGeneratorExecutor.java
index 8b902311e7a..22c0489b94c 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingKeyGeneratorExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingKeyGeneratorExecutor.java
@@ -80,7 +80,7 @@ public final class ShowUnusedShardingKeyGeneratorExecutor
implements RQLExecutor
}
@Override
- public String getType() {
- return ShowUnusedShardingKeyGeneratorsStatement.class.getName();
+ public Class<ShowUnusedShardingKeyGeneratorsStatement> getType() {
+ return ShowUnusedShardingKeyGeneratorsStatement.class;
}
}
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/query/RQLExecutor.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/query/RQLExecutor.java
index 39bcf4a6ae6..3da2fee284d 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/query/RQLExecutor.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/query/RQLExecutor.java
@@ -48,4 +48,7 @@ public interface RQLExecutor<T extends RQLStatement> extends
TypedSPI {
* @return query result rows
*/
Collection<LocalDataQueryResultRow> getRows(ShardingSphereDatabase
shardingSphereDatabase, T sqlStatement);
+
+ @Override
+ Class<T> getType();
}
diff --git
a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/CountSingleTableExecutor.java
b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/CountSingleTableExecutor.java
index d62f82e2d07..dc4867202c4 100644
---
a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/CountSingleTableExecutor.java
+++
b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/CountSingleTableExecutor.java
@@ -44,7 +44,7 @@ public final class CountSingleTableExecutor implements
RQLExecutor<CountSingleTa
}
@Override
- public String getType() {
- return CountSingleTableStatement.class.getName();
+ public Class<CountSingleTableStatement> getType() {
+ return CountSingleTableStatement.class;
}
}
diff --git
a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowDefaultSingleTableStorageUnitExecutor.java
b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowDefaultSingleTableStorageUnitExecutor.java
index 70102556d83..ddeb6683091 100644
---
a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowDefaultSingleTableStorageUnitExecutor.java
+++
b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowDefaultSingleTableStorageUnitExecutor.java
@@ -46,7 +46,7 @@ public final class ShowDefaultSingleTableStorageUnitExecutor
implements RQLExecu
}
@Override
- public String getType() {
- return ShowDefaultSingleTableStorageUnitStatement.class.getName();
+ public Class<ShowDefaultSingleTableStorageUnitStatement> getType() {
+ return ShowDefaultSingleTableStorageUnitStatement.class;
}
}
diff --git
a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowSingleTableExecutor.java
b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowSingleTableExecutor.java
index d21c27f91e2..9d03bb9cec6 100644
---
a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowSingleTableExecutor.java
+++
b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowSingleTableExecutor.java
@@ -62,7 +62,7 @@ public final class ShowSingleTableExecutor implements
RQLExecutor<ShowSingleTabl
}
@Override
- public String getType() {
- return ShowSingleTableStatement.class.getName();
+ public Class<ShowSingleTableStatement> getType() {
+ return ShowSingleTableStatement.class;
}
}
diff --git
a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowUnloadedSingleTableExecutor.java
b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowUnloadedSingleTableExecutor.java
index b20a22797ef..ca9efdb58c8 100644
---
a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowUnloadedSingleTableExecutor.java
+++
b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowUnloadedSingleTableExecutor.java
@@ -66,7 +66,7 @@ public final class ShowUnloadedSingleTableExecutor implements
RQLExecutor<ShowUn
}
@Override
- public String getType() {
- return ShowUnloadedSingleTableStatement.class.getName();
+ public Class<ShowUnloadedSingleTableStatement> getType() {
+ return ShowUnloadedSingleTableStatement.class;
}
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RQLBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RQLBackendHandler.java
index cffeb7f457c..9871323f850 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RQLBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RQLBackendHandler.java
@@ -69,7 +69,7 @@ public final class RQLBackendHandler<T extends RQLStatement>
implements DistSQLB
public ResponseHeader execute() throws SQLException {
String databaseName = getDatabaseName(connectionSession, sqlStatement);
checkDatabaseName(databaseName);
- RQLExecutor executor = TypedSPILoader.getService(RQLExecutor.class,
sqlStatement.getClass().getName());
+ RQLExecutor executor = TypedSPILoader.getService(RQLExecutor.class,
sqlStatement.getClass());
queryHeaders = createQueryHeader(executor.getColumnNames());
mergedResult =
createMergedResult(executor.getRows(ProxyContext.getInstance().getDatabase(databaseName),
sqlStatement));
return new QueryResponseHeader(queryHeaders);
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/ShowLogicalTableExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/ShowLogicalTableExecutor.java
index 5f7ad5cec37..c6997642d74 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/ShowLogicalTableExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/ShowLogicalTableExecutor.java
@@ -56,7 +56,7 @@ public final class ShowLogicalTableExecutor implements
RQLExecutor<ShowLogicalTa
}
@Override
- public String getType() {
- return ShowLogicalTablesStatement.class.getName();
+ public Class<ShowLogicalTablesStatement> getType() {
+ return ShowLogicalTablesStatement.class;
}
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/ShowRulesUsedStorageUnitExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/ShowRulesUsedStorageUnitExecutor.java
index da27fe07e7c..be340fb0630 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/ShowRulesUsedStorageUnitExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/ShowRulesUsedStorageUnitExecutor.java
@@ -147,7 +147,7 @@ public final class ShowRulesUsedStorageUnitExecutor
implements RQLExecutor<ShowR
}
@Override
- public String getType() {
- return ShowRulesUsedStorageUnitStatement.class.getName();
+ public Class<ShowRulesUsedStorageUnitStatement> getType() {
+ return ShowRulesUsedStorageUnitStatement.class;
}
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/storage/unit/ShowStorageUnitExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/storage/unit/ShowStorageUnitExecutor.java
index fe0cfb20f02..1e7ed7bd8fb 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/storage/unit/ShowStorageUnitExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/storage/unit/ShowStorageUnitExecutor.java
@@ -141,7 +141,7 @@ public final class ShowStorageUnitExecutor implements
RQLExecutor<ShowStorageUni
}
@Override
- public String getType() {
- return ShowStorageUnitsStatement.class.getName();
+ public Class<ShowStorageUnitsStatement> getType() {
+ return ShowStorageUnitsStatement.class;
}
}
