You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2022/05/11 10:54:38 UTC
[shardingsphere] branch master updated: Add DatabaseAdminExecutorCreatorFactory (#17594)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 526ea6804f9 Add DatabaseAdminExecutorCreatorFactory (#17594)
526ea6804f9 is described below
commit 526ea6804f9bf5b461f0285ed0621e5d89378d49
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Wed May 11 18:54:33 2022 +0800
Add DatabaseAdminExecutorCreatorFactory (#17594)
* Rename DatabaseAdminExecutorCreator
* Add DatabaseAdminExecutorCreatorFactory
* Add DatabaseAdminExecutorCreatorFactory
---
.../admin/DatabaseAdminBackendHandlerFactory.java | 19 ++++-----
...tory.java => DatabaseAdminExecutorCreator.java} | 13 +++---
.../DatabaseAdminExecutorCreatorFactory.java | 47 ++++++++++++++++++++++
...Factory.java => MySQLAdminExecutorCreator.java} | 10 ++---
...ory.java => OpenGaussAdminExecutorCreator.java} | 18 ++++-----
...ry.java => PostgreSQLAdminExecutorCreator.java} | 10 ++---
...xt.admin.executor.DatabaseAdminExecutorCreator} | 6 +--
.../admin/mysql/MySQLAdminExecutorFactoryTest.java | 8 ++--
.../OpenGaussAdminExecutorFactoryTest.java | 20 ++++-----
.../PostgreSQLAdminExecutorFactoryTest.java | 14 +++----
10 files changed, 103 insertions(+), 62 deletions(-)
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/DatabaseAdminBackendHandlerFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/DatabaseAdminBackendHandlerFactory.java
index 321b632e3d1..13a3a8cecfc 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/DatabaseAdminBackendHandlerFactory.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/DatabaseAdminBackendHandlerFactory.java
@@ -24,12 +24,11 @@ import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
import org.apache.shardingsphere.proxy.backend.text.admin.executor.DatabaseAdminExecutor;
-import org.apache.shardingsphere.proxy.backend.text.admin.executor.DatabaseAdminExecutorFactory;
+import org.apache.shardingsphere.proxy.backend.text.admin.executor.DatabaseAdminExecutorCreator;
+import org.apache.shardingsphere.proxy.backend.text.admin.executor.DatabaseAdminExecutorCreatorFactory;
import org.apache.shardingsphere.proxy.backend.text.admin.executor.DatabaseAdminQueryExecutor;
import org.apache.shardingsphere.proxy.backend.text.admin.executor.DatabaseSetCharsetExecutor;
import org.apache.shardingsphere.proxy.backend.text.encoding.DatabaseSetCharsetBackendHandler;
-import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.spi.type.typed.TypedSPIRegistry;
import java.util.Optional;
@@ -39,10 +38,6 @@ import java.util.Optional;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class DatabaseAdminBackendHandlerFactory {
- static {
- ShardingSphereServiceLoader.register(DatabaseAdminExecutorFactory.class);
- }
-
/**
* Create new instance of database admin backend handler,
* and this handler requires a connection containing a schema to be used.
@@ -53,11 +48,11 @@ public final class DatabaseAdminBackendHandlerFactory {
* @return created instance
*/
public static Optional<TextProtocolBackendHandler> newInstance(final DatabaseType databaseType, final SQLStatementContext<?> sqlStatementContext, final ConnectionSession connectionSession) {
- Optional<DatabaseAdminExecutorFactory> executorFactory = TypedSPIRegistry.findRegisteredService(DatabaseAdminExecutorFactory.class, databaseType.getType());
- if (!executorFactory.isPresent()) {
+ Optional<DatabaseAdminExecutorCreator> creator = DatabaseAdminExecutorCreatorFactory.findInstance(databaseType);
+ if (!creator.isPresent()) {
return Optional.empty();
}
- Optional<DatabaseAdminExecutor> executor = executorFactory.get().newInstance(sqlStatementContext);
+ Optional<DatabaseAdminExecutor> executor = creator.get().create(sqlStatementContext);
return executor.map(optional -> createTextProtocolBackendHandler(sqlStatementContext, connectionSession, optional));
}
@@ -72,11 +67,11 @@ public final class DatabaseAdminBackendHandlerFactory {
*/
public static Optional<TextProtocolBackendHandler> newInstance(final DatabaseType databaseType, final SQLStatementContext<?> sqlStatementContext,
final ConnectionSession connectionSession, final String sql) {
- Optional<DatabaseAdminExecutorFactory> executorFactory = TypedSPIRegistry.findRegisteredService(DatabaseAdminExecutorFactory.class, databaseType.getType());
+ Optional<DatabaseAdminExecutorCreator> executorFactory = DatabaseAdminExecutorCreatorFactory.findInstance(databaseType);
if (!executorFactory.isPresent()) {
return Optional.empty();
}
- Optional<DatabaseAdminExecutor> executor = executorFactory.get().newInstance(sqlStatementContext, sql, connectionSession.getDatabaseName());
+ Optional<DatabaseAdminExecutor> executor = executorFactory.get().create(sqlStatementContext, sql, connectionSession.getDatabaseName());
return executor.map(optional -> createTextProtocolBackendHandler(sqlStatementContext, connectionSession, optional));
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/executor/DatabaseAdminExecutorFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/executor/DatabaseAdminExecutorCreator.java
similarity index 73%
rename from shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/executor/DatabaseAdminExecutorFactory.java
rename to shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/executor/DatabaseAdminExecutorCreator.java
index 14081e973f4..9f607264db5 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/executor/DatabaseAdminExecutorFactory.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/executor/DatabaseAdminExecutorCreator.java
@@ -24,27 +24,26 @@ import org.apache.shardingsphere.spi.type.typed.TypedSPI;
import java.util.Optional;
/**
- * Database admin executor factory.
+ * Database admin executor creator.
*/
@SingletonSPI
-public interface DatabaseAdminExecutorFactory extends TypedSPI {
+public interface DatabaseAdminExecutorCreator extends TypedSPI {
/**
- * Create an instance of database admin executor,
- * and this executor requires a connection containing a schema to be used.
+ * Create database admin executor, and this executor requires a connection containing a schema to be used.
*
* @param sqlStatementContext SQL statement context
* @return created instance
*/
- Optional<DatabaseAdminExecutor> newInstance(SQLStatementContext<?> sqlStatementContext);
+ Optional<DatabaseAdminExecutor> create(SQLStatementContext<?> sqlStatementContext);
/**
- * Create an executor of database admin executor.
+ * Create database admin executor.
*
* @param sqlStatementContext SQL statement context
* @param sql SQL
* @param schemaName schema name
* @return created instance
*/
- Optional<DatabaseAdminExecutor> newInstance(SQLStatementContext<?> sqlStatementContext, String sql, String schemaName);
+ Optional<DatabaseAdminExecutor> create(SQLStatementContext<?> sqlStatementContext, String sql, String schemaName);
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/executor/DatabaseAdminExecutorCreatorFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/executor/DatabaseAdminExecutorCreatorFactory.java
new file mode 100644
index 00000000000..758946e3203
--- /dev/null
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/executor/DatabaseAdminExecutorCreatorFactory.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.proxy.backend.text.admin.executor;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.apache.shardingsphere.infra.database.type.DatabaseType;
+import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.spi.type.typed.TypedSPIRegistry;
+
+import java.util.Optional;
+
+/**
+ * Database admin executor creator factory.
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class DatabaseAdminExecutorCreatorFactory {
+
+ static {
+ ShardingSphereServiceLoader.register(DatabaseAdminExecutorCreator.class);
+ }
+
+ /**
+ * Get instance of database admin executor creator.
+ *
+ * @param databaseType database type
+ * @return got instance
+ */
+ public static Optional<DatabaseAdminExecutorCreator> findInstance(final DatabaseType databaseType) {
+ return TypedSPIRegistry.findRegisteredService(DatabaseAdminExecutorCreator.class, databaseType.getType());
+ }
+}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/MySQLAdminExecutorFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/MySQLAdminExecutorCreator.java
similarity index 96%
rename from shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/MySQLAdminExecutorFactory.java
rename to shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/MySQLAdminExecutorCreator.java
index d00c59d5ef5..1ef5bd478af 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/MySQLAdminExecutorFactory.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/MySQLAdminExecutorCreator.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.text.admin.executor.DatabaseAdminExecutor;
-import org.apache.shardingsphere.proxy.backend.text.admin.executor.DatabaseAdminExecutorFactory;
+import org.apache.shardingsphere.proxy.backend.text.admin.executor.DatabaseAdminExecutorCreator;
import org.apache.shardingsphere.proxy.backend.text.admin.mysql.executor.MySQLSetCharsetExecutor;
import org.apache.shardingsphere.proxy.backend.text.admin.mysql.executor.NoResourceSetExecutor;
import org.apache.shardingsphere.proxy.backend.text.admin.mysql.executor.NoResourceShowExecutor;
@@ -58,16 +58,16 @@ import java.util.Iterator;
import java.util.Optional;
/**
- * Admin executor factory for MySQL.
+ * Database admin executor creator for MySQL.
*/
-public final class MySQLAdminExecutorFactory implements DatabaseAdminExecutorFactory {
+public final class MySQLAdminExecutorCreator implements DatabaseAdminExecutorCreator {
private static final String INFORMATION_SCHEMA = "information_schema";
private static final String PERFORMANCE_SCHEMA = "performance_schema";
@Override
- public Optional<DatabaseAdminExecutor> newInstance(final SQLStatementContext<?> sqlStatementContext) {
+ public Optional<DatabaseAdminExecutor> create(final SQLStatementContext<?> sqlStatementContext) {
SQLStatement sqlStatement = sqlStatementContext.getSqlStatement();
if (sqlStatement instanceof MySQLShowFunctionStatusStatement) {
return Optional.of(new ShowFunctionStatusExecutor((MySQLShowFunctionStatusStatement) sqlStatement));
@@ -82,7 +82,7 @@ public final class MySQLAdminExecutorFactory implements DatabaseAdminExecutorFac
}
@Override
- public Optional<DatabaseAdminExecutor> newInstance(final SQLStatementContext<?> sqlStatementContext, final String sql, final String schemaName) {
+ public Optional<DatabaseAdminExecutor> create(final SQLStatementContext<?> sqlStatementContext, final String sql, final String schemaName) {
SQLStatement sqlStatement = sqlStatementContext.getSqlStatement();
if (sqlStatement instanceof UseStatement) {
return Optional.of(new UseDatabaseExecutor((UseStatement) sqlStatement));
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/opengauss/OpenGaussAdminExecutorFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/opengauss/OpenGaussAdminExecutorCreator.java
similarity index 69%
rename from shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/opengauss/OpenGaussAdminExecutorFactory.java
rename to shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/opengauss/OpenGaussAdminExecutorCreator.java
index ed31811818f..36a24355d11 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/opengauss/OpenGaussAdminExecutorFactory.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/opengauss/OpenGaussAdminExecutorCreator.java
@@ -19,31 +19,31 @@ package org.apache.shardingsphere.proxy.backend.text.admin.opengauss;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.proxy.backend.text.admin.executor.DatabaseAdminExecutor;
-import org.apache.shardingsphere.proxy.backend.text.admin.executor.DatabaseAdminExecutorFactory;
-import org.apache.shardingsphere.proxy.backend.text.admin.postgresql.PostgreSQLAdminExecutorFactory;
+import org.apache.shardingsphere.proxy.backend.text.admin.executor.DatabaseAdminExecutorCreator;
+import org.apache.shardingsphere.proxy.backend.text.admin.postgresql.PostgreSQLAdminExecutorCreator;
import java.util.Optional;
/**
- * Admin executor factory for openGauss.
+ * Database admin executor creator for openGauss.
*/
-public final class OpenGaussAdminExecutorFactory implements DatabaseAdminExecutorFactory {
+public final class OpenGaussAdminExecutorCreator implements DatabaseAdminExecutorCreator {
private static final String OG_DATABASE = "pg_database";
- private final PostgreSQLAdminExecutorFactory delegated = new PostgreSQLAdminExecutorFactory();
+ private final PostgreSQLAdminExecutorCreator delegated = new PostgreSQLAdminExecutorCreator();
@Override
- public Optional<DatabaseAdminExecutor> newInstance(final SQLStatementContext<?> sqlStatementContext) {
- return delegated.newInstance(sqlStatementContext);
+ public Optional<DatabaseAdminExecutor> create(final SQLStatementContext<?> sqlStatementContext) {
+ return delegated.create(sqlStatementContext);
}
@Override
- public Optional<DatabaseAdminExecutor> newInstance(final SQLStatementContext<?> sqlStatementContext, final String sql, final String schemaName) {
+ public Optional<DatabaseAdminExecutor> create(final SQLStatementContext<?> sqlStatementContext, final String sql, final String schemaName) {
if (sqlStatementContext.getTablesContext().getTableNames().contains(OG_DATABASE)) {
return Optional.of(new OpenGaussSelectDatabaseExecutor(sql));
}
- return delegated.newInstance(sqlStatementContext, sql, schemaName);
+ return delegated.create(sqlStatementContext, sql, schemaName);
}
@Override
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/postgresql/PostgreSQLAdminExecutorFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/postgresql/PostgreSQLAdminExecutorCreator.java
similarity index 93%
rename from shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/postgresql/PostgreSQLAdminExecutorFactory.java
rename to shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/postgresql/PostgreSQLAdminExecutorCreator.java
index a1c52004787..779ca42baca 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/postgresql/PostgreSQLAdminExecutorFactory.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/postgresql/PostgreSQLAdminExecutorCreator.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.proxy.backend.text.admin.postgresql;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.proxy.backend.text.admin.executor.AbstractDatabaseMetadataExecutor.DefaultDatabaseMetadataExecutor;
import org.apache.shardingsphere.proxy.backend.text.admin.executor.DatabaseAdminExecutor;
-import org.apache.shardingsphere.proxy.backend.text.admin.executor.DatabaseAdminExecutorFactory;
+import org.apache.shardingsphere.proxy.backend.text.admin.executor.DatabaseAdminExecutorCreator;
import org.apache.shardingsphere.proxy.backend.text.admin.postgresql.executor.PostgreSQLSetCharsetExecutor;
import org.apache.shardingsphere.proxy.backend.text.admin.postgresql.executor.SelectDatabaseExecutor;
import org.apache.shardingsphere.proxy.backend.text.admin.postgresql.executor.SelectTableExecutor;
@@ -40,9 +40,9 @@ import java.util.Optional;
import java.util.stream.Collectors;
/**
- * Admin executor factory for PostgreSQL.
+ * Database admin executor creator for PostgreSQL.
*/
-public final class PostgreSQLAdminExecutorFactory implements DatabaseAdminExecutorFactory {
+public final class PostgreSQLAdminExecutorCreator implements DatabaseAdminExecutorCreator {
private static final String PG_TABLESPACE = "pg_tablespace";
@@ -57,12 +57,12 @@ public final class PostgreSQLAdminExecutorFactory implements DatabaseAdminExecut
private static final String PG_PREFIX = "pg_";
@Override
- public Optional<DatabaseAdminExecutor> newInstance(final SQLStatementContext<?> sqlStatementContext) {
+ public Optional<DatabaseAdminExecutor> create(final SQLStatementContext<?> sqlStatementContext) {
return Optional.empty();
}
@Override
- public Optional<DatabaseAdminExecutor> newInstance(final SQLStatementContext<?> sqlStatementContext, final String sql, final String schemaName) {
+ public Optional<DatabaseAdminExecutor> create(final SQLStatementContext<?> sqlStatementContext, final String sql, final String schemaName) {
SQLStatement sqlStatement = sqlStatementContext.getSqlStatement();
if (sqlStatement instanceof SelectStatement) {
Collection<String> selectedTableNames = getSelectedTableNames((SelectStatement) sqlStatement);
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.text.admin.executor.DatabaseAdminExecutorFactory b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.text.admin.executor.DatabaseAdminExecutorCreator
similarity index 92%
rename from shardingsphere-proxy/shardingsphere-proxy-backend/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.text.admin.executor.DatabaseAdminExecutorFactory
rename to shardingsphere-proxy/shardingsphere-proxy-backend/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.text.admin.executor.DatabaseAdminExecutorCreator
index 7cad6c87793..ca9c2c39dc5 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.text.admin.executor.DatabaseAdminExecutorFactory
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.text.admin.executor.DatabaseAdminExecutorCreator
@@ -15,6 +15,6 @@
# limitations under the License.
#
-org.apache.shardingsphere.proxy.backend.text.admin.mysql.MySQLAdminExecutorFactory
-org.apache.shardingsphere.proxy.backend.text.admin.postgresql.PostgreSQLAdminExecutorFactory
-org.apache.shardingsphere.proxy.backend.text.admin.opengauss.OpenGaussAdminExecutorFactory
+org.apache.shardingsphere.proxy.backend.text.admin.mysql.MySQLAdminExecutorCreator
+org.apache.shardingsphere.proxy.backend.text.admin.postgresql.PostgreSQLAdminExecutorCreator
+org.apache.shardingsphere.proxy.backend.text.admin.opengauss.OpenGaussAdminExecutorCreator
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/MySQLAdminExecutorFactoryTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/MySQLAdminExecutorFactoryTest.java
index 8be1ee4ee2c..a26b25f6f1f 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/MySQLAdminExecutorFactoryTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/MySQLAdminExecutorFactoryTest.java
@@ -37,14 +37,14 @@ import static org.mockito.Mockito.when;
public final class MySQLAdminExecutorFactoryTest {
- private final MySQLAdminExecutorFactory mySQLAdminExecutorFactory = new MySQLAdminExecutorFactory();
+ private final MySQLAdminExecutorCreator mySQLAdminExecutorFactory = new MySQLAdminExecutorCreator();
@Test
public void assertNewInstanceWithMySQLShowFunctionStatusStatement() {
MySQLShowFunctionStatusStatement statement = mock(MySQLShowFunctionStatusStatement.class);
CommonSQLStatementContext statementContext = mock(CommonSQLStatementContext.class);
when(statementContext.getSqlStatement()).thenReturn(statement);
- Optional<DatabaseAdminExecutor> executorOptional = mySQLAdminExecutorFactory.newInstance(statementContext);
+ Optional<DatabaseAdminExecutor> executorOptional = mySQLAdminExecutorFactory.create(statementContext);
assertTrue(executorOptional.isPresent());
assertThat(executorOptional.get(), instanceOf(ShowFunctionStatusExecutor.class));
}
@@ -54,7 +54,7 @@ public final class MySQLAdminExecutorFactoryTest {
MySQLShowProcedureStatusStatement statement = mock(MySQLShowProcedureStatusStatement.class);
CommonSQLStatementContext statementContext = mock(CommonSQLStatementContext.class);
when(statementContext.getSqlStatement()).thenReturn(statement);
- Optional<DatabaseAdminExecutor> executorOptional = mySQLAdminExecutorFactory.newInstance(statementContext);
+ Optional<DatabaseAdminExecutor> executorOptional = mySQLAdminExecutorFactory.create(statementContext);
assertTrue(executorOptional.isPresent());
assertThat(executorOptional.get(), instanceOf(ShowProcedureStatusExecutor.class));
}
@@ -64,7 +64,7 @@ public final class MySQLAdminExecutorFactoryTest {
MySQLShowTablesStatement statement = mock(MySQLShowTablesStatement.class);
CommonSQLStatementContext statementContext = mock(CommonSQLStatementContext.class);
when(statementContext.getSqlStatement()).thenReturn(statement);
- Optional<DatabaseAdminExecutor> executorOptional = mySQLAdminExecutorFactory.newInstance(statementContext);
+ Optional<DatabaseAdminExecutor> executorOptional = mySQLAdminExecutorFactory.create(statementContext);
assertTrue(executorOptional.isPresent());
assertThat(executorOptional.get(), instanceOf(ShowTablesExecutor.class));
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/opengauss/OpenGaussAdminExecutorFactoryTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/opengauss/OpenGaussAdminExecutorFactoryTest.java
index 7fcde5cc550..0fa90f7e2d6 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/opengauss/OpenGaussAdminExecutorFactoryTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/opengauss/OpenGaussAdminExecutorFactoryTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.proxy.backend.text.admin.opengauss;
import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.proxy.backend.text.admin.executor.DatabaseAdminExecutor;
-import org.apache.shardingsphere.proxy.backend.text.admin.postgresql.PostgreSQLAdminExecutorFactory;
+import org.apache.shardingsphere.proxy.backend.text.admin.postgresql.PostgreSQLAdminExecutorCreator;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -42,16 +42,16 @@ import static org.mockito.Mockito.when;
public final class OpenGaussAdminExecutorFactoryTest {
@Mock
- private PostgreSQLAdminExecutorFactory postgreSQLAdminExecutorFactory;
+ private PostgreSQLAdminExecutorCreator postgreSQLAdminExecutorFactory;
- private OpenGaussAdminExecutorFactory openGaussAdminExecutorFactory;
+ private OpenGaussAdminExecutorCreator openGaussAdminExecutorFactory;
@Before
@SneakyThrows
public void setup() {
- Field field = OpenGaussAdminExecutorFactory.class.getDeclaredField("delegated");
+ Field field = OpenGaussAdminExecutorCreator.class.getDeclaredField("delegated");
field.setAccessible(true);
- openGaussAdminExecutorFactory = new OpenGaussAdminExecutorFactory();
+ openGaussAdminExecutorFactory = new OpenGaussAdminExecutorCreator();
field.set(openGaussAdminExecutorFactory, postgreSQLAdminExecutorFactory);
}
@@ -59,8 +59,8 @@ public final class OpenGaussAdminExecutorFactoryTest {
public void assertNewInstanceWithSQLStatementContextOnly() {
SQLStatementContext<?> sqlStatementContext = mock(SQLStatementContext.class);
DatabaseAdminExecutor expected = mock(DatabaseAdminExecutor.class);
- when(postgreSQLAdminExecutorFactory.newInstance(sqlStatementContext)).thenReturn(Optional.of(expected));
- Optional<DatabaseAdminExecutor> actual = openGaussAdminExecutorFactory.newInstance(sqlStatementContext);
+ when(postgreSQLAdminExecutorFactory.create(sqlStatementContext)).thenReturn(Optional.of(expected));
+ Optional<DatabaseAdminExecutor> actual = openGaussAdminExecutorFactory.create(sqlStatementContext);
assertTrue(actual.isPresent());
assertThat(actual.get(), is(expected));
}
@@ -69,7 +69,7 @@ public final class OpenGaussAdminExecutorFactoryTest {
public void assertNewInstanceWithSelectDatabase() {
SQLStatementContext<?> sqlStatementContext = mock(SQLStatementContext.class, RETURNS_DEEP_STUBS);
when(sqlStatementContext.getTablesContext().getTableNames()).thenReturn(Collections.singletonList("pg_database"));
- Optional<DatabaseAdminExecutor> actual = openGaussAdminExecutorFactory.newInstance(sqlStatementContext, "select datcompatibility from pg_database where datname = 'sharding_db'", "");
+ Optional<DatabaseAdminExecutor> actual = openGaussAdminExecutorFactory.create(sqlStatementContext, "select datcompatibility from pg_database where datname = 'sharding_db'", "");
assertTrue(actual.isPresent());
assertTrue(actual.get() instanceof OpenGaussSelectDatabaseExecutor);
}
@@ -79,8 +79,8 @@ public final class OpenGaussAdminExecutorFactoryTest {
SQLStatementContext<?> sqlStatementContext = mock(SQLStatementContext.class, RETURNS_DEEP_STUBS);
when(sqlStatementContext.getTablesContext().getTableNames()).thenReturn(Collections.emptyList());
DatabaseAdminExecutor expected = mock(DatabaseAdminExecutor.class);
- when(postgreSQLAdminExecutorFactory.newInstance(sqlStatementContext, "", "")).thenReturn(Optional.of(expected));
- Optional<DatabaseAdminExecutor> actual = openGaussAdminExecutorFactory.newInstance(sqlStatementContext, "", "");
+ when(postgreSQLAdminExecutorFactory.create(sqlStatementContext, "", "")).thenReturn(Optional.of(expected));
+ Optional<DatabaseAdminExecutor> actual = openGaussAdminExecutorFactory.create(sqlStatementContext, "", "");
assertTrue(actual.isPresent());
assertThat(actual.get(), is(expected));
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/postgresql/PostgreSQLAdminExecutorFactoryTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/postgresql/PostgreSQLAdminExecutorFactoryTest.java
index 45ac80730ff..c273e619af6 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/postgresql/PostgreSQLAdminExecutorFactoryTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/postgresql/PostgreSQLAdminExecutorFactoryTest.java
@@ -47,7 +47,7 @@ import static org.mockito.Mockito.when;
public final class PostgreSQLAdminExecutorFactoryTest {
- private final PostgreSQLAdminExecutorFactory postgreSQLAdminExecutorFactory = new PostgreSQLAdminExecutorFactory();
+ private final PostgreSQLAdminExecutorCreator postgreSQLAdminExecutorFactory = new PostgreSQLAdminExecutorCreator();
@Test
public void assertNewInstanceWithPostgreSQLSelectPgDatabaseStatement() {
@@ -57,26 +57,26 @@ public final class PostgreSQLAdminExecutorFactoryTest {
when(statement.getFrom()).thenReturn(tableSegment);
SelectStatementContext statementContext = mock(SelectStatementContext.class);
when(statementContext.getSqlStatement()).thenReturn(statement);
- Optional<DatabaseAdminExecutor> executorOptional = postgreSQLAdminExecutorFactory.newInstance(statementContext, "", null);
+ Optional<DatabaseAdminExecutor> executorOptional = postgreSQLAdminExecutorFactory.create(statementContext, "", null);
assertTrue(executorOptional.isPresent());
assertThat(executorOptional.get(), instanceOf(SelectDatabaseExecutor.class));
}
@Test
public void assertNewInstanceWithSQLStatementOnly() {
- assertFalse(postgreSQLAdminExecutorFactory.newInstance(null).isPresent());
+ assertFalse(postgreSQLAdminExecutorFactory.create(null).isPresent());
}
@Test
public void assertNewInstanceWithUnknownStatement() {
- assertFalse(postgreSQLAdminExecutorFactory.newInstance(mock(SQLStatementContext.class), null, null).isPresent());
+ assertFalse(postgreSQLAdminExecutorFactory.create(mock(SQLStatementContext.class), null, null).isPresent());
}
@Test
public void assertNewInstanceWithSetClientEncoding() {
SetStatement setStatement = createSetStatement("client_encoding");
CommonSQLStatementContext<SetStatement> statementContext = new CommonSQLStatementContext<>(setStatement);
- Optional<DatabaseAdminExecutor> actual = postgreSQLAdminExecutorFactory.newInstance(statementContext, null, null);
+ Optional<DatabaseAdminExecutor> actual = postgreSQLAdminExecutorFactory.create(statementContext, null, null);
assertTrue(actual.isPresent());
assertTrue(actual.get() instanceof PostgreSQLSetCharsetExecutor);
}
@@ -85,7 +85,7 @@ public final class PostgreSQLAdminExecutorFactoryTest {
public void assertNewInstanceWithSetExtraFloatDigits() throws SQLException {
SetStatement setStatement = createSetStatement("extra_float_digits");
CommonSQLStatementContext<SetStatement> statementContext = new CommonSQLStatementContext<>(setStatement);
- Optional<DatabaseAdminExecutor> actual = postgreSQLAdminExecutorFactory.newInstance(statementContext, null, null);
+ Optional<DatabaseAdminExecutor> actual = postgreSQLAdminExecutorFactory.create(statementContext, null, null);
assertTrue(actual.isPresent());
ConnectionSession connectionSession = mock(ConnectionSession.class);
actual.get().execute(connectionSession);
@@ -96,7 +96,7 @@ public final class PostgreSQLAdminExecutorFactoryTest {
public void assertNewInstanceWithSetApplicationName() throws SQLException {
SetStatement setStatement = createSetStatement("application_name");
CommonSQLStatementContext<SetStatement> statementContext = new CommonSQLStatementContext<>(setStatement);
- Optional<DatabaseAdminExecutor> actual = postgreSQLAdminExecutorFactory.newInstance(statementContext, null, null);
+ Optional<DatabaseAdminExecutor> actual = postgreSQLAdminExecutorFactory.create(statementContext, null, null);
assertTrue(actual.isPresent());
ConnectionSession connectionSession = mock(ConnectionSession.class);
actual.get().execute(connectionSession);