maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/store/composition): rename 'default' to 'root'

Browse source 
This becomes the root of the composition. `default` implies we can
directly access anything else, which we cannot. `root` makes this more
understandable, and it's all internal only anyways.

Change-Id: I297511bc05a7c32c59510b9d192b40d1bd937b5f
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12746
Reviewed-by: yuka <yuka@yuka.dev>
Tested-by: BuildkiteCI
This commit is contained in:
Florian Klink 2024-11-09 13:16:11 +00:00 • committed by flokli
parent 8df919dcf0
commit d505f03e00
9 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tvix/store/src/pathinfoservice/from_addr.rs
View file

@ -128,12 +128,12 @@ mod tests {
async fn test_from_addr_tokio(#[case] uri_str: &str, #[case] exp_succeed: bool) {
let mut comp = Composition::new(&REG);
comp.extend(vec![(
"default".into(),
"root".into(),
DeserializeWithRegistry(Box::new(MemoryBlobServiceConfig {})
as Box<dyn ServiceBuilder<Output = dyn BlobService>>),
)]);
comp.extend(vec![(
"default".into(),
"root".into(),
DeserializeWithRegistry(Box::new(MemoryDirectoryServiceConfig {})
as Box<dyn ServiceBuilder<Output = dyn DirectoryService>>),
)]);

4
tvix/store/src/pathinfoservice/nix_http.rs
View file

@ -296,13 +296,13 @@ impl TryFrom<Url> for NixHTTPPathInfoServiceConfig {
.into_iter()
.find(|(k, _)| k == "blob_service")
.map(|(_, v)| v.to_string())
.unwrap_or("default".to_string());
.unwrap_or("root".to_string());
let directory_service = url
.query_pairs()
.into_iter()
.find(|(k, _)| k == "directory_service")
.map(|(_, v)| v.to_string())
.unwrap_or("default".to_string());
.unwrap_or("root".to_string());
Ok(NixHTTPPathInfoServiceConfig {
// Stringify the URL and remove the nix+ prefix.

12
tvix/store/src/utils.rs
View file

@ -145,15 +145,15 @@ pub async fn addrs_to_configs(
let path_info_service_url = Url::parse(&urls.path_info_service_addr)?;
configs.blobservices.insert(
"default".into(),
"root".into(),
with_registry(&REG, || blob_service_url.try_into())?,
);
configs.directoryservices.insert(
"default".into(),
"root".into(),
with_registry(&REG, || directory_service_url.try_into())?,
);
configs.pathinfoservices.insert(
"default".into(),
"root".into(),
with_registry(&REG, || path_info_service_url.try_into())?,
);
@ -194,9 +194,9 @@ pub async fn construct_services_from_configs(
comp.extend(configs.directoryservices);
comp.extend(configs.pathinfoservices);
let blob_service: Arc<dyn BlobService> = comp.build("default").await?;
let directory_service: Arc<dyn DirectoryService> = comp.build("default").await?;
let path_info_service: Arc<dyn PathInfoService> = comp.build("default").await?;
let blob_service: Arc<dyn BlobService> = comp.build("root").await?;
let directory_service: Arc<dyn DirectoryService> = comp.build("root").await?;
let path_info_service: Arc<dyn PathInfoService> = comp.build("root").await?;
// HACK: The grpc client also implements NarCalculationService, and we
// really want to use it (otherwise we'd need to fetch everything again for hashing).