[20257] Add a keyed fragmented change to the reader data instance only when its completed by Mario-DL · Pull Request #4261 · eProsima/Fast-DDS

Mario-DL · 2024-01-19T08:29:26Z

Description

When a keyed fragmented change is completed, notify the data instance and add the change in that moment instead of adding the change when it is still not fully assembled. This PR also makes the Stateless/full readers take the serialized key only from the fragment number 1.

@Mergifyio backport 2.12.x 2.11.x 2.10.x 2.6.x

Contributor Checklist

Commit messages follow the project guidelines.
The code follows the style guidelines of this project.
Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally
Any new/modified methods have been properly documented using Doxygen.
Changes are ABI compatible.
Changes are API compatible.
N/A New feature has been added to the versions.md file (if applicable).
N/ANew feature has been documented/Current behavior is correctly described in the documentation.
Applicable backports have been included in the description.

Reviewer Checklist

The PR has a milestone assigned.
The title and description correctly express the PR's purpose.
Check contributor checklist is correct.
Check CI results: changes do not issue any warning.
Check CI results: failing tests are unrelated with the changes.

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Mario-DL · 2024-01-19T17:46:38Z

@richiprosima please test this

src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp

JesusPoderoso · 2024-01-23T07:49:40Z

@richiprosima please test this

Mario-DL · 2024-01-23T09:11:58Z

New run here

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Mario-DL · 2024-01-24T10:14:54Z

@richiprosima please test this

src/cpp/rtps/reader/StatefulReader.cpp

src/cpp/rtps/reader/StatelessReader.cpp

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

…g nullptr Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Mario-DL · 2024-01-25T06:44:08Z

@richiprosima please test this

JesusPoderoso · 2024-01-26T12:51:12Z

CI issues seem unrelated to the PR. Ready to merge!

EduPonz · 2024-01-27T08:16:31Z

@Mergifyio backport 2.12.x 2.11.x 2.10.x 2.6.x

mergify · 2024-01-27T08:16:42Z

backport 2.12.x 2.11.x 2.10.x 2.6.x

✅ Backports have been created

Details

#4305 [20257] Add a keyed fragmented change to the reader data instance only when its completed (backport #4261) has been created for branch 2.12.x
#4306 [20257] Add a keyed fragmented change to the reader data instance only when its completed (backport #4261) has been created for branch 2.11.x
#4307 [20257] Add a keyed fragmented change to the reader data instance only when its completed (backport #4261) has been created for branch 2.10.x
#4308 [20257] Add a keyed fragmented change to the reader data instance only when its completed (backport #4261) has been created for branch 2.6.x but encountered conflicts

