Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions src/main/java/org/mariadb/r2dbc/api/MariadbOutParameters.java

This file was deleted.

11 changes: 0 additions & 11 deletions src/main/java/org/mariadb/r2dbc/api/MariadbOutSegment.java

This file was deleted.

40 changes: 1 addition & 39 deletions src/main/java/org/mariadb/r2dbc/client/DecoderState.java
Original file line number Diff line number Diff line change
Expand Up @@ -123,18 +123,11 @@ public DecoderState next(MariadbFrameDecoder decoder) {
EOF_INTERMEDIATE_RESPONSE {
@Override
public ServerMessage decode(ByteBuf body, Sequencer sequencer, MariadbFrameDecoder decoder) {
EofPacket eof = EofPacket.decode(body, decoder.getContext(), false);
decoder.setStateCounter((eof.getServerStatus() & ServerStatus.PS_OUT_PARAMETERS) > 0 ? 1 : 0);
return eof;
return EofPacket.decode(body, decoder.getContext(), false);
}

@Override
public DecoderState next(MariadbFrameDecoder decoder) {
// mysql has a broken protocol for output parameter, then driver need to know state
if (decoder.getStateCounter() > 0) {
decoder.setStateCounter(0);
return ROW_RESPONSE_OUT_PARAM;
}
return ROW_RESPONSE;
}
},
Expand Down Expand Up @@ -185,25 +178,6 @@ public DecoderState decoder(short val, int len) {
}
},

ROW_RESPONSE_OUT_PARAM {
@Override
public DecoderState decoder(short val, int len) {
switch (val) {
case 254:
if (len < 0xffffff) {
return EOF_END_OUT_PARAM;
} else {
// normal ROW
return ROW_OUTPUT_PARAM;
}
case 255: // 0xFF
return ERROR;
default:
return ROW_OUTPUT_PARAM;
}
}
},

ROW {
@Override
public ServerMessage decode(ByteBuf body, Sequencer sequencer, MariadbFrameDecoder decoder) {
Expand All @@ -216,18 +190,6 @@ public DecoderState next(MariadbFrameDecoder decoder) {
}
},

ROW_OUTPUT_PARAM {
@Override
public ServerMessage decode(ByteBuf body, Sequencer sequencer, MariadbFrameDecoder decoder) {
return new RowPacket(body);
}

@Override
public DecoderState next(MariadbFrameDecoder decoder) {
return ROW_RESPONSE_OUT_PARAM;
}
},

PREPARE_RESPONSE {
@Override
public DecoderState decoder(short val, int len) {
Expand Down
202 changes: 0 additions & 202 deletions src/main/java/org/mariadb/r2dbc/client/MariadbOutParameters.java

This file was deleted.

This file was deleted.

Loading