Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Sep 18, 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.

This is an automatic backport of pull request #6032 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Sep 18, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Sep 18, 2025

Cherry-pick of 3af813b has failed:

On branch mergify/bp/3.3.x/pr-6032
Your branch is up to date with 'origin/3.3.x'.

You are currently cherry-picking commit 3af813b0.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterExpressionParserImpl/identifiers.hpp
	modified:   src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterField.cpp
	modified:   test/unittest/dds/topic/DDSSQLFilter/DDSSQLFilterTests.cpp
	modified:   test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestType.hpp
	modified:   test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestType.idl
	modified:   test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypeCdrAux.hpp
	modified:   test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypeCdrAux.ipp
	modified:   test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.hpp
	modified:   test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypeTypeObjectSupport.cxx
	modified:   test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypeTypeObjectSupport.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   versions.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@MiguelCompany MiguelCompany added this to the v3.3.1 milestone Sep 18, 2025
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Sep 18, 2025
@MiguelCompany
Copy link
Member

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Sep 18, 2025

rebase

✅ Branch has been successfully rebased

@MiguelCompany MiguelCompany force-pushed the mergify/bp/3.3.x/pr-6032 branch from 10ae13e to 33256f8 Compare September 18, 2025 10:15
@MiguelCompany
Copy link
Member

@Mergifyio rebase

juanlofer-eprosima and others added 2 commits September 18, 2025 12:31
* 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
Signed-off-by: Miguel Company <[email protected]>
@mergify
Copy link
Contributor Author

mergify bot commented Sep 18, 2025

rebase

✅ Branch has been successfully rebased

@MiguelCompany MiguelCompany force-pushed the mergify/bp/3.3.x/pr-6032 branch from 33256f8 to 6390d30 Compare September 18, 2025 12:31
@MiguelCompany MiguelCompany self-requested a review September 18, 2025 12:39
@github-actions github-actions bot added the ci-pending PR which CI is running label Sep 18, 2025
@juanlofer-eprosima juanlofer-eprosima requested review from richiprosima and removed request for richiprosima September 18, 2025 12:51
@mergify
Copy link
Contributor Author

mergify bot commented Sep 18, 2025

🧪 CI Insights

Here's what we observed from your CI run for 6390d30.

❌ Job Failures

Pipeline Job Health on 3.3.x Retries 🔍 CI Insights 📄 Logs
Fast DDS Linters CI uncrustify Unknown 0 View View
Fast DDS Windows CI windows-ci / fastdds_test (RelWithDebInfo, examples), v143 Unknown 0 View View

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