Merge branch 'fix/cost-evidence-dataset' into impl/sds-stack-742

Author: zzylol

control_plane/src/physical/compiler.rs

@@ -4022,25 +4022,6 @@ fn reject_uncertified_readouts(
             reason: format!("invalid executable subDAG: {error}"),
         }
     })?;
-    // Leaf guarantees do not certify a composition (for example, division of
-    // two approximate quantiles). Admission checks the complete query result.
-    if dag.nodes.iter().any(|node| {
-        matches!(
-            node.payload,
-            planner_types::post_asap::ExecutableOperatorPayload::SummaryEstimate { .. }
-        )
-    }) && root.guarantee.as_ref().is_none_or(|guarantee| {
-        !asap_aware_mapping::accuracy::AccuracyModel::satisfies(
-            &DefaultAccuracyModel,
-            guarantee,
-            accuracy,
-        )
-    }) {
-        return Err(CompileError::Query {
-            query_id: query_id.into(),
-            reason: "selected query result has no certified accuracy guarantee satisfying the requested accuracy".into(),
-        });
-    }
     for node in &dag.nodes {
         if target != PhysicalDeploymentTarget::BackendLocalRemoteWrite
             && node.guarantee.as_ref().is_some_and(|guarantee| {
@@ -4071,6 +4052,25 @@ fn reject_uncertified_readouts(
             });
         }
     }
+    // Leaf guarantees do not certify a composition (for example, division of
+    // two approximate quantiles). Admission checks the complete query result.
+    if dag.nodes.iter().any(|node| {
+        matches!(
+            node.payload,
+            planner_types::post_asap::ExecutableOperatorPayload::SummaryEstimate { .. }
+        )
+    }) && root.guarantee.as_ref().is_none_or(|guarantee| {
+        !asap_aware_mapping::accuracy::AccuracyModel::satisfies(
+            &asap_aware_mapping::DefaultAccuracyModel,
+            guarantee,
+            accuracy,
+        )
+    }) {
+        return Err(CompileError::Query {
+            query_id: query_id.into(),
+            reason: "selected query result has no certified accuracy guarantee satisfying the requested accuracy".into(),
+        });
+    }
     Ok(())
 }
 
@@ -5878,6 +5878,7 @@ pub(crate) mod tests {
         let error = reject_uncertified_readouts(
             "q",
             &request.queries[0].selected_plan_root,
+            &request.queries[0].accuracy_target,
             PhysicalDeploymentTarget::DistributedCollectors,
         )
         .unwrap_err();