…ts completed (#4261) * Refs #20257: Add regression test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * #Refs #20257: Fix Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #20239: Second rev suggestions Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #20257: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #20257: Retrieve instance handle condition before for avoid being nullptr Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> (cherry picked from commit 9558ce4)

…ts completed (#4261) * Refs #20257: Add regression test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * #Refs #20257: Fix Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #20239: Second rev suggestions Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #20257: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #20257: Retrieve instance handle condition before for avoid being nullptr Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> (cherry picked from commit 9558ce4) # Conflicts: # src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp

…ts completed (#4261) (#4306) * Add a keyed fragmented change to the reader data instance only when its completed (#4261) * Refs #20257: Add regression test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * #Refs #20257: Fix Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #20239: Second rev suggestions Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #20257: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #20257: Retrieve instance handle condition before for avoid being nullptr Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> (cherry picked from commit 9558ce4) * Refs #20257: Correct test indentation Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com> Co-authored-by: Mario Dominguez <mariodominguez@eprosima.com>

…ts completed (#4261) * Refs #20257: Add regression test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * #Refs #20257: Fix Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #20239: Second rev suggestions Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #20257: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #20257: Retrieve instance handle condition before for avoid being nullptr Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> (cherry picked from commit 9558ce4)

…ts completed (#4261) (#4307) * Add a keyed fragmented change to the reader data instance only when its completed (#4261) * Refs #20257: Add regression test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * #Refs #20257: Fix Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #20239: Second rev suggestions Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #20257: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #20257: Retrieve instance handle condition before for avoid being nullptr Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> (cherry picked from commit 9558ce4) * Refs #20257: Correct test indentation Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com> Co-authored-by: Mario Dominguez <mariodominguez@eprosima.com>

…ts completed (#4261) (#4308) * Add a keyed fragmented change to the reader data instance only when its completed (#4261) * Refs #20257: Add regression test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * #Refs #20257: Fix Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #20239: Second rev suggestions Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #20257: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #20257: Retrieve instance handle condition before for avoid being nullptr Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> (cherry picked from commit 9558ce4) # Conflicts: # src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp * Refs #20257: Correct test indentation Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #20257: Resolve conflicts Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com> Co-authored-by: Mario Dominguez <mariodominguez@eprosima.com>

…ts completed (#4261) (#4305) * Add a keyed fragmented change to the reader data instance only when its completed (#4261) * Refs #20257: Add regression test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * #Refs #20257: Fix Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #20239: Second rev suggestions Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #20257: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #20257: Retrieve instance handle condition before for avoid being nullptr Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> (cherry picked from commit 9558ce4) * Refs #20257: Correct test indentation Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com> Co-authored-by: Mario Dominguez <mariodominguez@eprosima.com>

Refs #20257: Add regression test

a471216

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Mario-DL added this to the v2.13.2 milestone Jan 19, 2024

Mario-DL mentioned this pull request Jan 19, 2024

[20239] Make DataWriters always send the key hash on keyed topics #4238

Merged

11 tasks

Mario-DL added the ci-pending PR which CI is running label Jan 19, 2024

Mario-DL force-pushed the hotfix/20257 branch 2 times, most recently from 685b8a1 to 2f73ebc Compare January 19, 2024 17:46

Mario-DL added needs-review PR that is ready to be reviewed and removed ci-pending PR which CI is running labels Jan 22, 2024

EduPonz suggested changes Jan 23, 2024

View reviewed changes

src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp Outdated Show resolved Hide resolved

EduPonz added skip-ci Automatically pass CI and removed needs-review PR that is ready to be reviewed labels Jan 23, 2024

EduPonz previously approved these changes Jan 23, 2024

View reviewed changes

Mario-DL dismissed EduPonz’s stale review via 521b425 January 23, 2024 07:32

Mario-DL force-pushed the hotfix/20257 branch 2 times, most recently from 3486bdf to 46c68d3 Compare January 23, 2024 08:04

EduPonz previously approved these changes Jan 23, 2024

View reviewed changes

#Refs #20257: Fix

5059129

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Mario-DL dismissed EduPonz’s stale review via 5059129 January 24, 2024 10:07

Mario-DL force-pushed the hotfix/20257 branch from 46c68d3 to 5059129 Compare January 24, 2024 10:07

Mario-DL changed the title ~~[20257] When a keyed fragmented change is to be removed, it must also be removed from its related data instance~~ [20257] A keyed completed change is correctly added into the data instance Jan 24, 2024

Mario-DL changed the title ~~[20257] A keyed completed change is correctly added into the data instance~~ [20257] Add a keyed fragmented change to the reader data instance only when its completed Jan 24, 2024

Mario-DL added ci-pending PR which CI is running and removed skip-ci Automatically pass CI labels Jan 24, 2024

EduPonz suggested changes Jan 24, 2024

View reviewed changes

src/cpp/rtps/reader/StatefulReader.cpp Outdated Show resolved Hide resolved

src/cpp/rtps/reader/StatelessReader.cpp Outdated Show resolved Hide resolved

Refs #20239: Second rev suggestions

9546e32

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

EduPonz previously approved these changes Jan 24, 2024

View reviewed changes

Refs #20257: Linter

1b9e7fd

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Mario-DL dismissed EduPonz’s stale review via 1b9e7fd January 24, 2024 13:38

Refs #20257: Retrieve instance handle condition before for avoid bein…

9b342c1

…g nullptr Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

JesusPoderoso added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Jan 26, 2024

EduPonz approved these changes Jan 27, 2024

View reviewed changes

EduPonz merged commit 9558ce4 into master Jan 27, 2024

EduPonz deleted the hotfix/20257 branch January 27, 2024 08:16

mergify bot mentioned this pull request Jan 27, 2024

[20257] Add a keyed fragmented change to the reader data instance only when its completed (backport #4261) #4308

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[20257] Add a keyed fragmented change to the reader data instance only when its completed#4261

[20257] Add a keyed fragmented change to the reader data instance only when its completed#4261
EduPonz merged 5 commits intomasterfrom
hotfix/20257

Mario-DL commented Jan 19, 2024 •

edited

Loading

Uh oh!

Mario-DL commented Jan 19, 2024

Uh oh!

Uh oh!

JesusPoderoso commented Jan 23, 2024

Uh oh!

Mario-DL commented Jan 23, 2024 •

edited

Loading

Uh oh!

Mario-DL commented Jan 24, 2024

Uh oh!

Uh oh!

Uh oh!

Mario-DL commented Jan 25, 2024

Uh oh!

JesusPoderoso commented Jan 26, 2024

Uh oh!

EduPonz commented Jan 27, 2024

Uh oh!

mergify bot commented Jan 27, 2024 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

Mario-DL commented Jan 19, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Contributor Checklist

Reviewer Checklist

Uh oh!

Mario-DL commented Jan 19, 2024

Uh oh!

Uh oh!

JesusPoderoso commented Jan 23, 2024

Uh oh!

Mario-DL commented Jan 23, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Mario-DL commented Jan 24, 2024

Uh oh!

Uh oh!

Uh oh!

Mario-DL commented Jan 25, 2024

Uh oh!

JesusPoderoso commented Jan 26, 2024

Uh oh!

EduPonz commented Jan 27, 2024

Uh oh!

mergify bot commented Jan 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Backports have been created

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Mario-DL commented Jan 19, 2024 •

edited

Loading

Mario-DL commented Jan 23, 2024 •

edited

Loading

mergify bot commented Jan 27, 2024 •

edited

Loading