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

index: don't reload parent files after saving new segment file

Browse source 
This should be cheaper, and more importantly, we no longer need to propagate
ReadonlyIndexLoadError to the caller.
This commit is contained in:
Yuya Nishihara 2023-12-17 12:52:20 +09:00
parent fb07749291
commit dd8e686127
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,7 +32,7 @@ use tempfile::NamedTempFile;
use super::composite::{AsCompositeIndex, CompositeIndex, IndexSegment}; use super::composite::{AsCompositeIndex, CompositeIndex, IndexSegment};
use super::entry::{IndexEntry, IndexPosition, SmallIndexPositionsVec}; use super::entry::{IndexEntry, IndexPosition, SmallIndexPositionsVec};
use super::readonly::{DefaultReadonlyIndex, ReadonlyIndexLoadError, ReadonlyIndexSegment}; use super::readonly::{DefaultReadonlyIndex, ReadonlyIndexSegment};
use crate::backend::{ChangeId, CommitId, ObjectId}; use crate::backend::{ChangeId, CommitId, ObjectId};
use crate::commit::Commit; use crate::commit::Commit;
use crate::file_util::persist_content_addressed_temp_file; use crate::file_util::persist_content_addressed_temp_file;
@ -279,6 +279,7 @@ impl MutableIndexSegment {
let squashed = self.maybe_squash_with_ancestors(); let squashed = self.maybe_squash_with_ancestors();
let mut buf = Vec::new(); let mut buf = Vec::new();
squashed.serialize_parent_filename(&mut buf); squashed.serialize_parent_filename(&mut buf);
let local_entries_offset = buf.len();
squashed.serialize_local_entries(&mut buf); squashed.serialize_local_entries(&mut buf);
let mut hasher = Blake2b512::new(); let mut hasher = Blake2b512::new();
hasher.update(&buf); hasher.update(&buf);
@ -290,19 +291,14 @@ impl MutableIndexSegment {
file.write_all(&buf)?; file.write_all(&buf)?;
persist_content_addressed_temp_file(temp_file, index_file_path)?; persist_content_addressed_temp_file(temp_file, index_file_path)?;
ReadonlyIndexSegment::load_from( Ok(ReadonlyIndexSegment::load_with_parent_file(
&mut buf.as_slice(), &mut &buf[local_entries_offset..],
dir,
index_file_id_hex, index_file_id_hex,
squashed.parent_file,
squashed.commit_id_length, squashed.commit_id_length,
squashed.change_id_length, squashed.change_id_length,
) )
.map_err(|err| match err { .expect("in-memory index data should be valid and readable"))
ReadonlyIndexLoadError::IndexCorrupt(err) => {
panic!("Just-created index file is corrupt: {err}")
}
ReadonlyIndexLoadError::IoError(err) => err,
})
} }
} }