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

refactor(tvix/castore): move *Node and Directory to crate root

Browse source 
*Node and Directory are types of the tvix-castore model, not the tvix
DirectoryService model. A DirectoryService only happens to send
Directories.

Move types into individual files in a nodes/ subdirectory, as it's
gotten too cluttered in a single file, and (re-)export all types from
the crate root.

This has the effect that we now cannot poke at private fields directly
from other files inside `crate::directoryservice` (as it's not all in
the same file anymore), but that's a good thing, it now forces us to go
through the proper accessors.

For the same reasons, we currently also need to introduce the `rename`
functions on each *Node directly.

A followup is gonna move the names out of the individual enum kinds, so
we can better represent "unnamed nodes".

Change-Id: Icdb34dcfe454c41c94f2396e8e99973d27db8418
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12199
Reviewed-by: yuka <yuka@yuka.dev>
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
This commit is contained in:
Florian Klink 2024-08-13 20:04:58 +03:00 • committed by clbot
parent 2f4185ff1a
commit c7845f3c88
42 changed files with 620 additions and 622 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tvix/castore/src/import/archive.rs
View file

@ -11,8 +11,9 @@ use tokio_tar::Archive;
use tracing::{instrument, warn, Level};
use crate::blobservice::BlobService;
use crate::directoryservice::{DirectoryService, Node};
use crate::directoryservice::DirectoryService;
use crate::import::{ingest_entries, IngestionEntry, IngestionError};
use crate::Node;
use super::blobs::{self, ConcurrentBlobUploader};

4
tvix/castore/src/import/fs.rs
View file

@ -15,8 +15,8 @@ use walkdir::DirEntry;
use walkdir::WalkDir;
use crate::blobservice::BlobService;
use crate::directoryservice::{DirectoryService, Node};
use crate::B3Digest;
use crate::directoryservice::DirectoryService;
use crate::{B3Digest, Node};
use super::ingest_entries;
use super::IngestionEntry;

12
tvix/castore/src/import/mod.rs
View file

@ -4,15 +4,9 @@
//! Specific implementations, such as ingesting from the filesystem, live in
//! child modules.
use crate::directoryservice::Directory;
use crate::directoryservice::DirectoryNode;
use crate::directoryservice::DirectoryPutter;
use crate::directoryservice::DirectoryService;
use crate::directoryservice::FileNode;
use crate::directoryservice::Node;
use crate::directoryservice::SymlinkNode;
use crate::directoryservice::{DirectoryPutter, DirectoryService};
use crate::path::{Path, PathBuf};
use crate::B3Digest;
use crate::{B3Digest, Directory, DirectoryNode, FileNode, Node, SymlinkNode};
use futures::{Stream, StreamExt};
use tracing::Level;
@ -219,9 +213,9 @@ impl IngestionEntry {
mod test {
use rstest::rstest;
use crate::directoryservice::{Directory, DirectoryNode, FileNode, Node, SymlinkNode};
use crate::fixtures::{DIRECTORY_COMPLICATED, DIRECTORY_WITH_KEEP, EMPTY_BLOB_DIGEST};
use crate::{directoryservice::MemoryDirectoryService, fixtures::DUMMY_DIGEST};
use crate::{Directory, DirectoryNode, FileNode, Node, SymlinkNode};
use super::ingest_entries;
use super::IngestionEntry;