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 3995fd015d8 Remove unnecessary field in PostgreSQLRowDescriptionPacket
(#22383)
3995fd015d8 is described below
commit 3995fd015d83b1000e44b5237a7b5e98a26f5c56
Author: 吴伟杰 <[email protected]>
AuthorDate: Thu Nov 24 16:18:58 2022 +0800
Remove unnecessary field in PostgreSQLRowDescriptionPacket (#22383)
---
.../packet/command/query/PostgreSQLRowDescriptionPacket.java | 4 +---
.../packet/command/query/PostgreSQLRowDescriptionPacketTest.java | 4 ++--
.../opengauss/command/query/simple/OpenGaussComQueryExecutor.java | 3 +--
.../proxy/frontend/postgresql/command/query/extended/JDBCPortal.java | 3 +--
.../query/extended/describe/PostgreSQLComDescribeExecutor.java | 4 ++--
.../postgresql/command/query/simple/PostgreSQLComQueryExecutor.java | 3 +--
6 files changed, 8 insertions(+), 13 deletions(-)
diff --git
a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/PostgreSQLRowDescriptionPacket.java
b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/PostgreSQLRowDescriptionPacket.java
index dceeeebf9cb..6e0f11698df 100644
---
a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/PostgreSQLRowDescriptionPacket.java
+++
b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/PostgreSQLRowDescriptionPacket.java
@@ -31,13 +31,11 @@ import java.util.Collection;
@RequiredArgsConstructor
public final class PostgreSQLRowDescriptionPacket implements
PostgreSQLIdentifierPacket {
- private final int fieldCount;
-
private final Collection<PostgreSQLColumnDescription> columnDescriptions;
@Override
public void write(final PostgreSQLPacketPayload payload) {
- payload.writeInt2(fieldCount);
+ payload.writeInt2(columnDescriptions.size());
for (PostgreSQLColumnDescription each : columnDescriptions) {
payload.writeStringNul(each.getColumnName());
payload.writeInt4(each.getTableOID());
diff --git
a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/PostgreSQLRowDescriptionPacketTest.java
b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/PostgreSQLRowDescriptionPacketTest.java
index 235b82f053a..7cb7a86d01e 100644
---
a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/PostgreSQLRowDescriptionPacketTest.java
+++
b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/PostgreSQLRowDescriptionPacketTest.java
@@ -41,7 +41,7 @@ public final class PostgreSQLRowDescriptionPacketTest {
@Test
public void assertWrite() {
PostgreSQLColumnDescription description = new
PostgreSQLColumnDescription("name", 1, Types.VARCHAR, 4, null);
- PostgreSQLRowDescriptionPacket packet = new
PostgreSQLRowDescriptionPacket(1, Collections.singletonList(description));
+ PostgreSQLRowDescriptionPacket packet = new
PostgreSQLRowDescriptionPacket(Collections.singletonList(description));
packet.write(payload);
verify(payload, times(2)).writeInt2(1);
verify(payload).writeStringNul("name");
@@ -55,7 +55,7 @@ public final class PostgreSQLRowDescriptionPacketTest {
@Test
public void getMessageType() {
- PostgreSQLRowDescriptionPacket packet = new
PostgreSQLRowDescriptionPacket(0, Collections.emptyList());
+ PostgreSQLRowDescriptionPacket packet = new
PostgreSQLRowDescriptionPacket(Collections.emptyList());
assertThat(packet.getIdentifier(),
is(PostgreSQLMessagePacketType.ROW_DESCRIPTION));
}
}
diff --git
a/proxy/frontend/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/simple/OpenGaussComQueryExecutor.java
b/proxy/frontend/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/simple/OpenGaussComQueryExecutor.java
index 046c64206a2..ae8fab09700 100644
---
a/proxy/frontend/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/simple/OpenGaussComQueryExecutor.java
+++
b/proxy/frontend/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/simple/OpenGaussComQueryExecutor.java
@@ -82,9 +82,8 @@ public final class OpenGaussComQueryExecutor implements
QueryCommandExecutor {
}
private PostgreSQLRowDescriptionPacket createRowDescriptionPacket(final
QueryResponseHeader queryResponseHeader) {
- Collection<PostgreSQLColumnDescription> columnDescriptions =
createColumnDescriptions(queryResponseHeader);
responseType = ResponseType.QUERY;
- return new PostgreSQLRowDescriptionPacket(columnDescriptions.size(),
columnDescriptions);
+ return new
PostgreSQLRowDescriptionPacket(createColumnDescriptions(queryResponseHeader));
}
private Collection<PostgreSQLColumnDescription>
createColumnDescriptions(final QueryResponseHeader queryResponseHeader) {
diff --git
a/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/JDBCPortal.java
b/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/JDBCPortal.java
index ac95a2cb08e..6fd864ea50e 100644
---
a/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/JDBCPortal.java
+++
b/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/JDBCPortal.java
@@ -114,8 +114,7 @@ public final class JDBCPortal implements Portal<Void> {
}
private PostgreSQLRowDescriptionPacket createRowDescriptionPacket(final
QueryResponseHeader queryResponseHeader) {
- Collection<PostgreSQLColumnDescription> columnDescriptions =
createColumnDescriptions(queryResponseHeader);
- return new PostgreSQLRowDescriptionPacket(columnDescriptions.size(),
columnDescriptions);
+ return new
PostgreSQLRowDescriptionPacket(createColumnDescriptions(queryResponseHeader));
}
private Collection<PostgreSQLColumnDescription>
createColumnDescriptions(final QueryResponseHeader queryResponseHeader) {
diff --git
a/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutor.java
b/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutor.java
index f37f7aac60a..9a64c83c115 100644
---
a/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutor.java
+++
b/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutor.java
@@ -205,7 +205,7 @@ public final class PostgreSQLComDescribeExecutor implements
CommandExecutor {
result.add(convertExpressionToDescription((ExpressionProjectionSegment) each));
}
}
- return new PostgreSQLRowDescriptionPacket(result.size(), result);
+ return new PostgreSQLRowDescriptionPacket(result);
}
private PostgreSQLColumnDescription convertExpressionToDescription(final
ExpressionProjectionSegment expressionProjectionSegment) {
@@ -293,6 +293,6 @@ public final class PostgreSQLComDescribeExecutor implements
CommandExecutor {
String columnTypeName =
resultSetMetaData.getColumnTypeName(columnIndex);
columnDescriptions.add(new PostgreSQLColumnDescription(columnName,
columnIndex, columnType, columnLength, columnTypeName));
}
- logicPreparedStatement.setRowDescription(new
PostgreSQLRowDescriptionPacket(columnDescriptions.size(), columnDescriptions));
+ logicPreparedStatement.setRowDescription(new
PostgreSQLRowDescriptionPacket(columnDescriptions));
}
}
diff --git
a/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/simple/PostgreSQLComQueryExecutor.java
b/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/simple/PostgreSQLComQueryExecutor.java
index df31afbd0d2..2d1f1cfcb76 100644
---
a/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/simple/PostgreSQLComQueryExecutor.java
+++
b/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/simple/PostgreSQLComQueryExecutor.java
@@ -82,9 +82,8 @@ public final class PostgreSQLComQueryExecutor implements
QueryCommandExecutor {
}
private PostgreSQLRowDescriptionPacket createRowDescriptionPacket(final
QueryResponseHeader queryResponseHeader) {
- Collection<PostgreSQLColumnDescription> columnDescriptions =
createColumnDescriptions(queryResponseHeader);
responseType = ResponseType.QUERY;
- return new PostgreSQLRowDescriptionPacket(columnDescriptions.size(),
columnDescriptions);
+ return new
PostgreSQLRowDescriptionPacket(createColumnDescriptions(queryResponseHeader));
}
private Collection<PostgreSQLColumnDescription>
createColumnDescriptions(final QueryResponseHeader queryResponseHeader) {
