Fix database importer decoding error #784
Merged
Conversation
This file contains hidden or 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
farost
commented
Sep 3, 2025
|
|
||
| fn try_read_more(&mut self, bytes_to_read: usize) -> std::io::Result<usize> { | ||
| let mut addition = vec![0; bytes_to_read]; | ||
| fn read_more(&mut self, bytes_to_read: usize) -> std::io::Result<usize> { |
Member
Author
There was a problem hiding this comment.
No "not-try" methods, so it's probably not a try
| } | ||
|
|
||
| fn try_get_next_message_len(&mut self) -> Result<Option<usize>> { | ||
| fn decode_next_len(&mut self) -> Result<Option<(usize /*len*/, usize /*consumed*/)>> { |
Member
Author
There was a problem hiding this comment.
Return consumed to move the buffer/cursor/reader only in a single function when needed
| let mut cursor: &[u8] = &self.buffer; | ||
| match prost::decode_length_delimiter(&mut cursor) { | ||
| Ok(len) => { | ||
| let consumed = self.buffer.len() - cursor.len(); |
| Ok(bytes_read) if bytes_read >= required => {} | ||
| _ => return Some(Err(Error::Migration(MigrationError::CannotDecodeImportedConcept))), | ||
| let required = consumed + message_len; | ||
| while self.buffer.len() < required { |
|
|
||
| let mut message_buf = self.get_message_buf(message_len); | ||
| Some(M::decode(&mut message_buf).map_err(|_| Error::Migration(MigrationError::CannotDecodeImportedConcept))) | ||
| self.buffer.advance(consumed); |
flyingsilverfin
approved these changes
Sep 3, 2025
Member
flyingsilverfin
left a comment
flyingsilverfin
left a comment
There was a problem hiding this comment.
To be honest I kinda skimmed it but if it works i'm happy!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Usage and product changes
Stabilize the database import function by eliminating rare decoding errors that could occur during the import of large datasets. All the exported files that the import function could not process are still valid and should be correctly imported after the proposed changes.
Implementation
VecDequewithprost::bytes::*and isolate the file reader's moving in a single function (Iterator::next).readfunctions can read fewer bytes than requested even without meeting EOF, replace singleifcalls withloops <- this was probably the main issue before.I was not able to reduce the bug to a single test case, even with thousands of records (however, we had a report of a failure after processing 200 entries), so no new behavior tests were introduced. I decided not to spend more time searching for such cases.