Skip to content

Conversation

@juanlofer-eprosima
Copy link
Contributor

@juanlofer-eprosima juanlofer-eprosima commented Sep 12, 2025

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.

@juanlofer-eprosima juanlofer-eprosima added this to the v3.4.0 milestone Sep 12, 2025
@github-actions github-actions bot added the ci-pending PR which CI is running label Sep 12, 2025
@juanlofer-eprosima juanlofer-eprosima removed the request for review from richiprosima September 12, 2025 12:10
Copy link
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

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

Please rebase and fix uncrustify

Signed-off-by: Juan Lopez Fernandez <[email protected]>
Signed-off-by: Juan Lopez Fernandez <[email protected]>
Signed-off-by: Juan Lopez Fernandez <[email protected]>
Signed-off-by: Juan Lopez Fernandez <[email protected]>
Signed-off-by: Juan Lopez Fernandez <[email protected]>
@juanlofer-eprosima juanlofer-eprosima requested review from richiprosima and removed request for richiprosima September 17, 2025 07:49
Copy link
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

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

LGTM with green CI

@MiguelCompany MiguelCompany merged commit 3af813b into master Sep 18, 2025
24 of 29 checks passed
@MiguelCompany MiguelCompany deleted the bugfix/cft-alias branch September 18, 2025 10:03
@MiguelCompany
Copy link
Member

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

@mergify
Copy link
Contributor

mergify bot commented Sep 18, 2025

backport 3.3.x 3.2.x 2.14.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Sep 18, 2025
* Refs #23689. Regression test

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Support aliases in Content Filtered Topic

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Update versions.md

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Uncrustify

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Beautify

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Apply suggestion

Signed-off-by: Juan Lopez Fernandez <[email protected]>

---------

Signed-off-by: Juan Lopez Fernandez <[email protected]>
(cherry picked from commit 3af813b)

# Conflicts:
#	versions.md
mergify bot pushed a commit that referenced this pull request Sep 18, 2025
* Refs #23689. Regression test

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Support aliases in Content Filtered Topic

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Update versions.md

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Uncrustify

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Beautify

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Apply suggestion

Signed-off-by: Juan Lopez Fernandez <[email protected]>

---------

Signed-off-by: Juan Lopez Fernandez <[email protected]>
(cherry picked from commit 3af813b)

# Conflicts:
#	test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypeCdrAux.hpp
#	versions.md
mergify bot pushed a commit that referenced this pull request Sep 18, 2025
* Refs #23689. Regression test

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Support aliases in Content Filtered Topic

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Update versions.md

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Uncrustify

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Beautify

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Apply suggestion

Signed-off-by: Juan Lopez Fernandez <[email protected]>

---------

Signed-off-by: Juan Lopez Fernandez <[email protected]>
(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
MiguelCompany pushed a commit that referenced this pull request Sep 18, 2025
* Refs #23689. Regression test

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Support aliases in Content Filtered Topic

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Update versions.md

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Uncrustify

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Beautify

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Apply suggestion

Signed-off-by: Juan Lopez Fernandez <[email protected]>

---------

Signed-off-by: Juan Lopez Fernandez <[email protected]>
(cherry picked from commit 3af813b)

# Conflicts:
#	versions.md
juanlofer-eprosima added a commit that referenced this pull request Sep 18, 2025
* Refs #23689. Regression test

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Support aliases in Content Filtered Topic

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Update versions.md

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Uncrustify

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Beautify

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Apply suggestion

Signed-off-by: Juan Lopez Fernandez <[email protected]>

---------

Signed-off-by: Juan Lopez Fernandez <[email protected]>
MiguelCompany pushed a commit that referenced this pull request Sep 18, 2025
* Refs #23689. Regression test

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Support aliases in Content Filtered Topic

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Update versions.md

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Uncrustify

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Beautify

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Apply suggestion

Signed-off-by: Juan Lopez Fernandez <[email protected]>

---------

Signed-off-by: Juan Lopez Fernandez <[email protected]>
(cherry picked from commit 3af813b)

# Conflicts:
#	versions.md
juanlofer-eprosima added a commit that referenced this pull request Sep 18, 2025
MiguelCompany pushed a commit that referenced this pull request Sep 18, 2025
* Support aliases in Content Filtered Topic (#6032)

* Refs #23689. Regression test

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Support aliases in Content Filtered Topic

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Update versions.md

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Uncrustify

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Beautify

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #23689. Apply suggestion

Signed-off-by: Juan Lopez Fernandez <[email protected]>

---------

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Regenerate types

Signed-off-by: Juan Lopez Fernandez <[email protected]>

---------

Signed-off-by: Juan Lopez Fernandez <[email protected]>
Co-authored-by: juanlofer-eprosima <[email protected]>
Co-authored-by: Juan Lopez Fernandez <[email protected]>
MiguelCompany pushed a commit that referenced this pull request Sep 19, 2025
Signed-off-by: Juan Lopez Fernandez <[email protected]>
Co-authored-by: Juan Lopez Fernandez <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci-pending PR which CI is running

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants