RUBY-2234 Fix error on large bulk writes with zlib #2026
Merged
Conversation
This file contains 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
added 2 commits
July 20, 2020 14:44
…k writes split correctly
egiurleo
changed the title
p-mongo
reviewed
Jul 22, 2020
lib/mongo/server/connection_base.rb
Outdated
| @@ -213,12 +212,21 @@ def serialize(message, client, buffer = BSON::ByteBuffer.new) | |||
| max_bson_size += MAX_BSON_COMMAND_OVERHEAD | |||
| end | |||
|
|
|||
| final_message.serialize(buffer, max_bson_size) | |||
| temp_buffer = BSON::ByteBuffer.new | |||
| temp_buffer.put_string(buffer.to_s) | |||
There was a problem hiding this comment.
I believe this should be put_bytes and could you add a comment that this copies the existing passed in buffer contents, if any.
|
I broke jruby, so please disregard for now :) |
p-mongo
approved these changes
Jul 27, 2020
egiurleo
commented
Jul 29, 2020
Comment on lines
+226
to
239
| if max_message_size | ||
| # Create a separate buffer that contains the un-compressed message | ||
| # for the purpose of checking its size. Write any pre-existing contents | ||
| # from the original buffer into the temporary one. | ||
| temp_buffer = BSON::ByteBuffer.new | ||
|
|
||
| # TODO: address the fact that this line mutates the buffer. | ||
| temp_buffer.put_bytes(buffer.get_bytes(buffer.length)) | ||
|
|
||
| message.serialize(temp_buffer, max_bson_size) | ||
| if temp_buffer.length > max_message_size | ||
| raise Error::MaxMessageSize.new(max_message_size) | ||
| end | ||
| end |
There was a problem hiding this comment.
@p-mongo is this what you had in mind?
p-mongo
approved these changes
Jul 29, 2020
egiurleo
pushed a commit
that referenced
this pull request
Jul 30, 2020
egiurleo
pushed a commit
that referenced
this pull request
Jul 30, 2020
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.
No description provided.