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

refactor(tvix/{cli,store}): move TvixStoreIO to tvix-cli crate

Browse source 
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:
Florian Klink 2023-09-02 21:16:35 +03:00 • committed by clbot
parent 428b655845
commit 3c340b28bd
10 changed files with 113 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tvix/Cargo.lock generated
View file

@ -2724,6 +2724,7 @@ dependencies = [
"smol_str",
"ssri",
"thiserror",
"tracing",
"tvix-eval",
"tvix-store",
"wu-manber",
@ -2814,7 +2815,6 @@ dependencies = [
"tower",
"tracing",
"tracing-subscriber",
"tvix-eval",
"url",
"walkdir",
]