Bind Planner physical candidates without Backend operator lowering

Cargo.toml

@@ -14,10 +14,10 @@ version = "0.1.0"
 [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 = "4b0839ce1733aab8231eb90944c876063a4551f9" }
-asap-aware-mapping = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "4b0839ce1733aab8231eb90944c876063a4551f9" }
-asap-frontend-promql = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "4b0839ce1733aab8231eb90944c876063a4551f9" }
-asap-frontend-sql = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "4b0839ce1733aab8231eb90944c876063a4551f9" }
+planner-types = { package = "asap-types", git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "76fbbf16cc44b19f56a780bfdb47a95327e84711" }
+asap-aware-mapping = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "76fbbf16cc44b19f56a780bfdb47a95327e84711" }
+asap-frontend-promql = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "76fbbf16cc44b19f56a780bfdb47a95327e84711" }
+asap-frontend-sql = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "76fbbf16cc44b19f56a780bfdb47a95327e84711" }
 
 # Shared external deps (used by 2+ crates)
 serde = { version = "1.0", features = ["derive"] }
@@ -37,8 +37,8 @@ arc-swap = "1.7"
 reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }
 
 # Internal crates
-asap-physical-operators = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "4b0839ce1733aab8231eb90944c876063a4551f9" }
-asap_sketch_codec = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "4b0839ce1733aab8231eb90944c876063a4551f9" }
+asap-physical-operators = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "76fbbf16cc44b19f56a780bfdb47a95327e84711" }
+asap_sketch_codec = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "76fbbf16cc44b19f56a780bfdb47a95327e84711" }
 asap_types = { path = "crates/asap_types" }
 asap_otel_proto = { path = "crates/asap_otel_proto" }
 indexmap = { version = "2.0", features = ["serde"] }

control_plane/Cargo.toml

@@ -15,7 +15,7 @@ path = "src/main.rs"
 tokio       = { version = "1",    features = ["full"] }
 axum        = { version = "0.7",  features = ["ws"] }
 futures-util = "0.3"
-serde       = { version = "1",    features = ["derive"] }
+serde       = { version = "1",    features = ["derive", "rc"] }
 serde_json  = "1"
 sha2 = "0.10"
 serde_yaml  = "0.9"

control_plane/src/clickhouse.rs

@@ -534,7 +534,7 @@ where
             "SQL did not produce a summary DAG".into(),
         ));
     };
-    let semantic = planner_types::post_asap::compile_executable_dag_with_node_ids(&root)
+    let semantic = planner_types::post_asap::compile_post_asap_dag_with_node_ids(&root)
         .map_err(|error| ClickHousePlanningError::Lower(error.to_string()))?;
     let mut materialization_nodes = std::collections::BTreeMap::new();
     let mut query_nodes = std::collections::BTreeMap::new();

control_plane/src/main.rs

