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/07/29 00:27:13 UTC
[shardingsphere] branch master updated: Rename TextProtocolBackendHandler to ProxyBackendHandler (#19652)
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 ac43f803a20 Rename TextProtocolBackendHandler to ProxyBackendHandler (#19652)
ac43f803a20 is described below
commit ac43f803a2011d0ed60f461958dc20d6962ac70d
Author: 吴伟杰 <wu...@apache.org>
AuthorDate: Fri Jul 29 08:27:07 2022 +0800
Rename TextProtocolBackendHandler to ProxyBackendHandler (#19652)
---
.../jdbc/connection/JDBCBackendConnection.java | 26 +++++------
.../text/DatabaseRequiredBackendHandler.java | 2 +-
...ackendHandler.java => ProxyBackendHandler.java} | 4 +-
...actory.java => ProxyBackendHandlerFactory.java} | 30 ++++++-------
.../admin/DatabaseAdminBackendHandlerFactory.java | 16 +++----
.../admin/DatabaseAdminQueryBackendHandler.java | 4 +-
.../admin/DatabaseAdminUpdateBackendHandler.java | 4 +-
.../backend/text/data/DatabaseBackendHandler.java | 4 +-
.../database/CreateDatabaseBackendHandler.java | 4 +-
.../DatabaseOperateBackendHandlerFactory.java | 6 +--
.../text/database/DropDatabaseBackendHandler.java | 4 +-
.../text/distsql/DistSQLBackendHandlerFactory.java | 6 +--
.../text/distsql/ral/RALBackendHandler.java | 4 +-
.../text/distsql/ral/RALBackendHandlerFactory.java | 4 +-
.../update/UpdatableScalingRALBackendHandler.java | 4 +-
.../text/distsql/rdl/RDLBackendHandlerFactory.java | 6 +--
.../text/distsql/rql/RQLBackendHandlerFactory.java | 4 +-
.../text/distsql/rul/RULBackendHandler.java | 4 +-
.../text/distsql/rul/RULBackendHandlerFactory.java | 4 +-
...dHandler.java => ExtraProxyBackendHandler.java} | 8 ++--
.../backend/text/skip/SkipBackendHandler.java | 4 +-
.../transaction/TransactionBackendHandler.java | 4 +-
.../TransactionBackendHandlerFactory.java | 4 +-
.../text/transaction/TransactionSetHandler.java | 4 +-
.../text/transaction/TransactionXAHandler.java | 4 +-
.../jdbc/connection/JDBCBackendConnectionTest.java | 34 +++++++-------
...st.java => ProxyBackendHandlerFactoryTest.java} | 52 +++++++++++-----------
.../TransactionBackendHandlerFactoryTest.java | 14 +++---
.../execute/MySQLComStmtExecuteExecutor.java | 16 +++----
.../text/query/MySQLComQueryPacketExecutor.java | 18 ++++----
.../text/query/MySQLMultiStatementsHandler.java | 4 +-
.../execute/MySQLComStmtExecuteExecutorTest.java | 40 ++++++++---------
.../query/MySQLComQueryPacketExecutorTest.java | 24 +++++-----
.../query/simple/OpenGaussComQueryExecutor.java | 16 +++----
.../simple/OpenGaussComQueryExecutorTest.java | 18 ++++----
.../command/query/extended/JDBCPortal.java | 22 ++++-----
.../query/simple/PostgreSQLComQueryExecutor.java | 16 +++----
.../command/query/extended/JDBCPortalTest.java | 46 +++++++++----------
.../simple/PostgreSQLComQueryExecutorTest.java | 18 ++++----
.../ReactiveMySQLComStmtExecuteExecutor.java | 14 +++---
.../query/ReactiveMySQLComQueryPacketExecutor.java | 16 +++----
41 files changed, 268 insertions(+), 268 deletions(-)
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/JDBCBackendConnection.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/JDBCBackendConnection.java
index 6fea5d78d22..a2ffa0ccd98 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/JDBCBackendConnection.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/JDBCBackendConnection.java
@@ -31,7 +31,7 @@ import org.apache.shardingsphere.proxy.backend.communication.jdbc.transaction.JD
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.exception.BackendConnectionException;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
import org.apache.shardingsphere.proxy.backend.util.TransactionUtil;
import org.apache.shardingsphere.transaction.core.TransactionType;
@@ -59,9 +59,9 @@ public final class JDBCBackendConnection implements BackendConnection<Void>, Exe
private final Multimap<String, Connection> cachedConnections = LinkedHashMultimap.create();
- private final Collection<TextProtocolBackendHandler> handlers = Collections.newSetFromMap(new ConcurrentHashMap<>(64));
+ private final Collection<ProxyBackendHandler> backendHandlers = Collections.newSetFromMap(new ConcurrentHashMap<>(64));
- private final Collection<TextProtocolBackendHandler> inUseHandlers = Collections.newSetFromMap(new ConcurrentHashMap<>(64));
+ private final Collection<ProxyBackendHandler> inUseBackendHandlers = Collections.newSetFromMap(new ConcurrentHashMap<>(64));
private final Collection<ConnectionPostProcessor<Connection>> connectionPostProcessors = new LinkedList<>();
@@ -151,8 +151,8 @@ public final class JDBCBackendConnection implements BackendConnection<Void>, Exe
*
* @param handler handler to be added
*/
- public void add(final TextProtocolBackendHandler handler) {
- handlers.add(handler);
+ public void add(final ProxyBackendHandler handler) {
+ backendHandlers.add(handler);
}
/**
@@ -160,8 +160,8 @@ public final class JDBCBackendConnection implements BackendConnection<Void>, Exe
*
* @param handler handler to be marked
*/
- public void markResourceInUse(final TextProtocolBackendHandler handler) {
- inUseHandlers.add(handler);
+ public void markResourceInUse(final ProxyBackendHandler handler) {
+ inUseBackendHandlers.add(handler);
}
/**
@@ -169,8 +169,8 @@ public final class JDBCBackendConnection implements BackendConnection<Void>, Exe
*
* @param handler proxy backend handler to be added
*/
- public void unmarkResourceInUse(final TextProtocolBackendHandler handler) {
- inUseHandlers.remove(handler);
+ public void unmarkResourceInUse(final ProxyBackendHandler handler) {
+ inUseBackendHandlers.remove(handler);
}
@Override
@@ -226,8 +226,8 @@ public final class JDBCBackendConnection implements BackendConnection<Void>, Exe
*/
public Collection<SQLException> closeHandlers(final boolean includeInUse) {
Collection<SQLException> result = new LinkedList<>();
- for (TextProtocolBackendHandler each : handlers) {
- if (!includeInUse && inUseHandlers.contains(each)) {
+ for (ProxyBackendHandler each : backendHandlers) {
+ if (!includeInUse && inUseBackendHandlers.contains(each)) {
continue;
}
try {
@@ -237,9 +237,9 @@ public final class JDBCBackendConnection implements BackendConnection<Void>, Exe
}
}
if (includeInUse) {
- inUseHandlers.clear();
+ inUseBackendHandlers.clear();
}
- handlers.retainAll(inUseHandlers);
+ backendHandlers.retainAll(inUseBackendHandlers);
return result;
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/DatabaseRequiredBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/DatabaseRequiredBackendHandler.java
index 0a01e55b71e..00a43a4823b 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/DatabaseRequiredBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/DatabaseRequiredBackendHandler.java
@@ -38,7 +38,7 @@ import java.util.Optional;
*/
@RequiredArgsConstructor
@Getter
-public abstract class DatabaseRequiredBackendHandler<T extends SQLStatement> implements TextProtocolBackendHandler {
+public abstract class DatabaseRequiredBackendHandler<T extends SQLStatement> implements ProxyBackendHandler {
private final T sqlStatement;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/ProxyBackendHandler.java
similarity index 96%
rename from shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandler.java
rename to shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/ProxyBackendHandler.java
index 31d9042f2eb..39eb0fa2b83 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/ProxyBackendHandler.java
@@ -25,9 +25,9 @@ import java.sql.SQLException;
import java.util.Collections;
/**
- * Text protocol backend handler.
+ * Proxy backend handler.
*/
-public interface TextProtocolBackendHandler {
+public interface ProxyBackendHandler {
/**
* Execute command.
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/ProxyBackendHandlerFactory.java
similarity index 84%
rename from shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactory.java
rename to shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/ProxyBackendHandlerFactory.java
index 631e0605d19..3f83f59dd68 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactory.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/ProxyBackendHandlerFactory.java
@@ -39,7 +39,7 @@ import org.apache.shardingsphere.proxy.backend.text.admin.DatabaseAdminBackendHa
import org.apache.shardingsphere.proxy.backend.text.data.DatabaseBackendHandlerFactory;
import org.apache.shardingsphere.proxy.backend.text.database.DatabaseOperateBackendHandlerFactory;
import org.apache.shardingsphere.proxy.backend.text.distsql.DistSQLBackendHandlerFactory;
-import org.apache.shardingsphere.proxy.backend.text.extra.ExtraTextProtocolBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.extra.ExtraProxyBackendHandler;
import org.apache.shardingsphere.proxy.backend.text.skip.SkipBackendHandler;
import org.apache.shardingsphere.proxy.backend.text.transaction.TransactionBackendHandlerFactory;
import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
@@ -61,13 +61,13 @@ import java.util.LinkedList;
import java.util.Optional;
/**
- * Text protocol backend handler factory.
+ * Proxy backend handler factory.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class TextProtocolBackendHandlerFactory {
+public final class ProxyBackendHandlerFactory {
static {
- ShardingSphereServiceLoader.register(ExtraTextProtocolBackendHandler.class);
+ ShardingSphereServiceLoader.register(ExtraProxyBackendHandler.class);
}
/**
@@ -79,7 +79,7 @@ public final class TextProtocolBackendHandlerFactory {
* @return created instance
* @throws SQLException SQL exception
*/
- public static TextProtocolBackendHandler newInstance(final DatabaseType databaseType, final String sql, final ConnectionSession connectionSession) throws SQLException {
+ public static ProxyBackendHandler newInstance(final DatabaseType databaseType, final String sql, final ConnectionSession connectionSession) throws SQLException {
if (Strings.isNullOrEmpty(SQLUtil.trimComment(sql))) {
return new SkipBackendHandler(new EmptyStatement());
}
@@ -98,8 +98,8 @@ public final class TextProtocolBackendHandlerFactory {
* @return created instance
* @throws SQLException SQL exception
*/
- public static TextProtocolBackendHandler newInstance(final DatabaseType databaseType, final String sql, final SQLStatement sqlStatement,
- final ConnectionSession connectionSession) throws SQLException {
+ public static ProxyBackendHandler newInstance(final DatabaseType databaseType, final String sql, final SQLStatement sqlStatement,
+ final ConnectionSession connectionSession) throws SQLException {
if (sqlStatement instanceof EmptyStatement) {
return new SkipBackendHandler(new EmptyStatement());
}
@@ -127,8 +127,8 @@ public final class TextProtocolBackendHandlerFactory {
* @throws SQLException SQL exception
*/
@SuppressWarnings("unchecked")
- public static TextProtocolBackendHandler newInstance(final DatabaseType databaseType, final LogicSQL logicSQL, final ConnectionSession connectionSession,
- final boolean preferPreparedStatement) throws SQLException {
+ public static ProxyBackendHandler newInstance(final DatabaseType databaseType, final LogicSQL logicSQL, final ConnectionSession connectionSession,
+ final boolean preferPreparedStatement) throws SQLException {
SQLStatementContext<?> sqlStatementContext = logicSQL.getSqlStatementContext();
SQLStatement sqlStatement = sqlStatementContext.getSqlStatement();
String sql = logicSQL.getSql();
@@ -136,7 +136,7 @@ public final class TextProtocolBackendHandlerFactory {
if (sqlStatement instanceof TCLStatement) {
return TransactionBackendHandlerFactory.newInstance((SQLStatementContext<TCLStatement>) sqlStatementContext, sql, connectionSession);
}
- Optional<TextProtocolBackendHandler> backendHandler = DatabaseAdminBackendHandlerFactory.newInstance(databaseType, sqlStatementContext, connectionSession, sql);
+ Optional<ProxyBackendHandler> backendHandler = DatabaseAdminBackendHandlerFactory.newInstance(databaseType, sqlStatementContext, connectionSession, sql);
if (backendHandler.isPresent()) {
return backendHandler.get();
}
@@ -144,11 +144,11 @@ public final class TextProtocolBackendHandlerFactory {
if (sqlStatementContext instanceof TableAvailable) {
((TableAvailable) sqlStatementContext).getTablesContext().getDatabaseName().ifPresent(SQLStatementDatabaseHolder::set);
}
- Optional<ExtraTextProtocolBackendHandler> extraHandler = findExtraTextProtocolBackendHandler(sqlStatement);
+ Optional<ExtraProxyBackendHandler> extraHandler = findExtraProxyBackendHandler(sqlStatement);
if (extraHandler.isPresent()) {
return extraHandler.get();
}
- Optional<TextProtocolBackendHandler> databaseOperateHandler = findDatabaseOperateBackendHandler(sqlStatement, connectionSession);
+ Optional<ProxyBackendHandler> databaseOperateHandler = findDatabaseOperateBackendHandler(sqlStatement, connectionSession);
if (databaseOperateHandler.isPresent()) {
return databaseOperateHandler.get();
}
@@ -174,8 +174,8 @@ public final class TextProtocolBackendHandlerFactory {
}
}
- private static Optional<ExtraTextProtocolBackendHandler> findExtraTextProtocolBackendHandler(final SQLStatement sqlStatement) {
- for (ExtraTextProtocolBackendHandler each : ShardingSphereServiceLoader.getServiceInstances(ExtraTextProtocolBackendHandler.class)) {
+ private static Optional<ExtraProxyBackendHandler> findExtraProxyBackendHandler(final SQLStatement sqlStatement) {
+ for (ExtraProxyBackendHandler each : ShardingSphereServiceLoader.getServiceInstances(ExtraProxyBackendHandler.class)) {
if (each.accept(sqlStatement)) {
return Optional.of(each);
}
@@ -183,7 +183,7 @@ public final class TextProtocolBackendHandlerFactory {
return Optional.empty();
}
- private static Optional<TextProtocolBackendHandler> findDatabaseOperateBackendHandler(final SQLStatement sqlStatement, final ConnectionSession connectionSession) throws SQLException {
+ private static Optional<ProxyBackendHandler> findDatabaseOperateBackendHandler(final SQLStatement sqlStatement, final ConnectionSession connectionSession) throws SQLException {
if (sqlStatement instanceof CreateDatabaseStatement || sqlStatement instanceof DropDatabaseStatement) {
return Optional.of(DatabaseOperateBackendHandlerFactory.newInstance(sqlStatement, connectionSession));
}
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 2302d1c9673..09b30e14e64 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
@@ -22,7 +22,7 @@ import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
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.ProxyBackendHandler;
import org.apache.shardingsphere.proxy.backend.text.admin.executor.DatabaseAdminExecutor;
import org.apache.shardingsphere.proxy.backend.text.admin.executor.DatabaseAdminExecutorCreator;
import org.apache.shardingsphere.proxy.backend.text.admin.executor.DatabaseAdminExecutorCreatorFactory;
@@ -45,13 +45,13 @@ public final class DatabaseAdminBackendHandlerFactory {
* @param connectionSession connection session
* @return created instance
*/
- public static Optional<TextProtocolBackendHandler> newInstance(final DatabaseType databaseType, final SQLStatementContext<?> sqlStatementContext, final ConnectionSession connectionSession) {
+ public static Optional<ProxyBackendHandler> newInstance(final DatabaseType databaseType, final SQLStatementContext<?> sqlStatementContext, final ConnectionSession connectionSession) {
Optional<DatabaseAdminExecutorCreator> creator = DatabaseAdminExecutorCreatorFactory.findInstance(databaseType);
if (!creator.isPresent()) {
return Optional.empty();
}
Optional<DatabaseAdminExecutor> executor = creator.get().create(sqlStatementContext);
- return executor.map(optional -> createTextProtocolBackendHandler(sqlStatementContext, connectionSession, optional));
+ return executor.map(optional -> createProxyBackendHandler(sqlStatementContext, connectionSession, optional));
}
/**
@@ -63,18 +63,18 @@ public final class DatabaseAdminBackendHandlerFactory {
* @param sql SQL being executed
* @return created instance
*/
- public static Optional<TextProtocolBackendHandler> newInstance(final DatabaseType databaseType, final SQLStatementContext<?> sqlStatementContext,
- final ConnectionSession connectionSession, final String sql) {
+ public static Optional<ProxyBackendHandler> newInstance(final DatabaseType databaseType, final SQLStatementContext<?> sqlStatementContext,
+ final ConnectionSession connectionSession, final String sql) {
Optional<DatabaseAdminExecutorCreator> executorFactory = DatabaseAdminExecutorCreatorFactory.findInstance(databaseType);
if (!executorFactory.isPresent()) {
return Optional.empty();
}
Optional<DatabaseAdminExecutor> executor = executorFactory.get().create(sqlStatementContext, sql, connectionSession.getDatabaseName());
- return executor.map(optional -> createTextProtocolBackendHandler(sqlStatementContext, connectionSession, optional));
+ return executor.map(optional -> createProxyBackendHandler(sqlStatementContext, connectionSession, optional));
}
- private static TextProtocolBackendHandler createTextProtocolBackendHandler(final SQLStatementContext<?> sqlStatementContext,
- final ConnectionSession connectionSession, final DatabaseAdminExecutor executor) {
+ private static ProxyBackendHandler createProxyBackendHandler(final SQLStatementContext<?> sqlStatementContext,
+ final ConnectionSession connectionSession, final DatabaseAdminExecutor executor) {
if (executor instanceof DatabaseAdminQueryExecutor) {
return new DatabaseAdminQueryBackendHandler(connectionSession, (DatabaseAdminQueryExecutor) executor);
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/DatabaseAdminQueryBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/DatabaseAdminQueryBackendHandler.java
index 45f753498a0..bd429a77b11 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/DatabaseAdminQueryBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/DatabaseAdminQueryBackendHandler.java
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.proxy.backend.response.header.query.QueryHeader
import org.apache.shardingsphere.proxy.backend.response.header.query.QueryHeaderBuilderEngine;
import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
import org.apache.shardingsphere.proxy.backend.text.admin.executor.DatabaseAdminQueryExecutor;
import java.sql.SQLException;
@@ -41,7 +41,7 @@ import java.util.List;
* Database admin query backend handler.
*/
@RequiredArgsConstructor
-public final class DatabaseAdminQueryBackendHandler implements TextProtocolBackendHandler {
+public final class DatabaseAdminQueryBackendHandler implements ProxyBackendHandler {
private final ConnectionSession connectionSession;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/DatabaseAdminUpdateBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/DatabaseAdminUpdateBackendHandler.java
index cd1155f7acd..22370a64249 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/DatabaseAdminUpdateBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/DatabaseAdminUpdateBackendHandler.java
@@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor;
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.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
import org.apache.shardingsphere.proxy.backend.text.admin.executor.DatabaseAdminExecutor;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
@@ -31,7 +31,7 @@ import java.sql.SQLException;
* Database admin update backend handler.
*/
@RequiredArgsConstructor
-public final class DatabaseAdminUpdateBackendHandler implements TextProtocolBackendHandler {
+public final class DatabaseAdminUpdateBackendHandler implements ProxyBackendHandler {
private final ConnectionSession connectionSession;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/data/DatabaseBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/data/DatabaseBackendHandler.java
index 158e72aa4a7..87b5438f81f 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/data/DatabaseBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/data/DatabaseBackendHandler.java
@@ -17,10 +17,10 @@
package org.apache.shardingsphere.proxy.backend.text.data;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
/**
* Database backend handler.
*/
-public interface DatabaseBackendHandler extends TextProtocolBackendHandler {
+public interface DatabaseBackendHandler extends ProxyBackendHandler {
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/database/CreateDatabaseBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/database/CreateDatabaseBackendHandler.java
index b79222ae684..cb07165600a 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/database/CreateDatabaseBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/database/CreateDatabaseBackendHandler.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.exception.DBCreateExistsException;
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.TextProtocolBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.CreateDatabaseStatement;
import java.sql.SQLException;
@@ -31,7 +31,7 @@ import java.sql.SQLException;
* Create database backend handler.
*/
@RequiredArgsConstructor
-public final class CreateDatabaseBackendHandler implements TextProtocolBackendHandler {
+public final class CreateDatabaseBackendHandler implements ProxyBackendHandler {
private final CreateDatabaseStatement sqlStatement;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/database/DatabaseOperateBackendHandlerFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/database/DatabaseOperateBackendHandlerFactory.java
index ad9a0c116c6..666cf24df80 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/database/DatabaseOperateBackendHandlerFactory.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/database/DatabaseOperateBackendHandlerFactory.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.proxy.backend.text.database;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.CreateDatabaseStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DropDatabaseStatement;
@@ -41,11 +41,11 @@ public final class DatabaseOperateBackendHandlerFactory {
* @return created instance
* @throws SQLException SQL exception
*/
- public static TextProtocolBackendHandler newInstance(final SQLStatement sqlStatement, final ConnectionSession connectionSession) throws SQLException {
+ public static ProxyBackendHandler newInstance(final SQLStatement sqlStatement, final ConnectionSession connectionSession) throws SQLException {
return createBackendHandler(sqlStatement, connectionSession);
}
- private static TextProtocolBackendHandler createBackendHandler(final SQLStatement sqlStatement, final ConnectionSession connectionSession) {
+ private static ProxyBackendHandler createBackendHandler(final SQLStatement sqlStatement, final ConnectionSession connectionSession) {
if (sqlStatement instanceof CreateDatabaseStatement) {
return new CreateDatabaseBackendHandler((CreateDatabaseStatement) sqlStatement);
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/database/DropDatabaseBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/database/DropDatabaseBackendHandler.java
index 3e831db1905..1ae4dbd4f85 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/database/DropDatabaseBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/database/DropDatabaseBackendHandler.java
@@ -29,7 +29,7 @@ import org.apache.shardingsphere.proxy.backend.exception.UnknownDatabaseExceptio
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.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DropDatabaseStatement;
import java.util.Collection;
@@ -39,7 +39,7 @@ import java.util.LinkedList;
* Drop database backend handler.
*/
@RequiredArgsConstructor
-public final class DropDatabaseBackendHandler implements TextProtocolBackendHandler {
+public final class DropDatabaseBackendHandler implements ProxyBackendHandler {
private final DropDatabaseStatement sqlStatement;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/DistSQLBackendHandlerFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/DistSQLBackendHandlerFactory.java
index f01cb9b6444..700cc9e0e79 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/DistSQLBackendHandlerFactory.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/DistSQLBackendHandlerFactory.java
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.mode.manager.lock.definition.LockDefinitionFact
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.exception.UnsupportedUpdateOperationException;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
import org.apache.shardingsphere.proxy.backend.text.distsql.ral.RALBackendHandlerFactory;
import org.apache.shardingsphere.proxy.backend.text.distsql.rdl.RDLBackendHandlerFactory;
import org.apache.shardingsphere.proxy.backend.text.distsql.rql.RQLBackendHandlerFactory;
@@ -49,10 +49,10 @@ public final class DistSQLBackendHandlerFactory {
*
* @param sqlStatement dist SQL statement
* @param connectionSession connection session
- * @return text protocol backend handler
+ * @return proxy backend handler
* @throws SQLException SQL exception
*/
- public static TextProtocolBackendHandler newInstance(final DistSQLStatement sqlStatement, final ConnectionSession connectionSession) throws SQLException {
+ public static ProxyBackendHandler newInstance(final DistSQLStatement sqlStatement, final ConnectionSession connectionSession) throws SQLException {
if (sqlStatement instanceof RQLStatement) {
return RQLBackendHandlerFactory.newInstance((RQLStatement) sqlStatement, connectionSession);
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/RALBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/RALBackendHandler.java
index 342f1bb3481..cecab13954f 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/RALBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/RALBackendHandler.java
@@ -20,13 +20,13 @@ package org.apache.shardingsphere.proxy.backend.text.distsql.ral;
import lombok.Getter;
import org.apache.shardingsphere.distsql.parser.statement.ral.RALStatement;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
/**
* RAL backend handler.
*/
@Getter
-public abstract class RALBackendHandler<E extends RALStatement> implements TextProtocolBackendHandler {
+public abstract class RALBackendHandler<E extends RALStatement> implements ProxyBackendHandler {
private E sqlStatement;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/RALBackendHandlerFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/RALBackendHandlerFactory.java
index 896c9a6289f..3926f28c153 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/RALBackendHandlerFactory.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/RALBackendHandlerFactory.java
@@ -50,7 +50,7 @@ import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.SetInsta
import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.SetVariableStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.UnlabelInstanceStatement;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
import org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.HintRALBackendHandler;
import org.apache.shardingsphere.proxy.backend.text.distsql.ral.queryable.ConvertYamlConfigurationHandler;
import org.apache.shardingsphere.proxy.backend.text.distsql.ral.queryable.ExportDatabaseConfigurationHandler;
@@ -137,7 +137,7 @@ public final class RALBackendHandlerFactory {
* @return created instance
* @throws SQLException SQL exception
*/
- public static TextProtocolBackendHandler newInstance(final RALStatement sqlStatement, final ConnectionSession connectionSession) throws SQLException {
+ public static ProxyBackendHandler newInstance(final RALStatement sqlStatement, final ConnectionSession connectionSession) throws SQLException {
if (sqlStatement instanceof HintRALStatement) {
return new HintRALBackendHandler((HintRALStatement) sqlStatement, connectionSession);
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/scaling/update/UpdatableScalingRALBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/scaling/update/UpdatableScalingRALBackendHandler.java
index e13ba3ceeb6..d864ee22c13 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/scaling/update/UpdatableScalingRALBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/scaling/update/UpdatableScalingRALBackendHandler.java
@@ -23,14 +23,14 @@ import org.apache.shardingsphere.distsql.parser.statement.ral.scaling.UpdatableS
import org.apache.shardingsphere.infra.distsql.update.RALUpdaterFactory;
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.TextProtocolBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
/**
* Updatable scaling RAL backend handler factory.
*/
@RequiredArgsConstructor
@Setter
-public final class UpdatableScalingRALBackendHandler implements TextProtocolBackendHandler {
+public final class UpdatableScalingRALBackendHandler implements ProxyBackendHandler {
private final UpdatableScalingRALStatement sqlStatement;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/RDLBackendHandlerFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/RDLBackendHandlerFactory.java
index afd1bf0d61d..d8963cb711c 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/RDLBackendHandlerFactory.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/RDLBackendHandlerFactory.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterResourc
import org.apache.shardingsphere.distsql.parser.statement.rdl.create.AddResourceStatement;
import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropResourceStatement;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
import org.apache.shardingsphere.proxy.backend.text.distsql.rdl.resource.AddResourceBackendHandler;
import org.apache.shardingsphere.proxy.backend.text.distsql.rdl.resource.AlterResourceBackendHandler;
import org.apache.shardingsphere.proxy.backend.text.distsql.rdl.resource.DropResourceBackendHandler;
@@ -47,11 +47,11 @@ public final class RDLBackendHandlerFactory {
* @return RDL backend handler
* @throws SQLException SQL exception
*/
- public static TextProtocolBackendHandler newInstance(final RDLStatement sqlStatement, final ConnectionSession connectionSession) throws SQLException {
+ public static ProxyBackendHandler newInstance(final RDLStatement sqlStatement, final ConnectionSession connectionSession) throws SQLException {
return createBackendHandler(sqlStatement, connectionSession);
}
- private static TextProtocolBackendHandler createBackendHandler(final RDLStatement sqlStatement, final ConnectionSession connectionSession) {
+ private static ProxyBackendHandler createBackendHandler(final RDLStatement sqlStatement, final ConnectionSession connectionSession) {
if (sqlStatement instanceof AddResourceStatement) {
return new AddResourceBackendHandler((AddResourceStatement) sqlStatement, connectionSession);
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/RQLBackendHandlerFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/RQLBackendHandlerFactory.java
index a03ac78dd93..83412c61aee 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/RQLBackendHandlerFactory.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/RQLBackendHandlerFactory.java
@@ -22,7 +22,7 @@ import lombok.NoArgsConstructor;
import org.apache.shardingsphere.distsql.parser.statement.rql.RQLStatement;
import org.apache.shardingsphere.infra.distsql.query.DistSQLResultSet;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.spi.type.typed.TypedSPIRegistry;
@@ -45,7 +45,7 @@ public final class RQLBackendHandlerFactory {
* @param connectionSession connection session
* @return RDL backend handler
*/
- public static TextProtocolBackendHandler newInstance(final RQLStatement sqlStatement, final ConnectionSession connectionSession) {
+ public static ProxyBackendHandler newInstance(final RQLStatement sqlStatement, final ConnectionSession connectionSession) {
DistSQLResultSet resultSet = TypedSPIRegistry.getRegisteredService(DistSQLResultSet.class, sqlStatement.getClass().getCanonicalName(), new Properties());
return new RQLBackendHandler(sqlStatement, connectionSession, resultSet);
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rul/RULBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rul/RULBackendHandler.java
index 3cc3d254304..b872573a70d 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rul/RULBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rul/RULBackendHandler.java
@@ -20,13 +20,13 @@ package org.apache.shardingsphere.proxy.backend.text.distsql.rul;
import lombok.Getter;
import org.apache.shardingsphere.distsql.parser.statement.rul.RULStatement;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
/**
* RUL backend handler.
*/
@Getter
-public abstract class RULBackendHandler<E extends RULStatement> implements TextProtocolBackendHandler {
+public abstract class RULBackendHandler<E extends RULStatement> implements ProxyBackendHandler {
private E sqlStatement;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rul/RULBackendHandlerFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rul/RULBackendHandlerFactory.java
index 93a5331e740..a1ee3fbe3b2 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rul/RULBackendHandlerFactory.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rul/RULBackendHandlerFactory.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.distsql.parser.statement.rul.sql.FormatStatemen
import org.apache.shardingsphere.distsql.parser.statement.rul.sql.ParseStatement;
import org.apache.shardingsphere.distsql.parser.statement.rul.sql.PreviewStatement;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
import org.apache.shardingsphere.proxy.backend.text.distsql.rul.sql.FormatSQLHandler;
import org.apache.shardingsphere.proxy.backend.text.distsql.rul.sql.ParseDistSQLHandler;
import org.apache.shardingsphere.proxy.backend.text.distsql.rul.sql.PreviewHandler;
@@ -55,7 +55,7 @@ public final class RULBackendHandlerFactory {
* @return created instance
* @throws SQLException SQL exception
*/
- public static TextProtocolBackendHandler newInstance(final RULStatement sqlStatement, final ConnectionSession connectionSession) throws SQLException {
+ public static ProxyBackendHandler newInstance(final RULStatement sqlStatement, final ConnectionSession connectionSession) throws SQLException {
return createRULBackendHandler(sqlStatement, connectionSession);
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/extra/ExtraTextProtocolBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/extra/ExtraProxyBackendHandler.java
similarity index 82%
rename from shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/extra/ExtraTextProtocolBackendHandler.java
rename to shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/extra/ExtraProxyBackendHandler.java
index 839e977ff35..e0f68915aff 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/extra/ExtraTextProtocolBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/extra/ExtraProxyBackendHandler.java
@@ -17,20 +17,20 @@
package org.apache.shardingsphere.proxy.backend.text.extra;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
import org.apache.shardingsphere.spi.annotation.SingletonSPI;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
/**
- * Extra text protocol backend handler.
+ * Extra proxy backend handler.
*/
@SingletonSPI
-public interface ExtraTextProtocolBackendHandler extends TextProtocolBackendHandler {
+public interface ExtraProxyBackendHandler extends ProxyBackendHandler {
/**
* Whether accept to process SQL statement.
*
- * @param sqlStatement SQL statement to be judge
+ * @param sqlStatement SQL statement to be judged
* @return accept or not
*/
boolean accept(SQLStatement sqlStatement);
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/skip/SkipBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/skip/SkipBackendHandler.java
index c9945b62658..da45623dc95 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/skip/SkipBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/skip/SkipBackendHandler.java
@@ -20,14 +20,14 @@ package org.apache.shardingsphere.proxy.backend.text.skip;
import lombok.RequiredArgsConstructor;
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.TextProtocolBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
/**
* Skip backend handler.
*/
@RequiredArgsConstructor
-public final class SkipBackendHandler implements TextProtocolBackendHandler {
+public final class SkipBackendHandler implements ProxyBackendHandler {
private final SQLStatement sqlStatement;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandler.java
index 0c4a7a55e1a..1ccc12bf136 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandler.java
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.proxy.backend.communication.vertx.transaction.V
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.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.tcl.ReleaseSavepointStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.tcl.RollbackStatement;
@@ -50,7 +50,7 @@ import java.sql.SQLFeatureNotSupportedException;
/**
* Do transaction operation.
*/
-public final class TransactionBackendHandler implements TextProtocolBackendHandler {
+public final class TransactionBackendHandler implements ProxyBackendHandler {
private final TCLStatement tclStatement;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandlerFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandlerFactory.java
index 9d47ad40e86..052747cd0d0 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandlerFactory.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandlerFactory.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.binder.LogicSQL;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.proxy.backend.communication.DatabaseCommunicationEngineFactory;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
import org.apache.shardingsphere.sql.parser.sql.common.constant.OperationScope;
import org.apache.shardingsphere.sql.parser.sql.common.statement.tcl.BeginTransactionStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.tcl.CommitStatement;
@@ -53,7 +53,7 @@ public final class TransactionBackendHandlerFactory {
* @param connectionSession connection session
* @return backend handler
*/
- public static TextProtocolBackendHandler newInstance(final SQLStatementContext<? extends TCLStatement> sqlStatementContext, final String sql, final ConnectionSession connectionSession) {
+ public static ProxyBackendHandler newInstance(final SQLStatementContext<? extends TCLStatement> sqlStatementContext, final String sql, final ConnectionSession connectionSession) {
TCLStatement tclStatement = sqlStatementContext.getSqlStatement();
if (tclStatement instanceof BeginTransactionStatement || tclStatement instanceof StartTransactionStatement) {
return new TransactionBackendHandler(tclStatement, TransactionOperationType.BEGIN, connectionSession);
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionSetHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionSetHandler.java
index 43ea3ce2f13..19f4786e210 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionSetHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionSetHandler.java
@@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor;
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.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
import org.apache.shardingsphere.proxy.backend.util.TransactionUtil;
import org.apache.shardingsphere.sql.parser.sql.common.constant.TransactionAccessType;
import org.apache.shardingsphere.sql.parser.sql.common.statement.tcl.SetTransactionStatement;
@@ -34,7 +34,7 @@ import java.sql.SQLException;
* Set transaction handler.
*/
@RequiredArgsConstructor
-public final class TransactionSetHandler implements TextProtocolBackendHandler {
+public final class TransactionSetHandler implements ProxyBackendHandler {
private final SetTransactionStatement sqlStatement;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionXAHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionXAHandler.java
index e37307dad3a..dd7d2769b03 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionXAHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionXAHandler.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.proxy.backend.communication.jdbc.JDBCDatabaseCo
import org.apache.shardingsphere.proxy.backend.response.data.QueryResponseRow;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
import org.apache.shardingsphere.sharding.merge.ddl.fetch.FetchOrderByValueGroupsHolder;
import org.apache.shardingsphere.sql.parser.sql.common.statement.tcl.TCLStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.tcl.XAStatement;
@@ -39,7 +39,7 @@ import java.util.Collections;
* TODO Currently XA transaction started with `XA START` doesn't support for database with multiple datasource, a flag should be added for this both in init progress and add datasource from distSQL.
*/
@RequiredArgsConstructor
-public final class TransactionXAHandler implements TextProtocolBackendHandler {
+public final class TransactionXAHandler implements ProxyBackendHandler {
private final XAStatement tclStatement;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/JDBCBackendConnectionTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/JDBCBackendConnectionTest.java
index 3bd3c600b28..bf534cbf07c 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/JDBCBackendConnectionTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/JDBCBackendConnectionTest.java
@@ -36,7 +36,7 @@ import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.exception.BackendConnectionException;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.proxy.backend.session.transaction.TransactionStatus;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer;
import org.apache.shardingsphere.transaction.ShardingSphereTransactionManagerEngine;
import org.apache.shardingsphere.transaction.core.TransactionType;
@@ -315,27 +315,27 @@ public final class JDBCBackendConnectionTest extends ProxyContextRestorer {
@Test
public void assertAddDatabaseCommunicationEngine() {
- TextProtocolBackendHandler expectedEngine = mock(JDBCDatabaseCommunicationEngine.class);
+ ProxyBackendHandler expectedEngine = mock(JDBCDatabaseCommunicationEngine.class);
backendConnection.add(expectedEngine);
- Collection<TextProtocolBackendHandler> actual = getDatabaseCommunicationEngines();
+ Collection<ProxyBackendHandler> actual = getDatabaseCommunicationEngines();
assertThat(actual.size(), is(1));
assertThat(actual.iterator().next(), is(expectedEngine));
}
@Test
public void assertMarkDatabaseCommunicationEngineInUse() {
- TextProtocolBackendHandler expectedEngine = mock(JDBCDatabaseCommunicationEngine.class);
+ ProxyBackendHandler expectedEngine = mock(JDBCDatabaseCommunicationEngine.class);
backendConnection.add(expectedEngine);
backendConnection.markResourceInUse(expectedEngine);
- Collection<TextProtocolBackendHandler> actual = getInUseDatabaseCommunicationEngines();
+ Collection<ProxyBackendHandler> actual = getInUseDatabaseCommunicationEngines();
assertThat(actual.size(), is(1));
assertThat(actual.iterator().next(), is(expectedEngine));
}
@Test
public void assertUnmarkInUseDatabaseCommunicationEngine() {
- TextProtocolBackendHandler engine = mock(JDBCDatabaseCommunicationEngine.class);
- Collection<TextProtocolBackendHandler> actual = getInUseDatabaseCommunicationEngines();
+ ProxyBackendHandler engine = mock(JDBCDatabaseCommunicationEngine.class);
+ Collection<ProxyBackendHandler> actual = getInUseDatabaseCommunicationEngines();
actual.add(engine);
backendConnection.unmarkResourceInUse(engine);
assertTrue(actual.isEmpty());
@@ -343,12 +343,12 @@ public final class JDBCBackendConnectionTest extends ProxyContextRestorer {
@Test
public void assertCloseHandlers() throws SQLException {
- TextProtocolBackendHandler engine = mock(JDBCDatabaseCommunicationEngine.class);
- TextProtocolBackendHandler inUseEngine = mock(JDBCDatabaseCommunicationEngine.class);
+ ProxyBackendHandler engine = mock(JDBCDatabaseCommunicationEngine.class);
+ ProxyBackendHandler inUseEngine = mock(JDBCDatabaseCommunicationEngine.class);
SQLException expectedException = mock(SQLException.class);
doThrow(expectedException).when(engine).close();
- Collection<TextProtocolBackendHandler> databaseCommunicationEngines = getDatabaseCommunicationEngines();
- Collection<TextProtocolBackendHandler> inUseDatabaseCommunicationEngines = getInUseDatabaseCommunicationEngines();
+ Collection<ProxyBackendHandler> databaseCommunicationEngines = getDatabaseCommunicationEngines();
+ Collection<ProxyBackendHandler> inUseDatabaseCommunicationEngines = getInUseDatabaseCommunicationEngines();
databaseCommunicationEngines.add(engine);
databaseCommunicationEngines.add(inUseEngine);
inUseDatabaseCommunicationEngines.add(inUseEngine);
@@ -366,18 +366,18 @@ public final class JDBCBackendConnectionTest extends ProxyContextRestorer {
@SuppressWarnings("unchecked")
@SneakyThrows
- private Collection<TextProtocolBackendHandler> getDatabaseCommunicationEngines() {
- Field field = JDBCBackendConnection.class.getDeclaredField("handlers");
+ private Collection<ProxyBackendHandler> getDatabaseCommunicationEngines() {
+ Field field = JDBCBackendConnection.class.getDeclaredField("backendHandlers");
field.setAccessible(true);
- return (Collection<TextProtocolBackendHandler>) field.get(backendConnection);
+ return (Collection<ProxyBackendHandler>) field.get(backendConnection);
}
@SuppressWarnings("unchecked")
@SneakyThrows
- private Collection<TextProtocolBackendHandler> getInUseDatabaseCommunicationEngines() {
- Field field = JDBCBackendConnection.class.getDeclaredField("inUseHandlers");
+ private Collection<ProxyBackendHandler> getInUseDatabaseCommunicationEngines() {
+ Field field = JDBCBackendConnection.class.getDeclaredField("inUseBackendHandlers");
field.setAccessible(true);
- return (Collection<TextProtocolBackendHandler>) field.get(backendConnection);
+ return (Collection<ProxyBackendHandler>) field.get(backendConnection);
}
@Test
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactoryTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/ProxyBackendHandlerFactoryTest.java
similarity index 79%
rename from shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactoryTest.java
rename to shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/ProxyBackendHandlerFactoryTest.java
index 7b5e8177aed..7bb89e68796 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactoryTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/ProxyBackendHandlerFactoryTest.java
@@ -66,7 +66,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
-public final class TextProtocolBackendHandlerFactoryTest extends ProxyContextRestorer {
+public final class ProxyBackendHandlerFactoryTest extends ProxyContextRestorer {
private final DatabaseType databaseType = DatabaseTypeFactory.getInstance("MySQL");
@@ -112,95 +112,95 @@ public final class TextProtocolBackendHandlerFactoryTest extends ProxyContextRes
@Test
public void assertNewInstanceWithCommonDistSQL() throws SQLException {
String sql = "set variable transaction_type=LOCAL";
- TextProtocolBackendHandler actual = TextProtocolBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
+ ProxyBackendHandler actual = ProxyBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
assertThat(actual, instanceOf(SetVariableHandler.class));
sql = "show variable transaction_type";
- actual = TextProtocolBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
+ actual = ProxyBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
assertThat(actual, instanceOf(QueryableRALBackendHandler.class));
sql = "show all variables";
- actual = TextProtocolBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
+ actual = ProxyBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
assertThat(actual, instanceOf(QueryableRALBackendHandler.class));
sql = "set sharding hint database_value=1";
- actual = TextProtocolBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
+ actual = ProxyBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
assertThat(actual, instanceOf(HintRALBackendHandler.class));
}
@Test
public void assertNewInstanceWithBegin() throws SQLException {
String sql = "BEGIN";
- TextProtocolBackendHandler actual = TextProtocolBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
+ ProxyBackendHandler actual = ProxyBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
assertThat(actual, instanceOf(TransactionBackendHandler.class));
}
@Test
public void assertNewInstanceWithStartTransaction() throws SQLException {
String sql = "START TRANSACTION";
- TextProtocolBackendHandler actual = TextProtocolBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
+ ProxyBackendHandler actual = ProxyBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
assertThat(actual, instanceOf(TransactionBackendHandler.class));
}
@Test
public void assertNewInstanceWithSetAutoCommitToOff() throws SQLException {
String sql = "SET AUTOCOMMIT=0";
- TextProtocolBackendHandler actual = TextProtocolBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
+ ProxyBackendHandler actual = ProxyBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
assertThat(actual, instanceOf(TransactionBackendHandler.class));
}
@Test
public void assertNewInstanceWithScopeSetAutoCommitToOff() throws SQLException {
String sql = "SET @@SESSION.AUTOCOMMIT = OFF";
- TextProtocolBackendHandler actual = TextProtocolBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
+ ProxyBackendHandler actual = ProxyBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
assertThat(actual, instanceOf(TransactionBackendHandler.class));
}
@Test
public void assertNewInstanceWithSetAutoCommitToOn() throws SQLException {
String sql = "SET AUTOCOMMIT=1";
- TextProtocolBackendHandler actual = TextProtocolBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
+ ProxyBackendHandler actual = ProxyBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
assertThat(actual, instanceOf(TransactionBackendHandler.class));
}
@Test
public void assertNewInstanceWithScopeSetAutoCommitToOnForInTransaction() throws SQLException {
String sql = "SET @@SESSION.AUTOCOMMIT = ON";
- TextProtocolBackendHandler actual = TextProtocolBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
+ ProxyBackendHandler actual = ProxyBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
assertThat(actual, instanceOf(TransactionBackendHandler.class));
}
@Test
public void assertNewInstanceWithUse() throws SQLException {
String sql = "use sharding_db";
- TextProtocolBackendHandler actual = TextProtocolBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
+ ProxyBackendHandler actual = ProxyBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
assertThat(actual, instanceOf(DatabaseAdminUpdateBackendHandler.class));
}
@Test
public void assertNewInstanceWithShowDatabase() throws SQLException {
String sql = "show databases";
- TextProtocolBackendHandler actual = TextProtocolBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
+ ProxyBackendHandler actual = ProxyBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
assertThat(actual, instanceOf(DatabaseAdminQueryBackendHandler.class));
}
@Test
public void assertNewInstanceWithSet() throws SQLException {
String sql = "set @num=1";
- TextProtocolBackendHandler actual = TextProtocolBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
+ ProxyBackendHandler actual = ProxyBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
assertThat(actual, instanceOf(DatabaseAdminUpdateBackendHandler.class));
}
@Test
public void assertNewInstanceWithShow() throws SQLException {
String sql = "SHOW VARIABLES LIKE '%x%'";
- TextProtocolBackendHandler actual = TextProtocolBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
+ ProxyBackendHandler actual = ProxyBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
assertThat(actual, instanceOf(UnicastDatabaseBackendHandler.class));
sql = "SHOW VARIABLES WHERE Variable_name ='language'";
- actual = TextProtocolBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
+ actual = ProxyBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
assertThat(actual, instanceOf(UnicastDatabaseBackendHandler.class));
sql = "SHOW CHARACTER SET";
- actual = TextProtocolBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
+ actual = ProxyBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
assertThat(actual, instanceOf(UnicastDatabaseBackendHandler.class));
sql = "SHOW COLLATION";
- actual = TextProtocolBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
+ actual = ProxyBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
assertThat(actual, instanceOf(UnicastDatabaseBackendHandler.class));
}
@@ -212,44 +212,44 @@ public final class TextProtocolBackendHandlerFactoryTest extends ProxyContextRes
ProxyContext proxyContext = ProxyContext.getInstance();
when(proxyContext.getAllDatabaseNames()).thenReturn(new HashSet<>(Collections.singletonList("db")));
when(proxyContext.getDatabase("db").containsDataSource()).thenReturn(true);
- TextProtocolBackendHandler actual = TextProtocolBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
+ ProxyBackendHandler actual = ProxyBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
assertThat(actual, instanceOf(DatabaseCommunicationEngine.class));
sql = "select * from information_schema.schemata limit 1";
- actual = TextProtocolBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
+ actual = ProxyBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
assertThat(actual, instanceOf(DatabaseAdminQueryBackendHandler.class));
}
@Test
public void assertNewInstanceWithEmptyString() throws SQLException {
String sql = "";
- TextProtocolBackendHandler actual = TextProtocolBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
+ ProxyBackendHandler actual = ProxyBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
assertThat(actual, instanceOf(SkipBackendHandler.class));
}
@Test(expected = SQLParsingException.class)
public void assertNewInstanceWithErrorSQL() throws SQLException {
String sql = "SELECT";
- TextProtocolBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
+ ProxyBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
}
@Test(expected = SQLParsingException.class)
public void assertNewInstanceWithErrorRDL() throws SQLException {
String sql = "CREATE SHARDING";
- TextProtocolBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
+ ProxyBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
}
@Test(expected = UnsupportedOperationException.class)
public void assertUnsupportedNonQueryDistSQLInTransaction() throws SQLException {
when(connectionSession.getTransactionStatus().isInTransaction()).thenReturn(true);
String sql = "CREATE SHARDING KEY GENERATOR snowflake_key_generator (TYPE(NAME=SNOWFLAKE, PROPERTIES(\"max-vibration-offset\"=3)));";
- TextProtocolBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
+ ProxyBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
}
@Test
public void assertUnsupportedQueryableRALStatementInTransaction() throws SQLException {
when(connectionSession.getTransactionStatus().isInTransaction()).thenReturn(true);
String sql = "SHOW TRANSACTION RULE;";
- TextProtocolBackendHandler actual = TextProtocolBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
+ ProxyBackendHandler actual = ProxyBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
assertThat(actual, instanceOf(QueryableRALBackendHandler.class));
}
@@ -257,7 +257,7 @@ public final class TextProtocolBackendHandlerFactoryTest extends ProxyContextRes
public void assertUnsupportedRQLStatementInTransaction() throws SQLException {
when(connectionSession.getTransactionStatus().isInTransaction()).thenReturn(true);
String sql = "SHOW SINGLE TABLE RULES";
- TextProtocolBackendHandler actual = TextProtocolBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
+ ProxyBackendHandler actual = ProxyBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
assertThat(actual, instanceOf(RQLBackendHandler.class));
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandlerFactoryTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandlerFactoryTest.java
index 289fb14e6b2..d5fa5fc298f 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandlerFactoryTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandlerFactoryTest.java
@@ -29,7 +29,7 @@ import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.JDB
import org.apache.shardingsphere.proxy.backend.communication.jdbc.transaction.JDBCBackendTransactionManager;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer;
import org.apache.shardingsphere.sql.parser.sql.common.statement.tcl.CommitStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.tcl.RollbackStatement;
@@ -74,9 +74,9 @@ public final class TransactionBackendHandlerFactoryTest extends ProxyContextRest
when(connectionSession.getBackendConnection()).thenReturn(backendConnection);
SQLStatementContext<CommitStatement> context = mock(SQLStatementContext.class);
when(context.getSqlStatement()).thenReturn(mock(CommitStatement.class));
- TextProtocolBackendHandler textProtocolBackendHandler = TransactionBackendHandlerFactory.newInstance(context, null, connectionSession);
- assertThat(textProtocolBackendHandler, instanceOf(TransactionBackendHandler.class));
- TransactionBackendHandler transactionBackendHandler = (TransactionBackendHandler) textProtocolBackendHandler;
+ ProxyBackendHandler proxyBackendHandler = TransactionBackendHandlerFactory.newInstance(context, null, connectionSession);
+ assertThat(proxyBackendHandler, instanceOf(TransactionBackendHandler.class));
+ TransactionBackendHandler transactionBackendHandler = (TransactionBackendHandler) proxyBackendHandler;
assertFieldOfInstance(transactionBackendHandler, "operationType", is(TransactionOperationType.COMMIT));
assertFieldOfInstance(getBackendTransactionManager(transactionBackendHandler), "connection", is(backendConnection));
}
@@ -89,9 +89,9 @@ public final class TransactionBackendHandlerFactoryTest extends ProxyContextRest
when(connectionSession.getBackendConnection()).thenReturn(backendConnection);
SQLStatementContext<RollbackStatement> context = mock(SQLStatementContext.class);
when(context.getSqlStatement()).thenReturn(mock(RollbackStatement.class));
- TextProtocolBackendHandler textProtocolBackendHandler = TransactionBackendHandlerFactory.newInstance(context, null, connectionSession);
- assertThat(textProtocolBackendHandler, instanceOf(TransactionBackendHandler.class));
- TransactionBackendHandler transactionBackendHandler = (TransactionBackendHandler) textProtocolBackendHandler;
+ ProxyBackendHandler proxyBackendHandler = TransactionBackendHandlerFactory.newInstance(context, null, connectionSession);
+ assertThat(proxyBackendHandler, instanceOf(TransactionBackendHandler.class));
+ TransactionBackendHandler transactionBackendHandler = (TransactionBackendHandler) proxyBackendHandler;
assertFieldOfInstance(transactionBackendHandler, "operationType", is(TransactionOperationType.ROLLBACK));
assertFieldOfInstance(getBackendTransactionManager(transactionBackendHandler), "connection", is(backendConnection));
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutor.java
index a988f19d0ab..5bb37ba85aa 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutor.java
@@ -40,8 +40,8 @@ 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.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandlerFactory;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandlerFactory;
import org.apache.shardingsphere.proxy.frontend.command.executor.QueryCommandExecutor;
import org.apache.shardingsphere.proxy.frontend.command.executor.ResponseType;
import org.apache.shardingsphere.proxy.frontend.mysql.command.ServerStatusFlagCalculator;
@@ -63,7 +63,7 @@ public final class MySQLComStmtExecuteExecutor implements QueryCommandExecutor {
private final ConnectionSession connectionSession;
- private TextProtocolBackendHandler textProtocolBackendHandler;
+ private ProxyBackendHandler proxyBackendHandler;
@Getter
private ResponseType responseType;
@@ -84,8 +84,8 @@ public final class MySQLComStmtExecuteExecutor implements QueryCommandExecutor {
((TableAvailable) sqlStatementContext).getTablesContext().getDatabaseName().ifPresent(SQLStatementDatabaseHolder::set);
}
LogicSQL logicSQL = new LogicSQL(sqlStatementContext, preparedStatement.getSql(), parameters);
- textProtocolBackendHandler = TextProtocolBackendHandlerFactory.newInstance(DatabaseTypeFactory.getInstance("MySQL"), logicSQL, connectionSession, true);
- ResponseHeader responseHeader = textProtocolBackendHandler.execute();
+ proxyBackendHandler = ProxyBackendHandlerFactory.newInstance(DatabaseTypeFactory.getInstance("MySQL"), logicSQL, connectionSession, true);
+ ResponseHeader responseHeader = proxyBackendHandler.execute();
return responseHeader instanceof QueryResponseHeader ? processQuery((QueryResponseHeader) responseHeader) : processUpdate((UpdateResponseHeader) responseHeader);
}
@@ -112,12 +112,12 @@ public final class MySQLComStmtExecuteExecutor implements QueryCommandExecutor {
@Override
public boolean next() throws SQLException {
- return textProtocolBackendHandler.next();
+ return proxyBackendHandler.next();
}
@Override
public MySQLPacket getQueryRowPacket() throws SQLException {
- QueryResponseRow queryResponseRow = textProtocolBackendHandler.getRowData();
+ QueryResponseRow queryResponseRow = proxyBackendHandler.getRowData();
return new MySQLBinaryResultSetRowPacket(++currentSequenceId, createBinaryRow(queryResponseRow));
}
@@ -131,6 +131,6 @@ public final class MySQLComStmtExecuteExecutor implements QueryCommandExecutor {
@Override
public void close() throws SQLException {
- textProtocolBackendHandler.close();
+ proxyBackendHandler.close();
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutor.java
index 0418d1e8263..a52dbc40a8f 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutor.java
@@ -33,8 +33,8 @@ 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.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandlerFactory;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandlerFactory;
import org.apache.shardingsphere.proxy.frontend.command.executor.QueryCommandExecutor;
import org.apache.shardingsphere.proxy.frontend.command.executor.ResponseType;
import org.apache.shardingsphere.proxy.frontend.mysql.command.ServerStatusFlagCalculator;
@@ -55,7 +55,7 @@ public final class MySQLComQueryPacketExecutor implements QueryCommandExecutor {
private final ConnectionSession connectionSession;
- private final TextProtocolBackendHandler textProtocolBackendHandler;
+ private final ProxyBackendHandler proxyBackendHandler;
private final int characterSet;
@@ -68,8 +68,8 @@ public final class MySQLComQueryPacketExecutor implements QueryCommandExecutor {
this.connectionSession = connectionSession;
DatabaseType databaseType = DatabaseTypeFactory.getInstance("MySQL");
SQLStatement sqlStatement = parseSql(packet.getSql(), databaseType);
- textProtocolBackendHandler = areMultiStatements(connectionSession, sqlStatement, packet.getSql()) ? new MySQLMultiStatementsHandler(connectionSession, sqlStatement, packet.getSql())
- : TextProtocolBackendHandlerFactory.newInstance(databaseType, packet.getSql(), sqlStatement, connectionSession);
+ proxyBackendHandler = areMultiStatements(connectionSession, sqlStatement, packet.getSql()) ? new MySQLMultiStatementsHandler(connectionSession, sqlStatement, packet.getSql())
+ : ProxyBackendHandlerFactory.newInstance(databaseType, packet.getSql(), sqlStatement, connectionSession);
characterSet = connectionSession.getAttributeMap().attr(MySQLConstants.MYSQL_CHARACTER_SET_ATTRIBUTE_KEY).get().getId();
}
@@ -91,7 +91,7 @@ public final class MySQLComQueryPacketExecutor implements QueryCommandExecutor {
@Override
public Collection<DatabasePacket<?>> execute() throws SQLException {
- ResponseHeader responseHeader = textProtocolBackendHandler.execute();
+ ResponseHeader responseHeader = proxyBackendHandler.execute();
if (responseHeader instanceof QueryResponseHeader) {
return processQuery((QueryResponseHeader) responseHeader);
}
@@ -112,16 +112,16 @@ public final class MySQLComQueryPacketExecutor implements QueryCommandExecutor {
@Override
public boolean next() throws SQLException {
- return textProtocolBackendHandler.next();
+ return proxyBackendHandler.next();
}
@Override
public MySQLPacket getQueryRowPacket() throws SQLException {
- return new MySQLTextResultSetRowPacket(++currentSequenceId, textProtocolBackendHandler.getRowData().getData());
+ return new MySQLTextResultSetRowPacket(++currentSequenceId, proxyBackendHandler.getRowData().getData());
}
@Override
public void close() throws SQLException {
- textProtocolBackendHandler.close();
+ proxyBackendHandler.close();
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsHandler.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsHandler.java
index 58b78f3fa3f..58e0859a3e2 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsHandler.java
@@ -50,7 +50,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.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.dml.UpdateStatement;
@@ -70,7 +70,7 @@ import java.util.regex.Pattern;
/**
* Handler for MySQL multi statements.
*/
-public final class MySQLMultiStatementsHandler implements TextProtocolBackendHandler {
+public final class MySQLMultiStatementsHandler implements ProxyBackendHandler {
private static final Pattern MULTI_UPDATE_STATEMENTS = Pattern.compile(";(?=\\s*update)", Pattern.CASE_INSENSITIVE);
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutorTest.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutorTest.java
index 9ec9cd8d900..71ae4fc9490 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutorTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutorTest.java
@@ -50,8 +50,8 @@ import org.apache.shardingsphere.proxy.backend.response.header.query.QueryHeader
import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandlerFactory;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandlerFactory;
import org.apache.shardingsphere.proxy.frontend.command.executor.ResponseType;
import org.apache.shardingsphere.proxy.frontend.mysql.ProxyContextRestorer;
import org.apache.shardingsphere.proxy.frontend.mysql.command.query.binary.MySQLPreparedStatement;
@@ -99,7 +99,7 @@ import static org.mockito.Mockito.when;
public final class MySQLComStmtExecuteExecutorTest extends ProxyContextRestorer {
@Mock
- private TextProtocolBackendHandler textProtocolBackendHandler;
+ private ProxyBackendHandler proxyBackendHandler;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private ConnectionSession connectionSession;
@@ -162,13 +162,13 @@ public final class MySQLComStmtExecuteExecutorTest extends ProxyContextRestorer
MySQLComStmtExecutePacket packet = mock(MySQLComStmtExecutePacket.class);
when(packet.getStatementId()).thenReturn(1);
MySQLComStmtExecuteExecutor mysqlComStmtExecuteExecutor = new MySQLComStmtExecuteExecutor(packet, connectionSession);
- when(textProtocolBackendHandler.execute()).thenReturn(new QueryResponseHeader(Collections.singletonList(mock(QueryHeader.class))));
- when(textProtocolBackendHandler.next()).thenReturn(true, false);
- when(textProtocolBackendHandler.getRowData()).thenReturn(new QueryResponseRow(Collections.singletonList(new QueryResponseCell(Types.INTEGER, 1))));
+ when(proxyBackendHandler.execute()).thenReturn(new QueryResponseHeader(Collections.singletonList(mock(QueryHeader.class))));
+ when(proxyBackendHandler.next()).thenReturn(true, false);
+ when(proxyBackendHandler.getRowData()).thenReturn(new QueryResponseRow(Collections.singletonList(new QueryResponseCell(Types.INTEGER, 1))));
Iterator<DatabasePacket<?>> actual;
- try (MockedStatic<TextProtocolBackendHandlerFactory> mockedStatic = mockStatic(TextProtocolBackendHandlerFactory.class)) {
- mockedStatic.when(() -> TextProtocolBackendHandlerFactory.newInstance(any(MySQLDatabaseType.class), any(LogicSQL.class), eq(connectionSession), anyBoolean()))
- .thenReturn(textProtocolBackendHandler);
+ try (MockedStatic<ProxyBackendHandlerFactory> mockedStatic = mockStatic(ProxyBackendHandlerFactory.class)) {
+ mockedStatic.when(() -> ProxyBackendHandlerFactory.newInstance(any(MySQLDatabaseType.class), any(LogicSQL.class), eq(connectionSession), anyBoolean()))
+ .thenReturn(proxyBackendHandler);
actual = mysqlComStmtExecuteExecutor.execute().iterator();
}
assertThat(mysqlComStmtExecuteExecutor.getResponseType(), is(ResponseType.QUERY));
@@ -181,7 +181,7 @@ public final class MySQLComStmtExecuteExecutorTest extends ProxyContextRestorer
assertThat(actualQueryRowPacket, instanceOf(MySQLBinaryResultSetRowPacket.class));
assertThat(actualQueryRowPacket.getSequenceId(), is(4));
mysqlComStmtExecuteExecutor.close();
- verify(textProtocolBackendHandler).close();
+ verify(proxyBackendHandler).close();
}
@Test
@@ -190,11 +190,11 @@ public final class MySQLComStmtExecuteExecutorTest extends ProxyContextRestorer
when(packet.getStatementId()).thenReturn(2);
when(packet.getNewParametersBoundFlag()).thenReturn(MySQLNewParametersBoundFlag.PARAMETER_TYPE_EXIST);
MySQLComStmtExecuteExecutor mysqlComStmtExecuteExecutor = new MySQLComStmtExecuteExecutor(packet, connectionSession);
- when(textProtocolBackendHandler.execute()).thenReturn(new UpdateResponseHeader(new MySQLUpdateStatement()));
+ when(proxyBackendHandler.execute()).thenReturn(new UpdateResponseHeader(new MySQLUpdateStatement()));
Iterator<DatabasePacket<?>> actual;
- try (MockedStatic<TextProtocolBackendHandlerFactory> mockedStatic = mockStatic(TextProtocolBackendHandlerFactory.class)) {
- mockedStatic.when(() -> TextProtocolBackendHandlerFactory.newInstance(any(MySQLDatabaseType.class), any(LogicSQL.class), eq(connectionSession), anyBoolean()))
- .thenReturn(textProtocolBackendHandler);
+ try (MockedStatic<ProxyBackendHandlerFactory> mockedStatic = mockStatic(ProxyBackendHandlerFactory.class)) {
+ mockedStatic.when(() -> ProxyBackendHandlerFactory.newInstance(any(MySQLDatabaseType.class), any(LogicSQL.class), eq(connectionSession), anyBoolean()))
+ .thenReturn(proxyBackendHandler);
actual = mysqlComStmtExecuteExecutor.execute().iterator();
}
assertThat(mysqlComStmtExecuteExecutor.getResponseType(), is(ResponseType.UPDATE));
@@ -207,18 +207,18 @@ public final class MySQLComStmtExecuteExecutorTest extends ProxyContextRestorer
MySQLComStmtExecutePacket packet = mock(MySQLComStmtExecutePacket.class);
when(packet.getStatementId()).thenReturn(3);
MySQLComStmtExecuteExecutor mysqlComStmtExecuteExecutor = new MySQLComStmtExecuteExecutor(packet, connectionSession);
- TextProtocolBackendHandler textProtocolBackendHandler = mock(TextProtocolBackendHandler.class);
- when(textProtocolBackendHandler.execute()).thenReturn(new UpdateResponseHeader(new MySQLCommitStatement()));
+ ProxyBackendHandler proxyBackendHandler = mock(ProxyBackendHandler.class);
+ when(proxyBackendHandler.execute()).thenReturn(new UpdateResponseHeader(new MySQLCommitStatement()));
Iterator<DatabasePacket<?>> actual;
- try (MockedStatic<TextProtocolBackendHandlerFactory> mockedStatic = mockStatic(TextProtocolBackendHandlerFactory.class)) {
- mockedStatic.when(() -> TextProtocolBackendHandlerFactory.newInstance(any(MySQLDatabaseType.class), any(LogicSQL.class), eq(connectionSession), eq(true)))
- .thenReturn(textProtocolBackendHandler);
+ try (MockedStatic<ProxyBackendHandlerFactory> mockedStatic = mockStatic(ProxyBackendHandlerFactory.class)) {
+ mockedStatic.when(() -> ProxyBackendHandlerFactory.newInstance(any(MySQLDatabaseType.class), any(LogicSQL.class), eq(connectionSession), eq(true)))
+ .thenReturn(proxyBackendHandler);
actual = mysqlComStmtExecuteExecutor.execute().iterator();
}
assertThat(mysqlComStmtExecuteExecutor.getResponseType(), is(ResponseType.UPDATE));
assertThat(actual.next(), instanceOf(MySQLOKPacket.class));
assertFalse(actual.hasNext());
mysqlComStmtExecuteExecutor.close();
- verify(textProtocolBackendHandler).close();
+ verify(proxyBackendHandler).close();
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutorTest.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutorTest.java
index 532cc158b61..1a05466f020 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutorTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutorTest.java
@@ -33,7 +33,7 @@ import org.apache.shardingsphere.proxy.backend.response.header.query.QueryHeader
import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
import org.apache.shardingsphere.proxy.frontend.command.executor.ResponseType;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.sqltranslator.rule.SQLTranslatorRule;
@@ -67,7 +67,7 @@ import static org.mockito.Mockito.when;
public final class MySQLComQueryPacketExecutorTest {
@Mock
- private TextProtocolBackendHandler textProtocolBackendHandler;
+ private ProxyBackendHandler proxyBackendHandler;
@Mock
private MySQLComQueryPacket packet;
@@ -85,8 +85,8 @@ public final class MySQLComQueryPacketExecutorTest {
public void assertIsQueryResponse() throws SQLException, NoSuchFieldException, IllegalAccessException {
MySQLComQueryPacketExecutor mysqlComQueryPacketExecutor = new MySQLComQueryPacketExecutor(packet, connectionSession);
MemberAccessor accessor = Plugins.getMemberAccessor();
- accessor.set(MySQLComQueryPacketExecutor.class.getDeclaredField("textProtocolBackendHandler"), mysqlComQueryPacketExecutor, textProtocolBackendHandler);
- when(textProtocolBackendHandler.execute()).thenReturn(new QueryResponseHeader(Collections.singletonList(mock(QueryHeader.class))));
+ accessor.set(MySQLComQueryPacketExecutor.class.getDeclaredField("proxyBackendHandler"), mysqlComQueryPacketExecutor, proxyBackendHandler);
+ when(proxyBackendHandler.execute()).thenReturn(new QueryResponseHeader(Collections.singletonList(mock(QueryHeader.class))));
mysqlComQueryPacketExecutor.execute();
assertThat(mysqlComQueryPacketExecutor.getResponseType(), is(ResponseType.QUERY));
}
@@ -95,8 +95,8 @@ public final class MySQLComQueryPacketExecutorTest {
public void assertIsUpdateResponse() throws SQLException, NoSuchFieldException, IllegalAccessException {
MySQLComQueryPacketExecutor mysqlComQueryPacketExecutor = new MySQLComQueryPacketExecutor(packet, connectionSession);
MemberAccessor accessor = Plugins.getMemberAccessor();
- accessor.set(MySQLComQueryPacketExecutor.class.getDeclaredField("textProtocolBackendHandler"), mysqlComQueryPacketExecutor, textProtocolBackendHandler);
- when(textProtocolBackendHandler.execute()).thenReturn(new UpdateResponseHeader(mock(SQLStatement.class)));
+ accessor.set(MySQLComQueryPacketExecutor.class.getDeclaredField("proxyBackendHandler"), mysqlComQueryPacketExecutor, proxyBackendHandler);
+ when(proxyBackendHandler.execute()).thenReturn(new UpdateResponseHeader(mock(SQLStatement.class)));
mysqlComQueryPacketExecutor.execute();
assertThat(mysqlComQueryPacketExecutor.getResponseType(), is(ResponseType.UPDATE));
}
@@ -120,8 +120,8 @@ public final class MySQLComQueryPacketExecutorTest {
when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().<Boolean>getValue(ConfigurationPropertyKey.SQL_SHOW)).thenReturn(false);
MySQLComQueryPacketExecutor actual = new MySQLComQueryPacketExecutor(packet, connectionSession);
MemberAccessor accessor = Plugins.getMemberAccessor();
- accessor.set(MySQLComQueryPacketExecutor.class.getDeclaredField("textProtocolBackendHandler"), actual, textProtocolBackendHandler);
- when(textProtocolBackendHandler.execute()).thenReturn(new UpdateResponseHeader(mock(SQLStatement.class)));
+ accessor.set(MySQLComQueryPacketExecutor.class.getDeclaredField("proxyBackendHandler"), actual, proxyBackendHandler);
+ when(proxyBackendHandler.execute()).thenReturn(new UpdateResponseHeader(mock(SQLStatement.class)));
Collection<DatabasePacket<?>> actualPackets = actual.execute();
assertThat(actualPackets.size(), is(1));
assertThat(actualPackets.iterator().next(), instanceOf(MySQLOKPacket.class));
@@ -132,8 +132,8 @@ public final class MySQLComQueryPacketExecutorTest {
public void assertNext() throws SQLException, NoSuchFieldException, IllegalAccessException {
MySQLComQueryPacketExecutor actual = new MySQLComQueryPacketExecutor(packet, connectionSession);
MemberAccessor accessor = Plugins.getMemberAccessor();
- accessor.set(MySQLComQueryPacketExecutor.class.getDeclaredField("textProtocolBackendHandler"), actual, textProtocolBackendHandler);
- when(textProtocolBackendHandler.next()).thenReturn(true, false);
+ accessor.set(MySQLComQueryPacketExecutor.class.getDeclaredField("proxyBackendHandler"), actual, proxyBackendHandler);
+ when(proxyBackendHandler.next()).thenReturn(true, false);
assertTrue(actual.next());
assertFalse(actual.next());
}
@@ -147,8 +147,8 @@ public final class MySQLComQueryPacketExecutorTest {
public void assertClose() throws SQLException, NoSuchFieldException, IllegalAccessException {
MySQLComQueryPacketExecutor actual = new MySQLComQueryPacketExecutor(packet, connectionSession);
MemberAccessor accessor = Plugins.getMemberAccessor();
- accessor.set(MySQLComQueryPacketExecutor.class.getDeclaredField("textProtocolBackendHandler"), actual, textProtocolBackendHandler);
+ accessor.set(MySQLComQueryPacketExecutor.class.getDeclaredField("proxyBackendHandler"), actual, proxyBackendHandler);
actual.close();
- verify(textProtocolBackendHandler).close();
+ verify(proxyBackendHandler).close();
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/simple/OpenGaussComQueryExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/simple/OpenGaussComQueryExecutor.java
index 93eea75b5ce..b8235f14a64 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/simple/OpenGaussComQueryExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/simple/OpenGaussComQueryExecutor.java
@@ -33,8 +33,8 @@ import org.apache.shardingsphere.proxy.backend.response.header.query.QueryHeader
import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandlerFactory;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandlerFactory;
import org.apache.shardingsphere.proxy.frontend.command.executor.QueryCommandExecutor;
import org.apache.shardingsphere.proxy.frontend.command.executor.ResponseType;
import org.apache.shardingsphere.proxy.frontend.postgresql.command.PostgreSQLConnectionContext;
@@ -61,7 +61,7 @@ public final class OpenGaussComQueryExecutor implements QueryCommandExecutor {
private final PostgreSQLConnectionContext connectionContext;
- private final TextProtocolBackendHandler textProtocolBackendHandler;
+ private final ProxyBackendHandler proxyBackendHandler;
@Getter
private volatile ResponseType responseType;
@@ -69,12 +69,12 @@ public final class OpenGaussComQueryExecutor implements QueryCommandExecutor {
public OpenGaussComQueryExecutor(final PostgreSQLConnectionContext connectionContext, final PostgreSQLComQueryPacket comQueryPacket,
final ConnectionSession connectionSession) throws SQLException {
this.connectionContext = connectionContext;
- textProtocolBackendHandler = TextProtocolBackendHandlerFactory.newInstance(DatabaseTypeFactory.getInstance("openGauss"), comQueryPacket.getSql(), connectionSession);
+ proxyBackendHandler = ProxyBackendHandlerFactory.newInstance(DatabaseTypeFactory.getInstance("openGauss"), comQueryPacket.getSql(), connectionSession);
}
@Override
public Collection<DatabasePacket<?>> execute() throws SQLException {
- ResponseHeader responseHeader = textProtocolBackendHandler.execute();
+ ResponseHeader responseHeader = proxyBackendHandler.execute();
if (responseHeader instanceof QueryResponseHeader) {
return Collections.singleton(createRowDescriptionPacket((QueryResponseHeader) responseHeader));
}
@@ -120,16 +120,16 @@ public final class OpenGaussComQueryExecutor implements QueryCommandExecutor {
@Override
public boolean next() throws SQLException {
- return textProtocolBackendHandler.next();
+ return proxyBackendHandler.next();
}
@Override
public PostgreSQLPacket getQueryRowPacket() throws SQLException {
- return new PostgreSQLDataRowPacket(textProtocolBackendHandler.getRowData().getData());
+ return new PostgreSQLDataRowPacket(proxyBackendHandler.getRowData().getData());
}
@Override
public void close() throws SQLException {
- textProtocolBackendHandler.close();
+ proxyBackendHandler.close();
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/simple/OpenGaussComQueryExecutorTest.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/simple/OpenGaussComQueryExecutorTest.java
index b8fef81cd69..09c3cbc7ceb 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/simple/OpenGaussComQueryExecutorTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/simple/OpenGaussComQueryExecutorTest.java
@@ -29,7 +29,7 @@ import org.apache.shardingsphere.proxy.backend.response.header.query.QueryHeader
import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
import org.apache.shardingsphere.proxy.frontend.command.executor.ResponseType;
import org.apache.shardingsphere.proxy.frontend.postgresql.command.PostgreSQLConnectionContext;
import org.apache.shardingsphere.sql.parser.sql.common.statement.dml.InsertStatement;
@@ -60,7 +60,7 @@ public final class OpenGaussComQueryExecutorTest {
private PostgreSQLConnectionContext connectionContext;
@Mock
- private TextProtocolBackendHandler textProtocolBackendHandler;
+ private ProxyBackendHandler proxyBackendHandler;
private OpenGaussComQueryExecutor queryExecutor;
@@ -75,15 +75,15 @@ public final class OpenGaussComQueryExecutorTest {
@SneakyThrows
private void setMockFieldIntoExecutor(final OpenGaussComQueryExecutor executor) {
- Field field = OpenGaussComQueryExecutor.class.getDeclaredField("textProtocolBackendHandler");
+ Field field = OpenGaussComQueryExecutor.class.getDeclaredField("proxyBackendHandler");
field.setAccessible(true);
- field.set(executor, textProtocolBackendHandler);
+ field.set(executor, proxyBackendHandler);
}
@Test
public void assertExecuteQueryAndReturnEmptyResult() throws SQLException {
QueryResponseHeader queryResponseHeader = mock(QueryResponseHeader.class);
- when(textProtocolBackendHandler.execute()).thenReturn(queryResponseHeader);
+ when(proxyBackendHandler.execute()).thenReturn(queryResponseHeader);
Collection<DatabasePacket<?>> actual = queryExecutor.execute();
assertThat(actual.size(), is(1));
assertThat(actual.iterator().next(), is(instanceOf(PostgreSQLRowDescriptionPacket.class)));
@@ -95,7 +95,7 @@ public final class OpenGaussComQueryExecutorTest {
public void assertExecuteQueryAndReturnResult() throws SQLException {
QueryResponseHeader queryResponseHeader = mock(QueryResponseHeader.class);
when(queryResponseHeader.getQueryHeaders()).thenReturn(Collections.singletonList(new QueryHeader("schema", "table", "label", "column", 1, "type", 2, 3, true, true, true, true)));
- when(textProtocolBackendHandler.execute()).thenReturn(queryResponseHeader);
+ when(proxyBackendHandler.execute()).thenReturn(queryResponseHeader);
Collection<DatabasePacket<?>> actual = queryExecutor.execute();
assertThat(actual.size(), is(1));
assertThat(actual.iterator().next(), is(instanceOf(PostgreSQLRowDescriptionPacket.class)));
@@ -105,7 +105,7 @@ public final class OpenGaussComQueryExecutorTest {
@Test
public void assertExecuteUpdate() throws SQLException {
- when(textProtocolBackendHandler.execute()).thenReturn(new UpdateResponseHeader(mock(InsertStatement.class)));
+ when(proxyBackendHandler.execute()).thenReturn(new UpdateResponseHeader(mock(InsertStatement.class)));
Collection<DatabasePacket<?>> actual = queryExecutor.execute();
assertThat(actual.size(), is(1));
assertThat(actual.iterator().next(), is(instanceOf(PostgreSQLCommandCompletePacket.class)));
@@ -114,14 +114,14 @@ public final class OpenGaussComQueryExecutorTest {
@Test
public void assertNext() throws SQLException {
- when(textProtocolBackendHandler.next()).thenReturn(true, false);
+ when(proxyBackendHandler.next()).thenReturn(true, false);
assertTrue(queryExecutor.next());
assertFalse(queryExecutor.next());
}
@Test
public void assertGetQueryRowPacket() throws SQLException {
- when(textProtocolBackendHandler.getRowData()).thenReturn(new QueryResponseRow(Collections.emptyList()));
+ when(proxyBackendHandler.getRowData()).thenReturn(new QueryResponseRow(Collections.emptyList()));
PostgreSQLPacket actual = queryExecutor.getQueryRowPacket();
assertThat(actual, is(instanceOf(PostgreSQLDataRowPacket.class)));
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/JDBCPortal.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/JDBCPortal.java
index e70292db9bd..fc76e2b38e8 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/JDBCPortal.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/JDBCPortal.java
@@ -46,8 +46,8 @@ import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import org.apache.shardingsphere.proxy.backend.response.header.query.QueryHeader;
import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandlerFactory;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandlerFactory;
import org.apache.shardingsphere.proxy.frontend.postgresql.command.query.PostgreSQLCommand;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dal.VariableAssignSegment;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
@@ -74,7 +74,7 @@ public final class JDBCPortal implements Portal<Void> {
private final List<PostgreSQLValueFormat> resultFormats;
- private final TextProtocolBackendHandler textProtocolBackendHandler;
+ private final ProxyBackendHandler proxyBackendHandler;
private final JDBCBackendConnection backendConnection;
@@ -87,7 +87,7 @@ public final class JDBCPortal implements Portal<Void> {
this.resultFormats = resultFormats;
this.backendConnection = backendConnection;
if (!preparedStatement.getSqlStatementContext().isPresent()) {
- textProtocolBackendHandler = TextProtocolBackendHandlerFactory.newInstance(DatabaseTypeFactory.getInstance("PostgreSQL"),
+ proxyBackendHandler = ProxyBackendHandlerFactory.newInstance(DatabaseTypeFactory.getInstance("PostgreSQL"),
preparedStatement.getSql(), sqlStatement, backendConnection.getConnectionSession());
return;
}
@@ -98,7 +98,7 @@ public final class JDBCPortal implements Portal<Void> {
}
DatabaseType databaseType = getDatabaseType(databaseName);
LogicSQL logicSQL = new LogicSQL(sqlStatementContext, preparedStatement.getSql(), parameters);
- textProtocolBackendHandler = TextProtocolBackendHandlerFactory.newInstance(databaseType, logicSQL, backendConnection.getConnectionSession(), true);
+ proxyBackendHandler = ProxyBackendHandlerFactory.newInstance(databaseType, logicSQL, backendConnection.getConnectionSession(), true);
}
private static DatabaseType getDatabaseType(final String databaseName) {
@@ -109,7 +109,7 @@ public final class JDBCPortal implements Portal<Void> {
@SneakyThrows(SQLException.class)
@Override
public Void bind() {
- responseHeader = textProtocolBackendHandler.execute();
+ responseHeader = proxyBackendHandler.execute();
return null;
}
@@ -164,11 +164,11 @@ public final class JDBCPortal implements Portal<Void> {
}
private boolean hasNext() throws SQLException {
- return textProtocolBackendHandler.next();
+ return proxyBackendHandler.next();
}
private PostgreSQLPacket nextPacket() throws SQLException {
- return new PostgreSQLDataRowPacket(getData(textProtocolBackendHandler.getRowData()));
+ return new PostgreSQLDataRowPacket(getData(proxyBackendHandler.getRowData()));
}
private List<Object> getData(final QueryResponseRow queryResponseRow) {
@@ -203,7 +203,7 @@ public final class JDBCPortal implements Portal<Void> {
}
private void suspendPortal() {
- backendConnection.markResourceInUse(textProtocolBackendHandler);
+ backendConnection.markResourceInUse(proxyBackendHandler);
}
private long getUpdateCount() {
@@ -213,7 +213,7 @@ public final class JDBCPortal implements Portal<Void> {
@SneakyThrows(SQLException.class)
@Override
public void close() {
- backendConnection.unmarkResourceInUse(textProtocolBackendHandler);
- textProtocolBackendHandler.close();
+ backendConnection.unmarkResourceInUse(proxyBackendHandler);
+ proxyBackendHandler.close();
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/simple/PostgreSQLComQueryExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/simple/PostgreSQLComQueryExecutor.java
index 650bf782c55..7d7b285ee8b 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/simple/PostgreSQLComQueryExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/simple/PostgreSQLComQueryExecutor.java
@@ -33,8 +33,8 @@ import org.apache.shardingsphere.proxy.backend.response.header.query.QueryHeader
import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandlerFactory;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandlerFactory;
import org.apache.shardingsphere.proxy.frontend.command.executor.QueryCommandExecutor;
import org.apache.shardingsphere.proxy.frontend.command.executor.ResponseType;
import org.apache.shardingsphere.proxy.frontend.postgresql.command.PostgreSQLConnectionContext;
@@ -61,7 +61,7 @@ public final class PostgreSQLComQueryExecutor implements QueryCommandExecutor {
private final PostgreSQLConnectionContext connectionContext;
- private final TextProtocolBackendHandler textProtocolBackendHandler;
+ private final ProxyBackendHandler proxyBackendHandler;
@Getter
private volatile ResponseType responseType;
@@ -69,12 +69,12 @@ public final class PostgreSQLComQueryExecutor implements QueryCommandExecutor {
public PostgreSQLComQueryExecutor(final PostgreSQLConnectionContext connectionContext, final PostgreSQLComQueryPacket comQueryPacket,
final ConnectionSession connectionSession) throws SQLException {
this.connectionContext = connectionContext;
- textProtocolBackendHandler = TextProtocolBackendHandlerFactory.newInstance(DatabaseTypeFactory.getInstance("PostgreSQL"), comQueryPacket.getSql(), connectionSession);
+ proxyBackendHandler = ProxyBackendHandlerFactory.newInstance(DatabaseTypeFactory.getInstance("PostgreSQL"), comQueryPacket.getSql(), connectionSession);
}
@Override
public Collection<DatabasePacket<?>> execute() throws SQLException {
- ResponseHeader responseHeader = textProtocolBackendHandler.execute();
+ ResponseHeader responseHeader = proxyBackendHandler.execute();
if (responseHeader instanceof QueryResponseHeader) {
return Collections.singleton(createRowDescriptionPacket((QueryResponseHeader) responseHeader));
}
@@ -120,16 +120,16 @@ public final class PostgreSQLComQueryExecutor implements QueryCommandExecutor {
@Override
public boolean next() throws SQLException {
- return textProtocolBackendHandler.next();
+ return proxyBackendHandler.next();
}
@Override
public PostgreSQLPacket getQueryRowPacket() throws SQLException {
- return new PostgreSQLDataRowPacket(textProtocolBackendHandler.getRowData().getData());
+ return new PostgreSQLDataRowPacket(proxyBackendHandler.getRowData().getData());
}
@Override
public void close() throws SQLException {
- textProtocolBackendHandler.close();
+ proxyBackendHandler.close();
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/JDBCPortalTest.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/JDBCPortalTest.java
index 64e155f79d6..5809d90c8d0 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/JDBCPortalTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/JDBCPortalTest.java
@@ -42,8 +42,8 @@ import org.apache.shardingsphere.proxy.backend.response.header.query.QueryHeader
import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandlerFactory;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandlerFactory;
import org.apache.shardingsphere.proxy.frontend.postgresql.ProxyContextRestorer;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dal.VariableAssignSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dal.VariableSegment;
@@ -89,7 +89,7 @@ public final class JDBCPortalTest extends ProxyContextRestorer {
private ContextManager mockContextManager;
@Mock
- private TextProtocolBackendHandler textProtocolBackendHandler;
+ private ProxyBackendHandler proxyBackendHandler;
@Mock
private ConnectionSession connectionSession;
@@ -97,7 +97,7 @@ public final class JDBCPortalTest extends ProxyContextRestorer {
@Mock
private JDBCBackendConnection backendConnection;
- private MockedStatic<TextProtocolBackendHandlerFactory> mockedStatic;
+ private MockedStatic<ProxyBackendHandlerFactory> mockedStatic;
@Before
public void setup() throws SQLException {
@@ -109,11 +109,11 @@ public final class JDBCPortalTest extends ProxyContextRestorer {
when(database.getResource().getDatabaseType()).thenReturn(new PostgreSQLDatabaseType());
when(ProxyContext.getInstance().getDatabase("db")).thenReturn(database);
when(backendConnection.getConnectionSession()).thenReturn(connectionSession);
- mockedStatic = mockStatic(TextProtocolBackendHandlerFactory.class);
- mockedStatic.when(() -> TextProtocolBackendHandlerFactory.newInstance(any(PostgreSQLDatabaseType.class), anyString(), any(SQLStatement.class), eq(connectionSession)))
- .thenReturn(textProtocolBackendHandler);
- mockedStatic.when(() -> TextProtocolBackendHandlerFactory.newInstance(any(PostgreSQLDatabaseType.class), any(LogicSQL.class), eq(connectionSession), anyBoolean()))
- .thenReturn(textProtocolBackendHandler);
+ mockedStatic = mockStatic(ProxyBackendHandlerFactory.class);
+ mockedStatic.when(() -> ProxyBackendHandlerFactory.newInstance(any(PostgreSQLDatabaseType.class), anyString(), any(SQLStatement.class), eq(connectionSession)))
+ .thenReturn(proxyBackendHandler);
+ mockedStatic.when(() -> ProxyBackendHandlerFactory.newInstance(any(PostgreSQLDatabaseType.class), any(LogicSQL.class), eq(connectionSession), anyBoolean()))
+ .thenReturn(proxyBackendHandler);
}
@After
@@ -132,9 +132,9 @@ public final class JDBCPortalTest extends ProxyContextRestorer {
QueryResponseHeader responseHeader = mock(QueryResponseHeader.class);
QueryHeader queryHeader = new QueryHeader("schema", "table", "columnLabel", "columnName", Types.INTEGER, "columnTypeName", 0, 0, false, false, false, false);
when(responseHeader.getQueryHeaders()).thenReturn(Collections.singletonList(queryHeader));
- when(textProtocolBackendHandler.execute()).thenReturn(responseHeader);
- when(textProtocolBackendHandler.next()).thenReturn(true, true, false);
- when(textProtocolBackendHandler.getRowData()).thenReturn(new QueryResponseRow(Collections.singletonList(new QueryResponseCell(Types.INTEGER, 0))),
+ when(proxyBackendHandler.execute()).thenReturn(responseHeader);
+ when(proxyBackendHandler.next()).thenReturn(true, true, false);
+ when(proxyBackendHandler.getRowData()).thenReturn(new QueryResponseRow(Collections.singletonList(new QueryResponseCell(Types.INTEGER, 0))),
new QueryResponseRow(Collections.singletonList(new QueryResponseCell(Types.INTEGER, 1))));
PostgreSQLPreparedStatement preparedStatement = new PostgreSQLPreparedStatement("", new PostgreSQLSelectStatement(), mock(SelectStatementContext.class), Collections.emptyList());
List<PostgreSQLValueFormat> resultFormats = new ArrayList<>(Arrays.asList(PostgreSQLValueFormat.TEXT, PostgreSQLValueFormat.BINARY));
@@ -154,9 +154,9 @@ public final class JDBCPortalTest extends ProxyContextRestorer {
QueryResponseHeader responseHeader = mock(QueryResponseHeader.class);
QueryHeader queryHeader = new QueryHeader("schema", "table", "columnLabel", "columnName", Types.INTEGER, "columnTypeName", 0, 0, false, false, false, false);
when(responseHeader.getQueryHeaders()).thenReturn(Collections.singletonList(queryHeader));
- when(textProtocolBackendHandler.execute()).thenReturn(responseHeader);
- when(textProtocolBackendHandler.next()).thenReturn(true, true);
- when(textProtocolBackendHandler.getRowData()).thenReturn(
+ when(proxyBackendHandler.execute()).thenReturn(responseHeader);
+ when(proxyBackendHandler.next()).thenReturn(true, true);
+ when(proxyBackendHandler.getRowData()).thenReturn(
new QueryResponseRow(Collections.singletonList(new QueryResponseCell(Types.INTEGER, 0))),
new QueryResponseRow(Collections.singletonList(new QueryResponseCell(Types.INTEGER, 1))));
PostgreSQLPreparedStatement preparedStatement = new PostgreSQLPreparedStatement("", new PostgreSQLSelectStatement(), mock(SelectStatementContext.class), Collections.emptyList());
@@ -174,8 +174,8 @@ public final class JDBCPortalTest extends ProxyContextRestorer {
@Test
public void assertExecuteUpdate() throws SQLException {
- when(textProtocolBackendHandler.execute()).thenReturn(mock(UpdateResponseHeader.class));
- when(textProtocolBackendHandler.next()).thenReturn(false);
+ when(proxyBackendHandler.execute()).thenReturn(mock(UpdateResponseHeader.class));
+ when(proxyBackendHandler.next()).thenReturn(false);
PostgreSQLPreparedStatement preparedStatement = new PostgreSQLPreparedStatement("", new PostgreSQLInsertStatement(), mock(InsertStatementContext.class), Collections.emptyList());
JDBCPortal portal = new JDBCPortal("insert into t values (1)", preparedStatement, Collections.emptyList(), Collections.emptyList(), backendConnection);
portal.bind();
@@ -186,8 +186,8 @@ public final class JDBCPortalTest extends ProxyContextRestorer {
@Test
public void assertExecuteEmptyStatement() throws SQLException {
- when(textProtocolBackendHandler.execute()).thenReturn(mock(UpdateResponseHeader.class));
- when(textProtocolBackendHandler.next()).thenReturn(false);
+ when(proxyBackendHandler.execute()).thenReturn(mock(UpdateResponseHeader.class));
+ when(proxyBackendHandler.next()).thenReturn(false);
PostgreSQLPreparedStatement preparedStatement = new PostgreSQLPreparedStatement("", new EmptyStatement(), null, Collections.emptyList());
JDBCPortal portal = new JDBCPortal("", preparedStatement, Collections.emptyList(), Collections.emptyList(), backendConnection);
portal.bind();
@@ -198,8 +198,8 @@ public final class JDBCPortalTest extends ProxyContextRestorer {
@Test
public void assertExecuteSetStatement() throws SQLException {
- when(textProtocolBackendHandler.execute()).thenReturn(mock(UpdateResponseHeader.class));
- when(textProtocolBackendHandler.next()).thenReturn(false);
+ when(proxyBackendHandler.execute()).thenReturn(mock(UpdateResponseHeader.class));
+ when(proxyBackendHandler.next()).thenReturn(false);
String sql = "set client_encoding = utf8";
PostgreSQLSetStatement setStatement = new PostgreSQLSetStatement();
VariableAssignSegment variableAssignSegment = new VariableAssignSegment();
@@ -227,7 +227,7 @@ public final class JDBCPortalTest extends ProxyContextRestorer {
PostgreSQLPreparedStatement preparedStatement = new PostgreSQLPreparedStatement("", new EmptyStatement(), null, Collections.emptyList());
JDBCPortal portal = new JDBCPortal("", preparedStatement, Collections.emptyList(), Collections.emptyList(), backendConnection);
portal.close();
- verify(backendConnection).unmarkResourceInUse(textProtocolBackendHandler);
- verify(textProtocolBackendHandler).close();
+ verify(backendConnection).unmarkResourceInUse(proxyBackendHandler);
+ verify(proxyBackendHandler).close();
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/simple/PostgreSQLComQueryExecutorTest.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/simple/PostgreSQLComQueryExecutorTest.java
index cdc68c1c895..d8d55d62171 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/simple/PostgreSQLComQueryExecutorTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/simple/PostgreSQLComQueryExecutorTest.java
@@ -29,7 +29,7 @@ import org.apache.shardingsphere.proxy.backend.response.header.query.QueryRespon
import org.apache.shardingsphere.proxy.backend.response.header.query.QueryHeader;
import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
import org.apache.shardingsphere.proxy.frontend.command.executor.ResponseType;
import org.apache.shardingsphere.proxy.frontend.postgresql.command.PostgreSQLConnectionContext;
import org.apache.shardingsphere.sql.parser.sql.common.statement.dml.InsertStatement;
@@ -60,7 +60,7 @@ public final class PostgreSQLComQueryExecutorTest {
private PostgreSQLConnectionContext connectionContext;
@Mock
- private TextProtocolBackendHandler textProtocolBackendHandler;
+ private ProxyBackendHandler proxyBackendHandler;
private PostgreSQLComQueryExecutor queryExecutor;
@@ -75,15 +75,15 @@ public final class PostgreSQLComQueryExecutorTest {
@SneakyThrows
private void setMockFieldIntoExecutor(final PostgreSQLComQueryExecutor executor) {
- Field field = PostgreSQLComQueryExecutor.class.getDeclaredField("textProtocolBackendHandler");
+ Field field = PostgreSQLComQueryExecutor.class.getDeclaredField("proxyBackendHandler");
field.setAccessible(true);
- field.set(executor, textProtocolBackendHandler);
+ field.set(executor, proxyBackendHandler);
}
@Test
public void assertExecuteQueryAndReturnEmptyResult() throws SQLException {
QueryResponseHeader queryResponseHeader = mock(QueryResponseHeader.class);
- when(textProtocolBackendHandler.execute()).thenReturn(queryResponseHeader);
+ when(proxyBackendHandler.execute()).thenReturn(queryResponseHeader);
Collection<DatabasePacket<?>> actual = queryExecutor.execute();
assertThat(actual.size(), is(1));
assertThat(actual.iterator().next(), is(instanceOf(PostgreSQLRowDescriptionPacket.class)));
@@ -95,7 +95,7 @@ public final class PostgreSQLComQueryExecutorTest {
public void assertExecuteQueryAndReturnResult() throws SQLException {
QueryResponseHeader queryResponseHeader = mock(QueryResponseHeader.class);
when(queryResponseHeader.getQueryHeaders()).thenReturn(Collections.singletonList(new QueryHeader("schema", "table", "label", "column", 1, "type", 2, 3, true, true, true, true)));
- when(textProtocolBackendHandler.execute()).thenReturn(queryResponseHeader);
+ when(proxyBackendHandler.execute()).thenReturn(queryResponseHeader);
Collection<DatabasePacket<?>> actual = queryExecutor.execute();
assertThat(actual.size(), is(1));
assertThat(actual.iterator().next(), is(instanceOf(PostgreSQLRowDescriptionPacket.class)));
@@ -105,7 +105,7 @@ public final class PostgreSQLComQueryExecutorTest {
@Test
public void assertExecuteUpdate() throws SQLException {
- when(textProtocolBackendHandler.execute()).thenReturn(new UpdateResponseHeader(mock(InsertStatement.class)));
+ when(proxyBackendHandler.execute()).thenReturn(new UpdateResponseHeader(mock(InsertStatement.class)));
Collection<DatabasePacket<?>> actual = queryExecutor.execute();
assertThat(actual.size(), is(1));
assertThat(actual.iterator().next(), is(instanceOf(PostgreSQLCommandCompletePacket.class)));
@@ -114,14 +114,14 @@ public final class PostgreSQLComQueryExecutorTest {
@Test
public void assertNext() throws SQLException {
- when(textProtocolBackendHandler.next()).thenReturn(true, false);
+ when(proxyBackendHandler.next()).thenReturn(true, false);
assertTrue(queryExecutor.next());
assertFalse(queryExecutor.next());
}
@Test
public void assertGetQueryRowPacket() throws SQLException {
- when(textProtocolBackendHandler.getRowData()).thenReturn(new QueryResponseRow(Collections.emptyList()));
+ when(proxyBackendHandler.getRowData()).thenReturn(new QueryResponseRow(Collections.emptyList()));
PostgreSQLPacket actual = queryExecutor.getQueryRowPacket();
assertThat(actual, is(instanceOf(PostgreSQLDataRowPacket.class)));
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-reactive-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/reactive/mysql/command/query/binary/execute/ReactiveMySQLComStmtExecuteExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-reactive-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/reactive/mysql/command/query/binary/execute/ReactiveMySQLComStmtExecuteExecutor.java
index e299b89d0ef..ddbc96bfa15 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-reactive-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/reactive/mysql/command/query/binary/execute/ReactiveMySQLComStmtExecuteExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-reactive-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/reactive/mysql/command/query/binary/execute/ReactiveMySQLComStmtExecuteExecutor.java
@@ -48,8 +48,8 @@ import org.apache.shardingsphere.proxy.backend.response.data.QueryResponseRow;
import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandlerFactory;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandlerFactory;
import org.apache.shardingsphere.proxy.frontend.command.executor.ResponseType;
import org.apache.shardingsphere.proxy.frontend.mysql.command.ServerStatusFlagCalculator;
import org.apache.shardingsphere.proxy.frontend.mysql.command.query.binary.MySQLPreparedStatement;
@@ -77,7 +77,7 @@ public final class ReactiveMySQLComStmtExecuteExecutor implements ReactiveComman
private VertxDatabaseCommunicationEngine databaseCommunicationEngine;
- private TextProtocolBackendHandler textProtocolBackendHandler;
+ private ProxyBackendHandler proxyBackendHandler;
@Getter
private ResponseType responseType;
@@ -105,12 +105,12 @@ public final class ReactiveMySQLComStmtExecuteExecutor implements ReactiveComman
int characterSet = connectionSession.getAttributeMap().attr(MySQLConstants.MYSQL_CHARACTER_SET_ATTRIBUTE_KEY).get().getId();
// TODO Refactor the following branch
if (sqlStatement instanceof TCLStatement) {
- textProtocolBackendHandler = TextProtocolBackendHandlerFactory.newInstance(DatabaseTypeFactory.getInstance("MySQL"), preparedStatement.getSql(), sqlStatement, connectionSession);
+ proxyBackendHandler = ProxyBackendHandlerFactory.newInstance(DatabaseTypeFactory.getInstance("MySQL"), preparedStatement.getSql(), sqlStatement, connectionSession);
} else {
databaseCommunicationEngine = DatabaseCommunicationEngineFactory.getInstance()
.newDatabaseCommunicationEngine(new LogicSQL(sqlStatementContext, preparedStatement.getSql(), parameters), connectionSession.getBackendConnection(), true);
}
- return (null != databaseCommunicationEngine ? databaseCommunicationEngine.executeFuture() : textProtocolBackendHandler.executeFuture()).compose(responseHeader -> {
+ return (null != databaseCommunicationEngine ? databaseCommunicationEngine.executeFuture() : proxyBackendHandler.executeFuture()).compose(responseHeader -> {
Collection<DatabasePacket<?>> headerPackets = responseHeader instanceof QueryResponseHeader ? processQuery((QueryResponseHeader) responseHeader, characterSet)
: processUpdate((UpdateResponseHeader) responseHeader);
List<DatabasePacket<?>> result = new LinkedList<>(headerPackets);
@@ -176,8 +176,8 @@ public final class ReactiveMySQLComStmtExecuteExecutor implements ReactiveComman
@Override
public Future<Void> closeFuture() {
try {
- if (null != textProtocolBackendHandler) {
- textProtocolBackendHandler.close();
+ if (null != proxyBackendHandler) {
+ proxyBackendHandler.close();
}
return Future.succeededFuture();
} catch (final SQLException ex) {
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-reactive-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/reactive/mysql/command/query/text/query/ReactiveMySQLComQueryPacketExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-reactive-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/reactive/mysql/command/query/text/query/ReactiveMySQLComQueryPacketExecutor.java
index 111515323d0..6ba7b68d62d 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-reactive-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/reactive/mysql/command/query/text/query/ReactiveMySQLComQueryPacketExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-reactive-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/reactive/mysql/command/query/text/query/ReactiveMySQLComQueryPacketExecutor.java
@@ -27,8 +27,8 @@ import org.apache.shardingsphere.infra.database.type.DatabaseTypeFactory;
import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandlerFactory;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandler;
+import org.apache.shardingsphere.proxy.backend.text.ProxyBackendHandlerFactory;
import org.apache.shardingsphere.proxy.frontend.command.executor.ResponseType;
import org.apache.shardingsphere.proxy.frontend.mysql.command.ServerStatusFlagCalculator;
import org.apache.shardingsphere.proxy.frontend.mysql.command.query.builder.ResponsePacketBuilder;
@@ -46,7 +46,7 @@ public final class ReactiveMySQLComQueryPacketExecutor implements ReactiveComman
private final ConnectionSession connectionSession;
- private final TextProtocolBackendHandler textProtocolBackendHandler;
+ private final ProxyBackendHandler proxyBackendHandler;
private final int characterSet;
@@ -56,19 +56,19 @@ public final class ReactiveMySQLComQueryPacketExecutor implements ReactiveComman
public ReactiveMySQLComQueryPacketExecutor(final MySQLComQueryPacket packet, final ConnectionSession connectionSession) throws SQLException {
this.connectionSession = connectionSession;
- textProtocolBackendHandler = TextProtocolBackendHandlerFactory.newInstance(DatabaseTypeFactory.getInstance("MySQL"), packet.getSql(), connectionSession);
+ proxyBackendHandler = ProxyBackendHandlerFactory.newInstance(DatabaseTypeFactory.getInstance("MySQL"), packet.getSql(), connectionSession);
characterSet = connectionSession.getAttributeMap().attr(MySQLConstants.MYSQL_CHARACTER_SET_ATTRIBUTE_KEY).get().getId();
}
@Override
public Future<Collection<DatabasePacket<?>>> executeFuture() {
- return textProtocolBackendHandler.executeFuture().compose(responseHeader -> {
+ return proxyBackendHandler.executeFuture().compose(responseHeader -> {
List<DatabasePacket<?>> result = new LinkedList<>(
responseHeader instanceof QueryResponseHeader ? processQuery((QueryResponseHeader) responseHeader) : processUpdate((UpdateResponseHeader) responseHeader));
try {
if (ResponseType.QUERY == responseType) {
- while (textProtocolBackendHandler.next()) {
- result.add(new MySQLTextResultSetRowPacket(++currentSequenceId, textProtocolBackendHandler.getRowData().getData()));
+ while (proxyBackendHandler.next()) {
+ result.add(new MySQLTextResultSetRowPacket(++currentSequenceId, proxyBackendHandler.getRowData().getData()));
}
result.add(new MySQLEofPacket(++currentSequenceId, ServerStatusFlagCalculator.calculateFor(connectionSession)));
}
@@ -94,7 +94,7 @@ public final class ReactiveMySQLComQueryPacketExecutor implements ReactiveComman
@Override
public Future<Void> closeFuture() {
try {
- textProtocolBackendHandler.close();
+ proxyBackendHandler.close();
return Future.succeededFuture();
} catch (final SQLException ex) {
return Future.failedFuture(ex);