Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-02-01 17:01:09 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only flush leaf_set if we have a prunable backend. (#2735)

Browse source
This commit is contained in:
Antioch Peverell 2019-04-09 12:03:19 +01:00 committed by GitHub
parent 94732b0d58
commit 108bdbaa73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
store/src/pmmr.rs
View file

@ -261,10 +261,10 @@ impl<T: PMMRable> PMMRBackend<T> {
/// Syncs all files to disk. A call to sync is required to ensure all the /// Syncs all files to disk. A call to sync is required to ensure all the
/// data has been successfully written to disk. /// data has been successfully written to disk.
pub fn sync(&mut self) -> io::Result<()> { pub fn sync(&mut self) -> io::Result<()> {
self.hash_file Ok(())
.flush() .and(self.hash_file.flush())
.and(self.data_file.flush()) .and(self.data_file.flush())
.and(self.leaf_set.flush()) .and(self.sync_leaf_set())
.map_err(|e| { .map_err(|e| {
io::Error::new( io::Error::new(
io::ErrorKind::Interrupted, io::ErrorKind::Interrupted,
@ -273,11 +273,19 @@ impl<T: PMMRable> PMMRBackend<T> {
}) })
} }
// Sync the leaf_set if this is a prunable backend.
fn sync_leaf_set(&mut self) -> io::Result<()> {
if !self.prunable {
return Ok(());
}
self.leaf_set.flush()
}
/// Discard the current, non synced state of the backend. /// Discard the current, non synced state of the backend.
pub fn discard(&mut self) { pub fn discard(&mut self) {
self.hash_file.discard(); self.hash_file.discard();
self.leaf_set.discard();
self.data_file.discard(); self.data_file.discard();
self.leaf_set.discard();
} }
/// Takes the leaf_set at a given cutoff_pos and generates an updated /// Takes the leaf_set at a given cutoff_pos and generates an updated
@ -344,8 +352,7 @@ impl<T: PMMRable> PMMRBackend<T> {
self.data_file.replace(Path::new(&tmp_prune_file_data))?; self.data_file.replace(Path::new(&tmp_prune_file_data))?;
// 6. Write the leaf_set to disk. // 6. Write the leaf_set to disk.
// Optimize the bitmap storage in the process. self.sync_leaf_set()?;
self.leaf_set.flush()?;
// 7. cleanup rewind files // 7. cleanup rewind files
self.clean_rewind_files()?; self.clean_rewind_files()?;