-
Notifications
You must be signed in to change notification settings - Fork 1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix copying of data product containers #2711
Merged
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
timcanham
approved these changes
May 1, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
LeStarch
approved these changes
May 1, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One minor comment. Could be fixed on follow-up.
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.
This PR fixes an issue with copying data product containers. A
DpContainer
contains anFw::ExternalSerializeBuffer
as a member that provides a view into theFw::Buffer
that it owns. When aDpContainer
was copied via copy construction or copy assignment, theExternalSerializeBuffer
member was not being copied correctly.I did the following:
ExternalSerializeBuffer
.ExternalSerializeBuffer
:ExternalSerializeBufferWithDataCopy
andExternalSerializeBufferWithMemberCopy
. Each derived class adds just that kind of copy semantics to the base class.DpContainer
so that theExternalSerializeBuffer
has typeExternalSerializeBufferWithMemberCopy
. The slice is owned by theDpContainer
, so this is the behavior we want.FppTest/dp
to verify that the container assignment is working.SerializeBufferBase
protected, so that assigning into aSerializeBufferBase
reference is not allowed.SerializeBufferBase
reference, in a way that was not necessary.@timcanham This PR pulls out the changes that I submitted to your DpCatalog branch. I thought it would be good to make a separate PR to mainline with just these changes.