refactor(tvix/castore): remove name from Nodes
				
					
				
			Nodes only have names if they're contained inside a Directory, or if
they're a root node and have something else possibly giving them a name
externally.
This removes all `name` fields in the three different Nodes, and instead
maintains it inside a BTreeMap inside the Directory.
It also removes the NamedNode trait (they don't have a get_name()), as
well as Node::rename(self, name), and all [Partial]Ord implementations
for Node (as they don't have names to use for sorting).
The `nodes()`, `directories()`, `files()` iterators inside a `Directory`
now return a tuple of Name and Node, as does the RootNodesProvider.
The different {Directory,File,Symlink}Node struct constructors got
simpler, and the {Directory,File}Node ones became infallible - as
there's no more possibility to represent invalid state.
The proto structs stayed the same - there's now from_name_and_node and
into_name_and_node to convert back and forth between the two `Node`
structs.
Some further cleanups:
The error types for Node validation were renamed. Everything related to
names is now in the DirectoryError (not yet happy about the naming)
There's some leftover cleanups to do:
 - There should be a from_(sorted_)iter and into_iter in Directory, so
   we can construct and deconstruct in one go.
   That should also enable us to implement conversions from and to the
   proto representation that moves, rather than clones.
 - The BuildRequest and PathInfo structs are still proto-based, so we
   still do a bunch of conversions back and forth there (and have some
   ugly expect there). There's not much point for error handling here,
   this will be moved to stricter types in a followup CL.
Change-Id: I7369a8e3a426f44419c349077cb4fcab2044ebb6
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12205
Tested-by: BuildkiteCI
Reviewed-by: yuka <yuka@yuka.dev>
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: benjaminedwardwebb <benjaminedwardwebb@gmail.com>
Reviewed-by: Connor Brewster <cbrewster@hey.com>
			
			
This commit is contained in:
		
							parent
							
								
									04e9531e65
								
							
						
					
					
						commit
						49b173786c
					
				
					 46 changed files with 785 additions and 1002 deletions
				
			
		|  | @ -1,8 +1,7 @@ | |||
| use std::path::{Path, PathBuf}; | ||||
| 
 | ||||
| use itertools::Itertools; | ||||
| use tvix_castore::ValidateNodeError; | ||||
| use tvix_castore::{NamedNode, Node}; | ||||
| use tvix_castore::DirectoryError; | ||||
| 
 | ||||
| mod grpc_buildservice_wrapper; | ||||
| 
 | ||||
|  | @ -20,7 +19,7 @@ pub const FILE_DESCRIPTOR_SET: &[u8] = tonic::include_file_descriptor_set!("tvix | |||
| #[derive(Debug, thiserror::Error)] | ||||
| pub enum ValidateBuildRequestError { | ||||
|     #[error("invalid input node at position {0}: {1}")] | ||||
|     InvalidInputNode(usize, ValidateNodeError), | ||||
|     InvalidInputNode(usize, DirectoryError), | ||||
| 
 | ||||
|     #[error("input nodes are not sorted by name")] | ||||
|     InputNodesNotSorted, | ||||
|  | @ -124,19 +123,21 @@ impl BuildRequest { | |||
|     /// and all restrictions around paths themselves (relative, clean, …) need
 | ||||
|     // to be fulfilled.
 | ||||
|     pub fn validate(&self) -> Result<(), ValidateBuildRequestError> { | ||||
|         // now we can look at the names, and make sure they're sorted.
 | ||||
|         if !is_sorted( | ||||
|             self.inputs | ||||
|                 .iter() | ||||
|                 // TODO(flokli) handle conversion errors and store result somewhere
 | ||||
|                 .map(|e| { | ||||
|                     Node::try_from(e.node.as_ref().unwrap()) | ||||
|                         .unwrap() | ||||
|                         .get_name() | ||||
|                         .clone() | ||||
|                 }), | ||||
|         ) { | ||||
|             Err(ValidateBuildRequestError::InputNodesNotSorted)? | ||||
|         // validate names. Make sure they're sorted
 | ||||
| 
 | ||||
|         let mut last_name = bytes::Bytes::new(); | ||||
|         for (i, node) in self.inputs.iter().enumerate() { | ||||
|             // TODO(flokli): store result somewhere
 | ||||
|             let (name, _node) = node | ||||
|                 .clone() | ||||
|                 .into_name_and_node() | ||||
|                 .map_err(|e| ValidateBuildRequestError::InvalidInputNode(i, e))?; | ||||
| 
 | ||||
|             if name <= last_name { | ||||
|                 return Err(ValidateBuildRequestError::InputNodesNotSorted); | ||||
|             } else { | ||||
|                 last_name = name | ||||
|             } | ||||
|         } | ||||
| 
 | ||||
|         // validate working_dir
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue