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

[humble] Store serialized metadata in MCAP file (backport #1423) #1473

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 26, 2023

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

On branch mergify/bp/humble/pr-1423
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit a029ef9.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rosbag2_storage_mcap/src/mcap_storage.cpp
	both modified:   rosbag2_storage_mcap/test/rosbag2_storage_mcap/test_mcap_storage.cpp

no changes added to commit (use "git add" and/or "git commit -a")

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

* Store serialized metadata in MCAP file when calling update_metadata()

Signed-off-by: Michael Orlov <[email protected]>

* Remove ROS_DISTRO key-value from mcap::Metadata

- ROS_DISTRO now stored inside serialized metadata

Signed-off-by: Michael Orlov <[email protected]>

* Fix for test failure on Windows

- Use `UnorderedElementsAreArray` for checking
`metadata.topics_with_message_count`.
- The list of the metadata.topics_with_message_count forming from the
 mcap_reader_->channels() which is unordered_map.
 The order of the elements in the unordered_map is unpredictable and
 can vary on different platforms.

Signed-off-by: Michael Orlov <[email protected]>

---------

Signed-off-by: Michael Orlov <[email protected]>
(cherry picked from commit a029ef9)

# Conflicts:
#	rosbag2_storage_mcap/src/mcap_storage.cpp
#	rosbag2_storage_mcap/test/rosbag2_storage_mcap/test_mcap_storage.cpp
@mergify mergify bot requested a review from a team as a code owner September 26, 2023 15:13
@mergify mergify bot requested review from emersonknapp and jhdcs and removed request for a team September 26, 2023 15:13
@mergify mergify bot added the conflicts label Sep 26, 2023
@MichaelOrlov MichaelOrlov changed the title Store serialized metadata in MCAP file (backport #1423) [humble] Store serialized metadata in MCAP file (backport #1423) Sep 26, 2023
@MichaelOrlov
Copy link
Contributor

  • Closing as will not be done.
    This backport is not possible without updating mcap vendor package to the v1.1.0 because we have dependencies from the mcap_reader_->metadataIndexes(); API which became available only in the cpp: bump to 1.1.0 foxglove/mcap#902

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant