Remove dead code in ReplyHeader #1231
Conversation
The dead code is a remnant of when the driver supported the full range of OP_REPLY wire protocol message usage. Since the driver now only runs against MongoDB releases that support OP_MSG, OP_REPLY is only used for the response to the `hello` command in the handshake, and therefore most of the OP_REPLY-handling code is no longer on any execution paths. JAVA-5204
| opMsgFlagBits = header.getInt(); | ||
| header.get(); // ignore payload type | ||
| int flagBits = header.getInt(); | ||
| hasMoreToCome = (flagBits & (1 << 1)) != 0; |
There was a problem hiding this comment.
No need to store all the flag bigs since we only ever examine this one.
| } | ||
| } | ||
|
|
||
| ReplyMessage(final ReplyHeader replyHeader, final long requestId) { |
There was a problem hiding this comment.
This constructor was only used by a test, so removed it and refactored the test to use the remaining constructor.
| @@ -35,50 +32,24 @@ | |||
| */ | |||
| public class ReplyMessage<T> { | |||
|
|
|||
| private final ReplyHeader replyHeader; | |||
| private final List<T> documents; | |||
| private final T document; | |||
There was a problem hiding this comment.
In practice this is always a list of exactly 1, so get rid of the list
| @@ -63,7 +59,7 @@ class CommandMessageSpecification extends Specification { | |||
| .serverType(serverType as ServerType) | |||
| .sessionSupported(true) | |||
| .build(), | |||
| responseExpected, exhaustAllowed, null, null, clusterConnectionMode, null) | |||
There was a problem hiding this comment.
No need to test this flag bit since the driver never uses it.
| } | ||
|
|
||
| @Test(expected = MongoInternalException.class) | ||
| public void shouldThrowExceptionIfOpCodeIsIncorrect() { |
There was a problem hiding this comment.
This is actually a test of ReplyHeader, not ReplyMessage, and it duplicates an existing test in ReplyHeaderSpecification. That's why it's been deleted. (Migrating to use assertThrows is what clued me in to that).
|
No, nothing like that. The driver (and this code) fully supports OP_MSG, which is supported by all server versions >= 3.6. OP_REPLY is only used in very limited circumstances by the driver: when sending the first handshake message on a connection, when we don't know what server version we're connected to. So the driver sends an "ismaster" command using OP_QUERY, and the server responds with an OP_REPLY message. The driver will then switch to OP_MSG for all subsequent messages. |
The dead code is a remnant of when the driver supported the full range of OP_REPLY wire protocol message usage. Since the driver now only runs against MongoDB releases that support OP_MSG, OP_REPLY is only used for the response to the `hello` command in the handshake, and therefore most of the OP_REPLY-handling code is no longer on any execution paths. JAVA-5204
The dead code is a remnant of when the driver supported the full range of OP_REPLY wire protocol message usage. Since the driver now only runs against MongoDB releases that support OP_MSG, OP_REPLY is only used for the response to the `hello` command in the handshake, and therefore most of the OP_REPLY-handling code is no longer on any execution paths. JAVA-5204
The dead code is a remnant of when the driver supported the full range of OP_REPLY wire protocol message usage. Since the driver now only runs against MongoDB releases that support OP_MSG, OP_REPLY is only used for the response to the
hellocommand in the handshake, and therefore most of the OP_REPLY-handling code is no longer on any execution paths.JAVA-5204