Skip to content
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 read_next_sample and take_next_sample <2.2.x> [11145] #1899

Merged
merged 1 commit into from
Apr 23, 2021

Conversation

IkerLuengo
Copy link
Contributor

This is a port of #1732 from to <2.2.x>

This is a port of #1732 from <master> to <2.2.x>

* Refs 10476. Fix on DataReaderTests.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 10476. Added xxx_next_sample tests to DataReaderTests.read_unread

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 10476. Strict real-time on read_or_take.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 10476. Using LoanableTypedCollection<SampleInfo> on ReadTakeCommand and DataReaderLoanManager.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 10476. Use ReadTakeCommand on take_next_sample.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 10476. Use ReadTakeCommand on read_next_sample via read_or_take_next_sample.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 10476. Adapt tests to new behavior of take

Signed-off-by: Iker Luengo <ikerluengo@eprosima.com>

* Refs 10476. Added method get_first_change_with_minimum_ts to ReaderHistory.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 10476. Add new method to mock.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 10476. PubSubReader::last_seq is now a map for each instance.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 10476. Added UserAllocatedSequence.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 10476. Added take_first_data to PubSubReader.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 10476. Using take_first_data on LifespanQos blackbox test.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 10476. Uncrustify.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 10476. Solve build error on non-windows platforms.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 10480. Apply suggestions from code review

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

Co-authored-by: IkerLuengo <57146230+IkerLuengo@users.noreply.github.com>

Co-authored-by: Iker Luengo <ikerluengo@eprosima.com>
Co-authored-by: IkerLuengo <57146230+IkerLuengo@users.noreply.github.com>
Signed-off-by: Iker Luengo <ikerluengo@eprosima.com>
@IkerLuengo IkerLuengo changed the title Fix read_next_sample and take_next_sample Fix read_next_sample and take_next_sample <2.2.x> [11145] Apr 8, 2021
Copy link
Contributor

@JLBuenoLopez JLBuenoLopez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

CI failures are unrelated. Discovery server build error is fixed in #1811.

@JLBuenoLopez JLBuenoLopez added the ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. label Apr 22, 2021
@MiguelCompany MiguelCompany merged commit 12fdf42 into 2.2.x Apr 23, 2021
@MiguelCompany MiguelCompany deleted the bugfix/take-next-sample-2.2.x branch April 23, 2021 07:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants