This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 f158a7d3b47 Rename xxxExecutor (#26439)
f158a7d3b47 is described below
commit f158a7d3b47326a5008e156c2156373a83f182da
Author: yx9o <[email protected]>
AuthorDate: Tue Jun 20 10:51:07 2023 +0800
Rename xxxExecutor (#26439)
---
...owAlgorithmExecutor.java => ShowShadowAlgorithmsExecutor.java} | 4 ++--
...owTableRuleExecutor.java => ShowShadowTableRulesExecutor.java} | 4 ++--
.../org.apache.shardingsphere.distsql.handler.query.RQLExecutor | 4 ++--
...thmExecutorTest.java => ShowShadowAlgorithmsExecutorTest.java} | 8 ++++----
...uleExecutorTest.java => ShowShadowTableRulesExecutorTest.java} | 8 ++++----
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmExecutor.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmsExecutor.java
similarity index 95%
rename from
features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmExecutor.java
rename to
features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmsExecutor.java
index ff49e9f3d5a..1d11f7e6d23 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmExecutor.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmsExecutor.java
@@ -36,9 +36,9 @@ import java.util.Optional;
import java.util.Properties;
/**
- * Show shadow algorithm executor.
+ * Show shadow algorithms executor.
*/
-public final class ShowShadowAlgorithmExecutor implements
RQLExecutor<ShowShadowAlgorithmsStatement> {
+public final class ShowShadowAlgorithmsExecutor implements
RQLExecutor<ShowShadowAlgorithmsStatement> {
@Override
public Collection<LocalDataQueryResultRow> getRows(final
ShardingSphereDatabase database, final ShowShadowAlgorithmsStatement
sqlStatement) {
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowTableRuleExecutor.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowTableRulesExecutor.java
similarity index 96%
rename from
features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowTableRuleExecutor.java
rename to
features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowTableRulesExecutor.java
index 1c9cca4ad67..c212a3b7032 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowTableRuleExecutor.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowTableRulesExecutor.java
@@ -36,9 +36,9 @@ import java.util.Map;
import java.util.Optional;
/**
- * Show shadow table rule executor.
+ * Show shadow table rules executor.
*/
-public final class ShowShadowTableRuleExecutor implements
RQLExecutor<ShowShadowTableRulesStatement> {
+public final class ShowShadowTableRulesExecutor implements
RQLExecutor<ShowShadowTableRulesStatement> {
private static final String SHADOW_TABLE = "shadow_table";
diff --git
a/features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.query.RQLExecutor
b/features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.query.RQLExecutor
index c6332569a35..79cf6c06835 100644
---
a/features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.query.RQLExecutor
+++
b/features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.query.RQLExecutor
@@ -16,7 +16,7 @@
#
org.apache.shardingsphere.shadow.distsql.handler.query.ShowShadowRuleExecutor
-org.apache.shardingsphere.shadow.distsql.handler.query.ShowShadowTableRuleExecutor
-org.apache.shardingsphere.shadow.distsql.handler.query.ShowShadowAlgorithmExecutor
+org.apache.shardingsphere.shadow.distsql.handler.query.ShowShadowTableRulesExecutor
+org.apache.shardingsphere.shadow.distsql.handler.query.ShowShadowAlgorithmsExecutor
org.apache.shardingsphere.shadow.distsql.handler.query.ShowDefaultShadowAlgorithmExecutor
org.apache.shardingsphere.shadow.distsql.handler.query.CountShadowRuleExecutor
diff --git
a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShowShadowAlgorithmExecutorTest.java
b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShowShadowAlgorithmsExecutorTest.java
similarity index 96%
rename from
features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShowShadowAlgorithmExecutorTest.java
rename to
features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShowShadowAlgorithmsExecutorTest.java
index 9321342ec6c..5537069d557 100644
---
a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShowShadowAlgorithmExecutorTest.java
+++
b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShowShadowAlgorithmsExecutorTest.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import
org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration;
import
org.apache.shardingsphere.shadow.api.config.table.ShadowTableConfiguration;
-import
org.apache.shardingsphere.shadow.distsql.handler.query.ShowShadowAlgorithmExecutor;
+import
org.apache.shardingsphere.shadow.distsql.handler.query.ShowShadowAlgorithmsExecutor;
import
org.apache.shardingsphere.shadow.distsql.parser.statement.ShowShadowAlgorithmsStatement;
import org.apache.shardingsphere.shadow.rule.ShadowRule;
import org.apache.shardingsphere.test.util.PropertiesBuilder;
@@ -42,11 +42,11 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-class ShowShadowAlgorithmExecutorTest {
+class ShowShadowAlgorithmsExecutorTest {
@Test
void assertGetRowData() {
- RQLExecutor<ShowShadowAlgorithmsStatement> executor = new
ShowShadowAlgorithmExecutor();
+ RQLExecutor<ShowShadowAlgorithmsStatement> executor = new
ShowShadowAlgorithmsExecutor();
Collection<LocalDataQueryResultRow> actual =
executor.getRows(mockDatabase(), mock(ShowShadowAlgorithmsStatement.class));
assertThat(actual.size(), is(1));
Iterator<LocalDataQueryResultRow> iterator = actual.iterator();
@@ -59,7 +59,7 @@ class ShowShadowAlgorithmExecutorTest {
@Test
void assertGetColumnNames() {
- RQLExecutor<ShowShadowAlgorithmsStatement> executor = new
ShowShadowAlgorithmExecutor();
+ RQLExecutor<ShowShadowAlgorithmsStatement> executor = new
ShowShadowAlgorithmsExecutor();
Collection<String> columns = executor.getColumnNames();
assertThat(columns.size(), is(4));
Iterator<String> iterator = columns.iterator();
diff --git
a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShowShadowTableRuleExecutorTest.java
b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShowShadowTableRulesExecutorTest.java
similarity index 96%
rename from
features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShowShadowTableRuleExecutorTest.java
rename to
features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShowShadowTableRulesExecutorTest.java
index 47eee9144bf..5a9cebb13e9 100644
---
a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShowShadowTableRuleExecutorTest.java
+++
b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShowShadowTableRulesExecutorTest.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import
org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration;
import
org.apache.shardingsphere.shadow.api.config.table.ShadowTableConfiguration;
-import
org.apache.shardingsphere.shadow.distsql.handler.query.ShowShadowTableRuleExecutor;
+import
org.apache.shardingsphere.shadow.distsql.handler.query.ShowShadowTableRulesExecutor;
import
org.apache.shardingsphere.shadow.distsql.parser.statement.ShowShadowTableRulesStatement;
import org.apache.shardingsphere.shadow.rule.ShadowRule;
import org.apache.shardingsphere.test.util.PropertiesBuilder;
@@ -43,11 +43,11 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-class ShowShadowTableRuleExecutorTest {
+class ShowShadowTableRulesExecutorTest {
@Test
void assertGetRowData() {
- RQLExecutor<ShowShadowTableRulesStatement> executor = new
ShowShadowTableRuleExecutor();
+ RQLExecutor<ShowShadowTableRulesStatement> executor = new
ShowShadowTableRulesExecutor();
Collection<LocalDataQueryResultRow> actual =
executor.getRows(mockDatabase(), mock(ShowShadowTableRulesStatement.class));
assertThat(actual.size(), is(1));
Iterator<LocalDataQueryResultRow> iterator = actual.iterator();
@@ -58,7 +58,7 @@ class ShowShadowTableRuleExecutorTest {
@Test
void assertGetColumnNames() {
- RQLExecutor<ShowShadowTableRulesStatement> executor = new
ShowShadowTableRuleExecutor();
+ RQLExecutor<ShowShadowTableRulesStatement> executor = new
ShowShadowTableRulesExecutor();
Collection<String> columns = executor.getColumnNames();
assertThat(columns.size(), is(2));
Iterator<String> iterator = columns.iterator();
