Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions control_plane/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -91,18 +91,18 @@ asap_types.workspace = true
# scaffolding, unaware that `data_plane`'s `summary_executor.rs` in *this*
# repo is a real one. Vendored locally instead of chased upstream -- see
# `data_plane/src/query_engines/asap_query_engine/summary_exec.rs`.
planner-types = { package = "asap-types", git = "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/ProjectASAP/ASAPPlanner", rev = "26e580710cf9b44b282598719d6c5ea9a9cc62be" }
asap-aware-mapping = { git = "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/ProjectASAP/ASAPPlanner", rev = "26e580710cf9b44b282598719d6c5ea9a9cc62be" }
planner-types = { package = "asap-types", git = "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/ProjectASAP/ASAPPlanner", rev = "3dda28032c2a2badb64bf5358e0f40fef9918227" }
asap-aware-mapping = { git = "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/ProjectASAP/ASAPPlanner", rev = "3dda28032c2a2badb64bf5358e0f40fef9918227" }

# L1 adoption (design-target-architecture.md Part B): the PromQL front
# end itself, replacing control_plane's own query_parser/promql.rs.
# Pinned via `rev`, not a floating branch reference. Same rev as
# `planner-types`/`asap-aware-mapping` above -- these three MUST move
# together (two revs of the same upstream repo's types in one workspace
# resolve to distinct Rust types that won't unify).
asap-frontend-promql = { git = "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/ProjectASAP/ASAPPlanner", rev = "26e580710cf9b44b282598719d6c5ea9a9cc62be" }
asap-frontend-metricsql = { git = "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/ProjectASAP/ASAPPlanner", rev = "26e580710cf9b44b282598719d6c5ea9a9cc62be" }
asap-frontend-sql = { git = "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/ProjectASAP/ASAPPlanner", rev = "26e580710cf9b44b282598719d6c5ea9a9cc62be" }
asap-frontend-promql = { git = "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/ProjectASAP/ASAPPlanner", rev = "3dda28032c2a2badb64bf5358e0f40fef9918227" }
asap-frontend-metricsql = { git = "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/ProjectASAP/ASAPPlanner", rev = "3dda28032c2a2badb64bf5358e0f40fef9918227" }
asap-frontend-sql = { git = "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/ProjectASAP/ASAPPlanner", rev = "3dda28032c2a2badb64bf5358e0f40fef9918227" }

[dev-dependencies]
tokio = { version = "1", features = ["full", "test-util"] }
Expand Down
10 changes: 10 additions & 0 deletions control_plane/examples/calibration_candidates.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,16 @@ fn planner_forest(queries: &[control_plane::physical::compiler::PlanningQuery])
vec![outer, inner],
json!({"key_debug":format!("{key:?}"),"family_debug":format!("{family:?}")}),
),
SummaryExpr::RelationalJoin {
left,
right,
kind,
pred,
} => (
"RelationalJoin",
vec![left, right],
json!({"kind_debug":format!("{kind:?}"),"predicate_debug":format!("{pred:?}")}),
),
SummaryExpr::SummarySubtract { left, right } => {
("SummarySubtract", vec![left, right], json!({}))
}
Expand Down
5 changes: 5 additions & 0 deletions control_plane/examples/offline_planner_replay.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ fn inspect(
left: lhs,
right: rhs,
}
| SummaryExpr::RelationalJoin {
left: lhs,
right: rhs,
..
}
| SummaryExpr::BinaryOp { lhs, rhs, .. } => {
inspect(lhs, model, seen, states, raw);
inspect(rhs, model, seen, states, raw);
Expand Down
1 change: 1 addition & 0 deletions control_plane/src/emit/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ fn extract_from_node(node: &Rc<SummaryNode>) -> Option<SketchAlgorithm> {
// Not surfaced by any `Bind*` path yet (gated on rules that
// haven't landed — see `deployment_expr.rs`'s module docs).
SummaryExpr::BinaryOp { .. }
| SummaryExpr::RelationalJoin { .. }
| SummaryExpr::SummaryJoin { .. }
| SummaryExpr::SummarySubtract { .. }
| SummaryExpr::SummaryDelete { .. }
Expand Down
4 changes: 2 additions & 2 deletions control_plane/src/opamp/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1027,9 +1027,9 @@ mod tests {
abstract_window_framework:
planner_types::post_asap::SummaryWindowFramework::Tumbling,
window_implementation_id: "collector-tumbling-v1".into(),
pane_secs: 60,
slide_secs: 60,
pane_origin_ms: Some(0),
state_layout: "anchored-pane-v1".into(),
window_layout: asap_types::WindowMaterializationLayout::Pane { pane_secs: 60 },
evidence_source: None,
lifecycle: crate::physical::compiler::CollectorLifecycle {
kind: "continuously_maintained".into(),
Expand Down
7 changes: 7 additions & 0 deletions control_plane/src/physical/colored_dag/allocator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,13 @@ impl ThreeStageWalker {
}
StageId::Backend
}
SummaryExpr::RelationalJoin { left, right, .. } => {
for child in [left, right] {
let (cid, _) = self.visit_l4node(child)?;
self.dag.edges.push((id, cid));
}
StageId::Backend
}
SummaryExpr::ValueOperation { child, timing, .. } => {
let (cid, child_stage) = self.visit_l4node(child)?;
self.dag.edges.push((id, cid));
Expand Down
1 change: 1 addition & 0 deletions control_plane/src/physical/colored_dag/emitter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ fn classify(expr: &PhysicalExpr) -> NodeKind<'_> {
SummaryExpr::SummaryEstimate { query, .. } => NodeKind::SketchEstimate { query },
SummaryExpr::SummaryMerge { .. } => NodeKind::SketchMerge,
SummaryExpr::BinaryOp { .. }
| SummaryExpr::RelationalJoin { .. }
| SummaryExpr::CandidateTopK { .. }
| SummaryExpr::ValueOperation { .. }
| SummaryExpr::SummaryJoin { .. }
Expand Down
Loading
Loading