Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[15611] Improve GUID_t operator< performance (backport #2955) #2987

Merged
merged 2 commits into from
Oct 14, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 28, 2022

This is an automatic backport of pull request #2955 done by Mergify.
Cherry-pick of c871a29 has failed:

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

You are currently cherry-picking commit c871a2956.
  (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:   include/fastdds/rtps/common/Guid.h
	modified:   include/fastdds/rtps/common/GuidPrefix_t.hpp
	new file:   test/unittest/rtps/common/EntityIdTests.cpp
	new file:   test/unittest/rtps/common/GuidPrefixTests.cpp
	new file:   test/unittest/rtps/common/GuidTests.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   include/fastdds/rtps/common/EntityId_t.hpp
	both modified:   test/unittest/rtps/common/CMakeLists.txt

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

* Reimplement Guid comparator

Signed-off-by: jparisu <javierparis@eprosima.com>

* Add tests

Signed-off-by: jparisu <javierparis@eprosima.com>

* apply suggestions

Signed-off-by: jparisu <javierparis@eprosima.com>

* Add tests to == and =!

Signed-off-by: jparisu <javierparis@eprosima.com>

* uncrustify

Signed-off-by: jparisu <javierparis@eprosima.com>

Signed-off-by: jparisu <javierparis@eprosima.com>
(cherry picked from commit c871a29)

# Conflicts:
#	include/fastdds/rtps/common/EntityId_t.hpp
#	test/unittest/rtps/common/CMakeLists.txt
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Sep 28, 2022
@MiguelCompany
Copy link
Member

@jparisu Would you mind solving conflicts here ?

Signed-off-by: jparisu <javierparis@eprosima.com>
@MiguelCompany
Copy link
Member

@richiprosima Please test this

@MiguelCompany MiguelCompany added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Oct 5, 2022
@MiguelCompany
Copy link
Member

@richiprosima Please test mac

@MiguelCompany MiguelCompany merged commit 9f2928a into 2.3.x Oct 14, 2022
@MiguelCompany MiguelCompany deleted the mergify/bp/2.3.x/pr-2955 branch October 14, 2022 07:15
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.

2 participants