Replace use of mock server *_replies_to_find when replying to OP_MSG requests #1280
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kevinAlbs
approved these changes
May 24, 2023
| void | ||
| mock_rs_replies_opmsg (request_t *request, uint32_t flags, const bson_t *doc) | ||
| { | ||
| mock_server_replies_opmsg (request, flags, doc); |
There was a problem hiding this comment.
The mock_rs_replies_* functions do not depend on mock_rs_t and forward arguments to the correspondingmock_server_replies_* functions.
I suggest removing mock_rs_replies_* functions and replacing calls with mock_server_replies_*.
There was a problem hiding this comment.
Removed reference to mock_(server|rs)_* in reply functions. Renamed to use a common reply_to_* naming pattern instead.
| tmp_bson ("{'ok': 1," | ||
| " 'cursor': {" | ||
| " 'id': {'$numberLong': '0'}," | ||
| " 'ns': 'db.collection'," |
There was a problem hiding this comment.
Suggested change
| " 'ns': 'db.collection'," | |
| " 'ns': 'test.test'," |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivated by ongoing work on CDRIVER-4617 and CDRIVER-4630. Verified by this patch.
Improved validation and correctness checks for RPC message parsing in CDRIVER-4617 and CDRIVER-4630 (WIP) exposed several mock server tests that use
mock_(server|rs)_replies_to_findto respond to OP_MSG requests.mock_(server|rs)_replies_to_findassumes the request is an OP_QUERY and unconditionally accesses OP_QUERY flags in the request even if it is actually an OP_MSG.This PR replaces calls to
mock_(server|rs)_replies_to_findthat follow an OP_MSG request withmock_server_replies_opmsgor the newmock_rs_replies_opmsgfunction, that explicitly specifying the reply contents (e.g.cursorId,firstBatchcontents, etc.) as was intended by invoking*_replies_to_findwithis_command == true.