@@ -204,8 +204,12 @@ struct CompileAndPublishPhysicalPlanRequest {
     target_collector_ids: Vec<String>,
     capability_snapshot_id: String,
     #[serde(default)]
+    data_snapshot_id: Option<String>,
+    #[serde(default)]
     evidence: HashMap<String, physical::compiler::TopKMembershipEvidence>,
     #[serde(default)]
+    accuracy_evidence: HashMap<String, physical::compiler::ScopedAccuracyEvidence>,
+    #[serde(default)]
     exact_composition_costs:
         HashMap<String, Vec<physical::post_asap::cost_model::ExactCompositionCostEvidence>>,
     #[serde(default)]
@@ -378,7 +382,7 @@ async fn compile_and_publish_physical_plan(
 
     Json(CompileAndPublishPhysicalPlanResponse {
         cost_comparison: bundle.cost_comparison,
-        planner_selection_trace: bundle.planner_selection_trace,
+        planner_selection_trace: bundle.planner_selection_trace.as_ref().clone(),
         plan_id: bundle.envelope.plan_id,
         plan_version: bundle.envelope.plan_version,
         status: "active",
@@ -586,10 +590,11 @@ fn compile_physical_plan_request(
             query_id: query.query_id,
             query_string: query.query_string,
             selected_plan_root: post_asap,
+            physical_candidate: None,
             legacy_query_source: planner_types::pre_asap::Source::TimeSeries {
                 metric: query.metric,
             },
-            query_lookback_seconds: query.window_secs,
+            query_lookback_ms: query.window_secs.saturating_mul(1_000),
             group_by_labels: query.group_by,
             accuracy_target: query.accuracy,
             summary_lifecycle_inputs: query.lifecycle,
@@ -598,29 +603,69 @@ fn compile_physical_plan_request(
         });
     }
 
-    let planner_selection_trace = match physical::compiler::select_logical_roots_with_trace(
-        &mut queries,
-        canonical_roots.clone(),
-        &request.evidence,
-        &request.exact_composition_costs,
-        request.erp.as_ref(),
-    ) {
-        Ok(trace) => trace,
-        Err(error) => return Err((StatusCode::UNPROCESSABLE_ENTITY, error.to_string().into())),
-    };
+    let scoped_snapshot_id = request.data_snapshot_id.as_deref().or_else(|| {
+        request
+            .workload_cost_evidence
+            .as_ref()
+            .map(|evidence| evidence.data_snapshot_id.as_str())
+    });
+    if request.data_snapshot_id.as_ref().is_some_and(|id| {
+        request
+            .workload_cost_evidence
+            .as_ref()
+            .is_some_and(|evidence| evidence.data_snapshot_id != *id)
+    }) {
+        return Err((
+            StatusCode::UNPROCESSABLE_ENTITY,
+            "accuracy evidence data snapshot differs from workload cost evidence".into(),
+        ));
+    }
+    for (query_id, evidence) in &request.accuracy_evidence {
+        let Some(query) = queries.iter().find(|query| &query.query_id == query_id) else {
+            return Err((
+                StatusCode::UNPROCESSABLE_ENTITY,
+                format!("accuracy evidence names unknown query {query_id}").into(),
+            ));
+        };
+        evidence
+            .validate(
+                query_id,
+                &query.query_string,
+                &request.data_workload,
+                scoped_snapshot_id,
+                now,
+                request.max_evidence_age_ms,
+            )
+            .map_err(|error| (StatusCode::UNPROCESSABLE_ENTITY, error.to_string().into()))?;
+    }
+    let planner_selection_trace =
+        match physical::compiler::select_logical_roots_with_scoped_evidence_and_trace(
+            &mut queries,
+            canonical_roots.clone(),
+            &request.evidence,
+            &request.accuracy_evidence,
+            &request.exact_composition_costs,
+            request.erp.as_ref(),
+            now,
+        ) {
+            Ok(trace) => trace,
+            Err(error) => return Err((StatusCode::UNPROCESSABLE_ENTITY, error.to_string().into())),
+        };
 
     for (query, model) in queries.iter_mut().zip(window_models) {
         physical::compiler::prepare_window_implementations(query, &model, request.target, 0)
             .map_err(|error| (StatusCode::UNPROCESSABLE_ENTITY, error.to_string().into()))?;
     }
     let compilation_request = physical::compiler::PhysicalCompilationRequest {
-        planner_selection_trace,
+        planner_candidate_forests: Vec::new(),
+        planner_selection_trace: planner_selection_trace.into(),
         query_workload: Some(query_workload),
         data_workload: Some(request.data_workload),
         canonical_roots,
         queries,
         allow_mixed_summary_and_exact_execution: request.target
             == physical::compiler::PhysicalDeploymentTarget::BackendLocalRemoteWrite,
+        require_backend_local_execution: false,
         enabled_materialization_keys: None,
         topk_membership_evidence_by_query_id: request.evidence,
         exact_composition_costs: request.exact_composition_costs,
@@ -646,7 +691,7 @@ fn compile_physical_plan_request(
         compilation_request.clone(),
     )
     .map_err(|error| (StatusCode::UNPROCESSABLE_ENTITY, error.to_string().into()))?;
-    let planner_selection_trace = compilation_request.planner_selection_trace.clone();
+    let planner_selection_trace = compilation_request.planner_selection_trace.as_ref().clone();
     let (manifests, candidate_evaluations) =
         physical::workload_cost::compile_candidates_for_pricing(
             candidates.clone(),
@@ -929,7 +974,7 @@ mod api_tests {
             "target": "backend_local_remote_write",
             "queries": [{
                 "query_id": query.query_id, "query_string": query.query_string,
-                "metric": metric, "window_secs": query.query_lookback_seconds, "accuracy": query.accuracy_target,
+                "metric": metric, "window_secs": query.query_lookback_ms / 1_000, "accuracy": query.accuracy_target,
                 "lifecycle": query.summary_lifecycle_inputs, "evaluation_phase_ms": 0, "window_cost_model": { "implementation_id": "test", "cost": query.window_realization_candidates[0].cost }
             }],
             "dataset_identity": snapshot.environment.dataset_identity,