Skip to content

Commit

Permalink
Add set_read_order reader API (ros2#54)
Browse files Browse the repository at this point in the history
* Implement new set_read_order API for storage

Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>
Signed-off-by: James Smith <james@foxglove.dev>
  • Loading branch information
emersonknapp authored and james-rms committed Nov 17, 2022
1 parent f50f7d7 commit 69eff10
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 0 deletions.
1 change: 1 addition & 0 deletions rosbag2_storage_mcap/CMakeLists.txt
Expand Up @@ -57,6 +57,7 @@ endif()
# COMPATIBILITY(foxy, galactic, humble) - 0.17.x is the Rolling release.
if(${rosbag2_storage_VERSION} VERSION_GREATER_EQUAL 0.17.0)
list(APPEND MCAP_COMPILE_DEFS ROSBAG2_STORAGE_MCAP_HAS_STORAGE_FILTER_TOPIC_REGEX)
list(APPEND MCAP_COMPILE_DEFS ROSBAG2_STORAGE_MCAP_HAS_SET_READ_ORDER)
endif()

target_compile_definitions(${PROJECT_NAME} PRIVATE ${MCAP_COMPILE_DEFS})
Expand Down
32 changes: 32 additions & 0 deletions rosbag2_storage_mcap/src/mcap_storage.cpp
Expand Up @@ -174,6 +174,9 @@ class MCAPStorage : public rosbag2_storage::storage_interfaces::ReadWriteInterfa
std::string get_storage_identifier() const override;

/** BaseReadInterface **/
#ifdef ROSBAG2_STORAGE_MCAP_HAS_SET_READ_ORDER
void set_read_order(const rosbag2_storage::ReadOrder&) override;
#endif
bool has_next() override;
std::shared_ptr<rosbag2_storage::SerializedBagMessage> read_next() override;
std::vector<rosbag2_storage::TopicMetadata> get_all_topics_and_types() override;
Expand Down Expand Up @@ -458,6 +461,35 @@ void MCAPStorage::ensure_summary_read() {
}
}

#ifdef ROSBAG2_STORAGE_MCAP_HAS_SET_READ_ORDER
void MCAPStorage::set_read_order(const rosbag2_storage::ReadOrder& read_order) {
auto next_read_order = read_order_;
switch (read_order.sort_by) {
case rosbag2_storage::ReadOrder::ReceivedTimestamp:
if (read_order.reverse) {
next_read_order = mcap::ReadMessageOptions::ReadOrder::ReverseLogTimeOrder;
} else {
next_read_order = mcap::ReadMessageOptions::ReadOrder::LogTimeOrder;
}
break;
case rosbag2_storage::ReadOrder::File:
if (!read_order.reverse) {
next_read_order = mcap::ReadMessageOptions::ReadOrder::FileOrder;
} else {
throw std::runtime_error("Reverse file order reading not implemented.");
}
break;
case rosbag2_storage::ReadOrder::PublishedTimestamp:
throw std::runtime_error("PublishedTimestamp read order not yet implemented in ROS 2");
break;
}
if (next_read_order != read_order_) {
read_order_ = next_read_order;
reset_iterator();
}
}
#endif

bool MCAPStorage::has_next() {
if (!linear_iterator_) {
return false;
Expand Down

0 comments on commit 69eff10

Please sign in to comment.