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

Remove rcpputils::fs dependencies from rosbag2_storages #1558

Merged
merged 3 commits into from
Feb 2, 2024

Conversation

r7vme
Copy link
Contributor

@r7vme r7vme commented Jan 31, 2024

Original author: Kenta Yonekura yoneken@ieee.org

Copy of stalled PR #1474

Original author: Kenta Yonekura <yoneken@ieee.org>

Signed-off-by: Roman Sokolkov <rsokolkov@gmail.com>
@r7vme r7vme requested a review from a team as a code owner January 31, 2024 12:11
@r7vme r7vme requested review from emersonknapp and hidmic and removed request for a team January 31, 2024 12:11
Co-authored with Kenta Yonekura <yoneken@ieee.org>

Signed-off-by: Roman Sokolkov <rsokolkov@gmail.com>
@r7vme
Copy link
Contributor Author

r7vme commented Jan 31, 2024

@MichaelOrlov could you please take a look?

@clalancette
Copy link
Contributor

CI:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status

@clalancette
Copy link
Contributor

@r7vme There are quite a few linter failures here. Please run the linters locally and fix the problems, then we can try again.

Signed-off-by: Roman Sokolkov <rsokolkov@gmail.com>
@r7vme
Copy link
Contributor Author

r7vme commented Feb 1, 2024

@clalancette fixed tests, PTAL

@clalancette
Copy link
Contributor

CI:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status

Copy link
Contributor

@clalancette clalancette left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me, but I'd like another opinion from @MichaelOrlov before we merge.

Copy link
Contributor

@MichaelOrlov MichaelOrlov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@r7vme Thanks for the contribution. The changes looks good to me.
However, there is one open question for the future.
Do we really need to use the ".generic_string()" or simple .string() would be enough?

@clalancette
Copy link
Contributor

Do we really need to use the ".generic_string()" or simple .string() would be enough?

Someone is going to have to test it out on Windows to tell for sure.

@MichaelOrlov
Copy link
Contributor

As far as I understand from documentation the one should use .generic_string() if needed to make sure that the Windows-specific quirks with backslashes \ in the path will be converted to the regular slashes / when the path needs to be represented as string.

@MichaelOrlov MichaelOrlov merged commit edda376 into ros2:rolling Feb 2, 2024
14 checks passed
@MichaelOrlov
Copy link
Contributor

https://github.com/Mergifyio backport iron humble

Copy link

mergify bot commented Feb 2, 2024

backport iron humble

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Feb 2, 2024
* Remove rcpputils::fs dependencies from rosbag2_storages

Original author: Kenta Yonekura <yoneken@ieee.org>

Signed-off-by: Roman Sokolkov <rsokolkov@gmail.com>

* Use path::generic_string() for Windows compatibility

Co-authored with Kenta Yonekura <yoneken@ieee.org>

Signed-off-by: Roman Sokolkov <rsokolkov@gmail.com>

* Fix linter errors in osbag2_storage_sqlite3

Signed-off-by: Roman Sokolkov <rsokolkov@gmail.com>

---------

Signed-off-by: Roman Sokolkov <rsokolkov@gmail.com>
Co-authored-by: Kenta Yonekura <yoneken@ieee.org>
(cherry picked from commit edda376)

# Conflicts:
#	rosbag2_storage_mcap/test/rosbag2_storage_mcap/test_mcap_storage.cpp
#	rosbag2_storage_sqlite3/src/rosbag2_storage_sqlite3/sqlite_storage.cpp
#	rosbag2_storage_sqlite3/test/rosbag2_storage_sqlite3/test_sqlite_storage.cpp
mergify bot pushed a commit that referenced this pull request Feb 2, 2024
* Remove rcpputils::fs dependencies from rosbag2_storages

Original author: Kenta Yonekura <yoneken@ieee.org>

Signed-off-by: Roman Sokolkov <rsokolkov@gmail.com>

* Use path::generic_string() for Windows compatibility

Co-authored with Kenta Yonekura <yoneken@ieee.org>

Signed-off-by: Roman Sokolkov <rsokolkov@gmail.com>

* Fix linter errors in osbag2_storage_sqlite3

Signed-off-by: Roman Sokolkov <rsokolkov@gmail.com>

---------

Signed-off-by: Roman Sokolkov <rsokolkov@gmail.com>
Co-authored-by: Kenta Yonekura <yoneken@ieee.org>
(cherry picked from commit edda376)

# Conflicts:
#	rosbag2_storage/CMakeLists.txt
#	rosbag2_storage_default_plugins/src/rosbag2_storage_default_plugins/sqlite/sqlite_storage.cpp
#	rosbag2_storage_default_plugins/test/rosbag2_storage_default_plugins/sqlite/test_sqlite_storage.cpp
#	rosbag2_storage_mcap/test/rosbag2_storage_mcap/test_mcap_storage.cpp
MichaelOrlov added a commit that referenced this pull request Feb 3, 2024
…ort #1558) (#1564)

* Remove rcpputils::fs dependencies from rosbag2_storages (#1558)

* Remove rcpputils::fs dependencies from rosbag2_storages

Original author: Kenta Yonekura <yoneken@ieee.org>

Signed-off-by: Roman Sokolkov <rsokolkov@gmail.com>

* Use path::generic_string() for Windows compatibility

Co-authored with Kenta Yonekura <yoneken@ieee.org>

Signed-off-by: Roman Sokolkov <rsokolkov@gmail.com>

* Fix linter errors in osbag2_storage_sqlite3

Signed-off-by: Roman Sokolkov <rsokolkov@gmail.com>

---------

Signed-off-by: Roman Sokolkov <rsokolkov@gmail.com>
Co-authored-by: Kenta Yonekura <yoneken@ieee.org>
(cherry picked from commit edda376)

# Conflicts:
#	rosbag2_storage_mcap/test/rosbag2_storage_mcap/test_mcap_storage.cpp
#	rosbag2_storage_sqlite3/src/rosbag2_storage_sqlite3/sqlite_storage.cpp
#	rosbag2_storage_sqlite3/test/rosbag2_storage_sqlite3/test_sqlite_storage.cpp

* Resolve merge conflicts

Signed-off-by: Michael Orlov <michael.orlov@apex.ai>

* Update rosbag2_storage_sqlite3 to C++17. (#1501)

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
(cherry picked from commit 9855072)

---------

Signed-off-by: Michael Orlov <michael.orlov@apex.ai>
Co-authored-by: Roman <rsokolkov@gmail.com>
Co-authored-by: Michael Orlov <michael.orlov@apex.ai>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
@r7vme r7vme deleted the 164-migrate_std_storages branch March 19, 2024 15:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants