This is an automated email from the ASF dual-hosted git repository.
xiaoyu 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 cb726b3 Adjust input param to same sequence for
TextProtocolBackendHandler (#8483)
cb726b3 is described below
commit cb726b345d05b8b8721b4ccd65a7029ded06017f
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Dec 3 12:49:24 2020 +0800
Adjust input param to same sequence for TextProtocolBackendHandler (#8483)
---
.../backend/text/TextProtocolBackendHandlerFactory.java | 6 +++---
.../backend/text/admin/BroadcastBackendHandler.java | 4 ++--
.../backend/text/admin/DALBackendHandlerFactory.java | 8 ++++----
.../proxy/backend/text/admin/UnicastBackendHandler.java | 4 ++--
.../proxy/backend/text/query/QueryBackendHandler.java | 4 ++--
.../transaction/TransactionBackendHandlerFactory.java | 6 +++---
.../backend/text/admin/BroadcastBackendHandlerTest.java | 2 +-
.../backend/text/admin/DALBackendHandlerFactoryTest.java | 16 ++++++++--------
.../backend/text/admin/UnicastBackendHandlerTest.java | 4 ++--
.../TransactionBackendHandlerFactoryTest.java | 6 +++---
10 files changed, 30 insertions(+), 30 deletions(-)
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactory.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactory.java
index 74aa83e..630f454 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactory.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactory.java
@@ -65,11 +65,11 @@ public final class TextProtocolBackendHandlerFactory {
return new RDLBackendHandler(backendConnection, sqlStatement);
}
if (sqlStatement instanceof TCLStatement) {
- return TransactionBackendHandlerFactory.newInstance(sql,
(TCLStatement) sqlStatement, backendConnection);
+ return TransactionBackendHandlerFactory.newInstance((TCLStatement)
sqlStatement, sql, backendConnection);
}
if (sqlStatement instanceof DALStatement) {
- return DALBackendHandlerFactory.newInstance(sql, (DALStatement)
sqlStatement, backendConnection);
+ return DALBackendHandlerFactory.newInstance((DALStatement)
sqlStatement, sql, backendConnection);
}
- return new QueryBackendHandler(sql, sqlStatement, backendConnection);
+ return new QueryBackendHandler(sqlStatement, sql, backendConnection);
}
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/BroadcastBackendHandler.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/BroadcastBackendHandler.java
index e24abf9..08932a0 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/BroadcastBackendHandler.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/BroadcastBackendHandler.java
@@ -38,10 +38,10 @@ public final class BroadcastBackendHandler implements
TextProtocolBackendHandler
private final DatabaseCommunicationEngineFactory
databaseCommunicationEngineFactory =
DatabaseCommunicationEngineFactory.getInstance();
- private final String sql;
-
private final SQLStatement sqlStatement;
+ private final String sql;
+
private final BackendConnection backendConnection;
@Override
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/DALBackendHandlerFactory.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/DALBackendHandlerFactory.java
index 35dc50c..cbcd35b 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/DALBackendHandlerFactory.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/DALBackendHandlerFactory.java
@@ -36,12 +36,12 @@ public final class DALBackendHandlerFactory {
/**
* New instance of backend handler.
*
- * @param sql SQL
* @param dalStatement DAL statement
+ * @param sql SQL
* @param backendConnection backend connection
* @return backend handler
*/
- public static TextProtocolBackendHandler newInstance(final String sql,
final DALStatement dalStatement, final BackendConnection backendConnection) {
+ public static TextProtocolBackendHandler newInstance(final DALStatement
dalStatement, final String sql, final BackendConnection backendConnection) {
if (dalStatement instanceof MySQLUseStatement) {
return new UseDatabaseBackendHandler((MySQLUseStatement)
dalStatement, backendConnection);
}
@@ -52,8 +52,8 @@ public final class DALBackendHandlerFactory {
return new ShowTablesBackendHandler(backendConnection);
}
if (dalStatement instanceof SetStatement) {
- return new BroadcastBackendHandler(sql, dalStatement,
backendConnection);
+ return new BroadcastBackendHandler(dalStatement, sql,
backendConnection);
}
- return new UnicastBackendHandler(sql, dalStatement, backendConnection);
+ return new UnicastBackendHandler(dalStatement, sql, backendConnection);
}
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/UnicastBackendHandler.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/UnicastBackendHandler.java
index af5ccf9..e99585c 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/UnicastBackendHandler.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/UnicastBackendHandler.java
@@ -41,10 +41,10 @@ public final class UnicastBackendHandler implements
TextProtocolBackendHandler {
private final DatabaseCommunicationEngineFactory
databaseCommunicationEngineFactory =
DatabaseCommunicationEngineFactory.getInstance();
- private final String sql;
-
private final SQLStatement sqlStatement;
+ private final String sql;
+
private final BackendConnection backendConnection;
private DatabaseCommunicationEngine databaseCommunicationEngine;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/query/QueryBackendHandler.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/query/QueryBackendHandler.java
index edf1bf1..c2f0311 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/query/QueryBackendHandler.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/query/QueryBackendHandler.java
@@ -38,9 +38,9 @@ public final class QueryBackendHandler implements
TextProtocolBackendHandler {
private final DatabaseCommunicationEngineFactory
databaseCommunicationEngineFactory =
DatabaseCommunicationEngineFactory.getInstance();
- private final String sql;
-
private final SQLStatement sqlStatement;
+
+ private final String sql;
private final BackendConnection backendConnection;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandlerFactory.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandlerFactory.java
index 141b5ad..22b88c4 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandlerFactory.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandlerFactory.java
@@ -39,12 +39,12 @@ public final class TransactionBackendHandlerFactory {
/**
* New instance of backend handler.
*
- * @param sql SQL
* @param tclStatement TCL statement
+ * @param sql SQL
* @param backendConnection backend connection
* @return backend handler
*/
- public static TextProtocolBackendHandler newInstance(final String sql,
final TCLStatement tclStatement, final BackendConnection backendConnection) {
+ public static TextProtocolBackendHandler newInstance(final TCLStatement
tclStatement, final String sql, final BackendConnection backendConnection) {
if (tclStatement instanceof BeginTransactionStatement) {
return new
TransactionBackendHandler(TransactionOperationType.BEGIN, backendConnection);
}
@@ -60,6 +60,6 @@ public final class TransactionBackendHandlerFactory {
if (tclStatement instanceof RollbackStatement) {
return new
TransactionBackendHandler(TransactionOperationType.ROLLBACK, backendConnection);
}
- return new BroadcastBackendHandler(sql, tclStatement,
backendConnection);
+ return new BroadcastBackendHandler(tclStatement, sql,
backendConnection);
}
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/BroadcastBackendHandlerTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/BroadcastBackendHandlerTest.java
index 03ad39f..6540a58 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/BroadcastBackendHandlerTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/BroadcastBackendHandlerTest.java
@@ -80,7 +80,7 @@ public final class BroadcastBackendHandlerTest {
@Test
public void assertExecuteSuccess() throws SQLException {
mockDatabaseCommunicationEngine(new
UpdateResponseHeader(mock(SQLStatement.class)));
- BroadcastBackendHandler broadcastBackendHandler = new
BroadcastBackendHandler("SET timeout = 1000", mock(SQLStatement.class),
backendConnection);
+ BroadcastBackendHandler broadcastBackendHandler = new
BroadcastBackendHandler(mock(SQLStatement.class), "SET timeout = 1000",
backendConnection);
setBackendHandlerFactory(broadcastBackendHandler);
ResponseHeader actual = broadcastBackendHandler.execute();
assertThat(actual, instanceOf(UpdateResponseHeader.class));
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/DALBackendHandlerFactoryTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/DALBackendHandlerFactoryTest.java
index 414c725..a91b05a 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/DALBackendHandlerFactoryTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/DALBackendHandlerFactoryTest.java
@@ -39,9 +39,9 @@ public final class DALBackendHandlerFactoryTest {
@Test
public void
assertShowTablesBackendHandlerReturnedWhenMySQLShowTablesStatement() {
- MySQLShowTablesStatement mySQLShowTablesStatement =
mock(MySQLShowTablesStatement.class);
+ MySQLShowTablesStatement mysqlShowTablesStatement =
mock(MySQLShowTablesStatement.class);
BackendConnection backendConnection = mock(BackendConnection.class);
- TextProtocolBackendHandler textProtocolBackendHandler =
DALBackendHandlerFactory.newInstance("", mySQLShowTablesStatement,
backendConnection);
+ TextProtocolBackendHandler textProtocolBackendHandler =
DALBackendHandlerFactory.newInstance(mysqlShowTablesStatement, "",
backendConnection);
assertThat(textProtocolBackendHandler,
instanceOf(ShowTablesBackendHandler.class));
ShowTablesBackendHandler showTablesBackendHandler =
(ShowTablesBackendHandler) textProtocolBackendHandler;
assertFieldOfInstance(showTablesBackendHandler, "backendConnection",
is(backendConnection));
@@ -49,19 +49,19 @@ public final class DALBackendHandlerFactoryTest {
@Test
public void assertUseDatabaseBackendHandlerReturnedWhenMySQLUseStatement()
{
- MySQLUseStatement mySQLUseStatement = mock(MySQLUseStatement.class);
+ MySQLUseStatement mysqlUseStatement = mock(MySQLUseStatement.class);
BackendConnection backendConnection = mock(BackendConnection.class);
- TextProtocolBackendHandler textProtocolBackendHandler =
DALBackendHandlerFactory.newInstance("", mySQLUseStatement, backendConnection);
+ TextProtocolBackendHandler textProtocolBackendHandler =
DALBackendHandlerFactory.newInstance(mysqlUseStatement, "", backendConnection);
assertThat(textProtocolBackendHandler,
instanceOf(UseDatabaseBackendHandler.class));
UseDatabaseBackendHandler useDatabaseBackendHandler =
(UseDatabaseBackendHandler) textProtocolBackendHandler;
- assertFieldOfInstance(useDatabaseBackendHandler, "useStatement",
is(mySQLUseStatement));
+ assertFieldOfInstance(useDatabaseBackendHandler, "useStatement",
is(mysqlUseStatement));
assertFieldOfInstance(useDatabaseBackendHandler, "backendConnection",
is(backendConnection));
}
@Test
public void
assertShowDatabasesBackendHandlerReturnedWhenMySQLShowDatabasesStatement() {
BackendConnection backendConnection = mock(BackendConnection.class);
- TextProtocolBackendHandler textProtocolBackendHandler =
DALBackendHandlerFactory.newInstance("",
mock(MySQLShowDatabasesStatement.class), backendConnection);
+ TextProtocolBackendHandler textProtocolBackendHandler =
DALBackendHandlerFactory.newInstance(mock(MySQLShowDatabasesStatement.class),
"", backendConnection);
assertThat(textProtocolBackendHandler,
instanceOf(ShowDatabasesBackendHandler.class));
ShowDatabasesBackendHandler showDatabasesBackendHandler =
(ShowDatabasesBackendHandler) textProtocolBackendHandler;
assertFieldOfInstance(showDatabasesBackendHandler,
"backendConnection", is(backendConnection));
@@ -71,7 +71,7 @@ public final class DALBackendHandlerFactoryTest {
public void assertBroadcastBackendHandlerReturnedWhenSetStatement() {
SetStatement setStatement = mock(SetStatement.class);
BackendConnection backendConnection = mock(BackendConnection.class);
- TextProtocolBackendHandler textProtocolBackendHandler =
DALBackendHandlerFactory.newInstance("", setStatement, backendConnection);
+ TextProtocolBackendHandler textProtocolBackendHandler =
DALBackendHandlerFactory.newInstance(setStatement, "", backendConnection);
assertThat(textProtocolBackendHandler,
instanceOf(BroadcastBackendHandler.class));
BroadcastBackendHandler broadcastBackendHandler =
(BroadcastBackendHandler) textProtocolBackendHandler;
assertFieldOfInstance(broadcastBackendHandler, "sqlStatement",
is(setStatement));
@@ -83,7 +83,7 @@ public final class DALBackendHandlerFactoryTest {
public void assertUnicastBackendHandlerReturnedWhenOtherDALStatement() {
DALStatement dalStatement = mock(DALStatement.class);
BackendConnection backendConnection = mock(BackendConnection.class);
- TextProtocolBackendHandler textProtocolBackendHandler =
DALBackendHandlerFactory.newInstance("", dalStatement, backendConnection);
+ TextProtocolBackendHandler textProtocolBackendHandler =
DALBackendHandlerFactory.newInstance(dalStatement, "", backendConnection);
assertThat(textProtocolBackendHandler,
instanceOf(UnicastBackendHandler.class));
UnicastBackendHandler unicastBackendHandler = (UnicastBackendHandler)
textProtocolBackendHandler;
assertFieldOfInstance(unicastBackendHandler, "sqlStatement",
is(dalStatement));
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/UnicastBackendHandlerTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/UnicastBackendHandlerTest.java
index 1c96141..62d4da5 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/UnicastBackendHandlerTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/UnicastBackendHandlerTest.java
@@ -82,7 +82,7 @@ public final class UnicastBackendHandlerTest {
@Test
public void assertExecuteWhileSchemaIsNull() throws SQLException {
- UnicastBackendHandler backendHandler = new UnicastBackendHandler("show
variable like %s", mock(SQLStatement.class), backendConnection);
+ UnicastBackendHandler backendHandler = new
UnicastBackendHandler(mock(SQLStatement.class), "show variable like %s",
backendConnection);
backendConnection.setCurrentSchema(String.format(SCHEMA_PATTERN, 8));
setDatabaseCommunicationEngine(backendHandler);
ResponseHeader actual = backendHandler.execute();
@@ -93,7 +93,7 @@ public final class UnicastBackendHandlerTest {
@Test
public void assertExecuteWhileSchemaNotNull() throws SQLException {
backendConnection.setCurrentSchema(String.format(SCHEMA_PATTERN, 0));
- UnicastBackendHandler backendHandler = new UnicastBackendHandler("show
variable like %s", mock(SQLStatement.class), backendConnection);
+ UnicastBackendHandler backendHandler = new
UnicastBackendHandler(mock(SQLStatement.class), "show variable like %s",
backendConnection);
setDatabaseCommunicationEngine(backendHandler);
ResponseHeader actual = backendHandler.execute();
assertThat(actual, instanceOf(UpdateResponseHeader.class));
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandlerFactoryTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandlerFactoryTest.java
index e0580d9..6fb99d4 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandlerFactoryTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandlerFactoryTest.java
@@ -42,7 +42,7 @@ public final class TransactionBackendHandlerFactoryTest {
@Test
public void
assertTransactionBackendHandlerReturnedWhenTCLStatementInstanceOfCommitStatement()
{
BackendConnection backendConnection = mock(BackendConnection.class,
Answers.RETURNS_DEEP_STUBS);
- TextProtocolBackendHandler textProtocolBackendHandler =
TransactionBackendHandlerFactory.newInstance(null, mock(CommitStatement.class),
backendConnection);
+ TextProtocolBackendHandler textProtocolBackendHandler =
TransactionBackendHandlerFactory.newInstance(mock(CommitStatement.class), null,
backendConnection);
assertThat(textProtocolBackendHandler,
instanceOf(TransactionBackendHandler.class));
TransactionBackendHandler transactionBackendHandler =
(TransactionBackendHandler) textProtocolBackendHandler;
assertFieldOfInstance(transactionBackendHandler, "operationType",
is(TransactionOperationType.COMMIT));
@@ -52,7 +52,7 @@ public final class TransactionBackendHandlerFactoryTest {
@Test
public void
assertTransactionBackendHandlerReturnedWhenTCLStatementInstanceOfRollbackStatement()
{
BackendConnection backendConnection = mock(BackendConnection.class,
Answers.RETURNS_DEEP_STUBS);
- TextProtocolBackendHandler textProtocolBackendHandler =
TransactionBackendHandlerFactory.newInstance(null,
mock(RollbackStatement.class), backendConnection);
+ TextProtocolBackendHandler textProtocolBackendHandler =
TransactionBackendHandlerFactory.newInstance(mock(RollbackStatement.class),
null, backendConnection);
assertThat(textProtocolBackendHandler,
instanceOf(TransactionBackendHandler.class));
TransactionBackendHandler transactionBackendHandler =
(TransactionBackendHandler) textProtocolBackendHandler;
assertFieldOfInstance(transactionBackendHandler, "operationType",
is(TransactionOperationType.ROLLBACK));
@@ -61,7 +61,7 @@ public final class TransactionBackendHandlerFactoryTest {
@Test
public void assertBroadcastBackendHandlerReturnedWhenTCLStatementNotHit() {
- assertThat(TransactionBackendHandlerFactory.newInstance(null,
mock(TCLStatement.class), null), instanceOf(BroadcastBackendHandler.class));
+
assertThat(TransactionBackendHandlerFactory.newInstance(mock(TCLStatement.class),
null, null), instanceOf(BroadcastBackendHandler.class));
}
@SuppressWarnings("unchecked")
