Skip to content

[18763] Improve content filter expression parameters checks and verbosity. (backport #3565)#3593

Merged
MiguelCompany merged 1 commit into2.6.xfrom
mergify/bp/2.6.x/pr-3565
Aug 4, 2023
Merged

[18763] Improve content filter expression parameters checks and verbosity. (backport #3565)#3593
MiguelCompany merged 1 commit into2.6.xfrom
mergify/bp/2.6.x/pr-3565

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Jun 15, 2023

This is an automatic backport of pull request #3565 done by Mergify.
Cherry-pick of 3073c64 has failed:

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

You are currently cherry-picking commit 3073c6461.
  (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/core/policy/ParameterSerializer.hpp
	modified:   src/cpp/fastdds/topic/ContentFilteredTopicImpl.cpp
	modified:   test/unittest/dds/participant/ParticipantTests.cpp
	modified:   test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/fastdds/domain/DomainParticipantImpl.cpp

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify Bot added the conflicts Backport PR wich git cherry pick failed label Jun 15, 2023
@JesusPoderoso
Copy link
Copy Markdown
Contributor

@jsantiago-eProsima can you take a look at these conflicts?

@MiguelCompany MiguelCompany added this to the v2.6.6 milestone Jul 6, 2023
@EduPonz EduPonz added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Aug 3, 2023
…3565)

* Refs #18763: Added max expression parameter test

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

* Refs #18763: Fixed maximum parameter size checks when deserializing ContentFilteredTopics

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

* Refs #18763: Added test for qos expression_parameter constraints

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

* Refs #18763: Added check for expression_parameter constraints

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

* Refs #18763: Added runtime modification to test

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

* Refs #18763: Added check to set_expression_parameters

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

* Refs #18763: Fixed signed/unsigned mismatch

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

* Refs #18763: Applied suggestions

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

---------

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>
(cherry picked from commit 3073c64)
@EduPonz EduPonz force-pushed the mergify/bp/2.6.x/pr-3565 branch from 57ce327 to 5f48ee5 Compare August 3, 2023 05:50
@EduPonz
Copy link
Copy Markdown

EduPonz commented Aug 3, 2023

@richiprosima please test this

@MiguelCompany
Copy link
Copy Markdown
Member

@richiprosima Please test mac

@EduPonz
Copy link
Copy Markdown

EduPonz commented Aug 4, 2023

@richiprosima please test mac

@EduPonz
Copy link
Copy Markdown

EduPonz commented Aug 4, 2023

@richiprosima please test windows

@MiguelCompany MiguelCompany merged commit 23fdbf3 into 2.6.x Aug 4, 2023
@MiguelCompany MiguelCompany deleted the mergify/bp/2.6.x/pr-3565 branch August 4, 2023 08:39
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.

4 participants