[23689] Support aliases in Content Filtered Topic by juanlofer-eprosima · Pull Request #6032 · eProsima/Fast-DDS

juanlofer-eprosima · 2025-09-12T12:04:02Z

Description

Add support for alias case in Content Filtered Topic (complete identifiers were being wrongly assumed to be enumerations at filter evaluation).

@Mergifyio backport 3.3.x 3.2.x 2.14.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
N/A Any new/modified methods have been properly documented using Doxygen.
N/A Any new configuration API has an equivalent XML API (with the corresponding XSD extension)
Changes are backport compatible: they do NOT break ABI nor change library core behavior.
Changes are API compatible.
New feature has been added to the versions.md file (if applicable).
N/A New 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.
If this is a critical bug fix, backports to the critical-only supported branches have been requested.
Check CI results: changes do not issue any warning.
Check CI results: failing tests are unrelated with the changes.

MiguelCompany

Please rebase and fix uncrustify

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterExpressionParserImpl/identifiers.hpp

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

MiguelCompany

LGTM with green CI

MiguelCompany · 2025-09-18T10:03:24Z

@Mergifyio backport 3.3.x 3.2.x 2.14.x

mergify · 2025-09-18T10:03:35Z

backport 3.3.x 3.2.x 2.14.x

✅ Backports have been created

Details

#6047 [23689] Support aliases in Content Filtered Topic (backport #6032) has been created for branch 3.3.x but encountered conflicts
#6048 [23689] Support aliases in Content Filtered Topic (backport #6032) has been created for branch 3.2.x but encountered conflicts
#6049 [23689] Support aliases in Content Filtered Topic (backport #6032) has been created for branch 2.14.x but encountered conflicts

* Refs #23689. Regression test Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Support aliases in Content Filtered Topic Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Update versions.md Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Uncrustify Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Beautify Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Apply suggestion Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> --------- Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> (cherry picked from commit 3af813b) # Conflicts: # versions.md

* Refs #23689. Regression test Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Support aliases in Content Filtered Topic Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Update versions.md Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Uncrustify Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Beautify Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Apply suggestion Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> --------- Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> (cherry picked from commit 3af813b) # Conflicts: # test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypeCdrAux.hpp # versions.md

* Refs #23689. Regression test Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Support aliases in Content Filtered Topic Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Update versions.md Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Uncrustify Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Beautify Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Apply suggestion Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> --------- Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> (cherry picked from commit 3af813b) # Conflicts: # src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterExpressionParserImpl/identifiers.hpp # src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterField.cpp # test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestType.h # test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypeCdrAux.hpp # test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypeCdrAux.ipp # test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.hpp # test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypeTypeObjectSupport.cxx # test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypeTypeObjectSupport.hpp # versions.md

* Refs #23689. Regression test Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Support aliases in Content Filtered Topic Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Update versions.md Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Uncrustify Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Beautify Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Apply suggestion Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> --------- Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> (cherry picked from commit 3af813b) # Conflicts: # versions.md

* Refs #23689. Regression test Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Support aliases in Content Filtered Topic Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Update versions.md Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Uncrustify Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Beautify Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Apply suggestion Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> --------- Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

* Refs #23689. Regression test Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Support aliases in Content Filtered Topic Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Update versions.md Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Uncrustify Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Beautify Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Apply suggestion Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> --------- Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> (cherry picked from commit 3af813b) # Conflicts: # versions.md

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

