diff options
author | Florian Klink <flokli@flokli.de> | 2024-03-19T14·26+0200 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2024-03-20T12·17+0000 |
commit | 345cebaebb1bf37b0bf251032428f5ed85dd26e3 (patch) | |
tree | 50595679e131f884318a225013a72df2d3353471 /tvix/castore/src/blobservice/from_addr.rs | |
parent | 2798803f76687bdeceb10cdaf31ef3013d30acbc (diff) |
refactor(tvix/castore/blob): drop simplefs r/7750
This functionality is provided by the object store backend too (using `objectstore+file://$some_path`). This backend also supports content-defined chunking and compresses chunks with zstd. Change-Id: I5968c713112c400d23897c59db06b6c713c9d8cb Reviewed-on: https://cl.tvl.fyi/c/depot/+/11205 Autosubmit: flokli <flokli@flokli.de> Tested-by: BuildkiteCI Reviewed-by: raitobezarius <tvl@lahfa.xyz>
Diffstat (limited to 'tvix/castore/src/blobservice/from_addr.rs')
-rw-r--r-- | tvix/castore/src/blobservice/from_addr.rs | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/tvix/castore/src/blobservice/from_addr.rs b/tvix/castore/src/blobservice/from_addr.rs index 1f37ef61edf6..1473ee7e9cdc 100644 --- a/tvix/castore/src/blobservice/from_addr.rs +++ b/tvix/castore/src/blobservice/from_addr.rs @@ -3,8 +3,7 @@ use url::Url; use crate::{proto::blob_service_client::BlobServiceClient, Error}; use super::{ - BlobService, GRPCBlobService, MemoryBlobService, ObjectStoreBlobService, - SimpleFilesystemBlobService, SledBlobService, + BlobService, GRPCBlobService, MemoryBlobService, ObjectStoreBlobService, SledBlobService, }; /// Constructs a new instance of a [BlobService] from an URI. @@ -13,7 +12,6 @@ use super::{ /// - `memory://` ([MemoryBlobService]) /// - `sled://` ([SledBlobService]) /// - `grpc+*://` ([GRPCBlobService]) -/// - `simplefs://` ([SimpleFilesystemBlobService]) /// /// See their `from_url` methods for more details about their syntax. pub async fn from_addr(uri: &str) -> Result<Box<dyn BlobService>, crate::Error> { @@ -58,13 +56,6 @@ pub async fn from_addr(uri: &str) -> Result<Box<dyn BlobService>, crate::Error> let client = BlobServiceClient::new(crate::tonic::channel_from_url(&url).await?); Box::new(GRPCBlobService::from_client(client)) } - "simplefs" => { - if url.path().is_empty() { - return Err(Error::StorageError("Invalid filesystem path".to_string())); - } - - Box::new(SimpleFilesystemBlobService::new(url.path().into()).await?) - } scheme if scheme.starts_with("objectstore+") => { // We need to convert the URL to string, strip the prefix there, and then // parse it back as url, as Url::set_scheme() rejects some of the transitions we want to do. |