This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 369e2ff Refactor MySQLAdminBackendHandlerFactory (#8632)
369e2ff is described below
commit 369e2fff2d7ebeb486b7237aed264232a82b53f5
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Dec 15 23:07:01 2020 +0800
Refactor MySQLAdminBackendHandlerFactory (#8632)
---
.../mysql/MySQLAdminBackendHandlerFactory.java | 29 ++++++++-
.../ShowCurrentDatabaseBackendHandler.java | 6 +-
.../ShowDatabasesBackendHandler.java | 6 +-
.../impl => handler}/ShowTablesBackendHandler.java | 6 +-
.../UseDatabaseBackendHandler.java | 6 +-
.../admin/mysql/schema/SchemaBackendHandler.java | 26 --------
.../mysql/schema/SchemaBackendHandlerFactory.java | 70 ----------------------
.../TextProtocolBackendHandlerFactoryTest.java | 4 +-
.../ShowDatabasesBackendHandlerTest.java | 2 +-
.../ShowTablesBackendHandlerTest.java | 2 +-
.../UseDatabaseBackendHandlerTest.java | 2 +-
...va => MySQLAdminBackendHandlerFactoryTest.java} | 30 +++++++---
12 files changed, 65 insertions(+), 124 deletions(-)
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/MySQLAdminBackendHandlerFactory.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/MySQLAdminBackendHandlerFactory.java
index 48e41c2..7c37c41 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/MySQLAdminBackendHandlerFactory.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/MySQLAdminBackendHandlerFactory.java
@@ -20,8 +20,17 @@ package
org.apache.shardingsphere.proxy.backend.text.admin.mysql;
import
org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import
org.apache.shardingsphere.proxy.backend.text.admin.DatabaseAdminBackendHandler;
import
org.apache.shardingsphere.proxy.backend.text.admin.DatabaseAdminBackendHandlerFactory;
-import
org.apache.shardingsphere.proxy.backend.text.admin.mysql.schema.SchemaBackendHandlerFactory;
+import
org.apache.shardingsphere.proxy.backend.text.admin.mysql.handler.ShowCurrentDatabaseBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.text.admin.mysql.handler.ShowDatabasesBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.text.admin.mysql.handler.ShowTablesBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.text.admin.mysql.handler.UseDatabaseBackendHandler;
+import
org.apache.shardingsphere.sql.parser.sql.common.segment.dml.item.ExpressionProjectionSegment;
+import
org.apache.shardingsphere.sql.parser.sql.common.segment.dml.item.ProjectionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
+import
org.apache.shardingsphere.sql.parser.sql.common.statement.dml.SelectStatement;
+import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dal.MySQLShowDatabasesStatement;
+import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dal.MySQLShowTablesStatement;
+import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dal.MySQLUseStatement;
import java.util.Optional;
@@ -32,7 +41,23 @@ public final class MySQLAdminBackendHandlerFactory
implements DatabaseAdminBacke
@Override
public Optional<DatabaseAdminBackendHandler> newInstance(final
SQLStatement sqlStatement, final BackendConnection backendConnection) {
- return SchemaBackendHandlerFactory.newInstance(sqlStatement,
backendConnection);
+ if (sqlStatement instanceof MySQLUseStatement) {
+ return Optional.of(new
UseDatabaseBackendHandler((MySQLUseStatement) sqlStatement, backendConnection));
+ }
+ if (sqlStatement instanceof MySQLShowDatabasesStatement) {
+ return Optional.of(new
ShowDatabasesBackendHandler(backendConnection));
+ }
+ if (sqlStatement instanceof MySQLShowTablesStatement) {
+ return Optional.of(new
ShowTablesBackendHandler(backendConnection));
+ }
+ if (sqlStatement instanceof SelectStatement) {
+ ProjectionSegment firstProjection = ((SelectStatement)
sqlStatement).getProjections().getProjections().iterator().next();
+ if (firstProjection instanceof ExpressionProjectionSegment
+ &&
ShowCurrentDatabaseBackendHandler.FUNCTION_NAME.equalsIgnoreCase(((ExpressionProjectionSegment)
firstProjection).getText())) {
+ return Optional.of(new
ShowCurrentDatabaseBackendHandler(backendConnection));
+ }
+ }
+ return Optional.empty();
}
@Override
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/impl/ShowCurrentDatabaseBackendHandler.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/handler/ShowCurrentDatabaseBackendHandler.java
similarity index 95%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/impl/ShowCurrentDatabaseBackendHandler.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/handler/ShowCurrentDatabaseBackendHandler.java
index 32c53c3..0bd01ac 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/impl/ShowCurrentDatabaseBackendHandler.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/handler/ShowCurrentDatabaseBackendHandler.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.text.admin.mysql.schema.impl;
+package org.apache.shardingsphere.proxy.backend.text.admin.mysql.handler;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.merge.result.MergedResult;
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.Bac
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import
org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
import
org.apache.shardingsphere.proxy.backend.response.header.query.impl.QueryHeader;
-import
org.apache.shardingsphere.proxy.backend.text.admin.mysql.schema.SchemaBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.text.admin.DatabaseAdminBackendHandler;
import
org.apache.shardingsphere.sharding.merge.dal.common.SingleLocalDataMergedResult;
import java.sql.SQLException;
@@ -35,7 +35,7 @@ import java.util.Collections;
* Show current database backend handler.
*/
@RequiredArgsConstructor
-public final class ShowCurrentDatabaseBackendHandler implements
SchemaBackendHandler {
+public final class ShowCurrentDatabaseBackendHandler implements
DatabaseAdminBackendHandler {
public static final String FUNCTION_NAME = "DATABASE()";
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/impl/ShowDatabasesBackendHandler.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/handler/ShowDatabasesBackendHandler.java
similarity index 94%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/impl/ShowDatabasesBackendHandler.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/handler/ShowDatabasesBackendHandler.java
index 75d45bf..2121777 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/impl/ShowDatabasesBackendHandler.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/handler/ShowDatabasesBackendHandler.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.text.admin.mysql.schema.impl;
+package org.apache.shardingsphere.proxy.backend.text.admin.mysql.handler;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.auth.ShardingSphereUser;
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import
org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
import
org.apache.shardingsphere.proxy.backend.response.header.query.impl.QueryHeader;
-import
org.apache.shardingsphere.proxy.backend.text.admin.mysql.schema.SchemaBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.text.admin.DatabaseAdminBackendHandler;
import
org.apache.shardingsphere.sharding.merge.dal.common.SingleLocalDataMergedResult;
import java.sql.SQLException;
@@ -39,7 +39,7 @@ import java.util.Optional;
* Show databases backend handler.
*/
@RequiredArgsConstructor
-public final class ShowDatabasesBackendHandler implements SchemaBackendHandler
{
+public final class ShowDatabasesBackendHandler implements
DatabaseAdminBackendHandler {
private final BackendConnection backendConnection;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/impl/ShowTablesBackendHandler.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/handler/ShowTablesBackendHandler.java
similarity index 95%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/impl/ShowTablesBackendHandler.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/handler/ShowTablesBackendHandler.java
index 661d346..447beed 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/impl/ShowTablesBackendHandler.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/handler/ShowTablesBackendHandler.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.text.admin.mysql.schema.impl;
+package org.apache.shardingsphere.proxy.backend.text.admin.mysql.handler;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryResult;
@@ -29,7 +29,7 @@ import
org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import
org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
import
org.apache.shardingsphere.proxy.backend.response.header.query.impl.QueryHeaderBuilder;
-import
org.apache.shardingsphere.proxy.backend.text.admin.mysql.schema.SchemaBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.text.admin.DatabaseAdminBackendHandler;
import java.sql.SQLException;
import java.sql.Types;
@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
* Backend handler for show tables.
*/
@RequiredArgsConstructor
-public final class ShowTablesBackendHandler implements SchemaBackendHandler {
+public final class ShowTablesBackendHandler implements
DatabaseAdminBackendHandler {
private final BackendConnection backendConnection;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/impl/UseDatabaseBackendHandler.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/handler/UseDatabaseBackendHandler.java
similarity index 93%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/impl/UseDatabaseBackendHandler.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/handler/UseDatabaseBackendHandler.java
index ebca2eb..470a5a8 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/impl/UseDatabaseBackendHandler.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/handler/UseDatabaseBackendHandler.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.text.admin.mysql.schema.impl;
+package org.apache.shardingsphere.proxy.backend.text.admin.mysql.handler;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.auth.ShardingSphereUser;
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import
org.apache.shardingsphere.proxy.backend.exception.UnknownDatabaseException;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import
org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
-import
org.apache.shardingsphere.proxy.backend.text.admin.mysql.schema.SchemaBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.text.admin.DatabaseAdminBackendHandler;
import org.apache.shardingsphere.sql.parser.sql.common.util.SQLUtil;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dal.MySQLUseStatement;
@@ -36,7 +36,7 @@ import java.util.Optional;
* Use database backend handler.
*/
@RequiredArgsConstructor
-public final class UseDatabaseBackendHandler implements SchemaBackendHandler {
+public final class UseDatabaseBackendHandler implements
DatabaseAdminBackendHandler {
private final MySQLUseStatement useStatement;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/SchemaBackendHandler.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/SchemaBackendHandler.java
deleted file mode 100644
index eb79507..0000000
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/SchemaBackendHandler.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.mysql.schema;
-
-import
org.apache.shardingsphere.proxy.backend.text.admin.DatabaseAdminBackendHandler;
-
-/**
- * Schema backend handler.
- */
-public interface SchemaBackendHandler extends DatabaseAdminBackendHandler {
-}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/SchemaBackendHandlerFactory.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/SchemaBackendHandlerFactory.java
deleted file mode 100644
index f875e43..0000000
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/SchemaBackendHandlerFactory.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.mysql.schema;
-
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
-import
org.apache.shardingsphere.proxy.backend.text.admin.DatabaseAdminBackendHandler;
-import
org.apache.shardingsphere.proxy.backend.text.admin.mysql.schema.impl.ShowCurrentDatabaseBackendHandler;
-import
org.apache.shardingsphere.proxy.backend.text.admin.mysql.schema.impl.ShowDatabasesBackendHandler;
-import
org.apache.shardingsphere.proxy.backend.text.admin.mysql.schema.impl.ShowTablesBackendHandler;
-import
org.apache.shardingsphere.proxy.backend.text.admin.mysql.schema.impl.UseDatabaseBackendHandler;
-import
org.apache.shardingsphere.sql.parser.sql.common.segment.dml.item.ExpressionProjectionSegment;
-import
org.apache.shardingsphere.sql.parser.sql.common.segment.dml.item.ProjectionSegment;
-import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
-import
org.apache.shardingsphere.sql.parser.sql.common.statement.dml.SelectStatement;
-import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dal.MySQLShowDatabasesStatement;
-import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dal.MySQLShowTablesStatement;
-import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dal.MySQLUseStatement;
-
-import java.util.Optional;
-
-/**
- * Schema backend handler factory.
- */
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class SchemaBackendHandlerFactory {
-
- /**
- * New instance of schema backend handler.
- *
- * @param sqlStatement SQL statement
- * @param backendConnection backend connection
- * @return schema backend handler
- */
- public static Optional<DatabaseAdminBackendHandler> newInstance(final
SQLStatement sqlStatement, final BackendConnection backendConnection) {
- if (sqlStatement instanceof MySQLUseStatement) {
- return Optional.of(new
UseDatabaseBackendHandler((MySQLUseStatement) sqlStatement, backendConnection));
- }
- if (sqlStatement instanceof MySQLShowDatabasesStatement) {
- return Optional.of(new
ShowDatabasesBackendHandler(backendConnection));
- }
- if (sqlStatement instanceof MySQLShowTablesStatement) {
- return Optional.of(new
ShowTablesBackendHandler(backendConnection));
- }
- if (sqlStatement instanceof SelectStatement) {
- ProjectionSegment firstProjection = ((SelectStatement)
sqlStatement).getProjections().getProjections().iterator().next();
- if (firstProjection instanceof ExpressionProjectionSegment
- &&
ShowCurrentDatabaseBackendHandler.FUNCTION_NAME.equalsIgnoreCase(((ExpressionProjectionSegment)
firstProjection).getText())) {
- return Optional.of(new
ShowCurrentDatabaseBackendHandler(backendConnection));
- }
- }
- return Optional.empty();
- }
-}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/TextProtocolBackendHandlerFactoryTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/TextProtocolBackendHandlerFactoryTest.java
index ed5496d..c443967 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/TextProtocolBackendHandlerFactoryTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/TextProtocolBackendHandlerFactoryTest.java
@@ -27,8 +27,8 @@ import
org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandlerFa
import
org.apache.shardingsphere.proxy.backend.text.data.impl.BroadcastDatabaseBackendHandler;
import
org.apache.shardingsphere.proxy.backend.text.data.impl.SchemaAssignedDatabaseBackendHandler;
import
org.apache.shardingsphere.proxy.backend.text.data.impl.UnicastDatabaseBackendHandler;
-import
org.apache.shardingsphere.proxy.backend.text.admin.mysql.schema.impl.ShowDatabasesBackendHandler;
-import
org.apache.shardingsphere.proxy.backend.text.admin.mysql.schema.impl.UseDatabaseBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.text.admin.mysql.handler.ShowDatabasesBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.text.admin.mysql.handler.UseDatabaseBackendHandler;
import
org.apache.shardingsphere.proxy.backend.text.sctl.set.ShardingCTLSetBackendHandler;
import
org.apache.shardingsphere.proxy.backend.text.sctl.show.ShardingCTLShowBackendHandler;
import org.apache.shardingsphere.proxy.backend.text.skip.SkipBackendHandler;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/impl/ShowDatabasesBackendHandlerTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/handler/ShowDatabasesBackendHandlerTest.java
similarity index 99%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/impl/ShowDatabasesBackendHandlerTest.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/handler/ShowDatabasesBackendHandlerTest.java
index 3d7d771..2cf1f27 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/impl/ShowDatabasesBackendHandlerTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/handler/ShowDatabasesBackendHandlerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.text.admin.mysql.schema.impl;
+package org.apache.shardingsphere.proxy.backend.text.admin.mysql.handler;
import org.apache.shardingsphere.infra.auth.ShardingSphereUser;
import org.apache.shardingsphere.infra.auth.builtin.DefaultAuthentication;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/impl/ShowTablesBackendHandlerTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/handler/ShowTablesBackendHandlerTest.java
similarity index 99%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/impl/ShowTablesBackendHandlerTest.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/handler/ShowTablesBackendHandlerTest.java
index 4f43356..c95007e 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/impl/ShowTablesBackendHandlerTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/handler/ShowTablesBackendHandlerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.text.admin.mysql.schema.impl;
+package org.apache.shardingsphere.proxy.backend.text.admin.mysql.handler;
import org.apache.shardingsphere.infra.auth.ShardingSphereUser;
import org.apache.shardingsphere.infra.auth.builtin.DefaultAuthentication;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/impl/UseDatabaseBackendHandlerTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/handler/UseDatabaseBackendHandlerTest.java
similarity index 99%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/impl/UseDatabaseBackendHandlerTest.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/handler/UseDatabaseBackendHandlerTest.java
index a3dd6be..d80874c 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/impl/UseDatabaseBackendHandlerTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/handler/UseDatabaseBackendHandlerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.text.admin.mysql.schema.impl;
+package org.apache.shardingsphere.proxy.backend.text.admin.mysql.handler;
import org.apache.shardingsphere.infra.auth.ShardingSphereUser;
import org.apache.shardingsphere.infra.auth.builtin.DefaultAuthentication;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/SchemaBackendHandlerFactoryTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/MySQLAdminBackendHandlerFactoryTest.java
similarity index 68%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/SchemaBackendHandlerFactoryTest.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/MySQLAdminBackendHandlerFactoryTest.java
index 017c5ae..e8a5710 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/SchemaBackendHandlerFactoryTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/schema/MySQLAdminBackendHandlerFactoryTest.java
@@ -17,20 +17,25 @@
package org.apache.shardingsphere.proxy.backend.text.admin.mysql.schema;
+import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.infra.spi.typed.TypedSPIRegistry;
import
org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import
org.apache.shardingsphere.proxy.backend.text.admin.DatabaseAdminBackendHandler;
-import
org.apache.shardingsphere.proxy.backend.text.admin.mysql.schema.impl.ShowCurrentDatabaseBackendHandler;
-import
org.apache.shardingsphere.proxy.backend.text.admin.mysql.schema.impl.ShowDatabasesBackendHandler;
-import
org.apache.shardingsphere.proxy.backend.text.admin.mysql.schema.impl.ShowTablesBackendHandler;
-import
org.apache.shardingsphere.proxy.backend.text.admin.mysql.schema.impl.UseDatabaseBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.text.admin.DatabaseAdminBackendHandlerFactory;
+import
org.apache.shardingsphere.proxy.backend.text.admin.mysql.handler.ShowCurrentDatabaseBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.text.admin.mysql.handler.ShowDatabasesBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.text.admin.mysql.handler.ShowTablesBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.text.admin.mysql.handler.UseDatabaseBackendHandler;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.dml.item.ExpressionProjectionSegment;
import
org.apache.shardingsphere.sql.parser.sql.common.statement.dml.SelectStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dal.MySQLShowDatabasesStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dal.MySQLShowTablesStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dal.MySQLUseStatement;
+import org.junit.BeforeClass;
import org.junit.Test;
import java.util.Optional;
+import java.util.Properties;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.junit.Assert.assertThat;
@@ -39,18 +44,25 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public final class SchemaBackendHandlerFactoryTest {
+public final class MySQLAdminBackendHandlerFactoryTest {
+
+ private final DatabaseAdminBackendHandlerFactory
databaseAdminBackendHandlerFactory =
TypedSPIRegistry.getRegisteredService(DatabaseAdminBackendHandlerFactory.class,
"MySQL", new Properties());
+
+ @BeforeClass
+ public static void setUp() {
+
ShardingSphereServiceLoader.register(DatabaseAdminBackendHandlerFactory.class);
+ }
@Test
public void assertUseDatabase() {
- Optional<DatabaseAdminBackendHandler> actual =
SchemaBackendHandlerFactory.newInstance(mock(MySQLUseStatement.class),
mock(BackendConnection.class));
+ Optional<DatabaseAdminBackendHandler> actual =
databaseAdminBackendHandlerFactory.newInstance(mock(MySQLUseStatement.class),
mock(BackendConnection.class));
assertTrue(actual.isPresent());
assertThat(actual.get(), instanceOf(UseDatabaseBackendHandler.class));
}
@Test
public void assertShowDatabases() {
- Optional<DatabaseAdminBackendHandler> actual =
SchemaBackendHandlerFactory.newInstance(mock(MySQLShowDatabasesStatement.class),
mock(BackendConnection.class));
+ Optional<DatabaseAdminBackendHandler> actual =
databaseAdminBackendHandlerFactory.newInstance(mock(MySQLShowDatabasesStatement.class),
mock(BackendConnection.class));
assertTrue(actual.isPresent());
assertThat(actual.get(),
instanceOf(ShowDatabasesBackendHandler.class));
}
@@ -59,14 +71,14 @@ public final class SchemaBackendHandlerFactoryTest {
public void assertShowCurrentDatabase() {
SelectStatement sqlStatement = mock(SelectStatement.class,
RETURNS_DEEP_STUBS);
when(sqlStatement.getProjections().getProjections().iterator().next()).thenReturn(new
ExpressionProjectionSegment(0, 0,
ShowCurrentDatabaseBackendHandler.FUNCTION_NAME));
- Optional<DatabaseAdminBackendHandler> actual =
SchemaBackendHandlerFactory.newInstance(sqlStatement,
mock(BackendConnection.class));
+ Optional<DatabaseAdminBackendHandler> actual =
databaseAdminBackendHandlerFactory.newInstance(sqlStatement,
mock(BackendConnection.class));
assertTrue(actual.isPresent());
assertThat(actual.get(),
instanceOf(ShowCurrentDatabaseBackendHandler.class));
}
@Test
public void assertShowTables() {
- Optional<DatabaseAdminBackendHandler> actual =
SchemaBackendHandlerFactory.newInstance(mock(MySQLShowTablesStatement.class),
mock(BackendConnection.class));
+ Optional<DatabaseAdminBackendHandler> actual =
databaseAdminBackendHandlerFactory.newInstance(mock(MySQLShowTablesStatement.class),
mock(BackendConnection.class));
assertTrue(actual.isPresent());
assertThat(actual.get(), instanceOf(ShowTablesBackendHandler.class));
}
