Add a merge method, update unknown tests to use valid binary input. #307
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
tbkka
reviewed
Feb 23, 2017
| /// When `partial` is `true`, then partial messages are allowed, and | ||
| /// `Message.isInitialized` is not checked. | ||
| /// - Throws: An instance of `BinaryDecodingError` on failure. | ||
| mutating func merge(serializedData data: Data, extensions: ExtensionSet? = nil, partial: Bool = false) throws { | ||
| if !data.isEmpty { | ||
| try data.withUnsafeBytes { (pointer: UnsafePointer<UInt8>) in | ||
| try decodeBinary(from: pointer, |
There was a problem hiding this comment.
Should decodeBinary be renamed merge as well? It does the same thing (only accepting a pointer/count instead of a Data object).
There was a problem hiding this comment.
Done, also prefixed the new name with \_ since it isn't really a public symbol.
@allevato I'm assuming you'll give me a better name for the method. 😄
tbkka
reviewed
Feb 23, 2017
| msg1.unknownFields.append(protobufData: Data(bytes: [1, 2])) | ||
| assertUnknownFields(msg1, [1, 2]) | ||
| try msg1.merge(serializedData: Data(bytes: [24, 1])) // Field 3, varint | ||
| assertUnknownFields(msg1, [24, 1]) |
There was a problem hiding this comment.
Thanks! Since you're removing the only use of unknownFields.append outside of the library, would you mind marking the append method internal?
tbkka
approved these changes
Feb 23, 2017
allevato
approved these changes
Feb 23, 2017
| /// Updates the message by decoding the Protocol Buffer binary serialization | ||
| /// format data into this message. | ||
| /// | ||
| /// - Note: If the api does throw, the message may still have been mutated by the |
There was a problem hiding this comment.
Done, and new set of diffs posted merging this into the original.
thomasvl
force-pushed
the
mergeSerializedData
branch
from
c2120ff to
bf83f29
Compare
Rename decodeBinary(from:count:extensions:) to _mergeSerializedBytes(from:count:extensions:) since it merges into the existing message and to tag it as an internal detail.
thomasvl
force-pushed
the
mergeSerializedData
branch
from
bf83f29 to
0f28e51
Compare
ahmed-osama-saad
pushed a commit
to ahmed-osama-saad/swift-protobuf
that referenced
this pull request
Oct 12, 2023
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.