From 345cebaebb1bf37b0bf251032428f5ed85dd26e3 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 19 Mar 2024 16:26:18 +0200 Subject: refactor(tvix/castore/blob): drop simplefs 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 Tested-by: BuildkiteCI Reviewed-by: raitobezarius --- tvix/castore/src/blobservice/from_addr.rs | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'tvix/castore/src/blobservice/from_addr.rs') diff --git a/tvix/castore/src/blobservice/from_addr.rs b/tvix/castore/src/blobservice/from_addr.rs index 1f37ef61ed..1473ee7e9c 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, crate::Error> { @@ -58,13 +56,6 @@ pub async fn from_addr(uri: &str) -> Result, 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. -- cgit 1.4.1