Skip to content

refactor(mercury): remove unnecessary array allocation and copy in decode_pack_object #755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
genedna merged 2 commits into from
Dec 14, 2024
Merged

refactor(mercury): remove unnecessary array allocation and copy in decode_pack_object #755

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b66941
refactor(mercury): remove unnecessary array copy in `decode_pack_object`
el-ev Dec 14, 2024
b41fb07
Merge branch 'main' into avoid_vec_copy_2
genedna Dec 14, 2024
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
19 changes: 2 additions & 17 deletions mercury/src/internal/pack/decode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,21 +254,6 @@ impl Pack {
// Check if the object type is valid
let t = ObjectType::from_u8(type_bits)?;

// util lambda: return data with result capacity after rebuilding, for Memory Control
let reserve_delta_data = |data: Vec<u8>| -> Vec<u8> {
let result_size = { // Read `result-size` of delta_obj
let mut reader = Cursor::new(&data);
let _ = utils::read_varint_le(&mut reader).unwrap().0; // base_size
utils::read_varint_le(&mut reader).unwrap().0 // size after rebuilding
};
// capacity() == result_size, len() == data.len()
// just for accurate Memory Control (rely on `heap_size()` that based on capacity)
// Seems wasteful temporarily, but for final memory limit.
let mut data_result_cap = Vec::with_capacity(result_size as usize);
data_result_cap.extend(data);
data_result_cap
};

match t {
ObjectType::Commit | ObjectType::Tree | ObjectType::Blob | ObjectType::Tag => {
let (data, raw_size) = self.decompress_data(pack, size)?;
Expand All @@ -292,7 +277,7 @@ impl Pack {

Ok(CacheObject {
base_offset,
data_decompress: reserve_delta_data(data),
data_decompress: data,
obj_type: t,
offset: init_offset,
mem_recorder: None,
Expand All @@ -310,7 +295,7 @@ impl Pack {

Ok(CacheObject {
base_ref: ref_sha1,
data_decompress: reserve_delta_data(data),
data_decompress: data,
obj_type: t,
offset: init_offset,
mem_recorder: None,
Expand Down