refactor: adopt Planner PostAsapDag names

ASAPPlanner #470 renamed ExecutableDag to PostAsapDag, and #462 was
rebased onto it. Pin Planner to the rebased #462 head (76fbbf1) and
apply the rename, including OwnedPostAsapDag::from_post_asap_dag.
No serialized field or tag changes.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

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 = "3bff87fe6ca816627232a66240e778a7016a60a3" }
-asap-aware-mapping = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "3bff87fe6ca816627232a66240e778a7016a60a3" }
-asap-frontend-promql = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "3bff87fe6ca816627232a66240e778a7016a60a3" }
-asap-frontend-sql = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "3bff87fe6ca816627232a66240e778a7016a60a3" }
+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 = "3bff87fe6ca816627232a66240e778a7016a60a3" }
-asap_sketch_codec = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "3bff87fe6ca816627232a66240e778a7016a60a3" }
+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"] }

Cargo.toml

@@ -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/clickhouse.rs

@@ -16,7 +16,7 @@ use asap_aware_mapping::{
     SummaryMaintenanceLifecycleCostInputs, WorkloadDemand,
 };
 use planner_types::post_asap::{
-    CompositionOperator, EvaluationSchedule, ExecutableDagCompilation, OutputRepresentation,
+    CompositionOperator, EvaluationSchedule, OutputRepresentation, PostAsapDagCompilation,
     PostAsapNodeId, SketchAlgorithm, SketchParams, SketchQuery, SummaryExpr, SummaryFamilyType,
     SummaryMaintenanceLifecycle, SummaryMaintenanceMode, SummaryNode, SummaryWindowFramework,
 };
