mds: use find in is_data_pool #15982
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jan--f
force-pushed
the
mds-fix-is_data_pool
branch
from
c94a8f1
to
e9fb2bc
Compare
batrick
approved these changes
Jun 28, 2017
|
|
ukernel
reviewed
Jun 29, 2017
src/mds/MDSMap.h
Outdated
| return std::binary_search(data_pools.begin(), data_pools.end(), poolid); | ||
| std::vector<int64_t>::const_iterator b = data_pools.begin(); | ||
| std::vector<int64_t>::const_iterator e = data_pools.end(); | ||
| std::vector<int64_t>::const_iterator p = std::find(b, e, poolid); |
There was a problem hiding this comment.
Good catch!
Above three lines can be simplified into
"auto p = std::find(data_pools.begin(), data_pools.end(), poolid);"
There was a problem hiding this comment.
Thx, one more question:
Should we return p != data_pools::end() or is the more explicit return better?
binary_search assumes that vector data_pools is ordered. add_data_pool however only appends to the vector, so no order can be assumed. Fixes: http://tracker.ceph.com/issues/20452 Signed-off-by: Jan Fajerski <jfajerski@suse.com>
jan--f
force-pushed
the
mds-fix-is_data_pool
branch
from
e9fb2bc
to
fe6d71c
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
binary_search assumes that vector data_pools is ordered. add_data_pool
however only appends to the vector, so no order can be assumed.
Fixes: http://tracker.ceph.com/issues/20452
Signed-off-by: Jan Fajerski jfajerski@suse.com