You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2020/11/19 09:11:12 UTC
[shardingsphere] branch master updated: Refactor
TextProtocolBackendHandler.getRowData (#8220)
This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new c02b4b0 Refactor TextProtocolBackendHandler.getRowData (#8220)
c02b4b0 is described below
commit c02b4b0f3f3155b52187137df0ccb3e1facdcf49
Author: Liang Zhang <te...@163.com>
AuthorDate: Thu Nov 19 17:10:57 2020 +0800
Refactor TextProtocolBackendHandler.getRowData (#8220)
---
.../backend/text/TextProtocolBackendHandler.java | 8 +++---
.../text/admin/BroadcastBackendHandler.java | 4 +--
.../backend/text/admin/RDLBackendHandler.java | 22 +++++++--------
.../text/admin/ShowDatabasesBackendHandler.java | 8 +++---
.../text/admin/ShowTablesBackendHandler.java | 18 +++---------
.../backend/text/admin/UnicastBackendHandler.java | 6 ++--
.../text/admin/UseDatabaseBackendHandler.java | 4 +--
.../backend/text/query/QueryBackendHandler.java | 6 ++--
.../explain/ShardingCTLExplainBackendHandler.java | 8 ++----
.../sctl/hint/ShardingCTLHintBackendHandler.java | 6 ++--
.../sctl/set/ShardingCTLSetBackendHandler.java | 4 +--
.../sctl/show/ShardingCTLShowBackendHandler.java | 6 ++--
.../backend/text/skip/SkipBackendHandler.java | 5 ++--
.../transaction/TransactionBackendHandler.java | 4 +--
.../admin/ShowDatabasesBackendHandlerTest.java | 7 +----
.../text/admin/ShowTablesBackendHandlerTest.java | 9 ++----
.../ShardingCTLExplainBackendHandlerTest.java | 4 +--
.../hint/ShardingCTLHintBackendHandlerTest.java | 33 ++++++++++------------
.../show/ShardingCTLShowBackendHandlerTest.java | 10 +++----
.../text/query/MySQLComQueryPacketExecutor.java | 2 +-
.../query/text/PostgreSQLComQueryExecutor.java | 2 +-
21 files changed, 75 insertions(+), 101 deletions(-)
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 9c7a693..3ac34d4 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
@@ -18,9 +18,9 @@
package org.apache.shardingsphere.proxy.backend.text;
import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryData;
import java.sql.SQLException;
+import java.util.List;
/**
* Text protocol backend handler.
@@ -44,10 +44,10 @@ public interface TextProtocolBackendHandler {
boolean next() throws SQLException;
/**
- * Get query data.
+ * Get row data.
*
- * @return query data
+ * @return row data
* @throws SQLException SQL exception
*/
- QueryData getQueryData() throws SQLException;
+ List<Object> getRowData() throws SQLException;
}
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 ceaeba2..001c6d4 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
@@ -23,12 +23,12 @@ 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.RuleNotExistsException;
import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryData;
import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import java.sql.SQLException;
+import java.util.List;
/**
* Backend handler for broadcast.
@@ -64,7 +64,7 @@ public final class BroadcastBackendHandler implements TextProtocolBackendHandler
}
@Override
- public QueryData getQueryData() {
+ public List<Object> getRowData() {
return null;
}
}
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 8f2081c..bc20dd8 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
@@ -18,10 +18,17 @@
package org.apache.shardingsphere.proxy.backend.text.admin;
import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.distsql.parser.statement.rdl.CreateDataSourcesStatement;
+import org.apache.shardingsphere.distsql.parser.statement.rdl.CreateShardingRuleStatement;
+import org.apache.shardingsphere.governance.core.event.GovernanceEventBus;
import org.apache.shardingsphere.governance.core.event.model.datasource.DataSourcePersistEvent;
import org.apache.shardingsphere.governance.core.event.model.rule.RuleConfigurationsPersistEvent;
import org.apache.shardingsphere.governance.core.event.model.schema.SchemaNamePersistEvent;
-import org.apache.shardingsphere.governance.core.event.GovernanceEventBus;
+import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
+import org.apache.shardingsphere.infra.binder.statement.ddl.CreateDatabaseStatementContext;
+import org.apache.shardingsphere.infra.binder.statement.ddl.DropDatabaseStatementContext;
+import org.apache.shardingsphere.infra.binder.statement.rdl.CreateDataSourcesStatementContext;
+import org.apache.shardingsphere.infra.binder.statement.rdl.CreateShardingRuleStatementContext;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
import org.apache.shardingsphere.infra.context.metadata.impl.StandardMetaDataContexts;
@@ -31,21 +38,13 @@ 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.DBCreateExistsException;
import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryData;
import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
import org.apache.shardingsphere.proxy.config.util.DataSourceParameterConverter;
import org.apache.shardingsphere.proxy.config.yaml.YamlDataSourceParameter;
import org.apache.shardingsphere.proxy.converter.CreateDataSourcesStatementContextConverter;
-import org.apache.shardingsphere.infra.binder.statement.rdl.CreateDataSourcesStatementContext;
-import org.apache.shardingsphere.infra.binder.statement.rdl.CreateShardingRuleStatementContext;
-import org.apache.shardingsphere.distsql.parser.statement.rdl.CreateDataSourcesStatement;
-import org.apache.shardingsphere.distsql.parser.statement.rdl.CreateShardingRuleStatement;
import org.apache.shardingsphere.sharding.converter.CreateShardingRuleStatementContextConverter;
import org.apache.shardingsphere.sharding.yaml.config.YamlShardingRuleConfiguration;
-import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
-import org.apache.shardingsphere.infra.binder.statement.ddl.CreateDatabaseStatementContext;
-import org.apache.shardingsphere.infra.binder.statement.ddl.DropDatabaseStatementContext;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.CreateDatabaseStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DropDatabaseStatement;
@@ -53,6 +52,7 @@ import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DropDatabas
import java.sql.SQLException;
import java.util.Collection;
import java.util.Collections;
+import java.util.List;
import java.util.Map;
/**
@@ -154,7 +154,7 @@ public final class RDLBackendHandler implements TextProtocolBackendHandler {
}
@Override
- public QueryData getQueryData() {
- return new QueryData(Collections.emptyList(), Collections.emptyList());
+ public List<Object> getRowData() {
+ return Collections.emptyList();
}
}
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 7d9f4a6..9abc156 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
@@ -21,10 +21,9 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.executor.sql.raw.execute.result.query.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.QueryData;
import org.apache.shardingsphere.proxy.backend.response.query.QueryResponse;
-import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
import org.apache.shardingsphere.sharding.merge.dal.common.SingleLocalDataMergedResult;
@@ -33,6 +32,7 @@ import java.sql.Types;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
+import java.util.List;
/**
* Show databases backend handler.
@@ -65,7 +65,7 @@ public final class ShowDatabasesBackendHandler implements TextProtocolBackendHan
}
@Override
- public QueryData getQueryData() throws SQLException {
- return new QueryData(Collections.singletonList(Types.VARCHAR), Collections.singletonList(mergedResult.getValue(1, Object.class)));
+ public List<Object> getRowData() throws SQLException {
+ return Collections.singletonList(mergedResult.getValue(1, Object.class));
}
}
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 0ee82ed..f5511e4 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
@@ -27,7 +27,6 @@ import org.apache.shardingsphere.infra.executor.sql.raw.execute.result.query.Que
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.text.TextProtocolBackendHandler;
@@ -76,19 +75,10 @@ public final class ShowTablesBackendHandler implements TextProtocolBackendHandle
}
@Override
- public QueryData getQueryData() throws SQLException {
- List<QueryHeader> queryHeaders = queryResponse.getQueryHeaders();
- List<Object> row = new ArrayList<>(queryHeaders.size());
- for (int columnIndex = 1; columnIndex <= queryHeaders.size(); columnIndex++) {
- row.add(queryResponse.getQueryResults().get(0).getValue(columnIndex, Object.class));
- }
- return new QueryData(getColumnTypes(queryHeaders), row);
- }
-
- private List<Integer> getColumnTypes(final List<QueryHeader> queryHeaders) {
- List<Integer> result = new ArrayList<>(queryHeaders.size());
- for (QueryHeader each : queryHeaders) {
- result.add(each.getColumnType());
+ public List<Object> getRowData() throws SQLException {
+ List<Object> result = new ArrayList<>(queryResponse.getQueryHeaders().size());
+ for (int columnIndex = 1; columnIndex <= queryResponse.getQueryHeaders().size(); columnIndex++) {
+ result.add(queryResponse.getQueryResults().get(0).getValue(columnIndex, Object.class));
}
return result;
}
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 bc8e2a4..545f16e 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
@@ -26,11 +26,11 @@ 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.query.QueryData;
import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import java.sql.SQLException;
+import java.util.List;
import java.util.Map;
/**
@@ -72,7 +72,7 @@ public final class UnicastBackendHandler implements TextProtocolBackendHandler {
}
@Override
- public QueryData getQueryData() throws SQLException {
- return databaseCommunicationEngine.getQueryData();
+ public List<Object> getRowData() throws SQLException {
+ return databaseCommunicationEngine.getQueryData().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 95a1484..9653c81 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
@@ -22,13 +22,13 @@ 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.UnknownDatabaseException;
import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryData;
import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
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;
import java.util.Collection;
+import java.util.List;
/**
* Use database backend handler.
@@ -62,7 +62,7 @@ public final class UseDatabaseBackendHandler implements TextProtocolBackendHandl
}
@Override
- public QueryData getQueryData() {
+ public List<Object> getRowData() {
return null;
}
}
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 a894542..aedc408 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
@@ -24,11 +24,11 @@ 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.RuleNotExistsException;
import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryData;
import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import java.sql.SQLException;
+import java.util.List;
/**
* Backend handler with query.
@@ -61,7 +61,7 @@ public final class QueryBackendHandler implements TextProtocolBackendHandler {
}
@Override
- public QueryData getQueryData() throws SQLException {
- return databaseCommunicationEngine.getQueryData();
+ public List<Object> getRowData() throws SQLException {
+ return databaseCommunicationEngine.getQueryData().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 e61ffdc..c39c911 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
@@ -31,7 +31,6 @@ 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.RuleNotExistsException;
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.text.TextProtocolBackendHandler;
import org.apache.shardingsphere.proxy.backend.text.sctl.exception.InvalidShardingCTLFormatException;
@@ -92,14 +91,11 @@ public final class ShardingCTLExplainBackendHandler implements TextProtocolBacke
}
@Override
- public QueryData getQueryData() {
+ public List<Object> getRowData() {
ExecutionUnit executionUnit = executionUnits.next();
List<Object> row = new ArrayList<>(queryHeaders.size());
row.add(executionUnit.getDataSourceName());
row.add(executionUnit.getSqlUnit().getSql());
- List<Integer> columnTypes = new ArrayList<>(queryHeaders.size());
- columnTypes.add(queryHeaders.get(0).getColumnType());
- columnTypes.add(queryHeaders.get(1).getColumnType());
- return new QueryData(columnTypes, row);
+ return row;
}
}
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 2ce2005..e1cb21e 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
@@ -22,7 +22,6 @@ import org.apache.shardingsphere.infra.config.properties.ConfigurationPropertyKe
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.text.TextProtocolBackendHandler;
import org.apache.shardingsphere.proxy.backend.text.sctl.exception.InvalidShardingCTLFormatException;
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.HintCommand;
@@ -30,6 +29,7 @@ import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.HintComma
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.HintCommandExecutorFactory;
import java.sql.SQLException;
+import java.util.List;
import java.util.Optional;
/**
@@ -65,7 +65,7 @@ public final class ShardingCTLHintBackendHandler implements TextProtocolBackendH
}
@Override
- public QueryData getQueryData() throws SQLException {
- return hintCommandExecutor.getQueryData();
+ public List<Object> getRowData() throws SQLException {
+ return hintCommandExecutor.getQueryData().getData();
}
}
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 2301f9b..bfc25a7 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
@@ -20,13 +20,13 @@ 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.query.QueryData;
import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
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;
import org.apache.shardingsphere.transaction.core.TransactionType;
+import java.util.List;
import java.util.Optional;
/**
@@ -70,7 +70,7 @@ public final class ShardingCTLSetBackendHandler implements TextProtocolBackendHa
}
@Override
- public QueryData getQueryData() {
+ public List<Object> getRowData() {
return null;
}
}
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 427dbec..d14fb30 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
@@ -21,7 +21,6 @@ import org.apache.shardingsphere.infra.executor.sql.raw.execute.result.query.Que
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.QueryData;
import org.apache.shardingsphere.proxy.backend.response.query.QueryResponse;
import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
import org.apache.shardingsphere.proxy.backend.text.sctl.exception.InvalidShardingCTLFormatException;
@@ -32,6 +31,7 @@ import java.sql.SQLException;
import java.sql.Types;
import java.util.Arrays;
import java.util.Collections;
+import java.util.List;
import java.util.Optional;
/**
@@ -77,7 +77,7 @@ public final class ShardingCTLShowBackendHandler implements TextProtocolBackendH
}
@Override
- public QueryData getQueryData() throws SQLException {
- return new QueryData(Collections.singletonList(Types.VARCHAR), Collections.singletonList(mergedResult.getValue(1, Object.class)));
+ public List<Object> getRowData() throws SQLException {
+ return Collections.singletonList(mergedResult.getValue(1, Object.class));
}
}
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 ee3b9b0..22e1d73 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
@@ -18,10 +18,11 @@
package org.apache.shardingsphere.proxy.backend.text.skip;
import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
-import org.apache.shardingsphere.proxy.backend.response.query.QueryData;
import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
+import java.util.List;
+
/**
* Skip backend handler.
*/
@@ -38,7 +39,7 @@ public final class SkipBackendHandler implements TextProtocolBackendHandler {
}
@Override
- public QueryData getQueryData() {
+ public List<Object> getRowData() {
return null;
}
}
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 85fb395..c759f9a 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
@@ -20,13 +20,13 @@ 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.query.QueryData;
import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
import org.apache.shardingsphere.transaction.core.TransactionOperationType;
import java.sql.SQLException;
import java.sql.SQLFeatureNotSupportedException;
+import java.util.List;
/**
* Do transaction operation.
@@ -66,7 +66,7 @@ public final class TransactionBackendHandler implements TextProtocolBackendHandl
}
@Override
- public QueryData getQueryData() {
+ public List<Object> getRowData() {
return null;
}
}
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 6696ca1..4f44ca0 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,6 @@ import org.apache.shardingsphere.infra.executor.kernel.ExecutorKernel;
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.QueryData;
import org.apache.shardingsphere.proxy.backend.response.query.QueryResponse;
import org.junit.Before;
import org.junit.Test;
@@ -35,7 +34,6 @@ import org.mockito.junit.MockitoJUnitRunner;
import java.lang.reflect.Field;
import java.sql.SQLException;
-import java.sql.Types;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -91,10 +89,7 @@ public final class ShowDatabasesBackendHandlerTest {
public void assertShowDatabaseUsingStream() throws SQLException {
showDatabasesBackendHandler.execute();
while (showDatabasesBackendHandler.next()) {
- QueryData queryData = showDatabasesBackendHandler.getQueryData();
- assertThat(queryData.getColumnTypes().size(), is(1));
- assertThat(queryData.getColumnTypes().iterator().next(), is(Types.VARCHAR));
- assertThat(queryData.getData().size(), is(1));
+ assertThat(showDatabasesBackendHandler.getRowData().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 8021d58..7e3506c 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,14 +26,12 @@ import org.apache.shardingsphere.infra.executor.kernel.ExecutorKernel;
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.QueryData;
import org.apache.shardingsphere.proxy.backend.response.query.QueryResponse;
import org.junit.Before;
import org.junit.Test;
import java.lang.reflect.Field;
import java.sql.SQLException;
-import java.sql.Types;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -83,7 +81,7 @@ public final class ShowTablesBackendHandlerTest {
}
@Test
- public void assertExecuteShowTablesBackendHandler() throws SQLException {
+ public void assertExecuteShowTablesBackendHandler() {
QueryResponse actual = (QueryResponse) tablesBackendHandler.execute();
assertThat(actual, instanceOf(QueryResponse.class));
assertThat(actual.getQueryHeaders().size(), is(1));
@@ -93,10 +91,7 @@ public final class ShowTablesBackendHandlerTest {
public void assertShowTablesUsingStream() throws SQLException {
tablesBackendHandler.execute();
while (tablesBackendHandler.next()) {
- QueryData queryData = tablesBackendHandler.getQueryData();
- assertThat(queryData.getColumnTypes().size(), is(1));
- assertThat(queryData.getColumnTypes().iterator().next(), is(Types.VARCHAR));
- assertThat(queryData.getData().size(), is(1));
+ assertThat(tablesBackendHandler.getRowData().size(), is(1));
}
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/explain/ShardingCTLExplainBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/explain/ShardingCTLExplainBackendHandlerTest.java
index 4dd4c65..5458b4a 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/explain/ShardingCTLExplainBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/explain/ShardingCTLExplainBackendHandlerTest.java
@@ -71,9 +71,9 @@ public final class ShardingCTLExplainBackendHandlerTest {
}
@Test
- public void assertQueryData() {
+ public void assertGetRowData() {
handler.execute();
assertTrue(handler.next());
- assertThat(handler.getQueryData().getData().get(1), is("select 1"));
+ assertThat(handler.getRowData().get(1), is("select 1"));
}
}
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 b09a42e..fedd4ba 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
@@ -32,7 +32,6 @@ 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.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.text.sctl.exception.InvalidShardingCTLFormatException;
@@ -47,8 +46,8 @@ import org.mockito.junit.MockitoJUnitRunner;
import java.lang.reflect.Field;
import java.sql.SQLException;
-import java.sql.Types;
import java.util.Collections;
+import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -142,11 +141,9 @@ public final class ShardingCTLHintBackendHandlerTest {
assertThat(((QueryResponse) backendResponse).getQueryHeaders().get(0).getColumnLabel(), is("primary_only"));
assertThat(((QueryResponse) backendResponse).getQueryHeaders().get(1).getColumnLabel(), is("sharding_type"));
assertTrue(defaultHintBackendHandler.next());
- QueryData defaultQueryData = defaultHintBackendHandler.getQueryData();
- assertThat(defaultQueryData.getColumnTypes().get(0), is(Types.CHAR));
- assertThat(defaultQueryData.getColumnTypes().get(1), is(Types.CHAR));
- assertThat(defaultQueryData.getData().get(0).toString(), is("false"));
- assertThat(defaultQueryData.getData().get(1).toString(), is("databases_tables"));
+ List<Object> defaultRowData = defaultHintBackendHandler.getRowData();
+ assertThat(defaultRowData.get(0).toString(), is("false"));
+ assertThat(defaultRowData.get(1).toString(), is("databases_tables"));
assertFalse(defaultHintBackendHandler.next());
String setPrimaryOnlySQL = "sctl:hint set primary_only=true";
String setDatabaseOnlySQL = "sctl:hint set DatabaseShardingValue=100";
@@ -155,9 +152,9 @@ public final class ShardingCTLHintBackendHandlerTest {
ShardingCTLHintBackendHandler updateHintBackendHandler = new ShardingCTLHintBackendHandler(sql, backendConnection);
updateHintBackendHandler.execute();
assertTrue(updateHintBackendHandler.next());
- QueryData updateQueryData = updateHintBackendHandler.getQueryData();
- assertThat(updateQueryData.getData().get(0).toString(), is("true"));
- assertThat(updateQueryData.getData().get(1).toString(), is("databases_only"));
+ List<Object> updateRowData = updateHintBackendHandler.getRowData();
+ assertThat(updateRowData.get(0).toString(), is("true"));
+ assertThat(updateRowData.get(1).toString(), is("databases_only"));
assertFalse(updateHintBackendHandler.next());
}
@@ -179,10 +176,10 @@ public final class ShardingCTLHintBackendHandlerTest {
assertThat(((QueryResponse) backendResponse).getQueryHeaders().get(1).getColumnLabel(), is("database_sharding_values"));
assertThat(((QueryResponse) backendResponse).getQueryHeaders().get(2).getColumnLabel(), is("table_sharding_values"));
assertTrue(defaultHintBackendHandler.next());
- QueryData defaultQueryData = defaultHintBackendHandler.getQueryData();
- assertThat(defaultQueryData.getData().get(0).toString(), is("user"));
- assertThat(defaultQueryData.getData().get(1).toString(), is(""));
- assertThat(defaultQueryData.getData().get(2).toString(), is(""));
+ List<Object> defaultRowData = defaultHintBackendHandler.getRowData();
+ assertThat(defaultRowData.get(0).toString(), is("user"));
+ assertThat(defaultRowData.get(1).toString(), is(""));
+ assertThat(defaultRowData.get(2).toString(), is(""));
assertFalse(defaultHintBackendHandler.next());
String addDatabaseShardingValueSQL = "sctl:hint addDatabaseshardingvalue user=100";
String addTableShardingValueSQL1 = "sctl:hint addTableshardingvalue user=200";
@@ -193,10 +190,10 @@ public final class ShardingCTLHintBackendHandlerTest {
ShardingCTLHintBackendHandler updateHintBackendHandler = new ShardingCTLHintBackendHandler(sql, backendConnection);
updateHintBackendHandler.execute();
assertTrue(updateHintBackendHandler.next());
- QueryData updateQueryData = updateHintBackendHandler.getQueryData();
- assertThat(updateQueryData.getData().get(0).toString(), is("user"));
- assertThat(updateQueryData.getData().get(1).toString(), is("100"));
- assertThat(updateQueryData.getData().get(2).toString(), is("200,300"));
+ List<Object> updateRowData = updateHintBackendHandler.getRowData();
+ assertThat(updateRowData.get(0).toString(), is("user"));
+ assertThat(updateRowData.get(1).toString(), is("100"));
+ assertThat(updateRowData.get(2).toString(), is("200,300"));
assertFalse(updateHintBackendHandler.next());
}
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 14c752e..2232e86 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
@@ -19,7 +19,6 @@ 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.QueryData;
import org.apache.shardingsphere.proxy.backend.response.query.QueryResponse;
import org.apache.shardingsphere.proxy.backend.text.sctl.exception.InvalidShardingCTLFormatException;
import org.apache.shardingsphere.proxy.backend.text.sctl.exception.UnsupportedShardingCTLTypeException;
@@ -27,6 +26,7 @@ import org.apache.shardingsphere.transaction.core.TransactionType;
import org.junit.Test;
import java.sql.SQLException;
+import java.util.List;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
@@ -44,8 +44,8 @@ public final class ShardingCTLShowBackendHandlerTest {
assertThat(actual, instanceOf(QueryResponse.class));
assertThat(((QueryResponse) actual).getQueryHeaders().size(), is(1));
backendHandler.next();
- QueryData queryData = backendHandler.getQueryData();
- assertThat(queryData.getData().iterator().next(), is("LOCAL"));
+ List<Object> rowData = backendHandler.getRowData();
+ assertThat(rowData.iterator().next(), is("LOCAL"));
}
@Test
@@ -56,8 +56,8 @@ public final class ShardingCTLShowBackendHandlerTest {
assertThat(actual, instanceOf(QueryResponse.class));
assertThat(((QueryResponse) actual).getQueryHeaders().size(), is(1));
backendHandler.next();
- QueryData queryData = backendHandler.getQueryData();
- assertThat(queryData.getData().iterator().next(), is(0));
+ List<Object> rowData = backendHandler.getRowData();
+ assertThat(rowData.iterator().next(), is(0));
}
@Test(expected = UnsupportedShardingCTLTypeException.class)
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 9ccdce5..da832eb 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
@@ -77,6 +77,6 @@ public final class MySQLComQueryPacketExecutor implements QueryCommandExecutor {
@Override
public MySQLPacket getQueryData() throws SQLException {
- return new MySQLTextResultSetRowPacket(++currentSequenceId, textProtocolBackendHandler.getQueryData().getData());
+ return new MySQLTextResultSetRowPacket(++currentSequenceId, textProtocolBackendHandler.getRowData());
}
}
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 6b4bc6d..654b64f 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
@@ -102,6 +102,6 @@ public final class PostgreSQLComQueryExecutor implements QueryCommandExecutor {
@Override
public PostgreSQLPacket getQueryData() throws SQLException {
- return new PostgreSQLDataRowPacket(textProtocolBackendHandler.getQueryData().getData());
+ return new PostgreSQLDataRowPacket(textProtocolBackendHandler.getRowData());
}
}