2023-09-21 22:32:44 +03:00
|
|
|
mod digests;
|
|
|
|
|
mod errors;
|
2024-03-03 14:46:54 +02:00
|
|
|
mod hashing_reader;
|
2023-09-21 22:32:44 +03:00
|
|
|
|
|
|
|
|
pub mod blobservice;
|
2024-06-17 01:10:55 +02:00
|
|
|
pub mod composition;
|
2023-09-21 22:32:44 +03:00
|
|
|
pub mod directoryservice;
|
|
|
|
|
pub mod fixtures;
|
chore(tvix): move store/fs to castore/fs
With the recent introduction of the RootNodes trait, there's nothing in
the fs module pulling in tvix-store dependencies, so it can live in
tvix-castore.
This allows other crates to make use of TvixStoreFS, without having to
pull in tvix-store.
For example, a tvix-build using a fuse mountpoint at /nix/store doesn't
need a PathInfoService to hold the root nodes that should be present,
but just a list.
tvix-store now has a pathinfoservice/fs module, which contains the
necessary glue logic to implement the RootNodes trait for a
PathInfoService.
To satisfy Rust orphan rules for trait implementations, we had to add a
small wrapper struct. It's mostly hidden away by the make_fs helper
function returning a TvixStoreFs.
It can't be entirely private, as its still leaking into the concrete
type of TvixStoreFS.
tvix-store still has `fuse` and `virtiofs` features, but they now simply
enable these features in the `tvix-castore` crate they depend on.
The tests for the fuse functionality stay in tvix-store for now, as
they populate the root nodes through a PathInfoService.
Once above mentioned "list of root nodes" implementation exists, we
might want to shuffle this around one more time.
Fixes b/341.
Change-Id: I989f664827a5a361b23b34368d242d10c157c756
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10378
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
2023-12-17 00:16:22 +02:00
|
|
|
|
|
|
|
|
#[cfg(feature = "fs")]
|
|
|
|
|
pub mod fs;
|
|
|
|
|
|
2024-08-13 20:04:58 +03:00
|
|
|
mod nodes;
|
|
|
|
|
pub use nodes::*;
|
|
|
|
|
|
2024-05-01 12:53:09 +03:00
|
|
|
mod path;
|
2024-08-17 22:00:06 +03:00
|
|
|
pub use path::{Path, PathBuf, PathComponent, PathComponentError};
|
2024-05-01 12:53:09 +03:00
|
|
|
|
2023-09-21 22:32:44 +03:00
|
|
|
pub mod import;
|
|
|
|
|
pub mod proto;
|
2023-11-13 14:32:24 +02:00
|
|
|
pub mod tonic;
|
2023-09-21 22:32:44 +03:00
|
|
|
|
2023-10-05 10:57:27 +03:00
|
|
|
pub use digests::{B3Digest, B3_LEN};
|
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>
2024-08-14 22:00:12 +03:00
|
|
|
pub use errors::{DirectoryError, Error, ValidateNodeError};
|
2024-03-03 14:46:54 +02:00
|
|
|
pub use hashing_reader::{B3HashingReader, HashingReader};
|
2023-09-21 22:32:44 +03:00
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
|
mod tests;
|
2024-03-23 21:49:49 +01:00
|
|
|
|
|
|
|
|
// That's what the rstest_reuse README asks us do, and fails about being unable
|
|
|
|
|
// to find rstest_reuse in crate root.
|
|
|
|
|
#[cfg(test)]
|
|
|
|
|
#[allow(clippy::single_component_path_imports)]
|
|
|
|
|
use rstest_reuse;
|
