Skip to content

[23624] Allow empty partition list to match against "*" (backport #5989)#6006

Merged
MiguelCompany merged 1 commit into3.3.xfrom
mergify/bp/3.3.x/pr-5989
Nov 12, 2025
Merged

[23624] Allow empty partition list to match against "*" (backport #5989)#6006
MiguelCompany merged 1 commit into3.3.xfrom
mergify/bp/3.3.x/pr-5989

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Sep 3, 2025

Description

A partition with value "*" should match with a partition with value "".
An empty partition list should be treated as a list with a single partition with value "".
This should also match with a partition with value "*".

This PR refactors the matching of partitions to always use the StringMatching class, and makes the behavior of that class with respect to empty strings consistent between platforms.

@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.

  • N/A: 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.
  • N/A 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 #5989 done by [Mergify](https://mergify.com).

@MiguelCompany MiguelCompany added this to the v3.3.1 milestone Sep 3, 2025
@github-actions github-actions bot added the ci-pending PR which CI is running label Oct 29, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Oct 29, 2025

🧪 CI Insights

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

❌ Job Failures

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

@cferreiragonz
Copy link
Contributor

cferreiragonz commented Nov 5, 2025

@Mergifyio rebase

@cferreiragonz cferreiragonz removed the request for review from richiprosima November 5, 2025 14:35
@mergify
Copy link
Contributor Author

mergify bot commented Nov 5, 2025

rebase

✅ Branch has been successfully rebased

@cferreiragonz cferreiragonz force-pushed the mergify/bp/3.3.x/pr-5989 branch from 25c9336 to d0db55e Compare November 5, 2025 14:35
@cferreiragonz
Copy link
Contributor

@Mergifyio rebase

* Refs #23623. Always use StringMatching.

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

* Refs #23623. Refactor StringMatching.

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

* Refs #23623. Regression unit test..

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

* Refs #23623. Fix StringMatching on Windows.

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

* Refs #23624. Avoid unnecessary conditionals.

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

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 27ce90d)
@mergify
Copy link
Contributor Author

mergify bot commented Nov 6, 2025

rebase

✅ Branch has been successfully rebased

@cferreiragonz cferreiragonz force-pushed the mergify/bp/3.3.x/pr-5989 branch from d0db55e to cd895bf Compare November 6, 2025 07:22
@cferreiragonz cferreiragonz requested review from richiprosima and removed request for richiprosima November 6, 2025 07:23
@cferreiragonz cferreiragonz 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 Nov 12, 2025
@MiguelCompany MiguelCompany merged commit b9778b0 into 3.3.x Nov 12, 2025
47 of 56 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/3.3.x/pr-5989 branch November 12, 2025 09:09
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.

2 participants