refactor(tvix/{cli,store}): move TvixStoreIO to tvix-cli crate
This trait is eval-specific, there's no point in dealing with these things in tvix-store. This implements the EvalIO interface for a Tvix store. The proper place for this glue code (for now) is tvix-cli, which knows about both tvix-store and tvix-eval. There's one annoyance with this move: The `tvix-store import` subcommand previously also used the TvixStoreIO implementation (because it conveniently did what we wanted). Some of this code had to be duplicated, mostly logic to calculate the NAR-based output path and create the PathInfo object. Some, but potentially more of this can be extracted into helper functions in a shared crate, and then be used from both TvixStoreIO in tvix-cli as well as the tvix-store CLI entrypoint. Change-Id: Ia7515e83c1b54f95baf810fbd8414c5521382d40 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9212 Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su> Autosubmit: flokli <flokli@flokli.de>
This commit is contained in:
parent
428b655845
commit
3c340b28bd
10 changed files with 113 additions and 87 deletions
|
|
@ -121,6 +121,18 @@ pub fn build_regular_ca_path<S: AsRef<str>, I: IntoIterator<Item = S>>(
|
|||
}
|
||||
}
|
||||
|
||||
/// For given NAR sha256 digest and name, return the new [StorePath] this would have.
|
||||
pub fn build_nar_based_store_path(nar_sha256_digest: &[u8; 32], name: &str) -> StorePath {
|
||||
// We populate the struct directly, as we know the sha256 digest has the
|
||||
// right size.
|
||||
let nar_hash_with_mode = NixHashWithMode::Recursive(NixHash {
|
||||
algo: HashAlgo::Sha256,
|
||||
digest: nar_sha256_digest.to_vec(),
|
||||
});
|
||||
|
||||
build_regular_ca_path(name, &nar_hash_with_mode, Vec::<String>::new(), false).unwrap()
|
||||
}
|
||||
|
||||
/// This builds an input-addressed store path
|
||||
///
|
||||
/// Input-addresed store paths are always derivation outputs, the "input" in question is the
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue