fix issue in composite file #1456
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
The file offsets were recorded incorrectly in some cases, e.g. when the recording looked like this [(Field 1, Index 0, Offset 0), (Field 1, Index 1, Offset 14), (Field 0, Index 0, Offset 14)]. The last file is offset 14 to end of file for field 0. But the data was converted to a vec and sorted, which changes the last file to Field 1.
PSeitz
force-pushed
the
fix_composite_file
branch
from
a49c4fe
to
471fab2
Compare
Codecov Report
@@ Coverage Diff @@
## main #1456 +/- ##
==========================================
- Coverage 94.19% 94.18% -0.02%
==========================================
Files 237 237
Lines 44406 44443 +37
==========================================
+ Hits 41830 41860 +30
- Misses 2576 2583 +7
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
fulmicoton
reviewed
Aug 22, 2022
| @@ -106,6 +98,14 @@ pub struct CompositeFile { | |||
| offsets_index: HashMap<FileAddr, Range<usize>>, | |||
| } | |||
|
|
|||
| impl std::fmt::Debug for CompositeFile { | |||
| fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { | |||
There was a problem hiding this comment.
Suggested change
| fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { | |
| fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { |
|
What an horrible bug. Thanks for spotting! |
fulmicoton
approved these changes
Aug 22, 2022
| @@ -60,8 +60,8 @@ impl<W: TerminatingWrite + Write> CompositeWrite<W> { | |||
| pub fn for_field_with_idx(&mut self, field: Field, idx: usize) -> &mut CountingWriter<W> { | |||
| let offset = self.write.written_bytes(); | |||
| let file_addr = FileAddr::new(field, idx); | |||
| assert!(!self.offsets.contains_key(&file_addr)); | |||
| self.offsets.insert(file_addr, offset); | |||
| assert!(!self.offsets.iter().any(|el| el.0 == file_addr)); | |||
There was a problem hiding this comment.
Should this really be an assert instead of a debug_assert, i.e. is it necessary for memory safety? This does have linear instead of amortized constant runtime in the number of offsets now, so avoiding the check in release builds would be nice if possible IMHO.
This was referenced Jan 13, 2023
Closed
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.
The file offsets were recorded incorrectly in some cases, e.g. when the recording looked like this [(Field 1, Index 0, Offset 0), (Field 1, Index 1, Offset 14), (Field 0, Index 0, Offset 14)]. The last file is offset 14 to end of file for field 0. But the data was converted to a vec and sorted, which changes the last file to Field 1.