@@ -1475,7 +1475,7 @@ impl DeploymentPlanCompiler {
         // materializations, then consumed by QueryPlan lowering. The key is
         // the planner DAG node identity across the workload; serving never scans
         // downstream components to rediscover this decision.
-        let mut executable_dags = vec![None::<ExecutableDagCompilation>; request.queries.len()];
+        let mut executable_dags = vec![None::<PostAsapDagCompilation>; request.queries.len()];
         let mut node_bindings =
             BTreeMap::<(usize, PostAsapNodeId), asap_types::PolicyFingerprint>::new();
         let mut query_node_bindings =
@@ -1575,7 +1575,7 @@ impl DeploymentPlanCompiler {
             if selected.is_empty() && population_operators[query_index].is_none() {
                 continue;
             }
-            let executable = planner_types::post_asap::compile_executable_dag_with_node_ids(
+            let executable = planner_types::post_asap::compile_post_asap_dag_with_node_ids(
                 &query.selected_plan_root,
             )
             .map_err(|error| CompileError::Query {
@@ -1894,14 +1894,15 @@ impl DeploymentPlanCompiler {
                         .node_ids
                         .node_id(child)
                         .expect("selected input node");
-                    let document = asap_types::executable_plan::OwnedPostAsapDag::from_executable(
-                        query.query_id.clone(),
-                        &compiled.dag,
-                    )
-                    .map_err(|reason| CompileError::Query {
-                        query_id: query.query_id.clone(),
-                        reason,
-                    })?;
+                    let document =
+                        asap_types::executable_plan::OwnedPostAsapDag::from_post_asap_dag(
+                            query.query_id.clone(),
+                            &compiled.dag,
+                        )
+                        .map_err(|reason| CompileError::Query {
+                            query_id: query.query_id.clone(),
+                            reason,
+                        })?;
                     runtime_materialization.derived_input = Some(
                         asap_types::derived_input::DerivedInputIdentity::from_dag(
                             &document, input_node, &frontiers,
@@ -4081,7 +4082,7 @@ struct SelectedMaterialization {
 }
 
 fn validate_executable_subdag(node: &Rc<SummaryNode>) -> Result<(), String> {
-    let executable = planner_types::post_asap::compile_executable_dag(node)
+    let executable = planner_types::post_asap::compile_post_asap_dag(node)
         .map_err(|error| format!("invalid executable subDAG: {error}"))?;
     if let Some(edge) = executable.edges.iter().find(|edge| {
         edge.grouping == planner_types::post_asap::GroupingEdgeCompatibility::Incompatible
@@ -4099,7 +4100,7 @@ fn reject_uncertified_readouts(
     root: &Rc<SummaryNode>,
     accuracy: &AccuracyTarget,
 ) -> Result<(), CompileError> {
-    let dag = planner_types::post_asap::compile_executable_dag(root).map_err(|error| {
+    let dag = planner_types::post_asap::compile_post_asap_dag(root).map_err(|error| {
         CompileError::Query {
             query_id: query_id.into(),
             reason: format!("invalid executable subDAG: {error}"),
@@ -4108,7 +4109,7 @@ fn reject_uncertified_readouts(
     for node in &dag.nodes {
         if matches!(
             node.payload,
-            planner_types::post_asap::ExecutableOperatorPayload::SummaryEstimate { .. }
+            planner_types::post_asap::PostAsapOperatorPayload::SummaryEstimate { .. }
         ) && node
             .guarantee
             .as_ref()
@@ -4125,7 +4126,7 @@ fn reject_uncertified_readouts(
     if dag.nodes.iter().any(|node| {
         matches!(
             node.payload,
-            planner_types::post_asap::ExecutableOperatorPayload::SummaryEstimate { .. }
+            planner_types::post_asap::PostAsapOperatorPayload::SummaryEstimate { .. }
         )
     }) && root.guarantee.as_ref().is_none_or(|guarantee| {
         !asap_aware_mapping::accuracy::AccuracyModel::satisfies(
@@ -4883,7 +4884,7 @@ pub(crate) mod tests {
             std::slice::from_ref(&root),
         );
         let candidate = rule.candidate(&root).unwrap();
-        planner_types::post_asap::compile_executable_dag(&candidate).unwrap();
+        planner_types::post_asap::compile_post_asap_dag(&candidate).unwrap();
         assert!(!super::super::maintained_population::supported_node(
             &candidate
         ));
@@ -5185,17 +5186,16 @@ pub(crate) mod tests {
             .find(|node| {
                 matches!(
                     node.payload,
-                    planner_types::post_asap::ExecutableOperatorPayload::SummaryAgg { .. }
+                    planner_types::post_asap::PostAsapOperatorPayload::SummaryAgg { .. }
                 )
             })
             .unwrap();
-        if let planner_types::post_asap::ExecutableOperatorPayload::SummaryAgg {
-            reduction, ..
-        } = &mut node.payload
+        if let planner_types::post_asap::PostAsapOperatorPayload::SummaryAgg { reduction, .. } =
+            &mut node.payload
         {
             *reduction = planner_types::pre_asap::Reduction::by(vec![]);
         }
-        installed.document = asap_types::executable_plan::OwnedPostAsapDag::from_executable(
+        installed.document = asap_types::executable_plan::OwnedPostAsapDag::from_post_asap_dag(
             installed.document.query_id.clone(),
             &dag,
         )
@@ -7118,19 +7118,19 @@ pub(crate) mod tests {
             }],
             time_index: None,
         };
-        let dag = ExecutableDag {
+        let dag = PostAsapDag {
             nodes: (1..=5)
-                .map(|id| ExecutableDagNode {
+                .map(|id| PostAsapDagNode {
                     id: PostAsapNodeId(id),
-                    payload: ExecutableOperatorPayload::SummaryMerge,
+                    payload: PostAsapOperatorPayload::SummaryMerge,
                     output_state: ExecutionDataState::INGESTION_SUMMARY,
                     output_schema: schema.clone(),
                     guarantee: None,
                 })
                 .collect(),
             edges: [(1, 2), (2, 3), (2, 4), (3, 5), (4, 5)]
                 .into_iter()
-                .map(|(a, b)| ExecutableDagEdge {
+                .map(|(a, b)| PostAsapDagEdge {
                     producer: PostAsapNodeId(a),
                     consumer: PostAsapNodeId(b),
                     role: EdgeRole::Input,
@@ -7143,7 +7143,7 @@ pub(crate) mod tests {
             root: PostAsapNodeId(5),
         };
         let mut installed = InstalledPostAsapDag {
-            document: OwnedPostAsapDag::from_executable("shared".into(), &dag).unwrap(),
+            document: OwnedPostAsapDag::from_post_asap_dag("shared".into(), &dag).unwrap(),
             native_programs: BTreeMap::new(),
             binding: BackendExecutableBinding {
                 nodes: (1..=5)

control_plane/src/physical/compiler.rs

@@ -10,7 +10,7 @@ enum OperatorExecution {
 
 /// Every physical operator uses its node's placement; payload kind does not
 /// restrict execution phase. Runtime capability is checked separately.
-fn operator_execution(node: &planner_types::post_asap::ExecutableDagNode) -> OperatorExecution {
+fn operator_execution(node: &planner_types::post_asap::PostAsapDagNode) -> OperatorExecution {
     match node.output_state.timing {
         planner_types::post_asap::ExecutionTiming::IngestionTime => OperatorExecution::Ingestion,
         planner_types::post_asap::ExecutionTiming::QueryTime => OperatorExecution::Query,
@@ -20,7 +20,7 @@ fn operator_execution(node: &planner_types::post_asap::ExecutableDagNode) -> Ope
 /// Assign backend phases to a selected semantic DAG without changing its nodes.
 pub fn install_selected_dag(
     query_id: String,
-    dag: &planner_types::post_asap::ExecutableDag,
+    dag: &planner_types::post_asap::PostAsapDag,
     query_plan_sink: QueryNodeId,
     materialization: impl Fn(
         planner_types::post_asap::PostAsapNodeId,
@@ -30,7 +30,7 @@ pub fn install_selected_dag(
     let mut nodes = std::collections::BTreeMap::new();
     let mut precompute_sinks = Vec::new();
     for node in &dag.nodes {
-        if let planner_types::post_asap::ExecutableOperatorPayload::SummaryAgg {
+        if let planner_types::post_asap::PostAsapOperatorPayload::SummaryAgg {
             family,
             input,
             grouping,
@@ -56,7 +56,7 @@ pub fn install_selected_dag(
     precompute_sinks.sort();
     let installed = InstalledPostAsapDag {
         native_programs: std::collections::BTreeMap::new(),
-        document: OwnedPostAsapDag::from_executable(query_id, dag)?,
+        document: OwnedPostAsapDag::from_post_asap_dag(query_id, dag)?,
         binding: BackendExecutableBinding {
             nodes,
             query_sink: dag.root,

control_plane/src/physical/executable_binding.rs

@@ -35,12 +35,12 @@ fn selected(node: &SummaryNode) -> Option<(MaintainedPopulation, PopulationReado
         return None;
     };
     let dag =
-        planner_types::post_asap::compile_executable_dag(&std::rc::Rc::new(node.clone())).ok()?;
+        planner_types::post_asap::compile_post_asap_dag(&std::rc::Rc::new(node.clone())).ok()?;
     let populations = dag
         .nodes
         .iter()
         .filter_map(|node| match &node.payload {
-            planner_types::post_asap::ExecutableOperatorPayload::Value {
+            planner_types::post_asap::PostAsapOperatorPayload::Value {
                 operation: ValueOperation::MaintainPopulation { population },
             } => Some(population),
             _ => None,

control_plane/src/physical/maintained_population.rs

@@ -20,7 +20,7 @@ use asap_aware_mapping::{
     SummaryMaintenanceLifecycleCostInputs, TargetSubDAG, ValueOperationCapabilities,
 };
 use planner_types::post_asap::{
-    ExecutableOperatorPayload, GroupingStrategy, SketchAlgorithm, SketchParams, SketchQuery,
+    GroupingStrategy, PostAsapOperatorPayload, SketchAlgorithm, SketchParams, SketchQuery,
     SummaryFamilyType, SummaryWindowFramework,
 };
 use planner_types::pre_asap::expr_ir::ColumnRef;
@@ -190,13 +190,13 @@ impl ControlPlaneCostModel {
             // Exact compositions have a separate measured rate model.
             return None;
         };
-        let dag = planner_types::post_asap::compile_executable_dag(root).ok()?;
+        let dag = planner_types::post_asap::compile_post_asap_dag(root).ok()?;
         let mut value = 0.0;
         let mut states = 0;
         for node in &dag.nodes {
             let family = match &node.payload {
-                ExecutableOperatorPayload::SummaryAgg { family, .. }
-                | ExecutableOperatorPayload::SummaryJoin { family, .. } => family,
+                PostAsapOperatorPayload::SummaryAgg { family, .. }
+                | PostAsapOperatorPayload::SummaryJoin { family, .. } => family,
                 _ => continue,
             };
             states += 1;
@@ -527,12 +527,12 @@ impl CostModel for ControlPlaneCostModel {
     ) -> Option<bool> {
         use planner_types::post_asap::{NonNegativeWeightProof, WeightDomain};
         let dag =
-            planner_types::post_asap::compile_executable_dag(&std::rc::Rc::new(summary.clone()))
+            planner_types::post_asap::compile_post_asap_dag(&std::rc::Rc::new(summary.clone()))
                 .ok()?;
         // Counter-weighted heaps now consume explicit rate values. The raw
         // ingestion adapter cannot bind that frontier as counter deltas.
         let requires_rate_values = dag.nodes.iter().any(|node| matches!(&node.payload,
-            ExecutableOperatorPayload::SummaryAgg { input, family: SummaryFamilyType::Sketch(kind, _), .. }
+            PostAsapOperatorPayload::SummaryAgg { input, family: SummaryFamilyType::Sketch(kind, _), .. }
                 if matches!(kind.algorithm(), SketchAlgorithm::CmsWithHeap | SketchAlgorithm::CountSketchWithHeap)
                 && matches!(input.weight_domain, WeightDomain::NonNegative { proof: NonNegativeWeightProof::ResetAwareCounterDerivative })));
         requires_rate_values.then_some(false)

control_plane/src/physical/post_asap/cost_model.rs

@@ -77,10 +77,10 @@ fn target_identity(target: &QueryExpr, accuracy: &AccuracyTarget) -> Option<Stri
 fn summary_identity(node: &SummaryNode) -> Option<String> {
     // Canonical exporter owns operator payloads and edge semantics. Hash its
     // structure, not assigned node IDs or the incidental sharing of Rc values.
-    let dag = planner_types::post_asap::compile_executable_dag(&Rc::new(node.clone())).ok()?;
+    let dag = planner_types::post_asap::compile_post_asap_dag(&Rc::new(node.clone())).ok()?;
     lossless_json(&dag)?;
     fn visit(
-        dag: &planner_types::post_asap::ExecutableDag,
+        dag: &planner_types::post_asap::PostAsapDag,
         id: planner_types::post_asap::PostAsapNodeId,
         memo: &mut std::collections::HashMap<planner_types::post_asap::PostAsapNodeId, String>,
     ) -> String {