This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new d9ffe4d949e Rename impls of ProxyBackendHandler (#36803)
d9ffe4d949e is described below
commit d9ffe4d949e161ffaec4a1ea7545992b316fbed8
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Oct 7 12:51:28 2025 +0800
Rename impls of ProxyBackendHandler (#36803)
---
.../reachability-metadata.json | 54 +++++++++++-----------
.../connector/ProxyDatabaseConnectionManager.java | 18 ++++----
.../handler/ProxyBackendHandlerFactory.java | 24 +++++-----
...> DatabaseAdminProxyBackendHandlerFactory.java} | 8 ++--
... => DatabaseAdminQueryProxyBackendHandler.java} | 4 +-
...=> DatabaseAdminUpdateProxyBackendHandler.java} | 4 +-
...DatabaseOperateProxyBackendHandlerFactory.java} | 8 ++--
...andler.java => DistSQLProxyBackendHandler.java} | 4 +-
...java => DistSQLProxyBackendHandlerFactory.java} | 14 +++---
...r.java => DistSQLQueryProxyBackendHandler.java} | 6 +--
....java => DistSQLUpdateProxyBackendHandler.java} | 6 +--
...ndHandler.java => SkipProxyBackendHandler.java} | 4 +-
.../ProxyDatabaseConnectionManagerTest.java | 40 ++++++++--------
.../handler/ProxyBackendHandlerFactoryTest.java | 24 +++++-----
...DatabaseAdminQueryProxyBackendHandlerTest.java} | 6 +--
.../UnicastDatabaseProxyBackendHandlerTest.java | 4 +-
...baseOperateProxyBackendHandlerFactoryTest.java} | 20 ++++----
... => DistSQLProxyBackendHandlerFactoryTest.java} | 34 +++++++-------
...va => DistSQLQueryProxyBackendHandlerTest.java} | 10 ++--
...a => DistSQLUpdateProxyBackendHandlerTest.java} | 12 ++---
...riableUpdatableRALProxyBackendHandlerTest.java} | 6 +--
.../distsql/rul/ParseDistSQLExecutorTest.java | 8 ++--
...rTest.java => SkipProxyBackendHandlerTest.java} | 8 ++--
.../tcl/TCLProxyBackendHandlerFactoryTest.java | 6 +--
.../admin/executor/UseDatabaseExecutorTest.java | 4 +-
.../text/query/MySQLComQueryPacketExecutor.java | 2 +-
...> MySQLMultiStatementsProxyBackendHandler.java} | 6 +--
...SQLMultiStatementsProxyBackendHandlerTest.java} | 8 ++--
28 files changed, 177 insertions(+), 175 deletions(-)
diff --git
a/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reachability-metadata.json
b/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reachability-metadata.json
index b6e7d9b27b9..3500c3d9425 100644
---
a/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reachability-metadata.json
+++
b/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reachability-metadata.json
@@ -566,7 +566,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler"
},
"type": "java.lang.Object"
},
@@ -1107,7 +1107,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler"
},
"type": "java.util.LinkedHashSet"
},
@@ -1251,7 +1251,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler"
},
"type": "java.util.Properties"
},
@@ -1981,7 +1981,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler"
},
"type":
"org.apache.shardingsphere.broadcast.yaml.config.YamlBroadcastRuleConfiguration"
},
@@ -2691,7 +2691,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler"
},
"type": "org.apache.shardingsphere.driver.ShardingSphereDriver"
},
@@ -3388,7 +3388,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler"
},
"type":
"org.apache.shardingsphere.infra.algorithm.core.yaml.YamlAlgorithmConfiguration"
},
@@ -3528,7 +3528,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler"
},
"type":
"org.apache.shardingsphere.infra.algorithm.keygen.snowflake.SnowflakeKeyGenerateAlgorithm"
},
@@ -3630,7 +3630,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler"
},
"type":
"org.apache.shardingsphere.infra.algorithm.keygen.uuid.UUIDKeyGenerateAlgorithm"
},
@@ -3822,7 +3822,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler"
},
"type":
"org.apache.shardingsphere.infra.expr.groovy.GroovyInlineExpressionParser"
},
@@ -3918,7 +3918,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler"
},
"type":
"org.apache.shardingsphere.infra.expr.interval.IntervalInlineExpressionParser"
},
@@ -4014,7 +4014,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler"
},
"type":
"org.apache.shardingsphere.infra.expr.literal.LiteralInlineExpressionParser"
},
@@ -4427,7 +4427,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler"
},
"type":
"org.apache.shardingsphere.infra.yaml.data.pojo.YamlRowStatistics"
},
@@ -5744,7 +5744,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler"
},
"type":
"org.apache.shardingsphere.mode.node.path.type.database.metadata.DatabaseMetaDataNodePath"
},
@@ -5870,7 +5870,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler"
},
"type":
"org.apache.shardingsphere.mode.node.path.type.database.metadata.datasource.StorageUnitNodePath"
},
@@ -6003,7 +6003,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler"
},
"type":
"org.apache.shardingsphere.mode.node.path.type.database.metadata.rule.DatabaseRuleNodePath"
},
@@ -6157,7 +6157,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler"
},
"type":
"org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.SchemaMetaDataNodePath"
},
@@ -6423,7 +6423,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler"
},
"type":
"org.apache.shardingsphere.mode.node.path.type.database.statistics.StatisticsDataNodePath"
},
@@ -6576,7 +6576,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler"
},
"type":
"org.apache.shardingsphere.mode.node.path.type.database.statistics.StatisticsDatabaseNodePath"
},
@@ -6694,7 +6694,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler"
},
"type":
"org.apache.shardingsphere.mode.node.path.type.database.statistics.StatisticsSchemaNodePath"
},
@@ -6806,7 +6806,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler"
},
"type":
"org.apache.shardingsphere.mode.node.path.type.database.statistics.StatisticsTableNodePath"
},
@@ -8886,7 +8886,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler"
},
"type":
"org.apache.shardingsphere.sharding.yaml.config.YamlShardingRuleConfiguration"
},
@@ -9025,7 +9025,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler"
},
"type":
"org.apache.shardingsphere.sharding.yaml.config.rule.YamlTableRuleConfiguration"
},
@@ -9154,7 +9154,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler"
},
"type":
"org.apache.shardingsphere.sharding.yaml.config.strategy.keygen.YamlKeyGenerateStrategyConfiguration"
},
@@ -9308,7 +9308,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler"
},
"type":
"org.apache.shardingsphere.sharding.yaml.config.strategy.sharding.YamlShardingStrategyConfiguration"
},
@@ -9425,7 +9425,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler"
},
"type":
"org.apache.shardingsphere.sharding.yaml.config.strategy.sharding.YamlStandardShardingStrategyConfiguration"
},
@@ -10327,7 +10327,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler"
},
"type":
"org.apache.shardingsphere.sqlfederation.compiler.sql.function.mysql.MySQLOperatorTable"
},
@@ -10912,7 +10912,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler"
},
"type":
"org.apache.shardingsphere.timeservice.type.system.SystemTimestampService"
},
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/ProxyDatabaseConnectionManager.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/ProxyDatabaseConnectionManager.java
index e83d451caa0..f07e56fcf44 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/ProxyDatabaseConnectionManager.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/ProxyDatabaseConnectionManager.java
@@ -63,9 +63,9 @@ public final class ProxyDatabaseConnectionManager implements
DatabaseConnectionM
private final Multimap<String, Connection> cachedConnections =
LinkedHashMultimap.create();
- private final Collection<ProxyBackendHandler> backendHandlers =
Collections.newSetFromMap(new ConcurrentHashMap<>(64));
+ private final Collection<ProxyBackendHandler> proxyBackendHandlers =
Collections.newSetFromMap(new ConcurrentHashMap<>(64));
- private final Collection<ProxyBackendHandler> inUseBackendHandlers =
Collections.newSetFromMap(new ConcurrentHashMap<>(64));
+ private final Collection<ProxyBackendHandler> inUseProxyBackendHandlers =
Collections.newSetFromMap(new ConcurrentHashMap<>(64));
private final Collection<ConnectionPostProcessor> connectionPostProcessors
= new LinkedList<>();
@@ -226,7 +226,7 @@ public final class ProxyDatabaseConnectionManager
implements DatabaseConnectionM
* @param handler handler to be added
*/
public void add(final ProxyBackendHandler handler) {
- backendHandlers.add(handler);
+ proxyBackendHandlers.add(handler);
}
/**
@@ -235,7 +235,7 @@ public final class ProxyDatabaseConnectionManager
implements DatabaseConnectionM
* @param handler handler to be marked
*/
public void markResourceInUse(final ProxyBackendHandler handler) {
- inUseBackendHandlers.add(handler);
+ inUseProxyBackendHandlers.add(handler);
}
/**
@@ -244,7 +244,7 @@ public final class ProxyDatabaseConnectionManager
implements DatabaseConnectionM
* @param handler proxy backend handler to be added
*/
public void unmarkResourceInUse(final ProxyBackendHandler handler) {
- inUseBackendHandlers.remove(handler);
+ inUseProxyBackendHandlers.remove(handler);
}
/**
@@ -302,8 +302,8 @@ public final class ProxyDatabaseConnectionManager
implements DatabaseConnectionM
*/
public Collection<SQLException> closeHandlers(final boolean includeInUse) {
Collection<SQLException> result = new LinkedList<>();
- for (ProxyBackendHandler each : backendHandlers) {
- if (!includeInUse && inUseBackendHandlers.contains(each)) {
+ for (ProxyBackendHandler each : proxyBackendHandlers) {
+ if (!includeInUse && inUseProxyBackendHandlers.contains(each)) {
continue;
}
try {
@@ -313,9 +313,9 @@ public final class ProxyDatabaseConnectionManager
implements DatabaseConnectionM
}
}
if (includeInUse) {
- inUseBackendHandlers.clear();
+ inUseProxyBackendHandlers.clear();
}
- backendHandlers.retainAll(inUseBackendHandlers);
+ proxyBackendHandlers.retainAll(inUseProxyBackendHandlers);
return result;
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java
index 667d51a915e..6fce013e552 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java
@@ -42,11 +42,11 @@ import
org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.mode.state.ShardingSphereState;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.distsql.DistSQLStatementContext;
-import
org.apache.shardingsphere.proxy.backend.handler.admin.DatabaseAdminBackendHandlerFactory;
+import
org.apache.shardingsphere.proxy.backend.handler.admin.DatabaseAdminProxyBackendHandlerFactory;
import
org.apache.shardingsphere.proxy.backend.handler.data.DatabaseProxyBackendHandlerFactory;
-import
org.apache.shardingsphere.proxy.backend.handler.database.DatabaseOperateBackendHandlerFactory;
-import
org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLBackendHandlerFactory;
-import org.apache.shardingsphere.proxy.backend.handler.skip.SkipBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.handler.database.DatabaseOperateProxyBackendHandlerFactory;
+import
org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLProxyBackendHandlerFactory;
+import
org.apache.shardingsphere.proxy.backend.handler.skip.SkipProxyBackendHandler;
import
org.apache.shardingsphere.proxy.backend.handler.tcl.TCLProxyBackendHandlerFactory;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import
org.apache.shardingsphere.proxy.backend.state.DialectProxyStateSupportedSQLProvider;
@@ -92,7 +92,7 @@ public final class ProxyBackendHandlerFactory {
public static ProxyBackendHandler newInstance(final DatabaseType
databaseType, final String sql, final SQLStatement sqlStatement,
final ConnectionSession
connectionSession, final HintValueContext hintValueContext) throws SQLException
{
if (sqlStatement instanceof EmptyStatement) {
- return new SkipBackendHandler(sqlStatement);
+ return new SkipProxyBackendHandler(sqlStatement);
}
ShardingSphereMetaData metaData =
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData();
SQLStatementContext sqlStatementContext = sqlStatement instanceof
DistSQLStatement
@@ -121,22 +121,22 @@ public final class ProxyBackendHandlerFactory {
checkSupportedSQLStatement(databaseType, sqlStatement);
checkClusterState(databaseType, sqlStatement);
if (sqlStatement instanceof EmptyStatement) {
- return new SkipBackendHandler(sqlStatement);
+ return new SkipProxyBackendHandler(sqlStatement);
}
if (sqlStatement instanceof DistSQLStatement) {
checkSupportedDistSQLStatementInTransaction(sqlStatement,
connectionSession);
- return DistSQLBackendHandlerFactory.newInstance((DistSQLStatement)
sqlStatement, connectionSession);
+ return
DistSQLProxyBackendHandlerFactory.newInstance((DistSQLStatement) sqlStatement,
connectionSession);
}
handleAutoCommit(sqlStatement, connectionSession);
if (sqlStatement instanceof TCLStatement) {
return TCLProxyBackendHandlerFactory.newInstance(queryContext,
connectionSession);
}
- Optional<ProxyBackendHandler> databaseAdminHandler =
DatabaseAdminBackendHandlerFactory.newInstance(
+ Optional<ProxyBackendHandler> databaseAdminHandler =
DatabaseAdminProxyBackendHandlerFactory.newInstance(
databaseType, sqlStatementContext, connectionSession,
queryContext.getSql(), queryContext.getParameters());
if (databaseAdminHandler.isPresent()) {
return databaseAdminHandler.get();
}
- Optional<ProxyBackendHandler> databaseOperateHandler =
findDatabaseOperateBackendHandler(sqlStatement, connectionSession);
+ Optional<ProxyBackendHandler> databaseOperateHandler =
findDatabaseOperateProxyBackendHandler(sqlStatement, connectionSession);
if (databaseOperateHandler.isPresent()) {
return databaseOperateHandler.get();
}
@@ -147,7 +147,7 @@ public final class ProxyBackendHandlerFactory {
return
DatabaseProxyBackendHandlerFactory.newInstance(queryContext, connectionSession,
preferPreparedStatement);
}
checkSQLExecution(queryContext, connectionSession, databaseName);
- return DatabaseAdminBackendHandlerFactory.newInstance(databaseType,
sqlStatementContext, connectionSession)
+ return
DatabaseAdminProxyBackendHandlerFactory.newInstance(databaseType,
sqlStatementContext, connectionSession)
.orElseGet(() ->
DatabaseProxyBackendHandlerFactory.newInstance(queryContext, connectionSession,
preferPreparedStatement));
}
@@ -192,9 +192,9 @@ public final class ProxyBackendHandlerFactory {
}
}
- private static Optional<ProxyBackendHandler>
findDatabaseOperateBackendHandler(final SQLStatement sqlStatement, final
ConnectionSession connectionSession) {
+ private static Optional<ProxyBackendHandler>
findDatabaseOperateProxyBackendHandler(final SQLStatement sqlStatement, final
ConnectionSession connectionSession) {
return sqlStatement instanceof CreateDatabaseStatement || sqlStatement
instanceof DropDatabaseStatement
- ?
Optional.of(DatabaseOperateBackendHandlerFactory.newInstance(sqlStatement,
connectionSession))
+ ?
Optional.of(DatabaseOperateProxyBackendHandlerFactory.newInstance(sqlStatement,
connectionSession))
: Optional.empty();
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminBackendHandlerFactory.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminProxyBackendHandlerFactory.java
similarity index 92%
rename from
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminBackendHandlerFactory.java
rename to
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminProxyBackendHandlerFactory.java
index 01c52bdaf99..0ddc41c6f20 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminBackendHandlerFactory.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminProxyBackendHandlerFactory.java
@@ -32,10 +32,10 @@ import java.util.List;
import java.util.Optional;
/**
- * Database admin backend handler factory.
+ * Database admin proxy backend handler factory.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class DatabaseAdminBackendHandlerFactory {
+public final class DatabaseAdminProxyBackendHandlerFactory {
/**
* Create new instance of database admin backend handler, and this handler
requires a connection containing a schema to be used.
@@ -76,7 +76,7 @@ public final class DatabaseAdminBackendHandlerFactory {
private static ProxyBackendHandler createProxyBackendHandler(final
SQLStatementContext sqlStatementContext, final ConnectionSession
connectionSession, final DatabaseAdminExecutor executor) {
return executor instanceof DatabaseAdminQueryExecutor
- ? new DatabaseAdminQueryBackendHandler(connectionSession,
(DatabaseAdminQueryExecutor) executor)
- : new DatabaseAdminUpdateBackendHandler(connectionSession,
sqlStatementContext.getSqlStatement(), executor);
+ ? new DatabaseAdminQueryProxyBackendHandler(connectionSession,
(DatabaseAdminQueryExecutor) executor)
+ : new
DatabaseAdminUpdateProxyBackendHandler(connectionSession,
sqlStatementContext.getSqlStatement(), executor);
}
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminQueryBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminQueryProxyBackendHandler.java
similarity index 96%
rename from
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminQueryBackendHandler.java
rename to
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminQueryProxyBackendHandler.java
index 23c1b028b53..76e2d6c2a8f 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminQueryBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminQueryProxyBackendHandler.java
@@ -38,10 +38,10 @@ import java.util.ArrayList;
import java.util.List;
/**
- * Database admin query backend handler.
+ * Database admin query proxy backend handler.
*/
@RequiredArgsConstructor
-public final class DatabaseAdminQueryBackendHandler implements
ProxyBackendHandler {
+public final class DatabaseAdminQueryProxyBackendHandler implements
ProxyBackendHandler {
private final ConnectionSession connectionSession;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminUpdateBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminUpdateProxyBackendHandler.java
similarity index 92%
rename from
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminUpdateBackendHandler.java
rename to
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminUpdateProxyBackendHandler.java
index c15dfa18c72..0220ebb5c81 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminUpdateBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminUpdateProxyBackendHandler.java
@@ -28,10 +28,10 @@ import
org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatemen
import java.sql.SQLException;
/**
- * Database admin update backend handler.
+ * Database admin update proxy backend handler.
*/
@RequiredArgsConstructor
-public final class DatabaseAdminUpdateBackendHandler implements
ProxyBackendHandler {
+public final class DatabaseAdminUpdateProxyBackendHandler implements
ProxyBackendHandler {
private final ConnectionSession connectionSession;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactory.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateProxyBackendHandlerFactory.java
similarity index 87%
rename from
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactory.java
rename to
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateProxyBackendHandlerFactory.java
index b3bebf98ccf..75abec72793 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactory.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateProxyBackendHandlerFactory.java
@@ -27,10 +27,10 @@ import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.ddl.da
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.ddl.database.DropDatabaseStatement;
/**
- * Database operate backend handler factory.
+ * Database operate proxy backend handler factory.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class DatabaseOperateBackendHandlerFactory {
+public final class DatabaseOperateProxyBackendHandlerFactory {
/**
* Create new instance of database operate backend handler.
@@ -40,10 +40,10 @@ public final class DatabaseOperateBackendHandlerFactory {
* @return created instance
*/
public static ProxyBackendHandler newInstance(final SQLStatement
sqlStatement, final ConnectionSession connectionSession) {
- return createBackendHandler(sqlStatement, connectionSession);
+ return createProxyBackendHandler(sqlStatement, connectionSession);
}
- private static ProxyBackendHandler createBackendHandler(final SQLStatement
sqlStatement, final ConnectionSession connectionSession) {
+ private static ProxyBackendHandler createProxyBackendHandler(final
SQLStatement sqlStatement, final ConnectionSession connectionSession) {
if (sqlStatement instanceof CreateDatabaseStatement) {
return new
CreateDatabaseProxyBackendHandler((CreateDatabaseStatement) sqlStatement);
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLProxyBackendHandler.java
similarity index 89%
rename from
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandler.java
rename to
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLProxyBackendHandler.java
index d0122ee458d..0408ca39f52 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLProxyBackendHandler.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.proxy.backend.handler.distsql;
import org.apache.shardingsphere.proxy.backend.handler.ProxyBackendHandler;
/**
- * DistSQL backend handler.
+ * DistSQL proxy backend handler.
*/
-public interface DistSQLBackendHandler extends ProxyBackendHandler {
+public interface DistSQLProxyBackendHandler extends ProxyBackendHandler {
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactory.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLProxyBackendHandlerFactory.java
similarity index 84%
rename from
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactory.java
rename to
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLProxyBackendHandlerFactory.java
index e7de350b0b8..59576f55a66 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactory.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLProxyBackendHandlerFactory.java
@@ -30,13 +30,13 @@ import
org.apache.shardingsphere.proxy.backend.handler.ProxyBackendHandler;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
/**
- * DistSQL backend handler factory.
+ * DistSQL proxy backend handler factory.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class DistSQLBackendHandlerFactory {
+public final class DistSQLProxyBackendHandlerFactory {
/**
- * Create new instance of DistSQL backend handler.
+ * Create new instance of DistSQL proxy backend handler.
*
* @param sqlStatement DistSQL statement
* @param connectionSession connection session
@@ -45,13 +45,15 @@ public final class DistSQLBackendHandlerFactory {
*/
public static ProxyBackendHandler newInstance(final DistSQLStatement
sqlStatement, final ConnectionSession connectionSession) {
if (sqlStatement instanceof RQLStatement || sqlStatement instanceof
RULStatement) {
- return new DistSQLQueryBackendHandler(sqlStatement,
connectionSession);
+ return new DistSQLQueryProxyBackendHandler(sqlStatement,
connectionSession);
}
if (sqlStatement instanceof RDLStatement) {
- return new DistSQLUpdateBackendHandler(sqlStatement,
connectionSession);
+ return new DistSQLUpdateProxyBackendHandler(sqlStatement,
connectionSession);
}
if (sqlStatement instanceof RALStatement) {
- return sqlStatement instanceof QueryableRALStatement ? new
DistSQLQueryBackendHandler(sqlStatement, connectionSession) : new
DistSQLUpdateBackendHandler(sqlStatement, connectionSession);
+ return sqlStatement instanceof QueryableRALStatement
+ ? new DistSQLQueryProxyBackendHandler(sqlStatement,
connectionSession)
+ : new DistSQLUpdateProxyBackendHandler(sqlStatement,
connectionSession);
}
throw new
UnsupportedSQLOperationException(sqlStatement.getClass().getName());
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLQueryBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLQueryProxyBackendHandler.java
similarity index 93%
rename from
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLQueryBackendHandler.java
rename to
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLQueryProxyBackendHandler.java
index 8835091a6a7..37592657c62 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLQueryBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLQueryProxyBackendHandler.java
@@ -38,9 +38,9 @@ import java.util.List;
import java.util.stream.Collectors;
/**
- * DistSQL query backend handler.
+ * DistSQL query proxy backend handler.
*/
-public final class DistSQLQueryBackendHandler implements DistSQLBackendHandler
{
+public final class DistSQLQueryProxyBackendHandler implements
DistSQLProxyBackendHandler {
private final DistSQLQueryExecuteEngine engine;
@@ -48,7 +48,7 @@ public final class DistSQLQueryBackendHandler implements
DistSQLBackendHandler {
private MergedResult mergedResult;
- public DistSQLQueryBackendHandler(final DistSQLStatement sqlStatement,
final ConnectionSession connectionSession) {
+ public DistSQLQueryProxyBackendHandler(final DistSQLStatement
sqlStatement, final ConnectionSession connectionSession) {
DistSQLConnectionContext distsqlConnectionContext = new
DistSQLConnectionContext(connectionSession.getQueryContext(),
connectionSession.getDatabaseConnectionManager().getConnectionSize(),
connectionSession.getProtocolType(),
connectionSession.getDatabaseConnectionManager(),
connectionSession.getStatementManager());
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLUpdateBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLUpdateProxyBackendHandler.java
similarity index 87%
rename from
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLUpdateBackendHandler.java
rename to
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLUpdateProxyBackendHandler.java
index b705d86d57e..be4830395d0 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLUpdateBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLUpdateProxyBackendHandler.java
@@ -27,15 +27,15 @@ import
org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import java.sql.SQLException;
/**
- * DistSQL update backend handler.
+ * DistSQL update proxy backend handler.
*/
-public final class DistSQLUpdateBackendHandler implements
DistSQLBackendHandler {
+public final class DistSQLUpdateProxyBackendHandler implements
DistSQLProxyBackendHandler {
private final DistSQLStatement sqlStatement;
private final DistSQLUpdateExecuteEngine engine;
- public DistSQLUpdateBackendHandler(final DistSQLStatement sqlStatement,
final ConnectionSession connectionSession) {
+ public DistSQLUpdateProxyBackendHandler(final DistSQLStatement
sqlStatement, final ConnectionSession connectionSession) {
this.sqlStatement = sqlStatement;
engine = new DistSQLUpdateExecuteEngine(sqlStatement,
connectionSession.getUsedDatabaseName(),
ProxyContext.getInstance().getContextManager());
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/skip/SkipBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/skip/SkipProxyBackendHandler.java
similarity index 93%
rename from
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/skip/SkipBackendHandler.java
rename to
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/skip/SkipProxyBackendHandler.java
index 4d199fc2b01..aae9352968a 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/skip/SkipBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/skip/SkipProxyBackendHandler.java
@@ -24,10 +24,10 @@ import
org.apache.shardingsphere.proxy.backend.handler.ProxyBackendHandler;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement;
/**
- * Skip backend handler.
+ * Skip proxy backend handler.
*/
@RequiredArgsConstructor
-public final class SkipBackendHandler implements ProxyBackendHandler {
+public final class SkipProxyBackendHandler implements ProxyBackendHandler {
private final SQLStatement sqlStatement;
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxyDatabaseConnectionManagerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxyDatabaseConnectionManagerTest.java
index 225eb23b6a3..de447ac6d5f 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxyDatabaseConnectionManagerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxyDatabaseConnectionManagerTest.java
@@ -325,7 +325,7 @@ class ProxyDatabaseConnectionManagerTest {
void assertAddDatabaseProxyConnector() {
ProxyBackendHandler expectedEngine =
mock(DatabaseProxyConnector.class);
databaseConnectionManager.add(expectedEngine);
- Collection<ProxyBackendHandler> actual = getBackendHandlers();
+ Collection<ProxyBackendHandler> actual = getProxyBackendHandlers();
assertThat(actual.size(), is(1));
assertThat(actual.iterator().next(), is(expectedEngine));
}
@@ -335,7 +335,7 @@ class ProxyDatabaseConnectionManagerTest {
ProxyBackendHandler expectedEngine =
mock(DatabaseProxyConnector.class);
databaseConnectionManager.add(expectedEngine);
databaseConnectionManager.markResourceInUse(expectedEngine);
- Collection<ProxyBackendHandler> actual = getInUseBackendHandlers();
+ Collection<ProxyBackendHandler> actual =
getInUseProxyBackendHandlers();
assertThat(actual.size(), is(1));
assertThat(actual.iterator().next(), is(expectedEngine));
}
@@ -343,7 +343,7 @@ class ProxyDatabaseConnectionManagerTest {
@Test
void assertUnmarkInUseDatabaseProxyConnector() {
ProxyBackendHandler engine = mock(DatabaseProxyConnector.class);
- Collection<ProxyBackendHandler> actual = getInUseBackendHandlers();
+ Collection<ProxyBackendHandler> actual =
getInUseProxyBackendHandlers();
actual.add(engine);
databaseConnectionManager.unmarkResourceInUse(engine);
assertTrue(actual.isEmpty());
@@ -355,34 +355,34 @@ class ProxyDatabaseConnectionManagerTest {
ProxyBackendHandler inUseEngine = mock(DatabaseProxyConnector.class);
SQLException expectedException = mock(SQLException.class);
doThrow(expectedException).when(engine).close();
- Collection<ProxyBackendHandler> backendHandlers = getBackendHandlers();
- Collection<ProxyBackendHandler> inUseBackendHandlers =
getInUseBackendHandlers();
+ Collection<ProxyBackendHandler> backendHandlers =
getProxyBackendHandlers();
+ Collection<ProxyBackendHandler> inUseProxyBackendHandlers =
getInUseProxyBackendHandlers();
backendHandlers.add(engine);
backendHandlers.add(inUseEngine);
- inUseBackendHandlers.add(inUseEngine);
+ inUseProxyBackendHandlers.add(inUseEngine);
Collection<SQLException> actual =
databaseConnectionManager.closeHandlers(false);
assertThat(actual.size(), is(1));
assertThat(actual.iterator().next(), is(expectedException));
- assertThat(inUseBackendHandlers.size(), is(1));
+ assertThat(inUseProxyBackendHandlers.size(), is(1));
assertThat(backendHandlers.size(), is(1));
verify(engine).close();
databaseConnectionManager.closeHandlers(true);
verify(inUseEngine).close();
assertTrue(backendHandlers.isEmpty());
- assertTrue(inUseBackendHandlers.isEmpty());
+ assertTrue(inUseProxyBackendHandlers.isEmpty());
}
@Test
void assertCloseExecutionResourcesNotInTransaction() throws
BackendConnectionException, SQLException {
ProxyBackendHandler notInUseHandler = mock(ProxyBackendHandler.class);
ProxyBackendHandler inUseHandler = mock(ProxyBackendHandler.class);
- getBackendHandlers().addAll(Arrays.asList(notInUseHandler,
inUseHandler));
- getInUseBackendHandlers().add(inUseHandler);
+ getProxyBackendHandlers().addAll(Arrays.asList(notInUseHandler,
inUseHandler));
+ getInUseProxyBackendHandlers().add(inUseHandler);
Connection cachedConnection = prepareCachedConnections();
databaseConnectionManager.closeExecutionResources();
verify(cachedConnection).close();
- assertTrue(getBackendHandlers().isEmpty());
- assertTrue(getInUseBackendHandlers().isEmpty());
+ assertTrue(getProxyBackendHandlers().isEmpty());
+ assertTrue(getInUseProxyBackendHandlers().isEmpty());
verify(notInUseHandler).close();
verify(inUseHandler).close();
}
@@ -392,25 +392,25 @@ class ProxyDatabaseConnectionManagerTest {
connectionSession.getTransactionStatus().setInTransaction(true);
ProxyBackendHandler notInUseHandler = mock(ProxyBackendHandler.class);
ProxyBackendHandler inUseHandler = mock(ProxyBackendHandler.class);
- getBackendHandlers().addAll(Arrays.asList(notInUseHandler,
inUseHandler));
- getInUseBackendHandlers().add(inUseHandler);
+ getProxyBackendHandlers().addAll(Arrays.asList(notInUseHandler,
inUseHandler));
+ getInUseProxyBackendHandlers().add(inUseHandler);
Connection cachedConnection = prepareCachedConnections();
databaseConnectionManager.closeExecutionResources();
verifyNoInteractions(inUseHandler, cachedConnection);
- assertThat(getBackendHandlers(),
is(Collections.singleton(inUseHandler)));
- assertThat(getInUseBackendHandlers(),
is(Collections.singleton(inUseHandler)));
+ assertThat(getProxyBackendHandlers(),
is(Collections.singleton(inUseHandler)));
+ assertThat(getInUseProxyBackendHandlers(),
is(Collections.singleton(inUseHandler)));
}
@SuppressWarnings("unchecked")
@SneakyThrows(ReflectiveOperationException.class)
- private Collection<ProxyBackendHandler> getBackendHandlers() {
- return (Collection<ProxyBackendHandler>)
Plugins.getMemberAccessor().get(ProxyDatabaseConnectionManager.class.getDeclaredField("backendHandlers"),
databaseConnectionManager);
+ private Collection<ProxyBackendHandler> getProxyBackendHandlers() {
+ return (Collection<ProxyBackendHandler>)
Plugins.getMemberAccessor().get(ProxyDatabaseConnectionManager.class.getDeclaredField("proxyBackendHandlers"),
databaseConnectionManager);
}
@SuppressWarnings("unchecked")
@SneakyThrows(ReflectiveOperationException.class)
- private Collection<ProxyBackendHandler> getInUseBackendHandlers() {
- return (Collection<ProxyBackendHandler>)
Plugins.getMemberAccessor().get(ProxyDatabaseConnectionManager.class.getDeclaredField("inUseBackendHandlers"),
databaseConnectionManager);
+ private Collection<ProxyBackendHandler> getInUseProxyBackendHandlers() {
+ return (Collection<ProxyBackendHandler>)
Plugins.getMemberAccessor().get(ProxyDatabaseConnectionManager.class.getDeclaredField("inUseProxyBackendHandlers"),
databaseConnectionManager);
}
@Test
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactoryTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactoryTest.java
index b2bfc9bcaef..1d2d602ab26 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactoryTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactoryTest.java
@@ -38,11 +38,11 @@ import
org.apache.shardingsphere.parser.rule.builder.DefaultSQLParserRuleConfigu
import
org.apache.shardingsphere.proxy.backend.connector.DatabaseProxyConnector;
import
org.apache.shardingsphere.proxy.backend.connector.ProxyDatabaseConnectionManager;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import
org.apache.shardingsphere.proxy.backend.handler.admin.DatabaseAdminQueryBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.handler.admin.DatabaseAdminQueryProxyBackendHandler;
import
org.apache.shardingsphere.proxy.backend.handler.data.impl.UnicastDatabaseProxyBackendHandler;
-import
org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLQueryBackendHandler;
-import
org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler;
-import org.apache.shardingsphere.proxy.backend.handler.skip.SkipBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLQueryProxyBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.handler.skip.SkipProxyBackendHandler;
import
org.apache.shardingsphere.proxy.backend.handler.tcl.local.type.BeginTransactionProxyBackendHandler;
import
org.apache.shardingsphere.proxy.backend.handler.tcl.local.type.CommitProxyBackendHandler;
import
org.apache.shardingsphere.proxy.backend.handler.tcl.local.type.ReleaseSavepointProxyBackendHandler;
@@ -140,15 +140,15 @@ class ProxyBackendHandlerFactoryTest {
String sql = "set dist variable sql_show='true'";
SQLStatement sqlStatement = ProxySQLComQueryParser.parse(sql,
databaseType, connectionSession);
ProxyBackendHandler actual =
ProxyBackendHandlerFactory.newInstance(databaseType, sql, sqlStatement,
connectionSession, new HintValueContext());
- assertThat(actual, isA(DistSQLUpdateBackendHandler.class));
+ assertThat(actual, isA(DistSQLUpdateProxyBackendHandler.class));
sql = "show dist variable where name = sql_show";
sqlStatement = ProxySQLComQueryParser.parse(sql, databaseType,
connectionSession);
actual = ProxyBackendHandlerFactory.newInstance(databaseType, sql,
sqlStatement, connectionSession, new HintValueContext());
- assertThat(actual, isA(DistSQLQueryBackendHandler.class));
+ assertThat(actual, isA(DistSQLQueryProxyBackendHandler.class));
sql = "show dist variables";
sqlStatement = ProxySQLComQueryParser.parse(sql, databaseType,
connectionSession);
actual = ProxyBackendHandlerFactory.newInstance(databaseType, sql,
sqlStatement, connectionSession, new HintValueContext());
- assertThat(actual, isA(DistSQLQueryBackendHandler.class));
+ assertThat(actual, isA(DistSQLQueryProxyBackendHandler.class));
}
@ParameterizedTest(name = "{0}")
@@ -193,14 +193,14 @@ class ProxyBackendHandlerFactoryTest {
sql = "SELECT * FROM information_schema.schemata LIMIT 1";
sqlStatement = ProxySQLComQueryParser.parse(sql, databaseType,
connectionSession);
actual = ProxyBackendHandlerFactory.newInstance(databaseType, sql,
sqlStatement, connectionSession, new HintValueContext());
- assertThat(actual, isA(DatabaseAdminQueryBackendHandler.class));
+ assertThat(actual, isA(DatabaseAdminQueryProxyBackendHandler.class));
}
@Test
void assertNewInstanceWithEmptyString() throws SQLException {
String sql = "";
ProxyBackendHandler actual =
ProxyBackendHandlerFactory.newInstance(databaseType, sql, new
EmptyStatement(databaseType), connectionSession, new HintValueContext());
- assertThat(actual, isA(SkipBackendHandler.class));
+ assertThat(actual, isA(SkipProxyBackendHandler.class));
}
@Test
@@ -217,7 +217,7 @@ class ProxyBackendHandlerFactoryTest {
String sql = "SHOW TRANSACTION RULE;";
SQLStatement sqlStatement = ProxySQLComQueryParser.parse(sql,
databaseType, connectionSession);
ProxyBackendHandler actual =
ProxyBackendHandlerFactory.newInstance(databaseType, sql, sqlStatement,
connectionSession, new HintValueContext());
- assertThat(actual, isA(DistSQLQueryBackendHandler.class));
+ assertThat(actual, isA(DistSQLQueryProxyBackendHandler.class));
}
@Test
@@ -226,7 +226,7 @@ class ProxyBackendHandlerFactoryTest {
String sql = "SHOW DEFAULT SINGLE TABLE STORAGE UNIT";
SQLStatement sqlStatement = ProxySQLComQueryParser.parse(sql,
databaseType, connectionSession);
ProxyBackendHandler actual =
ProxyBackendHandlerFactory.newInstance(databaseType, sql, sqlStatement,
connectionSession, new HintValueContext());
- assertThat(actual, isA(DistSQLQueryBackendHandler.class));
+ assertThat(actual, isA(DistSQLQueryProxyBackendHandler.class));
}
@Test
@@ -235,7 +235,7 @@ class ProxyBackendHandlerFactoryTest {
String sql = "PREVIEW INSERT INTO account VALUES(1, 1, 1)";
SQLStatement sqlStatement = ProxySQLComQueryParser.parse(sql,
databaseType, connectionSession);
ProxyBackendHandler actual =
ProxyBackendHandlerFactory.newInstance(databaseType, sql, sqlStatement,
connectionSession, new HintValueContext());
- assertThat(actual, isA(DistSQLQueryBackendHandler.class));
+ assertThat(actual, isA(DistSQLQueryProxyBackendHandler.class));
}
private static final class TCLTestCaseArgumentsProvider implements
ArgumentsProvider {
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminQueryBackendHandlerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminQueryProxyBackendHandlerTest.java
similarity index 97%
rename from
proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminQueryBackendHandlerTest.java
rename to
proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminQueryProxyBackendHandlerTest.java
index dbe6a2ef79d..a96dd65ff9c 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminQueryBackendHandlerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminQueryProxyBackendHandlerTest.java
@@ -57,11 +57,11 @@ import static org.mockito.Mockito.when;
@ExtendWith(AutoMockExtension.class)
@StaticMockSettings(ProxyContext.class)
-class DatabaseAdminQueryBackendHandlerTest {
+class DatabaseAdminQueryProxyBackendHandlerTest {
private final DatabaseType databaseType =
TypedSPILoader.getService(DatabaseType.class, "FIXTURE");
- private DatabaseAdminQueryBackendHandler handler;
+ private DatabaseAdminQueryProxyBackendHandler handler;
@BeforeEach
void before() throws SQLException {
@@ -70,7 +70,7 @@ class DatabaseAdminQueryBackendHandlerTest {
DatabaseAdminQueryExecutor executor =
mock(DatabaseAdminQueryExecutor.class, RETURNS_DEEP_STUBS);
when(executor.getMergedResult()).thenReturn(new
LocalDataMergedResult(Collections.singleton(new LocalDataQueryResultRow("ds_0",
"ds_1"))));
when(executor.getQueryResultMetaData().getColumnCount()).thenReturn(1);
- handler = new DatabaseAdminQueryBackendHandler(connectionSession,
executor);
+ handler = new DatabaseAdminQueryProxyBackendHandler(connectionSession,
executor);
}
@Test
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/data/impl/UnicastDatabaseProxyBackendHandlerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/data/impl/UnicastDatabaseProxyBackendHandlerTest.java
index 8aba36ae932..d5efef590bc 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/data/impl/UnicastDatabaseProxyBackendHandlerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/data/impl/UnicastDatabaseProxyBackendHandlerTest.java
@@ -93,7 +93,7 @@ class UnicastDatabaseProxyBackendHandlerTest {
when(sqlStatementContext.getTablesContext().getDatabaseNames()).thenReturn(Collections.emptyList());
unicastDatabaseProxyBackendHandler = new
UnicastDatabaseProxyBackendHandler(
new QueryContext(sqlStatementContext, EXECUTE_SQL,
Collections.emptyList(), new HintValueContext(), mockConnectionContext(),
mock()), connectionSession);
- setBackendHandlerFactory(unicastDatabaseProxyBackendHandler);
+ setProxyBackendHandlerFactory(unicastDatabaseProxyBackendHandler);
}
private ConnectionContext mockConnectionContext() {
@@ -108,7 +108,7 @@ class UnicastDatabaseProxyBackendHandlerTest {
}
@SneakyThrows(ReflectiveOperationException.class)
- private void setBackendHandlerFactory(final DatabaseProxyBackendHandler
databaseProxyBackendHandler) {
+ private void setProxyBackendHandlerFactory(final
DatabaseProxyBackendHandler databaseProxyBackendHandler) {
Plugins.getMemberAccessor().set(databaseProxyBackendHandler.getClass().getDeclaredField("databaseProxyConnectorFactory"),
databaseProxyBackendHandler, databaseProxyConnectorFactory);
}
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactoryTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateProxyBackendHandlerFactoryTest.java
similarity index 85%
rename from
proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactoryTest.java
rename to
proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateProxyBackendHandlerFactoryTest.java
index 14be77e5f30..7d87502a085 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactoryTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateProxyBackendHandlerFactoryTest.java
@@ -64,7 +64,7 @@ import static org.mockito.Mockito.when;
@ExtendWith(AutoMockExtension.class)
@StaticMockSettings(ProxyContext.class)
@MockitoSettings(strictness = Strictness.LENIENT)
-class DatabaseOperateBackendHandlerFactoryTest {
+class DatabaseOperateProxyBackendHandlerFactoryTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private ContextManager contextManager;
@@ -93,7 +93,7 @@ class DatabaseOperateBackendHandlerFactoryTest {
CreateDatabaseStatement sqlStatement =
mock(CreateDatabaseStatement.class);
when(sqlStatement.getDatabaseName()).thenReturn("new_db");
setGovernanceMetaDataContexts(true);
- ResponseHeader response =
DatabaseOperateBackendHandlerFactory.newInstance(sqlStatement,
connectionSession).execute();
+ ResponseHeader response =
DatabaseOperateProxyBackendHandlerFactory.newInstance(sqlStatement,
connectionSession).execute();
assertThat(response, isA(UpdateResponseHeader.class));
}
@@ -102,7 +102,7 @@ class DatabaseOperateBackendHandlerFactoryTest {
DropDatabaseStatement sqlStatement = mock(DropDatabaseStatement.class);
when(sqlStatement.getDatabaseName()).thenReturn("foo_db");
setGovernanceMetaDataContexts(true);
- ResponseHeader response =
DatabaseOperateBackendHandlerFactory.newInstance(sqlStatement,
connectionSession).execute();
+ ResponseHeader response =
DatabaseOperateProxyBackendHandlerFactory.newInstance(sqlStatement,
connectionSession).execute();
assertThat(response, isA(UpdateResponseHeader.class));
}
@@ -112,7 +112,7 @@ class DatabaseOperateBackendHandlerFactoryTest {
when(sqlStatement.getDatabaseName()).thenReturn("foo_db");
setGovernanceMetaDataContexts(true);
try {
- DatabaseOperateBackendHandlerFactory.newInstance(sqlStatement,
connectionSession);
+
DatabaseOperateProxyBackendHandlerFactory.newInstance(sqlStatement,
connectionSession);
} catch (final DatabaseCreateExistsException ex) {
assertNull(ex.getMessage());
}
@@ -138,17 +138,17 @@ class DatabaseOperateBackendHandlerFactoryTest {
}
@Test
- void
assertDatabaseOperateBackendHandlerFactoryReturnCreateDatabaseProxyBackendHandler()
{
-
assertThat(DatabaseOperateBackendHandlerFactory.newInstance(mock(CreateDatabaseStatement.class),
mock(ConnectionSession.class)), isA(CreateDatabaseProxyBackendHandler.class));
+ void
assertDatabaseOperateProxyBackendHandlerFactoryReturnCreateDatabaseProxyBackendHandler()
{
+
assertThat(DatabaseOperateProxyBackendHandlerFactory.newInstance(mock(CreateDatabaseStatement.class),
mock(ConnectionSession.class)), isA(CreateDatabaseProxyBackendHandler.class));
}
@Test
- void
assertDatabaseOperateBackendHandlerFactoryReturnDropDatabaseProxyBackendHandler()
{
-
assertThat(DatabaseOperateBackendHandlerFactory.newInstance(mock(DropDatabaseStatement.class),
mock(ConnectionSession.class)), isA(DropDatabaseProxyBackendHandler.class));
+ void
assertDatabaseOperateProxyBackendHandlerFactoryReturnDropDatabaseProxyBackendHandler()
{
+
assertThat(DatabaseOperateProxyBackendHandlerFactory.newInstance(mock(DropDatabaseStatement.class),
mock(ConnectionSession.class)), isA(DropDatabaseProxyBackendHandler.class));
}
@Test
- void
assertDatabaseOperateBackendHandlerFactoryThrowUnsupportedOperationException() {
- assertThrows(UnsupportedSQLOperationException.class, () ->
DatabaseOperateBackendHandlerFactory.newInstance(mock(AlterDatabaseStatement.class),
mock(ConnectionSession.class)));
+ void
assertDatabaseOperateProxyBackendHandlerFactoryThrowUnsupportedOperationException()
{
+ assertThrows(UnsupportedSQLOperationException.class, () ->
DatabaseOperateProxyBackendHandlerFactory.newInstance(mock(AlterDatabaseStatement.class),
mock(ConnectionSession.class)));
}
}
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLProxyBackendHandlerFactoryTest.java
similarity index 84%
rename from
proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java
rename to
proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLProxyBackendHandlerFactoryTest.java
index 906067aa644..efd4b3af0a0 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLProxyBackendHandlerFactoryTest.java
@@ -76,7 +76,7 @@ import static org.mockito.Mockito.when;
@ExtendWith(AutoMockExtension.class)
@StaticMockSettings(ProxyContext.class)
@MockitoSettings(strictness = Strictness.LENIENT)
-class DistSQLBackendHandlerFactoryTest {
+class DistSQLProxyBackendHandlerFactoryTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private ConnectionSession connectionSession;
@@ -117,7 +117,7 @@ class DistSQLBackendHandlerFactoryTest {
void assertExecuteDataSourcesContext() throws SQLException {
RegisterStorageUnitStatement sqlStatement =
mock(RegisterStorageUnitStatement.class);
when(sqlStatement.getAttributes()).thenReturn(new
SQLStatementAttributes());
- assertThat(new DistSQLUpdateBackendHandler(sqlStatement,
connectionSession).execute(), isA(UpdateResponseHeader.class));
+ assertThat(new DistSQLUpdateProxyBackendHandler(sqlStatement,
connectionSession).execute(), isA(UpdateResponseHeader.class));
}
@Test
@@ -125,21 +125,21 @@ class DistSQLBackendHandlerFactoryTest {
when(ProxyContext.getInstance().getContextManager().getDatabase("foo_db").getRuleMetaData()).thenReturn(new
RuleMetaData(Collections.emptyList()));
CreateShardingTableRuleStatement sqlStatement =
mock(CreateShardingTableRuleStatement.class);
when(sqlStatement.getAttributes()).thenReturn(new
SQLStatementAttributes());
- assertThat(new DistSQLUpdateBackendHandler(sqlStatement,
connectionSession).execute(), isA(UpdateResponseHeader.class));
+ assertThat(new DistSQLUpdateProxyBackendHandler(sqlStatement,
connectionSession).execute(), isA(UpdateResponseHeader.class));
}
@Test
void assertExecuteAddResourceContext() throws SQLException {
RegisterStorageUnitStatement sqlStatement =
mock(RegisterStorageUnitStatement.class);
when(sqlStatement.getAttributes()).thenReturn(new
SQLStatementAttributes());
- assertThat(new DistSQLUpdateBackendHandler(sqlStatement,
connectionSession).execute(), isA(UpdateResponseHeader.class));
+ assertThat(new DistSQLUpdateProxyBackendHandler(sqlStatement,
connectionSession).execute(), isA(UpdateResponseHeader.class));
}
@Test
void assertExecuteAlterResourceContext() throws SQLException {
AlterStorageUnitStatement sqlStatement =
mock(AlterStorageUnitStatement.class);
when(sqlStatement.getAttributes()).thenReturn(new
SQLStatementAttributes());
- assertThat(new DistSQLUpdateBackendHandler(sqlStatement,
connectionSession).execute(), isA(UpdateResponseHeader.class));
+ assertThat(new DistSQLUpdateProxyBackendHandler(sqlStatement,
connectionSession).execute(), isA(UpdateResponseHeader.class));
}
@Test
@@ -147,7 +147,7 @@ class DistSQLBackendHandlerFactoryTest {
mockRuleMetaData();
AlterShadowRuleStatement sqlStatement =
mock(AlterShadowRuleStatement.class);
when(sqlStatement.getAttributes()).thenReturn(new
SQLStatementAttributes());
- assertThat(new DistSQLUpdateBackendHandler(sqlStatement,
connectionSession).execute(), isA(UpdateResponseHeader.class));
+ assertThat(new DistSQLUpdateProxyBackendHandler(sqlStatement,
connectionSession).execute(), isA(UpdateResponseHeader.class));
}
@Test
@@ -155,7 +155,7 @@ class DistSQLBackendHandlerFactoryTest {
mockRuleMetaData();
CreateShadowRuleStatement sqlStatement =
mock(CreateShadowRuleStatement.class);
when(sqlStatement.getAttributes()).thenReturn(new
SQLStatementAttributes());
- assertThat(new DistSQLUpdateBackendHandler(sqlStatement,
connectionSession).execute(), isA(UpdateResponseHeader.class));
+ assertThat(new DistSQLUpdateProxyBackendHandler(sqlStatement,
connectionSession).execute(), isA(UpdateResponseHeader.class));
}
@Test
@@ -163,7 +163,7 @@ class DistSQLBackendHandlerFactoryTest {
mockRuleMetaData();
DropShadowRuleStatement sqlStatement =
mock(DropShadowRuleStatement.class);
when(sqlStatement.getAttributes()).thenReturn(new
SQLStatementAttributes());
- assertThat(new DistSQLUpdateBackendHandler(sqlStatement,
connectionSession).execute(), isA(UpdateResponseHeader.class));
+ assertThat(new DistSQLUpdateProxyBackendHandler(sqlStatement,
connectionSession).execute(), isA(UpdateResponseHeader.class));
}
@Test
@@ -171,13 +171,13 @@ class DistSQLBackendHandlerFactoryTest {
mockRuleMetaData();
AlterDefaultShadowAlgorithmStatement statement = new
AlterDefaultShadowAlgorithmStatement(
new ShadowAlgorithmSegment("foo", new
AlgorithmSegment("SQL_HINT", PropertiesBuilder.build(new Property("type",
"value")))));
- assertThat(new DistSQLUpdateBackendHandler(statement,
connectionSession).execute(), isA(UpdateResponseHeader.class));
+ assertThat(new DistSQLUpdateProxyBackendHandler(statement,
connectionSession).execute(), isA(UpdateResponseHeader.class));
}
@Test
void assertExecuteShowShadowRulesContext() throws SQLException {
mockRuleMetaData();
- assertThat(new
DistSQLQueryBackendHandler(mock(ShowShadowRulesStatement.class,
RETURNS_DEEP_STUBS), connectionSession).execute(),
isA(QueryResponseHeader.class));
+ assertThat(new
DistSQLQueryProxyBackendHandler(mock(ShowShadowRulesStatement.class,
RETURNS_DEEP_STUBS), connectionSession).execute(),
isA(QueryResponseHeader.class));
}
@Test
@@ -185,7 +185,7 @@ class DistSQLBackendHandlerFactoryTest {
mockRuleMetaData();
ShowShadowTableRulesStatement sqlStatement =
mock(ShowShadowTableRulesStatement.class);
when(sqlStatement.getAttributes()).thenReturn(new
SQLStatementAttributes());
- assertThat(new DistSQLQueryBackendHandler(sqlStatement,
connectionSession).execute(), isA(QueryResponseHeader.class));
+ assertThat(new DistSQLQueryProxyBackendHandler(sqlStatement,
connectionSession).execute(), isA(QueryResponseHeader.class));
}
@Test
@@ -193,7 +193,7 @@ class DistSQLBackendHandlerFactoryTest {
mockRuleMetaData();
ShowShadowAlgorithmsStatement sqlStatement =
mock(ShowShadowAlgorithmsStatement.class);
when(sqlStatement.getAttributes()).thenReturn(new
SQLStatementAttributes());
- assertThat(new DistSQLQueryBackendHandler(sqlStatement,
connectionSession).execute(), isA(QueryResponseHeader.class));
+ assertThat(new DistSQLQueryProxyBackendHandler(sqlStatement,
connectionSession).execute(), isA(QueryResponseHeader.class));
}
@Test
@@ -201,31 +201,31 @@ class DistSQLBackendHandlerFactoryTest {
mockRuleMetaData();
DropShadowAlgorithmStatement sqlStatement =
mock(DropShadowAlgorithmStatement.class);
when(sqlStatement.getAttributes()).thenReturn(new
SQLStatementAttributes());
- assertThat(new DistSQLUpdateBackendHandler(sqlStatement,
connectionSession).execute(), isA(UpdateResponseHeader.class));
+ assertThat(new DistSQLUpdateProxyBackendHandler(sqlStatement,
connectionSession).execute(), isA(UpdateResponseHeader.class));
}
@Test
void assertExecuteDropResourceContext() throws SQLException {
UnregisterStorageUnitStatement sqlStatement =
mock(UnregisterStorageUnitStatement.class);
when(sqlStatement.getAttributes()).thenReturn(new
SQLStatementAttributes());
- assertThat(new DistSQLUpdateBackendHandler(sqlStatement,
connectionSession).execute(), isA(UpdateResponseHeader.class));
+ assertThat(new DistSQLUpdateProxyBackendHandler(sqlStatement,
connectionSession).execute(), isA(UpdateResponseHeader.class));
}
@Test
void assertExecuteDropReadwriteSplittingRuleContext() {
- assertThrows(MissingRequiredRuleException.class, () -> new
DistSQLUpdateBackendHandler(mock(DropReadwriteSplittingRuleStatement.class,
RETURNS_DEEP_STUBS), connectionSession).execute());
+ assertThrows(MissingRequiredRuleException.class, () -> new
DistSQLUpdateProxyBackendHandler(mock(DropReadwriteSplittingRuleStatement.class,
RETURNS_DEEP_STUBS), connectionSession).execute());
}
@Test
void assertExecuteCreateReadwriteSplittingRuleContext() throws
SQLException {
CreateReadwriteSplittingRuleStatement sqlStatement =
mock(CreateReadwriteSplittingRuleStatement.class);
when(sqlStatement.getAttributes()).thenReturn(new
SQLStatementAttributes());
- assertThat(new DistSQLUpdateBackendHandler(sqlStatement,
connectionSession).execute(), isA(UpdateResponseHeader.class));
+ assertThat(new DistSQLUpdateProxyBackendHandler(sqlStatement,
connectionSession).execute(), isA(UpdateResponseHeader.class));
}
@Test
void assertExecuteAlterReadwriteSplittingRuleContext() {
- assertThrows(MissingRequiredRuleException.class, () -> new
DistSQLUpdateBackendHandler(mock(AlterReadwriteSplittingRuleStatement.class,
RETURNS_DEEP_STUBS), connectionSession).execute());
+ assertThrows(MissingRequiredRuleException.class, () -> new
DistSQLUpdateProxyBackendHandler(mock(AlterReadwriteSplittingRuleStatement.class,
RETURNS_DEEP_STUBS), connectionSession).execute());
}
private void mockRuleMetaData() {
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLQueryBackendHandlerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLQueryProxyBackendHandlerTest.java
similarity index 89%
rename from
proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLQueryBackendHandlerTest.java
rename to
proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLQueryProxyBackendHandlerTest.java
index 3508dcadbb7..14c4ab071f3 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLQueryBackendHandlerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLQueryProxyBackendHandlerTest.java
@@ -58,14 +58,14 @@ import static org.mockito.Mockito.when;
@ExtendWith(AutoMockExtension.class)
@StaticMockSettings(ProxyContext.class)
-class DistSQLQueryBackendHandlerTest {
+class DistSQLQueryProxyBackendHandlerTest {
private final DatabaseType databaseType =
TypedSPILoader.getService(DatabaseType.class, "FIXTURE");
@Test
void assertExecuteWithNoDatabase() {
assertThrows(NoDatabaseSelectedException.class,
- () -> new
DistSQLQueryBackendHandler(mock(ExportDatabaseConfigurationStatement.class,
RETURNS_DEEP_STUBS), mock(ConnectionSession.class,
RETURNS_DEEP_STUBS)).execute());
+ () -> new
DistSQLQueryProxyBackendHandler(mock(ExportDatabaseConfigurationStatement.class,
RETURNS_DEEP_STUBS), mock(ConnectionSession.class,
RETURNS_DEEP_STUBS)).execute());
}
@Test
@@ -78,13 +78,13 @@ class DistSQLQueryBackendHandlerTest {
when(computeNodeInstanceContext.getModeConfiguration()).thenReturn(mock(ModeConfiguration.class));
ContextManager contextManager = new ContextManager(metaDataContexts,
computeNodeInstanceContext, mock(), mock(PersistRepository.class));
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
- assertThrows(UnknownDatabaseException.class, () -> new
DistSQLQueryBackendHandler(mock(ExportDatabaseConfigurationStatement.class,
RETURNS_DEEP_STUBS), connectionSession).execute());
+ assertThrows(UnknownDatabaseException.class, () -> new
DistSQLQueryProxyBackendHandler(mock(ExportDatabaseConfigurationStatement.class,
RETURNS_DEEP_STUBS), connectionSession).execute());
}
@Test
void assertExecuteWithAbstractStatement() {
assertThrows(ServiceProviderNotFoundException.class,
- () -> new
DistSQLQueryBackendHandler(mock(QueryableRALStatement.class,
RETURNS_DEEP_STUBS), mock(ConnectionSession.class,
RETURNS_DEEP_STUBS)).execute());
+ () -> new
DistSQLQueryProxyBackendHandler(mock(QueryableRALStatement.class,
RETURNS_DEEP_STUBS), mock(ConnectionSession.class,
RETURNS_DEEP_STUBS)).execute());
}
@Test
@@ -92,7 +92,7 @@ class DistSQLQueryBackendHandlerTest {
ShardingSphereDatabase database = new ShardingSphereDatabase(
"foo_db", databaseType, mock(), mock(),
Collections.singleton(new ShardingSphereSchema("foo_db", createTables(),
Collections.emptyList())));
when(ProxyContext.getInstance().getContextManager().getDatabase("foo_db")).thenReturn(database);
- assertDoesNotThrow(() -> new
DistSQLQueryBackendHandler(createSqlStatement(), mock(ConnectionSession.class,
RETURNS_DEEP_STUBS)).execute());
+ assertDoesNotThrow(() -> new
DistSQLQueryProxyBackendHandler(createSqlStatement(),
mock(ConnectionSession.class, RETURNS_DEEP_STUBS)).execute());
}
private Collection<ShardingSphereTable> createTables() {
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLUpdateBackendHandlerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLUpdateProxyBackendHandlerTest.java
similarity index 87%
rename from
proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLUpdateBackendHandlerTest.java
rename to
proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLUpdateProxyBackendHandlerTest.java
index 25450ddeab2..c17f9a08c31 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLUpdateBackendHandlerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLUpdateProxyBackendHandlerTest.java
@@ -53,7 +53,7 @@ import static org.mockito.Mockito.when;
@ExtendWith(AutoMockExtension.class)
@StaticMockSettings(ProxyContext.class)
-class DistSQLUpdateBackendHandlerTest {
+class DistSQLUpdateProxyBackendHandlerTest {
private final DatabaseType databaseType =
TypedSPILoader.getService(DatabaseType.class, "FIXTURE");
@@ -68,7 +68,7 @@ class DistSQLUpdateBackendHandlerTest {
@Test
void assertEmptyStorageUnit() {
when(contextManager.getDatabase("foo_db")).thenReturn(new
ShardingSphereDatabase("foo_db", databaseType, mock(), mock(),
Collections.emptyList()));
- DistSQLUpdateBackendHandler backendHandler = new
DistSQLUpdateBackendHandler(new RefreshTableMetaDataStatement(),
mockConnectionSession("foo_db"));
+ DistSQLUpdateProxyBackendHandler backendHandler = new
DistSQLUpdateProxyBackendHandler(new RefreshTableMetaDataStatement(),
mockConnectionSession("foo_db"));
assertThrows(EmptyStorageUnitException.class, backendHandler::execute);
}
@@ -77,7 +77,7 @@ class DistSQLUpdateBackendHandlerTest {
ResourceMetaData resourceMetaData = mock(ResourceMetaData.class);
when(resourceMetaData.getStorageUnits()).thenReturn(Collections.singletonMap("ds_0",
mock(StorageUnit.class)));
when(contextManager.getDatabase("foo_db")).thenReturn(new
ShardingSphereDatabase("foo_db", databaseType, resourceMetaData, mock(),
Collections.emptyList()));
- DistSQLUpdateBackendHandler backendHandler = new
DistSQLUpdateBackendHandler(new RefreshTableMetaDataStatement("t_order",
"ds_1", null), mockConnectionSession("foo_db"));
+ DistSQLUpdateProxyBackendHandler backendHandler = new
DistSQLUpdateProxyBackendHandler(new RefreshTableMetaDataStatement("t_order",
"ds_1", null), mockConnectionSession("foo_db"));
assertThrows(MissingRequiredStorageUnitsException.class,
backendHandler::execute);
}
@@ -86,7 +86,7 @@ class DistSQLUpdateBackendHandlerTest {
ResourceMetaData resourceMetaData = mock(ResourceMetaData.class);
when(resourceMetaData.getStorageUnits()).thenReturn(Collections.singletonMap("ds_0",
mock(StorageUnit.class)));
when(contextManager.getDatabase("foo_db")).thenReturn(new
ShardingSphereDatabase("foo_db", databaseType, resourceMetaData, mock(),
Collections.emptyList()));
- DistSQLUpdateBackendHandler backendHandler = new
DistSQLUpdateBackendHandler(new RefreshTableMetaDataStatement("t_order",
"ds_0", "bar_db"), mockConnectionSession("foo_db"));
+ DistSQLUpdateProxyBackendHandler backendHandler = new
DistSQLUpdateProxyBackendHandler(new RefreshTableMetaDataStatement("t_order",
"ds_0", "bar_db"), mockConnectionSession("foo_db"));
assertThrows(SchemaNotFoundException.class, backendHandler::execute);
}
@@ -100,7 +100,7 @@ class DistSQLUpdateBackendHandlerTest {
when(database.getSchema("foo_db")).thenReturn(schema);
when(database.getResourceMetaData()).thenReturn(resourceMetaData);
when(contextManager.getDatabase("foo_db")).thenReturn(database);
- DistSQLUpdateBackendHandler backendHandler = new
DistSQLUpdateBackendHandler(new RefreshTableMetaDataStatement("t_order",
"ds_0", "foo_db"), mockConnectionSession("foo_db"));
+ DistSQLUpdateProxyBackendHandler backendHandler = new
DistSQLUpdateProxyBackendHandler(new RefreshTableMetaDataStatement("t_order",
"ds_0", "foo_db"), mockConnectionSession("foo_db"));
assertThrows(TableNotFoundException.class, backendHandler::execute);
}
@@ -113,7 +113,7 @@ class DistSQLUpdateBackendHandlerTest {
when(database.getProtocolType()).thenReturn(databaseType);
when(database.getResourceMetaData()).thenReturn(resourceMetaData);
when(contextManager.getDatabase("foo_db")).thenReturn(database);
- ResponseHeader actual = new DistSQLUpdateBackendHandler(new
RefreshTableMetaDataStatement(), mockConnectionSession("foo_db")).execute();
+ ResponseHeader actual = new DistSQLUpdateProxyBackendHandler(new
RefreshTableMetaDataStatement(), mockConnectionSession("foo_db")).execute();
assertThat(actual, isA(UpdateResponseHeader.class));
}
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/variable/SetDistVariableUpdatableRALBackendHandlerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/variable/SetDistVariableUpdatableRALProxyBackendHandlerTest.java
similarity index 90%
rename from
proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/variable/SetDistVariableUpdatableRALBackendHandlerTest.java
rename to
proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/variable/SetDistVariableUpdatableRALProxyBackendHandlerTest.java
index c014a4c45bf..8125b86d784 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/variable/SetDistVariableUpdatableRALBackendHandlerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/variable/SetDistVariableUpdatableRALProxyBackendHandlerTest.java
@@ -21,7 +21,7 @@ import io.netty.util.DefaultAttributeMap;
import
org.apache.shardingsphere.distsql.statement.type.ral.updatable.SetDistVariableStatement;
import
org.apache.shardingsphere.infra.exception.kernel.syntax.UnsupportedVariableException;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import
org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.test.infra.framework.mock.AutoMockExtension;
import org.apache.shardingsphere.test.infra.framework.mock.StaticMockSettings;
@@ -36,7 +36,7 @@ import static org.mockito.Mockito.when;
@ExtendWith(AutoMockExtension.class)
@StaticMockSettings(ProxyContext.class)
-class SetDistVariableUpdatableRALBackendHandlerTest {
+class SetDistVariableUpdatableRALProxyBackendHandlerTest {
private ConnectionSession connectionSession;
@@ -48,7 +48,7 @@ class SetDistVariableUpdatableRALBackendHandlerTest {
@Test
void assertNotSupportedVariable() {
- DistSQLUpdateBackendHandler handler = new
DistSQLUpdateBackendHandler(new SetDistVariableStatement("unsupported", "XXX"),
connectionSession);
+ DistSQLUpdateProxyBackendHandler handler = new
DistSQLUpdateProxyBackendHandler(new SetDistVariableStatement("unsupported",
"XXX"), connectionSession);
assertThrows(UnsupportedVariableException.class, handler::execute);
}
}
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/ParseDistSQLExecutorTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/ParseDistSQLExecutorTest.java
index 5e52ead7942..a06d7813435 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/ParseDistSQLExecutorTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/ParseDistSQLExecutorTest.java
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
import
org.apache.shardingsphere.parser.rule.builder.DefaultSQLParserRuleConfigurationBuilder;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import
org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLQueryBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLQueryProxyBackendHandler;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement;
import org.apache.shardingsphere.test.infra.framework.mock.AutoMockExtension;
@@ -69,7 +69,7 @@ class ParseDistSQLExecutorTest {
void assertGetRowDataForMySQL() throws SQLException {
String sql = "SELECT * FROM t_order";
when(connectionSession.getProtocolType()).thenReturn(TypedSPILoader.getService(DatabaseType.class,
"MySQL"));
- DistSQLQueryBackendHandler handler = new
DistSQLQueryBackendHandler(new ParseStatement(sql), connectionSession);
+ DistSQLQueryProxyBackendHandler handler = new
DistSQLQueryProxyBackendHandler(new ParseStatement(sql), connectionSession);
handler.execute();
handler.next();
SQLStatement sqlStatement =
sqlParserRule.getSQLParserEngine(TypedSPILoader.getService(DatabaseType.class,
"MySQL")).parse(sql, false);
@@ -81,7 +81,7 @@ class ParseDistSQLExecutorTest {
void assertGetRowDataForPostgreSQL() throws SQLException {
String sql = "SELECT * FROM t_order";
when(connectionSession.getProtocolType()).thenReturn(TypedSPILoader.getService(DatabaseType.class,
"PostgreSQL"));
- DistSQLQueryBackendHandler handler = new
DistSQLQueryBackendHandler(new ParseStatement(sql), connectionSession);
+ DistSQLQueryProxyBackendHandler handler = new
DistSQLQueryProxyBackendHandler(new ParseStatement(sql), connectionSession);
handler.execute();
handler.next();
SQLStatement sqlStatement =
sqlParserRule.getSQLParserEngine(TypedSPILoader.getService(DatabaseType.class,
"PostgreSQL")).parse(sql, false);
@@ -92,7 +92,7 @@ class ParseDistSQLExecutorTest {
void assertExecute() {
String sql = "wrong sql";
when(connectionSession.getProtocolType()).thenReturn(TypedSPILoader.getService(DatabaseType.class,
"MySQL"));
- DistSQLQueryBackendHandler handler = new
DistSQLQueryBackendHandler(new ParseStatement(sql), connectionSession);
+ DistSQLQueryProxyBackendHandler handler = new
DistSQLQueryProxyBackendHandler(new ParseStatement(sql), connectionSession);
assertThrows(DialectSQLParsingException.class, handler::execute);
}
}
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/skip/SkipBackendHandlerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/skip/SkipProxyBackendHandlerTest.java
similarity index 83%
rename from
proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/skip/SkipBackendHandlerTest.java
rename to
proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/skip/SkipProxyBackendHandlerTest.java
index 0f9760f07af..3e009750220 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/skip/SkipBackendHandlerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/skip/SkipProxyBackendHandlerTest.java
@@ -24,12 +24,12 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.isA;
-class SkipBackendHandlerTest {
+class SkipProxyBackendHandlerTest {
@Test
- void assertExecuteSkipBackendHandler() {
- SkipBackendHandler skipBackendHandler = new SkipBackendHandler(null);
- ResponseHeader actual = skipBackendHandler.execute();
+ void assertExecuteSkipProxyBackendHandler() {
+ SkipProxyBackendHandler skipProxyBackendHandler = new
SkipProxyBackendHandler(null);
+ ResponseHeader actual = skipProxyBackendHandler.execute();
assertThat(actual, isA(UpdateResponseHeader.class));
}
}
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/TCLProxyBackendHandlerFactoryTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/TCLProxyBackendHandlerFactoryTest.java
index a51cb27a3bc..7f48f22c459 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/TCLProxyBackendHandlerFactoryTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/TCLProxyBackendHandlerFactoryTest.java
@@ -66,7 +66,7 @@ class TCLProxyBackendHandlerFactoryTest {
private final DatabaseType databaseType =
TypedSPILoader.getService(DatabaseType.class, "FIXTURE");
@Test
- void
assertTCLBackendHandlerReturnedWhenTCLStatementInstanceOfCommitStatement() {
+ void
assertTCLProxyBackendHandlerReturnedWhenTCLStatementInstanceOfCommitStatement()
{
ConnectionSession connectionSession = mock(ConnectionSession.class,
Answers.RETURNS_DEEP_STUBS);
ProxyDatabaseConnectionManager databaseConnectionManager =
mock(ProxyDatabaseConnectionManager.class);
when(connectionSession.getDatabaseConnectionManager()).thenReturn(databaseConnectionManager);
@@ -84,7 +84,7 @@ class TCLProxyBackendHandlerFactoryTest {
}
@Test
- void
assertTCLBackendHandlerReturnedWhenTCLStatementInstanceOfRollbackStatement() {
+ void
assertTCLProxyBackendHandlerReturnedWhenTCLStatementInstanceOfRollbackStatement()
{
ConnectionSession connectionSession = mock(ConnectionSession.class,
Answers.RETURNS_DEEP_STUBS);
ProxyDatabaseConnectionManager databaseConnectionManager =
mock(ProxyDatabaseConnectionManager.class);
when(connectionSession.getDatabaseConnectionManager()).thenReturn(databaseConnectionManager);
@@ -109,7 +109,7 @@ class TCLProxyBackendHandlerFactoryTest {
}
@Test
- void assertBroadcastBackendHandlerReturnedWhenTCLStatementNotHit() {
+ void assertBroadcastProxyBackendHandlerReturnedWhenTCLStatementNotHit() {
SQLStatementContext sqlStatementContext =
mock(SQLStatementContext.class, RETURNS_DEEP_STUBS);
when(sqlStatementContext.getTablesContext().getDatabaseNames()).thenReturn(Collections.emptyList());
when(sqlStatementContext.getSqlStatement()).thenReturn(mock(TCLStatement.class));
diff --git
a/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/UseDatabaseExecutorTest.java
b/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/UseDatabaseExecutorTest.java
index 6aa8244e14f..c6a16a0ba2a 100644
---
a/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/UseDatabaseExecutorTest.java
+++
b/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/UseDatabaseExecutorTest.java
@@ -60,7 +60,7 @@ class UseDatabaseExecutorTest {
private ConnectionSession connectionSession;
@Test
- void assertExecuteUseStatementBackendHandler() {
+ void assertExecuteUseStatementProxyBackendHandler() {
MySQLUseStatement useStatement = mock(MySQLUseStatement.class);
when(useStatement.getDatabase()).thenReturn(String.format(DATABASE_PATTERN, 0));
ContextManager contextManager = mockContextManager();
@@ -73,7 +73,7 @@ class UseDatabaseExecutorTest {
}
@Test
- void assertExecuteUseStatementBackendHandlerWhenSchemaNotExist() {
+ void assertExecuteUseStatementProxyBackendHandlerWhenSchemaNotExist() {
MySQLUseStatement useStatement = mock(MySQLUseStatement.class);
when(useStatement.getDatabase()).thenReturn(String.format(DATABASE_PATTERN,
10));
UseDatabaseExecutor executor = new UseDatabaseExecutor(useStatement);
diff --git
a/proxy/frontend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutor.java
b/proxy/frontend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutor.java
index 49d1ebf11ea..cf91cbabb82 100644
---
a/proxy/frontend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutor.java
+++
b/proxy/frontend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutor.java
@@ -66,7 +66,7 @@ public final class MySQLComQueryPacketExecutor implements
QueryCommandExecutor {
DatabaseType databaseType =
TypedSPILoader.getService(DatabaseType.class, "MySQL");
SQLStatement sqlStatement =
ProxySQLComQueryParser.parse(packet.getSQL(), databaseType, connectionSession);
proxyBackendHandler = areMultiStatements(connectionSession,
sqlStatement, packet.getSQL())
- ? new MySQLMultiStatementsHandler(connectionSession,
sqlStatement, packet.getSQL())
+ ? new
MySQLMultiStatementsProxyBackendHandler(connectionSession, sqlStatement,
packet.getSQL())
: ProxyBackendHandlerFactory.newInstance(databaseType,
packet.getSQL(), sqlStatement, connectionSession, packet.getHintValueContext());
characterSet =
connectionSession.getAttributeMap().attr(MySQLConstants.CHARACTER_SET_ATTRIBUTE_KEY).get().getId();
}
diff --git
a/proxy/frontend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsHandler.java
b/proxy/frontend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsProxyBackendHandler.java
similarity index 97%
rename from
proxy/frontend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsHandler.java
rename to
proxy/frontend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsProxyBackendHandler.java
index 1e6b0707ab8..c1a6c20856b 100644
---
a/proxy/frontend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsHandler.java
+++
b/proxy/frontend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsProxyBackendHandler.java
@@ -69,9 +69,9 @@ import java.util.List;
import java.util.regex.Pattern;
/**
- * Handler for MySQL multi statements.
+ * MySQL multi-statements proxy backend handler.
*/
-public final class MySQLMultiStatementsHandler implements ProxyBackendHandler {
+public final class MySQLMultiStatementsProxyBackendHandler implements
ProxyBackendHandler {
private static final Pattern MULTI_INSERT_STATEMENTS =
Pattern.compile(";(?=\\s*insert)", Pattern.CASE_INSENSITIVE);
@@ -91,7 +91,7 @@ public final class MySQLMultiStatementsHandler implements
ProxyBackendHandler {
private final BatchPreparedStatementExecutor batchExecutor;
- public MySQLMultiStatementsHandler(final ConnectionSession
connectionSession, final SQLStatement sqlStatementSample, final String sql) {
+ public MySQLMultiStatementsProxyBackendHandler(final ConnectionSession
connectionSession, final SQLStatement sqlStatementSample, final String sql) {
connectionSession.getDatabaseConnectionManager().handleAutoCommit();
this.connectionSession = connectionSession;
this.sqlStatementSample = sqlStatementSample;
diff --git
a/proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsHandlerTest.java
b/proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsProxyBackendHandlerTest.java
similarity index 96%
rename from
proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsHandlerTest.java
rename to
proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsProxyBackendHandlerTest.java
index ee91711e83f..260af69b4f4 100644
---
a/proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsHandlerTest.java
+++
b/proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsProxyBackendHandlerTest.java
@@ -69,7 +69,7 @@ import static org.mockito.Mockito.when;
@ExtendWith(AutoMockExtension.class)
@StaticMockSettings(ProxyContext.class)
@MockitoSettings(strictness = Strictness.LENIENT)
-class MySQLMultiStatementsHandlerTest {
+class MySQLMultiStatementsProxyBackendHandlerTest {
@Test
void assertExecute() throws SQLException {
@@ -78,7 +78,7 @@ class MySQLMultiStatementsHandlerTest {
UpdateStatement expectedStatement = mock(UpdateStatement.class);
ContextManager contextManager = mockContextManager();
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
- ResponseHeader actual = new
MySQLMultiStatementsHandler(connectionSession, expectedStatement,
sql).execute();
+ ResponseHeader actual = new
MySQLMultiStatementsProxyBackendHandler(connectionSession, expectedStatement,
sql).execute();
assertThat(actual, isA(MultiStatementsUpdateResponseHeader.class));
MultiStatementsUpdateResponseHeader actualHeader =
(MultiStatementsUpdateResponseHeader) actual;
assertThat(actualHeader.getUpdateResponseHeaders().size(), is(3));
@@ -104,7 +104,7 @@ class MySQLMultiStatementsHandlerTest {
UpdateStatement expectedStatement = mock(UpdateStatement.class);
ContextManager contextManager = mockContextManager();
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
- ResponseHeader actual = new
MySQLMultiStatementsHandler(connectionSession, expectedStatement,
sql).execute();
+ ResponseHeader actual = new
MySQLMultiStatementsProxyBackendHandler(connectionSession, expectedStatement,
sql).execute();
assertThat(actual, isA(MultiStatementsUpdateResponseHeader.class));
MultiStatementsUpdateResponseHeader actualHeader =
(MultiStatementsUpdateResponseHeader) actual;
assertThat(actualHeader.getUpdateResponseHeaders().size(), is(3));
@@ -132,7 +132,7 @@ class MySQLMultiStatementsHandlerTest {
UpdateStatement expectedStatement = mock(UpdateStatement.class);
ContextManager contextManager = mockContextManager();
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
- ResponseHeader actual = new
MySQLMultiStatementsHandler(connectionSession, expectedStatement,
sql).execute();
+ ResponseHeader actual = new
MySQLMultiStatementsProxyBackendHandler(connectionSession, expectedStatement,
sql).execute();
assertThat(actual, isA(MultiStatementsUpdateResponseHeader.class));
MultiStatementsUpdateResponseHeader actualHeader =
(MultiStatementsUpdateResponseHeader) actual;
assertThat(actualHeader.getUpdateResponseHeaders().size(), is(3));
