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: remove unnecessary clone in packblob

Browse Source 
Summary: Remove unnecessary clone in packblob along with the Clone constraint on the inner blobstore.

Reviewed By: krallin

Differential Revision: D24109293

fbshipit-source-id: b47e68e63b6ffda95d28d974ed6883e4ae31b3a1
This commit is contained in:
Alex Hornby 2020-10-06 03:33:18 -07:00 committed by Facebook GitHub Bot
parent 720bad11ac
commit 42f5c54104
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
eden/mononoke/blobstore/packblob/Cargo.toml
View File

@ -13,7 +13,6 @@ mononoke_types = { path = "../../mononoke_types" }
packblob-thrift = { path = "if" }
zstdelta = { path = "../../../scm/lib/zstdelta" }
fbthrift = { git = "https://github.com/facebook/fbthrift.git", branch = "master" }
futures_ext = { git = "https://github.com/facebookexperimental/rust-shed.git", branch = "master" }
anyhow = "1.0"
ascii = "1.0"
bufsize = "0.5"

31
eden/mononoke/blobstore/packblob/src/store.rs
View File

@ -13,7 +13,7 @@ use blobstore::{Blobstore, BlobstoreGetData, BlobstoreWithLink};
use bytes::Bytes;
use context::CoreContext;
use futures::{
future::{BoxFuture, FutureExt},
future::{self, BoxFuture, FutureExt},
stream::{FuturesUnordered, TryStreamExt},
};
use mononoke_types::BlobstoreBytes;
@ -34,13 +34,13 @@ impl PackOptions {
}
/// A layer over an existing blobstore that uses thrift blob wrappers to allow packing and compression
#[derive(Clone, Debug)]
pub struct PackBlob<T: Blobstore + Clone> {
#[derive(Debug)]
pub struct PackBlob<T: Blobstore> {
inner: T,
options: PackOptions,
}
impl<T: Blobstore + Clone> PackBlob<T> {
impl<T: Blobstore> PackBlob<T> {
pub fn new(inner: T, options: PackOptions) -> Self {
Self { inner, options }
}
@ -60,7 +60,7 @@ fn compress_if_worthwhile(value: Bytes, zstd_level: i32) -> Result<SingleValue,
// differentiate keys just in case packblob is run in an existing unpacked store
pub const ENVELOPE_SUFFIX: &str = ".pack";
impl<T: Blobstore + Clone> Blobstore for PackBlob<T> {
impl<T: Blobstore> Blobstore for PackBlob<T> {
fn get(
&self,
ctx: CoreContext,
@ -114,17 +114,18 @@ impl<T: Blobstore + Clone> Blobstore for PackBlob<T> {
Ok(SingleValue::Raw(value.to_vec()))
};
let inner = self.inner.clone();
async move {
// Wrap in thrift encoding
let envelope: PackEnvelope = PackEnvelope(StorageEnvelope {
storage: StorageFormat::Single(single?),
});
// pass through the put after wrapping
inner.put(ctx, key, envelope.into()).await
match single {
Ok(single) => {
// Wrap in thrift encoding
let envelope: PackEnvelope = PackEnvelope(StorageEnvelope {
storage: StorageFormat::Single(single),
});
// pass through the put after wrapping
self.inner.put(ctx, key, envelope.into())
}
Err(e) => future::err(e).boxed(),
}
.boxed()
}
fn is_present(
@ -137,7 +138,7 @@ impl<T: Blobstore + Clone> Blobstore for PackBlob<T> {
}
}
impl<T: Blobstore + BlobstoreWithLink + Clone> PackBlob<T> {
impl<T: Blobstore + BlobstoreWithLink> PackBlob<T> {
// Put packed content, returning the pack's key if successful.
// `prefix` is in the control of the packer, e.g. if packing only
// filecontent together packer can chose "repoXXXX.packed.file_content."