refactor(tvix): move refscan module to castore

This is required to add the optional refscanner parameter to the
ingest functions.

Change-Id: Ib40a7287cf857eb55e31e0df309a79474fefb518
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12527
Autosubmit: yuka <yuka@yuka.dev>
Reviewed-by: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
This commit is contained in:
Yureka 2024-09-27 16:56:52 +02:00 committed by clbot
parent ed2bd88850
commit caf597db81
7 changed files with 19 additions and 13 deletions

5
tvix/Cargo.lock generated
View file

@ -4510,6 +4510,7 @@ dependencies = [
"object_store", "object_store",
"parking_lot 0.12.3", "parking_lot 0.12.3",
"petgraph", "petgraph",
"pin-project",
"pin-project-lite", "pin-project-lite",
"prost", "prost",
"prost-build", "prost-build",
@ -4529,6 +4530,7 @@ dependencies = [
"tokio-retry", "tokio-retry",
"tokio-stream", "tokio-stream",
"tokio-tar", "tokio-tar",
"tokio-test",
"tokio-util", "tokio-util",
"tonic", "tonic",
"tonic-build", "tonic-build",
@ -4545,6 +4547,7 @@ dependencies = [
"vm-memory", "vm-memory",
"vmm-sys-util", "vmm-sys-util",
"walkdir", "walkdir",
"wu-manber",
"xattr", "xattr",
"zstd", "zstd",
] ]
@ -4658,7 +4661,6 @@ dependencies = [
"thiserror", "thiserror",
"tokio", "tokio",
"tokio-tar", "tokio-tar",
"tokio-test",
"tokio-util", "tokio-util",
"tracing", "tracing",
"tracing-indicatif", "tracing-indicatif",
@ -4669,7 +4671,6 @@ dependencies = [
"tvix-tracing", "tvix-tracing",
"url", "url",
"walkdir", "walkdir",
"wu-manber",
] ]
[[package]] [[package]]

View file

@ -14814,6 +14814,10 @@ rec {
name = "petgraph"; name = "petgraph";
packageId = "petgraph"; packageId = "petgraph";
} }
{
name = "pin-project";
packageId = "pin-project";
}
{ {
name = "pin-project-lite"; name = "pin-project-lite";
packageId = "pin-project-lite"; packageId = "pin-project-lite";
@ -14939,6 +14943,10 @@ rec {
name = "walkdir"; name = "walkdir";
packageId = "walkdir"; packageId = "walkdir";
} }
{
name = "wu-manber";
packageId = "wu-manber";
}
{ {
name = "zstd"; name = "zstd";
packageId = "zstd"; packageId = "zstd";
@ -14983,6 +14991,10 @@ rec {
name = "tokio-retry"; name = "tokio-retry";
packageId = "tokio-retry"; packageId = "tokio-retry";
} }
{
name = "tokio-test";
packageId = "tokio-test";
}
{ {
name = "xattr"; name = "xattr";
packageId = "xattr"; packageId = "xattr";
@ -15440,10 +15452,6 @@ rec {
name = "walkdir"; name = "walkdir";
packageId = "walkdir"; packageId = "walkdir";
} }
{
name = "wu-manber";
packageId = "wu-manber";
}
]; ];
devDependencies = [ devDependencies = [
{ {
@ -15480,10 +15488,6 @@ rec {
name = "tempfile"; name = "tempfile";
packageId = "tempfile"; packageId = "tempfile";
} }
{
name = "tokio-test";
packageId = "tokio-test";
}
]; ];
features = { features = {
"default" = [ "nix_tests" ]; "default" = [ "nix_tests" ];

View file

@ -37,6 +37,7 @@ serde = { workspace = true, features = ["derive"] }
serde_with = { workspace = true } serde_with = { workspace = true }
serde_qs = { workspace = true } serde_qs = { workspace = true }
petgraph = { workspace = true } petgraph = { workspace = true }
pin-project = { workspace = true }
erased-serde = { workspace = true } erased-serde = { workspace = true }
serde_tagged = { workspace = true } serde_tagged = { workspace = true }
hyper-util = { workspace = true } hyper-util = { workspace = true }
@ -52,6 +53,7 @@ virtio-queue = { workspace = true, optional = true }
vm-memory = { workspace = true, optional = true } vm-memory = { workspace = true, optional = true }
vmm-sys-util = { workspace = true, optional = true } vmm-sys-util = { workspace = true, optional = true }
virtio-bindings = { workspace = true, optional = true } virtio-bindings = { workspace = true, optional = true }
wu-manber = { workspace = true }
[build-dependencies] [build-dependencies]
prost-build = { workspace = true } prost-build = { workspace = true }
@ -66,6 +68,7 @@ hex-literal = { workspace = true }
rstest_reuse = { workspace = true } rstest_reuse = { workspace = true }
xattr = { workspace = true } xattr = { workspace = true }
serde_json = { workspace = true } serde_json = { workspace = true }
tokio-test = { workspace = true }
[features] [features]
default = ["cloud"] default = ["cloud"]

View file

@ -6,6 +6,7 @@ pub mod blobservice;
pub mod composition; pub mod composition;
pub mod directoryservice; pub mod directoryservice;
pub mod fixtures; pub mod fixtures;
pub mod refscan;
#[cfg(feature = "fs")] #[cfg(feature = "fs")]
pub mod fs; pub mod fs;

View file

@ -32,7 +32,6 @@ md-5 = { workspace = true }
url = { workspace = true } url = { workspace = true }
walkdir = { workspace = true } walkdir = { workspace = true }
clap = { workspace = true } clap = { workspace = true }
wu-manber = { workspace = true }
[dev-dependencies] [dev-dependencies]
criterion = { workspace = true, features = ["html_reports"] } criterion = { workspace = true, features = ["html_reports"] }
@ -43,7 +42,6 @@ nix = { workspace = true, features = ["fs"] }
pretty_assertions = { workspace = true } pretty_assertions = { workspace = true }
rstest = { workspace = true } rstest = { workspace = true }
tempfile = { workspace = true } tempfile = { workspace = true }
tokio-test = { workspace = true }
[features] [features]
default = ["nix_tests"] default = ["nix_tests"]

View file

@ -1,7 +1,6 @@
pub mod builtins; pub mod builtins;
pub mod fetchers; pub mod fetchers;
pub mod known_paths; pub mod known_paths;
pub mod refscan;
pub mod tvix_build; pub mod tvix_build;
pub mod tvix_io; pub mod tvix_io;
pub mod tvix_store_io; pub mod tvix_store_io;