mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-02 18:01:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

git_backend: move add_entry() of extra metadata table to caller

Browse source 
I'm going to add a caller which will insert multiple entries at once.
This commit is contained in:
Yuya Nishihara 2023-05-20 18:52:53 +09:00
parent e6addf7905
commit fe97dccd02
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/src/git_backend.rs
View file

@ -30,7 +30,7 @@ use crate::backend::{
};
use crate::lock::FileLock;
use crate::repo_path::{RepoPath, RepoPathComponent};
use crate::stacked_table::{ReadonlyTable, TableSegment, TableStore};
use crate::stacked_table::{MutableTable, ReadonlyTable, TableSegment, TableStore};
const HASH_LENGTH: usize = 20;
const CHANGE_ID_LENGTH: usize = 16;
@ -124,15 +124,11 @@ impl GitBackend {
.map_err(|err| BackendError::Other(format!("Failed to read non-git metadata: {err}")))
}
fn write_extra_metadata_entry(
fn save_extra_metadata_table(
&self,
table: &Arc<ReadonlyTable>,
mut_table: MutableTable,
_table_lock: &FileLock,
id: &CommitId,
extras: Vec<u8>,
) -> BackendResult<()> {
let mut mut_table = table.start_mutation();
mut_table.add_entry(id.to_bytes(), extras);
let table = self
.extra_metadata_store
.save_table(mut_table)
@ -507,8 +503,9 @@ impl Backend for GitBackend {
} else {
// Make our change id persist (otherwise future write_commit() could reassign
// new change id.)
let extras = serialize_extras(&commit);
self.write_extra_metadata_entry(&table, &table_lock, id, extras)?;
let mut mut_table = table.start_mutation();
mut_table.add_entry(id.to_bytes(), serialize_extras(&commit));
self.save_extra_metadata_table(mut_table, &table_lock)?;
}
}
@ -600,7 +597,9 @@ impl Backend for GitBackend {
contents.author.timestamp.timestamp = MillisSinceEpoch(author.when().seconds() * 1000);
contents.committer.timestamp.timestamp =
MillisSinceEpoch(committer.when().seconds() * 1000);
self.write_extra_metadata_entry(&table, &table_lock, &id, extras)?;
let mut mut_table = table.start_mutation();
mut_table.add_entry(id.to_bytes(), extras);
self.save_extra_metadata_table(mut_table, &table_lock)?;
Ok((id, contents))
}
}