提交 38f5dd79 编写于 作者: T terrymanu

for #1941, move getSequenceId from DatabasePacket to MySQLPacket

上级 4fb26568
......@@ -29,6 +29,7 @@ import org.apache.shardingsphere.shardingproxy.error.CommonErrorCode;
import org.apache.shardingsphere.shardingproxy.transport.common.packet.command.CommandResponsePackets;
import org.apache.shardingsphere.shardingproxy.transport.common.packet.command.query.DataHeaderPacket;
import org.apache.shardingsphere.shardingproxy.transport.common.packet.command.query.QueryResponsePackets;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.MySQLPacket;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.MySQLPacketPayload;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.command.MySQLCommandPacket;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.command.MySQLCommandPacketFactory;
......@@ -128,7 +129,7 @@ public final class MySQLCommandExecutor implements Runnable {
}
}
}
DatabasePacket resultValue = mysqlQueryCommandPacket.getQueryData();
MySQLPacket resultValue = mysqlQueryCommandPacket.getQueryData();
currentSequenceId = resultValue.getSequenceId();
context.write(resultValue);
if (proxyFrontendFlushThreshold == count) {
......
......@@ -60,7 +60,7 @@ public final class MySQLPacketCodecEngine implements DatabasePacketCodecEngine {
try (MySQLPacketPayload payload = new MySQLPacketPayload(context.alloc().buffer())) {
((MySQLPacket) message).write(payload);
out.writeMediumLE(payload.getByteBuf().readableBytes());
out.writeByte(message.getSequenceId());
out.writeByte(((MySQLPacket) message).getSequenceId());
out.writeBytes(payload.getByteBuf());
}
}
......
......@@ -30,6 +30,13 @@ public interface MySQLPacket extends DatabasePacket {
int SEQUENCE_LENGTH = 1;
/**
* Get sequence ID.
*
* @return sequence ID
*/
int getSequenceId();
/**
* Write packet to byte buffer.
*
......
......@@ -17,8 +17,8 @@
package org.apache.shardingsphere.shardingproxy.transport.mysql.packet.command.query;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.MySQLPacket;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.command.MySQLCommandPacket;
import org.apache.shardingsphere.shardingproxy.transport.spi.DatabasePacket;
import java.sql.SQLException;
......@@ -41,8 +41,8 @@ public interface MySQLQueryCommandPacket extends MySQLCommandPacket {
/**
* Get query data.
*
* @return database packet of query data
* @return MySQL packet of query data
* @throws SQLException SQL exception
*/
DatabasePacket getQueryData() throws SQLException;
MySQLPacket getQueryData() throws SQLException;
}
......@@ -37,6 +37,7 @@ import org.apache.shardingsphere.shardingproxy.transport.common.packet.command.q
import org.apache.shardingsphere.shardingproxy.transport.common.packet.command.query.QueryResponsePackets;
import org.apache.shardingsphere.shardingproxy.transport.mysql.constant.MySQLColumnType;
import org.apache.shardingsphere.shardingproxy.transport.mysql.constant.MySQLNewParametersBoundFlag;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.MySQLPacket;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.MySQLPacketPayload;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.command.query.MySQLQueryCommandPacket;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.command.query.binary.MySQLBinaryStatement;
......@@ -47,7 +48,6 @@ import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.command.qu
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.generic.MySQLErrPacket;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.generic.MySQLErrPacketFactory;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.generic.MySQLOKPacket;
import org.apache.shardingsphere.shardingproxy.transport.spi.DatabasePacket;
import java.sql.SQLException;
import java.util.ArrayList;
......@@ -195,7 +195,7 @@ public final class MySQLQueryComStmtExecutePacket implements MySQLQueryCommandPa
}
@Override
public DatabasePacket getQueryData() throws SQLException {
public MySQLPacket getQueryData() throws SQLException {
QueryData queryData = databaseCommunicationEngine.getQueryData();
return new MySQLBinaryResultSetRowPacket(++currentQueryDataSequenceId + dataHeaderEofSequenceId, queryData.getData(), getMySQLColumnTypes(queryData));
}
......
......@@ -34,6 +34,7 @@ import org.apache.shardingsphere.shardingproxy.error.CommonErrorCode;
import org.apache.shardingsphere.shardingproxy.transport.common.packet.command.CommandResponsePackets;
import org.apache.shardingsphere.shardingproxy.transport.common.packet.command.query.DataHeaderPacket;
import org.apache.shardingsphere.shardingproxy.transport.common.packet.command.query.QueryResponsePackets;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.MySQLPacket;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.MySQLPacketPayload;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.command.MySQLCommandPacketType;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.command.query.MySQLQueryCommandPacket;
......@@ -41,7 +42,6 @@ import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.command.qu
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.generic.MySQLErrPacket;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.generic.MySQLErrPacketFactory;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.generic.MySQLOKPacket;
import org.apache.shardingsphere.shardingproxy.transport.spi.DatabasePacket;
import java.sql.SQLException;
import java.util.Collection;
......@@ -129,7 +129,7 @@ public final class MySQLComPacketQuery implements MySQLQueryCommandPacket {
}
@Override
public DatabasePacket getQueryData() throws SQLException {
public MySQLPacket getQueryData() throws SQLException {
QueryData queryData = textProtocolBackendHandler.getQueryData();
return new MySQLTextResultSetRowPacket(++currentQueryDataSequenceId + dataHeaderEofSequenceId, queryData.getData());
}
......
......@@ -20,6 +20,7 @@ package org.apache.shardingsphere.shardingproxy.transport.mysql.packet.command.a
import com.google.common.base.Optional;
import org.apache.shardingsphere.shardingproxy.error.CommonErrorCode;
import org.apache.shardingsphere.shardingproxy.transport.common.packet.command.CommandResponsePackets;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.MySQLPacket;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.MySQLPacketPayload;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.command.MySQLCommandPacketType;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.generic.MySQLErrPacket;
......@@ -44,7 +45,7 @@ public final class MySQLUnsupportedCommandPacketTest {
Optional<CommandResponsePackets> actual = new MySQLUnsupportedCommandPacket(1, MySQLCommandPacketType.COM_SLEEP).execute();
assertTrue(actual.isPresent());
assertThat(actual.get().getPackets().size(), is(1));
assertThat(actual.get().getHeadPacket().getSequenceId(), is(2));
assertThat(((MySQLPacket) actual.get().getHeadPacket()).getSequenceId(), is(2));
assertThat(((MySQLErrPacket) actual.get().getHeadPacket()).getErrorCode(), CoreMatchers.is(CommonErrorCode.UNSUPPORTED_COMMAND.getErrorCode()));
assertThat(((MySQLErrPacket) actual.get().getHeadPacket()).getSqlState(), CoreMatchers.is(CommonErrorCode.UNSUPPORTED_COMMAND.getSqlState()));
assertThat(((MySQLErrPacket) actual.get().getHeadPacket()).getErrorMessage(),
......
......@@ -25,6 +25,7 @@ import org.apache.shardingsphere.shardingproxy.backend.schema.LogicSchema;
import org.apache.shardingsphere.shardingproxy.backend.schema.LogicSchemas;
import org.apache.shardingsphere.shardingproxy.transport.common.packet.command.CommandResponsePackets;
import org.apache.shardingsphere.shardingproxy.transport.mysql.constant.MySQLServerErrorCode;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.MySQLPacket;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.MySQLPacketPayload;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.command.MySQLCommandPacketType;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.generic.MySQLErrPacket;
......@@ -70,7 +71,7 @@ public final class MySQLComInitDbPacketTest {
Optional<CommandResponsePackets> actual = new MySQLComInitDbPacket(1, payload, backendConnection).execute();
assertTrue(actual.isPresent());
assertThat(actual.get().getPackets().size(), is(1));
assertThat(actual.get().getHeadPacket().getSequenceId(), is(2));
assertThat(((MySQLPacket) actual.get().getHeadPacket()).getSequenceId(), is(2));
assertThat(((MySQLOKPacket) actual.get().getHeadPacket()).getAffectedRows(), is(0L));
assertThat(((MySQLOKPacket) actual.get().getHeadPacket()).getLastInsertId(), is(0L));
assertThat(((MySQLOKPacket) actual.get().getHeadPacket()).getWarnings(), is(0));
......@@ -84,7 +85,7 @@ public final class MySQLComInitDbPacketTest {
Optional<CommandResponsePackets> actual = new MySQLComInitDbPacket(1, payload, backendConnection).execute();
assertTrue(actual.isPresent());
assertThat(actual.get().getPackets().size(), is(1));
assertThat(actual.get().getHeadPacket().getSequenceId(), is(2));
assertThat(((MySQLPacket) actual.get().getHeadPacket()).getSequenceId(), is(2));
assertThat(((MySQLErrPacket) actual.get().getHeadPacket()).getErrorCode(), is(MySQLServerErrorCode.ER_BAD_DB_ERROR.getErrorCode()));
assertThat(((MySQLErrPacket) actual.get().getHeadPacket()).getSqlState(), is(MySQLServerErrorCode.ER_BAD_DB_ERROR.getSqlState()));
assertThat(((MySQLErrPacket) actual.get().getHeadPacket()).getErrorMessage(), is(String.format(MySQLServerErrorCode.ER_BAD_DB_ERROR.getErrorMessage(), invalidSchema)));
......
......@@ -19,6 +19,7 @@ package org.apache.shardingsphere.shardingproxy.transport.mysql.packet.command.a
import com.google.common.base.Optional;
import org.apache.shardingsphere.shardingproxy.transport.common.packet.command.CommandResponsePackets;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.MySQLPacket;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.MySQLPacketPayload;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.command.MySQLCommandPacketType;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.generic.MySQLOKPacket;
......@@ -43,7 +44,7 @@ public final class MySQLComPingPacketTest {
Optional<CommandResponsePackets> actual = new MySQLComPingPacket(1).execute();
assertTrue(actual.isPresent());
assertThat(actual.get().getPackets().size(), is(1));
assertThat(actual.get().getHeadPacket().getSequenceId(), is(2));
assertThat(((MySQLPacket) actual.get().getHeadPacket()).getSequenceId(), is(2));
assertThat(((MySQLOKPacket) actual.get().getHeadPacket()).getAffectedRows(), is(0L));
assertThat(((MySQLOKPacket) actual.get().getHeadPacket()).getLastInsertId(), is(0L));
assertThat(((MySQLOKPacket) actual.get().getHeadPacket()).getWarnings(), is(0));
......
......@@ -19,6 +19,7 @@ package org.apache.shardingsphere.shardingproxy.transport.mysql.packet.command.a
import com.google.common.base.Optional;
import org.apache.shardingsphere.shardingproxy.transport.common.packet.command.CommandResponsePackets;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.MySQLPacket;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.MySQLPacketPayload;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.command.MySQLCommandPacketType;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.generic.MySQLOKPacket;
......@@ -43,7 +44,7 @@ public final class MySQLComQuitPacketTest {
Optional<CommandResponsePackets> actual = new MySQLComQuitPacket(1).execute();
assertTrue(actual.isPresent());
assertThat(actual.get().getPackets().size(), is(1));
assertThat(actual.get().getHeadPacket().getSequenceId(), is(2));
assertThat(((MySQLPacket) actual.get().getHeadPacket()).getSequenceId(), is(2));
assertThat(((MySQLOKPacket) actual.get().getHeadPacket()).getAffectedRows(), is(0L));
assertThat(((MySQLOKPacket) actual.get().getHeadPacket()).getLastInsertId(), is(0L));
assertThat(((MySQLOKPacket) actual.get().getHeadPacket()).getWarnings(), is(0));
......
......@@ -24,10 +24,10 @@ import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.connec
import org.apache.shardingsphere.shardingproxy.backend.response.query.QueryData;
import org.apache.shardingsphere.shardingproxy.backend.response.query.QueryResponse;
import org.apache.shardingsphere.shardingproxy.transport.common.packet.command.CommandResponsePackets;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.MySQLPacket;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.MySQLPacketPayload;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.command.query.binary.MySQLBinaryStatementRegistry;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.command.query.binary.fixture.BinaryStatementRegistryUtil;
import org.apache.shardingsphere.shardingproxy.transport.spi.DatabasePacket;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
......@@ -92,7 +92,7 @@ public final class MySQLComStmtExecutePacketTest {
Optional<CommandResponsePackets> actualCommandResponsePackets = packet.execute();
assertTrue(actualCommandResponsePackets.isPresent());
assertTrue(packet.next());
DatabasePacket actual = packet.getQueryData();
MySQLPacket actual = packet.getQueryData();
assertThat(actual.getSequenceId(), is(3));
assertThat(((MySQLBinaryResultSetRowPacket) actual).getData(), is(Collections.<Object>singletonList(99999L)));
assertFalse(packet.next());
......
......@@ -35,6 +35,7 @@ import org.apache.shardingsphere.shardingproxy.backend.schema.LogicSchemas;
import org.apache.shardingsphere.shardingproxy.backend.schema.ShardingSchema;
import org.apache.shardingsphere.shardingproxy.transport.common.packet.command.CommandResponsePackets;
import org.apache.shardingsphere.shardingproxy.transport.mysql.constant.MySQLColumnType;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.MySQLPacket;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.MySQLPacketPayload;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.command.query.MySQLColumnDefinition41Packet;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.command.query.binary.fixture.BinaryStatementRegistryUtil;
......@@ -137,7 +138,7 @@ public final class MySQLComStmtPreparePacketTest {
assertTrue(actual.isPresent());
assertThat(actual.get().getPackets().size(), is(1));
assertThat(actual.get().getHeadPacket(), CoreMatchers.<DatabasePacket>instanceOf(MySQLComStmtPrepareOKPacket.class));
assertThat(actual.get().getHeadPacket().getSequenceId(), is(1));
assertThat(((MySQLPacket) actual.get().getHeadPacket()).getSequenceId(), is(1));
}
@Test
......@@ -148,7 +149,7 @@ public final class MySQLComStmtPreparePacketTest {
assertTrue(actual.isPresent());
assertThat(actual.get().getPackets().size(), is(1));
assertThat(actual.get().getHeadPacket(), CoreMatchers.<DatabasePacket>instanceOf(MySQLComStmtPrepareOKPacket.class));
assertThat(actual.get().getHeadPacket().getSequenceId(), is(1));
assertThat(((MySQLPacket) actual.get().getHeadPacket()).getSequenceId(), is(1));
}
@Test
......@@ -158,7 +159,7 @@ public final class MySQLComStmtPreparePacketTest {
assertTrue(actual.isPresent());
assertThat(actual.get().getPackets().size(), is(1));
assertThat(actual.get().getHeadPacket(), CoreMatchers.<DatabasePacket>instanceOf(MySQLComStmtPrepareOKPacket.class));
assertThat(actual.get().getHeadPacket().getSequenceId(), is(1));
assertThat(((MySQLPacket) actual.get().getHeadPacket()).getSequenceId(), is(1));
}
@SneakyThrows
......
......@@ -28,6 +28,7 @@ import org.apache.shardingsphere.shardingproxy.backend.schema.LogicSchemas;
import org.apache.shardingsphere.shardingproxy.backend.schema.ShardingSchema;
import org.apache.shardingsphere.shardingproxy.backend.text.TextProtocolBackendHandler;
import org.apache.shardingsphere.shardingproxy.transport.common.packet.command.CommandResponsePackets;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.MySQLPacket;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.MySQLPacketPayload;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.command.MySQLCommandPacketType;
import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.command.query.text.MySQLTextResultSetRowPacket;
......@@ -160,7 +161,7 @@ public final class MySQLComQueryPacketTest {
private void assertOKPacket(final CommandResponsePackets actual) {
assertThat(actual.getPackets().size(), is(1));
assertThat((actual.getPackets().iterator().next()).getSequenceId(), is(1));
assertThat(((MySQLPacket) (actual.getPackets().iterator().next())).getSequenceId(), is(1));
assertThat(actual.getPackets().iterator().next(), CoreMatchers.<DatabasePacket>instanceOf(MySQLOKPacket.class));
}
}
......@@ -44,9 +44,4 @@ public final class PostgreSQLUnsupportedCommandPacket implements PostgreSQLComma
@Override
public void write(final PostgreSQLPacketPayload payload) {
}
@Override
public int getSequenceId() {
return 0;
}
}
......@@ -53,9 +53,4 @@ public final class PostgreSQLRowDescriptionPacket implements PostgreSQLPacket {
payload.writeInt2(each.getDataFormat());
}
}
@Override
public int getSequenceId() {
return 0;
}
}
......@@ -58,9 +58,4 @@ public final class PostgreSQLBinaryResultSetRowPacket implements PostgreSQLPacke
postgreSQLBinaryProtocolValue.write(payload, value);
}
}
@Override
public int getSequenceId() {
return 0;
}
}
......@@ -18,7 +18,6 @@
package org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.command.query.binary.bind;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.PostgreSQLPacket;
import org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.PostgreSQLPacketPayload;
import org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.command.PostgreSQLCommandPacketType;
......@@ -28,7 +27,6 @@ import org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.comma
*
* @author zhangyonglun
*/
@Slf4j
public final class PostgreSQLBindCompletePacket implements PostgreSQLPacket {
@Getter
......@@ -37,9 +35,4 @@ public final class PostgreSQLBindCompletePacket implements PostgreSQLPacket {
@Override
public void write(final PostgreSQLPacketPayload payload) {
}
@Override
public int getSequenceId() {
return 0;
}
}
......@@ -113,7 +113,6 @@ public final class PostgreSQLComBindPacket implements PostgreSQLQueryCommandPack
if (GlobalContext.getInstance().isCircuitBreak()) {
return Optional.of(new CommandResponsePackets(new PostgreSQLErrorResponsePacket()));
}
CommandResponsePackets result = new CommandResponsePackets(new PostgreSQLBindCompletePacket());
if (null != databaseCommunicationEngine) {
BackendResponse backendResponse = databaseCommunicationEngine.execute();
if (backendResponse instanceof ErrorResponse) {
......@@ -125,7 +124,7 @@ public final class PostgreSQLComBindPacket implements PostgreSQLQueryCommandPack
Collection<DataHeaderPacket> dataHeaderPackets = createDataHeaderPackets(((QueryResponse) backendResponse).getQueryHeaders());
return Optional.<CommandResponsePackets>of(new QueryResponsePackets(dataHeaderPackets, dataHeaderPackets.size() + 2));
}
return Optional.of(result);
return Optional.of(new CommandResponsePackets(new PostgreSQLBindCompletePacket()));
}
private PostgreSQLErrorResponsePacket createErrorPacket(final ErrorResponse errorResponse) {
......@@ -169,9 +168,4 @@ public final class PostgreSQLComBindPacket implements PostgreSQLQueryCommandPack
}
return result;
}
@Override
public int getSequenceId() {
return 0;
}
}
......@@ -19,7 +19,6 @@ package org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.comm
import com.google.common.base.Optional;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.shardingproxy.transport.common.packet.command.CommandResponsePackets;
import org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.PostgreSQLPacketPayload;
import org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.command.PostgreSQLCommandPacket;
......@@ -30,7 +29,6 @@ import org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.comma
*
* @author zhangyonglun
*/
@Slf4j
public final class PostgreSQLComDescribePacket implements PostgreSQLCommandPacket {
@Getter
......@@ -50,9 +48,4 @@ public final class PostgreSQLComDescribePacket implements PostgreSQLCommandPacke
public Optional<CommandResponsePackets> execute() {
return Optional.absent();
}
@Override
public int getSequenceId() {
return 0;
}
}
......@@ -19,7 +19,6 @@ package org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.comm
import com.google.common.base.Optional;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.shardingproxy.transport.common.packet.command.CommandResponsePackets;
import org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.PostgreSQLPacketPayload;
import org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.command.PostgreSQLCommandPacket;
......@@ -30,10 +29,9 @@ import org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.comma
*
* @author zhangyonglun
*/
@Slf4j
@Getter
public final class PostgreSQLComExecutePacket implements PostgreSQLCommandPacket {
@Getter
private final char messageType = PostgreSQLCommandPacketType.EXECUTE.getValue();
public PostgreSQLComExecutePacket(final PostgreSQLPacketPayload payload) {
......@@ -50,9 +48,4 @@ public final class PostgreSQLComExecutePacket implements PostgreSQLCommandPacket
public Optional<CommandResponsePackets> execute() {
return Optional.absent();
}
@Override
public int getSequenceId() {
return 0;
}
}
......@@ -103,9 +103,4 @@ public final class PostgreSQLComParsePacket implements PostgreSQLCommandPacket {
}
return Optional.of(new CommandResponsePackets(new PostgreSQLParseCompletePacket()));
}
@Override
public int getSequenceId() {
return 0;
}
}
......@@ -18,7 +18,6 @@
package org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.command.query.binary.parse;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.PostgreSQLPacket;
import org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.PostgreSQLPacketPayload;
import org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.command.PostgreSQLCommandPacketType;
......@@ -28,18 +27,12 @@ import org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.comma
*
* @author zhangyonglun
*/
@Slf4j
@Getter
public final class PostgreSQLParseCompletePacket implements PostgreSQLPacket {
@Getter
private final char messageType = PostgreSQLCommandPacketType.PARSE_COMPLETE.getValue();
@Override
public void write(final PostgreSQLPacketPayload payload) {
}
@Override
public int getSequenceId() {
return 0;
}
}
......@@ -19,7 +19,6 @@ package org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.comm
import com.google.common.base.Optional;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.shardingproxy.transport.common.packet.command.CommandResponsePackets;
import org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.PostgreSQLPacketPayload;
import org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.command.PostgreSQLCommandPacket;
......@@ -30,7 +29,6 @@ import org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.comma
*
* @author zhangyonglun
*/
@Slf4j
public final class PostgreSQLComSyncPacket implements PostgreSQLCommandPacket {
@Getter
......@@ -48,9 +46,4 @@ public final class PostgreSQLComSyncPacket implements PostgreSQLCommandPacket {
public Optional<CommandResponsePackets> execute() {
return Optional.absent();
}
@Override
public int getSequenceId() {
return 0;
}
}
......@@ -112,9 +112,4 @@ public final class PostgreSQLComQueryPacket implements PostgreSQLQueryCommandPac
public DatabasePacket getQueryData() throws SQLException {
return new PostgreSQLDataRowPacket(textProtocolBackendHandler.getQueryData().getData());
}
@Override
public int getSequenceId() {
return 0;
}
}
......@@ -56,9 +56,4 @@ public final class PostgreSQLDataRowPacket implements PostgreSQLPacket {
}
}
}
@Override
public int getSequenceId() {
return 0;
}
}
......@@ -19,7 +19,6 @@ package org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.gene
import com.google.common.base.Optional;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.shardingproxy.transport.common.packet.command.CommandResponsePackets;
import org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.PostgreSQLPacketPayload;
import org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.command.PostgreSQLCommandPacket;
......@@ -30,7 +29,6 @@ import org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.comma
*
* @author zhangyonglun
*/
@Slf4j
public final class PostgreSQLComTerminationPacket implements PostgreSQLCommandPacket {
@Getter
......@@ -48,9 +46,4 @@ public final class PostgreSQLComTerminationPacket implements PostgreSQLCommandPa
public Optional<CommandResponsePackets> execute() {
return Optional.absent();
}
@Override
public int getSequenceId() {
return 0;
}
}
......@@ -41,9 +41,4 @@ public final class PostgreSQLCommandCompletePacket implements PostgreSQLPacket {
// TODO payload.writeStringNul(sqlCommand + " " + rowCount);
payload.writeStringNul("");
}
@Override
public int getSequenceId() {
return 0;
}
}
......@@ -38,9 +38,4 @@ public final class PostgreSQLErrorResponsePacket implements PostgreSQLPacket {
public void write(final PostgreSQLPacketPayload payload) {
payload.writeInt1(errorCode);
}
@Override
public int getSequenceId() {
return 0;
}
}
......@@ -38,9 +38,4 @@ public final class PostgreSQLReadyForQueryPacket implements PostgreSQLPacket {
public void write(final PostgreSQLPacketPayload payload) {
payload.writeInt1(status);
}
@Override
public int getSequenceId() {
return 0;
}
}
......@@ -42,9 +42,4 @@ public final class PostgreSQLAuthenticationOKPacket implements PostgreSQLPacket
public void write(final PostgreSQLPacketPayload payload) {
payload.writeInt4(success);
}
@Override
public int getSequenceId() {
return 0;
}
}
......@@ -47,9 +47,4 @@ public final class PostgreSQLComStartupPacket implements PostgreSQLPacket {
@Override
public void write(final PostgreSQLPacketPayload payload) {
}
@Override
public int getSequenceId() {
return 0;
}
}
......@@ -18,6 +18,7 @@
package org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.handshake;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.PostgreSQLPacket;
import org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.PostgreSQLPacketPayload;
import org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.command.PostgreSQLCommandPacketType;
......@@ -27,6 +28,7 @@ import org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.comma
*
* @author zhangyonglun
*/
@RequiredArgsConstructor
public final class PostgreSQLParameterStatusPacket implements PostgreSQLPacket {
@Getter
......@@ -36,19 +38,9 @@ public final class PostgreSQLParameterStatusPacket implements PostgreSQLPacket {
private final String value;
public PostgreSQLParameterStatusPacket(final String key, final String value) {
this.key = key;
this.value = value;
}
@Override
public void write(final PostgreSQLPacketPayload payload) {
payload.writeStringNul(key);
payload.writeStringNul(value);
}
@Override
public int getSequenceId() {
return 0;
}
}
......@@ -37,9 +37,4 @@ public final class PostgreSQLSSLNegativePacket implements PostgreSQLPacket {
public void write(final PostgreSQLPacketPayload payload) {
payload.writeInt1(statusCode);
}
@Override
public int getSequenceId() {
return 0;
}
}
......@@ -23,11 +23,4 @@ package org.apache.shardingsphere.shardingproxy.transport.spi;
* @author zhangliang
*/
public interface DatabasePacket {
/**
* Get sequence ID.
*
* @return sequence ID
*/
int getSequenceId();
}
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.shardingsphere.shardingproxy.transport.common.packet;
/**
* Database packet.
*
* @author zhangliang
*/
public interface DatabasePacket {
/**
* Get sequence ID.
*
* @return sequence ID
*/
int getSequenceId();
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册