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

Draft: [Humble] Don't reopen file for every seek if we don't have to. Search directionally for the correct file (backport #1117) #1201

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 7, 2022

This is an automatic backport of pull request #1117 done by Mergify.
Cherry-pick of 0c7c352 has failed:

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

You are currently cherry-picking commit 0c7c352.
  (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:   rosbag2_cpp/include/rosbag2_cpp/readers/sequential_reader.hpp
	modified:   rosbag2_cpp/test/rosbag2_cpp/test_multifile_reader.cpp
	modified:   rosbag2_storage/src/rosbag2_storage/impl/storage_factory_impl.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rosbag2_cpp/src/rosbag2_cpp/readers/sequential_reader.cpp

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

…nally for the correct file (#1117)

* Don't reopen file for every seek if we don't have to. Search directionally for the correct file

Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>

* Fix use of load_next_file in test

Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>

* has_prev_file and load_prev_file API instead of has_next(bool)

Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>

Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>
(cherry picked from commit 0c7c352)

# Conflicts:
#	rosbag2_cpp/src/rosbag2_cpp/readers/sequential_reader.cpp
@mergify mergify bot requested a review from a team as a code owner December 7, 2022 20:33
@mergify mergify bot requested review from MichaelOrlov and hidmic and removed request for a team December 7, 2022 20:33
@mergify mergify bot added the conflicts label Dec 7, 2022
@MichaelOrlov MichaelOrlov changed the title Don't reopen file for every seek if we don't have to. Search directionally for the correct file (backport #1117) [Humble] Don't reopen file for every seek if we don't have to. Search directionally for the correct file (backport #1117) Dec 7, 2022
@MichaelOrlov MichaelOrlov changed the title [Humble] Don't reopen file for every seek if we don't have to. Search directionally for the correct file (backport #1117) Draft: [Humble] Don't reopen file for every seek if we don't have to. Search directionally for the correct file (backport #1117) Dec 7, 2022
@emersonknapp
Copy link
Collaborator

Is this a real PR with the title "Draft", or should it actually be marked as a draft?

@MichaelOrlov
Copy link
Contributor

@emersonknapp I added draft in title because it has unresolved conflicts after the mergify and not ready for review yet.
I was not able to find how to switch this PR to the draft.

@emersonknapp emersonknapp marked this pull request as draft December 14, 2022 07:27
@emersonknapp
Copy link
Collaborator

It's a hard-to-see button underneath "Reviewers" on the right bar

@MichaelOrlov
Copy link
Contributor

@MichaelOrlov MichaelOrlov deleted the mergify/bp/humble/pr-1117 branch December 20, 2022 07:23
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.

2 participants