ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

index: let caller of segment-level save-in() squash segments explicitly

Browse source 
There are many unit tests that call mutable_segment.save_in(), but I don't
think these callers expect that the segment file could be squashed depending
on the size. Let's make it caller's responsibility.

maybe_squash_with_ancestors() should be cheap if segment_num_commits() == 0,
so it's okay to call it before checking the emptiness.
This commit is contained in:
Yuya Nishihara 2023-12-19 20:57:54 +09:00
parent 1d80bbb70a
commit 320d15412b
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/src/default_index/mutable.rs
View file

@ -273,11 +273,10 @@ impl MutableIndexSegment {
return Ok(self.parent_file.unwrap()); return Ok(self.parent_file.unwrap());
} }
let squashed = self.maybe_squash_with_ancestors();
let mut buf = Vec::new(); let mut buf = Vec::new();
squashed.serialize_parent_filename(&mut buf); self.serialize_parent_filename(&mut buf);
let local_entries_offset = buf.len(); let local_entries_offset = buf.len();
squashed.serialize_local_entries(&mut buf); self.serialize_local_entries(&mut buf);
let mut hasher = Blake2b512::new(); let mut hasher = Blake2b512::new();
hasher.update(&buf); hasher.update(&buf);
let index_file_id_hex = hex::encode(hasher.finalize()); let index_file_id_hex = hex::encode(hasher.finalize());
@ -291,9 +290,9 @@ impl MutableIndexSegment {
Ok(ReadonlyIndexSegment::load_with_parent_file( Ok(ReadonlyIndexSegment::load_with_parent_file(
&mut &buf[local_entries_offset..], &mut &buf[local_entries_offset..],
index_file_id_hex, index_file_id_hex,
squashed.parent_file, self.parent_file,
squashed.commit_id_length, self.commit_id_length,
squashed.change_id_length, self.change_id_length,
) )
.expect("in-memory index data should be valid and readable")) .expect("in-memory index data should be valid and readable"))
} }
@ -405,8 +404,8 @@ impl DefaultMutableIndex {
self.0.add_commit_data(commit_id, change_id, parent_ids); self.0.add_commit_data(commit_id, change_id, parent_ids);
} }
pub(super) fn save_in(self, dir: &Path) -> io::Result<Arc<ReadonlyIndexSegment>> { pub(super) fn squash_and_save_in(self, dir: &Path) -> io::Result<Arc<ReadonlyIndexSegment>> {
self.0.save_in(dir) self.0.maybe_squash_with_ancestors().save_in(dir)
} }
} }

2
lib/src/default_index/store.rs
View file

@ -197,7 +197,7 @@ impl DefaultIndexStore {
op_id: &OperationId, op_id: &OperationId,
) -> Result<Arc<ReadonlyIndexSegment>, DefaultIndexStoreError> { ) -> Result<Arc<ReadonlyIndexSegment>, DefaultIndexStoreError> {
let index_segment = mutable_index let index_segment = mutable_index
.save_in(&self.dir) .squash_and_save_in(&self.dir)
.map_err(DefaultIndexStoreError::SaveIndex)?; .map_err(DefaultIndexStoreError::SaveIndex)?;
self.associate_file_with_operation(&index_segment, op_id) self.associate_file_with_operation(&index_segment, op_id)
.map_err(|source| DefaultIndexStoreError::AssociateIndex { .map_err(|source| DefaultIndexStoreError::AssociateIndex {