Install coherent deployment plans with dataset-bound SDS identities

.gitignore

@@ -10,3 +10,6 @@ uuid
 /store/
 
 .claude/
+
+# Generated evaluation archives stay outside version control.
+/docs/evaluation/**/*.gz

Cargo.toml

@@ -3,6 +3,7 @@ resolver = "2"
 members = [
     "crates/asap_otel_proto",
     "crates/asap_types",
+    "crates/asap_sketch_codec",
     "data_plane",
     "control_plane",
 ]
@@ -11,19 +12,13 @@ members = [
 edition = "2021"
 version = "0.1.0"
 
-# ASAPCollector's `asap-precompute-rs` currently declares Sketchlib as a
-# relative path. When Collector is consumed from Git, resolve that dependency
-# to the same Git-sourced Sketchlib package as the backend.
-[patch."https://github.com/ProjectASAP/ASAPCollector"]
-asap_sketchlib = { git = "https://github.com/ProjectASAP/asap_sketchlib", branch = "main" }
-
 [workspace.dependencies]
 # Keep Planner frontends, selection, and IR on the same immutable revision.
 # Alias upstream asap-types because this workspace also defines asap_types.
-planner-types = { package = "asap-types", git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "cd7e9e0f710816d49190dabd6c789359067a208f" }
-asap-aware-mapping = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "cd7e9e0f710816d49190dabd6c789359067a208f" }
-asap-frontend-promql = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "cd7e9e0f710816d49190dabd6c789359067a208f" }
-asap-frontend-sql = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "cd7e9e0f710816d49190dabd6c789359067a208f" }
+planner-types = { package = "asap-types", git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "bccc837f5caf21c888b2cce73c64a1be283b679a" }
+asap-aware-mapping = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "bccc837f5caf21c888b2cce73c64a1be283b679a" }
+asap-frontend-promql = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "bccc837f5caf21c888b2cce73c64a1be283b679a" }
+asap-frontend-sql = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "bccc837f5caf21c888b2cce73c64a1be283b679a" }
 
 # Shared external deps (used by 2+ crates)
 serde = { version = "1.0", features = ["derive"] }

README.md

@@ -241,8 +241,8 @@ git -C ../ASAPCollector checkout main
 
 [MVP CI](.github/workflows/mvp-ci.yml) is the source for compatible dependency
 checkouts; currently Collector uses its default branch. For reproducible runs,
-record all three exact revisions. ASAPPlanner is fetched at the revision pinned
-in Cargo manifests; do not substitute an unrelated local planner checkout.
+record the exact revisions. ASAPPlanner is fetched at the revision pinned in
+the Cargo manifests; do not substitute an unrelated local planner checkout.
 
 ### 2. Check prerequisites and build
 

control_plane/examples/audit_clickhouse_corpus.rs

@@ -69,7 +69,7 @@ fn publication_inputs(schema: &Schema, sql: String) -> ClickHouseSqlWorkload {
     )
     .unwrap();
     let reference = sds.reference().unwrap();
-    precompute_plan.summary_catalog = Some(reference.clone());
+    precompute_plan.bind_catalog(&sds).unwrap();
     transmission_plan.summary_catalog = Some(reference);
     ClickHouseSqlWorkload {
         summary_catalog: sds,

control_plane/examples/calibration_candidates.rs

@@ -1,6 +1,6 @@
 //! Export every bindable candidate for isolated measurement, without selecting a winner.
 use control_plane::physical::{
-    compiler::{BackendLocalPlanningInput, PhysicalPlanCompiler},
+    compiler::{BackendLocalPlanningInput, DeploymentPlanCompiler},
     workload_cost,
 };
 use planner_types::post_asap::{SummaryExpr, SummaryNode};
@@ -37,17 +37,6 @@ fn planner_forest(queries: &[control_plane::physical::compiler::QueryCompilation
                 vec![lhs, rhs],
                 json!({"operator_debug":format!("{operator:?}"),"timing_debug":format!("{timing:?}")}),
             ),
-            SummaryExpr::CandidateTopK {
-                candidates,
-                values,
-                k,
-                grouping,
-                completeness,
-            } => (
-                "CandidateTopK",
-                vec![candidates, values],
-                json!({"k":k,"grouping_debug":format!("{grouping:?}"),"completeness_debug":format!("{completeness:?}")}),
-            ),
             SummaryExpr::ValueOperation {
                 child,
                 operation,
@@ -84,10 +73,11 @@ fn planner_forest(queries: &[control_plane::physical::compiler::QueryCompilation
                 right,
                 kind,
                 pred,
+                pruning,
             } => (
                 "RelationalJoin",
                 vec![left, right],
-                json!({"kind_debug":format!("{kind:?}"),"predicate_debug":format!("{pred:?}")}),
+                json!({"kind_debug":format!("{kind:?}"),"predicate_debug":format!("{pred:?}"), "pruning_debug":format!("{pruning:?}")}),
             ),
             SummaryExpr::SummarySubtract { left, right } => {
                 ("SummarySubtract", vec![left, right], json!({}))
@@ -105,7 +95,7 @@ fn planner_forest(queries: &[control_plane::physical::compiler::QueryCompilation
                 vec![summary_input],
                 json!({"query_debug":format!("{query:?}")}),
             ),
-            SummaryExpr::SummaryMerge { children } => {
+            SummaryExpr::SummaryMerge { children, .. } => {
                 ("SummaryMerge", children.iter().collect(), json!({}))
             }
         };
@@ -138,9 +128,9 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         let enabled_materialization_keys = candidate.enabled_materialization_keys.clone();
         let planner_selected_queries = planner_forest(&queries);
         let compiled = if metricsql {
-            PhysicalPlanCompiler.compile_metricsql(candidate, environment.clone())
+            DeploymentPlanCompiler.compile_metricsql(candidate, environment.clone())
         } else {
-            PhysicalPlanCompiler.compile_promql(candidate, environment.clone())
+            DeploymentPlanCompiler.compile_promql(candidate, environment.clone())
         };
         let plan = match compiled {
             Ok(plan) => plan,

control_plane/examples/offline_planner_replay.rs

@@ -59,7 +59,7 @@ fn inspect(
             inspect(summary_input, model, seen, states, raw)
         }
         SummaryExpr::ValueOperation { child, .. } => inspect(child, model, seen, states, raw),
-        SummaryExpr::SummaryMerge { children } => {
+        SummaryExpr::SummaryMerge { children, .. } => {
             for child in children {
                 inspect(child, model, seen, states, raw);
             }
@@ -82,12 +82,6 @@ fn inspect(
             inspect(lhs, model, seen, states, raw);
             inspect(rhs, model, seen, states, raw);
         }
-        SummaryExpr::CandidateTopK {
-            candidates, values, ..
-        } => {
-            inspect(candidates, model, seen, states, raw);
-            inspect(values, model, seen, states, raw);
-        }
     }
 }
 

control_plane/examples/workload_cost_manifest.rs

@@ -1,6 +1,6 @@
 //! Emit pricing requirements; never fabricate quotes or publish a plan.
 use control_plane::physical::{
-    compiler::BackendLocalPlanningInput, compiler::PhysicalPlanCompiler, workload_cost,
+    compiler::BackendLocalPlanningInput, compiler::DeploymentPlanCompiler, workload_cost,
 };
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
@@ -14,7 +14,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .into_iter()
         .filter_map(|candidate| {
             let queries = candidate.queries.clone();
-            PhysicalPlanCompiler
+            DeploymentPlanCompiler
                 .compile_promql(candidate, environment.clone())
                 .and_then(|plan| workload_cost::manifest(&plan, &queries))
                 .ok()