Refactors BucketStorage::map_open_file() #2141
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
brooksprumo
force-pushed
the
bucket-map/map-open-file
branch
from
48fb732 to
817cadc
Compare
brooksprumo
force-pushed
the
bucket-map/map-open-file
branch
from
817cadc to
dc514a1
Compare
| @@ -427,23 +426,21 @@ impl<O: BucketOccupied> BucketStorage<O> { | |||
| .fetch_add(measure_flush.end_as_us(), Ordering::Relaxed); | |||
| } | |||
| let mut measure_mmap = Measure::start("measure_mmap"); | |||
| let res = unsafe { MmapMut::map_mut(&data) }; | |||
| if let Err(e) = res { | |||
| let mmap = unsafe { MmapMut::map_mut(&data) }.unwrap_or_else(|err| { | |||
There was a problem hiding this comment.
this adds a lot more code inside unsafe. I'm sure you're aware. It is all error handling code.
There was a problem hiding this comment.
I put the .unwrap_or_else after the unsafe block ends. I don't think think that runs as unsafe then, right?
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.
Problem
BucketStorage::map_open_file()could be a touch simpler, and have some logic/error handling improved.Summary of Changes