summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2018-08-26 04:16:04 +0200
committerGitHub <noreply@github.com>2018-08-26 04:16:04 +0200
commit5b82d53fd29294ac598d3e80fcee0e7b27f59c0c (patch)
tree3ea5287f0d2a5ba0e476e59321a09331a945a6a1
parentf2916aa51a43996e56f452bb47bfbceda291d519 (diff)
parent8b508fe4c3d87ad7dd25a0754be41661d42e25fa (diff)
downloadimag-5b82d53fd29294ac598d3e80fcee0e7b27f59c0c.zip
imag-5b82d53fd29294ac598d3e80fcee0e7b27f59c0c.tar.gz
Merge pull request #1502 from matthiasbeyer/libimagstore/fs-backend-no-fd-holding
Optimize backend impl to not hold open files
-rw-r--r--lib/core/libimagstore/src/file_abstraction/fs.rs71
1 files changed, 19 insertions, 52 deletions
diff --git a/lib/core/libimagstore/src/file_abstraction/fs.rs b/lib/core/libimagstore/src/file_abstraction/fs.rs
index b9d9186..574cace 100644
--- a/lib/core/libimagstore/src/file_abstraction/fs.rs
+++ b/lib/core/libimagstore/src/file_abstraction/fs.rs
@@ -32,10 +32,7 @@ use storeid::StoreId;
use file_abstraction::iter::PathIterator;
#[derive(Debug)]
-pub enum FSFileAbstractionInstance {
- Absent(PathBuf),
- File(File, PathBuf)
-}
+pub struct FSFileAbstractionInstance(PathBuf);
impl FileAbstractionInstance for FSFileAbstractionInstance {
@@ -44,32 +41,18 @@ impl FileAbstractionInstance for FSFileAbstractionInstance {
*/
fn get_file_content(&mut self, id: StoreId) -> Result<Entry, SE> {
debug!("Getting lazy file: {:?}", self);
- let (file, path) = match *self {
- FSFileAbstractionInstance::File(ref mut f, _) => return {
- // We seek to the beginning of the file since we expect each
- // access to the file to be in a different context
- f.seek(SeekFrom::Start(0))
- .chain_err(|| SEK::FileNotSeeked)?;
-
- let mut s = String::new();
- f.read_to_string(&mut s)
- .chain_err(|| SEK::IoError)
- .map(|_| s)
- .and_then(|s| Entry::from_str(id, &s))
- },
- FSFileAbstractionInstance::Absent(ref p) =>
- (open_file(p).chain_err(|| SEK::FileNotFound)?, p.clone()),
- };
- *self = FSFileAbstractionInstance::File(file, path);
- if let FSFileAbstractionInstance::File(ref mut f, _) = *self {
- let mut s = String::new();
- f.read_to_string(&mut s)
- .chain_err(|| SEK::IoError)
- .map(|_| s)
- .and_then(|s| Entry::from_str(id, &s))
- } else {
- unreachable!()
- }
+
+ let mut file = open_file(&self.0)
+ .chain_err(|| SEK::FileNotFound)?;
+
+ file.seek(SeekFrom::Start(0)).chain_err(|| SEK::FileNotSeeked)?;
+
+ let mut s = String::new();
+
+ file.read_to_string(&mut s)
+ .chain_err(|| SEK::IoError)
+ .map(|_| s)
+ .and_then(|s| Entry::from_str(id, &s))
}
/**
@@ -78,28 +61,12 @@ impl FileAbstractionInstance for FSFileAbstractionInstance {
fn write_file_content(&mut self, buf: &Entry) -> Result<(), SE> {
use std::io::Write;
- let buf = buf.to_str()?.into_bytes();
-
- let (file, path) = match *self {
- FSFileAbstractionInstance::File(ref mut f, _) => return {
- // We seek to the beginning of the file since we expect each
- // access to the file to be in a different context
- f.seek(SeekFrom::Start(0))
- .chain_err(|| SEK::FileNotCreated)?;
-
- f.set_len(buf.len() as u64).chain_err(|| SEK::FileNotWritten)?;
+ let buf = buf.to_str()?.into_bytes();
+ let mut file = create_file(&self.0).chain_err(|| SEK::FileNotCreated)?;
- f.write_all(&buf).chain_err(|| SEK::FileNotWritten)
- },
- FSFileAbstractionInstance::Absent(ref p) =>
- (create_file(p).chain_err(|| SEK::FileNotCreated)?, p.clone()),
- };
- *self = FSFileAbstractionInstance::File(file, path);
- if let FSFileAbstractionInstance::File(ref mut f, _) = *self {
- trace!("Writing buffer...");
- return f.write_all(&buf).chain_err(|| SEK::FileNotWritten);
- }
- unreachable!();
+ file.seek(SeekFrom::Start(0)).chain_err(|| SEK::FileNotCreated)?;
+ file.set_len(buf.len() as u64).chain_err(|| SEK::FileNotWritten)?;
+ file.write_all(&buf).chain_err(|| SEK::FileNotWritten)
}
}
@@ -149,7 +116,7 @@ impl FileAbstraction for FSFileAbstraction {
}
fn new_instance(&self, p: PathBuf) -> Box<FileAbstractionInstance> {
- Box::new(FSFileAbstractionInstance::Absent(p))
+ Box::new(FSFileAbstractionInstance(p))
}
/// We return nothing from the FS here.