-
Notifications
You must be signed in to change notification settings - Fork 249
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 explicit sqlite3 from code #1166
Remove explicit sqlite3 from code #1166
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Among one question in rosbag2_py/test/test_convert.py
Removes all code mentions of "sqlite3" from packages * rosbag2_cpp * rosbag2_performance_benchmarking * rosbag2_py * rosbag2_storage * rosbag2_transport `rosbag2_tests` and the CLI/README will be in separate PRs Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>
Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>
f49f45a
to
9afe8bc
Compare
Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>
@@ -579,7 +580,7 @@ TEST_F(TemporaryDirectoryFixture, split_bag_metadata_has_full_duration) { | |||
}; | |||
rosbag2_storage::StorageOptions storage_options; | |||
storage_options.uri = (rcpputils::fs::path(temporary_dir_path_) / "split_duration_bag").string(); | |||
storage_options.storage_id = "sqlite3"; | |||
storage_options.storage_id = rosbag2_storage::get_default_storage_id(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would it make sense to leave this as hardcoded, with the aim to parametrize this test across both ("sqlite3", "mcap")
when both are installed in the CI environment?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think that leaving it hardcoded doesn't get us any closer to that parametrization - so this is at worst a sideways move and at best removes an explicit mention, so I'd rather leave this PR this way.
@@ -46,7 +47,7 @@ TEST_F(MetadataFixture, test_writing_and_reading_yaml) | |||
{ | |||
BagMetadata metadata{}; | |||
metadata.version = 1; | |||
metadata.storage_identifier = "sqlite3"; | |||
metadata.storage_identifier = get_default_storage_id(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same comment here as with test_sequential_writer
Gist: https://gist.githubusercontent.com/emersonknapp/5527da6c5a57cbc6ac31537c4702c2a0/raw/64cef56d4cda9be4154fc9a427641a1a52a08b54/ros2.repos |
https://github.com/Mergifyio backport humble |
✅ Backports have been created
|
* Remove explicit sqlite3 from code Removes all code mentions of "sqlite3" from packages * rosbag2_cpp * rosbag2_performance_benchmarking * rosbag2_py * rosbag2_storage * rosbag2_transport `rosbag2_tests` and the CLI/README will be in separate PRs Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com> (cherry picked from commit 3300a27) # Conflicts: # rosbag2_cpp/test/rosbag2_cpp/test_info.cpp # rosbag2_cpp/test/rosbag2_cpp/test_sequential_reader.cpp # rosbag2_cpp/test/rosbag2_cpp/test_sequential_writer.cpp
* Remove explicit sqlite3 from code Removes all code mentions of "sqlite3" from packages * rosbag2_cpp * rosbag2_performance_benchmarking * rosbag2_py * rosbag2_storage * rosbag2_transport `rosbag2_tests` and the CLI/README will be in separate PRs Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com> (cherry picked from commit 3300a27) # Conflicts: # rosbag2_cpp/test/rosbag2_cpp/test_info.cpp # rosbag2_cpp/test/rosbag2_cpp/test_sequential_reader.cpp # rosbag2_cpp/test/rosbag2_cpp/test_sequential_writer.cpp
* Remove explicit sqlite3 from code (#1166) * Remove explicit sqlite3 from code Removes all code mentions of "sqlite3" from packages * rosbag2_cpp * rosbag2_performance_benchmarking * rosbag2_py * rosbag2_storage * rosbag2_transport `rosbag2_tests` and the CLI/README will be in separate PRs Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com> (cherry picked from commit 3300a27) # Conflicts: # rosbag2_cpp/test/rosbag2_cpp/test_info.cpp # rosbag2_cpp/test/rosbag2_cpp/test_sequential_reader.cpp # rosbag2_cpp/test/rosbag2_cpp/test_sequential_writer.cpp * Address merge conflicts - Shall be applied above backport of the #1146. Due to missing `default_storage_id.hpp` Signed-off-by: Michael Orlov <michael.orlov@apex.ai> --------- Signed-off-by: Michael Orlov <michael.orlov@apex.ai> Co-authored-by: Emerson Knapp <537409+emersonknapp@users.noreply.github.com> Co-authored-by: Michael Orlov <michael.orlov@apex.ai>
Removes all code mentions of "sqlite3" from packages
rosbag2_tests
and the CLI/README will be in separate PRs