Merge branch 'integration/physical-stack-765' into integration/physical-stack-766

Author: zzylol

Cargo.lock

@@ -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 = "645cacb04a451e25147f0d23aaddd05da16b4746" }
-asap-aware-mapping = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "645cacb04a451e25147f0d23aaddd05da16b4746" }
-asap-frontend-promql = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "645cacb04a451e25147f0d23aaddd05da16b4746" }
-asap-frontend-sql = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "645cacb04a451e25147f0d23aaddd05da16b4746" }
+planner-types = { package = "asap-types", git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "b58f24268270a4dd7b7caaf0076ea3db842f3e9b" }
+asap-aware-mapping = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "b58f24268270a4dd7b7caaf0076ea3db842f3e9b" }
+asap-frontend-promql = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "b58f24268270a4dd7b7caaf0076ea3db842f3e9b" }
+asap-frontend-sql = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "b58f24268270a4dd7b7caaf0076ea3db842f3e9b" }
 
 # 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 = "645cacb04a451e25147f0d23aaddd05da16b4746" }
-asap_sketch_codec = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "645cacb04a451e25147f0d23aaddd05da16b4746" }
+asap-physical-operators = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "b58f24268270a4dd7b7caaf0076ea3db842f3e9b" }
+asap_sketch_codec = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "b58f24268270a4dd7b7caaf0076ea3db842f3e9b" }
 asap_types = { path = "crates/asap_types" }
 asap_otel_proto = { path = "crates/asap_otel_proto" }
 indexmap = { version = "2.0", features = ["serde"] }

Cargo.toml

@@ -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};
@@ -129,9 +129,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/calibration_candidates.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()

control_plane/examples/workload_cost_manifest.rs

@@ -1,7 +1,7 @@
 //! Backend-facing projection of one planning cycle.
 //!
 //! These types are the input to [`crate::backend_plan::from_stage_config`] and
-//! to `emit::backend_wire`'s backend JSON builders. `PhysicalPlanCompiler` builds
+//! to `emit::backend_wire`'s backend JSON builders. `DeploymentPlanCompiler` builds
 //! them directly from the summaries ASAPPlanner selected.
 //!
 //! They are deliberately not `Serialize`/`Deserialize`: `SummaryFamilyType`