* Support aliases in Content Filtered Topic (#6032) * Refs #23689. Regression test Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Support aliases in Content Filtered Topic Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Update versions.md Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Uncrustify Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Beautify Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Apply suggestion Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> --------- Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Regenerate types Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> --------- Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> Co-authored-by: juanlofer-eprosima <88179026+juanlofer-eprosima@users.noreply.github.com> Co-authored-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> Co-authored-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

* Refs #23689. Regression test Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Support aliases in Content Filtered Topic Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Update versions.md Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Uncrustify Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Beautify Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Apply suggestion Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> --------- Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> (cherry picked from commit 3af813b) # Conflicts: # versions.md

* Support aliases in Content Filtered Topic (#6032) * Refs #23689. Regression test Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Support aliases in Content Filtered Topic Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Update versions.md Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Uncrustify Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Beautify Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23689. Apply suggestion Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> --------- Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> (cherry picked from commit 3af813b) # Conflicts: # versions.md * Fix conflicts Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> Co-authored-by: juanlofer-eprosima <88179026+juanlofer-eprosima@users.noreply.github.com> Co-authored-by: Miguel Company <miguelcompany@eprosima.com>

juanlofer-eprosima added this to the v3.4.0 milestone Sep 12, 2025

juanlofer-eprosima requested a review from richiprosima September 12, 2025 12:10

github-actions bot added the ci-pending PR which CI is running label Sep 12, 2025

juanlofer-eprosima removed the request for review from richiprosima September 12, 2025 12:10

MiguelCompany requested changes Sep 16, 2025

View reviewed changes

juanlofer-eprosima added 5 commits September 17, 2025 08:50

Refs #23689. Regression test

c9138ac

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

Refs #23689. Support aliases in Content Filtered Topic

942c085

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

Refs #23689. Update versions.md

e81c8ce

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

Refs #23689. Uncrustify

6372a9a

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

Refs #23689. Beautify

dc76e50

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

juanlofer-eprosima force-pushed the bugfix/cft-alias branch from c0de3a7 to dc76e50 Compare September 17, 2025 07:17

juanlofer-eprosima requested review from richiprosima and removed request for richiprosima September 17, 2025 07:19

MiguelCompany requested changes Sep 17, 2025

View reviewed changes

src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterExpressionParserImpl/identifiers.hpp Outdated Show resolved Hide resolved

src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterExpressionParserImpl/identifiers.hpp Outdated Show resolved Hide resolved

Refs #23689. Apply suggestion

b741fe4

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

juanlofer-eprosima requested review from richiprosima and removed request for richiprosima September 17, 2025 07:49

MiguelCompany approved these changes Sep 17, 2025

View reviewed changes

MiguelCompany merged commit 3af813b into master Sep 18, 2025
24 of 29 checks passed

MiguelCompany deleted the bugfix/cft-alias branch September 18, 2025 10:03

mergify bot mentioned this pull request Sep 18, 2025

[23689] Support aliases in Content Filtered Topic (backport #6032) #6047

Merged

13 tasks

This was referenced Sep 18, 2025

[23689] Support aliases in Content Filtered Topic (backport #6032) #6048

Merged

[23689] Support aliases in Content Filtered Topic (backport #6032) #6049

Merged

juanlofer-eprosima added a commit that referenced this pull request Sep 18, 2025

Support aliases in Content Filtered Topic (#6032)

ed2b6cf

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

MiguelCompany pushed a commit that referenced this pull request Sep 19, 2025

Support aliases in Content Filtered Topic (#6032) (#6049)

16510a1

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> Co-authored-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[23689] Support aliases in Content Filtered Topic#6032

[23689] Support aliases in Content Filtered Topic#6032
MiguelCompany merged 6 commits intomasterfrom
bugfix/cft-alias

juanlofer-eprosima commented Sep 12, 2025 •

edited by MiguelCompany

Loading

Uh oh!

MiguelCompany left a comment

Uh oh!

Uh oh!

Uh oh!

MiguelCompany left a comment

Uh oh!

Uh oh!

MiguelCompany commented Sep 18, 2025

Uh oh!

mergify bot commented Sep 18, 2025 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

juanlofer-eprosima commented Sep 12, 2025 • edited by MiguelCompany Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Contributor Checklist

Reviewer Checklist

Uh oh!

MiguelCompany left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

MiguelCompany left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

MiguelCompany commented Sep 18, 2025

Uh oh!

mergify bot commented Sep 18, 2025 • 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!

2 participants

juanlofer-eprosima commented Sep 12, 2025 •

edited by MiguelCompany

Loading

mergify bot commented Sep 18, 2025 •

edited

Loading