diff options
| author | Florian Klink <flokli@flokli.de> | 2023-09-21T19·32+0300 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-09-22T12·51+0000 |
| commit | 32f41458c0a0f62bf906021ef096c465ccc45581 (patch) | |
| tree | 3aaab8c453871f39c46fb43f8278aa933b24519d /tvix/cli | |
| parent | d8ef0cfb4a859af7e33828b013356412d02532da (diff) | |
refactor(tvix): move castore into tvix-castore crate r/6629
This splits the pure content-addressed layers from tvix-store into a `castore` crate, and only leaves PathInfo related things, as well as the CLI entrypoint in the tvix-store crate. Notable changes: - `fixtures` and `utils` had to be moved out of the `test` cfg, so they can be imported from tvix-store. - Some ad-hoc fixtures in the test were moved to proper fixtures in the same step. - The protos are now created by a (more static) recipe in the protos/ directory. The (now two) golang targets are commented out, as it's not possible to update them properly in the same CL. This will be done by a followup CL once this is merged (and whitby deployed) Bug: https://b.tvl.fyi/issues/301 Change-Id: I8d675d4bf1fb697eb7d479747c1b1e3635718107 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9370 Reviewed-by: tazjin <tazjin@tvl.su> Reviewed-by: flokli <flokli@flokli.de> Autosubmit: flokli <flokli@flokli.de> Tested-by: BuildkiteCI Reviewed-by: Connor Brewster <cbrewster@hey.com>
Diffstat (limited to 'tvix/cli')
| -rw-r--r-- | tvix/cli/Cargo.toml | 1 | ||||
| -rw-r--r-- | tvix/cli/src/main.rs | 4 | ||||
| -rw-r--r-- | tvix/cli/src/tvix_store_io.rs | 11 |
3 files changed, 10 insertions, 6 deletions
diff --git a/tvix/cli/Cargo.toml b/tvix/cli/Cargo.toml index cb795976a971..577ee8bb9e87 100644 --- a/tvix/cli/Cargo.toml +++ b/tvix/cli/Cargo.toml @@ -9,6 +9,7 @@ path = "src/main.rs" [dependencies] nix-compat = { path = "../nix-compat" } +tvix-castore = { path = "../castore" } tvix-store = { path = "../store", features = []} tvix-eval = { path = "../eval" } bytes = "1.4.0" diff --git a/tvix/cli/src/main.rs b/tvix/cli/src/main.rs index 65970e1d1cd8..ebcfe4b800b8 100644 --- a/tvix/cli/src/main.rs +++ b/tvix/cli/src/main.rs @@ -13,10 +13,10 @@ use std::{fs, path::PathBuf}; use clap::Parser; use known_paths::KnownPaths; use rustyline::{error::ReadlineError, Editor}; +use tvix_castore::blobservice::MemoryBlobService; +use tvix_castore::directoryservice::MemoryDirectoryService; use tvix_eval::observer::{DisassemblingObserver, TracingObserver}; use tvix_eval::Value; -use tvix_store::blobservice::MemoryBlobService; -use tvix_store::directoryservice::MemoryDirectoryService; use tvix_store::pathinfoservice::MemoryPathInfoService; use tvix_store_io::TvixStoreIO; diff --git a/tvix/cli/src/tvix_store_io.rs b/tvix/cli/src/tvix_store_io.rs index ef112858b1bc..cc69357282fd 100644 --- a/tvix/cli/src/tvix_store_io.rs +++ b/tvix/cli/src/tvix_store_io.rs @@ -6,14 +6,17 @@ use tokio::io::AsyncReadExt; use tracing::{error, instrument, warn}; use tvix_eval::{EvalIO, FileType, StdIO}; -use tvix_store::{ +use tvix_castore::{ blobservice::BlobService, directoryservice::{self, DirectoryService}, import, + proto::{node::Node, NamedNode}, + B3Digest, +}; +use tvix_store::{ nar::calculate_size_and_sha256, pathinfoservice::PathInfoService, - proto::{node::Node, NamedNode, NarInfo, PathInfo}, - B3Digest, + proto::{NarInfo, PathInfo}, }; /// Implements [EvalIO], asking given [PathInfoService], [DirectoryService] @@ -330,7 +333,7 @@ async fn import_path_with_pathinfo( // assemble the [PathInfo] object. let path_info = PathInfo { - node: Some(tvix_store::proto::Node { + node: Some(tvix_castore::proto::Node { node: Some(root_node), }), // There's no reference scanning on path contents ingested like this. |