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 f396a7bd744 Refactor MySQL admin executors to use consistent naming
and package structure (#36859)
f396a7bd744 is described below
commit f396a7bd7448053d90265a756a6ed012a9166e24
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Oct 12 21:58:45 2025 +0800
Refactor MySQL admin executors to use consistent naming and package
structure (#36859)
---
.../handler/admin/MySQLAdminExecutorCreator.java | 28 +++++++++++-----------
...Executor.java => MySQLKillProcessExecutor.java} | 4 ++--
.../MySQLShowCreateDatabaseExecutor.java} | 6 ++---
.../MySQLShowDatabasesExecutor.java} | 6 ++---
.../MySQLShowFunctionStatusExecutor.java} | 6 ++---
.../MySQLShowProcedureStatusExecutor.java} | 6 ++---
.../MySQLShowProcessListExecutor.java} | 6 ++---
.../MySQLShowTablesExecutor.java} | 6 ++---
.../admin/MySQLAdminExecutorCreatorTest.java | 24 +++++++++----------
.../SelectInformationSchemataExecutorTest.java | 3 +--
.../MySQLShowCreateDatabaseExecutorTest.java} | 6 ++---
.../MySQLShowDatabasesExecutorTest.java} | 16 ++++++-------
.../MySQLShowFunctionStatusExecutorTest.java} | 6 ++---
.../MySQLShowProcedureStatusExecutorTest.java} | 6 ++---
.../MySQLShowProcessListExecutorTest.java} | 6 ++---
.../MySQLShowTablesExecutorTest.java} | 18 +++++++-------
16 files changed, 76 insertions(+), 77 deletions(-)
diff --git
a/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLAdminExecutorCreator.java
b/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLAdminExecutorCreator.java
index 559a1a4db07..af564a584e2 100644
---
a/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLAdminExecutorCreator.java
+++
b/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLAdminExecutorCreator.java
@@ -21,14 +21,14 @@ import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementCont
import
org.apache.shardingsphere.infra.binder.context.statement.type.dml.SelectStatementContext;
import
org.apache.shardingsphere.proxy.backend.handler.admin.executor.DatabaseAdminExecutor;
import
org.apache.shardingsphere.proxy.backend.handler.admin.executor.DatabaseAdminExecutorCreator;
-import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.KillProcessExecutor;
+import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.MySQLKillProcessExecutor;
import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.MySQLSetVariableAdminExecutor;
-import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.ShowCreateDatabaseExecutor;
-import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.ShowDatabasesExecutor;
-import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.ShowFunctionStatusExecutor;
-import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.ShowProcedureStatusExecutor;
-import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.ShowProcessListExecutor;
-import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.ShowTablesExecutor;
+import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.show.MySQLShowCreateDatabaseExecutor;
+import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.show.MySQLShowDatabasesExecutor;
+import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.show.MySQLShowFunctionStatusExecutor;
+import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.show.MySQLShowProcedureStatusExecutor;
+import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.show.MySQLShowProcessListExecutor;
+import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.show.MySQLShowTablesExecutor;
import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.MySQLUseDatabaseExecutor;
import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.factory.MySQLSelectAdminExecutorFactory;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement;
@@ -60,25 +60,25 @@ public final class MySQLAdminExecutorCreator implements
DatabaseAdminExecutorCre
return Optional.of(new
MySQLUseDatabaseExecutor((MySQLUseStatement) sqlStatement));
}
if (sqlStatement instanceof MySQLShowDatabasesStatement) {
- return Optional.of(new
ShowDatabasesExecutor((MySQLShowDatabasesStatement) sqlStatement));
+ return Optional.of(new
MySQLShowDatabasesExecutor((MySQLShowDatabasesStatement) sqlStatement));
}
if (sqlStatement instanceof MySQLShowTablesStatement) {
- return Optional.of(new
ShowTablesExecutor((MySQLShowTablesStatement) sqlStatement,
sqlStatementContext.getSqlStatement().getDatabaseType()));
+ return Optional.of(new
MySQLShowTablesExecutor((MySQLShowTablesStatement) sqlStatement,
sqlStatementContext.getSqlStatement().getDatabaseType()));
}
if (sqlStatement instanceof MySQLShowCreateDatabaseStatement) {
- return Optional.of(new
ShowCreateDatabaseExecutor((MySQLShowCreateDatabaseStatement) sqlStatement));
+ return Optional.of(new
MySQLShowCreateDatabaseExecutor((MySQLShowCreateDatabaseStatement)
sqlStatement));
}
if (sqlStatement instanceof MySQLShowFunctionStatusStatement) {
- return Optional.of(new
ShowFunctionStatusExecutor((MySQLShowFunctionStatusStatement) sqlStatement));
+ return Optional.of(new
MySQLShowFunctionStatusExecutor((MySQLShowFunctionStatusStatement)
sqlStatement));
}
if (sqlStatement instanceof MySQLShowProcedureStatusStatement) {
- return Optional.of(new
ShowProcedureStatusExecutor((MySQLShowProcedureStatusStatement) sqlStatement));
+ return Optional.of(new
MySQLShowProcedureStatusExecutor((MySQLShowProcedureStatusStatement)
sqlStatement));
}
if (sqlStatement instanceof MySQLShowProcessListStatement) {
- return Optional.of(new
ShowProcessListExecutor(((MySQLShowProcessListStatement)
sqlStatement).isFull()));
+ return Optional.of(new
MySQLShowProcessListExecutor(((MySQLShowProcessListStatement)
sqlStatement).isFull()));
}
if (sqlStatement instanceof MySQLKillStatement) {
- return Optional.of(new KillProcessExecutor((MySQLKillStatement)
sqlStatement));
+ return Optional.of(new
MySQLKillProcessExecutor((MySQLKillStatement) sqlStatement));
}
if (sqlStatement instanceof SetStatement) {
return Optional.of(new
MySQLSetVariableAdminExecutor((SetStatement) sqlStatement));
diff --git
a/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/KillProcessExecutor.java
b/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/MySQLKillProcessExecutor.java
similarity index 95%
rename from
proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/KillProcessExecutor.java
rename to
proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/MySQLKillProcessExecutor.java
index c4a04d5ce02..96bd5eb4baf 100644
---
a/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/KillProcessExecutor.java
+++
b/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/MySQLKillProcessExecutor.java
@@ -29,10 +29,10 @@ import
org.apache.shardingsphere.sql.parser.statement.mysql.dal.MySQLKillStateme
import java.sql.SQLException;
/**
- * Kill process executor.
+ * Kill process executor for MySQL.
*/
@RequiredArgsConstructor
-public final class KillProcessExecutor implements DatabaseAdminExecutor {
+public final class MySQLKillProcessExecutor implements DatabaseAdminExecutor {
private static final String QUERY_SCOPE = "QUERY";
diff --git
a/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowCreateDatabaseExecutor.java
b/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowCreateDatabaseExecutor.java
similarity index 96%
rename from
proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowCreateDatabaseExecutor.java
rename to
proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowCreateDatabaseExecutor.java
index 8f397328c7b..f06be0250ad 100644
---
a/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowCreateDatabaseExecutor.java
+++
b/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowCreateDatabaseExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor;
+package
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.show;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -40,11 +40,11 @@ import java.util.Collections;
import java.util.List;
/**
- * Show create database executor.
+ * Show create database executor for MySQL.
*/
@RequiredArgsConstructor
@Getter
-public final class ShowCreateDatabaseExecutor implements
DatabaseAdminQueryExecutor {
+public final class MySQLShowCreateDatabaseExecutor implements
DatabaseAdminQueryExecutor {
private static final String CREATE_DATABASE_PATTERN = "CREATE DATABASE
`%s`;";
diff --git
a/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowDatabasesExecutor.java
b/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowDatabasesExecutor.java
similarity index 96%
rename from
proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowDatabasesExecutor.java
rename to
proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowDatabasesExecutor.java
index 03b89cb1ff6..33fb87c1f43 100644
---
a/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowDatabasesExecutor.java
+++
b/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowDatabasesExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor;
+package
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.show;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -41,11 +41,11 @@ import java.util.Optional;
import java.util.stream.Collectors;
/**
- * Show databases executor.
+ * Show databases executor for MySQL.
*/
@RequiredArgsConstructor
@Getter
-public final class ShowDatabasesExecutor implements DatabaseAdminQueryExecutor
{
+public final class MySQLShowDatabasesExecutor implements
DatabaseAdminQueryExecutor {
private final MySQLShowDatabasesStatement showDatabasesStatement;
diff --git
a/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowFunctionStatusExecutor.java
b/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowFunctionStatusExecutor.java
similarity index 96%
rename from
proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowFunctionStatusExecutor.java
rename to
proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowFunctionStatusExecutor.java
index 0346b264e55..4721502e824 100644
---
a/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowFunctionStatusExecutor.java
+++
b/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowFunctionStatusExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor;
+package
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.show;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -37,11 +37,11 @@ import java.util.Collections;
import java.util.List;
/**
- * Show function status executor.
+ * Show function status executor for MySQL.
*/
@RequiredArgsConstructor
@Getter
-public final class ShowFunctionStatusExecutor implements
DatabaseAdminQueryExecutor {
+public final class MySQLShowFunctionStatusExecutor implements
DatabaseAdminQueryExecutor {
private final MySQLShowFunctionStatusStatement showFunctionStatusStatement;
diff --git
a/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcedureStatusExecutor.java
b/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowProcedureStatusExecutor.java
similarity index 96%
rename from
proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcedureStatusExecutor.java
rename to
proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowProcedureStatusExecutor.java
index 991998486cc..eb46c33b8c5 100644
---
a/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcedureStatusExecutor.java
+++
b/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowProcedureStatusExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor;
+package
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.show;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -37,11 +37,11 @@ import java.util.Collections;
import java.util.List;
/**
- * Show procedure status executor.
+ * Show procedure status executor for MySQL.
*/
@RequiredArgsConstructor
@Getter
-public final class ShowProcedureStatusExecutor implements
DatabaseAdminQueryExecutor {
+public final class MySQLShowProcedureStatusExecutor implements
DatabaseAdminQueryExecutor {
private final MySQLShowProcedureStatusStatement
showProcedureStatusStatement;
diff --git
a/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcessListExecutor.java
b/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowProcessListExecutor.java
similarity index 97%
rename from
proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcessListExecutor.java
rename to
proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowProcessListExecutor.java
index 751a2cb8bfa..0d77047bcfc 100644
---
a/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcessListExecutor.java
+++
b/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowProcessListExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor;
+package
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.show;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -42,10 +42,10 @@ import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
- * Show process list executor.
+ * Show process list executor for MySQL.
*/
@RequiredArgsConstructor
-public final class ShowProcessListExecutor implements
DatabaseAdminQueryExecutor {
+public final class MySQLShowProcessListExecutor implements
DatabaseAdminQueryExecutor {
private final boolean showFullProcesslist;
diff --git
a/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowTablesExecutor.java
b/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowTablesExecutor.java
similarity index 97%
rename from
proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowTablesExecutor.java
rename to
proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowTablesExecutor.java
index 9e01fb2d972..8170d1e645e 100644
---
a/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowTablesExecutor.java
+++
b/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowTablesExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor;
+package
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.show;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -51,10 +51,10 @@ import java.util.regex.Pattern;
import java.util.stream.Collectors;
/**
- * Show tables executor.
+ * Show tables executor for MySQL.
*/
@RequiredArgsConstructor
-public final class ShowTablesExecutor implements DatabaseAdminQueryExecutor {
+public final class MySQLShowTablesExecutor implements
DatabaseAdminQueryExecutor {
private final MySQLShowTablesStatement sqlStatement;
diff --git
a/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLAdminExecutorCreatorTest.java
b/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLAdminExecutorCreatorTest.java
index 5c14c722e47..0fdff82b6ca 100644
---
a/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLAdminExecutorCreatorTest.java
+++
b/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLAdminExecutorCreatorTest.java
@@ -36,12 +36,12 @@ import
org.apache.shardingsphere.proxy.backend.handler.admin.executor.DatabaseMe
import
org.apache.shardingsphere.proxy.backend.handler.admin.executor.DatabaseAdminExecutor;
import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.MySQLSetVariableAdminExecutor;
import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.MySQLSystemVariableQueryExecutor;
-import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.ShowCreateDatabaseExecutor;
-import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.ShowDatabasesExecutor;
-import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.ShowFunctionStatusExecutor;
-import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.ShowProcedureStatusExecutor;
-import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.ShowProcessListExecutor;
-import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.ShowTablesExecutor;
+import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.show.MySQLShowCreateDatabaseExecutor;
+import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.show.MySQLShowDatabasesExecutor;
+import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.show.MySQLShowFunctionStatusExecutor;
+import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.show.MySQLShowProcedureStatusExecutor;
+import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.show.MySQLShowProcessListExecutor;
+import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.show.MySQLShowTablesExecutor;
import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.MySQLUseDatabaseExecutor;
import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.select.NoResourceShowExecutor;
import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.select.SelectInformationSchemataExecutor;
@@ -98,7 +98,7 @@ class MySQLAdminExecutorCreatorTest {
SQLStatementContext sqlStatementContext = new
CommonSQLStatementContext(new MySQLShowFunctionStatusStatement(databaseType,
null));
Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "", "",
Collections.emptyList());
assertTrue(actual.isPresent());
- assertThat(actual.get(), isA(ShowFunctionStatusExecutor.class));
+ assertThat(actual.get(), isA(MySQLShowFunctionStatusExecutor.class));
}
@Test
@@ -106,7 +106,7 @@ class MySQLAdminExecutorCreatorTest {
SQLStatementContext sqlStatementContext = new
CommonSQLStatementContext(new MySQLShowProcedureStatusStatement(databaseType,
null));
Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "", "",
Collections.emptyList());
assertTrue(actual.isPresent());
- assertThat(actual.get(), isA(ShowProcedureStatusExecutor.class));
+ assertThat(actual.get(), isA(MySQLShowProcedureStatusExecutor.class));
}
@Test
@@ -114,7 +114,7 @@ class MySQLAdminExecutorCreatorTest {
SQLStatementContext sqlStatementContext = new
CommonSQLStatementContext(new MySQLShowTablesStatement(databaseType, null,
null, false));
Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "", "",
Collections.emptyList());
assertTrue(actual.isPresent());
- assertThat(actual.get(), isA(ShowTablesExecutor.class));
+ assertThat(actual.get(), isA(MySQLShowTablesExecutor.class));
}
@Test
@@ -130,7 +130,7 @@ class MySQLAdminExecutorCreatorTest {
SQLStatementContext sqlStatementContext = new
CommonSQLStatementContext(new MySQLShowDatabasesStatement(databaseType, null));
Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "", "",
Collections.emptyList());
assertTrue(actual.isPresent());
- assertThat(actual.get(), isA(ShowDatabasesExecutor.class));
+ assertThat(actual.get(), isA(MySQLShowDatabasesExecutor.class));
}
@Test
@@ -138,7 +138,7 @@ class MySQLAdminExecutorCreatorTest {
SQLStatementContext sqlStatementContext = new
CommonSQLStatementContext(new MySQLShowProcessListStatement(databaseType,
false));
Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "", "",
Collections.emptyList());
assertTrue(actual.isPresent());
- assertThat(actual.get(), isA(ShowProcessListExecutor.class));
+ assertThat(actual.get(), isA(MySQLShowProcessListExecutor.class));
}
@Test
@@ -146,7 +146,7 @@ class MySQLAdminExecutorCreatorTest {
SQLStatementContext sqlStatementContext = new
CommonSQLStatementContext(new MySQLShowCreateDatabaseStatement(databaseType,
null));
Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "", "",
Collections.emptyList());
assertTrue(actual.isPresent());
- assertThat(actual.get(), isA(ShowCreateDatabaseExecutor.class));
+ assertThat(actual.get(), isA(MySQLShowCreateDatabaseExecutor.class));
}
@Test
diff --git
a/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/information/SelectInformationSchemataExecutorTest.java
b/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/select/SelectInformationSchemataExecutorTest.java
similarity index 98%
rename from
proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/information/SelectInformationSchemataExecutorTest.java
rename to
proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/select/SelectInformationSchemataExecutorTest.java
index 1cb914a2b8f..d1212a00a72 100644
---
a/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/information/SelectInformationSchemataExecutorTest.java
+++
b/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/select/SelectInformationSchemataExecutorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.information;
+package
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.select;
import
org.apache.shardingsphere.authority.provider.database.DatabasePermittedPrivileges;
import org.apache.shardingsphere.authority.rule.AuthorityRule;
@@ -36,7 +36,6 @@ import
org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
import
org.apache.shardingsphere.parser.rule.builder.DefaultSQLParserRuleConfigurationBuilder;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.select.SelectInformationSchemataExecutor;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.dml.SelectStatement;
import org.apache.shardingsphere.test.infra.fixture.jdbc.MockedDataSource;
diff --git
a/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowCreateDatabaseExecutorTest.java
b/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowCreateDatabaseExecutorTest.java
similarity index 94%
rename from
proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowCreateDatabaseExecutorTest.java
rename to
proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowCreateDatabaseExecutorTest.java
index 1624ef2086a..c5faad059a1 100644
---
a/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowCreateDatabaseExecutorTest.java
+++
b/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowCreateDatabaseExecutorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor;
+package
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.show;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
@@ -38,7 +38,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.mock;
@ExtendWith(MockitoExtension.class)
-class ShowCreateDatabaseExecutorTest {
+class MySQLShowCreateDatabaseExecutorTest {
private static final String DATABASE_PATTERN = "db_%s";
@@ -47,7 +47,7 @@ class ShowCreateDatabaseExecutorTest {
@Test
void assertExecute() throws SQLException {
MySQLShowCreateDatabaseStatement statement = new
MySQLShowCreateDatabaseStatement(databaseType, "db_0");
- ShowCreateDatabaseExecutor executor = new
ShowCreateDatabaseExecutor(statement);
+ MySQLShowCreateDatabaseExecutor executor = new
MySQLShowCreateDatabaseExecutor(statement);
executor.execute(mock(ConnectionSession.class), new
ShardingSphereMetaData(createDatabases(), mock(), mock(), mock()));
assertThat(executor.getQueryResultMetaData().getColumnCount(), is(2));
int count = 0;
diff --git
a/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowDatabasesExecutorTest.java
b/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowDatabasesExecutorTest.java
similarity index 92%
rename from
proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowDatabasesExecutorTest.java
rename to
proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowDatabasesExecutorTest.java
index 17238e6b576..afed5fa2458 100644
---
a/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowDatabasesExecutorTest.java
+++
b/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowDatabasesExecutorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor;
+package
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.show;
import org.apache.shardingsphere.authority.model.ShardingSpherePrivileges;
import org.apache.shardingsphere.authority.rule.AuthorityRule;
@@ -54,7 +54,7 @@ import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
@MockitoSettings(strictness = Strictness.LENIENT)
-class ShowDatabasesExecutorTest {
+class MySQLShowDatabasesExecutorTest {
private static final String DATABASE_PATTERN = "database_%s";
@@ -62,7 +62,7 @@ class ShowDatabasesExecutorTest {
@Test
void assertExecute() throws SQLException {
- ShowDatabasesExecutor executor = new ShowDatabasesExecutor(new
MySQLShowDatabasesStatement(databaseType, null));
+ MySQLShowDatabasesExecutor executor = new
MySQLShowDatabasesExecutor(new MySQLShowDatabasesStatement(databaseType, null));
executor.execute(mockConnectionSession(), mockMetaData());
QueryResultMetaData queryResultMetaData =
executor.getQueryResultMetaData();
assertThat(queryResultMetaData.getColumnCount(), is(1));
@@ -78,12 +78,12 @@ class ShowDatabasesExecutorTest {
ShowLikeSegment showLikeSegment = new ShowLikeSegment(0, 0,
"database%");
showFilterSegment.setLike(showLikeSegment);
MySQLShowDatabasesStatement showDatabasesStatement = new
MySQLShowDatabasesStatement(databaseType, showFilterSegment);
- ShowDatabasesExecutor executor = new
ShowDatabasesExecutor(showDatabasesStatement);
+ MySQLShowDatabasesExecutor executor = new
MySQLShowDatabasesExecutor(showDatabasesStatement);
executor.execute(mockConnectionSession(), mockMetaData());
assertThat(getActual(executor), is(getExpected()));
}
- private Collection<String> getActual(final ShowDatabasesExecutor executor)
throws SQLException {
+ private Collection<String> getActual(final MySQLShowDatabasesExecutor
executor) throws SQLException {
Map<String, String> result = new ConcurrentHashMap<>(10, 1F);
while (executor.getMergedResult().next()) {
String value = executor.getMergedResult().getValue(1,
Object.class).toString();
@@ -107,7 +107,7 @@ class ShowDatabasesExecutorTest {
ShowLikeSegment showLikeSegment = new ShowLikeSegment(0, 0, "%_1");
showFilterSegment.setLike(showLikeSegment);
MySQLShowDatabasesStatement showDatabasesStatement = new
MySQLShowDatabasesStatement(databaseType, showFilterSegment);
- ShowDatabasesExecutor executor = new
ShowDatabasesExecutor(showDatabasesStatement);
+ MySQLShowDatabasesExecutor executor = new
MySQLShowDatabasesExecutor(showDatabasesStatement);
executor.execute(mockConnectionSession(), mockMetaData());
assertThat(executor.getQueryResultMetaData().getColumnCount(), is(1));
int count = 0;
@@ -124,7 +124,7 @@ class ShowDatabasesExecutorTest {
ShowLikeSegment showLikeSegment = new ShowLikeSegment(0, 0,
"database_9");
showFilterSegment.setLike(showLikeSegment);
MySQLShowDatabasesStatement showDatabasesStatement = new
MySQLShowDatabasesStatement(databaseType, showFilterSegment);
- ShowDatabasesExecutor executor = new
ShowDatabasesExecutor(showDatabasesStatement);
+ MySQLShowDatabasesExecutor executor = new
MySQLShowDatabasesExecutor(showDatabasesStatement);
executor.execute(mockConnectionSession(), mockMetaData());
assertThat(executor.getQueryResultMetaData().getColumnCount(), is(1));
int count = 0;
@@ -141,7 +141,7 @@ class ShowDatabasesExecutorTest {
ShowLikeSegment showLikeSegment = new ShowLikeSegment(0, 0,
"not_exist_database");
showFilterSegment.setLike(showLikeSegment);
MySQLShowDatabasesStatement showDatabasesStatement = new
MySQLShowDatabasesStatement(databaseType, showFilterSegment);
- ShowDatabasesExecutor executor = new
ShowDatabasesExecutor(showDatabasesStatement);
+ MySQLShowDatabasesExecutor executor = new
MySQLShowDatabasesExecutor(showDatabasesStatement);
executor.execute(mockConnectionSession(), mockMetaData());
assertThat(executor.getQueryResultMetaData().getColumnCount(), is(1));
int count = 0;
diff --git
a/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowFunctionStatusExecutorTest.java
b/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowFunctionStatusExecutorTest.java
similarity index 92%
rename from
proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowFunctionStatusExecutorTest.java
rename to
proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowFunctionStatusExecutorTest.java
index f747ad72b3e..4f7a1ca6f0e 100644
---
a/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowFunctionStatusExecutorTest.java
+++
b/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowFunctionStatusExecutorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor;
+package
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.show;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
@@ -38,7 +38,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.mock;
@ExtendWith(MockitoExtension.class)
-class ShowFunctionStatusExecutorTest {
+class MySQLShowFunctionStatusExecutorTest {
private static final String DATABASE_PATTERN = "db_%s";
@@ -46,7 +46,7 @@ class ShowFunctionStatusExecutorTest {
@Test
void assertExecute() throws SQLException {
- ShowFunctionStatusExecutor executor = new
ShowFunctionStatusExecutor(new MySQLShowFunctionStatusStatement(databaseType,
null));
+ MySQLShowFunctionStatusExecutor executor = new
MySQLShowFunctionStatusExecutor(new
MySQLShowFunctionStatusStatement(databaseType, null));
executor.execute(mock(ConnectionSession.class), new
ShardingSphereMetaData(createDatabases(), mock(), mock(), mock()));
assertThat(executor.getQueryResultMetaData().getColumnCount(), is(11));
}
diff --git
a/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcedureStatusExecutorTest.java
b/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowProcedureStatusExecutorTest.java
similarity index 92%
rename from
proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcedureStatusExecutorTest.java
rename to
proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowProcedureStatusExecutorTest.java
index e140eee2ffc..f429c37fd31 100644
---
a/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcedureStatusExecutorTest.java
+++
b/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowProcedureStatusExecutorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor;
+package
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.show;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
@@ -38,7 +38,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.mock;
@ExtendWith(MockitoExtension.class)
-class ShowProcedureStatusExecutorTest {
+class MySQLShowProcedureStatusExecutorTest {
private static final String DATABASE_PATTERN = "db_%s";
@@ -46,7 +46,7 @@ class ShowProcedureStatusExecutorTest {
@Test
void assertExecute() throws SQLException {
- ShowProcedureStatusExecutor executor = new
ShowProcedureStatusExecutor(new MySQLShowProcedureStatusStatement(databaseType,
null));
+ MySQLShowProcedureStatusExecutor executor = new
MySQLShowProcedureStatusExecutor(new
MySQLShowProcedureStatusStatement(databaseType, null));
executor.execute(mock(ConnectionSession.class), new
ShardingSphereMetaData(createDatabases(), mock(), mock(), mock()));
assertThat(executor.getQueryResultMetaData().getColumnCount(), is(11));
}
diff --git
a/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcessListExecutorTest.java
b/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowProcessListExecutorTest.java
similarity index 96%
rename from
proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcessListExecutorTest.java
rename to
proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowProcessListExecutorTest.java
index bbba9a3374f..9a4d006991a 100644
---
a/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcessListExecutorTest.java
+++
b/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowProcessListExecutorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor;
+package
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.show;
import io.netty.util.DefaultAttributeMap;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
@@ -44,7 +44,7 @@ import static org.mockito.Mockito.when;
@ExtendWith(AutoMockExtension.class)
@StaticMockSettings(ProxyContext.class)
-class ShowProcessListExecutorTest {
+class MySQLShowProcessListExecutorTest {
private final DatabaseType databaseType =
TypedSPILoader.getService(DatabaseType.class, "MySQL");
@@ -53,7 +53,7 @@ class ShowProcessListExecutorTest {
ContextManager contextManager = mock(ContextManager.class,
RETURNS_DEEP_STUBS);
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
when(contextManager.getPersistServiceFacade().getModeFacade().getProcessService().getProcessList()).thenReturn(mockProcessList());
- ShowProcessListExecutor showProcessListExecutor = new
ShowProcessListExecutor(false);
+ MySQLShowProcessListExecutor showProcessListExecutor = new
MySQLShowProcessListExecutor(false);
showProcessListExecutor.execute(new ConnectionSession(databaseType,
new DefaultAttributeMap()), mock());
assertThat(showProcessListExecutor.getQueryResultMetaData().getColumnCount(),
is(8));
MergedResult mergedResult = showProcessListExecutor.getMergedResult();
diff --git
a/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowTablesExecutorTest.java
b/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowTablesExecutorTest.java
similarity index 92%
rename from
proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowTablesExecutorTest.java
rename to
proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowTablesExecutorTest.java
index 20b29bdc3b1..da532cc7265 100644
---
a/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowTablesExecutorTest.java
+++
b/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowTablesExecutorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor;
+package
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.show;
import org.apache.shardingsphere.authority.rule.AuthorityRule;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
@@ -59,7 +59,7 @@ import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
@MockitoSettings(strictness = Strictness.LENIENT)
-class ShowTablesExecutorTest {
+class MySQLShowTablesExecutorTest {
private static final String DATABASE_PATTERN = "db_%s";
@@ -67,7 +67,7 @@ class ShowTablesExecutorTest {
@Test
void assertShowTablesExecutorWithoutFilter() throws SQLException {
- ShowTablesExecutor executor = new ShowTablesExecutor(new
MySQLShowTablesStatement(databaseType, null, null, false), databaseType);
+ MySQLShowTablesExecutor executor = new MySQLShowTablesExecutor(new
MySQLShowTablesStatement(databaseType, null, null, false), databaseType);
executor.execute(mockConnectionSession(),
mockMetaData(mockDatabases()));
assertThat(executor.getQueryResultMetaData().getColumnCount(), is(1));
executor.getMergedResult().next();
@@ -85,7 +85,7 @@ class ShowTablesExecutorTest {
void assertShowTablesExecutorWithFull() throws SQLException {
MySQLShowTablesStatement showTablesStatement =
mock(MySQLShowTablesStatement.class);
when(showTablesStatement.isContainsFull()).thenReturn(true);
- ShowTablesExecutor executor = new
ShowTablesExecutor(showTablesStatement, databaseType);
+ MySQLShowTablesExecutor executor = new
MySQLShowTablesExecutor(showTablesStatement, databaseType);
executor.execute(mockConnectionSession(),
mockMetaData(mockDatabases()));
assertThat(executor.getQueryResultMetaData().getColumnCount(), is(2));
}
@@ -95,7 +95,7 @@ class ShowTablesExecutorTest {
ShowFilterSegment showFilterSegment = mock(ShowFilterSegment.class);
when(showFilterSegment.getLike()).thenReturn(Optional.of(new
ShowLikeSegment(0, 10, "t_account%")));
MySQLShowTablesStatement showTablesStatement = new
MySQLShowTablesStatement(databaseType, null, showFilterSegment, false);
- ShowTablesExecutor executor = new
ShowTablesExecutor(showTablesStatement, databaseType);
+ MySQLShowTablesExecutor executor = new
MySQLShowTablesExecutor(showTablesStatement, databaseType);
executor.execute(mockConnectionSession(),
mockMetaData(mockDatabases()));
assertThat(executor.getQueryResultMetaData().getColumnCount(), is(1));
executor.getMergedResult().next();
@@ -112,7 +112,7 @@ class ShowTablesExecutorTest {
ShowFilterSegment showFilterSegment = mock(ShowFilterSegment.class);
when(showFilterSegment.getLike()).thenReturn(Optional.of(new
ShowLikeSegment(0, 10, "t_account")));
MySQLShowTablesStatement showTablesStatement = new
MySQLShowTablesStatement(databaseType, null, showFilterSegment, false);
- ShowTablesExecutor executor = new
ShowTablesExecutor(showTablesStatement, databaseType);
+ MySQLShowTablesExecutor executor = new
MySQLShowTablesExecutor(showTablesStatement, databaseType);
executor.execute(mockConnectionSession(),
mockMetaData(mockDatabases()));
assertThat(executor.getQueryResultMetaData().getColumnCount(), is(1));
executor.getMergedResult().next();
@@ -125,7 +125,7 @@ class ShowTablesExecutorTest {
ShowFilterSegment showFilterSegment = mock(ShowFilterSegment.class);
when(showFilterSegment.getLike()).thenReturn(Optional.of(new
ShowLikeSegment(0, 10, "T_TEST")));
MySQLShowTablesStatement showTablesStatement = new
MySQLShowTablesStatement(databaseType, null, showFilterSegment, false);
- ShowTablesExecutor executor = new
ShowTablesExecutor(showTablesStatement, databaseType);
+ MySQLShowTablesExecutor executor = new
MySQLShowTablesExecutor(showTablesStatement, databaseType);
executor.execute(mockConnectionSession(),
mockMetaData(mockDatabases()));
assertThat(executor.getQueryResultMetaData().getColumnCount(), is(1));
executor.getMergedResult().next();
@@ -138,7 +138,7 @@ class ShowTablesExecutorTest {
ShowFilterSegment showFilterSegment = mock(ShowFilterSegment.class);
when(showFilterSegment.getLike()).thenReturn(Optional.of(new
ShowLikeSegment(0, 10, "t_test")));
MySQLShowTablesStatement showTablesStatement = new
MySQLShowTablesStatement(databaseType, null, showFilterSegment, false);
- ShowTablesExecutor executor = new
ShowTablesExecutor(showTablesStatement, databaseType);
+ MySQLShowTablesExecutor executor = new
MySQLShowTablesExecutor(showTablesStatement, databaseType);
executor.execute(mockConnectionSession(),
mockMetaData(mockDatabases()));
assertThat(executor.getQueryResultMetaData().getColumnCount(), is(1));
executor.getMergedResult().next();
@@ -150,7 +150,7 @@ class ShowTablesExecutorTest {
void assertShowTableFromUncompletedDatabase() throws SQLException {
MySQLShowTablesStatement showTablesStatement = new
MySQLShowTablesStatement(
databaseType, new FromDatabaseSegment(0, new
DatabaseSegment(0, 0, new IdentifierValue("uncompleted"))), null, false);
- ShowTablesExecutor executor = new
ShowTablesExecutor(showTablesStatement, databaseType);
+ MySQLShowTablesExecutor executor = new
MySQLShowTablesExecutor(showTablesStatement, databaseType);
executor.execute(mockConnectionSession(),
mockMetaData(mockDatabases()));
QueryResultMetaData actualMetaData = executor.getQueryResultMetaData();
assertThat(actualMetaData.getColumnCount(), is(1));
