facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 16:57:49 +03:00
Code Issues Projects Releases Wiki Activity

mononoke: do not cache gets in MemWritesBlobstore

Browse Source 
Summary:
At the moment MemWritesBlobstore stores both writes and reads. This is not
always desirable - in particular, in the next diff I'd like to add --dry-run
mode to backfill_derived_data which would keep everything that was derived in
memory. In that case storing all data that we read from blobstore might be too
much.
Given that we don't need this functionality let's just remove it

While there also add a method to get access to the underlying cache - again, it
will be used in the next diff.

Reviewed By: krallin

Differential Revision: D21088794

fbshipit-source-id: 91c8729d748d8ad8d9a70e6f8d5e15afe5021e8c
This commit is contained in:
Stanislau Hlebik 2020-04-20 06:53:56 -07:00 committed by Facebook GitHub Bot
parent 6ca292ef57
commit 7a03ef85bc
1 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
eden/mononoke/blobstore/cacheblob/src/mem_writes.rs
View File

@ -18,17 +18,11 @@ use std::{
sync::{Arc, Mutex},
};
#[derive(Clone, Debug)]
enum Cache {
Put(BlobstoreBytes),
Get(Option<BlobstoreBytes>),
}
/// A blobstore wrapper that reads from the underlying blobstore but writes to memory.
#[derive(Clone, Debug)]
pub struct MemWritesBlobstore<T: Blobstore + Clone> {
inner: T,
cache: Arc<Mutex<HashMap<String, Cache>>>,
cache: Arc<Mutex<HashMap<String, BlobstoreBytes>>>,
}
impl<T: Blobstore + Clone> MemWritesBlobstore<T> {
@ -45,10 +39,6 @@ impl<T: Blobstore + Clone> MemWritesBlobstore<T> {
pub fn persist(&self, ctx: CoreContext) -> impl Future<Item = (), Error = Error> {
let items = self.cache.with(|cache| mem::replace(cache, HashMap::new()));
stream::iter_ok(items)
.filter_map(|(key, cache)| match cache {
Cache::Put(value) => Some((key, value)),
Cache::Get(_) => None,
})
.map({
let inner = self.inner.clone();
move |(key, value)| inner.put(ctx.clone(), key, value)
@ -60,35 +50,22 @@ impl<T: Blobstore + Clone> MemWritesBlobstore<T> {
pub fn get_inner(&self) -> T {
self.inner.clone()
}
pub fn get_cache(&self) -> &Arc<Mutex<HashMap<String, BlobstoreBytes>>> {
&self.cache
}
}
impl<T: Blobstore + Clone> Blobstore for MemWritesBlobstore<T> {
fn put(&self, _ctx: CoreContext, key: String, value: BlobstoreBytes) -> BoxFuture<(), Error> {
self.cache
.with(|cache| cache.insert(key, Cache::Put(value)));
self.cache.with(|cache| cache.insert(key, value));
future::ok(()).boxify()
}
fn get(&self, ctx: CoreContext, key: String) -> BoxFuture<Option<BlobstoreBytes>, Error> {
match self.cache.with(|cache| cache.get(&key).cloned()) {
Some(cache) => {
let result = match cache {
Cache::Put(value) => Some(value),
Cache::Get(result) => result,
};
future::ok(result).boxify()
}
None => self
.inner
.get(ctx, key.clone())
.map({
let cache = self.cache.clone();
move |result| {
cache.with(|cache| cache.insert(key, Cache::Get(result.clone())));
result
}
})
.boxify(),
Some(value) => future::ok(Some(value)).boxify(),
None => self.inner.get(ctx, key).boxify(),
}
}