You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/11/30 13:52:15 UTC
[shardingsphere] branch master updated: Rename ResponseHeader and
QueryResponseData (#8426)
This is an automated email from the ASF dual-hosted git repository.
zhangyonglun 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 af024df Rename ResponseHeader and QueryResponseData (#8426)
af024df is described below
commit af024df142e89e7c2f44d523b66946be0748993f
Author: Liang Zhang <te...@163.com>
AuthorDate: Mon Nov 30 21:51:39 2020 +0800
Rename ResponseHeader and QueryResponseData (#8426)
* Refactor JDBCDatabaseCommunicationEngine
* Rename ResponseHeader
* Rename QueryResponseData
---
.../communication/DatabaseCommunicationEngine.java | 12 +++---
.../jdbc/JDBCDatabaseCommunicationEngine.java | 49 +++++++++++-----------
.../QueryData.java => data/QueryResponseData.java} | 6 +--
.../ResponseHeader.java} | 6 +--
.../query/QueryResponseHeader.java} | 9 ++--
.../{query => header/query/impl}/QueryHeader.java | 2 +-
.../query/impl}/QueryHeaderBuilder.java | 2 +-
.../update/UpdateResponseHeader.java} | 12 +++---
.../backend/text/TextProtocolBackendHandler.java | 4 +-
.../text/admin/BroadcastBackendHandler.java | 8 ++--
.../backend/text/admin/RDLBackendHandler.java | 26 ++++++------
.../text/admin/ShowDatabasesBackendHandler.java | 10 ++---
.../text/admin/ShowTablesBackendHandler.java | 14 +++----
.../backend/text/admin/UnicastBackendHandler.java | 6 +--
.../text/admin/UseDatabaseBackendHandler.java | 8 ++--
.../backend/text/query/QueryBackendHandler.java | 6 +--
.../explain/ShardingCTLExplainBackendHandler.java | 10 ++---
.../sctl/hint/ShardingCTLHintBackendHandler.java | 6 +--
.../sctl/hint/internal/HintCommandExecutor.java | 12 +++---
.../executor/AbstractHintQueryExecutor.java | 16 +++----
.../executor/AbstractHintUpdateExecutor.java | 4 +-
.../HintAddDatabaseShardingValueExecutor.java | 8 ++--
.../HintAddTableShardingValueExecutor.java | 8 ++--
.../hint/internal/executor/HintClearExecutor.java | 8 ++--
.../executor/HintErrorParameterExecutor.java | 4 +-
.../HintSetDatabaseShardingValueExecutor.java | 8 ++--
.../executor/HintSetPrimaryOnlyExecutor.java | 8 ++--
.../internal/executor/HintShowStatusExecutor.java | 2 +-
.../executor/HintShowTableStatusExecutor.java | 2 +-
.../sctl/set/ShardingCTLSetBackendHandler.java | 8 ++--
.../sctl/show/ShardingCTLShowBackendHandler.java | 12 +++---
.../backend/text/skip/SkipBackendHandler.java | 8 ++--
.../transaction/TransactionBackendHandler.java | 8 ++--
.../query/impl}/QueryHeaderBuilderTest.java | 2 +-
.../text/admin/BroadcastBackendHandlerTest.java | 18 ++++----
.../backend/text/admin/RDLBackendHandlerTest.java | 20 ++++-----
.../admin/ShowDatabasesBackendHandlerTest.java | 6 +--
.../text/admin/ShowTablesBackendHandlerTest.java | 6 +--
.../text/admin/UnicastBackendHandlerTest.java | 18 ++++----
.../text/admin/UseDatabaseBackendHandlerTest.java | 8 ++--
.../hint/ShardingCTLHintBackendHandlerTest.java | 34 +++++++--------
.../sctl/set/ShardingCTLSetBackendHandlerTest.java | 16 +++----
.../show/ShardingCTLShowBackendHandlerTest.java | 16 +++----
.../backend/text/skip/SkipBackendHandlerTest.java | 8 ++--
.../transaction/TransactionBackendHandlerTest.java | 8 ++--
.../execute/MySQLComStmtExecuteExecutor.java | 22 +++++-----
.../query/builder/ResponsePacketBuilder.java | 18 ++++----
.../fieldlist/MySQLComFieldListPacketExecutor.java | 2 +-
.../text/query/MySQLComQueryPacketExecutor.java | 18 ++++----
.../execute/MySQLComStmtExecuteExecutorTest.java | 10 ++---
.../query/builder/ResponsePacketBuilderTest.java | 18 ++++----
.../query/MySQLComQueryPacketExecutorTest.java | 10 ++---
.../binary/bind/PostgreSQLComBindExecutor.java | 34 +++++++--------
.../query/text/PostgreSQLComQueryExecutor.java | 28 ++++++-------
54 files changed, 317 insertions(+), 315 deletions(-)
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java
index 10ad767..cc28518 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.proxy.backend.communication;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryData;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.data.QueryResponseData;
import java.sql.SQLException;
@@ -33,7 +33,7 @@ public interface DatabaseCommunicationEngine {
* @return backend response
* @throws SQLException SQL exception
*/
- BackendResponse execute() throws SQLException;
+ ResponseHeader execute() throws SQLException;
/**
* Goto next result value.
@@ -44,10 +44,10 @@ public interface DatabaseCommunicationEngine {
boolean next() throws SQLException;
/**
- * Get query data.
+ * Get query response data.
*
- * @return query data
+ * @return query response data
* @throws SQLException SQL exception
*/
- QueryData getQueryData() throws SQLException;
+ QueryResponseData getQueryResponseData() throws SQLException;
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/JDBCDatabaseCommunicationEngine.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/JDBCDatabaseCommunicationEngine.java
index 038de73..456698d 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/JDBCDatabaseCommunicationEngine.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/JDBCDatabaseCommunicationEngine.java
@@ -40,12 +40,12 @@ import org.apache.shardingsphere.infra.spi.ordered.OrderedSPIRegistry;
import org.apache.shardingsphere.proxy.backend.communication.DatabaseCommunicationEngine;
import org.apache.shardingsphere.proxy.backend.communication.ProxySQLExecutor;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryData;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryHeader;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryHeaderBuilder;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryResponse;
-import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.data.QueryResponseData;
+import org.apache.shardingsphere.proxy.backend.response.header.query.impl.QueryHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.query.impl.QueryHeaderBuilder;
+import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.dml.DeleteStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.dml.InsertStatement;
@@ -78,7 +78,7 @@ public final class JDBCDatabaseCommunicationEngine implements DatabaseCommunicat
private MergedResult mergedResult;
@Override
- public BackendResponse execute() throws SQLException {
+ public ResponseHeader execute() throws SQLException {
ExecutionContext executionContext = kernelProcessor.generateExecutionContext(logicSQL, metaData, ProxyContext.getInstance().getMetaDataContexts().getProps());
logSQL(executionContext);
return doExecute(executionContext);
@@ -90,9 +90,9 @@ public final class JDBCDatabaseCommunicationEngine implements DatabaseCommunicat
}
}
- private BackendResponse doExecute(final ExecutionContext executionContext) throws SQLException {
+ private ResponseHeader doExecute(final ExecutionContext executionContext) throws SQLException {
if (executionContext.getExecutionUnits().isEmpty()) {
- return new UpdateResponse();
+ return new UpdateResponseHeader();
}
proxySQLExecutor.checkExecutePrerequisites(executionContext);
Collection<ExecuteResult> executeResults = proxySQLExecutor.execute(executionContext);
@@ -101,10 +101,11 @@ public final class JDBCDatabaseCommunicationEngine implements DatabaseCommunicat
? processExecuteQuery(executionContext, executeResults, (QueryResult) executeResultSample) : processExecuteUpdate(executionContext, executeResults);
}
- private QueryResponse processExecuteQuery(final ExecutionContext executionContext, final Collection<ExecuteResult> executeResults, final QueryResult executeResultSample) throws SQLException {
+ private QueryResponseHeader processExecuteQuery(final ExecutionContext executionContext,
+ final Collection<ExecuteResult> executeResults, final QueryResult executeResultSample) throws SQLException {
queryHeaders = createQueryHeaders(executionContext, executeResultSample);
mergedResult = mergeQuery(executionContext.getSqlStatementContext(), executeResults.stream().map(each -> (QueryResult) each).collect(Collectors.toList()));
- return new QueryResponse(queryHeaders);
+ return new QueryResponseHeader(queryHeaders);
}
private List<QueryHeader> createQueryHeaders(final ExecutionContext executionContext, final QueryResult executeResultSample) throws SQLException {
@@ -127,15 +128,21 @@ public final class JDBCDatabaseCommunicationEngine implements DatabaseCommunicat
return sqlStatementContext instanceof SelectStatementContext && !((SelectStatementContext) sqlStatementContext).getProjectionsContext().getExpandProjections().isEmpty();
}
- private UpdateResponse processExecuteUpdate(final ExecutionContext executionContext, final Collection<ExecuteResult> executeResults) throws SQLException {
- UpdateResponse result = createUpdateResponse(executionContext, executeResults);
+ private MergedResult mergeQuery(final SQLStatementContext<?> sqlStatementContext, final List<QueryResult> queryResults) throws SQLException {
+ MergeEngine mergeEngine = new MergeEngine(ProxyContext.getInstance().getMetaDataContexts().getDatabaseType(),
+ metaData.getSchema(), ProxyContext.getInstance().getMetaDataContexts().getProps(), metaData.getRuleMetaData().getRules());
+ return mergeEngine.merge(queryResults, sqlStatementContext);
+ }
+
+ private UpdateResponseHeader processExecuteUpdate(final ExecutionContext executionContext, final Collection<ExecuteResult> executeResults) throws SQLException {
+ UpdateResponseHeader result = createUpdateResponse(executionContext, executeResults);
refreshSchema(executionContext);
mergeUpdateCount(executionContext.getSqlStatementContext(), result);
return result;
}
- private UpdateResponse createUpdateResponse(final ExecutionContext executionContext, final Collection<ExecuteResult> executeResults) {
- UpdateResponse result = new UpdateResponse(executeResults);
+ private UpdateResponseHeader createUpdateResponse(final ExecutionContext executionContext, final Collection<ExecuteResult> executeResults) {
+ UpdateResponseHeader result = new UpdateResponseHeader(executeResults);
if (executionContext.getSqlStatementContext().getSqlStatement() instanceof InsertStatement) {
result.setType("INSERT");
} else if (executionContext.getSqlStatementContext().getSqlStatement() instanceof DeleteStatement) {
@@ -166,13 +173,7 @@ public final class JDBCDatabaseCommunicationEngine implements DatabaseCommunicat
OrderedSPIRegistry.getRegisteredServices(Collections.singletonList(schema), SchemaChangedNotifier.class).values().forEach(each -> each.notify(schemaName, schema));
}
- private MergedResult mergeQuery(final SQLStatementContext<?> sqlStatementContext, final List<QueryResult> queryResults) throws SQLException {
- MergeEngine mergeEngine = new MergeEngine(ProxyContext.getInstance().getMetaDataContexts().getDatabaseType(),
- metaData.getSchema(), ProxyContext.getInstance().getMetaDataContexts().getProps(), metaData.getRuleMetaData().getRules());
- return mergeEngine.merge(queryResults, sqlStatementContext);
- }
-
- private void mergeUpdateCount(final SQLStatementContext<?> sqlStatementContext, final UpdateResponse response) {
+ private void mergeUpdateCount(final SQLStatementContext<?> sqlStatementContext, final UpdateResponseHeader response) {
if (isNeedAccumulate(sqlStatementContext)) {
response.mergeUpdateCount();
}
@@ -190,11 +191,11 @@ public final class JDBCDatabaseCommunicationEngine implements DatabaseCommunicat
}
@Override
- public QueryData getQueryData() throws SQLException {
+ public QueryResponseData getQueryResponseData() throws SQLException {
List<Object> row = new ArrayList<>(queryHeaders.size());
for (int columnIndex = 1; columnIndex <= queryHeaders.size(); columnIndex++) {
row.add(mergedResult.getValue(columnIndex, Object.class));
}
- return new QueryData(queryHeaders.stream().map(QueryHeader::getColumnType).collect(Collectors.toList()), row);
+ return new QueryResponseData(queryHeaders.stream().map(QueryHeader::getColumnType).collect(Collectors.toList()), row);
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/query/QueryData.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/data/QueryResponseData.java
similarity index 89%
rename from shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/query/QueryData.java
rename to shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/data/QueryResponseData.java
index 88efaeb..e9acccb 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/query/QueryData.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/data/QueryResponseData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.response.query;
+package org.apache.shardingsphere.proxy.backend.response.data;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -23,11 +23,11 @@ import lombok.RequiredArgsConstructor;
import java.util.List;
/**
- * Query data.
+ * Query response data.
*/
@RequiredArgsConstructor
@Getter
-public final class QueryData {
+public final class QueryResponseData {
private final List<Integer> columnTypes;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/BackendResponse.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/header/ResponseHeader.java
similarity index 87%
rename from shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/BackendResponse.java
rename to shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/header/ResponseHeader.java
index 2f0af66..016639b 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/BackendResponse.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/header/ResponseHeader.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.response;
+package org.apache.shardingsphere.proxy.backend.response.header;
/**
- * Backend response.
+ * Response header.
*/
-public interface BackendResponse {
+public interface ResponseHeader {
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/query/QueryResponse.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/header/query/QueryResponseHeader.java
similarity index 74%
rename from shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/query/QueryResponse.java
rename to shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/header/query/QueryResponseHeader.java
index 63acc61..5fd076f 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/query/QueryResponse.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/header/query/QueryResponseHeader.java
@@ -15,20 +15,21 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.response.query;
+package org.apache.shardingsphere.proxy.backend.response.header.query;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.query.impl.QueryHeader;
import java.util.List;
/**
- * Query response.
+ * Query response header.
*/
@RequiredArgsConstructor
@Getter
-public final class QueryResponse implements BackendResponse {
+public final class QueryResponseHeader implements ResponseHeader {
private final List<QueryHeader> queryHeaders;
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/query/QueryHeader.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/header/query/impl/QueryHeader.java
similarity index 95%
rename from shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/query/QueryHeader.java
rename to shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/header/query/impl/QueryHeader.java
index 559fb46..763cfdb 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/query/QueryHeader.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/header/query/impl/QueryHeader.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.response.query;
+package org.apache.shardingsphere.proxy.backend.response.header.query.impl;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/query/QueryHeaderBuilder.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/header/query/impl/QueryHeaderBuilder.java
similarity index 98%
rename from shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/query/QueryHeaderBuilder.java
rename to shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/header/query/impl/QueryHeaderBuilder.java
index 61120f4..96a75f3 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/query/QueryHeaderBuilder.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/header/query/impl/QueryHeaderBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.response.query;
+package org.apache.shardingsphere.proxy.backend.response.header.query.impl;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/update/UpdateResponse.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/header/update/UpdateResponseHeader.java
similarity index 85%
rename from shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/update/UpdateResponse.java
rename to shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/header/update/UpdateResponseHeader.java
index eb94903..df76284 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/update/UpdateResponse.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/header/update/UpdateResponseHeader.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.response.update;
+package org.apache.shardingsphere.proxy.backend.response.header.update;
import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.infra.executor.sql.execute.result.ExecuteResult;
import org.apache.shardingsphere.infra.executor.sql.execute.result.update.UpdateResult;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import java.util.Collection;
import java.util.Collections;
@@ -29,9 +29,9 @@ import java.util.LinkedList;
import java.util.List;
/**
- * Update response.
+ * Update response header.
*/
-public final class UpdateResponse implements BackendResponse {
+public final class UpdateResponseHeader implements ResponseHeader {
private final List<Integer> updateCounts = new LinkedList<>();
@@ -45,11 +45,11 @@ public final class UpdateResponse implements BackendResponse {
@Setter
private String type;
- public UpdateResponse() {
+ public UpdateResponseHeader() {
this(Collections.emptyList());
}
- public UpdateResponse(final Collection<ExecuteResult> executeResults) {
+ public UpdateResponseHeader(final Collection<ExecuteResult> executeResults) {
for (ExecuteResult each : executeResults) {
updateCount = ((UpdateResult) each).getUpdateCount();
updateCounts.add(((UpdateResult) each).getUpdateCount());
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandler.java
index 3c59cf3..596c202 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandler.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.proxy.backend.text;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import java.sql.SQLException;
import java.util.Collection;
@@ -33,7 +33,7 @@ public interface TextProtocolBackendHandler {
* @return backend response
* @throws SQLException SQL exception
*/
- BackendResponse execute() throws SQLException;
+ ResponseHeader execute() throws SQLException;
/**
* Goto next result value.
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 bd4661f..1c08a2a 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
@@ -22,8 +22,8 @@ import org.apache.shardingsphere.proxy.backend.communication.DatabaseCommunicati
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.exception.RuleNotExistsException;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
@@ -45,7 +45,7 @@ public final class BroadcastBackendHandler implements TextProtocolBackendHandler
private final BackendConnection backendConnection;
@Override
- public BackendResponse execute() throws SQLException {
+ public ResponseHeader execute() throws SQLException {
String originalSchema = backendConnection.getSchemaName();
for (String each : ProxyContext.getInstance().getAllSchemaNames()) {
backendConnection.setCurrentSchema(each);
@@ -55,7 +55,7 @@ public final class BroadcastBackendHandler implements TextProtocolBackendHandler
databaseCommunicationEngineFactory.newTextProtocolInstance(sqlStatement, sql, backendConnection).execute();
}
backendConnection.setCurrentSchema(originalSchema);
- return new UpdateResponse();
+ return new UpdateResponseHeader();
}
@Override
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/RDLBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/RDLBackendHandler.java
index ac732ec..c72b008 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/RDLBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/RDLBackendHandler.java
@@ -37,8 +37,8 @@ import org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapper
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.exception.DBCreateExistsException;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
import org.apache.shardingsphere.proxy.config.util.DataSourceParameterConverter;
import org.apache.shardingsphere.proxy.config.yaml.YamlDataSourceParameter;
@@ -65,53 +65,53 @@ public final class RDLBackendHandler implements TextProtocolBackendHandler {
private final SQLStatement sqlStatement;
@Override
- public BackendResponse execute() throws SQLException {
+ public ResponseHeader execute() throws SQLException {
SQLStatementContext<?> context = getSQLStatementContext();
if (!isRegistryCenterExisted()) {
throw new SQLException(String.format("No Registry center to execute `%s` SQL", context.getClass().getSimpleName()));
}
- return getBackendResponse(context);
+ return getResponseHeader(context);
}
- private BackendResponse execute(final CreateDatabaseStatementContext context) {
+ private ResponseHeader execute(final CreateDatabaseStatementContext context) {
if (ProxyContext.getInstance().getAllSchemaNames().contains(context.getSqlStatement().getDatabaseName())) {
throw new DBCreateExistsException(context.getSqlStatement().getDatabaseName());
}
// TODO Need to get the executed feedback from registry center for returning.
GovernanceEventBus.getInstance().post(new SchemaNamePersistEvent(context.getSqlStatement().getDatabaseName(), false));
- UpdateResponse result = new UpdateResponse();
+ UpdateResponseHeader result = new UpdateResponseHeader();
result.setType("CREATE");
return result;
}
- private BackendResponse execute(final DropDatabaseStatementContext context) {
+ private ResponseHeader execute(final DropDatabaseStatementContext context) {
if (!ProxyContext.getInstance().getAllSchemaNames().contains(context.getSqlStatement().getDatabaseName())) {
throw new DBCreateExistsException(context.getSqlStatement().getDatabaseName());
}
// TODO Need to get the executed feedback from registry center for returning.
GovernanceEventBus.getInstance().post(new SchemaNamePersistEvent(context.getSqlStatement().getDatabaseName(), true));
- UpdateResponse result = new UpdateResponse();
+ UpdateResponseHeader result = new UpdateResponseHeader();
result.setType("DROP");
return result;
}
- private BackendResponse execute(final CreateDataSourcesStatementContext context) {
+ private ResponseHeader execute(final CreateDataSourcesStatementContext context) {
Map<String, YamlDataSourceParameter> parameters = CreateDataSourcesStatementContextConverter.convert(context);
Map<String, DataSourceConfiguration> dataSources = DataSourceParameterConverter.getDataSourceConfigurationMap(
DataSourceParameterConverter.getDataSourceParameterMapFromYamlConfiguration(parameters));
// TODO Need to get the executed feedback from registry center for returning.
GovernanceEventBus.getInstance().post(new DataSourcePersistEvent(backendConnection.getSchemaName(), dataSources));
- UpdateResponse result = new UpdateResponse();
+ UpdateResponseHeader result = new UpdateResponseHeader();
result.setType("CREATE");
return result;
}
- private BackendResponse execute(final CreateShardingRuleStatementContext context) {
+ private ResponseHeader execute(final CreateShardingRuleStatementContext context) {
YamlShardingRuleConfiguration config = CreateShardingRuleStatementContextConverter.convert(context);
Collection<RuleConfiguration> rules = new YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(Collections.singleton(config));
// TODO Need to get the executed feedback from registry center for returning.
GovernanceEventBus.getInstance().post(new RuleConfigurationsPersistEvent(backendConnection.getSchemaName(), rules));
- UpdateResponse result = new UpdateResponse();
+ UpdateResponseHeader result = new UpdateResponseHeader();
result.setType("CREATE");
return result;
}
@@ -130,7 +130,7 @@ public final class RDLBackendHandler implements TextProtocolBackendHandler {
return new DropDatabaseStatementContext((DropDatabaseStatement) sqlStatement);
}
- private BackendResponse getBackendResponse(final SQLStatementContext<?> context) {
+ private ResponseHeader getResponseHeader(final SQLStatementContext<?> context) {
if (context instanceof CreateDatabaseStatementContext) {
return execute((CreateDatabaseStatementContext) context);
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/ShowDatabasesBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/ShowDatabasesBackendHandler.java
index b26717f..7a3e210 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/ShowDatabasesBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/ShowDatabasesBackendHandler.java
@@ -18,12 +18,12 @@
package org.apache.shardingsphere.proxy.backend.text.admin;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.query.impl.QueryHeader;
import org.apache.shardingsphere.infra.merge.result.MergedResult;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
import org.apache.shardingsphere.sharding.merge.dal.common.SingleLocalDataMergedResult;
@@ -44,9 +44,9 @@ public final class ShowDatabasesBackendHandler implements TextProtocolBackendHan
private MergedResult mergedResult;
@Override
- public BackendResponse execute() {
+ public ResponseHeader execute() {
mergedResult = new SingleLocalDataMergedResult(getSchemaNames());
- return new QueryResponse(Collections.singletonList(
+ return new QueryResponseHeader(Collections.singletonList(
new QueryHeader("information_schema", "SCHEMATA", "Database", "SCHEMA_NAME", 100, Types.VARCHAR, "VARCHAR", 0, false, false, false, false)));
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/ShowTablesBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/ShowTablesBackendHandler.java
index 0bbc38a..1fe85fe 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/ShowTablesBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/ShowTablesBackendHandler.java
@@ -23,11 +23,11 @@ import org.apache.shardingsphere.infra.executor.sql.execute.result.query.type.me
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.raw.type.RawMemoryQueryResult;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.raw.metadata.RawQueryResultMetaData;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.raw.metadata.RawQueryResultColumnMetaData;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.query.impl.QueryHeader;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
import java.sql.SQLException;
@@ -49,8 +49,8 @@ public final class ShowTablesBackendHandler implements TextProtocolBackendHandle
private QueryResult queryResult;
@Override
- public BackendResponse execute() {
- QueryResponse result = createQueryResponse(backendConnection.getSchemaName());
+ public ResponseHeader execute() {
+ QueryResponseHeader result = createQueryResponse(backendConnection.getSchemaName());
if (!ProxyContext.getInstance().getMetaData(backendConnection.getSchemaName()).isComplete()) {
return result;
}
@@ -62,9 +62,9 @@ public final class ShowTablesBackendHandler implements TextProtocolBackendHandle
return result;
}
- private QueryResponse createQueryResponse(final String schemaName) {
+ private QueryResponseHeader createQueryResponse(final String schemaName) {
String column = String.format("Tables_in_%s", schemaName);
- return new QueryResponse(Collections.singletonList(new QueryHeader(schemaName, "", column, column, 64, Types.VARCHAR, "VARCHAR", 0, false, false, false, false)));
+ return new QueryResponseHeader(Collections.singletonList(new QueryHeader(schemaName, "", column, column, 64, Types.VARCHAR, "VARCHAR", 0, false, false, false, false)));
}
@Override
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 dcdb121..4f7f2be 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
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.Bac
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.exception.NoDatabaseSelectedException;
import org.apache.shardingsphere.proxy.backend.exception.RuleNotExistsException;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
@@ -50,7 +50,7 @@ public final class UnicastBackendHandler implements TextProtocolBackendHandler {
private DatabaseCommunicationEngine databaseCommunicationEngine;
@Override
- public BackendResponse execute() throws SQLException {
+ public ResponseHeader execute() throws SQLException {
if (null == backendConnection.getSchemaName()) {
Map<String, ShardingSphereMetaData> metaDataMap = ProxyContext.getInstance().getMetaDataContexts().getMetaDataMap();
if (metaDataMap.isEmpty()) {
@@ -73,6 +73,6 @@ public final class UnicastBackendHandler implements TextProtocolBackendHandler {
@Override
public Collection<Object> getRowData() throws SQLException {
- return databaseCommunicationEngine.getQueryData().getData();
+ return databaseCommunicationEngine.getQueryResponseData().getData();
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/UseDatabaseBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/UseDatabaseBackendHandler.java
index 8f880bf..8bf68fd 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/UseDatabaseBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/UseDatabaseBackendHandler.java
@@ -21,8 +21,8 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.exception.UnknownDatabaseException;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
import org.apache.shardingsphere.sql.parser.sql.common.util.SQLUtil;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dal.MySQLUseStatement;
@@ -40,11 +40,11 @@ public final class UseDatabaseBackendHandler implements TextProtocolBackendHandl
private final BackendConnection backendConnection;
@Override
- public BackendResponse execute() {
+ public ResponseHeader execute() {
String schema = SQLUtil.getExactlyValue(useStatement.getSchema());
if (ProxyContext.getInstance().schemaExists(schema) && isAuthorizedSchema(schema)) {
backendConnection.setCurrentSchema(schema);
- return new UpdateResponse();
+ return new UpdateResponseHeader();
}
throw new UnknownDatabaseException(schema);
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 f8e8e34..e42bf56 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
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.proxy.backend.communication.DatabaseCommunicati
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.exception.RuleNotExistsException;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
@@ -47,7 +47,7 @@ public final class QueryBackendHandler implements TextProtocolBackendHandler {
private DatabaseCommunicationEngine databaseCommunicationEngine;
@Override
- public BackendResponse execute() throws SQLException {
+ public ResponseHeader execute() throws SQLException {
if (!ProxyContext.getInstance().getMetaData(backendConnection.getSchemaName()).isComplete()) {
throw new RuleNotExistsException();
}
@@ -62,6 +62,6 @@ public final class QueryBackendHandler implements TextProtocolBackendHandler {
@Override
public Collection<Object> getRowData() throws SQLException {
- return databaseCommunicationEngine.getQueryData().getData();
+ return databaseCommunicationEngine.getQueryResponseData().getData();
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/explain/ShardingCTLExplainBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/explain/ShardingCTLExplainBackendHandler.java
index 55085b6..cfed674 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/explain/ShardingCTLExplainBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/explain/ShardingCTLExplainBackendHandler.java
@@ -24,14 +24,14 @@ import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.context.kernel.KernelProcessor;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
import org.apache.shardingsphere.infra.executor.sql.context.ExecutionUnit;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.query.impl.QueryHeader;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.parser.ShardingSphereSQLParserEngine;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.exception.RuleNotExistsException;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
import org.apache.shardingsphere.proxy.backend.text.sctl.exception.InvalidShardingCTLFormatException;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
@@ -62,7 +62,7 @@ public final class ShardingCTLExplainBackendHandler implements TextProtocolBacke
private Iterator<ExecutionUnit> executionUnits;
@Override
- public BackendResponse execute() {
+ public ResponseHeader execute() {
Optional<ShardingCTLExplainStatement> explainStatement = new ShardingCTLExplainParser(sql).doParse();
if (!explainStatement.isPresent()) {
throw new InvalidShardingCTLFormatException(sql);
@@ -76,7 +76,7 @@ public final class ShardingCTLExplainBackendHandler implements TextProtocolBacke
queryHeaders = new ArrayList<>(2);
queryHeaders.add(new QueryHeader("", "", "datasource_name", "", 255, Types.CHAR, "CHAR", 0, false, false, false, false));
queryHeaders.add(new QueryHeader("", "", "sql", "", 255, Types.CHAR, "CHAR", 0, false, false, false, false));
- return new QueryResponse(queryHeaders);
+ return new QueryResponseHeader(queryHeaders);
}
private LogicSQL createLogicSQL(final ShardingSphereMetaData metaData, final ShardingCTLExplainStatement explainStatement) {
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintBackendHandler.java
index cf1e3b9..3786ae1 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintBackendHandler.java
@@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.config.properties.ConfigurationPropertyKey;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
import org.apache.shardingsphere.proxy.backend.text.sctl.exception.InvalidShardingCTLFormatException;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.HintCommand;
@@ -46,7 +46,7 @@ public final class ShardingCTLHintBackendHandler implements TextProtocolBackendH
@SuppressWarnings("unchecked")
@Override
- public BackendResponse execute() {
+ public ResponseHeader execute() {
if (!ProxyContext.getInstance().getMetaDataContexts().getProps().<Boolean>getValue(ConfigurationPropertyKey.PROXY_HINT_ENABLED)) {
throw new UnsupportedOperationException(String.format("%s should be true, please check your config", ConfigurationPropertyKey.PROXY_HINT_ENABLED.getKey()));
}
@@ -66,6 +66,6 @@ public final class ShardingCTLHintBackendHandler implements TextProtocolBackendH
@Override
public Collection<Object> getRowData() throws SQLException {
- return hintCommandExecutor.getQueryData().getData();
+ return hintCommandExecutor.getQueryResponseData().getData();
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/HintCommandExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/HintCommandExecutor.java
index ced15e4..51f3a17 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/HintCommandExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/HintCommandExecutor.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryData;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.data.QueryResponseData;
import java.sql.SQLException;
@@ -33,7 +33,7 @@ public interface HintCommandExecutor<T extends HintCommand> {
* @param hintCommand hint command
* @return backend response
*/
- BackendResponse execute(T hintCommand);
+ ResponseHeader execute(T hintCommand);
/**
* Goto next result value.
@@ -44,10 +44,10 @@ public interface HintCommandExecutor<T extends HintCommand> {
boolean next() throws SQLException;
/**
- * Get query data.
+ * Get query response data.
*
- * @return query data
+ * @return query response data
* @throws SQLException SQL exception
*/
- QueryData getQueryData() throws SQLException;
+ QueryResponseData getQueryResponseData() throws SQLException;
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/AbstractHintQueryExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/AbstractHintQueryExecutor.java
index 8e9b6a7..aa6aa4d 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/AbstractHintQueryExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/AbstractHintQueryExecutor.java
@@ -17,11 +17,11 @@
package org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.executor;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.query.impl.QueryHeader;
import org.apache.shardingsphere.infra.merge.result.MergedResult;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryData;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.data.QueryResponseData;
+import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.HintCommand;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.HintCommandExecutor;
@@ -39,10 +39,10 @@ public abstract class AbstractHintQueryExecutor<T extends HintCommand> implement
private MergedResult mergedResult;
@Override
- public final BackendResponse execute(final T hintCommand) {
+ public final ResponseHeader execute(final T hintCommand) {
queryHeaders = createQueryHeaders();
mergedResult = createMergedResult();
- return new QueryResponse(queryHeaders);
+ return new QueryResponseHeader(queryHeaders);
}
protected abstract List<QueryHeader> createQueryHeaders();
@@ -55,13 +55,13 @@ public abstract class AbstractHintQueryExecutor<T extends HintCommand> implement
}
@Override
- public final QueryData getQueryData() throws SQLException {
+ public final QueryResponseData getQueryResponseData() throws SQLException {
List<Integer> columnTypes = new ArrayList<>(queryHeaders.size());
List<Object> row = new ArrayList<>(queryHeaders.size());
for (int i = 0; i < queryHeaders.size(); i++) {
columnTypes.add(queryHeaders.get(i).getColumnType());
row.add(mergedResult.getValue(i + 1, Object.class));
}
- return new QueryData(columnTypes, row);
+ return new QueryResponseData(columnTypes, row);
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/AbstractHintUpdateExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/AbstractHintUpdateExecutor.java
index 31cc2ca..b0d4d8a 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/AbstractHintUpdateExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/AbstractHintUpdateExecutor.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.executor;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryData;
+import org.apache.shardingsphere.proxy.backend.response.data.QueryResponseData;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.HintCommand;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.HintCommandExecutor;
@@ -32,7 +32,7 @@ public abstract class AbstractHintUpdateExecutor<T extends HintCommand> implemen
}
@Override
- public final QueryData getQueryData() {
+ public final QueryResponseData getQueryResponseData() {
return null;
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintAddDatabaseShardingValueExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintAddDatabaseShardingValueExecutor.java
index c2293e3..f4f1431 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintAddDatabaseShardingValueExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintAddDatabaseShardingValueExecutor.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.executor;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.HintManagerHolder;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintAddDatabaseShardingValueCommand;
@@ -28,8 +28,8 @@ import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.H
public final class HintAddDatabaseShardingValueExecutor extends AbstractHintUpdateExecutor<HintAddDatabaseShardingValueCommand> {
@Override
- public BackendResponse execute(final HintAddDatabaseShardingValueCommand command) {
+ public ResponseHeader execute(final HintAddDatabaseShardingValueCommand command) {
HintManagerHolder.get().addDatabaseShardingValue(command.getLogicTable(), command.getValue());
- return new UpdateResponse();
+ return new UpdateResponseHeader();
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintAddTableShardingValueExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintAddTableShardingValueExecutor.java
index b905a5b..4228edd 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintAddTableShardingValueExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintAddTableShardingValueExecutor.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.executor;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.HintManagerHolder;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintAddTableShardingValueCommand;
@@ -28,8 +28,8 @@ import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.H
public final class HintAddTableShardingValueExecutor extends AbstractHintUpdateExecutor<HintAddTableShardingValueCommand> {
@Override
- public BackendResponse execute(final HintAddTableShardingValueCommand command) {
+ public ResponseHeader execute(final HintAddTableShardingValueCommand command) {
HintManagerHolder.get().addTableShardingValue(command.getLogicTable(), command.getValue());
- return new UpdateResponse();
+ return new UpdateResponseHeader();
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintClearExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintClearExecutor.java
index c86002c..e1a7b34 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintClearExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintClearExecutor.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.executor;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.HintManagerHolder;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintClearCommand;
@@ -28,9 +28,9 @@ import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.H
public final class HintClearExecutor extends AbstractHintUpdateExecutor<HintClearCommand> {
@Override
- public BackendResponse execute(final HintClearCommand command) {
+ public ResponseHeader execute(final HintClearCommand command) {
HintManagerHolder.get().close();
HintManagerHolder.remove();
- return new UpdateResponse();
+ return new UpdateResponseHeader();
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintErrorParameterExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintErrorParameterExecutor.java
index 50a6359..bbd4729 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintErrorParameterExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintErrorParameterExecutor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.executor;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import org.apache.shardingsphere.proxy.backend.text.sctl.exception.UnsupportedShardingCTLTypeException;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintErrorParameterCommand;
@@ -31,7 +31,7 @@ public final class HintErrorParameterExecutor extends AbstractHintUpdateExecutor
private final String sql;
@Override
- public BackendResponse execute(final HintErrorParameterCommand command) {
+ public ResponseHeader execute(final HintErrorParameterCommand command) {
throw new UnsupportedShardingCTLTypeException(sql);
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintSetDatabaseShardingValueExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintSetDatabaseShardingValueExecutor.java
index dc3a015..7b999e0 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintSetDatabaseShardingValueExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintSetDatabaseShardingValueExecutor.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.executor;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.HintManagerHolder;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintSetDatabaseShardingValueCommand;
@@ -28,8 +28,8 @@ import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.H
public final class HintSetDatabaseShardingValueExecutor extends AbstractHintUpdateExecutor<HintSetDatabaseShardingValueCommand> {
@Override
- public BackendResponse execute(final HintSetDatabaseShardingValueCommand command) {
+ public ResponseHeader execute(final HintSetDatabaseShardingValueCommand command) {
HintManagerHolder.get().setDatabaseShardingValue(command.getValue());
- return new UpdateResponse();
+ return new UpdateResponseHeader();
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintSetPrimaryOnlyExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintSetPrimaryOnlyExecutor.java
index 1200325..9366ac1 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintSetPrimaryOnlyExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintSetPrimaryOnlyExecutor.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.executor;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.HintManagerHolder;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.HintSetPrimaryOnlyCommand;
@@ -28,10 +28,10 @@ import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.command.H
public final class HintSetPrimaryOnlyExecutor extends AbstractHintUpdateExecutor<HintSetPrimaryOnlyCommand> {
@Override
- public BackendResponse execute(final HintSetPrimaryOnlyCommand command) {
+ public ResponseHeader execute(final HintSetPrimaryOnlyCommand command) {
if (command.isPrimaryOnly()) {
HintManagerHolder.get().setPrimaryRouteOnly();
}
- return new UpdateResponse();
+ return new UpdateResponseHeader();
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintShowStatusExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintShowStatusExecutor.java
index e622ca4..8b63891 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintShowStatusExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintShowStatusExecutor.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.executor;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.query.impl.QueryHeader;
import org.apache.shardingsphere.infra.hint.HintManager;
import org.apache.shardingsphere.infra.merge.result.MergedResult;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.HintShardingType;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintShowTableStatusExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintShowTableStatusExecutor.java
index a9954b4..03f2041 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintShowTableStatusExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/internal/executor/HintShowTableStatusExecutor.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.executor
import com.google.common.base.Joiner;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.query.impl.QueryHeader;
import org.apache.shardingsphere.infra.hint.HintManager;
import org.apache.shardingsphere.infra.merge.result.MergedResult;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/set/ShardingCTLSetBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/set/ShardingCTLSetBackendHandler.java
index bf9daab..f823169 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/set/ShardingCTLSetBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/set/ShardingCTLSetBackendHandler.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.proxy.backend.text.sctl.set;
import org.apache.shardingsphere.infra.exception.ShardingSphereException;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
import org.apache.shardingsphere.proxy.backend.text.sctl.exception.InvalidShardingCTLFormatException;
import org.apache.shardingsphere.proxy.backend.text.sctl.exception.UnsupportedShardingCTLTypeException;
@@ -44,7 +44,7 @@ public final class ShardingCTLSetBackendHandler implements TextProtocolBackendHa
}
@Override
- public BackendResponse execute() {
+ public ResponseHeader execute() {
Optional<ShardingCTLSetStatement> shardingTCLStatement = new ShardingCTLSetParser(sql).doParse();
if (!shardingTCLStatement.isPresent()) {
throw new InvalidShardingCTLFormatException(sql);
@@ -61,7 +61,7 @@ public final class ShardingCTLSetBackendHandler implements TextProtocolBackendHa
} else {
throw new UnsupportedShardingCTLTypeException(sql);
}
- return new UpdateResponse();
+ return new UpdateResponseHeader();
}
@Override
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/show/ShardingCTLShowBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/show/ShardingCTLShowBackendHandler.java
index 6032972..f049e94 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/show/ShardingCTLShowBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/show/ShardingCTLShowBackendHandler.java
@@ -17,11 +17,11 @@
package org.apache.shardingsphere.proxy.backend.text.sctl.show;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.query.impl.QueryHeader;
import org.apache.shardingsphere.infra.merge.result.MergedResult;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
import org.apache.shardingsphere.proxy.backend.text.sctl.exception.InvalidShardingCTLFormatException;
import org.apache.shardingsphere.proxy.backend.text.sctl.exception.UnsupportedShardingCTLTypeException;
@@ -51,7 +51,7 @@ public final class ShardingCTLShowBackendHandler implements TextProtocolBackendH
}
@Override
- public BackendResponse execute() {
+ public ResponseHeader execute() {
Optional<ShardingCTLShowStatement> showStatement = new ShardingCTLShowParser(sql).doParse();
if (!showStatement.isPresent()) {
throw new InvalidShardingCTLFormatException(sql);
@@ -66,9 +66,9 @@ public final class ShardingCTLShowBackendHandler implements TextProtocolBackendH
}
}
- private BackendResponse createResponsePackets(final String columnName, final Object... values) {
+ private ResponseHeader createResponsePackets(final String columnName, final Object... values) {
mergedResult = new MultipleLocalDataMergedResult(Collections.singletonList(Arrays.asList(values)));
- return new QueryResponse(Collections.singletonList(new QueryHeader("", "", columnName, columnName, 100, Types.VARCHAR, "VARCHAR", 0, false, false, false, false)));
+ return new QueryResponseHeader(Collections.singletonList(new QueryHeader("", "", columnName, columnName, 100, Types.VARCHAR, "VARCHAR", 0, false, false, false, false)));
}
@Override
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/skip/SkipBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/skip/SkipBackendHandler.java
index de301f86..1b77c84 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/skip/SkipBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/skip/SkipBackendHandler.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.proxy.backend.text.skip;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
import java.util.Collection;
@@ -29,8 +29,8 @@ import java.util.Collection;
public final class SkipBackendHandler implements TextProtocolBackendHandler {
@Override
- public BackendResponse execute() {
- return new UpdateResponse();
+ public ResponseHeader execute() {
+ return new UpdateResponseHeader();
}
@Override
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandler.java
index 6e8370f..e398c65 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandler.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.proxy.backend.text.transaction;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.transaction.BackendTransactionManager;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
import org.apache.shardingsphere.transaction.core.TransactionOperationType;
@@ -43,7 +43,7 @@ public final class TransactionBackendHandler implements TextProtocolBackendHandl
}
@Override
- public BackendResponse execute() throws SQLException {
+ public ResponseHeader execute() throws SQLException {
switch (operationType) {
case BEGIN:
backendTransactionManager.begin();
@@ -57,7 +57,7 @@ public final class TransactionBackendHandler implements TextProtocolBackendHandl
default:
throw new SQLFeatureNotSupportedException(operationType.name());
}
- return new UpdateResponse();
+ return new UpdateResponseHeader();
}
@Override
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/response/query/QueryHeaderBuilderTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/response/header/query/impl/QueryHeaderBuilderTest.java
similarity index 99%
rename from shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/response/query/QueryHeaderBuilderTest.java
rename to shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/response/header/query/impl/QueryHeaderBuilderTest.java
index 15fb907..68eb354 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/response/query/QueryHeaderBuilderTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/response/header/query/impl/QueryHeaderBuilderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.response.query;
+package org.apache.shardingsphere.proxy.backend.response.header.query.impl;
import org.apache.shardingsphere.infra.binder.segment.select.projection.ProjectionsContext;
import org.apache.shardingsphere.infra.binder.segment.select.projection.impl.ColumnProjection;
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 23fe3c4..940bd87 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
@@ -28,8 +28,8 @@ import org.apache.shardingsphere.proxy.backend.communication.DatabaseCommunicati
import org.apache.shardingsphere.proxy.backend.communication.DatabaseCommunicationEngineFactory;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.junit.Before;
import org.junit.Test;
@@ -79,13 +79,13 @@ public final class BroadcastBackendHandlerTest {
@Test
public void assertExecuteSuccess() throws SQLException {
- mockDatabaseCommunicationEngine(new UpdateResponse());
+ mockDatabaseCommunicationEngine(new UpdateResponseHeader());
BroadcastBackendHandler broadcastBackendHandler = new BroadcastBackendHandler("SET timeout = 1000", mock(SQLStatement.class), backendConnection);
setBackendHandlerFactory(broadcastBackendHandler);
- BackendResponse actual = broadcastBackendHandler.execute();
- assertThat(actual, instanceOf(UpdateResponse.class));
- assertThat(((UpdateResponse) actual).getUpdateCount(), is(0L));
- assertThat(((UpdateResponse) actual).getLastInsertId(), is(0L));
+ ResponseHeader actual = broadcastBackendHandler.execute();
+ assertThat(actual, instanceOf(UpdateResponseHeader.class));
+ assertThat(((UpdateResponseHeader) actual).getUpdateCount(), is(0L));
+ assertThat(((UpdateResponseHeader) actual).getLastInsertId(), is(0L));
verify(databaseCommunicationEngine, times(10)).execute();
}
@@ -99,8 +99,8 @@ public final class BroadcastBackendHandlerTest {
return result;
}
- private void mockDatabaseCommunicationEngine(final BackendResponse backendResponse) throws SQLException {
- when(databaseCommunicationEngine.execute()).thenReturn(backendResponse);
+ private void mockDatabaseCommunicationEngine(final ResponseHeader responseHeader) throws SQLException {
+ when(databaseCommunicationEngine.execute()).thenReturn(responseHeader);
when(databaseCommunicationEngineFactory.newTextProtocolInstance(any(), anyString(), any())).thenReturn(databaseCommunicationEngine);
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/RDLBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/RDLBackendHandlerTest.java
index 95dcbd9..8cca1ed 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/RDLBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/RDLBackendHandlerTest.java
@@ -28,8 +28,8 @@ import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.exception.DBCreateExistsException;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.distsql.parser.statement.rdl.CreateDataSourcesStatement;
import org.apache.shardingsphere.distsql.parser.statement.rdl.CreateShardingRuleStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.CreateDatabaseStatement;
@@ -86,8 +86,8 @@ public final class RDLBackendHandlerTest {
assertThat(ex.getMessage(), is("No Registry center to execute `CreateDatabaseStatementContext` SQL"));
}
setGovernanceMetaDataContexts(true);
- BackendResponse response = executeEngine.execute();
- assertThat(response, instanceOf(UpdateResponse.class));
+ ResponseHeader response = executeEngine.execute();
+ assertThat(response, instanceOf(UpdateResponseHeader.class));
}
@Test
@@ -111,8 +111,8 @@ public final class RDLBackendHandlerTest {
assertThat(ex.getMessage(), is("No Registry center to execute `DropDatabaseStatementContext` SQL"));
}
setGovernanceMetaDataContexts(true);
- BackendResponse response = executeEngine.execute();
- assertThat(response, instanceOf(UpdateResponse.class));
+ ResponseHeader response = executeEngine.execute();
+ assertThat(response, instanceOf(UpdateResponseHeader.class));
}
@Test
@@ -158,8 +158,8 @@ public final class RDLBackendHandlerTest {
assertThat(ex.getMessage(), is("No Registry center to execute `CreateDataSourcesStatementContext` SQL"));
}
setGovernanceMetaDataContexts(true);
- BackendResponse response = executeEngine.execute();
- assertThat(response, instanceOf(UpdateResponse.class));
+ ResponseHeader response = executeEngine.execute();
+ assertThat(response, instanceOf(UpdateResponseHeader.class));
}
@Test
@@ -173,8 +173,8 @@ public final class RDLBackendHandlerTest {
assertThat(ex.getMessage(), is("No Registry center to execute `CreateShardingRuleStatementContext` SQL"));
}
setGovernanceMetaDataContexts(true);
- BackendResponse response = executeEngine.execute();
- assertThat(response, instanceOf(UpdateResponse.class));
+ ResponseHeader response = executeEngine.execute();
+ assertThat(response, instanceOf(UpdateResponseHeader.class));
}
@SneakyThrows(ReflectiveOperationException.class)
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/ShowDatabasesBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/ShowDatabasesBackendHandlerTest.java
index e3de1ef..8ee4ccf 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/ShowDatabasesBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/ShowDatabasesBackendHandlerTest.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -80,8 +80,8 @@ public final class ShowDatabasesBackendHandlerTest {
@Test
public void assertExecuteShowDatabaseBackendHandler() {
- QueryResponse actual = (QueryResponse) showDatabasesBackendHandler.execute();
- assertThat(actual, instanceOf(QueryResponse.class));
+ QueryResponseHeader actual = (QueryResponseHeader) showDatabasesBackendHandler.execute();
+ assertThat(actual, instanceOf(QueryResponseHeader.class));
assertThat(actual.getQueryHeaders().size(), is(1));
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/ShowTablesBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/ShowTablesBackendHandlerTest.java
index 05e76e1..9d64771 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/ShowTablesBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/ShowTablesBackendHandlerTest.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
import org.junit.Before;
import org.junit.Test;
@@ -82,8 +82,8 @@ public final class ShowTablesBackendHandlerTest {
@Test
public void assertExecuteShowTablesBackendHandler() {
- QueryResponse actual = (QueryResponse) tablesBackendHandler.execute();
- assertThat(actual, instanceOf(QueryResponse.class));
+ QueryResponseHeader actual = (QueryResponseHeader) tablesBackendHandler.execute();
+ assertThat(actual, instanceOf(QueryResponseHeader.class));
assertThat(actual.getQueryHeaders().size(), is(1));
}
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 1cddc73..bc37016 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
@@ -28,8 +28,8 @@ import org.apache.shardingsphere.proxy.backend.communication.DatabaseCommunicati
import org.apache.shardingsphere.proxy.backend.communication.DatabaseCommunicationEngineFactory;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.transaction.core.TransactionType;
import org.junit.Before;
@@ -69,7 +69,7 @@ public final class UnicastBackendHandlerTest {
metaDataContexts.setAccessible(true);
metaDataContexts.set(ProxyContext.getInstance(),
new StandardMetaDataContexts(getMetaDataMap(), mock(ExecutorEngine.class), new Authentication(), new ConfigurationProperties(new Properties()), new MySQLDatabaseType()));
- setUnderlyingHandler(new UpdateResponse());
+ setUnderlyingHandler(new UpdateResponseHeader());
}
private Map<String, ShardingSphereMetaData> getMetaDataMap() {
@@ -85,8 +85,8 @@ public final class UnicastBackendHandlerTest {
UnicastBackendHandler backendHandler = new UnicastBackendHandler("show variable like %s", mock(SQLStatement.class), backendConnection);
backendConnection.setCurrentSchema(String.format(SCHEMA_PATTERN, 8));
setDatabaseCommunicationEngine(backendHandler);
- BackendResponse actual = backendHandler.execute();
- assertThat(actual, instanceOf(UpdateResponse.class));
+ ResponseHeader actual = backendHandler.execute();
+ assertThat(actual, instanceOf(UpdateResponseHeader.class));
backendHandler.execute();
}
@@ -95,14 +95,14 @@ public final class UnicastBackendHandlerTest {
backendConnection.setCurrentSchema(String.format(SCHEMA_PATTERN, 0));
UnicastBackendHandler backendHandler = new UnicastBackendHandler("show variable like %s", mock(SQLStatement.class), backendConnection);
setDatabaseCommunicationEngine(backendHandler);
- BackendResponse actual = backendHandler.execute();
- assertThat(actual, instanceOf(UpdateResponse.class));
+ ResponseHeader actual = backendHandler.execute();
+ assertThat(actual, instanceOf(UpdateResponseHeader.class));
backendHandler.execute();
}
- private void setUnderlyingHandler(final BackendResponse backendResponse) throws SQLException {
+ private void setUnderlyingHandler(final ResponseHeader responseHeader) throws SQLException {
DatabaseCommunicationEngine databaseCommunicationEngine = mock(DatabaseCommunicationEngine.class);
- when(databaseCommunicationEngine.execute()).thenReturn(backendResponse);
+ when(databaseCommunicationEngine.execute()).thenReturn(responseHeader);
when(databaseCommunicationEngineFactory.newTextProtocolInstance(any(), anyString(), any())).thenReturn(databaseCommunicationEngine);
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/UseDatabaseBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/UseDatabaseBackendHandlerTest.java
index d1ddbd0..08d25aa 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/UseDatabaseBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/UseDatabaseBackendHandlerTest.java
@@ -27,8 +27,8 @@ import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.exception.UnknownDatabaseException;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dal.MySQLUseStatement;
import org.junit.Before;
import org.junit.Test;
@@ -85,9 +85,9 @@ public final class UseDatabaseBackendHandlerTest {
MySQLUseStatement useStatement = mock(MySQLUseStatement.class);
when(useStatement.getSchema()).thenReturn(String.format(SCHEMA_PATTERN, 0));
UseDatabaseBackendHandler useSchemaBackendHandler = new UseDatabaseBackendHandler(useStatement, backendConnection);
- BackendResponse actual = useSchemaBackendHandler.execute();
+ ResponseHeader actual = useSchemaBackendHandler.execute();
verify(backendConnection).setCurrentSchema(anyString());
- assertThat(actual, instanceOf(UpdateResponse.class));
+ assertThat(actual, instanceOf(UpdateResponseHeader.class));
}
@Test(expected = UnknownDatabaseException.class)
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintBackendHandlerTest.java
index 713ad8a..6bb03c4 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintBackendHandlerTest.java
@@ -31,9 +31,9 @@ import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
import org.apache.shardingsphere.infra.metadata.schema.model.TableMetaData;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryResponse;
-import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.text.sctl.exception.InvalidShardingCTLFormatException;
import org.apache.shardingsphere.proxy.backend.text.sctl.exception.UnsupportedShardingCTLTypeException;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.HintManagerHolder;
@@ -90,7 +90,7 @@ public final class ShardingCTLHintBackendHandlerTest {
clearThreadLocal();
String sql = "sctl:hint set primary_only=true ";
ShardingCTLHintBackendHandler hintBackendHandler = new ShardingCTLHintBackendHandler(sql, backendConnection);
- assertThat(hintBackendHandler.execute(), instanceOf(UpdateResponse.class));
+ assertThat(hintBackendHandler.execute(), instanceOf(UpdateResponseHeader.class));
assertTrue(HintManager.isPrimaryRouteOnly());
}
@@ -99,7 +99,7 @@ public final class ShardingCTLHintBackendHandlerTest {
clearThreadLocal();
String sql = "sctl:hint set databaseShardingValue=100";
ShardingCTLHintBackendHandler hintBackendHandler = new ShardingCTLHintBackendHandler(sql, backendConnection);
- assertThat(hintBackendHandler.execute(), instanceOf(UpdateResponse.class));
+ assertThat(hintBackendHandler.execute(), instanceOf(UpdateResponseHeader.class));
assertThat(HintManager.getDatabaseShardingValues().iterator().next().toString(), is("100"));
}
@@ -108,7 +108,7 @@ public final class ShardingCTLHintBackendHandlerTest {
clearThreadLocal();
String sql = "sctl:hint addDatabaseShardingValue user=100 ";
ShardingCTLHintBackendHandler hintBackendHandler = new ShardingCTLHintBackendHandler(sql, backendConnection);
- assertThat(hintBackendHandler.execute(), instanceOf(UpdateResponse.class));
+ assertThat(hintBackendHandler.execute(), instanceOf(UpdateResponseHeader.class));
assertThat(HintManager.getDatabaseShardingValues("user").iterator().next().toString(), is("100"));
}
@@ -117,7 +117,7 @@ public final class ShardingCTLHintBackendHandlerTest {
clearThreadLocal();
String sql = "sctl:hint addTableShardingValue user=100 ";
ShardingCTLHintBackendHandler hintBackendHandler = new ShardingCTLHintBackendHandler(sql, backendConnection);
- assertThat(hintBackendHandler.execute(), instanceOf(UpdateResponse.class));
+ assertThat(hintBackendHandler.execute(), instanceOf(UpdateResponseHeader.class));
assertThat(HintManager.getTableShardingValues("user").iterator().next().toString(), is("100"));
}
@@ -126,7 +126,7 @@ public final class ShardingCTLHintBackendHandlerTest {
clearThreadLocal();
String sql = "sctl:hint clear ";
ShardingCTLHintBackendHandler hintBackendHandler = new ShardingCTLHintBackendHandler(sql, backendConnection);
- assertThat(hintBackendHandler.execute(), instanceOf(UpdateResponse.class));
+ assertThat(hintBackendHandler.execute(), instanceOf(UpdateResponseHeader.class));
assertThat(HintManager.getInstance(), instanceOf(HintManager.class));
HintManager.clear();
}
@@ -136,10 +136,10 @@ public final class ShardingCTLHintBackendHandlerTest {
clearThreadLocal();
String sql = "sctl:hint show status";
ShardingCTLHintBackendHandler defaultHintBackendHandler = new ShardingCTLHintBackendHandler(sql, backendConnection);
- BackendResponse backendResponse = defaultHintBackendHandler.execute();
- assertThat(backendResponse, instanceOf(QueryResponse.class));
- assertThat(((QueryResponse) backendResponse).getQueryHeaders().get(0).getColumnLabel(), is("primary_only"));
- assertThat(((QueryResponse) backendResponse).getQueryHeaders().get(1).getColumnLabel(), is("sharding_type"));
+ ResponseHeader responseHeader = defaultHintBackendHandler.execute();
+ assertThat(responseHeader, instanceOf(QueryResponseHeader.class));
+ assertThat(((QueryResponseHeader) responseHeader).getQueryHeaders().get(0).getColumnLabel(), is("primary_only"));
+ assertThat(((QueryResponseHeader) responseHeader).getQueryHeaders().get(1).getColumnLabel(), is("sharding_type"));
assertTrue(defaultHintBackendHandler.next());
Iterator<Object> defaultRowData = defaultHintBackendHandler.getRowData().iterator();
assertThat(defaultRowData.next().toString(), is("false"));
@@ -170,11 +170,11 @@ public final class ShardingCTLHintBackendHandlerTest {
new StandardMetaDataContexts(getMetaDataMap(), mock(ExecutorEngine.class), new Authentication(), new ConfigurationProperties(props), new MySQLDatabaseType()));
String sql = "sctl:hint show table status";
ShardingCTLHintBackendHandler defaultHintBackendHandler = new ShardingCTLHintBackendHandler(sql, backendConnection);
- BackendResponse backendResponse = defaultHintBackendHandler.execute();
- assertThat(backendResponse, instanceOf(QueryResponse.class));
- assertThat(((QueryResponse) backendResponse).getQueryHeaders().get(0).getColumnLabel(), is("table_name"));
- assertThat(((QueryResponse) backendResponse).getQueryHeaders().get(1).getColumnLabel(), is("database_sharding_values"));
- assertThat(((QueryResponse) backendResponse).getQueryHeaders().get(2).getColumnLabel(), is("table_sharding_values"));
+ ResponseHeader responseHeader = defaultHintBackendHandler.execute();
+ assertThat(responseHeader, instanceOf(QueryResponseHeader.class));
+ assertThat(((QueryResponseHeader) responseHeader).getQueryHeaders().get(0).getColumnLabel(), is("table_name"));
+ assertThat(((QueryResponseHeader) responseHeader).getQueryHeaders().get(1).getColumnLabel(), is("database_sharding_values"));
+ assertThat(((QueryResponseHeader) responseHeader).getQueryHeaders().get(2).getColumnLabel(), is("table_sharding_values"));
assertTrue(defaultHintBackendHandler.next());
Iterator<Object> defaultRowData = defaultHintBackendHandler.getRowData().iterator();
assertThat(defaultRowData.next().toString(), is("user"));
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/set/ShardingCTLSetBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/set/ShardingCTLSetBackendHandlerTest.java
index 409e835..f1e5bc1 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/set/ShardingCTLSetBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/set/ShardingCTLSetBackendHandlerTest.java
@@ -25,8 +25,8 @@ import org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.text.sctl.exception.InvalidShardingCTLFormatException;
import org.apache.shardingsphere.proxy.backend.text.sctl.exception.UnsupportedShardingCTLTypeException;
import org.apache.shardingsphere.transaction.core.TransactionType;
@@ -69,8 +69,8 @@ public final class ShardingCTLSetBackendHandlerTest {
public void assertSwitchTransactionTypeXA() {
backendConnection.setCurrentSchema(String.format(SCHEMA_PATTERN, 0));
ShardingCTLSetBackendHandler shardingCTLBackendHandler = new ShardingCTLSetBackendHandler("sctl:set transaction_type=XA", backendConnection);
- BackendResponse actual = shardingCTLBackendHandler.execute();
- assertThat(actual, instanceOf(UpdateResponse.class));
+ ResponseHeader actual = shardingCTLBackendHandler.execute();
+ assertThat(actual, instanceOf(UpdateResponseHeader.class));
assertThat(backendConnection.getTransactionStatus().getTransactionType(), is(TransactionType.XA));
}
@@ -78,8 +78,8 @@ public final class ShardingCTLSetBackendHandlerTest {
public void assertSwitchTransactionTypeBASE() {
backendConnection.setCurrentSchema(String.format(SCHEMA_PATTERN, 0));
ShardingCTLSetBackendHandler shardingCTLBackendHandler = new ShardingCTLSetBackendHandler("sctl:set transaction_type=BASE", backendConnection);
- BackendResponse actual = shardingCTLBackendHandler.execute();
- assertThat(actual, instanceOf(UpdateResponse.class));
+ ResponseHeader actual = shardingCTLBackendHandler.execute();
+ assertThat(actual, instanceOf(UpdateResponseHeader.class));
assertThat(backendConnection.getTransactionStatus().getTransactionType(), is(TransactionType.BASE));
}
@@ -87,8 +87,8 @@ public final class ShardingCTLSetBackendHandlerTest {
public void assertSwitchTransactionTypeLOCAL() {
backendConnection.setCurrentSchema(String.format(SCHEMA_PATTERN, 0));
ShardingCTLSetBackendHandler shardingCTLBackendHandler = new ShardingCTLSetBackendHandler("sctl:set transaction_type=LOCAL", backendConnection);
- BackendResponse actual = shardingCTLBackendHandler.execute();
- assertThat(actual, instanceOf(UpdateResponse.class));
+ ResponseHeader actual = shardingCTLBackendHandler.execute();
+ assertThat(actual, instanceOf(UpdateResponseHeader.class));
assertThat(backendConnection.getTransactionStatus().getTransactionType(), is(TransactionType.LOCAL));
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/show/ShardingCTLShowBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/show/ShardingCTLShowBackendHandlerTest.java
index 2c41316..46ec702 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/show/ShardingCTLShowBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/show/ShardingCTLShowBackendHandlerTest.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.proxy.backend.text.sctl.show;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
import org.apache.shardingsphere.proxy.backend.text.sctl.exception.InvalidShardingCTLFormatException;
import org.apache.shardingsphere.proxy.backend.text.sctl.exception.UnsupportedShardingCTLTypeException;
import org.apache.shardingsphere.transaction.core.TransactionType;
@@ -40,9 +40,9 @@ public final class ShardingCTLShowBackendHandlerTest {
public void assertShowTransactionType() throws SQLException {
backendConnection.setCurrentSchema("schema");
ShardingCTLShowBackendHandler backendHandler = new ShardingCTLShowBackendHandler("sctl:show transaction_type", backendConnection);
- BackendResponse actual = backendHandler.execute();
- assertThat(actual, instanceOf(QueryResponse.class));
- assertThat(((QueryResponse) actual).getQueryHeaders().size(), is(1));
+ ResponseHeader actual = backendHandler.execute();
+ assertThat(actual, instanceOf(QueryResponseHeader.class));
+ assertThat(((QueryResponseHeader) actual).getQueryHeaders().size(), is(1));
backendHandler.next();
Collection<Object> rowData = backendHandler.getRowData();
assertThat(rowData.iterator().next(), is("LOCAL"));
@@ -52,9 +52,9 @@ public final class ShardingCTLShowBackendHandlerTest {
public void assertShowCachedConnections() throws SQLException {
backendConnection.setCurrentSchema("schema");
ShardingCTLShowBackendHandler backendHandler = new ShardingCTLShowBackendHandler("sctl:show cached_connections", backendConnection);
- BackendResponse actual = backendHandler.execute();
- assertThat(actual, instanceOf(QueryResponse.class));
- assertThat(((QueryResponse) actual).getQueryHeaders().size(), is(1));
+ ResponseHeader actual = backendHandler.execute();
+ assertThat(actual, instanceOf(QueryResponseHeader.class));
+ assertThat(((QueryResponseHeader) actual).getQueryHeaders().size(), is(1));
backendHandler.next();
Collection<Object> rowData = backendHandler.getRowData();
assertThat(rowData.iterator().next(), is(0));
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/skip/SkipBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/skip/SkipBackendHandlerTest.java
index d7805fa..accba7d 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/skip/SkipBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/skip/SkipBackendHandlerTest.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.proxy.backend.text.skip;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
@@ -29,7 +29,7 @@ public final class SkipBackendHandlerTest {
@Test
public void assertExecuteSkipBackendHandler() {
SkipBackendHandler skipBackendHandler = new SkipBackendHandler();
- BackendResponse actual = skipBackendHandler.execute();
- assertThat(actual, instanceOf(UpdateResponse.class));
+ ResponseHeader actual = skipBackendHandler.execute();
+ assertThat(actual, instanceOf(UpdateResponseHeader.class));
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandlerTest.java
index cef2456..ceae961 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandlerTest.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.proxy.backend.text.transaction;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.transaction.core.TransactionOperationType;
import org.apache.shardingsphere.transaction.core.TransactionType;
import org.junit.Test;
@@ -36,7 +36,7 @@ public final class TransactionBackendHandlerTest {
@Test
public void assertExecute() throws SQLException {
TransactionBackendHandler transactionBackendHandler = new TransactionBackendHandler(TransactionOperationType.BEGIN, backendConnection);
- BackendResponse actual = transactionBackendHandler.execute();
- assertThat(actual, instanceOf(UpdateResponse.class));
+ ResponseHeader actual = transactionBackendHandler.execute();
+ assertThat(actual, instanceOf(UpdateResponseHeader.class));
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutor.java
index d5974c8..1675f40 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutor.java
@@ -29,10 +29,10 @@ import org.apache.shardingsphere.proxy.backend.communication.DatabaseCommunicati
import org.apache.shardingsphere.proxy.backend.communication.DatabaseCommunicationEngineFactory;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryData;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryResponse;
-import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.data.QueryResponseData;
+import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.frontend.command.executor.QueryCommandExecutor;
import org.apache.shardingsphere.proxy.frontend.command.executor.ResponseType;
import org.apache.shardingsphere.proxy.frontend.mysql.command.query.builder.ResponsePacketBuilder;
@@ -63,20 +63,20 @@ public final class MySQLComStmtExecuteExecutor implements QueryCommandExecutor {
@Override
public Collection<DatabasePacket<?>> execute() throws SQLException {
- BackendResponse backendResponse = databaseCommunicationEngine.execute();
- return backendResponse instanceof QueryResponse ? processQuery((QueryResponse) backendResponse) : processUpdate((UpdateResponse) backendResponse);
+ ResponseHeader responseHeader = databaseCommunicationEngine.execute();
+ return responseHeader instanceof QueryResponseHeader ? processQuery((QueryResponseHeader) responseHeader) : processUpdate((UpdateResponseHeader) responseHeader);
}
- private Collection<DatabasePacket<?>> processQuery(final QueryResponse queryResponse) {
+ private Collection<DatabasePacket<?>> processQuery(final QueryResponseHeader queryResponseHeader) {
responseType = ResponseType.QUERY;
- Collection<DatabasePacket<?>> result = ResponsePacketBuilder.buildQueryResponsePackets(queryResponse);
+ Collection<DatabasePacket<?>> result = ResponsePacketBuilder.buildQueryResponsePackets(queryResponseHeader);
currentSequenceId = result.size();
return result;
}
- private Collection<DatabasePacket<?>> processUpdate(final UpdateResponse updateResponse) {
+ private Collection<DatabasePacket<?>> processUpdate(final UpdateResponseHeader updateResponseHeader) {
responseType = ResponseType.UPDATE;
- return ResponsePacketBuilder.buildUpdateResponsePackets(updateResponse);
+ return ResponsePacketBuilder.buildUpdateResponsePackets(updateResponseHeader);
}
@Override
@@ -86,7 +86,7 @@ public final class MySQLComStmtExecuteExecutor implements QueryCommandExecutor {
@Override
public MySQLPacket getQueryData() throws SQLException {
- QueryData queryData = databaseCommunicationEngine.getQueryData();
+ QueryResponseData queryData = databaseCommunicationEngine.getQueryResponseData();
return new MySQLBinaryResultSetRowPacket(++currentSequenceId, queryData.getData(), queryData.getColumnTypes().stream().map(MySQLColumnType::valueOfJDBCType).collect(Collectors.toList()));
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/builder/ResponsePacketBuilder.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/builder/ResponsePacketBuilder.java
index 2d17f96..4816981 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/builder/ResponsePacketBuilder.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/builder/ResponsePacketBuilder.java
@@ -26,9 +26,9 @@ import org.apache.shardingsphere.db.protocol.mysql.packet.command.query.MySQLFie
import org.apache.shardingsphere.db.protocol.mysql.packet.generic.MySQLEofPacket;
import org.apache.shardingsphere.db.protocol.mysql.packet.generic.MySQLOKPacket;
import org.apache.shardingsphere.db.protocol.packet.DatabasePacket;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryHeader;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryResponse;
-import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.query.impl.QueryHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import java.util.Collection;
import java.util.Collections;
@@ -44,13 +44,13 @@ public final class ResponsePacketBuilder {
/**
* Build query response packets.
*
- * @param queryResponse query response
+ * @param queryResponseHeader query response header
* @return query response packets
*/
- public static Collection<DatabasePacket<?>> buildQueryResponsePackets(final QueryResponse queryResponse) {
+ public static Collection<DatabasePacket<?>> buildQueryResponsePackets(final QueryResponseHeader queryResponseHeader) {
Collection<DatabasePacket<?>> result = new LinkedList<>();
int sequenceId = 0;
- List<QueryHeader> queryHeader = queryResponse.getQueryHeaders();
+ List<QueryHeader> queryHeader = queryResponseHeader.getQueryHeaders();
result.add(new MySQLFieldCountPacket(++sequenceId, queryHeader.size()));
for (QueryHeader each : queryHeader) {
result.add(new MySQLColumnDefinition41Packet(++sequenceId, getColumnFieldDetailFlag(each), each.getSchema(), each.getTable(), each.getTable(),
@@ -80,10 +80,10 @@ public final class ResponsePacketBuilder {
/**
* Build update response packets.
*
- * @param updateResponse update response
+ * @param updateResponseHeader update response header
* @return update response packets
*/
- public static Collection<DatabasePacket<?>> buildUpdateResponsePackets(final UpdateResponse updateResponse) {
- return Collections.singletonList(new MySQLOKPacket(1, updateResponse.getUpdateCount(), updateResponse.getLastInsertId()));
+ public static Collection<DatabasePacket<?>> buildUpdateResponsePackets(final UpdateResponseHeader updateResponseHeader) {
+ return Collections.singletonList(new MySQLOKPacket(1, updateResponseHeader.getUpdateCount(), updateResponseHeader.getLastInsertId()));
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/fieldlist/MySQLComFieldListPacketExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/fieldlist/MySQLComFieldListPacketExecutor.java
index 87611d8..0a0c799 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/fieldlist/MySQLComFieldListPacketExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/fieldlist/MySQLComFieldListPacketExecutor.java
@@ -69,7 +69,7 @@ public final class MySQLComFieldListPacketExecutor implements CommandExecutor {
private Collection<DatabasePacket<?>> createColumnDefinition41Packets() throws SQLException {
Collection<DatabasePacket<?>> result = new LinkedList<>();
while (databaseCommunicationEngine.next()) {
- String columnName = databaseCommunicationEngine.getQueryData().getData().get(0).toString();
+ String columnName = databaseCommunicationEngine.getQueryResponseData().getData().get(0).toString();
result.add(new MySQLColumnDefinition41Packet(++currentSequenceId, schemaName, packet.getTable(), packet.getTable(), columnName, columnName, 100, MySQLColumnType.MYSQL_TYPE_VARCHAR, 0));
}
result.add(new MySQLEofPacket(++currentSequenceId));
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutor.java
index da832eb..dec8e48 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutor.java
@@ -24,9 +24,9 @@ import org.apache.shardingsphere.db.protocol.mysql.packet.command.query.text.que
import org.apache.shardingsphere.db.protocol.packet.DatabasePacket;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryResponse;
-import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandlerFactory;
import org.apache.shardingsphere.proxy.frontend.command.executor.QueryCommandExecutor;
@@ -54,20 +54,20 @@ public final class MySQLComQueryPacketExecutor implements QueryCommandExecutor {
@Override
public Collection<DatabasePacket<?>> execute() throws SQLException {
- BackendResponse backendResponse = textProtocolBackendHandler.execute();
- return backendResponse instanceof QueryResponse ? processQuery((QueryResponse) backendResponse) : processUpdate((UpdateResponse) backendResponse);
+ ResponseHeader responseHeader = textProtocolBackendHandler.execute();
+ return responseHeader instanceof QueryResponseHeader ? processQuery((QueryResponseHeader) responseHeader) : processUpdate((UpdateResponseHeader) responseHeader);
}
- private Collection<DatabasePacket<?>> processQuery(final QueryResponse queryResponse) {
+ private Collection<DatabasePacket<?>> processQuery(final QueryResponseHeader queryResponseHeader) {
responseType = ResponseType.QUERY;
- Collection<DatabasePacket<?>> result = ResponsePacketBuilder.buildQueryResponsePackets(queryResponse);
+ Collection<DatabasePacket<?>> result = ResponsePacketBuilder.buildQueryResponsePackets(queryResponseHeader);
currentSequenceId = result.size();
return result;
}
- private Collection<DatabasePacket<?>> processUpdate(final UpdateResponse updateResponse) {
+ private Collection<DatabasePacket<?>> processUpdate(final UpdateResponseHeader updateResponseHeader) {
responseType = ResponseType.UPDATE;
- return ResponsePacketBuilder.buildUpdateResponsePackets(updateResponse);
+ return ResponsePacketBuilder.buildUpdateResponsePackets(updateResponseHeader);
}
@Override
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutorTest.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutorTest.java
index 2c4ed37..68a0013 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutorTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutorTest.java
@@ -23,13 +23,13 @@ import org.apache.shardingsphere.infra.config.properties.ConfigurationProperties
import org.apache.shardingsphere.infra.context.metadata.impl.StandardMetaDataContexts;
import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
import org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.query.impl.QueryHeader;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.proxy.backend.communication.DatabaseCommunicationEngine;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryResponse;
-import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.frontend.command.executor.ResponseType;
import org.junit.Before;
import org.junit.Test;
@@ -73,7 +73,7 @@ public final class MySQLComStmtExecuteExecutorTest {
when(packet.getSql()).thenReturn("SELECT 1");
MySQLComStmtExecuteExecutor mysqlComStmtExecuteExecutor = new MySQLComStmtExecuteExecutor(packet, backendConnection);
FieldSetter.setField(mysqlComStmtExecuteExecutor, MySQLComStmtExecuteExecutor.class.getDeclaredField("databaseCommunicationEngine"), databaseCommunicationEngine);
- when(databaseCommunicationEngine.execute()).thenReturn(new QueryResponse(Collections.singletonList(mock(QueryHeader.class))));
+ when(databaseCommunicationEngine.execute()).thenReturn(new QueryResponseHeader(Collections.singletonList(mock(QueryHeader.class))));
mysqlComStmtExecuteExecutor.execute();
assertThat(mysqlComStmtExecuteExecutor.getResponseType(), is(ResponseType.QUERY));
}
@@ -86,7 +86,7 @@ public final class MySQLComStmtExecuteExecutorTest {
when(packet.getSql()).thenReturn("SELECT 1");
MySQLComStmtExecuteExecutor mysqlComStmtExecuteExecutor = new MySQLComStmtExecuteExecutor(packet, backendConnection);
FieldSetter.setField(mysqlComStmtExecuteExecutor, MySQLComStmtExecuteExecutor.class.getDeclaredField("databaseCommunicationEngine"), databaseCommunicationEngine);
- when(databaseCommunicationEngine.execute()).thenReturn(new UpdateResponse());
+ when(databaseCommunicationEngine.execute()).thenReturn(new UpdateResponseHeader());
mysqlComStmtExecuteExecutor.execute();
assertThat(mysqlComStmtExecuteExecutor.getResponseType(), is(ResponseType.UPDATE));
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/builder/ResponsePacketBuilderTest.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/builder/ResponsePacketBuilderTest.java
index 1977fb5..b3387d9 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/builder/ResponsePacketBuilderTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/builder/ResponsePacketBuilderTest.java
@@ -22,9 +22,9 @@ import org.apache.shardingsphere.db.protocol.mysql.packet.command.query.MySQLFie
import org.apache.shardingsphere.db.protocol.mysql.packet.generic.MySQLEofPacket;
import org.apache.shardingsphere.db.protocol.mysql.packet.generic.MySQLOKPacket;
import org.apache.shardingsphere.db.protocol.packet.DatabasePacket;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryHeader;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryResponse;
-import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.query.impl.QueryHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.junit.Test;
import java.util.Arrays;
@@ -45,17 +45,17 @@ public final class ResponsePacketBuilderTest {
QueryHeader queryHeader1 = new QueryHeader("schema1", "table1", "columnLabel1", "columnName1", 4, 5, "VARCHAR", 6, false, true, false, true);
QueryHeader queryHeader2 = new QueryHeader("schema2", "table2", "columnLabel2", "columnName2", 7, 8, "VARCHAR", 9, false, true, true, true);
List<QueryHeader> queryHeaders = Arrays.asList(queryHeader1, queryHeader2);
- QueryResponse queryResponse = new QueryResponse(queryHeaders);
- Collection<DatabasePacket<?>> actual = ResponsePacketBuilder.buildQueryResponsePackets(queryResponse);
+ QueryResponseHeader queryResponseHeader = new QueryResponseHeader(queryHeaders);
+ Collection<DatabasePacket<?>> actual = ResponsePacketBuilder.buildQueryResponsePackets(queryResponseHeader);
assertThat(actual.stream().findAny().get(), anyOf(instanceOf(MySQLFieldCountPacket.class), instanceOf(MySQLColumnDefinition41Packet.class), instanceOf(MySQLEofPacket.class)));
}
@Test
public void assertBuildUpdateResponsePackets() {
- UpdateResponse updateResponse = mock(UpdateResponse.class);
- when(updateResponse.getUpdateCount()).thenReturn(10L);
- when(updateResponse.getLastInsertId()).thenReturn(100L);
- Collection<DatabasePacket<?>> actual = ResponsePacketBuilder.buildUpdateResponsePackets(updateResponse);
+ UpdateResponseHeader updateResponseHeader = mock(UpdateResponseHeader.class);
+ when(updateResponseHeader.getUpdateCount()).thenReturn(10L);
+ when(updateResponseHeader.getLastInsertId()).thenReturn(100L);
+ Collection<DatabasePacket<?>> actual = ResponsePacketBuilder.buildUpdateResponsePackets(updateResponseHeader);
MySQLOKPacket actualItem = (MySQLOKPacket) actual.stream().findAny().get();
assertThat(actualItem, instanceOf(MySQLOKPacket.class));
assertThat(actualItem.getAffectedRows(), is(10L));
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutorTest.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutorTest.java
index 3556592..5590a11 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutorTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutorTest.java
@@ -18,9 +18,9 @@
package org.apache.shardingsphere.proxy.frontend.mysql.command.query.text.query;
import org.apache.shardingsphere.db.protocol.mysql.packet.command.query.text.query.MySQLComQueryPacket;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryHeader;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryResponse;
-import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.query.impl.QueryHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
import org.apache.shardingsphere.proxy.frontend.command.executor.ResponseType;
import org.junit.Test;
@@ -48,7 +48,7 @@ public final class MySQLComQueryPacketExecutorTest {
@Test
public void assertIsQueryResponse() throws SQLException, NoSuchFieldException {
FieldSetter.setField(mysqlComQueryPacketExecutor, MySQLComQueryPacketExecutor.class.getDeclaredField("textProtocolBackendHandler"), textProtocolBackendHandler);
- when(textProtocolBackendHandler.execute()).thenReturn(new QueryResponse(Collections.singletonList(mock(QueryHeader.class))));
+ when(textProtocolBackendHandler.execute()).thenReturn(new QueryResponseHeader(Collections.singletonList(mock(QueryHeader.class))));
mysqlComQueryPacketExecutor.execute();
assertThat(mysqlComQueryPacketExecutor.getResponseType(), is(ResponseType.QUERY));
}
@@ -56,7 +56,7 @@ public final class MySQLComQueryPacketExecutorTest {
@Test
public void assertIsUpdateResponse() throws SQLException, NoSuchFieldException {
FieldSetter.setField(mysqlComQueryPacketExecutor, MySQLComQueryPacketExecutor.class.getDeclaredField("textProtocolBackendHandler"), textProtocolBackendHandler);
- when(textProtocolBackendHandler.execute()).thenReturn(new UpdateResponse());
+ when(textProtocolBackendHandler.execute()).thenReturn(new UpdateResponseHeader());
mysqlComQueryPacketExecutor.execute();
assertThat(mysqlComQueryPacketExecutor.getResponseType(), is(ResponseType.UPDATE));
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/binary/bind/PostgreSQLComBindExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/binary/bind/PostgreSQLComBindExecutor.java
index f14dc39..87b1ba3 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/binary/bind/PostgreSQLComBindExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/binary/bind/PostgreSQLComBindExecutor.java
@@ -34,11 +34,11 @@ import org.apache.shardingsphere.proxy.backend.communication.DatabaseCommunicati
import org.apache.shardingsphere.proxy.backend.communication.DatabaseCommunicationEngineFactory;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryData;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryHeader;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryResponse;
-import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.data.QueryResponseData;
+import org.apache.shardingsphere.proxy.backend.response.header.query.impl.QueryHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.frontend.command.executor.QueryCommandExecutor;
import org.apache.shardingsphere.proxy.frontend.command.executor.ResponseType;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
@@ -82,19 +82,19 @@ public final class PostgreSQLComBindExecutor implements QueryCommandExecutor {
if (null == databaseCommunicationEngine) {
return result;
}
- BackendResponse backendResponse = databaseCommunicationEngine.execute();
- if (backendResponse instanceof QueryResponse) {
- createQueryPacket((QueryResponse) backendResponse).ifPresent(result::add);
+ ResponseHeader responseHeader = databaseCommunicationEngine.execute();
+ if (responseHeader instanceof QueryResponseHeader) {
+ createQueryPacket((QueryResponseHeader) responseHeader).ifPresent(result::add);
}
- if (backendResponse instanceof UpdateResponse) {
+ if (responseHeader instanceof UpdateResponseHeader) {
responseType = ResponseType.UPDATE;
- result.add(createUpdatePacket((UpdateResponse) backendResponse));
+ result.add(createUpdatePacket((UpdateResponseHeader) responseHeader));
}
return result;
}
- private Optional<PostgreSQLRowDescriptionPacket> createQueryPacket(final QueryResponse queryResponse) {
- Collection<PostgreSQLColumnDescription> columnDescriptions = createColumnDescriptions(queryResponse);
+ private Optional<PostgreSQLRowDescriptionPacket> createQueryPacket(final QueryResponseHeader queryResponseHeader) {
+ Collection<PostgreSQLColumnDescription> columnDescriptions = createColumnDescriptions(queryResponseHeader);
if (columnDescriptions.isEmpty()) {
responseType = ResponseType.QUERY;
}
@@ -104,17 +104,17 @@ public final class PostgreSQLComBindExecutor implements QueryCommandExecutor {
return Optional.of(new PostgreSQLRowDescriptionPacket(columnDescriptions.size(), columnDescriptions));
}
- private Collection<PostgreSQLColumnDescription> createColumnDescriptions(final QueryResponse queryResponse) {
+ private Collection<PostgreSQLColumnDescription> createColumnDescriptions(final QueryResponseHeader queryResponseHeader) {
Collection<PostgreSQLColumnDescription> result = new LinkedList<>();
int columnIndex = 0;
- for (QueryHeader each : queryResponse.getQueryHeaders()) {
+ for (QueryHeader each : queryResponseHeader.getQueryHeaders()) {
result.add(new PostgreSQLColumnDescription(each.getColumnName(), ++columnIndex, each.getColumnType(), each.getColumnLength(), each.getColumnTypeName()));
}
return result;
}
- private PostgreSQLCommandCompletePacket createUpdatePacket(final UpdateResponse updateResponse) {
- return new PostgreSQLCommandCompletePacket(updateResponse.getType(), updateResponse.getUpdateCount());
+ private PostgreSQLCommandCompletePacket createUpdatePacket(final UpdateResponseHeader updateResponseHeader) {
+ return new PostgreSQLCommandCompletePacket(updateResponseHeader.getType(), updateResponseHeader.getUpdateCount());
}
@Override
@@ -124,7 +124,7 @@ public final class PostgreSQLComBindExecutor implements QueryCommandExecutor {
@Override
public PostgreSQLPacket getQueryData() throws SQLException {
- QueryData queryData = databaseCommunicationEngine.getQueryData();
+ QueryResponseData queryData = databaseCommunicationEngine.getQueryResponseData();
return packet.isBinaryRowData()
? new PostgreSQLBinaryResultSetRowPacket(queryData.getData(), queryData.getColumnTypes().stream().map(PostgreSQLColumnType::valueOfJDBCType).collect(Collectors.toList()))
: new PostgreSQLDataRowPacket(queryData.getData());
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/text/PostgreSQLComQueryExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/text/PostgreSQLComQueryExecutor.java
index 6806f41..32d8ac22 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/text/PostgreSQLComQueryExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/text/PostgreSQLComQueryExecutor.java
@@ -27,10 +27,10 @@ import org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.tex
import org.apache.shardingsphere.db.protocol.postgresql.packet.generic.PostgreSQLCommandCompletePacket;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
-import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryHeader;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryResponse;
-import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.query.impl.QueryHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandlerFactory;
import org.apache.shardingsphere.proxy.frontend.command.executor.QueryCommandExecutor;
@@ -59,17 +59,17 @@ public final class PostgreSQLComQueryExecutor implements QueryCommandExecutor {
@Override
public Collection<DatabasePacket<?>> execute() throws SQLException {
- BackendResponse backendResponse = textProtocolBackendHandler.execute();
- if (backendResponse instanceof QueryResponse) {
- Optional<PostgreSQLRowDescriptionPacket> result = createQueryPacket((QueryResponse) backendResponse);
+ ResponseHeader responseHeader = textProtocolBackendHandler.execute();
+ if (responseHeader instanceof QueryResponseHeader) {
+ Optional<PostgreSQLRowDescriptionPacket> result = createQueryPacket((QueryResponseHeader) responseHeader);
return result.<List<DatabasePacket<?>>>map(Collections::singletonList).orElseGet(Collections::emptyList);
}
responseType = ResponseType.UPDATE;
- return Collections.singletonList(createUpdatePacket((UpdateResponse) backendResponse));
+ return Collections.singletonList(createUpdatePacket((UpdateResponseHeader) responseHeader));
}
- private Optional<PostgreSQLRowDescriptionPacket> createQueryPacket(final QueryResponse queryResponse) {
- Collection<PostgreSQLColumnDescription> columnDescriptions = createColumnDescriptions(queryResponse);
+ private Optional<PostgreSQLRowDescriptionPacket> createQueryPacket(final QueryResponseHeader queryResponseHeader) {
+ Collection<PostgreSQLColumnDescription> columnDescriptions = createColumnDescriptions(queryResponseHeader);
if (columnDescriptions.isEmpty()) {
responseType = ResponseType.QUERY;
}
@@ -79,17 +79,17 @@ public final class PostgreSQLComQueryExecutor implements QueryCommandExecutor {
return Optional.of(new PostgreSQLRowDescriptionPacket(columnDescriptions.size(), columnDescriptions));
}
- private Collection<PostgreSQLColumnDescription> createColumnDescriptions(final QueryResponse queryResponse) {
+ private Collection<PostgreSQLColumnDescription> createColumnDescriptions(final QueryResponseHeader queryResponseHeader) {
Collection<PostgreSQLColumnDescription> result = new LinkedList<>();
int columnIndex = 0;
- for (QueryHeader each : queryResponse.getQueryHeaders()) {
+ for (QueryHeader each : queryResponseHeader.getQueryHeaders()) {
result.add(new PostgreSQLColumnDescription(each.getColumnName(), ++columnIndex, each.getColumnType(), each.getColumnLength(), each.getColumnTypeName()));
}
return result;
}
- private PostgreSQLCommandCompletePacket createUpdatePacket(final UpdateResponse updateResponse) {
- return new PostgreSQLCommandCompletePacket(updateResponse.getType(), updateResponse.getUpdateCount());
+ private PostgreSQLCommandCompletePacket createUpdatePacket(final UpdateResponseHeader updateResponseHeader) {
+ return new PostgreSQLCommandCompletePacket(updateResponseHeader.getType(), updateResponseHeader.getUpdateCount());
}
@Override