diff --git a/Cargo.lock b/Cargo.lock index bb127f0b..28106fd5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -343,7 +343,7 @@ dependencies = [ [[package]] name = "asap-ir" version = "0.1.0" -source = "git+https://github.com/ProjectASAP/ASAPController?rev=01745cceac857be21fd1d80584c045e6f932ebfc#01745cceac857be21fd1d80584c045e6f932ebfc" +source = "git+https://github.com/ProjectASAP/ASAPController?rev=fc09c3aa0b0cf0297ee415d1ed49f7cdc0cc55e4#fc09c3aa0b0cf0297ee415d1ed49f7cdc0cc55e4" dependencies = [ "serde", "serde_json", @@ -353,7 +353,7 @@ dependencies = [ [[package]] name = "asap-l2" version = "0.1.0" -source = "git+https://github.com/ProjectASAP/ASAPController?rev=01745cceac857be21fd1d80584c045e6f932ebfc#01745cceac857be21fd1d80584c045e6f932ebfc" +source = "git+https://github.com/ProjectASAP/ASAPController?rev=fc09c3aa0b0cf0297ee415d1ed49f7cdc0cc55e4#fc09c3aa0b0cf0297ee415d1ed49f7cdc0cc55e4" dependencies = [ "asap-ir", "thiserror 2.0.18", @@ -362,7 +362,7 @@ dependencies = [ [[package]] name = "asap-plan" version = "0.1.0" -source = "git+https://github.com/ProjectASAP/ASAPController?rev=01745cceac857be21fd1d80584c045e6f932ebfc#01745cceac857be21fd1d80584c045e6f932ebfc" +source = "git+https://github.com/ProjectASAP/ASAPController?rev=fc09c3aa0b0cf0297ee415d1ed49f7cdc0cc55e4#fc09c3aa0b0cf0297ee415d1ed49f7cdc0cc55e4" dependencies = [ "asap-ir", "asap-sketch", @@ -382,7 +382,7 @@ dependencies = [ [[package]] name = "asap-sketch" version = "0.1.0" -source = "git+https://github.com/ProjectASAP/ASAPController?rev=01745cceac857be21fd1d80584c045e6f932ebfc#01745cceac857be21fd1d80584c045e6f932ebfc" +source = "git+https://github.com/ProjectASAP/ASAPController?rev=fc09c3aa0b0cf0297ee415d1ed49f7cdc0cc55e4#fc09c3aa0b0cf0297ee415d1ed49f7cdc0cc55e4" dependencies = [ "asap-ir", ] diff --git a/control_plane/Cargo.toml b/control_plane/Cargo.toml index f5d846b4..1aec834c 100644 --- a/control_plane/Cargo.toml +++ b/control_plane/Cargo.toml @@ -44,14 +44,14 @@ asap_types.workspace = true # tagged releases yet. Re-pin as ASAPController's IR evolves; move to a tag # once one exists. # -# Bumped to 7fcaf91 (merge of PR #143, "add serving-time traits to -# WindowKind") for the WindowType -> WindowKind unification (see -# scratchpad/artifacts/enum-unification-plan.md) -- WindowKind needs -# Copy/Default/Hash/Display/FromStr + snake_case serde for -# asap_types::enums::WindowKind to replace the backend's own WindowType. -# Also satisfies everything Phase 2 (#395) needs -- asap-l2 (Step 4), -# asap-plan/asap-sketch + Implementation::is_satisfied_by (Steps 8-9) -- -# 7fcaf91 is a strict descendant of every rev that PR pinned along the way. +# Bumped to fc09c3a (main tip, "feat(sketch): SummaryExecutor -- +# serving-time execution model for L4Node", #155) to pick up +# `asap_sketch::exec::{SummaryExecutor, execute}` -- the serving-time +# counterpart to `asap_plan::bind`'s planning-time L4Node construction, +# needed for data_plane/docs/l4node-plan-executor-design.md (Step C). +# fc09c3a is a strict descendant of 7fcaf91 (the previous pin, "add +# serving-time traits to WindowKind" / Phase 2 #395), so nothing this +# repo already consumes from that revision moves. # # asap-plan owns the single authoritative AggIntent -> sketch-vs-exact # implementation decision (`boundary::implementation_for`, Cascades @@ -61,10 +61,10 @@ asap_types.workspace = true # this doesn't pull in datafusion or any front-end weight. asap-sketch is # asap-plan's own dependency (SummaryKind/SummaryParams), needed here only # to translate Implementation into this repo's own Capability vocabulary. -asap-ir = { git = "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/ProjectASAP/ASAPController", rev = "01745cceac857be21fd1d80584c045e6f932ebfc" } -asap-l2 = { git = "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/ProjectASAP/ASAPController", rev = "01745cceac857be21fd1d80584c045e6f932ebfc" } -asap-sketch = { git = "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/ProjectASAP/ASAPController", rev = "01745cceac857be21fd1d80584c045e6f932ebfc" } -asap-plan = { git = "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/ProjectASAP/ASAPController", rev = "01745cceac857be21fd1d80584c045e6f932ebfc" } +asap-ir = { git = "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/ProjectASAP/ASAPController", rev = "fc09c3aa0b0cf0297ee415d1ed49f7cdc0cc55e4" } +asap-l2 = { git = "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/ProjectASAP/ASAPController", rev = "fc09c3aa0b0cf0297ee415d1ed49f7cdc0cc55e4" } +asap-sketch = { git = "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/ProjectASAP/ASAPController", rev = "fc09c3aa0b0cf0297ee415d1ed49f7cdc0cc55e4" } +asap-plan = { git = "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/ProjectASAP/ASAPController", rev = "fc09c3aa0b0cf0297ee415d1ed49f7cdc0cc55e4" } [dev-dependencies] tokio = { version = "1", features = ["full", "test-util"] } diff --git a/crates/asap_types/Cargo.toml b/crates/asap_types/Cargo.toml index b1ca38c9..11c54ca7 100644 --- a/crates/asap_types/Cargo.toml +++ b/crates/asap_types/Cargo.toml @@ -16,7 +16,7 @@ xxhash-rust = { version = "0.8", features = ["xxh64"] } # via this crate): WindowType -> asap_ir::intent_algebra::query_expr::WindowKind # unification (scratchpad/artifacts/enum-unification-plan.md). Pin matches # control_plane's -- see control_plane/Cargo.toml's comment for the rationale. -asap-ir = { git = "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/ProjectASAP/ASAPController", rev = "01745cceac857be21fd1d80584c045e6f932ebfc" } +asap-ir = { git = "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/ProjectASAP/ASAPController", rev = "fc09c3aa0b0cf0297ee415d1ed49f7cdc0cc55e4" } # Step 5 of the sketch-identity unification (see # scratchpad/artifacts/enum-unification-plan.md): `AccumulatorSpec` # (accumulator_spec.rs) converges data_plane's identity representation @@ -25,4 +25,4 @@ asap-ir = { git = "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/ProjectASAP/ASAPController", rev = "01745c # control_plane's pin exactly (`control_plane/Cargo.toml`) -- two # different revs of the same git dependency in one workspace resolve # to two distinct Rust types that won't unify. -asap-sketch = { git = "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/ProjectASAP/ASAPController", rev = "01745cceac857be21fd1d80584c045e6f932ebfc" } +asap-sketch = { git = "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/ProjectASAP/ASAPController", rev = "fc09c3aa0b0cf0297ee415d1ed49f7cdc0cc55e4" }