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

refactor(tvix/store/directorysvc/traverse): clippy, use NamedNode

Browse source 
Also, get rid of the explicit byte comparison here, but unwrap like in
the rest of the codebase. We'll deal with this in a generic manner in
b/267 and b/189.

Change-Id: Ie5f3d27ab35b7e88d67a2796c29cdd7bc7df71f3
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8589
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
Florian Klink 2023-05-18 19:49:40 +03:00 • committed by flokli
parent dcbcac8955
commit 2e09e94aad
1 changed files with 6 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

23
tvix/store/src/directoryservice/traverse.rs
View file

@ -1,6 +1,5 @@
use super::DirectoryService; use super::DirectoryService;
use crate::Error; use crate::{proto::NamedNode, Error};
use std::os::unix::prelude::OsStrExt;
use tracing::{instrument, warn}; use tracing::{instrument, warn};
/// This traverses from a (root) node to the given (sub)path, returning the Node /// This traverses from a (root) node to the given (sub)path, returning the Node
@ -33,9 +32,6 @@ pub fn traverse_to<DS: DirectoryService>(
Ok(Some(node)) Ok(Some(node))
} }
Some(first_component) => { Some(first_component) => {
// convert first_component to bytes, which are later used for comparison.
let first_component_bytes: &[u8] = first_component.as_os_str().as_bytes();
match node { match node {
crate::proto::node::Node::File(_) | crate::proto::node::Node::Symlink(_) => { crate::proto::node::Node::File(_) | crate::proto::node::Node::Symlink(_) => {
// There's still some path left, but the current node is no directory. // There's still some path left, but the current node is no directory.
@ -54,25 +50,18 @@ pub fn traverse_to<DS: DirectoryService>(
None => { None => {
let digest_b64 = data_encoding::BASE64.encode(&digest); let digest_b64 = data_encoding::BASE64.encode(&digest);
warn!("directory {} does not exist", digest_b64); warn!("directory {} does not exist", digest_b64);
return Err(Error::StorageError(format!(
Err(Error::StorageError(format!(
"directory {} does not exist", "directory {} does not exist",
digest_b64 digest_b64
))); )))
} }
Some(directory) => { Some(directory) => {
// look for first_component in the [Directory]. // look for first_component in the [Directory].
// FUTUREWORK: as the nodes() iterator returns in a sorted fashion, we // FUTUREWORK: as the nodes() iterator returns in a sorted fashion, we
// could stop as soon as e.name is larger than the search string. // could stop as soon as e.name is larger than the search string.
let child_node = directory.nodes().find(|n| match n { let child_node = directory.nodes().find(|n| {
crate::proto::node::Node::Directory(e) => { n.get_name() == first_component.as_os_str().to_str().unwrap()
&e.name.to_string().into_bytes() == first_component_bytes
}
crate::proto::node::Node::File(e) => {
&e.name.to_string().into_bytes() == first_component_bytes
}
crate::proto::node::Node::Symlink(e) => {
&e.name.to_string().into_bytes() == first_component_bytes
}
}); });
match child_node { match child_node {