Keep changes inside instances sorted by source timestamp [12421] #2182
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
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
|
@Mergifyio backport 2.3.x 2.2.x 2.1.x 2.0.x |
|
Command
|
|
@richiprosima Please test windows |
IkerLuengo
previously approved these changes
Sep 6, 2021
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
richiware
reviewed
Sep 6, 2021
richiware
previously approved these changes
Sep 6, 2021
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
richiware
approved these changes
Sep 6, 2021
|
@richiprosima Please test linux |
mergify bot
pushed a commit
that referenced
this pull request
Sep 6, 2021
* Refs 12419. Regression test. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12419. Added sorted_vector_insert utility method. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12419. ReaderHistory uses sorted_vector_insert. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12419. SubscriberHistory uses sorted_vector_insert. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12421. Uncrustify. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12421. Apply suggestions Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12421. Moved new template method to correct namespace. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> (cherry picked from commit 38e8d0f)
mergify bot
pushed a commit
that referenced
this pull request
Sep 6, 2021
* Refs 12419. Regression test. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12419. Added sorted_vector_insert utility method. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12419. ReaderHistory uses sorted_vector_insert. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12419. SubscriberHistory uses sorted_vector_insert. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12421. Uncrustify. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12421. Apply suggestions Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12421. Moved new template method to correct namespace. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> (cherry picked from commit 38e8d0f)
mergify bot
pushed a commit
that referenced
this pull request
Sep 6, 2021
* Refs 12419. Regression test. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12419. Added sorted_vector_insert utility method. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12419. ReaderHistory uses sorted_vector_insert. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12419. SubscriberHistory uses sorted_vector_insert. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12421. Uncrustify. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12421. Apply suggestions Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12421. Moved new template method to correct namespace. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> (cherry picked from commit 38e8d0f) # Conflicts: # src/cpp/fastrtps_deprecated/subscriber/SubscriberHistory.cpp # src/cpp/rtps/history/ReaderHistory.cpp
mergify bot
pushed a commit
that referenced
this pull request
Sep 6, 2021
* Refs 12419. Regression test. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12419. Added sorted_vector_insert utility method. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12419. ReaderHistory uses sorted_vector_insert. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12419. SubscriberHistory uses sorted_vector_insert. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12421. Uncrustify. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12421. Apply suggestions Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12421. Moved new template method to correct namespace. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> (cherry picked from commit 38e8d0f) # Conflicts: # include/fastdds/rtps/history/ReaderHistory.h # src/cpp/fastrtps_deprecated/subscriber/SubscriberHistory.cpp # src/cpp/rtps/history/ReaderHistory.cpp # test/mock/rtps/ReaderHistory/fastdds/rtps/history/ReaderHistory.h
|
Command
|
SamuelWHalodi
pushed a commit
to SamuelWHalodi/Fast-DDS
that referenced
this pull request
Oct 4, 2021
* Refs 12419. Regression test. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12419. Added sorted_vector_insert utility method. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12419. ReaderHistory uses sorted_vector_insert. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12419. SubscriberHistory uses sorted_vector_insert. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12421. Uncrustify. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12421. Apply suggestions Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12421. Moved new template method to correct namespace. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> Signed-off-by: Samuel Wilhelmsson <samuel@halodi.com>
MiguelCompany
added a commit
that referenced
this pull request
Oct 15, 2021
* Keep changes inside instances sorted by source timestamp (#2182) * Refs 12419. Regression test. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12419. Added sorted_vector_insert utility method. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12419. ReaderHistory uses sorted_vector_insert. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12419. SubscriberHistory uses sorted_vector_insert. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12421. Uncrustify. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12421. Apply suggestions Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12421. Moved new template method to correct namespace. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> (cherry picked from commit 38e8d0f) # Conflicts: # src/cpp/fastrtps_deprecated/subscriber/SubscriberHistory.cpp # src/cpp/rtps/history/ReaderHistory.cpp * Refs 12421. Fix conflicts after backport. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12421. Uncrustify. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
MiguelCompany
added a commit
that referenced
this pull request
Feb 15, 2022
* Keep changes inside instances sorted by source timestamp (#2182) * Refs 12419. Regression test. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12419. Added sorted_vector_insert utility method. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12419. ReaderHistory uses sorted_vector_insert. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12419. SubscriberHistory uses sorted_vector_insert. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12421. Uncrustify. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12421. Apply suggestions Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12421. Moved new template method to correct namespace. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> (cherry picked from commit 38e8d0f) # Conflicts: # include/fastdds/rtps/history/ReaderHistory.h # src/cpp/fastrtps_deprecated/subscriber/SubscriberHistory.cpp # src/cpp/rtps/history/ReaderHistory.cpp # test/mock/rtps/ReaderHistory/fastdds/rtps/history/ReaderHistory.h * Refs 12421: fix backport conflicts Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #12421: linters Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Co-authored-by: Miguel Company <miguelcompany@eprosima.com> Co-authored-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
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.
On a reliable reader, when using a topic with keys, and changes arrive unordered, they are returned in the received order instead of the sequence number order.
This PR fixes this misbehavior, and also adds a generic utility function to keep changes on a vector sorted.