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

mononoke: remove ManifoldBlobstore type alias

Browse Source 
Summary: Remove the type alias as its not needed.

Reviewed By: krallin

Differential Revision: D28475479

fbshipit-source-id: 2bf976bf96561e24d4fab540f2673d50ab180a77
This commit is contained in:
Alex Hornby 2021-05-20 03:32:52 -07:00 committed by Facebook GitHub Bot
parent 6f10e5a9ff
commit 69aab09b5e
1 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
eden/mononoke/blobstore/factory/src/blobstore.rs
View File

@ -41,11 +41,6 @@ use throttledblob::{ThrottleOptions, ThrottledBlob};
use crate::ReadOnlyStorage;
#[cfg(fbcode_build)]
use crate::facebook::ManifoldBlobstore;
#[cfg(not(fbcode_build))]
type ManifoldBlobstore = DisabledBlob;
#[derive(Clone, Debug)]
pub struct BlobstoreOptions {
pub chaos_options: ChaosOptions,
@ -283,33 +278,26 @@ async fn make_manifold_blobstore(
fb: FacebookInit,
blobconfig: BlobConfig,
blobstore_options: &BlobstoreOptions,
) -> Result<ManifoldBlobstore, Error> {
) -> Result<Arc<dyn BlobstoreWithLink>, Error> {
use BlobConfig::*;
match blobconfig {
Manifold { bucket, prefix } => crate::facebook::make_manifold_blobstore(
fb,
&prefix,
&bucket,
None,
blobstore_options.manifold_api_key.as_deref(),
blobstore_options.manifold_weak_consistency_ms,
blobstore_options.put_behaviour,
),
let (bucket, prefix, ttl) = match blobconfig {
Manifold { bucket, prefix } => (bucket, prefix, None),
ManifoldWithTtl {
bucket,
prefix,
ttl,
} => crate::facebook::make_manifold_blobstore(
fb,
&prefix,
&bucket,
Some(ttl),
blobstore_options.manifold_api_key.as_deref(),
blobstore_options.manifold_weak_consistency_ms,
blobstore_options.put_behaviour,
),
} => (bucket, prefix, Some(ttl)),
_ => bail!("Not a Manifold blobstore"),
}
};
crate::facebook::make_manifold_blobstore(
fb,
&prefix,
&bucket,
ttl,
blobstore_options.manifold_api_key.as_deref(),
blobstore_options.manifold_weak_consistency_ms,
blobstore_options.put_behaviour,
)
}
#[cfg(not(fbcode_build))]
@ -317,7 +305,7 @@ async fn make_manifold_blobstore(
_fb: FacebookInit,
_blobconfig: BlobConfig,
_blobstore_options: &BlobstoreOptions,
) -> Result<ManifoldBlobstore, Error> {
) -> Result<Arc<dyn BlobstoreWithLink>, Error> {
unimplemented!("This is implemented only for fbcode_build")
}
@ -357,7 +345,6 @@ async fn make_blobstore_with_link<'a>(
make_manifold_blobstore(fb, blobconfig, blobstore_options)
.watched(logger)
.await
.map(|store| Arc::new(store) as Arc<dyn BlobstoreWithLink>)
}
Files { .. } => make_files_blobstore(blobconfig, blobstore_options)
.await