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 fdbc8f70274 Rename databaseConnector to databaseProxyConnector (#36801)
fdbc8f70274 is described below
commit fdbc8f7027438d69b3c035b7c1fbb79054c4014b
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Oct 7 11:32:05 2025 +0800
Rename databaseConnector to databaseProxyConnector (#36801)
---
.../reachability-metadata.json | 12 +++++------
.../connector/AdvancedProxySQLExecutor.java | 4 ++--
.../proxy/backend/connector/ProxySQLExecutor.java | 4 ++--
.../connector/jdbc/executor/ProxyJDBCExecutor.java | 6 +++---
.../callback/ProxyJDBCExecutorCallback.java | 10 ++++-----
.../callback/ProxyJDBCExecutorCallbackFactory.java | 8 ++++----
.../ProxyPreparedStatementExecutorCallback.java | 4 ++--
.../impl/ProxyStatementExecutorCallback.java | 4 ++--
.../impl/UnicastDatabaseProxyBackendHandler.java | 14 ++++++-------
.../tcl/xa/XATCLProxyBackendHandlerFactory.java | 12 +++++------
.../tcl/xa/type/XABeginProxyBackendHandler.java | 4 ++--
.../tcl/xa/type/XACommitProxyBackendHandler.java | 4 ++--
.../type/XAOtherOperationProxyBackendHandler.java | 4 ++--
.../tcl/xa/type/XARecoveryProxyBackendHandler.java | 8 ++++----
.../tcl/xa/type/XARollbackProxyBackendHandler.java | 4 ++--
.../DatabaseProxyConnectorFactoryTest.java | 4 ++--
.../ProxyDatabaseConnectionManagerTest.java | 24 +++++++++++-----------
...ava => StandardDatabaseProxyConnectorTest.java} | 14 ++++++-------
.../UnicastDatabaseProxyBackendHandlerTest.java | 10 ++++-----
.../executor/UnicastResourceShowExecutor.java | 12 +++++------
.../fieldlist/MySQLComFieldListPacketExecutor.java | 14 ++++++-------
21 files changed, 90 insertions(+), 90 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 10ac7bcb7fd..17e4954046e 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
@@ -554,7 +554,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.connector.StandardDatabaseConnector"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.connector.StandardDatabaseProxyConnector"
},
"type": "java.lang.Object"
},
@@ -4910,7 +4910,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.connector.StandardDatabaseConnector"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.connector.StandardDatabaseProxyConnector"
},
"type":
"org.apache.shardingsphere.infra.yaml.schema.pojo.YamlShardingSphereTable"
},
@@ -5732,7 +5732,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.connector.StandardDatabaseConnector"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.connector.StandardDatabaseProxyConnector"
},
"type":
"org.apache.shardingsphere.mode.node.path.type.database.metadata.DatabaseMetaDataNodePath"
},
@@ -6151,7 +6151,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.connector.StandardDatabaseConnector"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.connector.StandardDatabaseProxyConnector"
},
"type":
"org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.SchemaMetaDataNodePath"
},
@@ -6267,7 +6267,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.connector.StandardDatabaseConnector"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.connector.StandardDatabaseProxyConnector"
},
"type":
"org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.TableMetaDataNodePath"
},
@@ -11044,7 +11044,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.connector.StandardDatabaseConnector"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.connector.StandardDatabaseProxyConnector"
},
"type":
"org.apache.shardingsphere.transaction.base.seata.at.SeataTransactionalSQLExecutionHook"
},
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/AdvancedProxySQLExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/AdvancedProxySQLExecutor.java
index 8b0555dd353..c02f47e1729 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/AdvancedProxySQLExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/AdvancedProxySQLExecutor.java
@@ -39,9 +39,9 @@ public interface AdvancedProxySQLExecutor extends
ShardingSphereSPI {
* @param executionContext execution context
* @param contextManager context manager
* @param database database
- * @param databaseConnector database connector
+ * @param databaseProxyConnector database proxy connector
* @return execute result
* @throws SQLException SQL exception
*/
- List<ExecuteResult> execute(ExecutionContext executionContext,
ContextManager contextManager, ShardingSphereDatabase database,
DatabaseProxyConnector databaseConnector) throws SQLException;
+ List<ExecuteResult> execute(ExecutionContext executionContext,
ContextManager contextManager, ShardingSphereDatabase database,
DatabaseProxyConnector databaseProxyConnector) throws SQLException;
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutor.java
index d17e3fa2fa4..8397be1fb8e 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutor.java
@@ -101,13 +101,13 @@ public final class ProxySQLExecutor {
TransactionHook.class,
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getRules());
public ProxySQLExecutor(final String type,
- final ProxyDatabaseConnectionManager
databaseConnectionManager, final DatabaseProxyConnector databaseConnector,
final SQLStatementContext sqlStatementContext) {
+ final ProxyDatabaseConnectionManager
databaseConnectionManager, final DatabaseProxyConnector databaseProxyConnector,
final SQLStatementContext sqlStatementContext) {
this.type = type;
this.databaseConnectionManager = databaseConnectionManager;
ExecutorEngine executorEngine =
BackendExecutorContext.getInstance().getExecutorEngine();
ConnectionContext connectionContext =
databaseConnectionManager.getConnectionSession().getConnectionContext();
JDBCExecutor jdbcExecutor = new JDBCExecutor(executorEngine,
connectionContext);
- regularExecutor = new ProxyJDBCExecutor(type,
databaseConnectionManager.getConnectionSession(), databaseConnector,
jdbcExecutor);
+ regularExecutor = new ProxyJDBCExecutor(type,
databaseConnectionManager.getConnectionSession(), databaseProxyConnector,
jdbcExecutor);
rawExecutor = new RawExecutor(executorEngine, connectionContext);
MetaDataContexts metaDataContexts =
ProxyContext.getInstance().getContextManager().getMetaDataContexts();
String currentDatabaseName =
Strings.isNullOrEmpty(databaseConnectionManager.getConnectionSession().getCurrentDatabaseName())
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/ProxyJDBCExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/ProxyJDBCExecutor.java
index 4d85f0e8873..81ddf2a6731 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/ProxyJDBCExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/ProxyJDBCExecutor.java
@@ -46,7 +46,7 @@ public final class ProxyJDBCExecutor {
private final ConnectionSession connectionSession;
- private final DatabaseProxyConnector databaseConnector;
+ private final DatabaseProxyConnector databaseProxyConnector;
private final JDBCExecutor jdbcExecutor;
@@ -71,10 +71,10 @@ public final class ProxyJDBCExecutor {
processEngine.executeSQL(executionGroupContext, queryContext);
SQLStatementContext context =
queryContext.getSqlStatementContext();
return jdbcExecutor.execute(executionGroupContext,
- ProxyJDBCExecutorCallbackFactory.newInstance(type,
protocolType, database.getResourceMetaData(), context.getSqlStatement(),
databaseConnector, isReturnGeneratedKeys,
+ ProxyJDBCExecutorCallbackFactory.newInstance(type,
protocolType, database.getResourceMetaData(), context.getSqlStatement(),
databaseProxyConnector, isReturnGeneratedKeys,
isExceptionThrown,
true),
- ProxyJDBCExecutorCallbackFactory.newInstance(type,
protocolType, database.getResourceMetaData(), context.getSqlStatement(),
databaseConnector, isReturnGeneratedKeys,
+ ProxyJDBCExecutorCallbackFactory.newInstance(type,
protocolType, database.getResourceMetaData(), context.getSqlStatement(),
databaseProxyConnector, isReturnGeneratedKeys,
isExceptionThrown,
false));
} finally {
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/callback/ProxyJDBCExecutorCallback.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/callback/ProxyJDBCExecutorCallback.java
index 1eae9eac395..9064986b933 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/callback/ProxyJDBCExecutorCallback.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/callback/ProxyJDBCExecutorCallback.java
@@ -46,7 +46,7 @@ import java.util.Optional;
*/
public abstract class ProxyJDBCExecutorCallback extends
JDBCExecutorCallback<ExecuteResult> {
- private final DatabaseProxyConnector databaseConnector;
+ private final DatabaseProxyConnector databaseProxyConnector;
private final boolean isReturnGeneratedKeys;
@@ -55,10 +55,10 @@ public abstract class ProxyJDBCExecutorCallback extends
JDBCExecutorCallback<Exe
private boolean hasMetaData;
protected ProxyJDBCExecutorCallback(final DatabaseType protocolType, final
ResourceMetaData resourceMetaData, final SQLStatement sqlStatement,
- final DatabaseProxyConnector
databaseConnector,
+ final DatabaseProxyConnector
databaseProxyConnector,
final boolean isReturnGeneratedKeys,
final boolean isExceptionThrown, final boolean fetchMetaData) {
super(protocolType, resourceMetaData, sqlStatement, isExceptionThrown);
- this.databaseConnector = databaseConnector;
+ this.databaseProxyConnector = databaseProxyConnector;
this.isReturnGeneratedKeys = isReturnGeneratedKeys;
this.fetchMetaData = fetchMetaData;
}
@@ -66,10 +66,10 @@ public abstract class ProxyJDBCExecutorCallback extends
JDBCExecutorCallback<Exe
@Override
public ExecuteResult executeSQL(final String sql, final Statement
statement, final ConnectionMode connectionMode, final DatabaseType storageType)
throws SQLException {
hasMetaData = fetchMetaData && !hasMetaData;
- databaseConnector.add(statement);
+ databaseProxyConnector.add(statement);
if (execute(sql, statement, isReturnGeneratedKeys)) {
ResultSet resultSet = statement.getResultSet();
- databaseConnector.add(resultSet);
+ databaseProxyConnector.add(resultSet);
return createQueryResult(resultSet, connectionMode, storageType);
}
return new UpdateResult(Math.max(statement.getUpdateCount(), 0),
isReturnGeneratedKeys ? getGeneratedKey(statement) : 0L);
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/callback/ProxyJDBCExecutorCallbackFactory.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/callback/ProxyJDBCExecutorCallbackFactory.java
index c56a9c1a1b2..22e27056df1 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/callback/ProxyJDBCExecutorCallbackFactory.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/callback/ProxyJDBCExecutorCallbackFactory.java
@@ -41,7 +41,7 @@ public final class ProxyJDBCExecutorCallbackFactory {
* @param protocolType protocol type
* @param resourceMetaData resource meta data
* @param sqlStatement SQL statement
- * @param databaseConnector database connector
+ * @param databaseProxyConnector database proxy connector
* @param isReturnGeneratedKeys is return generated keys or not
* @param isExceptionThrown is exception thrown or not
* @param isFetchMetaData is fetch meta data or not
@@ -49,13 +49,13 @@ public final class ProxyJDBCExecutorCallbackFactory {
* @throws UnsupportedSQLOperationException unsupported SQL operation
exception
*/
public static ProxyJDBCExecutorCallback newInstance(final String type,
final DatabaseType protocolType, final ResourceMetaData resourceMetaData, final
SQLStatement sqlStatement,
- final
DatabaseProxyConnector databaseConnector, final boolean isReturnGeneratedKeys,
final boolean isExceptionThrown,
+ final
DatabaseProxyConnector databaseProxyConnector, final boolean
isReturnGeneratedKeys, final boolean isExceptionThrown,
final boolean
isFetchMetaData) {
if (JDBCDriverType.STATEMENT.equals(type)) {
- return new ProxyStatementExecutorCallback(protocolType,
resourceMetaData, sqlStatement, databaseConnector, isReturnGeneratedKeys,
isExceptionThrown, isFetchMetaData);
+ return new ProxyStatementExecutorCallback(protocolType,
resourceMetaData, sqlStatement, databaseProxyConnector, isReturnGeneratedKeys,
isExceptionThrown, isFetchMetaData);
}
if (JDBCDriverType.PREPARED_STATEMENT.equals(type)) {
- return new ProxyPreparedStatementExecutorCallback(protocolType,
resourceMetaData, sqlStatement, databaseConnector, isReturnGeneratedKeys,
isExceptionThrown, isFetchMetaData);
+ return new ProxyPreparedStatementExecutorCallback(protocolType,
resourceMetaData, sqlStatement, databaseProxyConnector, isReturnGeneratedKeys,
isExceptionThrown, isFetchMetaData);
}
throw new UnsupportedSQLOperationException(String.format("Unsupported
driver type: `%s`", type));
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/callback/impl/ProxyPreparedStatementExecutorCallback.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/callback/impl/ProxyPreparedStatementExecutorCallback.java
index cf2a528bd6c..7a8e88c99ed 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/callback/impl/ProxyPreparedStatementExecutorCallback.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/callback/impl/ProxyPreparedStatementExecutorCallback.java
@@ -33,9 +33,9 @@ import java.sql.Statement;
public final class ProxyPreparedStatementExecutorCallback extends
ProxyJDBCExecutorCallback {
public ProxyPreparedStatementExecutorCallback(final DatabaseType
protocolType, final ResourceMetaData resourceMetaData, final SQLStatement
sqlStatement,
- final DatabaseProxyConnector
databaseConnector, final boolean isReturnGeneratedKeys,
+ final DatabaseProxyConnector
databaseProxyConnector, final boolean isReturnGeneratedKeys,
final boolean
isExceptionThrown, final boolean fetchMetaData) {
- super(protocolType, resourceMetaData, sqlStatement, databaseConnector,
isReturnGeneratedKeys, isExceptionThrown, fetchMetaData);
+ super(protocolType, resourceMetaData, sqlStatement,
databaseProxyConnector, isReturnGeneratedKeys, isExceptionThrown,
fetchMetaData);
}
@Override
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/callback/impl/ProxyStatementExecutorCallback.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/callback/impl/ProxyStatementExecutorCallback.java
index fe6576932c2..d8afe58d59d 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/callback/impl/ProxyStatementExecutorCallback.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/callback/impl/ProxyStatementExecutorCallback.java
@@ -33,9 +33,9 @@ import java.sql.Statement;
public final class ProxyStatementExecutorCallback extends
ProxyJDBCExecutorCallback {
public ProxyStatementExecutorCallback(final DatabaseType protocolType,
final ResourceMetaData resourceMetaData, final SQLStatement sqlStatement,
- final DatabaseProxyConnector
databaseConnector, final boolean isReturnGeneratedKeys,
+ final DatabaseProxyConnector
databaseProxyConnector, final boolean isReturnGeneratedKeys,
final boolean isExceptionThrown,
final boolean fetchMetaData) {
- super(protocolType, resourceMetaData, sqlStatement, databaseConnector,
isReturnGeneratedKeys, isExceptionThrown, fetchMetaData);
+ super(protocolType, resourceMetaData, sqlStatement,
databaseProxyConnector, isReturnGeneratedKeys, isExceptionThrown,
fetchMetaData);
}
@Override
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/data/impl/UnicastDatabaseProxyBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/data/impl/UnicastDatabaseProxyBackendHandler.java
index ff7aaf932c4..e04b6a1bb12 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/data/impl/UnicastDatabaseProxyBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/data/impl/UnicastDatabaseProxyBackendHandler.java
@@ -49,7 +49,7 @@ public final class UnicastDatabaseProxyBackendHandler
implements DatabaseProxyBa
private final ConnectionSession connectionSession;
- private DatabaseProxyConnector databaseConnector;
+ private DatabaseProxyConnector databaseProxyConnector;
@Override
public ResponseHeader execute() throws SQLException {
@@ -59,8 +59,8 @@ public final class UnicastDatabaseProxyBackendHandler
implements DatabaseProxyBa
() -> new EmptyStorageUnitException(unicastDatabaseName));
try {
connectionSession.setCurrentDatabaseName(unicastDatabaseName);
- databaseConnector =
databaseProxyConnectorFactory.newInstance(queryContext,
connectionSession.getDatabaseConnectionManager(), false);
- return databaseConnector.execute();
+ databaseProxyConnector =
databaseProxyConnectorFactory.newInstance(queryContext,
connectionSession.getDatabaseConnectionManager(), false);
+ return databaseProxyConnector.execute();
} finally {
connectionSession.setCurrentDatabaseName(originalDatabaseName);
}
@@ -81,18 +81,18 @@ public final class UnicastDatabaseProxyBackendHandler
implements DatabaseProxyBa
@Override
public boolean next() throws SQLException {
- return databaseConnector.next();
+ return databaseProxyConnector.next();
}
@Override
public QueryResponseRow getRowData() throws SQLException {
- return databaseConnector.getRowData();
+ return databaseProxyConnector.getRowData();
}
@Override
public void close() throws SQLException {
- if (null != databaseConnector) {
- databaseConnector.close();
+ if (null != databaseProxyConnector) {
+ databaseProxyConnector.close();
}
}
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/xa/XATCLProxyBackendHandlerFactory.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/xa/XATCLProxyBackendHandlerFactory.java
index 6093e4cc5d6..8b13b4f7353 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/xa/XATCLProxyBackendHandlerFactory.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/xa/XATCLProxyBackendHandlerFactory.java
@@ -50,19 +50,19 @@ public final class XATCLProxyBackendHandlerFactory {
*/
public static ProxyBackendHandler newInstance(final QueryContext
queryContext, final ConnectionSession connectionSession) {
XAStatement sqlStatement = (XAStatement)
queryContext.getSqlStatementContext().getSqlStatement();
- DatabaseProxyConnector databaseConnector =
DatabaseProxyConnectorFactory.getInstance().newInstance(queryContext,
connectionSession.getDatabaseConnectionManager(), false);
+ DatabaseProxyConnector databaseProxyConnector =
DatabaseProxyConnectorFactory.getInstance().newInstance(queryContext,
connectionSession.getDatabaseConnectionManager(), false);
if (sqlStatement instanceof XARecoveryStatement) {
- return new XARecoveryProxyBackendHandler(databaseConnector);
+ return new XARecoveryProxyBackendHandler(databaseProxyConnector);
}
if (sqlStatement instanceof XABeginStatement) {
- return new XABeginProxyBackendHandler(connectionSession,
databaseConnector);
+ return new XABeginProxyBackendHandler(connectionSession,
databaseProxyConnector);
}
if (sqlStatement instanceof XACommitStatement) {
- return new XACommitProxyBackendHandler(connectionSession,
databaseConnector);
+ return new XACommitProxyBackendHandler(connectionSession,
databaseProxyConnector);
}
if (sqlStatement instanceof XARollbackStatement) {
- return new XARollbackProxyBackendHandler(connectionSession,
databaseConnector);
+ return new XARollbackProxyBackendHandler(connectionSession,
databaseProxyConnector);
}
- return new XAOtherOperationProxyBackendHandler(databaseConnector);
+ return new XAOtherOperationProxyBackendHandler(databaseProxyConnector);
}
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/xa/type/XABeginProxyBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/xa/type/XABeginProxyBackendHandler.java
index 9b47166c088..e7af8b2ea15 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/xa/type/XABeginProxyBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/xa/type/XABeginProxyBackendHandler.java
@@ -39,7 +39,7 @@ public final class XABeginProxyBackendHandler implements
ProxyBackendHandler {
private final ConnectionSession connectionSession;
- private final DatabaseProxyConnector databaseConnector;
+ private final DatabaseProxyConnector databaseProxyConnector;
/*
* We have to let session occupy the thread when doing xa transaction.
According to https://dev.mysql.com/doc/refman/5.7/en/xa-states.html XA and
local transactions are mutually exclusive.
@@ -47,7 +47,7 @@ public final class XABeginProxyBackendHandler implements
ProxyBackendHandler {
@Override
public ResponseHeader execute() throws SQLException {
ShardingSpherePreconditions.checkState(!connectionSession.getTransactionStatus().isInTransaction(),
XATransactionNestedBeginException::new);
- ResponseHeader result = databaseConnector.execute();
+ ResponseHeader result = databaseProxyConnector.execute();
TransactionRule transactionRule =
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(TransactionRule.class);
ShardingSphereTransactionManagerEngine engine =
transactionRule.getResource();
connectionSession.getConnectionContext().getTransactionContext().beginTransaction(transactionRule.getDefaultType().name(),
engine.getTransactionManager(transactionRule.getDefaultType()));
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/xa/type/XACommitProxyBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/xa/type/XACommitProxyBackendHandler.java
index c02200932cd..40bf87742e9 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/xa/type/XACommitProxyBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/xa/type/XACommitProxyBackendHandler.java
@@ -33,12 +33,12 @@ public final class XACommitProxyBackendHandler implements
ProxyBackendHandler {
private final ConnectionSession connectionSession;
- private final DatabaseProxyConnector databaseConnector;
+ private final DatabaseProxyConnector databaseProxyConnector;
@Override
public ResponseHeader execute() throws SQLException {
try {
- return databaseConnector.execute();
+ return databaseProxyConnector.execute();
} finally {
connectionSession.getConnectionContext().clearTransactionContext();
connectionSession.getConnectionContext().clearCursorContext();
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/xa/type/XAOtherOperationProxyBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/xa/type/XAOtherOperationProxyBackendHandler.java
index 3647f27ed66..2025a1521cc 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/xa/type/XAOtherOperationProxyBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/xa/type/XAOtherOperationProxyBackendHandler.java
@@ -30,10 +30,10 @@ import java.sql.SQLException;
@RequiredArgsConstructor
public final class XAOtherOperationProxyBackendHandler implements
ProxyBackendHandler {
- private final DatabaseProxyConnector databaseConnector;
+ private final DatabaseProxyConnector databaseProxyConnector;
@Override
public ResponseHeader execute() throws SQLException {
- return databaseConnector.execute();
+ return databaseProxyConnector.execute();
}
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/xa/type/XARecoveryProxyBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/xa/type/XARecoveryProxyBackendHandler.java
index 4140859f298..e1d73c48cd1 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/xa/type/XARecoveryProxyBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/xa/type/XARecoveryProxyBackendHandler.java
@@ -31,20 +31,20 @@ import java.sql.SQLException;
@RequiredArgsConstructor
public final class XARecoveryProxyBackendHandler implements
ProxyBackendHandler {
- private final DatabaseProxyConnector databaseConnector;
+ private final DatabaseProxyConnector databaseProxyConnector;
@Override
public boolean next() throws SQLException {
- return databaseConnector.next();
+ return databaseProxyConnector.next();
}
@Override
public QueryResponseRow getRowData() throws SQLException {
- return databaseConnector.getRowData();
+ return databaseProxyConnector.getRowData();
}
@Override
public ResponseHeader execute() throws SQLException {
- return databaseConnector.execute();
+ return databaseProxyConnector.execute();
}
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/xa/type/XARollbackProxyBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/xa/type/XARollbackProxyBackendHandler.java
index f7fe88781e7..fae63ab6e28 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/xa/type/XARollbackProxyBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/xa/type/XARollbackProxyBackendHandler.java
@@ -33,12 +33,12 @@ public final class XARollbackProxyBackendHandler implements
ProxyBackendHandler
private final ConnectionSession connectionSession;
- private final DatabaseProxyConnector databaseConnector;
+ private final DatabaseProxyConnector databaseProxyConnector;
@Override
public ResponseHeader execute() throws SQLException {
try {
- return databaseConnector.execute();
+ return databaseProxyConnector.execute();
} finally {
connectionSession.getConnectionContext().clearTransactionContext();
connectionSession.getConnectionContext().clearCursorContext();
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseProxyConnectorFactoryTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseProxyConnectorFactoryTest.java
index 54cb0822745..3035ae0b4f0 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseProxyConnectorFactoryTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseProxyConnectorFactoryTest.java
@@ -55,7 +55,7 @@ class DatabaseProxyConnectorFactoryTest {
private final DatabaseType databaseType =
TypedSPILoader.getService(DatabaseType.class, "FIXTURE");
@Test
- void assertNewDatabaseConnectorWithoutParameter() {
+ void assertNewDatabaseProxyConnectorWithoutParameter() {
ProxyDatabaseConnectionManager databaseConnectionManager =
mock(ProxyDatabaseConnectionManager.class, RETURNS_DEEP_STUBS);
when(databaseConnectionManager.getConnectionSession().getUsedDatabaseName()).thenReturn("foo_db");
SQLStatementContext sqlStatementContext =
mock(SQLStatementContext.class, RETURNS_DEEP_STUBS);
@@ -79,7 +79,7 @@ class DatabaseProxyConnectorFactoryTest {
}
@Test
- void assertNewDatabaseConnectorWithParameters() {
+ void assertNewDatabaseProxyConnectorWithParameters() {
ProxyDatabaseConnectionManager databaseConnectionManager =
mock(ProxyDatabaseConnectionManager.class, RETURNS_DEEP_STUBS);
when(databaseConnectionManager.getConnectionSession().getUsedDatabaseName()).thenReturn("foo_db");
SQLStatementContext sqlStatementContext =
mock(SQLStatementContext.class, RETURNS_DEEP_STUBS);
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 889b2a60eab..225eb23b6a3 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
@@ -322,7 +322,7 @@ class ProxyDatabaseConnectionManagerTest {
}
@Test
- void assertAddDatabaseConnector() {
+ void assertAddDatabaseProxyConnector() {
ProxyBackendHandler expectedEngine =
mock(DatabaseProxyConnector.class);
databaseConnectionManager.add(expectedEngine);
Collection<ProxyBackendHandler> actual = getBackendHandlers();
@@ -331,7 +331,7 @@ class ProxyDatabaseConnectionManagerTest {
}
@Test
- void assertMarkDatabaseConnectorInUse() {
+ void assertMarkDatabaseProxyConnectorInUse() {
ProxyBackendHandler expectedEngine =
mock(DatabaseProxyConnector.class);
databaseConnectionManager.add(expectedEngine);
databaseConnectionManager.markResourceInUse(expectedEngine);
@@ -341,7 +341,7 @@ class ProxyDatabaseConnectionManagerTest {
}
@Test
- void assertUnmarkInUseDatabaseConnector() {
+ void assertUnmarkInUseDatabaseProxyConnector() {
ProxyBackendHandler engine = mock(DatabaseProxyConnector.class);
Collection<ProxyBackendHandler> actual = getInUseBackendHandlers();
actual.add(engine);
@@ -355,21 +355,21 @@ class ProxyDatabaseConnectionManagerTest {
ProxyBackendHandler inUseEngine = mock(DatabaseProxyConnector.class);
SQLException expectedException = mock(SQLException.class);
doThrow(expectedException).when(engine).close();
- Collection<ProxyBackendHandler> databaseConnectors =
getBackendHandlers();
- Collection<ProxyBackendHandler> inUseDatabaseConnectors =
getInUseBackendHandlers();
- databaseConnectors.add(engine);
- databaseConnectors.add(inUseEngine);
- inUseDatabaseConnectors.add(inUseEngine);
+ Collection<ProxyBackendHandler> backendHandlers = getBackendHandlers();
+ Collection<ProxyBackendHandler> inUseBackendHandlers =
getInUseBackendHandlers();
+ backendHandlers.add(engine);
+ backendHandlers.add(inUseEngine);
+ inUseBackendHandlers.add(inUseEngine);
Collection<SQLException> actual =
databaseConnectionManager.closeHandlers(false);
assertThat(actual.size(), is(1));
assertThat(actual.iterator().next(), is(expectedException));
- assertThat(inUseDatabaseConnectors.size(), is(1));
- assertThat(databaseConnectors.size(), is(1));
+ assertThat(inUseBackendHandlers.size(), is(1));
+ assertThat(backendHandlers.size(), is(1));
verify(engine).close();
databaseConnectionManager.closeHandlers(true);
verify(inUseEngine).close();
- assertTrue(databaseConnectors.isEmpty());
- assertTrue(inUseDatabaseConnectors.isEmpty());
+ assertTrue(backendHandlers.isEmpty());
+ assertTrue(inUseBackendHandlers.isEmpty());
}
@Test
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/StandardDatabaseConnectorTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/StandardDatabaseProxyConnectorTest.java
similarity index 94%
rename from
proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/StandardDatabaseConnectorTest.java
rename to
proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/StandardDatabaseProxyConnectorTest.java
index 945a33184cd..fab74e89fbf 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/StandardDatabaseConnectorTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/StandardDatabaseProxyConnectorTest.java
@@ -93,7 +93,7 @@ import static org.mockito.Mockito.when;
@ExtendWith(AutoMockExtension.class)
@MockitoSettings(strictness = Strictness.LENIENT)
@StaticMockSettings({ProxyContext.class, SystemSchemaUtils.class})
-class StandardDatabaseConnectorTest {
+class StandardDatabaseProxyConnectorTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private ProxyDatabaseConnectionManager databaseConnectionManager;
@@ -140,7 +140,7 @@ class StandardDatabaseConnectorTest {
SQLStatementContext sqlStatementContext =
mock(SQLStatementContext.class, RETURNS_DEEP_STUBS);
when(sqlStatementContext.getTablesContext().getDatabaseNames()).thenReturn(Collections.emptyList());
when(sqlStatementContext.getSqlStatement().getDatabaseType()).thenReturn(TypedSPILoader.getService(DatabaseType.class,
"FIXTURE"));
- DatabaseProxyConnector engine =
createDatabaseConnector(JDBCDriverType.PREPARED_STATEMENT,
createQueryContext(sqlStatementContext));
+ DatabaseProxyConnector engine =
createDatabaseProxyConnector(JDBCDriverType.PREPARED_STATEMENT,
createQueryContext(sqlStatementContext));
Field queryHeadersField =
StandardDatabaseProxyConnector.class.getDeclaredField("queryHeaders");
ShardingSphereDatabase database = createDatabaseMetaData();
try (MockedStatic<DatabaseTypedSPILoader> spiLoader =
mockStatic(DatabaseTypedSPILoader.class)) {
@@ -167,7 +167,7 @@ class StandardDatabaseConnectorTest {
}
}
- private DatabaseProxyConnector createDatabaseConnector(final String
driverType, final QueryContext queryContext) {
+ private DatabaseProxyConnector createDatabaseProxyConnector(final String
driverType, final QueryContext queryContext) {
DatabaseProxyConnector result = new
StandardDatabaseProxyConnector(driverType, queryContext,
databaseConnectionManager);
databaseConnectionManager.add(result);
return result;
@@ -204,7 +204,7 @@ class StandardDatabaseConnectorTest {
SQLStatementContext sqlStatementContext =
mock(SQLStatementContext.class, RETURNS_DEEP_STUBS);
when(sqlStatementContext.getTablesContext().getDatabaseNames()).thenReturn(Collections.emptyList());
when(sqlStatementContext.getSqlStatement().getDatabaseType()).thenReturn(TypedSPILoader.getService(DatabaseType.class,
"FIXTURE"));
- DatabaseProxyConnector engine =
createDatabaseConnector(JDBCDriverType.STATEMENT,
createQueryContext(sqlStatementContext));
+ DatabaseProxyConnector engine =
createDatabaseProxyConnector(JDBCDriverType.STATEMENT,
createQueryContext(sqlStatementContext));
engine.add(statement);
Collection<?> actual = getField(engine, "cachedStatements");
assertThat(actual.size(), is(1));
@@ -216,7 +216,7 @@ class StandardDatabaseConnectorTest {
SQLStatementContext sqlStatementContext =
mock(SQLStatementContext.class, RETURNS_DEEP_STUBS);
when(sqlStatementContext.getTablesContext().getDatabaseNames()).thenReturn(Collections.emptyList());
when(sqlStatementContext.getSqlStatement().getDatabaseType()).thenReturn(TypedSPILoader.getService(DatabaseType.class,
"FIXTURE"));
- DatabaseProxyConnector engine =
createDatabaseConnector(JDBCDriverType.STATEMENT,
createQueryContext(sqlStatementContext));
+ DatabaseProxyConnector engine =
createDatabaseProxyConnector(JDBCDriverType.STATEMENT,
createQueryContext(sqlStatementContext));
engine.add(resultSet);
Collection<?> actual = getField(engine, "cachedResultSets");
assertThat(actual.size(), is(1));
@@ -228,7 +228,7 @@ class StandardDatabaseConnectorTest {
SQLStatementContext sqlStatementContext =
mock(SQLStatementContext.class, RETURNS_DEEP_STUBS);
when(sqlStatementContext.getTablesContext().getDatabaseNames()).thenReturn(Collections.emptyList());
when(sqlStatementContext.getSqlStatement().getDatabaseType()).thenReturn(TypedSPILoader.getService(DatabaseType.class,
"FIXTURE"));
- DatabaseProxyConnector engine =
createDatabaseConnector(JDBCDriverType.STATEMENT,
createQueryContext(sqlStatementContext));
+ DatabaseProxyConnector engine =
createDatabaseProxyConnector(JDBCDriverType.STATEMENT,
createQueryContext(sqlStatementContext));
Collection<ResultSet> cachedResultSets = getField(engine,
"cachedResultSets");
cachedResultSets.add(resultSet);
Collection<Statement> cachedStatements = getField(engine,
"cachedStatements");
@@ -246,7 +246,7 @@ class StandardDatabaseConnectorTest {
SQLStatementContext sqlStatementContext =
mock(SQLStatementContext.class, RETURNS_DEEP_STUBS);
when(sqlStatementContext.getTablesContext().getDatabaseNames()).thenReturn(Collections.emptyList());
when(sqlStatementContext.getSqlStatement().getDatabaseType()).thenReturn(TypedSPILoader.getService(DatabaseType.class,
"FIXTURE"));
- DatabaseProxyConnector engine =
createDatabaseConnector(JDBCDriverType.STATEMENT,
createQueryContext(sqlStatementContext));
+ DatabaseProxyConnector engine =
createDatabaseProxyConnector(JDBCDriverType.STATEMENT,
createQueryContext(sqlStatementContext));
Collection<ResultSet> cachedResultSets = getField(engine,
"cachedResultSets");
SQLException sqlExceptionByResultSet = new SQLException("ResultSet");
doThrow(sqlExceptionByResultSet).when(resultSet).close();
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 c0e99b5136c..257c9fda8d2 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
@@ -83,12 +83,12 @@ class UnicastDatabaseProxyBackendHandlerTest {
private DatabaseProxyConnectorFactory databaseProxyConnectorFactory;
@Mock
- private DatabaseProxyConnector databaseConnector;
+ private DatabaseProxyConnector databaseProxyConnector;
@BeforeEach
void setUp() throws SQLException {
when(connectionSession.getCurrentDatabaseName()).thenReturn(String.format(DATABASE_PATTERN,
0));
- mockDatabaseConnector(new UpdateResponseHeader(mock()));
+ mockDatabaseProxyConnector(new UpdateResponseHeader(mock()));
SQLStatementContext sqlStatementContext =
mock(SQLStatementContext.class, RETURNS_DEEP_STUBS);
when(sqlStatementContext.getTablesContext().getDatabaseNames()).thenReturn(Collections.emptyList());
unicastDatabaseBackendHandler = new UnicastDatabaseProxyBackendHandler(
@@ -102,9 +102,9 @@ class UnicastDatabaseProxyBackendHandlerTest {
return result;
}
- private void mockDatabaseConnector(final ResponseHeader responseHeader)
throws SQLException {
- when(databaseConnector.execute()).thenReturn(responseHeader);
-
when(databaseProxyConnectorFactory.newInstance(any(QueryContext.class),
any(ProxyDatabaseConnectionManager.class),
eq(false))).thenReturn(databaseConnector);
+ private void mockDatabaseProxyConnector(final ResponseHeader
responseHeader) throws SQLException {
+ when(databaseProxyConnector.execute()).thenReturn(responseHeader);
+
when(databaseProxyConnectorFactory.newInstance(any(QueryContext.class),
any(ProxyDatabaseConnectionManager.class),
eq(false))).thenReturn(databaseProxyConnector);
}
@SneakyThrows(ReflectiveOperationException.class)
diff --git
a/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/UnicastResourceShowExecutor.java
b/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/UnicastResourceShowExecutor.java
index 73c47cc7934..0c39366ad82 100644
---
a/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/UnicastResourceShowExecutor.java
+++
b/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/UnicastResourceShowExecutor.java
@@ -67,7 +67,7 @@ public final class UnicastResourceShowExecutor implements
DatabaseAdminQueryExec
private final String sql;
- private DatabaseProxyConnector databaseConnector;
+ private DatabaseProxyConnector databaseProxyConnector;
private ResponseHeader responseHeader;
@@ -84,13 +84,13 @@ public final class UnicastResourceShowExecutor implements
DatabaseAdminQueryExec
connectionSession.setCurrentDatabaseName(databaseName);
ShardingSphereMetaData metaData =
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData();
SQLStatementContext sqlStatementContext = new
SQLBindEngine(metaData, connectionSession.getCurrentDatabaseName(),
hintValueContext).bind(sqlStatement);
- databaseConnector = databaseProxyConnectorFactory.newInstance(new
QueryContext(
+ databaseProxyConnector =
databaseProxyConnectorFactory.newInstance(new QueryContext(
sqlStatementContext, sql, Collections.emptyList(),
hintValueContext, connectionSession.getConnectionContext(), metaData),
connectionSession.getDatabaseConnectionManager(), false);
- responseHeader = databaseConnector.execute();
+ responseHeader = databaseProxyConnector.execute();
mergedResult = new TransparentMergedResult(createQueryResult());
} finally {
connectionSession.setCurrentDatabaseName(originDatabase);
- databaseConnector.close();
+ databaseProxyConnector.close();
}
}
@@ -114,8 +114,8 @@ public final class UnicastResourceShowExecutor implements
DatabaseAdminQueryExec
private QueryResult createQueryResult() throws SQLException {
List<MemoryQueryResultDataRow> rows = new LinkedList<>();
- while (databaseConnector.next()) {
- List<Object> data = databaseConnector.getRowData().getData();
+ while (databaseProxyConnector.next()) {
+ List<Object> data = databaseProxyConnector.getRowData().getData();
rows.add(new MemoryQueryResultDataRow(data));
}
return new RawMemoryQueryResult(getQueryResultMetaData(), rows);
diff --git
a/proxy/frontend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/fieldlist/MySQLComFieldListPacketExecutor.java
b/proxy/frontend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/fieldlist/MySQLComFieldListPacketExecutor.java
index 788a6d1003b..67b09e8ae82 100644
---
a/proxy/frontend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/fieldlist/MySQLComFieldListPacketExecutor.java
+++
b/proxy/frontend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/fieldlist/MySQLComFieldListPacketExecutor.java
@@ -61,7 +61,7 @@ public final class MySQLComFieldListPacketExecutor implements
CommandExecutor {
private final ConnectionSession connectionSession;
- private DatabaseProxyConnector databaseConnector;
+ private DatabaseProxyConnector databaseProxyConnector;
@Override
public Collection<DatabasePacket> execute() throws SQLException {
@@ -74,16 +74,16 @@ public final class MySQLComFieldListPacketExecutor
implements CommandExecutor {
SQLStatementContext sqlStatementContext = new
SQLBindEngine(metaDataContexts.getMetaData(), currentDatabaseName,
hintValueContext).bind(sqlStatement);
ProxyDatabaseConnectionManager databaseConnectionManager =
connectionSession.getDatabaseConnectionManager();
QueryContext queryContext = new QueryContext(sqlStatementContext, sql,
Collections.emptyList(), hintValueContext,
connectionSession.getConnectionContext(), metaDataContexts.getMetaData());
- databaseConnector =
DatabaseProxyConnectorFactory.getInstance().newInstance(queryContext,
databaseConnectionManager, false);
- databaseConnector.execute();
+ databaseProxyConnector =
DatabaseProxyConnectorFactory.getInstance().newInstance(queryContext,
databaseConnectionManager, false);
+ databaseProxyConnector.execute();
return createColumnDefinition41Packets(currentDatabaseName);
}
private Collection<DatabasePacket> createColumnDefinition41Packets(final
String databaseName) throws SQLException {
Collection<DatabasePacket> result = new LinkedList<>();
int characterSet =
connectionSession.getAttributeMap().attr(MySQLConstants.CHARACTER_SET_ATTRIBUTE_KEY).get().getId();
- while (databaseConnector.next()) {
- String columnName =
databaseConnector.getRowData().getCells().iterator().next().getData().toString();
+ while (databaseProxyConnector.next()) {
+ String columnName =
databaseProxyConnector.getRowData().getCells().iterator().next().getData().toString();
result.add(new MySQLColumnDefinition41Packet(
characterSet, databaseName, packet.getTable(),
packet.getTable(), columnName, columnName, 100, MySQLBinaryColumnType.VARCHAR,
0, true));
}
@@ -93,8 +93,8 @@ public final class MySQLComFieldListPacketExecutor implements
CommandExecutor {
@Override
public void close() throws SQLException {
- if (null != databaseConnector) {
- databaseConnector.close();
+ if (null != databaseProxyConnector) {
+ databaseProxyConnector.close();
}
}
}
