Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/common/compressed_training_file_reader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,14 @@ impl<T: Read + Seek> CompressedTrainingDataFileReader<T> {
Ok(data)
}

pub fn read_next_chunk_into(&mut self, buffer: &mut Vec<u8>) -> Result<()> {
let header = self.read_chunk_header()?;
buffer.resize(header.chunk_size as usize, 0);
self.file.read_exact(buffer)?;
self.read_bytes += header.chunk_size as u64;
Ok(())
}

fn read_chunk_header(&mut self) -> Result<Header> {
let mut buf = [0u8; HEADER_SIZE];

Expand Down
9 changes: 5 additions & 4 deletions src/reader/compressed_reader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,11 @@ impl<T: Read + Seek> CompressedTrainingDataEntryReader<T> {
reader.is_end = true;
return Err(CompressedReaderError::EndOfFile);
} else {
reader.chunk = match reader.input_file.as_mut().unwrap().read_next_chunk() {
Ok(chunk) => chunk,
Err(e) => return Err(CompressedReaderError::BinpackError(e)),
};
reader
.input_file
.as_mut()
.unwrap()
.read_next_chunk_into(&mut reader.chunk)?;
}

Ok(reader)
Expand Down