facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity

revisionstore: do not attempt repacking one packfile

Browse Source 
Summary:
Repacking one packfile will yield the same packfile, so we can save some IO by
not trying to repack.

Differential Revision: D14013789

fbshipit-source-id: 8069840cc7cb1837eb94cea97e50b3bbaa548873
This commit is contained in:
Xavier Deguillard 2019-02-12 10:53:37 -08:00 committed by Facebook Github Bot
parent 946fa43efd
commit 73aed5c3d2
1 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
lib/revisionstore/src/repack.rs
View File

@ -111,28 +111,30 @@ pub fn repack_datapacks<'a>(
paths: impl IntoIterator<Item = &'a PathBuf> + Clone,
outdir: &Path,
) -> Fallible<PathBuf> {
let mut empty = true;
let mut mut_pack = MutableDataPack::new(outdir, DataPackVersion::One)?;
if paths.clone().into_iter().count() <= 1 {
if let Some(path) = paths.into_iter().next() {
return Ok(path.to_path_buf());
} else {
return Ok(PathBuf::new());
}
}
for path in paths.clone() {
let data_pack = DataPack::new(&path)?;
repack_datapack(&data_pack, &mut mut_pack)?;
empty = false;
}
if empty {
Ok(PathBuf::new())
} else {
let new_pack_path = mut_pack.close()?;
for path in paths {
let datapack = DataPack::new(&path)?;
if datapack.base_path() != new_pack_path {
datapack.delete()?;
}
let new_pack_path = mut_pack.close()?;
for path in paths {
let datapack = DataPack::new(&path)?;
if datapack.base_path() != new_pack_path {
datapack.delete()?;
}
Ok(new_pack_path)
}
Ok(new_pack_path)
}
fn repack_historypack(
@ -152,28 +154,30 @@ pub fn repack_historypacks<'a>(
paths: impl IntoIterator<Item = &'a PathBuf> + Clone,
outdir: &Path,
) -> Fallible<PathBuf> {
let mut empty = true;
let mut mut_pack = MutableHistoryPack::new(outdir, HistoryPackVersion::One)?;
if paths.clone().into_iter().count() <= 1 {
if let Some(path) = paths.into_iter().next() {
return Ok(path.to_path_buf());
} else {
return Ok(PathBuf::new());
}
}
for path in paths.clone() {
let history_pack = HistoryPack::new(path)?;
repack_historypack(&history_pack, &mut mut_pack)?;
empty = false;
}
if empty {
Ok(PathBuf::new())
} else {
let new_pack_path = mut_pack.close()?;
for path in paths {
let history_pack = HistoryPack::new(path)?;
if history_pack.base_path() != new_pack_path {
history_pack.delete()?;
}
let new_pack_path = mut_pack.close()?;
for path in paths {
let history_pack = HistoryPack::new(path)?;
if history_pack.base_path() != new_pack_path {
history_pack.delete()?;
}
Ok(new_pack_path)
}
Ok(new_pack_path)
}
/// List all the pack files in the directory `dir` that ends with `extension`.