diff --git a/Cargo.lock b/Cargo.lock index 177a991e5..de76c1704 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -339,10 +339,20 @@ dependencies = [ "tokio", ] +[[package]] +name = "asap-frontend-common" +version = "0.1.0" +dependencies = [ + "asap-types", + "serde", + "thiserror 2.0.18", +] + [[package]] name = "asap-frontend-metricsql" version = "0.1.0" dependencies = [ + "asap-frontend-common", "asap-types", "metricsql_parser", "thiserror 2.0.18", @@ -353,6 +363,7 @@ name = "asap-frontend-promql" version = "0.1.0" dependencies = [ "asap-aware-mapping", + "asap-frontend-common", "asap-types", "promql-parser", ] @@ -362,6 +373,7 @@ name = "asap-frontend-sql" version = "0.1.0" dependencies = [ "asap-aware-mapping", + "asap-frontend-common", "asap-sql-function-catalog", "asap-types", "datafusion", @@ -379,6 +391,7 @@ dependencies = [ "asap-frontend-promql", "asap-frontend-sql", "asap-physical-operators", + "asap-planner", "asap-types", "asap_sketchlib 0.3.0 (git+https://github.com/ProjectASAP/asap_sketchlib)", "futures", @@ -394,6 +407,7 @@ dependencies = [ "asap-frontend-promql", "asap-types", "asap_sketchlib 0.3.0 (git+https://github.com/ProjectASAP/asap_sketchlib?rev=5f03ccbd798ed5fec62bdd839bcb331123cab369)", + "chrono", "futures", "regex", "rmp-serde", diff --git a/Cargo.toml b/Cargo.toml index a2b019af8..b33026447 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,6 +2,7 @@ members = [ "crates/asap-physical-operators", "crates/types", + "crates/frontend-common", "crates/sql-function-catalog", "crates/asap-aware-mapping", "crates/frontend-promql", diff --git a/crates/asap-aware-mapping/src/accuracy/composition.rs b/crates/asap-aware-mapping/src/accuracy/composition.rs index f42e8f158..daad8071c 100644 --- a/crates/asap-aware-mapping/src/accuracy/composition.rs +++ b/crates/asap-aware-mapping/src/accuracy/composition.rs @@ -448,9 +448,7 @@ fn composed_provenance( } pub(super) fn exact_operation_rule(operation: &ExactOperation) -> Option { - let ExactOperation::Aggregate { measures, .. } = operation else { - return None; - }; + let ExactOperation::Aggregate { measures, .. } = operation; match measures.as_slice() { [intent] => crate::function_rules::function_rules(intent).map(|rules| rules.accuracy), // The remaining functions are exact over exact samples, but have @@ -1035,8 +1033,8 @@ mod tests { reduction: asap_types::pre_asap::Reduction::PerEntity, measures: vec![intent], output_names: vec![], - having: None, filters: vec![], + having: None, }; assert_eq!( DefaultAccuracyModel.exact_operation_rule(&operation(AggIntent::Rate)), diff --git a/crates/asap-aware-mapping/src/accuracy/estimators/cms.rs b/crates/asap-aware-mapping/src/accuracy/estimators/cms.rs index 46559358d..9482c539a 100644 --- a/crates/asap-aware-mapping/src/accuracy/estimators/cms.rs +++ b/crates/asap-aware-mapping/src/accuracy/estimators/cms.rs @@ -65,7 +65,7 @@ mod tests { } #[test] - fn heap_readout_retains_frequency_metric() { + fn heap_evaluation_retains_frequency_metric() { use asap_types::post_asap::{GroupingStrategy, SketchKind}; let cms_heap = SketchParams::CmsWithHeap { width: 272, diff --git a/crates/asap-aware-mapping/src/accuracy/estimators/hll.rs b/crates/asap-aware-mapping/src/accuracy/estimators/hll.rs index 4431a4118..f4556446c 100644 --- a/crates/asap-aware-mapping/src/accuracy/estimators/hll.rs +++ b/crates/asap-aware-mapping/src/accuracy/estimators/hll.rs @@ -1,7 +1,7 @@ //! Estimator-specific confidence for classic HLL's linear-counting branch. //! //! This is conditional on independent uniform bucket hashes and an enforced -//! upper bound on distinct items in the complete readout population (including +//! upper bound on distinct items in the complete evaluation population (including //! all merged panes). It is not an RSE-to-normal conversion or an ERP fit. use super::*; @@ -56,13 +56,13 @@ impl ClassicHllConfidence { value: self.relative_error, }, failure_probability: ProbabilityExpr::Constant { value: delta }, - provenance: vec![GuaranteeSource::SketchReadout { + provenance: vec![GuaranteeSource::SketchEvaluation { algorithm: "Hll".into(), contract: "classic_hll_linear_counting_collision_bound_v1".into(), params: serde_json::json!({"precision": precision, "max_distinct": self.max_distinct, "relative_error": self.relative_error, "hash_assumption": "independent_uniform_buckets", - "population_scope": "complete_readout_including_merged_panes"}), + "population_scope": "complete_evaluation_including_merged_panes"}), query: "Cardinality".into(), }], }) @@ -187,7 +187,7 @@ mod tests { } } } - /// The model's readout formula matches the actual classic estimator after merge. + /// The model's evaluation formula matches the actual classic estimator after merge. #[test] fn native_classic_estimator_and_merged_registers_use_the_same_contract() { use asap_sketchlib::sketches::hll::{Classic, HyperLogLogP16}; diff --git a/crates/asap-aware-mapping/src/accuracy/estimators/kll.rs b/crates/asap-aware-mapping/src/accuracy/estimators/kll.rs index 4cfe6f073..4f880894d 100644 --- a/crates/asap-aware-mapping/src/accuracy/estimators/kll.rs +++ b/crates/asap-aware-mapping/src/accuracy/estimators/kll.rs @@ -69,7 +69,7 @@ mod tests { assert_eq!(g.approximate_layer_count(), 1); assert!(g.provenance.iter().any(|source| matches!( source, - GuaranteeSource::SketchReadout { contract, .. } + GuaranteeSource::SketchEvaluation { contract, .. } if contract == "apache_datasketches_kll_empirical_99_a9b42755072b" ))); } diff --git a/crates/asap-aware-mapping/src/accuracy/estimators/mod.rs b/crates/asap-aware-mapping/src/accuracy/estimators/mod.rs index 4eabf40be..0cd5fcb4f 100644 --- a/crates/asap-aware-mapping/src/accuracy/estimators/mod.rs +++ b/crates/asap-aware-mapping/src/accuracy/estimators/mod.rs @@ -46,7 +46,7 @@ fn bounded_guarantee( metric, bound: BoundExpr::Constant { value: bound }, failure_probability: delta, - provenance: vec![GuaranteeSource::SketchReadout { + provenance: vec![GuaranteeSource::SketchEvaluation { algorithm: format!("{algorithm:?}"), contract: contract.into(), params: serde_json::to_value(params).unwrap_or(serde_json::Value::Null), @@ -169,9 +169,9 @@ impl<'a> EstimatorAccuracy<'a> { fn hll(&self) -> Option { let EstimatorContract::ClassicHll { - max_distinct_per_readout, + max_distinct_per_evaluation, } = self.contract?; - hll::ClassicHllConfidence::new(max_distinct_per_readout, self.epsilon) + hll::ClassicHllConfidence::new(max_distinct_per_evaluation, self.epsilon) } pub(crate) fn size_params(&self, algorithm: &SketchAlgorithm) -> Option { diff --git a/crates/asap-aware-mapping/src/accuracy/estimators/univmon.rs b/crates/asap-aware-mapping/src/accuracy/estimators/univmon.rs index 297cf53d3..6a89a105e 100644 --- a/crates/asap-aware-mapping/src/accuracy/estimators/univmon.rs +++ b/crates/asap-aware-mapping/src/accuracy/estimators/univmon.rs @@ -1,4 +1,4 @@ -//! UnivMon currently certifies only its exact unit-update total readout. +//! UnivMon currently certifies only its exact unit-update total evaluation. use super::*; pub(super) fn guarantee(query: &SketchStatistic) -> Option { diff --git a/crates/asap-aware-mapping/src/accuracy/evidence.rs b/crates/asap-aware-mapping/src/accuracy/evidence.rs index 6391c746e..f779d5782 100644 --- a/crates/asap-aware-mapping/src/accuracy/evidence.rs +++ b/crates/asap-aware-mapping/src/accuracy/evidence.rs @@ -2,12 +2,12 @@ use super::*; /// A trusted source assertion scoped by `AccuracyEvidenceProvider` to one -/// complete readout. Choosing this variant asserts the estimator and hash +/// complete evaluation. Choosing this variant asserts the estimator and hash /// assumptions; it must not be inferred from sampled population statistics. #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum EstimatorContract { /// Classic HLL with independent uniform bucket hashing, including merged panes. - ClassicHll { max_distinct_per_readout: u32 }, + ClassicHll { max_distinct_per_evaluation: u32 }, } /// An enforced domain for every sample of a direct quantile operand, in every @@ -18,7 +18,7 @@ pub enum EstimatorContract { pub struct QuantileInputDomain { pub lower: f64, pub upper: f64, - /// Upper bound on samples per evaluation, matching the pinned readout's + /// Upper bound on samples per evaluation, matching the pinned evaluation's /// exact Float64 rank limit. The population must also be nonempty. pub max_samples: u64, pub contract: String, @@ -87,31 +87,22 @@ pub struct PropagationStats { /// Supplies typed planning-time evidence required by propagation rules. pub trait AccuracyEvidenceProvider { /// Trusted estimator contract for this complete aggregate expression, - /// including source, filters, grouping and all panes in each readout. + /// including source, filters, grouping and all panes in each evaluation. /// An observed cardinality is not an enforced population bound. - fn estimator_contract( - &self, - _expression: &asap_types::pre_asap::QueryExpr, - ) -> Option { + fn estimator_contract(&self, _expression: &OperatorNode) -> Option { None } /// Enforced upper bound on distinct (partition, item) identities across a - /// complete TopK readout. Used to union-bound score errors for adaptively + /// complete TopK evaluation. Used to union-bound score errors for adaptively /// selected candidates. Observed cardinality is not sufficient evidence. - fn topk_max_distinct_items( - &self, - _expression: &asap_types::pre_asap::QueryExpr, - ) -> Option { + fn topk_max_distinct_items(&self, _expression: &OperatorNode) -> Option { None } /// Proof scoped to this complete quantile expression, including its source, /// filters, grouping and window. `None` means unknown, including emptiness. - fn quantile_input_domain( - &self, - _operand: &asap_types::pre_asap::query_expr::QueryExpr, - ) -> Option { + fn quantile_input_domain(&self, _operand: &OperatorNode) -> Option { None } diff --git a/crates/asap-aware-mapping/src/accuracy/mod.rs b/crates/asap-aware-mapping/src/accuracy/mod.rs index 9026de468..a2f3354c0 100644 --- a/crates/asap-aware-mapping/src/accuracy/mod.rs +++ b/crates/asap-aware-mapping/src/accuracy/mod.rs @@ -20,18 +20,20 @@ pub use evidence::{ QuantileInputDomain, WorkloadAccuracyEvidence, }; +use asap_types::ir::OperatorNode; use asap_types::post_asap::{ - AccuracyError, BoundExpr, CompositionOperator, ErrorMetric, ExactOperation, FieldDataType, - GuaranteeSource, ProbabilityExpr, ResultGuarantee, SketchAlgorithm, SketchParams, - SketchStatistic, + AccuracyError, BoundExpr, CompositionOperator, ErrorMetric, FieldDataType, GuaranteeSource, + ProbabilityExpr, ResultGuarantee, SketchAlgorithm, SketchParams, SketchStatistic, }; use asap_types::types::AccuracyTarget; +use crate::exact_composition::ExactOperation; + /// The deployment-extensible accuracy algebra. `asap-aware-mapping` ships /// [`DefaultAccuracyModel`]; a deployment with a proof for a composition the /// default rejects (a registered cross-metric conversion, say) implements /// this trait and passes it to -/// [`crate::replacement::SketchAlgorithmStrategy::new_with_planning_inputs`]. +/// [`crate::replacement::ASAPStrategies::new_with_planning_inputs`]. pub trait AccuracyModel { /// The definition-registered rule for applying `operation` to an /// approximate input. `None` means the function is exact only over exact @@ -78,7 +80,7 @@ pub struct DefaultAccuracyModel; const SATISFACTION_TOLERANCE: f64 = 1e-9; impl DefaultAccuracyModel { - /// Derive the guarantee for the committed estimator parameters and readout. + /// Derive the guarantee for the committed estimator parameters and evaluation. pub fn sketch_guarantee( algorithm: &SketchAlgorithm, params: &SketchParams, diff --git a/crates/asap-aware-mapping/src/accuracy/reconciliation.rs b/crates/asap-aware-mapping/src/accuracy/reconciliation.rs index 6014d3ba3..a8b16bcae 100644 --- a/crates/asap-aware-mapping/src/accuracy/reconciliation.rs +++ b/crates/asap-aware-mapping/src/accuracy/reconciliation.rs @@ -3,7 +3,7 @@ //! //! ## The gap this closes //! -//! `asap_types::pre_asap::cse::share_common_sub_dags` (pre-ASAP CSE) only +//! `asap_types::ir::cse::share_common_sub_dags` (pre-ASAP CSE) only //! ever merges two sub-DAGs that are *exactly* [`PartialEq`]-equal, //! including their [`AggIntent`]'s `accuracy: AccuracyTarget` field. Two //! otherwise-identical aggregates that differ *only* in how tight an @@ -28,10 +28,10 @@ //! //! ## What counts as a "near-duplicate", and why //! -//! Two [`QueryExpr::Aggregate`] nodes are accuracy-near-duplicates here iff, +//! Two `NonASAPOp::Aggregate` nodes are accuracy-near-duplicates here iff, //! **in this order**: //! -//! 1. Both are the same bindable shape [`crate::replacement::SketchAlgorithmStrategy`] +//! 1. Both are the same bindable shape [`crate::replacement::ASAPStrategies`] //! itself targets — a single measure, no `HAVING` (`bindable_intent`'s own //! scope) — **and** that one measure is one of the four accuracy-bearing //! [`AggIntent`] variants ([`crate::replacement::accuracy_target`]'s own @@ -105,7 +105,7 @@ //! //! Like every [`ReplacementStrategy`], this only ever *proposes* — the //! looser-accuracy consumer's own independently-sized candidate (from -//! [`crate::replacement::SketchAlgorithmStrategy`]) stays in its +//! [`crate::replacement::ASAPStrategies`]) stays in its //! [`crate::replacement::TargetSubDAGCandidates`] right alongside this strategy's //! "read the tighter sibling instead" [`Replacement::Rewrite`] candidate; //! [`crate::cost_model::CostModel`]-driven ranking picks between them; @@ -149,11 +149,13 @@ //! same structural child, so adding the edge preserves the reference DAG's //! parent-before-child topological ordering. +use asap_types::ir::non_asap::any_measure_filtered; use std::cmp::Ordering; use std::rc::Rc; +use asap_types::ir::operator_properties::Reduction; +use asap_types::ir::{NonASAPOp, OperatorNode}; use asap_types::pre_asap::agg_intent::AggIntent; -use asap_types::pre_asap::query_expr::{any_measure_filtered, QueryExpr, Reduction}; use asap_types::types::AccuracyTarget; use crate::replacement::{ @@ -169,27 +171,27 @@ type BindableAccuracyAggregate<'a> = ( &'a AggIntent, &'a AccuracyTarget, &'a [String], - &'a Rc, + &'a Rc, ); /// The `(reduction, intent, accuracy, output_names, child)` shape this /// module operates on: the same single-measure, no-`HAVING` bindable shape -/// [`crate::replacement::SketchAlgorithmStrategy`] targets (see that +/// [`crate::replacement::ASAPStrategies`] targets (see that /// module's private `bindable_intent`), further narrowed to a measure whose /// intent actually carries an [`AccuracyTarget`] /// ([`crate::replacement::accuracy_target`]'s own scope: `Count` / /// `Quantile` / `Cardinality` / `TopK`). `None` for anything else, including /// a multi-measure or `HAVING` aggregate, a non-`Aggregate` node, or an /// accuracy-free intent (`Sum`, `Avg`, …). -fn bindable_accuracy_aggregate(node: &QueryExpr) -> Option> { - let QueryExpr::Aggregate { +fn bindable_accuracy_aggregate(node: &OperatorNode) -> Option> { + let Some(NonASAPOp::Aggregate { reduction, measures, output_names, filters, having, child, - } = node + }) = node.non_asap() else { return None; }; @@ -278,7 +280,7 @@ fn strictly_tighter(a: &AccuracyTarget, b: &AccuracyTarget) -> bool { /// this strategy from the same post-CSE `Aggregate` sibling set it already /// builds for `RollupStrategy`. pub struct AccuracyReconciliationStrategy { - siblings: Vec>, + siblings: Vec>, } impl AccuracyReconciliationStrategy { @@ -286,7 +288,7 @@ impl AccuracyReconciliationStrategy { /// each as a candidate tighter-accuracy source (or looser-accuracy /// target) — typically the full set of `Aggregate` nodes a workload-wide /// discovery pass already found. - pub fn new(siblings: &[Rc]) -> Self { + pub fn new(siblings: &[Rc]) -> Self { Self { siblings: siblings.to_vec(), } @@ -301,7 +303,7 @@ impl AccuracyReconciliationStrategy { /// /// Also requires the candidate's own *output* schema to carry a provable /// unique key ([`Schema::has_unique_key`]) — the exact legality gate - /// `pre_asap::cse::share_common_sub_dags` already applies to its own + /// `ir::cse::share_common_sub_dags` already applies to its own /// sharing decisions, and [`crate::rollup::RollupStrategy`] already /// reuses verbatim for the identical reason (see that module's /// `is_legal_rollup_source` doc, point 4): a producer's output is only @@ -311,14 +313,14 @@ impl AccuracyReconciliationStrategy { /// reports no unique key — see `cse.rs`'s "Legality" section) would get /// proposed for reconciliation even though nothing guarantees a second /// read of it lines up row-for-row with the first. - fn tighter_sources<'a>(&'a self, target: &TargetSubDAG<'_>) -> Vec<&'a Rc> { + fn tighter_sources<'a>(&'a self, target: &TargetSubDAG<'_>) -> Vec<&'a Rc> { let Some((target_reduction, target_intent, target_accuracy, target_names, target_child)) = bindable_accuracy_aggregate(target.root) else { return Vec::new(); }; - let mut sources: Vec<&Rc> = self + let mut sources: Vec<&Rc> = self .siblings .iter() .filter(|candidate| { @@ -335,9 +337,7 @@ impl AccuracyReconciliationStrategy { && (Rc::ptr_eq(child, target_child) || child == target_child) && same_intent_except_accuracy(intent, target_intent) && strictly_tighter(accuracy, target_accuracy) - && candidate - .output_schema() - .is_ok_and(|schema| schema.has_unique_key()) + && candidate.schema.has_unique_key() }) .collect(); sources.sort_by(|a, b| { @@ -369,7 +369,7 @@ impl ReplacementStrategy for AccuracyReconciliationStrategy { .expect("tighter_sources only returns bindable_accuracy_aggregate matches"); ReplacementSubDAG { strategy: self.name(), - replacement: Replacement::Rewrite(Rc::clone(source)), + replacement: Replacement::SubDAG(Rc::clone(source)), provenance: ReplacementProvenance::AccuracyReconciliation, rationale: format!( "reuses a near-duplicate sibling aggregate — identical intent and grouping \ @@ -391,9 +391,9 @@ impl ReplacementStrategy for AccuracyReconciliationStrategy { mod tests { use super::*; use crate::cost_model::{CostModel, DefaultCostModel}; + use asap_types::ir::cse::share_common_sub_dags; + use asap_types::ir::operator_properties::{GroupKeys, Source}; use asap_types::post_asap::SketchAlgorithm; - use asap_types::pre_asap::cse::share_common_sub_dags; - use asap_types::pre_asap::query_expr::{GroupKeys, Source}; use asap_types::pre_asap::schema::{ColumnId, DataType, Field, Schema}; /// `[ts(0), value(1), job(2)]`. @@ -401,8 +401,8 @@ mod tests { /// willing to hoist it — see `Schema::has_unique_key`/`cse.rs`'s own /// "Legality" section: a producer with no provable unique key is always /// inserted fresh, never hoisted, regardless of structural equality. - fn metric_scan() -> Rc { - Rc::new(QueryExpr::Scan { + fn metric_scan() -> Rc { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Scan { source: Source::TimeSeries { metric: "m".into() }, predicates: vec![], schema: Schema::with_time_index( @@ -414,21 +414,23 @@ mod tests { 0, vec![vec![0]], ), - }) + })) + .unwrap() } - fn agg(by: Vec, intent: AggIntent, child: &Rc) -> Rc { - Rc::new(QueryExpr::Aggregate { + fn agg(by: Vec, intent: AggIntent, child: &Rc) -> Rc { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { reduction: Reduction::by(by), measures: vec![intent], output_names: vec![], filters: vec![], having: None, child: Rc::clone(child), - }) + })) + .unwrap() } - fn quantile(q: f64, accuracy: AccuracyTarget, child: &Rc) -> Rc { + fn quantile(q: f64, accuracy: AccuracyTarget, child: &Rc) -> Rc { agg( vec![2], AggIntent::Quantile { @@ -441,10 +443,14 @@ mod tests { } /// A globally-grouped (`by(vec![])`) quantile — `aggregate_output_schema` - /// reports no unique key for an empty `by` (see `query_expr.rs`'s own + /// reports no unique key for an empty `by` (see `aggregate_schema.rs`'s own /// `unique_keys = if by.is_empty() || has_count_values { vec![] } else /// { .. }`). - fn global_quantile(q: f64, accuracy: AccuracyTarget, child: &Rc) -> Rc { + fn ungrouped_quantile( + q: f64, + accuracy: AccuracyTarget, + child: &Rc, + ) -> Rc { agg( vec![], AggIntent::Quantile { @@ -463,9 +469,9 @@ mod tests { q: f64, accuracy: AccuracyTarget, excluded: Vec, - child: &Rc, - ) -> Rc { - Rc::new(QueryExpr::Aggregate { + child: &Rc, + ) -> Rc { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { reduction: Reduction::Reduce(GroupKeys::without(excluded)), measures: vec![AggIntent::Quantile { col: None, @@ -476,7 +482,8 @@ mod tests { filters: vec![], having: None, child: Rc::clone(child), - }) + })) + .unwrap() } // ── dominates / strictly_tighter ───────────────────────────────────── @@ -548,7 +555,7 @@ mod tests { assert!(strategy.matches(&TargetSubDAG::new(&loose))); let replacements = strategy.replacements(&TargetSubDAG::new(&loose)); assert_eq!(replacements.len(), 1); - let Replacement::Rewrite(rc) = &replacements[0].replacement else { + let Replacement::SubDAG(rc) = &replacements[0].replacement else { panic!("expected a Rewrite candidate"); }; assert!(Rc::ptr_eq(rc, &tight)); @@ -580,7 +587,7 @@ mod tests { assert!( loose_group.candidates.iter().any(|candidate| { candidate.strategy == "AccuracyReconciliationStrategy" - && matches!(candidate.replacement, Replacement::Rewrite(_)) + && matches!(candidate.replacement, Replacement::SubDAG(_)) }), "expected an AccuracyReconciliationStrategy candidate for the looser consumer, got: \ {:?}", @@ -661,7 +668,7 @@ mod tests { // ── exact structural equality / share_common_sub_dags is unchanged ──── #[test] - fn share_common_sub_dags_still_never_merges_differing_accuracy() { + fn share_common_subdags_still_never_merges_differing_accuracy() { // The additive guarantee this issue explicitly must not violate: // pre-ASAP CSE's own exact-equality merge stays exact. Two // aggregates differing only in `accuracy` must come back as two @@ -669,8 +676,8 @@ mod tests { // is the *only* place cross-accuracy sharing gets proposed, never // `share_common_sub_dags` itself. let scan = metric_scan(); - let a = (*quantile(0.99, AccuracyTarget::Epsilon(0.01), &scan)).clone(); - let b = (*quantile(0.99, AccuracyTarget::Epsilon(0.05), &scan)).clone(); + let a = quantile(0.99, AccuracyTarget::Epsilon(0.01), &scan); + let b = quantile(0.99, AccuracyTarget::Epsilon(0.05), &scan); let roots = share_common_sub_dags(vec![("a", a), ("b", b)]); assert!( @@ -684,10 +691,10 @@ mod tests { // The identical scan child, though, is still shared exactly as // before — this module changes nothing about that. - let QueryExpr::Aggregate { child: child_a, .. } = roots[0].1.as_ref() else { + let Some(NonASAPOp::Aggregate { child: child_a, .. }) = roots[0].1.non_asap() else { panic!("expected an Aggregate root"); }; - let QueryExpr::Aggregate { child: child_b, .. } = roots[1].1.as_ref() else { + let Some(NonASAPOp::Aggregate { child: child_b, .. }) = roots[1].1.non_asap() else { panic!("expected an Aggregate root"); }; assert!(Rc::ptr_eq(child_a, child_b)); @@ -700,8 +707,8 @@ mod tests { // exact equality — unrelated to this module, but pins the contrast // with the test above. let scan = metric_scan(); - let a = (*quantile(0.99, AccuracyTarget::Epsilon(0.01), &scan)).clone(); - let b = (*quantile(0.99, AccuracyTarget::Epsilon(0.01), &scan)).clone(); + let a = quantile(0.99, AccuracyTarget::Epsilon(0.01), &scan); + let b = quantile(0.99, AccuracyTarget::Epsilon(0.01), &scan); let roots = share_common_sub_dags(vec![("a", a), ("b", b)]); assert!(Rc::ptr_eq(&roots[0].1, &roots[1].1)); @@ -717,11 +724,11 @@ mod tests { // `share_common_sub_dags`/`RollupStrategy` apply, which this // strategy must not bypass (module docs, point 5). let scan = metric_scan(); - let tight = global_quantile(0.99, AccuracyTarget::Epsilon(0.01), &scan); - let loose = global_quantile(0.99, AccuracyTarget::Epsilon(0.05), &scan); + let tight = ungrouped_quantile(0.99, AccuracyTarget::Epsilon(0.01), &scan); + let loose = ungrouped_quantile(0.99, AccuracyTarget::Epsilon(0.05), &scan); assert!( - !tight.output_schema().unwrap().has_unique_key(), + !tight.schema.clone().has_unique_key(), "fixture sanity: a globally-grouped aggregate has no provable unique key" ); @@ -741,7 +748,7 @@ mod tests { let loose = without_quantile(0.99, AccuracyTarget::Epsilon(0.05), vec![2], &scan); assert!( - !tight.output_schema().unwrap().has_unique_key(), + !tight.schema.clone().has_unique_key(), "fixture sanity: a without(...) aggregate has no provable unique key" ); @@ -831,7 +838,7 @@ mod tests { "global_selection must commit to some candidate for a single-consumer looser target" ); // With no recompute term at all (it never rebuilds `target`), this - // candidate strictly undercuts every SketchAlgorithmStrategy + // candidate strictly undercuts every ASAPStrategies // candidate (which each pay a recompute term on top of their own // maintenance term) under DefaultCostModel's numbers — the sane // direction: reading an already-necessary sibling should be able to diff --git a/crates/asap-aware-mapping/src/analytical_cost.rs b/crates/asap-aware-mapping/src/analytical_cost.rs index 3c19960a9..7ba28d0ed 100644 --- a/crates/asap-aware-mapping/src/analytical_cost.rs +++ b/crates/asap-aware-mapping/src/analytical_cost.rs @@ -14,7 +14,7 @@ use serde::{Deserialize, Serialize}; use crate::physical_operator_statistics::{ validate_comparison_scopes, ComparisonScope, EdgeStatistics, OperatorStatistics, - OperatorStatisticsProvider, PromqlEdgeStatistics, PromqlValueKind, SourceCoverage, + OperatorStatisticsProvider, PromqlEdgeStatistics, PromqlValueKind, ScanSelection, }; /// Version of the analytical formulas applied to evidenced physical plans. @@ -383,9 +383,9 @@ pub struct PhysicalDAGNode { pub operator: PhysicalOperator, pub children: Vec, /// Exact comparison-scope coverage consumed by a scan. Non-scan nodes - /// leave this empty. Reusing `SourceCoverage` prevents a physical plan + /// leave this empty. Reusing `ScanSelection` prevents a physical plan /// from naming a source independently of its snapshot and predicates. - pub source_coverage: Option, + pub scan_selection: Option, /// Maximum transient edge buffer, distinct from logical `output_bytes`. pub output_buffer_bytes: u64, /// State that remains live after this node finishes (zero for ordinary @@ -573,9 +573,10 @@ pub fn estimate_physical_dag_with_cache( let node_statistics = &resolved_statistics[id]; match node.operator { PhysicalOperator::Scan => { - let coverage = node.source_coverage.as_ref().ok_or_else(|| { - AnalyticalCostError::MissingScanSourceCoverage(node.id.clone()) - })?; + let coverage = node + .scan_selection + .as_ref() + .ok_or_else(|| AnalyticalCostError::MissingScanSelection(node.id.clone()))?; if !scope.sources.contains(coverage) { return Err(AnalyticalCostError::ScanOutsideComparisonScope( node.id.clone(), @@ -585,9 +586,9 @@ pub fn estimate_physical_dag_with_cache( consumed_sources.push(coverage); } } - _ if node.source_coverage.is_some() => { + _ if node.scan_selection.is_some() => { return Err(AnalyticalCostError::InvalidPhysicalDAG( - "only scan nodes may declare source coverage", + "only scan nodes may declare scan selection", )); } _ => {} @@ -2163,8 +2164,6 @@ pub enum AnalyticalCostError { UnsupportedDataArrival(DataArrival), #[error("ingestion rate must be finite and non-negative, got {0}")] InvalidIngestionRate(f64), - #[error("summary lifecycle, maintenance mode, and evaluation schedule are inconsistent")] - IncompatibleLifecycleGuarantee, #[error("bootstrap row and byte evidence must either both be zero or both be non-zero")] InconsistentBootstrapEvidence, #[error("required summary operation cost {0} must be finite and positive, got {1}")] @@ -2195,13 +2194,13 @@ pub enum AnalyticalCostError { UnsupportedQueryOperator, #[error("inconsistent operator statistics: {0}")] InconsistentOperatorStatistics(&'static str), - #[error("summary operation {0} has no lifecycle-aware cost formula")] + #[error("summary operation {0} has no cost formula")] UnsupportedSummaryOperation(&'static str), #[error("required comparison-scope field {0} is missing")] MissingComparisonScope(&'static str), - #[error("scan node {0} does not declare source coverage")] - MissingScanSourceCoverage(String), - #[error("scan node {0} reads source coverage outside the comparison scope")] + #[error("scan node {0} does not declare scan selection")] + MissingScanSelection(String), + #[error("scan node {0} reads scan selection outside the comparison scope")] ScanOutsideComparisonScope(String), #[error("raw and candidate comparison scopes differ in {0}")] ComparisonScopeMismatch(&'static str), @@ -2234,7 +2233,7 @@ mod tests { use crate::physical_operator_statistics::{ validate_comparison_scopes, BinaryEdgeStatistics, ComparisonScope, EdgeStatistics, OperatorStatistics, PartitionStatistics, PromqlBinaryEdgeStatistics, PromqlEdgeStatistics, - PromqlUnaryEdgeStatistics, PromqlValueKind, SourceCoverage, UnaryEdgeStatistics, + PromqlUnaryEdgeStatistics, PromqlValueKind, ScanSelection, UnaryEdgeStatistics, }; /// Analytical estimates reuse the shared dimensions while preserving exact @@ -2475,7 +2474,7 @@ mod tests { id: "scan".into(), operator: PhysicalOperator::Scan, children: vec![], - source_coverage: Some(comparison_scope().sources[0].clone()), + scan_selection: Some(comparison_scope().sources[0].clone()), output_buffer_bytes: 8, retained_bytes: 0, execution: ExecutionMultiplicity::PerEvaluation, @@ -2484,7 +2483,7 @@ mod tests { id: "filter".into(), operator: filter_operator(), children: vec!["scan".into()], - source_coverage: None, + scan_selection: None, output_buffer_bytes: 8, retained_bytes: 0, execution: ExecutionMultiplicity::PerEvaluation, @@ -2814,7 +2813,7 @@ mod tests { id: "scan".into(), operator: PhysicalOperator::Scan, children: vec![], - source_coverage: Some(coverage), + scan_selection: Some(coverage), output_buffer_bytes: 10, retained_bytes: 0, execution: ExecutionMultiplicity::PerEvaluation, @@ -2823,7 +2822,7 @@ mod tests { id: "left".into(), operator: filter_operator(), children: vec!["scan".into()], - source_coverage: None, + scan_selection: None, output_buffer_bytes: 4, retained_bytes: 0, execution: ExecutionMultiplicity::PerEvaluation, @@ -2832,7 +2831,7 @@ mod tests { id: "right".into(), operator: filter_operator(), children: vec!["scan".into()], - source_coverage: None, + scan_selection: None, output_buffer_bytes: 4, retained_bytes: 0, execution: ExecutionMultiplicity::PerEvaluation, @@ -2841,7 +2840,7 @@ mod tests { id: "root".into(), operator: PhysicalOperator::Concat, children: vec!["left".into(), "right".into()], - source_coverage: None, + scan_selection: None, output_buffer_bytes: 8, retained_bytes: 0, execution: ExecutionMultiplicity::PerEvaluation, @@ -2905,7 +2904,7 @@ mod tests { id: "scan".into(), operator: PhysicalOperator::Scan, children: vec![], - source_coverage: Some(coverage), + scan_selection: Some(coverage), output_buffer_bytes: 10, retained_bytes: 0, execution: ExecutionMultiplicity::Once, @@ -2914,7 +2913,7 @@ mod tests { id: "state".into(), operator: aggregate_operator(), children: vec!["scan".into()], - source_coverage: None, + scan_selection: None, output_buffer_bytes: 16, retained_bytes: 32, execution: ExecutionMultiplicity::Once, @@ -2926,7 +2925,7 @@ mod tests { offset: 0, }, children: vec!["state".into()], - source_coverage: None, + scan_selection: None, output_buffer_bytes: 16, retained_bytes: 0, execution: ExecutionMultiplicity::PerEvaluation, @@ -2969,7 +2968,7 @@ mod tests { } fn comparison_scope() -> ComparisonScope { - use asap_types::pre_asap::query_expr::Source; + use asap_types::ir::operator_properties::Source; use asap_types::workload::{ DurationMs, QueryRecurrence, QueryTimeScope, RepeatedDemand, RepetitionInterval, TimeSelection, TimestampMs, @@ -2987,7 +2986,7 @@ mod tests { lookback: Some(DurationMs(300_000)), as_of: Some(TimestampMs(1_000)), }, - sources: vec![SourceCoverage { + sources: vec![ScanSelection { source: Source::Table { table_ref: "metrics".into(), }, @@ -3008,9 +3007,7 @@ mod tests { #[test] fn comparison_rejects_different_snapshot_predicate_time_or_horizon() { - use std::rc::Rc; - - use asap_types::pre_asap::query_expr::{Predicate, QueryExpr}; + use asap_types::ir::{Predicate, ScalarExpr}; use asap_types::workload::{DurationMs, TimestampMs}; let raw = comparison_scope(); @@ -3026,7 +3023,7 @@ mod tests { candidate = raw.clone(); candidate.sources[0] .predicates - .push(Predicate(Rc::new(QueryExpr::promql_scalar(1.0)))); + .push(Predicate(ScalarExpr::literal_f64(1.0))); assert_eq!( validate_comparison_scopes(&raw, &candidate), Err(AnalyticalCostError::ComparisonScopeMismatch("sources")) @@ -3059,7 +3056,7 @@ mod tests { id: "scan".into(), operator: PhysicalOperator::Scan, children: vec![], - source_coverage: Some(coverage), + scan_selection: Some(coverage), output_buffer_bytes: 10, retained_bytes: 0, execution: ExecutionMultiplicity::PerEvaluation, @@ -3068,7 +3065,7 @@ mod tests { id: "filter".into(), operator: filter_operator(), children: vec!["scan".into()], - source_coverage: None, + scan_selection: None, output_buffer_bytes: 4, retained_bytes: 0, execution: ExecutionMultiplicity::PerEvaluation, @@ -3134,7 +3131,7 @@ mod tests { id: "scan".into(), operator: PhysicalOperator::Scan, children: vec![], - source_coverage: Some(coverage), + scan_selection: Some(coverage), output_buffer_bytes: 10, retained_bytes: 0, execution: ExecutionMultiplicity::PerEvaluation, @@ -3143,7 +3140,7 @@ mod tests { id: "filter".into(), operator: filter_operator(), children: vec!["scan".into()], - source_coverage: None, + scan_selection: None, output_buffer_bytes: 4, retained_bytes: 0, execution: ExecutionMultiplicity::PerEvaluation, @@ -3197,7 +3194,7 @@ mod tests { id: "scan".into(), operator: PhysicalOperator::Scan, children: vec![], - source_coverage: Some(coverage), + scan_selection: Some(coverage), output_buffer_bytes: 10, retained_bytes: 0, execution: ExecutionMultiplicity::PerEvaluation, @@ -3206,7 +3203,7 @@ mod tests { id: "filter".into(), operator: filter_operator(), children: vec!["scan".into()], - source_coverage: None, + scan_selection: None, output_buffer_bytes: 0, retained_bytes: 0, execution: ExecutionMultiplicity::PerEvaluation, @@ -3245,8 +3242,8 @@ mod tests { id: "scan".into(), operator: PhysicalOperator::Scan, children: vec![], - source_coverage: Some(SourceCoverage { - source: asap_types::pre_asap::query_expr::Source::Table { + scan_selection: Some(ScanSelection { + source: asap_types::ir::operator_properties::Source::Table { table_ref: "other_metrics".into(), }, source_snapshot_id: "catalog-version-42".into(), @@ -3283,7 +3280,7 @@ mod tests { id: "scan".into(), operator: PhysicalOperator::Scan, children: vec![], - source_coverage: None, + scan_selection: None, output_buffer_bytes: 10, retained_bytes: 0, execution: ExecutionMultiplicity::PerEvaluation, @@ -3302,9 +3299,7 @@ mod tests { assert_eq!( estimate_physical_dag(&nodes, "scan", &comparison_scope(), &provided), - Err(AnalyticalCostError::MissingScanSourceCoverage( - "scan".into() - )) + Err(AnalyticalCostError::MissingScanSelection("scan".into())) ); } @@ -3312,8 +3307,8 @@ mod tests { fn physical_dag_rejects_an_unconsumed_scope_source() { let mut scope = comparison_scope(); let coverage = scope.sources[0].clone(); - scope.sources.push(SourceCoverage { - source: asap_types::pre_asap::query_expr::Source::Table { + scope.sources.push(ScanSelection { + source: asap_types::ir::operator_properties::Source::Table { table_ref: "auxiliary".into(), }, source_snapshot_id: "catalog-version-42".into(), @@ -3324,7 +3319,7 @@ mod tests { id: "scan".into(), operator: PhysicalOperator::Scan, children: vec![], - source_coverage: Some(coverage), + scan_selection: Some(coverage), output_buffer_bytes: 10, retained_bytes: 0, execution: ExecutionMultiplicity::PerEvaluation, @@ -3357,7 +3352,7 @@ mod tests { id: "scan".into(), operator: PhysicalOperator::Scan, children: vec![], - source_coverage: Some(coverage), + scan_selection: Some(coverage), output_buffer_bytes: 10, retained_bytes: 0, execution: ExecutionMultiplicity::PerEvaluation, @@ -3366,7 +3361,7 @@ mod tests { id: "aggregate".into(), operator: aggregate_operator(), children: vec!["scan".into()], - source_coverage: None, + scan_selection: None, output_buffer_bytes: 16, retained_bytes: 32, execution: ExecutionMultiplicity::Once, @@ -3411,7 +3406,7 @@ mod tests { id: "scan".into(), operator: PhysicalOperator::Scan, children: vec![], - source_coverage: Some(coverage), + scan_selection: Some(coverage), output_buffer_bytes: 10, retained_bytes: 0, execution: ExecutionMultiplicity::PerEvaluation, @@ -3642,7 +3637,7 @@ mod tests { id: "scan".into(), operator: PhysicalOperator::Scan, children: vec![], - source_coverage: Some(comparison_scope().sources[0].clone()), + scan_selection: Some(comparison_scope().sources[0].clone()), output_buffer_bytes: 0, retained_bytes: 0, execution: ExecutionMultiplicity::PerEvaluation, diff --git a/crates/asap-aware-mapping/src/cost_model.rs b/crates/asap-aware-mapping/src/cost_model.rs index 0315e88f1..9589d1382 100644 --- a/crates/asap-aware-mapping/src/cost_model.rs +++ b/crates/asap-aware-mapping/src/cost_model.rs @@ -26,7 +26,7 @@ //! than overloading these ones across incompatible `Kind`/`Params` types. //! //! Every entry point that doesn't take an explicit `&dyn CostModel` -//! ([`SketchAlgorithmStrategy::default_cost_model`](crate::replacement::SketchAlgorithmStrategy::default_cost_model), +//! ([`ASAPStrategies::default_cost_model`](crate::replacement::ASAPStrategies::default_cost_model), //! [`search_workload`](crate::replacement::search_workload)) runs against //! [`DefaultCostModel`], so a deployment that never plugs in its own cost //! model keeps today's static-preference-order behavior exactly, byte for @@ -36,7 +36,7 @@ //! //! [`CseCandidate`]/[`ShareDecision`]/[`CostModel::cse_share_decision`] below //! decide whether a CSE-detected shared sub-DAG -//! ([`asap_types::pre_asap::cse::share_common_sub_dags`], issue #223 stages +//! ([`asap_types::ir::cse::share_common_sub_dags`], issue #223 stages //! 1-2, PR #235) is actually worth sharing, via a real Volcano/Cascades-style //! cost comparison rather than a fixed rule. See //! `docs/design_docs/cse-cost-model-decision.md` for the full design discussion (why @@ -48,15 +48,13 @@ use std::rc::Rc; +use crate::exact_composition::ExactOperation; +use asap_types::ir::{ASAPOp, Operator, OperatorNode}; use asap_types::post_asap::{ - ExactOperation, FieldDataType, GroupingStrategy, HydraParams, ResultGuarantee, SketchAlgorithm, - SketchParams, SketchStatistic, SummaryExpr, SummaryMaintenanceLifecycleGuarantee, SummaryNode, - SummaryWindowFramework, + FieldDataType, GroupingStrategy, HydraParams, SketchAlgorithm, SketchParams, SketchStatistic, }; use asap_types::pre_asap::agg_intent::AggIntent; use asap_types::pre_asap::expr_ir::ColumnRef; -use asap_types::pre_asap::query_expr::QueryExpr; -use asap_types::types::AccuracyTarget; use crate::exact_composition::{ExactComposition, OperationPlacement}; use crate::recurrence::{ @@ -66,9 +64,6 @@ use crate::recurrence::{ use crate::replacement::{ realize_child, Realization, Replacement, ReplacementProvenance, ReplacementSubDAG, TargetSubDAG, }; -use crate::summary_maintenance_lifecycle::{ - SummaryMaintenanceCapabilities, SummaryMaintenanceLifecycleCostInputs, -}; // ── Recurring-cost vocabulary for mixed exact/summary plans (issue #171) ── @@ -94,7 +89,7 @@ pub struct CostProvenance { /// operator on the update path must never be handed one. #[derive(Debug, Clone, Copy, PartialEq, Eq, Default)] pub struct ValueOperationCapabilities { - /// The runtime can apply an exact operator to summary readouts at + /// The runtime can apply an exact operator to summary evaluations at /// query evaluation time. pub query_time: bool, /// The runtime can apply an exact row transform on the update path, @@ -127,17 +122,17 @@ impl ValueOperationCapabilities { /// composes with. #[derive(Debug, Clone, Copy)] pub struct ExactCompositionCostRequest<'a> { - /// The pre-ASAP target the composed candidate replaces. - pub target: &'a QueryExpr, + /// The target the composed candidate replaces. + pub target: &'a OperatorNode, /// The composition itself — placement, operator, child target. pub composition: &'a ExactComposition, /// For [`OperationPlacement::Read`]: the child target's *selected* - /// summary readout candidate the exact operator consumes. For + /// summary evaluation candidate the exact operator consumes. For /// [`OperationPlacement::Maintenance`]: the maintained summary *above* the /// transform that consumes its output (the `SummaryAgg` this transform /// feeds). Either way, the summary whose maintenance/read cost the /// formula charges. - pub summary: &'a SummaryNode, + pub summary: &'a OperatorNode, /// How many times this site actually runs once ancestors' own choices /// are accounted for (see `CandidateLogicalASAPDAGs::global_selection`). pub effective_consumer_count: usize, @@ -147,11 +142,11 @@ pub struct ExactCompositionCostRequest<'a> { /// optional: **an unknown stays `None` — never a zero** — so a formula /// with a missing input yields no rate at all rather than a spuriously /// cheap one, and global selection then keeps the conservative -/// `KeepPreAsap` behavior. A deployment model that wants defaults supplies +/// keep-as-is behavior. A deployment model that wants defaults supplies /// them explicitly by overriding [`CostModel::exact_composition_cost_inputs`]. #[derive(Debug, Clone, PartialEq)] pub struct ExactCompositionCostInputs { - /// Exact operator cost per row it processes — per readout row for a + /// Exact operator cost per row it processes — per evaluation row for a /// read-time operation, per input row for an maintenance-time operation. pub exact_cost_per_row: Option, /// Rows the exact operator consumes per evaluation (read-time operation) or @@ -161,14 +156,14 @@ pub struct ExactCompositionCostInputs { pub expected_output_rows: Option, /// Cost of one update to the composed-with summary's maintained state. pub summary_maintenance_cost_per_update: Option, - /// Cost of one readout of that summary at evaluation time. + /// Cost of one evaluation of that summary at evaluation time. pub summary_read_cost: Option, /// Update (ingest) events per second reaching this site. pub update_rate: Option, /// Evaluations per second across every consumer of this site. pub evaluation_rate: Option, /// Cost of one full raw recompute of the target from pre-ASAP data — - /// the `KeepPreAsap` baseline's per-evaluation cost. + /// the kept-query baseline's per-evaluation cost. pub raw_recompute_cost: Option, /// Recurring formulas require `CostUnitsPerSecond`; totals yield no rate. pub unit: CostUnit, @@ -271,16 +266,16 @@ fn finite_rate(units_per_second: f64) -> Option { /// [`CandidateLogicalASAPDAGs::cost_sorted`](crate::replacement::CandidateLogicalASAPDAGs::cost_sorted) /// (via [`crate::replacement`]'s own `cse_preference`) the first time it /// needs a representative bound node for a sub-DAG that -/// [`asap_types::pre_asap::cse::share_common_sub_dags`] already collapsed +/// [`asap_types::ir::cse::share_common_sub_dags`] already collapsed /// onto one `Rc` for two or more workload roots. See /// `docs/design_docs/cse-cost-model-decision.md`. pub struct CseCandidate<'a> { - /// The shared pre-ASAP sub-DAG itself. - pub sub_dag: &'a QueryExpr, - /// The `SummaryNode` this sub-DAG bound to — gives the cost model the + /// The shared sub-DAG itself. + pub sub_dag: &'a Rc, + /// The node this sub-DAG bound to — gives the cost model the /// concrete `FieldDataType`/`(kind, params)` actually at stake, not - /// just the pre-ASAP shape. - pub bound_summary: &'a SummaryNode, + /// just the logical shape. + pub bound_summary: &'a OperatorNode, /// How many workload roots reference this exact shared sub-DAG, counted /// once up front over the whole workload (always >= 2 — a candidate is /// only ever constructed for an actually-shared sub-DAG). @@ -298,38 +293,6 @@ pub struct CseCandidate<'a> { #[derive(Debug, Clone, Copy, PartialEq, PartialOrd)] pub struct Cost(pub f64); -/// One physical summary state and the lifecycle selected for that exact DAG -/// node. Node identity is preserved so whole-DAG models can bind per-state -/// evidence without relying on traversal order. -pub struct CostedSummaryDeployment<'a> { - pub summary: &'a SummaryNode, - pub guarantee: &'a SummaryMaintenanceLifecycleGuarantee, - pub selected_cost: Cost, -} - -/// Complete candidate estimate returned to lifecycle and global plan search. -/// -/// A deployment-aware model may compare abstract summary-window primitives -/// using evidence supplied by downstream implementations. `window_frameworks` -/// is planner IR: it records the selected semantic realization contract. -/// `physical_plan_id` is separate provider-owned provenance for the concrete -/// implementation whose evidence won; it is not interpreted as planner IR. -#[derive(Debug, Clone, PartialEq)] -pub struct CompleteSummaryCandidateEstimate { - pub cost: Cost, - /// Stable provider identity of the complete implementation whose evidence - /// produced this estimate. - pub physical_plan_id: Option, - /// Window choice for each entry of the `deployments` slice passed to the - /// complete-cost hook. `None` explicitly means that deployment does not - /// use a summary-window framework. - pub window_frameworks: Vec>, - /// End-to-end guarantee supplied by the selected window realization. - /// `None` means that the complete model supplied no window-specific - /// guarantee; `Some` may be exact or approximate. - pub window_accuracy_guarantee: Option, -} - impl Cost { /// The cost of an operation that costs nothing at all. pub const ZERO: Cost = Cost(0.0); @@ -359,7 +322,7 @@ impl std::ops::Mul for Cost { /// [`CseCandidate`]. #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum ShareDecision { - /// Reuse one bound `SummaryNode` across every consumer. + /// Reuse one bound node across every consumer. Share, /// Bind each occurrence independently — the shared-maintenance cost /// isn't worth it for this candidate. @@ -367,23 +330,23 @@ pub enum ShareDecision { } /// Default [`CostModel::cse_recompute_cost`]: a structural-size proxy — the -/// number of *unique* nodes in `sub_dag`'s DAG -/// ([`asap_types::pre_asap::cse::dag_node_count`], the same module this +/// number of *unique* nodes in `sub-DAG`'s DAG +/// ([`asap_types::ir::cse::dag_node_count`], the same module this /// candidate's sharing was detected in). Deliberately **not** a raw -/// `serde_json` serialization length: after CSE, `sub_dag` generally has -/// internal sharing (a `CseCandidate` only exists because something got +/// `serde_json` serialization length: after CSE, `sub-DAG` is generally a +/// DAG, not a tree (a `CseCandidate` only exists because something got /// shared), and a naive full serialization re-serializes — over-counts — -/// any descendant `sub_dag` already shares internally, once per parent +/// any descendant `sub-DAG` already shares internally, once per parent /// that references it, instead of once for the whole DAG. `dag_node_count` /// dedupes by `Rc` pointer identity, so it charges each unique node's /// contribution exactly once regardless of how many places within -/// `sub_dag` reference it. Cheap to compute (one pass, no serialization), +/// `sub-DAG` reference it. Cheap to compute (one pass, no serialization), /// and still scales with real structural complexity — a genuinely tiny /// leaf costs little to recompute, a deep multi-join sub-DAG costs a lot. /// A deployment with real per-row/per-update cost knowledge should /// override [`CostModel::cse_recompute_cost`] instead of relying on this. -pub fn default_cse_recompute_cost(sub_dag: &QueryExpr) -> Cost { - Cost(asap_types::pre_asap::cse::dag_node_count(sub_dag) as f64) +pub fn default_cse_recompute_cost(sub_dag: &Rc) -> Cost { + Cost(asap_types::ir::cse::dag_node_count(sub_dag) as f64) } /// Default [`CostModel::cse_shared_maintenance_cost`]: a small @@ -506,7 +469,7 @@ pub trait CostModel { /// Estimated number of distinct subpopulations produced by `target`'s /// grouping keys. `None` means the deployment has no cardinality estimate; /// grouping alternatives remain legal but keep their discovery order. - fn estimated_subpopulation_count(&self, _target: &QueryExpr) -> Option { + fn estimated_subpopulation_count(&self, _target: &OperatorNode) -> Option { None } @@ -518,7 +481,7 @@ pub trait CostModel { candidate: &ReplacementSubDAG, target: &TargetSubDAG<'_>, ) -> Option { - let Replacement::Summary(node) = &candidate.replacement else { + let Replacement::SubDAG(node) = &candidate.replacement else { return None; }; let (kind, grouping) = sketch_state(node)?; @@ -545,17 +508,17 @@ pub trait CostModel { Realization::PassThrough } - /// Build the `SummaryEstimate` readout for an `Extension` intent this + /// Build the `SummaryEstimate` evaluation for an `Extension` intent this /// same `CostModel` realized as `Realization::Sketch` via /// [`realize_extension`](Self::realize_extension). Only ever called /// when `realize_extension` returned `Sketch` for the same - /// `(ext_kind, payload)` — `replacement::readout` has no other way to build a + /// `(ext_kind, payload)` — `replacement::evaluation` has no other way to build a /// `SketchStatistic` for a shape core doesn't know. A deployment that /// overrides `realize_extension` to return `Sketch` for some /// `ext_kind` MUST also override this for that same `ext_kind`, or /// this default panics loudly (rather than silently misinterpreting /// `payload`) the first time that intent is actually read out. - fn readout_extension( + fn evaluation_extension( &self, ext_kind: &str, _payload: &serde_json::Value, @@ -563,11 +526,11 @@ pub trait CostModel { ) -> SketchStatistic { unimplemented!( "CostModel::realize_extension returned Sketch for ext_kind={ext_kind:?} but \ - readout_extension wasn't overridden to match" + evaluation_extension wasn't overridden to match" ) } - /// Estimate the one-time cost of recomputing `candidate.sub_dag` + /// Estimate the one-time cost of recomputing `candidate.sub-DAG` /// independently at a single use site. Default: /// [`default_cse_recompute_cost`] (a structural-size proxy). See /// `docs/design_docs/cse-cost-model-decision.md`. @@ -581,7 +544,7 @@ pub trait CostModel { /// weight table), applied to whichever field of /// `candidate.bound_summary`'s output schema actually carries summary /// state (falls back to the cheapest, `Plain`, weight if none does — - /// e.g. `bound_summary` is a passthrough `KeepPreAsap` node with nothing + /// e.g. `bound_summary` is a kept non-ASAP sub-DAG with nothing /// summary-shaped to maintain). See `docs/design_docs/cse-cost-model-decision.md`. fn cse_shared_maintenance_cost(&self, candidate: &CseCandidate) -> Cost { let family = candidate @@ -598,7 +561,7 @@ pub trait CostModel { default_cse_shared_maintenance_cost(&family) } - /// Decide whether to reuse one shared `SummaryNode` across every + /// Decide whether to reuse one shared node across every /// consumer of `candidate`, or bind each occurrence independently — a /// Volcano/Cascades-style cost comparison (issue #237, #223 stage 4; see /// `docs/design_docs/cse-cost-model-decision.md`): share iff the estimated cost of @@ -666,7 +629,7 @@ pub trait CostModel { Cost(1.0) } - /// Cost of recomputing `candidate.sub_dag` once, from the pre-ASAP/raw + /// Cost of recomputing `candidate.sub-DAG` once, from the pre-ASAP/raw /// path. Units: cost units per recomputation — the `raw_recompute_cost` /// term of `recompute_cost_rate`. Default: delegates to /// [`cse_recompute_cost`](Self::cse_recompute_cost) (the same @@ -738,21 +701,21 @@ pub trait CostModel { /// on [`CandidateLogicalASAPDAGs::cost_sorted`](crate::replacement::CandidateLogicalASAPDAGs::cost_sorted)), /// not just order candidates against each other — that ordering job /// already belongs to [`rank_candidates`](Self::rank_candidates) (for a - /// [`SketchAlgorithmStrategy`](crate::replacement::SketchAlgorithmStrategy) + /// [`ASAPStrategies`](crate::replacement::ASAPStrategies) /// group) and [`cse_share_decision`](Self::cse_share_decision) (for a /// [`SharedSubDAGStrategy`](crate::replacement::SharedSubDAGStrategy) /// group). /// /// One method covers both candidate shapes this crate ships: - /// `candidate.replacement`'s [`Replacement::Summary`] arm (a - /// `SketchAlgorithmStrategy` candidate — the bound `SummaryNode` is right - /// there, nothing to reconstruct) and its [`Replacement::Rewrite`] arm + /// `candidate.replacement`'s [`Replacement::SubDAG`] from a summary + /// realization (a `ASAPStrategies` candidate — the bound node is + /// right there, nothing to reconstruct) and the same arm from a rewrite /// (a `SharedSubDAGStrategy` share-vs-recompute candidate — no bound - /// `SummaryNode` of its own, since sharing is a decision about a target + /// summary of its own, since sharing is a decision about a target /// already bound some other way; a representative binding is recovered /// from `target` itself). `target` is threaded through explicitly /// (rather than only ever the target embedded in `candidate` — there - /// isn't one for a `Rewrite`) so both arms have the `consumer_count` + /// isn't one for a rewrite) so both arms have the `consumer_count` /// context a cost estimate needs to be meaningful. /// /// Default: **not a real cost model** — always returns `f64::NAN`. @@ -770,116 +733,10 @@ pub trait CostModel { f64::NAN } - /// Primitive build, update, read, retention, and retirement costs used to - /// compare physical summary-state lifecycles. Unknown values stay - /// unknown, preventing long-lived deployments from winning through - /// optimistic zeroes. - fn summary_maintenance_lifecycle_cost_inputs( - &self, - _summary: &SummaryNode, - ) -> SummaryMaintenanceLifecycleCostInputs { - SummaryMaintenanceLifecycleCostInputs::default() - } - - /// Horizon-aware form used by lifecycle planning. Models whose retention - /// objective is capacity rather than byte-seconds can normalize their - /// rate so the horizon integral equals one peak-capacity charge. - fn summary_maintenance_lifecycle_cost_inputs_for_horizon( - &self, - summary: &SummaryNode, - _horizon: Option, - ) -> SummaryMaintenanceLifecycleCostInputs { - self.summary_maintenance_lifecycle_cost_inputs(summary) - } - - /// Physical update/merge/delete support for one concrete summary. The - /// conservative default advertises no long-lived maintenance capability. - fn summary_maintenance_capabilities( - &self, - _summary: &SummaryNode, - ) -> SummaryMaintenanceCapabilities { - SummaryMaintenanceCapabilities::default() - } - - /// Replace the sum of selected per-state lifecycle costs with a complete - /// root-DAG cost. The default preserves legacy models. Evidence-strict - /// models return `None` when any root operation is unavailable; callers - /// must not then reuse the partial per-state sum. - fn complete_summary_candidate_cost( - &self, - _root: &SummaryNode, - _target: Option<&QueryExpr>, - deployments: &[CostedSummaryDeployment<'_>], - _horizon: Option, - _expected_reads: Option, - _required_accuracy: &[AccuracyTarget], - ) -> Option { - Some(Cost( - deployments - .iter() - .map(|deployment| deployment.selected_cost.0) - .sum(), - )) - } - - /// Complete cost together with selected implementation provenance and - /// planner-visible window primitives. The default preserves cost models - /// that do not perform either decision. - fn complete_summary_candidate_estimate( - &self, - root: &SummaryNode, - target: Option<&QueryExpr>, - deployments: &[CostedSummaryDeployment<'_>], - horizon: Option, - expected_reads: Option, - required_accuracy: &[AccuracyTarget], - ) -> Option { - self.complete_summary_candidate_cost( - root, - target, - deployments, - horizon, - expected_reads, - required_accuracy, - ) - .map(|cost| CompleteSummaryCandidateEstimate { - cost, - physical_plan_id: None, - window_frameworks: vec![None; deployments.len()], - window_accuracy_guarantee: None, - }) - } - - /// Whether the complete-candidate hook is authoritative for lifecycle - /// costs. When true, lifecycle alternatives rejected only because their - /// legacy per-state cost is missing remain eligible for complete-DAG - /// evaluation. Semantic and runtime-capability rejections still apply. - fn complete_summary_candidate_estimate_covers_lifecycle_costs(&self) -> bool { - false - } - - /// Cost of evaluating `target` directly from its logical/raw inputs once. - /// When known, lifecycle-aware materialization compares this fallback with - /// the aggregate cost of the selected summary deployments. - fn raw_query_recompute_cost(&self, _target: &QueryExpr) -> Option { - None - } - - /// Complete raw cost over the comparison context. The default preserves - /// per-read models; context-aware models override this when raw input - /// cardinality changes between evaluations. - fn raw_query_recompute_total_cost( - &self, - target: &QueryExpr, - expected_reads: f64, - ) -> Option { - self.raw_query_recompute_cost(target) - .map(|per_read| Cost(per_read.0 * expected_reads)) - } /// Physical feasibility evidence for a complete summary candidate. /// `None` defers admission to physical/deployment compilation; `Some(false)` /// excludes the candidate without changing its computation or parameters. - fn summary_support_evidence(&self, _summary: &SummaryNode) -> Option { + fn summary_support_evidence(&self, _summary: &OperatorNode) -> Option { None } @@ -932,7 +789,7 @@ pub trait CostModel { /// /// Default: every input unknown ([`ExactCompositionCostInputs::unknown`]) /// — unknown is never zero, and with no rate derivable - /// `CandidateLogicalASAPDAGs::global_selection` keeps the conservative `KeepPreAsap` + /// `CandidateLogicalASAPDAGs::global_selection` keeps the conservative keep-as-is /// behavior for the site. A deployment that wants defaults must supply /// them here explicitly. fn exact_composition_cost_inputs( @@ -948,14 +805,16 @@ pub trait CostModel { } fn sketch_state( - node: &SummaryNode, + node: &OperatorNode, ) -> Option<(&asap_types::post_asap::SketchKind, &GroupingStrategy)> { - match &node.expr { - SummaryExpr::SummaryEstimate { summary_input, .. } => sketch_state(summary_input), - SummaryExpr::SummaryAgg { + match &node.operator { + Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) => { + sketch_state(summary_input) + } + Operator::ASAP(ASAPOp::SummaryAgg { family: FieldDataType::Sketch(kind, grouping), .. - } => Some((kind, grouping)), + }) => Some((kind, grouping)), _ => None, } } @@ -1027,15 +886,17 @@ impl CostModel for DefaultCostModel { /// `cse_share_decision`'s default body already composes — rather than a /// second formula: /// - /// - [`Replacement::Summary`]: `cse_recompute_cost` (the one-time + /// - A [`ReplacementProvenance::SummaryRealization`] candidate (a + /// `ASAPStrategies` binding): `cse_recompute_cost` (the one-time /// structural cost of building `target` at all) plus /// `cse_shared_maintenance_cost` of the candidate's own bound family /// (a pricier family — a sketch over an exact accumulator, say — /// costs more here, consistent with the per-family weighting /// [`default_cse_shared_maintenance_cost`] already orders candidates /// by). - /// - [`Replacement::Rewrite`]: recovers one representative bound - /// `SummaryNode` for `target` via `realize_child` (the same + /// - Any other [`Replacement::SubDAG`] (a logical rewrite or a CSE + /// share/recompute candidate): recovers one + /// representative bound node for `target` via `realize_child` (the same /// rank-and-take-first helper `replacement::realize_child` reuses for the /// identical need), then charges /// `cse_shared_maintenance_cost` for the candidate that shares @@ -1060,7 +921,9 @@ impl CostModel for DefaultCostModel { fn estimate_cost(&self, candidate: &ReplacementSubDAG, target: &TargetSubDAG<'_>) -> f64 { let consumer_count = target.consumer_count.max(1); match &candidate.replacement { - Replacement::Summary(node) => { + Replacement::SubDAG(node) + if candidate.provenance == ReplacementProvenance::SummaryRealization => + { let cse = CseCandidate { sub_dag: target.root, bound_summary: node, @@ -1068,7 +931,7 @@ impl CostModel for DefaultCostModel { }; (self.cse_recompute_cost(&cse) + self.cse_shared_maintenance_cost(&cse)).0 } - Replacement::Rewrite(rc) + Replacement::SubDAG(rc) if candidate.provenance == ReplacementProvenance::AccuracyReconciliation => { let Ok(sibling_bound) = realize_child(rc, self) else { @@ -1087,7 +950,7 @@ impl CostModel for DefaultCostModel { }; self.cse_shared_maintenance_cost(&cse).0 } - Replacement::Rewrite(rc) => { + Replacement::SubDAG(rc) => { let Ok(bound) = realize_child(target.root, self) else { return f64::NAN; }; @@ -1320,11 +1183,11 @@ mod tests { assert_eq!( DefaultCostModel.value_operation_support_evidence( &ExactOperation::Aggregate { - reduction: asap_types::pre_asap::query_expr::Reduction::by(vec![]), + reduction: asap_types::ir::operator_properties::Reduction::by(vec![]), measures: vec![AggIntent::Max { col: None }], output_names: vec![], - having: None, filters: vec![], + having: None, }, OperationPlacement::Read, ), @@ -1346,14 +1209,15 @@ mod tests { // ── CSE sharing (issue #237, #223 stage 4) ────────────────────────── + use asap_types::ir::operator_properties::Source; + use asap_types::ir::{NonASAPOp, Predicate, ScalarExpr}; use asap_types::post_asap::{ - ExactKind, ExactParams, Field, GroupingStrategy, Schema, SketchKind, SummaryExpr, + ExactKind, ExactParams, Field, GroupingStrategy, Schema, SketchKind, }; - use asap_types::pre_asap::query_expr::Source; use asap_types::pre_asap::schema::DataType; - fn scan() -> QueryExpr { - QueryExpr::Scan { + fn scan() -> Rc { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Scan { source: Source::TimeSeries { metric: "m".into() }, predicates: vec![], schema: Schema::with_time_index( @@ -1364,37 +1228,39 @@ mod tests { 0, vec![], ), - } - } - - fn summary_node(family: FieldDataType) -> SummaryNode { - SummaryNode { - expr: SummaryExpr::SummaryAgg { - child: std::rc::Rc::new(SummaryNode { - expr: SummaryExpr::KeepPreAsap(Rc::new(scan())), - schema: Schema::lifted(vec![], None), - guarantee: None, + })) + .unwrap() + } + + /// A `SummaryAgg` directly over the kept `scan()` sub-DAG. + fn summary_node(family: FieldDataType) -> Rc { + std::rc::Rc::new( + OperatorNode::with_schema( + asap_types::ir::Operator::ASAP(ASAPOp::SummaryAgg { + child: scan(), + family: family.clone(), + input: asap_types::post_asap::SummaryUpdate::column( + asap_types::pre_asap::expr_ir::ColumnRef::Named("value".into()), + ), + reduction: asap_types::ir::operator_properties::Reduction::by(vec![]), + grouping: GroupingStrategy::default(), + filter: None, }), - family: family.clone(), - input: asap_types::post_asap::SummaryUpdate::column( - asap_types::pre_asap::expr_ir::ColumnRef::Named("value".into()), - ), - reduction: asap_types::pre_asap::query_expr::Reduction::by(vec![]), - grouping: GroupingStrategy::default(), - filter: None, - }, - schema: Schema::lifted(vec![Field::new("state", family, false)], None), - guarantee: None, - } + Schema::lifted(vec![Field::new("state", family, false)], None), + ) + .with_guarantee(None), + ) } #[test] fn default_recompute_cost_is_positive_and_grows_with_structural_size() { let leaf = scan(); - let nested = QueryExpr::Dedup { - cols: vec![0], - child: std::rc::Rc::new(leaf.clone()), - }; + let nested = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Dedup { + cols: vec![0], + child: Rc::clone(&leaf), + })) + .unwrap(); assert!(default_cse_recompute_cost(&leaf) > Cost::ZERO); assert!(default_cse_recompute_cost(&nested) > default_cse_recompute_cost(&leaf)); } @@ -1407,27 +1273,27 @@ mod tests { /// identity-blind recursive walk) would count it. #[test] fn default_recompute_cost_does_not_double_count_an_internally_shared_descendant() { + use asap_types::ir::operator_properties::JoinKind; use asap_types::pre_asap::expr_ir::ScalarValue; - use asap_types::pre_asap::query_expr::{JoinKind, Predicate}; - let true_pred = || { - Predicate(std::rc::Rc::new(QueryExpr::Literal(ScalarValue::Boolean( - true, - )))) - }; - let shared_leaf = std::rc::Rc::new(scan()); - let no_sharing = QueryExpr::Join { - kind: JoinKind::Inner, - pred: true_pred(), - left: std::rc::Rc::new(scan()), - right: std::rc::Rc::new(scan()), - }; - let with_sharing = QueryExpr::Join { - kind: JoinKind::Inner, - pred: true_pred(), - left: std::rc::Rc::clone(&shared_leaf), - right: std::rc::Rc::clone(&shared_leaf), - }; + let true_pred = || Predicate(ScalarExpr::Literal(ScalarValue::Boolean(true))); + let shared_leaf = scan(); + let no_sharing = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Join { + kind: JoinKind::Inner, + pred: true_pred(), + left: scan(), + right: scan(), + })) + .unwrap(); + let with_sharing = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Join { + kind: JoinKind::Inner, + pred: true_pred(), + left: Rc::clone(&shared_leaf), + right: Rc::clone(&shared_leaf), + })) + .unwrap(); assert_eq!( default_cse_recompute_cost(&no_sharing), Cost(3.0), @@ -1555,20 +1421,20 @@ mod tests { } } - let root = Rc::new(scan()); + let root = scan(); let target = TargetSubDAG::new(&root); let candidate = ReplacementSubDAG { strategy: "TestStrategy", - replacement: Replacement::Summary(Rc::new(summary_node(FieldDataType::Plain( + replacement: Replacement::SubDAG(summary_node(FieldDataType::Plain( asap_types::pre_asap::DataType::Float64, - )))), + ))), provenance: crate::replacement::ReplacementProvenance::SummaryRealization, rationale: "whatever".into(), }; assert!(RankOnly.estimate_cost(&candidate, &target).is_nan()); } - /// `DefaultCostModel::estimate_cost` for a [`Replacement::Summary`] + /// `DefaultCostModel::estimate_cost` for a summary-rooted [`Replacement::SubDAG`] /// candidate reuses [`default_cse_shared_maintenance_cost`]'s own /// per-family ordering: a candidate bound to a cheap-to-maintain family /// (an exact accumulator) must cost less than one bound to an @@ -1578,25 +1444,26 @@ mod tests { /// above. #[test] fn estimate_cost_for_summary_orders_candidates_by_family_cheapest_to_priciest() { - let root = Rc::new(scan()); + let root = scan(); let target = TargetSubDAG::new(&root); let cheap = ReplacementSubDAG { strategy: "TestStrategy", - replacement: Replacement::Summary(Rc::new(summary_node( - FieldDataType::ExactAggregate(ExactKind::Sum, ExactParams::Sum), + replacement: Replacement::SubDAG(summary_node(FieldDataType::ExactAggregate( + ExactKind::Sum, + ExactParams::Sum, ))), provenance: crate::replacement::ReplacementProvenance::SummaryRealization, rationale: "exact accumulator".into(), }; let pricey = ReplacementSubDAG { strategy: "TestStrategy", - replacement: Replacement::Summary(Rc::new(summary_node(FieldDataType::StatModel( + replacement: Replacement::SubDAG(summary_node(FieldDataType::StatModel( asap_types::post_asap::StatModelKind::Parametric, asap_types::post_asap::StatModelParams::Parametric { family: "gaussian_mixture".into(), }, - )))), + ))), provenance: crate::replacement::ReplacementProvenance::SummaryRealization, rationale: "fitted statistical model".into(), }; @@ -1614,7 +1481,7 @@ mod tests { ); } - /// `DefaultCostModel::estimate_cost` for a [`Replacement::Rewrite`] pair + /// `DefaultCostModel::estimate_cost` for a relational [`Replacement::SubDAG`] pair /// (the `SharedSubDAGStrategy` share-vs-recompute shape) agrees with /// what `cse_share_decision` would already pick for the same target: with /// many consumers of a cheap-to-recompute leaf, the "share" candidate @@ -1625,18 +1492,18 @@ mod tests { /// directly. #[test] fn estimate_cost_for_rewrite_prefers_sharing_when_recompute_dominates_maintenance() { - let target_root = Rc::new(scan()); + let target_root = scan(); let target = TargetSubDAG::with_consumer_count(&target_root, 20); let share = ReplacementSubDAG { strategy: "TestStrategy", - replacement: Replacement::Rewrite(Rc::clone(&target_root)), + replacement: Replacement::SubDAG(Rc::clone(&target_root)), provenance: crate::replacement::ReplacementProvenance::CseShare, rationale: "build once and share".into(), }; let recompute = ReplacementSubDAG { strategy: "TestStrategy", - replacement: Replacement::Rewrite(Rc::new((*target_root).clone())), + replacement: Replacement::SubDAG(Rc::new((*target_root).clone())), provenance: crate::replacement::ReplacementProvenance::CseRecompute, rationale: "build independently".into(), }; diff --git a/crates/asap-aware-mapping/src/empirical_comparison.rs b/crates/asap-aware-mapping/src/empirical_comparison.rs index ecd2a6cd4..17e3e9a82 100644 --- a/crates/asap-aware-mapping/src/empirical_comparison.rs +++ b/crates/asap-aware-mapping/src/empirical_comparison.rs @@ -41,7 +41,7 @@ pub struct OfflineExactMeasurement { } /// The companion format binds otherwise query-agnostic sketch primitives to -/// their measured readout and exact reference. Bindings describe state after +/// their measured evaluation and exact reference. Bindings describe state after /// ingestion, without merges or intervening updates during the read sequence. #[derive(Debug, Clone, Serialize, Deserialize)] #[serde(deny_unknown_fields)] @@ -247,7 +247,9 @@ pub fn recommend_offline( || error.query.get("value_type").and_then(|v| v.as_str()) != Some(request.query.value_type.as_str()) { - return Err("offline error observation has incompatible readout semantics".into()); + return Err( + "offline error observation has incompatible evaluation semantics".into(), + ); } if error.metric != request.accuracy.metric || error.trials < request.accuracy.minimum_trials @@ -802,14 +804,14 @@ mod tests { } assert!(recommend_offline(&evidence, &request).is_err(), "{case}"); } - for case in ["metric", "trials", "binding", "readout"] { + for case in ["metric", "trials", "binding", "evaluation"] { let mut evidence = evidence.clone(); let mut request = request.clone(); match case { "metric" => request.accuracy.metric = "rank_error".into(), "trials" => request.accuracy.minimum_trials = 100, "binding" => evidence.query_bindings.clear(), - "readout" => { + "evaluation" => { for row in &mut evidence.sketch_evidence.records { row.error.as_mut().unwrap().query["kind"] = serde_json::json!("total_count"); diff --git a/crates/asap-aware-mapping/src/empirical_cost.rs b/crates/asap-aware-mapping/src/empirical_cost.rs index b6d4f9a08..eb9904f77 100644 --- a/crates/asap-aware-mapping/src/empirical_cost.rs +++ b/crates/asap-aware-mapping/src/empirical_cost.rs @@ -2,17 +2,14 @@ //! configuration and environment; they are neither runtime feedback nor proofs //! of an accuracy guarantee. CPU quantities are nanoseconds, never CPU operations. -use asap_types::post_asap::{ - FieldDataType, GroupingStrategy, SketchAlgorithm, SketchParams, SummaryExpr, SummaryNode, -}; +use asap_types::post_asap::{SketchAlgorithm, SketchParams}; use asap_types::pre_asap::AggIntent; use serde::{Deserialize, Serialize}; -use crate::cost_model::{Cost, CostModel, DefaultCostModel}; +use crate::cost_model::{CostModel, DefaultCostModel}; use crate::replacement::{ accuracy_budget, accuracy_target, default_size_params, ReplacementSubDAG, TargetSubDAG, }; -use crate::summary_maintenance_lifecycle::SummaryMaintenanceLifecycleCostInputs; pub const EVIDENCE_SCHEMA_VERSION: u32 = 1; pub const EVIDENCE_MODEL_VERSION: &str = "empirical-update-cpu-v1"; @@ -208,40 +205,6 @@ impl EmpiricalEvidenceProvider { costs.sort_by(|a, b| a.1.total_cmp(&b.1)); costs.into_iter().map(|(algorithm, _)| algorithm).collect() } - - /// Costs for one independently instantiated sketch state, in CPU ns. - /// Unknown retention/retirement remain unavailable; CPU time must not be - /// mixed with an existing deployment's unitless or CPU-operation costs. - pub fn lifecycle_cost_inputs( - &self, - summary: &SummaryNode, - ) -> SummaryMaintenanceLifecycleCostInputs { - let SummaryExpr::SummaryAgg { - family: FieldDataType::Sketch(kind, GroupingStrategy::PerSubpopulationInstance), - grouping: GroupingStrategy::PerSubpopulationInstance, - .. - } = &summary.expr - else { - return SummaryMaintenanceLifecycleCostInputs::default(); - }; - let Ok(row) = self.lookup(kind.algorithm(), kind.params()) else { - return SummaryMaintenanceLifecycleCostInputs::default(); - }; - SummaryMaintenanceLifecycleCostInputs { - build_cost: snapshot_build_cpu(row).map(Cost), - maintenance_cost_per_update: row - .metrics - .resources - .cpu - .update_cpu_ns - .as_ref() - .map(|m| Cost(m.value)), - // A point-frequency benchmark read does not price a total-count - // or quantile read. There is no query request in this hook. - summary_read_cost: None, - ..Default::default() - } - } } /// Standalone adapter for the existing planner boundary. Empirical data changes @@ -277,13 +240,6 @@ impl CostModel for EmpiricalCostModel { fn estimate_cost(&self, candidate: &ReplacementSubDAG, target: &TargetSubDAG<'_>) -> f64 { DefaultCostModel.estimate_cost(candidate, target) } - - fn summary_maintenance_lifecycle_cost_inputs( - &self, - summary: &SummaryNode, - ) -> SummaryMaintenanceLifecycleCostInputs { - self.provider.lifecycle_cost_inputs(summary) - } } impl EvidenceArtifact { @@ -361,14 +317,6 @@ fn nonnegative(value: f64) -> bool { value.is_finite() && value >= 0.0 } -fn snapshot_build_cpu(row: &OfflineMeasurement) -> Option { - let cpu = row.metrics.resources.cpu.build_cpu_ns.as_ref()?.value - + row.metrics.resources.cpu.update_cpu_ns.as_ref()?.value - * row.distribution.sample_count as f64 - + snapshot_prepare_cpu(row)?; - nonnegative(cpu).then_some(cpu) -} - /// The existing fixed-snapshot CMS/CountSketch contract needs no separate /// preparation. Other families must measure that phase, including an explicit /// zero when no preparation is necessary; absence is not free work. @@ -491,30 +439,6 @@ mod tests { ); } - /// Lifecycle build includes all measured snapshot updates, not just an empty - /// allocation. A missing update measurement cannot become free ingestion. - #[test] - fn lifecycle_build_requires_complete_snapshot_ingestion() { - let (mut artifact, _, _) = fixture(); - let row = &mut artifact.records[0]; - row.metrics.resources.cpu.build_cpu_ns = Some(Measurement { - value: 10.0, - stddev: None, - samples: 1, - method: None, - }); - assert_eq!(snapshot_build_cpu(row), Some(20010.0)); - row.metrics.resources.cpu.prepare_cpu_ns = Some(Measurement { - value: 17.0, - stddev: None, - samples: 1, - method: None, - }); - assert_eq!(snapshot_build_cpu(row), Some(20027.0)); - row.metrics.resources.cpu.update_cpu_ns = None; - assert_eq!(snapshot_build_cpu(row), None); - } - /// Newly shared optional dimensions receive the same numeric validation. #[test] fn optional_prepare_and_scan_measurements_are_validated() { @@ -538,28 +462,21 @@ mod tests { /// Only the established frequency-sketch contract can omit preparation. #[test] - fn unmeasured_preparation_for_other_families_keeps_build_unknown() { + fn unmeasured_preparation_for_other_families_stays_unknown() { let (mut artifact, _, _) = fixture(); let row = &mut artifact.records[0]; - row.metrics.resources.cpu.build_cpu_ns = Some(Measurement { - value: 10.0, - stddev: None, - samples: 1, - method: None, - }); - assert_eq!(snapshot_build_cpu(row), Some(20010.0)); row.algorithm = SketchAlgorithm::CountSketch; assert_eq!(snapshot_prepare_cpu(row), Some(0.0)); row.algorithm = SketchAlgorithm::Kll; row.params = SketchParams::Kll { k: 269 }; - assert_eq!(snapshot_build_cpu(row), None); + assert_eq!(snapshot_prepare_cpu(row), None); row.metrics.resources.cpu.prepare_cpu_ns = Some(Measurement { value: 17.0, stddev: None, samples: 1, method: None, }); - assert_eq!(snapshot_build_cpu(row), Some(20027.0)); + assert_eq!(snapshot_prepare_cpu(row), Some(17.0)); } fn fixture() -> (EvidenceArtifact, EvidenceContext, AggIntent) { diff --git a/crates/asap-aware-mapping/src/exact_composition.rs b/crates/asap-aware-mapping/src/exact_composition.rs index 54bce26f6..618265e9b 100644 --- a/crates/asap-aware-mapping/src/exact_composition.rs +++ b/crates/asap-aware-mapping/src/exact_composition.rs @@ -4,21 +4,23 @@ //! `construct_summary_agg` already nests accumulator realizations, such as //! KLL over exact `Sum` state or a quantile over `Rate` state. This strategy //! covers the more general cases where an exact function must consume a -//! summary readout, or where a maintained summary consumes the values of an +//! summary evaluation, or where a maintained summary consumes the values of an //! exact function that has no accumulator realization. //! -//! Both cases use the general [`SummaryExpr::ValueOperation`] node. Its -//! semantic [`ValueOperation`] is independent from [`ExecutionTiming`], so -//! adding a function does not require adding a new physical node type. +//! Both cases use an ordinary `NonASAPOp::Aggregate` node over the child +//! plan. The node carries no timing: it runs when its consumer runs, so the +//! same operator serves both placements and adding a function does not +//! require adding a new physical node type. [`OperationPlacement`] is the +//! search-time placement choice. //! //! ## Reference, don't select //! //! A composed candidate needs a child plan to compose *with* — the inner -//! quantile's own summary readout, say. This strategy deliberately does +//! quantile's own summary evaluation, say. This strategy deliberately does //! **not** pick that child itself (the way `construct_summary_agg`'s //! `realize_child` takes the head of the child's own ranking): a //! [`Replacement::ExactComposition`] carries only the child *target* -//! (`ExactComposition::child_target`, the same `Rc` whose +//! (`ExactComposition::child_target`, the same `Rc` whose //! `TargetSubDAGCandidates` in `CandidateLogicalASAPDAGs` already holds every candidate for it). It is //! [`CandidateLogicalASAPDAGs::global_selection`](crate::replacement::CandidateLogicalASAPDAGs::global_selection) //! that commits the compatible parent/child pair — so the child's own @@ -34,7 +36,7 @@ //! //! - the target is a single-measure, `HAVING`-free exact aggregate; //! - read-time operation: the child is a bindable aggregate that has at least one -//! readout-producing summary implementation (a sketch/sample/wavelet/ +//! evaluation-producing summary implementation (a sketch/sample/wavelet/ //! model — the shapes a maintained accumulator can't sit above), and the //! target's grouping keys resolve in the child's output schema; //! transform: the target is a per-entity exact function with no @@ -58,18 +60,21 @@ //! - Decide whether a composition is *worth it*: that is //! `global_selection`'s job, using the issue's cost-units-per-second //! formulas (see `crate::cost_model::read_operation_plan_cost_rate` and -//! siblings). Missing statistics keep the conservative `KeepPreAsap`. +//! siblings). Missing statistics keep the conservative kept sub-DAG. +use asap_types::ir::non_asap::any_measure_filtered; use std::rc::Rc; -use asap_types::post_asap::execution_data_state::validate_execution_data_states_at; +use asap_types::ir::aggregate_schema::aggregate_output_schema; +use asap_types::ir::operator_properties::Reduction; +use asap_types::ir::timing::{planned_data_state, validate_maintained}; +use asap_types::ir::{NonASAPOp, Operator, OperatorNode, Predicate}; +use asap_types::post_asap::execution_data_state::lift_plain; use asap_types::post_asap::{ - exact_operation_output_schema, produced_data_state, AccuracyError, ExactOperation, - ExecutionDataState, ExecutionDataStateError, ResultGuarantee, Schema, SummaryExpr, SummaryNode, - ValueOperation, + AccuracyError, ExactOperationSchemaError, ExecutionDataState, ExecutionDataStateError, + ResultGuarantee, Schema, }; use asap_types::pre_asap::agg_intent::AggIntent; -use asap_types::pre_asap::query_expr::{any_measure_filtered, QueryExpr, Reduction}; use asap_types::types::AccuracyTarget; use crate::cost_model::CostModel; @@ -84,9 +89,61 @@ use asap_types::post_asap::ExecutionTiming; /// Which side of the maintenance/read boundary an [`ExactComposition`]'s /// exact function executes on. +/// The exact function an [`ExactComposition`] applies: the parameters of +/// the `NonASAPOp::Aggregate` node the composition builds over its child. +#[derive(Debug, Clone, PartialEq)] +pub enum ExactOperation { + Aggregate { + reduction: Reduction, + measures: Vec, + output_names: Vec, + filters: Vec>, + having: Option, + }, +} + +impl ExactOperation { + /// Output schema of this operation over a child whose edge carries + /// `input` — the same canonical derivation the pre-ASAP `Aggregate` + /// node uses. `Err` when the child carries non-plain state the operator + /// cannot read. + pub fn output_schema(&self, input: &Schema) -> Result { + if !input.is_all_plain() { + return Err(ExactOperationSchemaError::NonPlainInput); + } + let plain = lift_plain(input); + let ExactOperation::Aggregate { + reduction, + measures, + output_names, + .. + } = self; + let out = aggregate_output_schema(&plain, reduction, measures, output_names)?; + Ok(lift_plain(&out)) + } + + fn into_op(self, child: Rc) -> NonASAPOp { + let ExactOperation::Aggregate { + reduction, + measures, + output_names, + filters, + having, + } = self; + NonASAPOp::Aggregate { + reduction, + measures, + output_names, + filters, + having, + child, + } + } +} + #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] pub enum OperationPlacement { - /// After the child's summary readout. + /// After the child's summary evaluation. Read, /// On the maintenance path, feeding /// maintained state above. @@ -120,7 +177,7 @@ pub struct ExactComposition { pub op: ExactOperation, /// The pre-ASAP child the operator consumes; its `TargetSubDAGCandidates` holds the /// candidates `global_selection` may commit this composition with. - pub child_target: Rc, + pub child_target: Rc, /// The composed node's output schema — the target's own pre-ASAP /// output schema, lifted with every column `Plain` (an exact operator /// only ever produces plain values). @@ -128,24 +185,27 @@ pub struct ExactComposition { } impl ExactComposition { + /// The data state `child` produces when this operation (its consumer) + /// runs at the placement's timing. + fn child_data_state(&self, child: &Rc) -> ExecutionDataState { + planned_data_state(child, self.placement.data_state().timing) + } + /// Can `child` legally be this composition's input? Phase legality - /// (the child's produced data_state — a `KeepPreAsap` leaf takes the + /// (the child's produced data_state — a kept pre-ASAP sub-DAG takes the /// phase this edge assigns) plus the plain-operand rule, checked /// through the same schema derivation [`Self::compose`] uses. - pub fn accepts_child(&self, child: &SummaryNode) -> bool { - let phase_ok = match produced_data_state(&child.expr) { - None => true, - Some(avail) => avail == self.placement.data_state(), - }; - phase_ok && exact_operation_output_schema(&self.op, &child.schema).is_ok() + pub fn accepts_child(&self, child: &Rc) -> bool { + self.child_data_state(child) == self.placement.data_state() + && self.op.output_schema(&child.schema).is_ok() } /// Build the composed, data_state-validated node over `child`. Every edge of /// the result (including everything beneath `child`) is checked by - /// `asap_types::post_asap::validate_execution_data_states`; an illegal + /// `asap_types::ir::timing::validate_maintained`; an illegal /// placement is a typed [`RealizationError::ExecutionDataState`], never deferred to a /// runtime. - pub fn compose(&self, child: Rc) -> Result, RealizationError> { + pub fn compose(&self, child: Rc) -> Result, RealizationError> { self.compose_with_accuracy(child, &DefaultAccuracyModel) } @@ -154,24 +214,23 @@ impl ExactComposition { /// unsupported folds fail closed with a typed accuracy error. pub fn compose_with_accuracy( &self, - child: Rc, + child: Rc, accuracy_model: &dyn AccuracyModel, - ) -> Result, RealizationError> { - if let Some(produced) = produced_data_state(&child.expr) { - if produced != self.placement.data_state() { - let edge = match self.placement { - OperationPlacement::Maintenance => "ValueOperation.child (maintenance time)", - OperationPlacement::Read => "ValueOperation.child (read time)", - }; - return Err(RealizationError::ExecutionDataState( - ExecutionDataStateError::IllegalChildDataState { - edge, - child: produced, - }, - )); - } + ) -> Result, RealizationError> { + let produced = self.child_data_state(&child); + if produced != self.placement.data_state() { + let edge = match self.placement { + OperationPlacement::Maintenance => "exact operation child (maintenance time)", + OperationPlacement::Read => "exact operation child (read time)", + }; + return Err(RealizationError::ExecutionDataState( + ExecutionDataStateError::IllegalChildDataState { + edge, + child: produced, + }, + )); } - let schema = exact_operation_output_schema(&self.op, &child.schema)?; + let schema = self.op.output_schema(&child.schema)?; let guarantee = match &child.guarantee { None => None, Some(input) if input.is_exact() => Some(ResultGuarantee::exact(format!( @@ -198,23 +257,11 @@ impl ExactComposition { None => None, }, }; - let timing = match self.placement { - OperationPlacement::Read => asap_types::post_asap::ExecutionTiming::QueryTime, - OperationPlacement::Maintenance => { - asap_types::post_asap::ExecutionTiming::IngestionTime - } - }; - let expr = SummaryExpr::ValueOperation { - child, - operation: ValueOperation::Exact(self.op.clone()), - timing, - }; - let node = Rc::new(SummaryNode { - expr, - schema, - guarantee, - }); - validate_execution_data_states_at(&node, self.placement.data_state())?; + let node = Rc::new( + OperatorNode::with_schema(Operator::NonASAP(self.op.clone().into_op(child)), schema) + .with_guarantee(guarantee), + ); + validate_maintained(&node, self.placement.data_state().timing)?; Ok(node) } @@ -227,7 +274,7 @@ impl ExactComposition { } } -/// Which exact reducers may run as a query-time fold over readout rows. +/// Which exact reducers may run as a query-time fold over evaluation rows. /// `Count` only at `Exact` accuracy (an approximate count is a sketch /// target, not an exact fold). fn is_query_time_reducer(intent: &AggIntent) -> bool { @@ -245,9 +292,9 @@ fn is_query_time_reducer(intent: &AggIntent) -> bool { ) } -/// Does `implementation` need a `SummaryEstimate` readout to yield a value +/// Does `implementation` need a `SummaryEstimate` evaluation to yield a value /// — i.e. is it a shape a maintained accumulator can't legally sit above? -fn needs_readout(implementation: &Realization) -> bool { +fn needs_evaluation(implementation: &Realization) -> bool { matches!( implementation, Realization::Sketch(_) @@ -259,17 +306,17 @@ fn needs_readout(implementation: &Realization) -> bool { /// The `(op, child)` of a read-time operation-shaped target, or `None`. fn query_time_shape( - root: &QueryExpr, + root: &OperatorNode, cost_model: &dyn CostModel, -) -> Option<(ExactOperation, Rc, AggIntent)> { - let QueryExpr::Aggregate { +) -> Option<(ExactOperation, Rc, AggIntent)> { + let Some(NonASAPOp::Aggregate { reduction, measures, output_names, filters, having: None, child, - } = root + }) = root.non_asap() else { return None; }; @@ -291,13 +338,12 @@ fn query_time_shape( let child_intent = bindable_intent(child)?; if !realizations_for_intent(child_intent, cost_model) .iter() - .any(needs_readout) + .any(needs_evaluation) { return None; } // Grouping keys must resolve in the child's output schema — the same // derivation the composed node's own schema will use. - root.output_schema().ok()?; Some(( ExactOperation::Aggregate { reduction: reduction.clone(), @@ -314,17 +360,17 @@ fn query_time_shape( /// The `(op, child)` of a function-shaped target — a per-entity exact /// transform with no accumulator form — or `None`. fn ingestion_time_shape( - root: &QueryExpr, + root: &OperatorNode, cost_model: &dyn CostModel, -) -> Option<(ExactOperation, Rc, AggIntent)> { - let QueryExpr::Aggregate { +) -> Option<(ExactOperation, Rc, AggIntent)> { + let Some(NonASAPOp::Aggregate { reduction: Reduction::PerEntity, measures, output_names, filters, having: None, child, - } = root + }) = root.non_asap() else { return None; }; @@ -346,7 +392,6 @@ fn ingestion_time_shape( { return None; } - root.output_schema().ok()?; Some(( ExactOperation::Aggregate { reduction: Reduction::PerEntity, @@ -386,10 +431,7 @@ impl<'a> ExactCompositionStrategy<'a> { } fn candidates(&self, target: &TargetSubDAG<'_>) -> Vec { - let Ok(schema) = target.root.output_schema() else { - return Vec::new(); - }; - let schema = asap_types::post_asap::execution_data_state::lift_plain(&schema); + let schema = lift_plain(&target.root.schema); let mut out = Vec::new(); if let Some((op, child, intent)) = query_time_shape(target.root, self.cost_model) { @@ -410,10 +452,10 @@ impl<'a> ExactCompositionStrategy<'a> { }), provenance: ReplacementProvenance::ValueOperationAtQueryTime, rationale: format!( - "{} is an exact fold whose input is the readout of {} — a maintained \ - accumulator cannot consume query-time values, so instead of collapsing \ - the whole DAG into KeepPreAsap this applies the fold as an \ - ExactRead over whichever summary readout global_selection \ + "{} is an exact fold whose input is the evaluation of {} — a maintained \ + accumulator cannot consume query-time values, so instead of keeping \ + the whole tree pre-ASAP this applies the fold as an \ + ExactRead over whichever summary evaluation global_selection \ commits for the child target (asap_aware_mapping::exact_composition)", describe_intent(&intent), child_desc @@ -441,7 +483,7 @@ impl<'a> ExactCompositionStrategy<'a> { "{} is an exact per-entity function with no accumulator form; as an \ explicit ExactMaintenance on the update path its output can feed a \ maintained summary above it instead of being handed over as an opaque \ - raw KeepPreAsap blob (asap_aware_mapping::exact_composition)", + raw kept sub_dag (asap_aware_mapping::exact_composition)", describe_intent(&intent) ), }); @@ -465,59 +507,20 @@ impl ReplacementStrategy for ExactCompositionStrategy<'_> { mod tests { use super::*; use crate::cost_model::{DefaultCostModel, ValueOperationCapabilities}; - use crate::replacement::keep_pre_asap; + use crate::replacement::retain_exact; + use crate::test_support::{agg, agg_per_entity as per_entity, metric_scan, timed}; + use asap_types::ir::ASAPOp; use asap_types::post_asap::{ExecutionDataStateError, FieldDataType, SketchAlgorithm}; use asap_types::pre_asap::agg_intent::default_quantile; - use asap_types::pre_asap::query_expr::Source; - use asap_types::pre_asap::schema::{DataType, Field, Schema}; - - fn metric_scan(labels: &[&str]) -> QueryExpr { - let mut columns = vec![ - Field::plain("ts", DataType::Timestamp, false), - Field::plain("value", DataType::Float64, false), - ]; - columns.extend( - labels - .iter() - .map(|n| Field::plain(*n, DataType::Utf8, true)), - ); - QueryExpr::Scan { - source: Source::TimeSeries { metric: "m".into() }, - predicates: vec![], - schema: Schema::with_time_index(columns, 0, vec![]), - } - } - - fn agg(by: Vec, intent: AggIntent, child: QueryExpr) -> QueryExpr { - QueryExpr::Aggregate { - reduction: Reduction::by(by), - measures: vec![intent], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(child), - } - } - - fn per_entity(intent: AggIntent, child: QueryExpr) -> QueryExpr { - QueryExpr::Aggregate { - reduction: Reduction::PerEntity, - measures: vec![intent], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(child), - } - } /// `max by (zone) (quantile by (zone, host) (m))`. - fn max_over_quantile() -> Rc { + fn max_over_quantile() -> Rc { let inner = agg( vec![2, 3], default_quantile(0.99), metric_scan(&["zone", "host"]), ); - Rc::new(agg(vec![0], AggIntent::Max { col: None }, inner)) + agg(vec![0], AggIntent::Max { col: None }, inner) } #[test] @@ -539,7 +542,7 @@ mod tests { candidates[0].provenance, ReplacementProvenance::ValueOperationAtQueryTime ); - let QueryExpr::Aggregate { child, .. } = root.as_ref() else { + let Some(NonASAPOp::Aggregate { child, .. }) = root.non_asap() else { unreachable!() }; assert!( @@ -553,7 +556,7 @@ mod tests { #[test] fn proposes_query_time_operation_for_avg_over_quantile_alongside_the_rewrite() { let inner = agg(vec![2], default_quantile(0.99), metric_scan(&["zone"])); - let root = Rc::new(agg(vec![0], AggIntent::Avg { col: None }, inner)); + let root = agg(vec![0], AggIntent::Avg { col: None }, inner); let target = TargetSubDAG::new(&root); assert_eq!( ExactCompositionStrategy::default_cost_model() @@ -567,7 +570,7 @@ mod tests { #[test] fn proposes_ingestion_time_operation_for_a_per_entity_pass_through_over_raw_input() { - let root = Rc::new(per_entity(AggIntent::Deriv, metric_scan(&["zone"]))); + let root = per_entity(AggIntent::Deriv, metric_scan(&["zone"])); let target = TargetSubDAG::new(&root); let candidates = ExactCompositionStrategy::default_cost_model().replacements(&target); assert_eq!(candidates.len(), 1); @@ -579,21 +582,21 @@ mod tests { #[test] fn does_not_propose_for_shapes_already_covered_by_accumulators() { - // sum by (zone) over an exact Sum child: the child has no readout, + // sum by (zone) over an exact Sum child: the child has no evaluation, // so SummaryAgg(Sum) over SummaryAgg(Sum) is already legal. let inner = agg( vec![2, 3], AggIntent::Sum { col: None }, metric_scan(&["zone", "host"]), ); - let root = Rc::new(agg(vec![0], AggIntent::Sum { col: None }, inner)); + let root = agg(vec![0], AggIntent::Sum { col: None }, inner); assert!(!ExactCompositionStrategy::default_cost_model().matches(&TargetSubDAG::new(&root))); // rate is an exact accumulator — directly nestable, no separate value operation. - let rate = Rc::new(per_entity(AggIntent::Rate, metric_scan(&[]))); + let rate = per_entity(AggIntent::Rate, metric_scan(&[])); assert!(!ExactCompositionStrategy::default_cost_model().matches(&TargetSubDAG::new(&rate))); // A sketch-capable outer intent is not an exact fold. let inner = agg(vec![2], default_quantile(0.5), metric_scan(&["zone"])); - let root = Rc::new(agg(vec![0], default_quantile(0.99), inner)); + let root = agg(vec![0], default_quantile(0.99), inner); assert!(!ExactCompositionStrategy::default_cost_model().matches(&TargetSubDAG::new(&root))); } @@ -618,7 +621,7 @@ mod tests { let strategy = ExactCompositionStrategy::new(&NoMixedExecution); assert!(!strategy.matches(&target)); assert!(strategy.replacements(&target).is_empty()); - let deriv = Rc::new(per_entity(AggIntent::Deriv, metric_scan(&[]))); + let deriv = per_entity(AggIntent::Deriv, metric_scan(&[])); assert!(!strategy.matches(&TargetSubDAG::new(&deriv))); } @@ -630,12 +633,13 @@ mod tests { let Replacement::ExactComposition(comp) = &candidates[0].replacement else { unreachable!() }; - // A bare SummaryAgg (state, no readout) is not a legal read-time operation + // A bare SummaryAgg (state, no evaluation) is not a legal read-time operation // input — the operator would be consuming sketch state. let state_child = crate::replacement::realize_child(&comp.child_target, &DefaultCostModel).unwrap(); - let SummaryExpr::SummaryEstimate { summary_input, .. } = &state_child.expr else { - panic!("expected the child to realize to a readout"); + let Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) = &state_child.operator + else { + panic!("expected the child to realize to a evaluation"); }; assert!(!comp.accepts_child(summary_input)); assert!(matches!( @@ -644,7 +648,7 @@ mod tests { ExecutionDataStateError::IllegalChildDataState { .. } )) )); - // The readout itself is accepted and composes to a plain schema. + // The evaluation itself is accepted and composes to a plain schema. assert!(comp.accepts_child(&state_child)); let composed = comp.compose(state_child).unwrap(); assert!( @@ -652,12 +656,13 @@ mod tests { "rank error has no registered conversion through max" ); assert!(matches!( - composed.expr, - SummaryExpr::ValueOperation { - timing: ExecutionTiming::QueryTime, - .. - } + composed.operator, + Operator::NonASAP(NonASAPOp::Aggregate { .. }) )); + // Timing is no longer stored by composition: under the default + // materialization assignment the composed read-time operation runs at + // query time. + assert_eq!(timed(&composed).timing, Some(ExecutionTiming::QueryTime)); assert!(composed .schema .fields @@ -666,32 +671,78 @@ mod tests { } #[test] - fn compose_rejects_a_readout_child_for_a_ingestion_time_operation() { + fn compose_rejects_a_evaluation_child_for_a_ingestion_time_operation() { let inner = agg(vec![2], default_quantile(0.99), metric_scan(&["zone"])); - let root = Rc::new(per_entity(AggIntent::Deriv, inner)); + let root = per_entity(AggIntent::Deriv, inner); let candidates = ExactCompositionStrategy::default_cost_model().replacements(&TargetSubDAG::new(&root)); let Replacement::ExactComposition(comp) = &candidates[0].replacement else { unreachable!() }; - let readout = + let evaluation = crate::replacement::realize_child(&comp.child_target, &DefaultCostModel).unwrap(); - assert!(!comp.accepts_child(&readout)); + assert!(!comp.accepts_child(&evaluation)); assert!(matches!( - comp.compose(readout), + comp.compose(evaluation), Err(RealizationError::ExecutionDataState( ExecutionDataStateError::IllegalChildDataState { .. } )) )); // Raw update input is fine. - let raw = keep_pre_asap(&comp.child_target).unwrap(); + let raw = retain_exact(&comp.child_target).unwrap(); assert!(comp.accepts_child(&raw)); + // Timing is no longer stored by composition: the composition's + // placement is maintenance time, the composed exact operation is a + // plain Aggregate over the raw rows, and it is legal (and planned to + // run) at ingestion time. + assert_eq!(comp.placement, OperationPlacement::Maintenance); + let composed = comp.compose(raw).unwrap(); assert!(matches!( - comp.compose(raw).unwrap().expr, - SummaryExpr::ValueOperation { - timing: ExecutionTiming::IngestionTime, - .. - } + composed.operator, + Operator::NonASAP(NonASAPOp::Aggregate { .. }) + )); + validate_maintained(&composed, ExecutionTiming::IngestionTime).unwrap(); + assert_eq!( + planned_data_state(&composed, ExecutionTiming::IngestionTime).timing, + ExecutionTiming::IngestionTime + ); + } + + fn max_op(by: Vec) -> ExactOperation { + ExactOperation::Aggregate { + reduction: Reduction::by(by), + measures: vec![AggIntent::Max { col: None }], + output_names: vec![], + filters: vec![], + having: None, + } + } + + #[test] + fn exact_operator_schema_matches_pre_asap_aggregate_derivation() { + let child = lift_plain(&metric_scan(&["zone"]).schema); + let out = max_op(vec![2]).output_schema(&child).unwrap(); + let names: Vec<_> = out.fields.iter().map(|f| f.name.as_str()).collect(); + assert_eq!(names, vec!["zone", "max"]); + assert!(out.is_all_plain()); + } + + #[test] + fn exact_operator_rejects_non_plain_input() { + let state = Schema::lifted( + vec![asap_types::pre_asap::Field::new( + "state", + FieldDataType::ExactAggregate( + asap_types::post_asap::ExactKind::Sum, + asap_types::post_asap::ExactParams::Sum, + ), + false, + )], + None, + ); + assert!(matches!( + max_op(vec![]).output_schema(&state), + Err(ExactOperationSchemaError::NonPlainInput) )); } } diff --git a/crates/asap-aware-mapping/src/explanation.rs b/crates/asap-aware-mapping/src/explanation.rs index e7afff2ba..bc67be96f 100644 --- a/crates/asap-aware-mapping/src/explanation.rs +++ b/crates/asap-aware-mapping/src/explanation.rs @@ -31,7 +31,7 @@ //! collapses into a single question this module asks of *that* data instead: //! **for a given `TargetSubDAG`, does its candidate list contain anything //! other than the trivial, no-op realization?** A `TargetSubDAG` whose only -//! candidate is "the one thing `SketchAlgorithmStrategy` would have committed +//! candidate is "the one thing `ASAPStrategies` would have committed //! to anyway, with no alternative" has no optimization to report — that //! candidate isn't an *opportunity*, it's just the target's existing shape //! reflected back. A `TargetSubDAG` with more than one candidate (several @@ -43,9 +43,9 @@ //! [`TargetSubDAGCandidates`]s into that shape: //! //! - [`ExplanationKind::SketchApproximation`] — the `TargetSubDAG`'s -//! candidate list contains at least one [`Replacement::Summary`] that +//! candidate list contains at least one summary-realization [`Replacement::SubDAG`] that //! actually realizes a sketch family (`FieldDataType::Sketch`), i.e. -//! [`SketchAlgorithmStrategy`] found something to offer beyond whatever +//! [`ASAPStrategies`] found something to offer beyond whatever //! exact/pass-through candidate [`crate::replacement`]'s own //! `realizations_for_intent` would have committed to on its own. //! - [`ExplanationKind::CommonSubexpressionReuse`] — the `TargetSubDAG` @@ -103,7 +103,7 @@ //! [`ReplacementStrategy`] already *is* that extension point, one layer //! down, and [`explain_replacements_with`]'s own `strategies` //! parameter is where a caller plugs in a custom one (or a custom -//! `CostModel`, via [`crate::replacement::SketchAlgorithmStrategy::new`]) — the identical spot +//! `CostModel`, via [`crate::replacement::ASAPStrategies::new`]) — the identical spot //! [`crate::replacement::search_workload_with`] itself exposes. //! //! ## Two guarantees the old traversal made, re-verified against the new one @@ -134,7 +134,7 @@ //! ## One thing [`CandidateLogicalASAPDAGs`] doesn't carry that this module still needs: //! human-readable `location` text //! -//! [`TargetSubDAGCandidates`]/[`CandidateLogicalASAPDAGs`] deliberately track only `Rc` +//! [`TargetSubDAGCandidates`]/[`CandidateLogicalASAPDAGs`] deliberately track only `Rc` //! pointer identity — the currency the search itself needs — not //! caller-facing prose. [`ReplacementExplanation::location`] is prose (a //! breadcrumb like `root "dash_a" > lhs`), so this module keeps one small, @@ -161,8 +161,8 @@ //! //! | Catalog entry | Status | Where a future `ExplanationKind` would come from | //! |---|---|---| -//! | Semantic-equivalent rewriting (e.g. `avg` → `sum`/`count`) | [`AvgToSumOverCountStrategy`](crate::rewrite::AvgToSumOverCountStrategy) exists and is wired into `default_strategies()` (issue #253) — but still no `ExplanationKind` of its own below, since this table is about *direct* findings for a catalog entry, and this strategy's whole point is indirect: its `Replacement::Rewrite` candidate exposes `sum`/`count` as independently bindable discovered targets, which can then earn `CommonSubexpressionReuse` findings when the workload actually reuses them | A dedicated variant would need `findings_from_candidate_logical_asap_dags` to recognize a `LogicalRewrite`-provenance candidate as a finding in its own right, not just rely on what it exposes downstream | -//! | Roll-ups (fine-to-coarse group-by reuse) | [`RollupStrategy`](crate::rollup::RollupStrategy), derived from workload siblings after CSE/target discovery (issue #254) | Any `Replacement::Rewrite` candidate that rolls a coarse aggregate up from a compatible finer aggregate | +//! | Semantic-equivalent rewriting (e.g. `avg` → `sum`/`count`) | [`AvgToSumOverCountStrategy`](crate::rewrite::AvgToSumOverCountStrategy) exists and is wired into `default_strategies()` (issue #253) — but still no `ExplanationKind` of its own below, since this table is about *direct* findings for a catalog entry, and this strategy's whole point is indirect: its `Replacement::SubDAG` rewrite candidate exposes `sum`/`count` as independently bindable discovered targets, which can then earn `CommonSubexpressionReuse` findings when the workload actually reuses them | A dedicated variant would need `findings_from_candidate_logical_asap_dags` to recognize a `LogicalRewrite`-provenance candidate as a finding in its own right, not just rely on what it exposes downstream | +//! | Roll-ups (fine-to-coarse group-by reuse) | [`RollupStrategy`](crate::rollup::RollupStrategy), derived from workload siblings after CSE/target discovery (issue #254) | Any `Replacement::SubDAG` rewrite candidate that rolls a coarse aggregate up from a compatible finer aggregate | //! | Wavelets/OMP | Params type exists (`WaveletKind`/`WaveletParams`), reachable only via a deployment `CostModel::realize_extension` (no core `AggIntent` dispatch picks it) | A `ReplacementStrategy` that inspects a deployment's own `CostModel`, once some intent shape actually maps to `Realization::Wavelet` | //! | Sampling | Same story as Wavelets: `SamplingKind`/`SamplingParams` exist, unreachable from core dispatch | Same hook as Wavelets, for `Realization::Sample` | //! | Deep generative compression | No representation at all — no `Realization`/`FieldDataType` variant | Needs a new summary family added to `asap_types::post_asap` first | @@ -175,9 +175,8 @@ //! [`ReplacementStrategy`]: crate::replacement::ReplacementStrategy //! [`ReplacementSubDAG`]: crate::replacement::ReplacementSubDAG //! [`Replacement`]: crate::replacement::Replacement -//! [`Replacement::Summary`]: crate::replacement::Replacement::Summary -//! [`Replacement::Rewrite`]: crate::replacement::Replacement::Rewrite -//! [`SketchAlgorithmStrategy`]: crate::replacement::SketchAlgorithmStrategy +//! [`Replacement::SubDAG`]: crate::replacement::Replacement::SubDAG +//! [`ASAPStrategies`]: crate::replacement::ASAPStrategies //! [`SharedSubDAGStrategy`]: crate::replacement::SharedSubDAGStrategy //! [`CandidateLogicalASAPDAGs`]: crate::replacement::CandidateLogicalASAPDAGs //! [`TargetSubDAGCandidates`]: crate::replacement::TargetSubDAGCandidates @@ -186,9 +185,9 @@ use std::collections::HashMap; use std::fmt::Display; use std::rc::Rc; -use asap_types::post_asap::{FieldDataType, SummaryExpr, SummaryNode}; -use asap_types::pre_asap::cse::{structural_hash, HashCache}; -use asap_types::pre_asap::query_expr::QueryExpr; +use asap_types::ir::cse::{structural_hash, HashCache}; +use asap_types::ir::{ASAPOp, Operator, OperatorNode}; +use asap_types::post_asap::FieldDataType; use crate::replacement::{ self, CandidateLogicalASAPDAGs, Replacement, ReplacementStrategy, TargetSubDAGCandidates, @@ -206,8 +205,8 @@ use crate::replacement::{ #[non_exhaustive] pub enum ExplanationKind { /// A `TargetSubDAG`'s candidate list contains at least one - /// [`Replacement::Summary`] that realizes a sketch family — - /// [`crate::replacement::SketchAlgorithmStrategy`] found a genuine sketch + /// [`Replacement::SubDAG`] that realizes a sketch family — + /// [`crate::replacement::ASAPStrategies`] found a genuine sketch /// alternative for this `Aggregate`, beyond whatever exact/pass-through /// candidate `crate::replacement`'s own `realizations_for_intent` would /// have committed to on its own. @@ -222,8 +221,8 @@ pub enum ExplanationKind { /// [`Replacement::ExactComposition`] — /// [`crate::exact_composition::ExactCompositionStrategy`] found an exact /// operator that can be composed with a summary plan across an explicit - /// update/readout boundary instead of collapsing the whole DAG into - /// `KeepPreAsap` (issue #171). + /// update/evaluation boundary instead of keeping the whole tree as it is + /// (issue #171). ExactComposition, } @@ -233,11 +232,11 @@ pub enum ExplanationKind { /// not machine parsing — literally the matching candidate's own /// [`crate::replacement::ReplacementSubDAG::rationale`]). /// -/// `node_hash` is [`structural_hash`](asap_types::pre_asap::cse::structural_hash) +/// `node_hash` is [`structural_hash`](asap_types::ir::cse::structural_hash) /// of the `TargetSubDAG`'s own `target` sub-DAG — the same function, on the -/// same `Rc` shape, that [`asap_types::dag_export::DAGNode::hash`] +/// same `Rc` shape, that [`asap_types::dag_export::DAGNode::hash`] /// is computed with. A downstream consumer that independently exported the -/// same `QueryExpr` (e.g. via `asap_types::dag_export::export`) can match +/// same node (e.g. via `asap_types::dag_export::export`) can match /// this explanation to a `DAGNode` by first comparing hashes and then /// confirming structural equality with [`ReplacementExplanation::target`]. #[derive(Debug, Clone, PartialEq)] @@ -249,7 +248,7 @@ pub struct ReplacementExplanation { /// The exact target expression the explanation describes. Reporting /// integrations use this together with `node_hash`: the hash narrows the /// search, and structural equality makes the final match collision-safe. - pub target: Rc, + pub target: Rc, } /// Explain every replacement [`crate::replacement::search_workload`] finds @@ -265,7 +264,7 @@ pub struct ReplacementExplanation { /// candidate-plan space, then reads findings off it — see the module docs' /// "The reframing" section for what that translation actually checks. pub fn explain_replacements( - roots: Vec<(Id, QueryExpr)>, + roots: Vec<(Id, Rc)>, ) -> Vec { explain_replacements_with(roots, &replacement::default_strategies()) } @@ -274,17 +273,17 @@ pub fn explain_replacements( /// instead of [`crate::replacement::default_strategies`] — the extension /// point for a deployment-specific [`ReplacementStrategy`], or a custom /// `CostModel` plugged into -/// [`crate::replacement::SketchAlgorithmStrategy::new`] (e.g. via +/// [`crate::replacement::ASAPStrategies::new`] (e.g. via /// [`crate::replacement::default_strategies_with`]). /// /// [`ReplacementStrategy`]: crate::replacement::ReplacementStrategy pub fn explain_replacements_with<'s, Id: Display>( - roots: Vec<(Id, QueryExpr)>, + roots: Vec<(Id, Rc)>, strategies: &[Box], ) -> Vec { - let ided: Vec<(String, Rc)> = roots + let ided: Vec<(String, Rc)> = roots .into_iter() - .map(|(id, expr)| (id.to_string(), Rc::new(expr))) + .map(|(id, expr)| (id.to_string(), expr)) .collect(); let space = replacement::search_workload_with(ided, strategies); findings_from_candidate_logical_asap_dags(&space) @@ -375,7 +374,7 @@ fn sketch_finding_reason(group: &TargetSubDAGCandidates) -> Option { .candidates .iter() .filter( - |c| matches!(&c.replacement, Replacement::Summary(node) if is_sketch_realization(node)), + |c| matches!(&c.replacement, Replacement::SubDAG(node) if is_sketch_realization(node)), ) .map(|c| c.rationale.as_str()) .collect(); @@ -387,7 +386,7 @@ fn sketch_finding_reason(group: &TargetSubDAGCandidates) -> Option { } /// Does `group` have two or more consumers *and* a "build once and share" -/// candidate (the [`Replacement::Rewrite`] whose `Rc` is the group's own +/// candidate (the [`Replacement::SubDAG`] whose `Rc` is the group's own /// `target`) in its candidate list? If so, the finding's `reason` is that /// candidate's own `rationale`. fn shared_subexpr_finding_reason(group: &TargetSubDAGCandidates) -> Option { @@ -398,7 +397,7 @@ fn shared_subexpr_finding_reason(group: &TargetSubDAGCandidates) -> Option Option bool { +fn is_sketch_realization(node: &OperatorNode) -> bool { if node .guarantee .as_ref() @@ -417,9 +416,13 @@ fn is_sketch_realization(node: &SummaryNode) -> bool { { return false; } - match &node.expr { - SummaryExpr::SummaryEstimate { summary_input, .. } => is_sketch_realization(summary_input), - SummaryExpr::SummaryAgg { family, .. } => matches!(family, FieldDataType::Sketch(..)), + match &node.operator { + Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) => { + is_sketch_realization(summary_input) + } + Operator::ASAP(ASAPOp::SummaryAgg { family, .. }) => { + matches!(family, FieldDataType::Sketch(..)) + } _ => false, } } @@ -432,8 +435,10 @@ fn is_sketch_realization(node: &SummaryNode) -> bool { /// every breadcrumb path that reaches a given `Rc`, not just the first: a /// shared node referenced from two workload roots (or two branches of one /// root) needs both breadcrumbs in its finding's `location`, not just one. -fn collect_locations(roots: &[(String, Rc)]) -> HashMap<*const QueryExpr, Vec> { - let mut locations: HashMap<*const QueryExpr, Vec> = HashMap::new(); +fn collect_locations( + roots: &[(String, Rc)], +) -> HashMap<*const OperatorNode, Vec> { + let mut locations: HashMap<*const OperatorNode, Vec> = HashMap::new(); for (id, root) in roots { visit(root, format!("root {id:?}"), &mut locations); } @@ -444,9 +449,9 @@ fn collect_locations(roots: &[(String, Rc)]) -> HashMap<*const QueryE /// through its children. A shared ancestor is intentionally traversed once /// per incoming path so every descendant receives every valid breadcrumb. fn visit( - node: &Rc, + node: &Rc, label: String, - locations: &mut HashMap<*const QueryExpr, Vec>, + locations: &mut HashMap<*const OperatorNode, Vec>, ) { let ptr = Rc::as_ptr(node); locations.entry(ptr).or_default().push(label.clone()); @@ -455,20 +460,24 @@ fn visit( /// `node`'s own **relational-skeleton** operator children — the same scope /// `crate::replacement`'s own target-discovery `walk_children` (and -/// `asap_types::pre_asap::cse::share_common_sub_dags`'s `rebuild_children`) -/// use. Exhaustive over every `QueryExpr` variant: a new variant fails to -/// compile here until this match is extended too. +/// `asap_types::ir::cse::share_common_sub_dags`) use. Exhaustive over every +/// `NonASAPOp` variant: a new variant fails to compile here until this match +/// is extended too. An ASAP node never occurs in a workload root. fn visit_children( - node: &QueryExpr, + node: &OperatorNode, label: &str, - locations: &mut HashMap<*const QueryExpr, Vec>, + locations: &mut HashMap<*const OperatorNode, Vec>, ) { - use QueryExpr::*; - match node { - Scan { .. } | PromqlScalarBridge(_) | EvalTimestamp | CurrentTimestamp => {} - PromqlVectorFromScalar(c) | PromqlScalarFromVector(c) => { + use asap_types::ir::{NonASAPOp::*, ScalarExpr}; + let Operator::NonASAP(op) = &node.operator else { + return; + }; + match op { + Scan { .. } | Values { .. } => {} + PromqlVectorFromScalar(ScalarExpr::PromqlScalarFromVector(c)) => { visit(c, format!("{label} > child"), locations) } + PromqlVectorFromScalar(_) => {} PromqlRelabel { child, .. } | PromqlInfoEnrich { child, .. } | PromqlSeriesSample { child, .. } @@ -484,7 +493,7 @@ fn visit_children( | Limit { child, .. } => visit(child, format!("{label} > child"), locations), Concat { children, .. } => { for (i, c) in children.iter().enumerate() { - visit_children(c, &format!("{label} > concat[{i}]"), locations); + visit(c, format!("{label} > concat[{i}]"), locations); } } Join { left, right, .. } | SetOp { left, right, .. } => { @@ -495,31 +504,20 @@ fn visit_children( visit(lhs, format!("{label} > lhs"), locations); visit(rhs, format!("{label} > rhs"), locations); } - Column(_) - | Literal(_) - | Compare { .. } - | BoolAnd(_) - | BoolOr(_) - | Not(_) - | IsNull(_) - | IsNotNull(_) - | Cast { .. } - | InList { .. } - | FunctionCall { .. } - | Arithmetic { .. } - | Case { .. } => {} } } #[cfg(test)] mod tests { use super::*; + use asap_types::ir::operator_properties::{BinaryOpKind, Reduction, Source}; + use asap_types::ir::{BinaryOperator, NonASAPOp, OperatorNode, Predicate, ScalarExpr}; use asap_types::pre_asap::agg_intent::{default_quantile, AggIntent}; - use asap_types::pre_asap::query_expr::{Reduction, Source}; use asap_types::pre_asap::schema::{DataType, Field, Schema}; + use asap_types::types::AccuracyTarget; - fn metric_scan(labels: &[&str]) -> QueryExpr { + fn metric_scan(labels: &[&str]) -> Rc { let mut columns = vec![ Field::plain("ts", DataType::Timestamp, false), Field::plain("value", DataType::Float64, false), @@ -529,22 +527,43 @@ mod tests { .iter() .map(|n| Field::plain(*n, DataType::Utf8, true)), ); - QueryExpr::Scan { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Scan { source: Source::TimeSeries { metric: "m".into() }, predicates: vec![], schema: Schema::with_time_index(columns, 0, vec![]), - } + })) + .unwrap() } - fn agg(by: Vec, intent: AggIntent, child: QueryExpr) -> QueryExpr { - QueryExpr::Aggregate { + fn agg(by: Vec, intent: AggIntent, child: Rc) -> Rc { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { reduction: Reduction::by(by), measures: vec![intent], output_names: vec![], filters: vec![], having: None, - child: Rc::new(child), - } + child, + })) + .unwrap() + } + + fn binary( + kind: BinaryOpKind, + lhs: Rc, + rhs: Rc, + ) -> Rc { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::BinaryOp { + operator: BinaryOperator { + kind, + vector_match: None, + checked_relative_division: false, + checked_finite_division: false, + }, + return_bool: false, + lhs, + rhs, + })) + .unwrap() } // ── SketchApproximation ────────────────────────────────────────────── @@ -567,7 +586,7 @@ mod tests { } /// `node_hash` must be the literal `structural_hash` a downstream - /// consumer would compute over the *same* `QueryExpr` sub-DAG via + /// consumer would compute over the *same* `OperatorNode` sub-DAG via /// `asap_types::dag_export::export` — the whole point of carrying it is /// that two independent exports of the same DAG agree, with no /// string-matching against `location` required. @@ -586,7 +605,7 @@ mod tests { Some(sketch.node_hash), expected_hash, "ReplacementExplanation::node_hash must match dag_export's DAGNode::hash \ - for the same QueryExpr sub-DAG" + for the same OperatorNode sub_dag" ); } @@ -641,21 +660,18 @@ mod tests { /// A sketch-applicable `Aggregate` reachable via two paths that CSE /// collapses onto one `Rc` — the same `median(x) == median(x)` shape - /// `pre_asap::cse`'s own `single_query_shares_its_own_repeated_sub_dag` + /// `pre_asap::cse`'s own `single_query_shares_its_own_repeated_sub-DAG` /// test uses — must be reported once, not once per path: it is exactly /// one [`crate::replacement::TargetSubDAGCandidates`], keyed by `Rc` pointer identity, /// not one per path that reaches it. #[test] fn a_shared_sketchable_aggregate_is_reported_only_once() { let quantile = agg(vec![2], default_quantile(0.99), metric_scan(&["job"])); - let root = QueryExpr::BinaryOp { - op: asap_types::pre_asap::query_expr::BinaryOpKind::Compare( - asap_types::pre_asap::expr_ir::CompareOpKind::Eq, - ), - lhs: Rc::new(quantile.clone()), - rhs: Rc::new(quantile), - vector_match: None, - }; + let root = binary( + BinaryOpKind::Compare(asap_types::pre_asap::expr_ir::CompareOpKind::Eq), + Rc::clone(&quantile), + quantile, + ); let findings = explain_replacements(vec![("ratio", root)]); let sketch: Vec<_> = findings .iter() @@ -695,8 +711,8 @@ mod tests { #[test] fn descendant_of_a_shared_root_keeps_every_root_breadcrumb() { let inner = agg(vec![2], default_quantile(0.99), metric_scan(&["job"])); - let outer = agg(vec![2], AggIntent::Sum { col: None }, inner); - let findings = explain_replacements(vec![("dash_a", outer.clone()), ("dash_b", outer)]); + let outer = agg(vec![0], AggIntent::Sum { col: None }, inner); + let findings = explain_replacements(vec![("dash_a", Rc::clone(&outer)), ("dash_b", outer)]); let inner_sketch = findings .iter() .find(|f| { @@ -742,14 +758,11 @@ mod tests { // The same shared branch appearing twice within one query (an `a/a` // shape) — single-query CSE. let branch = agg(vec![2], AggIntent::Sum { col: None }, metric_scan(&["job"])); - let q = QueryExpr::BinaryOp { - op: asap_types::pre_asap::query_expr::BinaryOpKind::Arithmetic( - asap_types::pre_asap::expr_ir::ArithmeticOpKind::Div, - ), - lhs: Rc::new(branch.clone()), - rhs: Rc::new(branch), - vector_match: None, - }; + let q = binary( + BinaryOpKind::Arithmetic(asap_types::pre_asap::expr_ir::ArithmeticOpKind::Div), + Rc::clone(&branch), + branch, + ); let findings = explain_replacements(vec![("ratio", q)]); let reuse: Vec<_> = findings .iter() @@ -766,7 +779,7 @@ mod tests { /// A shared node nested three levels under two *different*, unshared /// `Filter` parents (mirrors `crate::replacement::tests:: - /// nested_shared_sub_dag_below_an_unshared_parent_is_still_discovered`) + /// nested_shared_sub-DAG_below_an_unshared_parent_is_still_discovered`) /// must still be exactly one finding — the maximal-`TargetSubDAG` /// guarantee the module docs describe, now provided by /// `crate::replacement`'s own target discovery rather than this module's @@ -774,17 +787,20 @@ mod tests { #[test] fn a_deeply_shared_sub_dag_under_different_parents_is_reported_once() { use asap_types::pre_asap::expr_ir::ScalarValue; - use asap_types::pre_asap::query_expr::Predicate; let shared = agg(vec![2], AggIntent::Sum { col: None }, metric_scan(&["job"])); - let root_a = QueryExpr::Filter { - pred: Predicate(Rc::new(QueryExpr::Literal(ScalarValue::Int64(1)))), - child: Rc::new(shared.clone()), - }; - let root_b = QueryExpr::Filter { - pred: Predicate(Rc::new(QueryExpr::Literal(ScalarValue::Int64(2)))), - child: Rc::new(shared), - }; + let root_a = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Filter { + pred: Predicate(ScalarExpr::Literal(ScalarValue::Int64(1))), + child: Rc::clone(&shared), + })) + .unwrap(); + let root_b = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Filter { + pred: Predicate(ScalarExpr::Literal(ScalarValue::Int64(2))), + child: shared, + })) + .unwrap(); let findings = explain_replacements(vec![("a", root_a), ("b", root_b)]); let reuse: Vec<_> = findings .iter() @@ -825,7 +841,7 @@ mod tests { let q = agg(vec![2], default_quantile(0.99), metric_scan(&["job"])); let custom_model = AlwaysDDSketch; let strategies: Vec> = vec![Box::new( - crate::replacement::SketchAlgorithmStrategy::new(&custom_model), + crate::replacement::ASAPStrategies::new(&custom_model), )]; let findings = explain_replacements_with(vec![("q", q)], &strategies); assert_eq!(findings.len(), 1); diff --git a/crates/asap-aware-mapping/src/grouping.rs b/crates/asap-aware-mapping/src/grouping.rs index fc4abfe62..da7562c1c 100644 --- a/crates/asap-aware-mapping/src/grouping.rs +++ b/crates/asap-aware-mapping/src/grouping.rs @@ -7,7 +7,7 @@ //! //! ## Placement: planning metadata and edge-state type //! -//! `SummaryExpr::SummaryAgg` carries the grouping choice next to the +//! `ASAPOp::SummaryAgg` carries the grouping choice next to the //! `Reduction` whose `by` keys determine legality. The same choice is also //! committed to `FieldDataType::Sketch` on the aggregate's output edge. //! That duplication is intentional: the node field makes the choice easy to @@ -41,7 +41,7 @@ //! An earlier draft of this module (written against the very first draft of //! #251) reused a `CostModel`-wrapping adapter that "steered" a //! whole-recursive-bind decision procedure toward a specific `SketchKind`, -//! the same pattern [`crate::replacement::SketchAlgorithmStrategy`]'s own module +//! the same pattern [`crate::replacement::ASAPStrategies`]'s own module //! docs explain was deliberately deleted from this crate as an anti-pattern: //! forcing a choice via a whole-DAG `CostModel` adapter had a real bug where //! the forced choice could leak into a target's own nested aggregates. This @@ -53,7 +53,7 @@ //! passes that exact, //! already-decided `Realization` to //! [`crate::replacement::construct_summary`] — the same first-class, -//! one-candidate-at-a-time primitive [`crate::replacement::SketchAlgorithmStrategy`] +//! one-candidate-at-a-time primitive [`crate::replacement::ASAPStrategies`] //! itself calls once per candidate. No adapter, no steering, no risk of a //! forced choice leaking into nested aggregates. //! @@ -71,13 +71,14 @@ use std::rc::Rc; +use asap_types::ir::operator_properties::Reduction; +use asap_types::ir::{ASAPOp, NonASAPOp, Operator, OperatorNode}; use asap_types::post_asap::{ default_hydra_params, hydra_kind_for, AccuracyError, BoundExpr, CompositionOperator, FieldDataType, GroupingStrategy, GuaranteeSource, HydraKind, ProbabilityExpr, ResultGuarantee, - SketchAlgorithm, SketchParams, SummaryExpr, SummaryNode, + SketchAlgorithm, SketchParams, }; use asap_types::pre_asap::agg_intent::AggIntent; -use asap_types::pre_asap::query_expr::{QueryExpr, Reduction}; use crate::accuracy::{ AccuracyBudgetAllocator, AccuracyEvidenceProvider, AccuracyModel, PropagationStats, @@ -110,15 +111,15 @@ pub fn has_subpopulations(reduction: &Reduction) -> bool { /// A single static instance so [`HydraGroupingStrategy::default_cost_model`] /// can hand out a `&'static dyn CostModel` without heap-allocating one — same -/// pattern [`crate::replacement::SketchAlgorithmStrategy`] uses. +/// pattern [`crate::replacement::ASAPStrategies`] uses. static DEFAULT_COST_MODEL: DefaultCostModel = DefaultCostModel; /// Wraps the `GroupingStrategy` axis (issue #256) as a -/// [`ReplacementStrategy`]: for a target [`SketchAlgorithmStrategy`](crate::replacement::SketchAlgorithmStrategy) +/// [`ReplacementStrategy`]: for a target [`ASAPStrategies`](crate::replacement::ASAPStrategies) /// already has an opinion on, offers an additional /// `GroupingStrategy::SharedMultiSubpopulation` candidate wherever the /// legality conditions in the module docs above hold — alongside, not -/// instead of, the per-subpopulation candidates `SketchAlgorithmStrategy` +/// instead of, the per-subpopulation candidates `ASAPStrategies` /// itself enumerates. The workload search composes both strategies over the /// same target, so it sees every summary-family alternative *and* the Hydra /// alternative; the built-in workload search registers both strategies, and @@ -132,7 +133,7 @@ pub struct HydraGroupingStrategy<'a> { impl HydraGroupingStrategy<'static> { /// A strategy that ranks/binds via the built-in [`DefaultCostModel`] — /// what a deployment gets with no custom cost model plugged in, the same - /// default [`crate::replacement::SketchAlgorithmStrategy::default_cost_model`] + /// default [`crate::replacement::ASAPStrategies::default_cost_model`] /// offers. pub fn default_cost_model() -> Self { Self { @@ -144,7 +145,7 @@ impl HydraGroupingStrategy<'static> { impl<'a> HydraGroupingStrategy<'a> { /// A strategy that ranks/binds via `cost_model` instead of the built-in /// static preference order — the same customization point - /// [`crate::replacement::SketchAlgorithmStrategy::new`] already offers. + /// [`crate::replacement::ASAPStrategies::new`] already offers. pub fn new(cost_model: &'a dyn CostModel) -> Self { Self { planning_inputs: CandidatePlanningInputs::with_default_accuracy(cost_model), @@ -173,7 +174,7 @@ impl<'a> HydraGroupingStrategy<'a> { /// variant modeled. fn hydra_proposals(&self, target: &TargetSubDAG<'_>) -> Proposals { let mut proposals = Proposals::default(); - let QueryExpr::Aggregate { reduction, .. } = target.root.as_ref() else { + let Some(NonASAPOp::Aggregate { reduction, .. }) = target.root.non_asap() else { return proposals; }; if !has_subpopulations(reduction) { @@ -208,11 +209,11 @@ impl<'a> HydraGroupingStrategy<'a> { /// `PerSubpopulationInstance` to /// `SharedMultiSubpopulation { kind: hydra_kind, .. }` — reusing the /// entire bind decision procedure (schema derivation, column resolution, - /// readout construction) unchanged, patching only the one field this + /// evaluation construction) unchanged, patching only the one field this /// axis owns. fn build_candidate( &self, - root: &Rc, + root: &Rc, intent: &AggIntent, sketch_kind: SketchAlgorithm, hydra_kind: HydraKind, @@ -233,12 +234,12 @@ impl<'a> HydraGroupingStrategy<'a> { params, }; - let (family, query) = match &node.expr { - SummaryExpr::SummaryEstimate { + let (family, query) = match &node.operator { + Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, query, - } => match &summary_input.expr { - SummaryExpr::SummaryAgg { family, .. } => (family, Some(query)), + }) => match &summary_input.operator { + Operator::ASAP(ASAPOp::SummaryAgg { family, .. }) => (family, Some(query)), _ => return None, }, _ => return None, @@ -295,7 +296,7 @@ impl<'a> HydraGroupingStrategy<'a> { } Some(ReplacementSubDAG { strategy: "HydraGroupingStrategy", - replacement: Replacement::Summary(patched), + replacement: Replacement::SubDAG(patched), provenance: crate::replacement::ReplacementProvenance::SummaryRealization, rationale: format!( "{} realizes as a shared {hydra_kind:?} structure over {sketch_kind:?} \ @@ -313,7 +314,7 @@ impl<'a> HydraGroupingStrategy<'a> { impl ReplacementStrategy for HydraGroupingStrategy<'_> { fn matches(&self, target: &TargetSubDAG<'_>) -> bool { - let QueryExpr::Aggregate { reduction, .. } = target.root.as_ref() else { + let Some(NonASAPOp::Aggregate { reduction, .. }) = target.root.non_asap() else { return false; }; if !has_subpopulations(reduction) { @@ -357,15 +358,15 @@ impl ReplacementStrategy for HydraGroupingStrategy<'_> { /// destructures the right variant for `kind`; this function's only job is /// to find whatever `SketchParams` the bind decision already committed to /// and hand the whole thing over unchanged. -fn per_subpopulation_sketch_params(node: &SummaryNode) -> Option { - match &node.expr { - SummaryExpr::SummaryEstimate { summary_input, .. } => { +fn per_subpopulation_sketch_params(node: &OperatorNode) -> Option { + match &node.operator { + Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) => { per_subpopulation_sketch_params(summary_input) } - SummaryExpr::SummaryAgg { + Operator::ASAP(ASAPOp::SummaryAgg { family: FieldDataType::Sketch(kind, _), .. - } => Some(kind.params().clone()), + }) => Some(kind.params().clone()), _ => None, } } @@ -373,33 +374,35 @@ fn per_subpopulation_sketch_params(node: &SummaryNode) -> Option { /// Rebuild `node`, replacing its `SummaryAgg`'s `grouping` field with /// `grouping` — patching the one field this axis owns onto an /// already-correctly-bound node rather than re-deriving the rest of it. -/// Recurses through a `SummaryEstimate` readout wrapper (the shape every +/// Recurses through a `SummaryEstimate` evaluation wrapper (the shape every /// sketch candidate this module builds actually has) to reach the /// `SummaryAgg` underneath. fn with_grouping( - node: Rc, + node: Rc, grouping: GroupingStrategy, stats: &PropagationStats, -) -> Rc { - match &node.expr { - SummaryExpr::SummaryEstimate { +) -> Rc { + match &node.operator { + Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, query, - } => Rc::new(SummaryNode { - expr: SummaryExpr::SummaryEstimate { - summary_input: with_grouping(Rc::clone(summary_input), grouping, stats), - query: query.clone(), - }, - schema: node.schema.clone(), - guarantee: node.guarantee.as_ref().map(|g| hydra_guarantee(g, stats)), - }), - SummaryExpr::SummaryAgg { + }) => std::rc::Rc::new( + OperatorNode::with_schema( + asap_types::ir::Operator::ASAP(ASAPOp::SummaryEstimate { + summary_input: with_grouping(Rc::clone(summary_input), grouping, stats), + query: query.clone(), + }), + node.schema.clone(), + ) + .with_guarantee(node.guarantee.as_ref().map(|g| hydra_guarantee(g, stats))), + ), + Operator::ASAP(ASAPOp::SummaryAgg { child, family, input, reduction, .. - } => { + }) => { let grouped_family = match family { FieldDataType::Sketch(kind, _) => { FieldDataType::Sketch(kind.clone(), grouping.clone()) @@ -412,17 +415,21 @@ fn with_grouping( field.dtype = FieldDataType::Sketch(kind.clone(), grouping.clone()); } } - Rc::new(SummaryNode { - expr: SummaryExpr::SummaryAgg { - child: Rc::clone(child), - family: grouped_family, - input: input.clone(), - reduction: reduction.clone(), - grouping, - filter: None, - }, - schema: grouped_schema, - guarantee: None, + // Regrouping the same state leaves the observations it covers unchanged. + std::rc::Rc::new(OperatorNode { + coverage: node.coverage.clone(), + ..OperatorNode::with_schema( + asap_types::ir::Operator::ASAP(ASAPOp::SummaryAgg { + child: Rc::clone(child), + family: grouped_family, + input: input.clone(), + reduction: reduction.clone(), + grouping, + filter: None, + }), + grouped_schema, + ) + .with_guarantee(None) }) } // Never reached by this module's own callers (they only ever pass a @@ -492,51 +499,11 @@ fn hydra_guarantee(inner: &ResultGuarantee, stats: &PropagationStats) -> ResultG mod tests { use super::*; use crate::accuracy::{DefaultAccuracyModel, EqualSplitAllocator}; + use crate::test_support::{agg, agg_per_entity, metric_scan}; use asap_types::post_asap::ErrorMetric; use asap_types::pre_asap::agg_intent::{default_cardinality, default_quantile}; - use asap_types::pre_asap::query_expr::Source; - use asap_types::pre_asap::schema::{DataType, Field, Schema}; use asap_types::types::AccuracyTarget; - fn metric_scan(labels: &[&str]) -> QueryExpr { - let mut columns = vec![ - Field::plain("ts", DataType::Timestamp, false), - Field::plain("value", DataType::Float64, false), - ]; - columns.extend( - labels - .iter() - .map(|n| Field::plain(*n, DataType::Utf8, true)), - ); - QueryExpr::Scan { - source: Source::TimeSeries { metric: "m".into() }, - predicates: vec![], - schema: Schema::with_time_index(columns, 0, vec![]), - } - } - - fn agg(by: Vec, intent: AggIntent, child: QueryExpr) -> QueryExpr { - QueryExpr::Aggregate { - reduction: Reduction::by(by), - measures: vec![intent], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(child), - } - } - - fn agg_per_entity(intent: AggIntent, child: QueryExpr) -> QueryExpr { - QueryExpr::Aggregate { - reduction: Reduction::PerEntity, - measures: vec![intent], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(child), - } - } - // ── has_subpopulations ──────────────────────────────────────────────── #[test] @@ -556,7 +523,7 @@ mod tests { #[test] fn without_grouping_has_a_subpopulation_concept_even_when_empty() { - use asap_types::pre_asap::query_expr::GroupKeys; + use asap_types::ir::operator_properties::GroupKeys; // `without([])` groups by every remaining label — a real // subpopulation concept, unlike `by([])`'s genuine full reduction. assert!(has_subpopulations(&Reduction::Reduce(GroupKeys::without( @@ -603,7 +570,7 @@ mod tests { delta: 0.01, }, }; - let q = Rc::new(agg(vec![2], intent, metric_scan(&["job"]))); + let q = agg(vec![2], intent, metric_scan(&["job"])); let target = TargetSubDAG::new(&q); assert!(HydraGroupingStrategy::default_cost_model().matches(&target)); } @@ -611,7 +578,7 @@ mod tests { #[test] fn does_not_match_an_empty_by_aggregate() { // Global reduction — no subpopulation concept, no Hydra alternative. - let q = Rc::new(agg(vec![], default_quantile(0.99), metric_scan(&["job"]))); + let q = agg(vec![], default_quantile(0.99), metric_scan(&["job"])); let target = TargetSubDAG::new(&q); let strategy = HydraGroupingStrategy::default_cost_model(); assert!(!strategy.matches(&target)); @@ -620,10 +587,7 @@ mod tests { #[test] fn does_not_match_a_per_entity_aggregate() { - let q = Rc::new(agg_per_entity( - default_quantile(0.99), - metric_scan(&["job"]), - )); + let q = agg_per_entity(default_quantile(0.99), metric_scan(&["job"])); let target = TargetSubDAG::new(&q); let strategy = HydraGroupingStrategy::default_cost_model(); assert!(!strategy.matches(&target)); @@ -632,14 +596,14 @@ mod tests { #[test] fn does_not_match_a_non_aggregate_node() { - let scan = Rc::new(metric_scan(&["job"])); + let scan = metric_scan(&["job"]); let target = TargetSubDAG::new(&scan); assert!(!HydraGroupingStrategy::default_cost_model().matches(&target)); } #[test] fn quantile_has_no_hydra_candidate_without_a_modeled_error_bound() { - let q = Rc::new(agg(vec![2], default_quantile(0.99), metric_scan(&["job"]))); + let q = agg(vec![2], default_quantile(0.99), metric_scan(&["job"])); let target = TargetSubDAG::new(&q); let replacements = HydraGroupingStrategy::default_cost_model().replacements(&target); assert!(replacements.is_empty(), "{replacements:?}"); @@ -653,13 +617,13 @@ mod tests { delta: 0.01, }, }; - let q = Rc::new(agg(vec![2], intent, metric_scan(&["job"]))); + let q = agg(vec![2], intent, metric_scan(&["job"])); let target = TargetSubDAG::new(&q); let replacements = HydraGroupingStrategy::default_cost_model().replacements(&target); assert_eq!(replacements.len(), 2, "{replacements:?}"); assert!(replacements.iter().all(|candidate| matches!( &candidate.replacement, - Replacement::Summary(node) + Replacement::SubDAG(node) if node.guarantee.as_ref().is_some_and(|guarantee| guarantee.bound.evaluate().is_none() && guarantee.failure_probability.evaluate().is_none()) @@ -691,7 +655,7 @@ mod tests { delta: 0.01, }, }; - let q = Rc::new(agg(vec![2], intent, metric_scan(&["job"]))); + let q = agg(vec![2], intent, metric_scan(&["job"])); let strategy = HydraGroupingStrategy::new_with_planning_inputs_and_evidence( &DefaultCostModel, &DefaultAccuracyModel, @@ -702,7 +666,7 @@ mod tests { assert_eq!(replacements.len(), 2, "{replacements:?}"); assert!(replacements.iter().all(|candidate| matches!( &candidate.replacement, - Replacement::Summary(node) + Replacement::SubDAG(node) if node.guarantee.as_ref().is_some_and(|g| g.bound.evaluate().is_some() && g.failure_probability.evaluate().is_some()) @@ -731,7 +695,7 @@ mod tests { delta: 0.01, }, }; - let q = Rc::new(agg(vec![2], intent, metric_scan(&["job"]))); + let q = agg(vec![2], intent, metric_scan(&["job"])); let strategy = HydraGroupingStrategy::new_with_planning_inputs_and_evidence( &DefaultCostModel, &DefaultAccuracyModel, @@ -771,7 +735,7 @@ mod tests { } } } - let q = Rc::new(agg( + let q = agg( vec![2], AggIntent::Count { accuracy: AccuracyTarget::EpsilonDelta { @@ -780,7 +744,7 @@ mod tests { }, }, metric_scan(&["job"]), - )); + ); let strategy = HydraGroupingStrategy::new_with_planning_inputs_and_evidence( &DefaultCostModel, &DefaultAccuracyModel, @@ -801,7 +765,7 @@ mod tests { // summary_candidates(Cardinality) = [Hll, Theta, Kmv] — none have a // modeled Hydra variant, so no candidate at all (not an error, just // an empty result, same conservatism as every other strategy here). - let q = Rc::new(agg(vec![2], default_cardinality(), metric_scan(&["job"]))); + let q = agg(vec![2], default_cardinality(), metric_scan(&["job"])); let target = TargetSubDAG::new(&q); let strategy = HydraGroupingStrategy::default_cost_model(); assert!(!strategy.matches(&target)); @@ -817,7 +781,7 @@ mod tests { q: 0.99, accuracy: AccuracyTarget::Exact, }; - let q = Rc::new(agg(vec![2], intent, metric_scan(&["job"]))); + let q = agg(vec![2], intent, metric_scan(&["job"])); let target = TargetSubDAG::new(&q); let strategy = HydraGroupingStrategy::default_cost_model(); assert!(!strategy.matches(&target)); @@ -828,11 +792,7 @@ mod tests { fn exact_mergeable_intent_has_no_hydra_candidate() { // Sum's exact accumulator has no candidate summary families at all // (summary_candidates only covers approximate-capable intents). - let q = Rc::new(agg( - vec![2], - AggIntent::Sum { col: None }, - metric_scan(&["job"]), - )); + let q = agg(vec![2], AggIntent::Sum { col: None }, metric_scan(&["job"])); let target = TargetSubDAG::new(&q); let strategy = HydraGroupingStrategy::default_cost_model(); assert!(!strategy.matches(&target)); @@ -843,14 +803,16 @@ mod tests { fn does_not_match_a_multi_intent_or_having_aggregate() { let strategy = HydraGroupingStrategy::default_cost_model(); - let multi = Rc::new(QueryExpr::Aggregate { - reduction: Reduction::by(vec![2]), - measures: vec![AggIntent::Sum { col: None }, AggIntent::Avg { col: None }], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(metric_scan(&["job"])), - }); + let multi = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { + reduction: Reduction::by(vec![2]), + measures: vec![AggIntent::Sum { col: None }, AggIntent::Avg { col: None }], + output_names: vec![], + filters: vec![], + having: None, + child: metric_scan(&["job"]), + })) + .unwrap(); let target = TargetSubDAG::new(&multi); assert!(!strategy.matches(&target)); assert!(strategy.replacements(&target).is_empty()); @@ -859,7 +821,7 @@ mod tests { /// A custom `CostModel` doesn't change *which* candidate is offered — /// only which sketch candidate `realizations_for_intent` itself would /// have ranked first, and how that candidate's own params are sized — - /// same guarantee `SketchAlgorithmStrategy` makes for its own candidates. + /// same guarantee `ASAPStrategies` makes for its own candidates. struct PreferDDSketch; impl CostModel for PreferDDSketch { fn rank_candidates( @@ -878,7 +840,7 @@ mod tests { #[test] fn custom_cost_model_cannot_enable_unproven_hydra_kll() { - let q = Rc::new(agg(vec![2], default_quantile(0.99), metric_scan(&["job"]))); + let q = agg(vec![2], default_quantile(0.99), metric_scan(&["job"])); let target = TargetSubDAG::new(&q); let custom = PreferDDSketch; let replacements = HydraGroupingStrategy::new(&custom).replacements(&target); diff --git a/crates/asap-aware-mapping/src/lib.rs b/crates/asap-aware-mapping/src/lib.rs index 95e50a552..f9bf69101 100644 --- a/crates/asap-aware-mapping/src/lib.rs +++ b/crates/asap-aware-mapping/src/lib.rs @@ -1,18 +1,18 @@ //! `asap-plan` — the cost-aware optimizer layer over the pre-ASAP intent algebra. //! //! This crate sits between the language-agnostic IR ([`asap_ir`]) and -//! any runtime: it consumes pre-ASAP [`QueryExpr`](asap_types::pre_asap::QueryExpr) +//! any runtime: it consumes pre-ASAP [`OperatorNode`](asap_types::ir::OperatorNode) //! DAGs and makes the cost-aware decisions the pre-ASAP IR deliberately //! leaves open — which sketch (if any) realises each approximate intent. //! //! **Common sub-expression elimination (CSE) is not this crate's job.** -//! Detection is a primary pass over the pre-ASAP `QueryExpr` IR itself -//! (`asap_types::pre_asap`, design tracked in issue #223), run before a -//! DAG ever reaches [`replacement::SketchAlgorithmStrategy`] — see issue #222 +//! Detection is a primary pass over the pre-ASAP operator IR itself +//! (`asap_types::ir::cse`, design tracked in issue #223), run before a +//! tree ever reaches [`replacement::ASAPStrategies`] — see issue #222 //! for why (batch query optimization needs to see shared work across a //! `QueryWorkload` before summary binding, not after). This crate may //! eventually run a second, narrower CSE pass of its own over an -//! already-bound `SummaryExpr`/`SummaryNode` DAG, recognizing sharing that's invisible +//! already-bound post-ASAP `OperatorNode` DAG, recognizing sharing that's invisible //! at the pre-ASAP level by construction — e.g. `Quantile(x, 0.99)` and //! `Quantile(x, 0.95)` are structurally distinct `AggIntent`s but can //! still share one built sketch, read out twice. That post-ASAP pass is @@ -22,9 +22,9 @@ //! It depends only on the IR crate, never on a front end — the layering //! invariant (arrows point up) holds here too. //! -//! Post-lowering **canonicalization** is *not* here: it landed in -//! `asap_types::pre_asap::canonicalize`, run inside the shared `resolve_root` -//! so every front end normalizes before the pre-ASAP IR leaves resolution +//! Post-lowering **canonicalization** is *not* here: it lives in +//! `asap_types::ir::canonicalize`, run inside `asap_frontend_common`'s shared +//! `resolve_root` so every front end normalizes before the IR leaves resolution //! (issue #34, closed). //! //! ## Planning workflows @@ -41,14 +41,11 @@ //! to obtain ranked views, and perform selection downstream. //! - Call [`CandidateLogicalASAPDAGs::global_selection`] once for the workload, then //! [`GlobalSelection::assemble_selected_dag`] for each query root. This -//! coordinates logical choices and preserves shared nodes, but makes no -//! summary-maintenance lifecycle decision. -//! - When Planner owns maintenance-versus-recomputation decisions, use -//! [`global_selection_with_summary_maintenance_lifecycles`] followed by -//! [`assemble_selected_dag_with_summary_maintenance_lifecycles`] per root. -//! This alternative workflow returns [`SummaryMaintenanceLifecyclePlan`] -//! values containing DAG roots and maintenance decisions; callers do not need -//! to run ordinary selection/assembly first. +//! coordinates logical choices and preserves shared nodes. Whether and when +//! a summary state is materialized is not decided here: every summary runs +//! at query time until Stage 2 materialization (#509) owns that choice. +//! - Run the whole pipeline through [`optimize`] with [`MajorPass`], which +//! performs the two steps above for every root of a parsed workload. //! //! Models and evidence determine which choices the helpers can justify. //! Physical operator binding, placement, storage, deployment, and execution @@ -83,7 +80,7 @@ //! re-deriving it from an already-computed, strictly finer sibling //! `Aggregate` over identical child IR instead of an independent pass //! over the raw source — the cross-aggregate sibling of -//! `pre_asap::cse::share_common_sub_dags`'s identical-sub-DAG sharing. +//! `ir::cse::share_common_sub_dags`'s identical-sub-DAG sharing. //! [`rollup::is_legal_rollup_source`] is the standalone legality predicate //! other axes (e.g. issue #256's `GroupingStrategy`) are expected to //! consult directly, so it and this module's `RollupStrategy` can never @@ -92,7 +89,7 @@ //! #33) is an additional `ReplacementStrategy`: the orthogonal //! `GroupingStrategy` axis (one summary instance per `by` subpopulation //! versus one shared Hydra-family structure serving all of them), offered -//! alongside the candidates [`replacement::SketchAlgorithmStrategy`] +//! alongside the candidates [`replacement::ASAPStrategies`] //! enumerates for the same target. //! - [`rewrite`] — the "semantic-equivalent rewriting (e.g. `avg` → //! `sum`/`count`) to increase how often the [sharing/sketch] optimizations @@ -115,9 +112,9 @@ //! //! | Term | Meaning | Entry point | //! |---|---|---| -//! | Schema resolution | Derive input schemas and resolve column names to positions | `asap_types::pre_asap::SchemaResolver::resolve_schema`, `resolve_root` | +//! | Schema resolution | Derive input schemas and resolve column names to positions | `asap_frontend_common::schema_resolver::SchemaResolver::resolve_schema`, `asap_frontend_common::resolve::resolve_root` | //! | Realization | Enumerate ranked physical forms for one aggregate intent | `replacement::realizations_for_intent` | -//! | Replacement | Construct each candidate summary sub-DAG | [`replacement::SketchAlgorithmStrategy`] | +//! | Replacement | Construct each candidate summary sub-DAG | [`replacement::ASAPStrategies`] | //! | Search | Enumerate and compare alternatives across a workload | [`replacement::search_workload`] | //! | Runtime placement | Choose deployment locations and concrete executors | Downstream physical plan providers | //! @@ -172,9 +169,6 @@ pub mod replacement; pub mod rewrite; pub mod rollup; pub mod storage_io; -pub mod summary_maintenance_cost; -pub mod summary_maintenance_dag_export; -pub mod summary_maintenance_lifecycle; #[cfg(test)] mod test_support; pub mod topk_reuse; @@ -185,7 +179,6 @@ pub use accuracy::{ CompositionShape, DefaultAccuracyModel, EqualSplitAllocator, NoAccuracyEvidence, PropagationStats, WorkloadAccuracyEvidence, }; -pub use cost_model::CompleteSummaryCandidateEstimate; pub use cost_model::{ maintenance_operation_plan_cost_rate, raw_recompute_cost_rate, read_operation_plan_cost_rate, CostModel, CostProvenance, CostUnit, DefaultCostModel, ExactCompositionCostInputs, @@ -197,9 +190,8 @@ pub use explanation::{ }; pub use grouping::{has_subpopulations, HydraGroupingStrategy}; pub use pass::{ - optimize, LifecycleInput, MajorPass, OptimizationInput, OptimizationInputError, - OptimizationPass, OptimizeError, PassNameConflict, PassRegistry, PlanOutput, PlanningModels, - QueryLifecyclePlan, + optimize, MajorPass, OptimizationInput, OptimizationInputError, OptimizationPass, + OptimizeError, PassNameConflict, PassRegistry, PlanOutput, PlanningModels, QueryPlan, }; pub use recurrence::{ evaluation_rate_of, total_cost, update_rate_from_data_workload, CostRate, EvaluationRate, @@ -207,30 +199,19 @@ pub use recurrence::{ UpdateRate, }; pub use replacement::{ - default_strategies, default_strategies_with, search_workload, search_workload_with, - search_workload_with_targets, summary_candidates, CandidateLogicalASAPDAGs, - CompositionDecision, GlobalSelection, Matcher, Proposals, RankedTargetSubDAGCandidates, - Realization, RealizationError, RecurrenceProfileMap, RejectedCandidate, Replacement, - ReplacementProvenance, ReplacementStrategy, ReplacementSubDAG, SharedSubDAGStrategy, - SketchAlgorithmStrategy, TargetSubDAG, TargetSubDAGCandidates, TargetSubDAGSelection, + default_strategies, default_strategies_with, is_logical_rewrite, search_workload, + search_workload_with, search_workload_with_targets, summary_candidates, ASAPStrategies, + CandidateLogicalASAPDAGs, CompositionDecision, GlobalSelection, Matcher, Proposals, + RankedTargetSubDAGCandidates, Realization, RealizationError, RecurrenceProfileMap, + RejectedCandidate, Replacement, ReplacementProvenance, ReplacementStrategy, ReplacementSubDAG, + SharedSubDAGStrategy, TargetSubDAG, TargetSubDAGCandidates, TargetSubDAGSelection, MAX_SEARCH_ITERATIONS, }; pub use rewrite::{AvgToSumOverCountStrategy, SemanticEquivalentRewriteStrategy}; -pub use summary_maintenance_dag_export::{ - export_summary_maintenance_plan, SummaryMaintenanceDAGExport, - SummaryMaintenanceDeploymentExport, SummaryMaintenanceLifecycleAlternativeExport, -}; -pub use summary_maintenance_lifecycle::{ - assemble_selected_dag_with_summary_maintenance_lifecycles, - enumerate_summary_maintenance_lifecycles, global_selection_with_summary_maintenance_lifecycles, - plan_summary_maintenance_lifecycles, SummaryMaintenanceCapabilities, - SummaryMaintenanceDeployment, SummaryMaintenanceLifecycleAlternative, - SummaryMaintenanceLifecycleAssemblyError, SummaryMaintenanceLifecycleCandidates, - SummaryMaintenanceLifecycleCapabilities, SummaryMaintenanceLifecycleChoiceError, - SummaryMaintenanceLifecycleCostInputs, SummaryMaintenanceLifecyclePlan, - SummaryMaintenanceLifecyclePlanError, SummaryMaintenanceLifecycleRejection, - SummaryMaintenanceLifecycleSelectionError, SummaryMaintenanceTimingError, WorkloadDemand, -}; pub use topk_reuse::TopKLimitReuseStrategy; pub mod maintained_population; + +/// Local candidate generation over the unified IR. No execution timing is +/// assigned: that is a Stage 2 materialization decision. +pub mod logical_candidates; diff --git a/crates/asap-aware-mapping/src/logical_candidates.rs b/crates/asap-aware-mapping/src/logical_candidates.rs new file mode 100644 index 000000000..8c8a28913 --- /dev/null +++ b/crates/asap-aware-mapping/src/logical_candidates.rs @@ -0,0 +1,147 @@ +//! Pass 1 local alternatives over the unified logical IR. +//! +//! Alternatives are nominal realization descriptors attached to their original +//! target, not ranked plans or accuracy certificates. Workload composition and +//! physical planning consume this inventory later; empirical models belong to +//! selection. The legacy search API remains until planner cutover. +use std::collections::HashSet; +use std::rc::Rc; + +use asap_types::ir::{NonASAPOp, OperatorNode, QueryRoot, SchemaDerivationError}; +use asap_types::post_asap::{ExactKind, ExactParams, SketchKind}; +use asap_types::pre_asap::AggIntent; +use asap_types::types::AccuracyTarget; +use thiserror::Error; + +use crate::replacement::{ + accuracy_budget, accuracy_target, default_size_params, summary_candidates, Realization, +}; + +/// All local realizations of one single-measure aggregate. The target retains +/// source, grouping, filters, input expressions and evaluation context. +#[derive(Debug, Clone)] +pub struct LocalLogicalTarget { + pub target: Rc, + pub alternatives: Vec, +} + +/// Compact Pass 1 inventory; roots and nested producer dependencies are retained. +#[derive(Debug, Clone)] +pub struct LocalLogicalCandidates { + pub roots: Vec<(Id, QueryRoot)>, + pub targets: Vec, +} + +#[derive(Debug, Error)] +pub enum LogicalCandidateError { + #[error(transparent)] + Structure(#[from] SchemaDerivationError), + #[error("logical candidate input already has assigned execution timing")] + AssignedTiming, + #[error("approximate accuracy requires finite positive epsilon and delta in (0, 1)")] + InvalidAccuracy, +} + +/// Enumerate exact and summary choices in stable catalog order, without ranking +/// or empirical assessment. Parameters are candidate dimensions, not a claim +/// that a deployment meets the request's accuracy requirement. +pub fn local_realizations_for_intent( + intent: &AggIntent, +) -> Result, LogicalCandidateError> { + let mut choices = vec![Realization::PassThrough]; + let exact = match intent { + AggIntent::Count { .. } => Some((ExactKind::Count, ExactParams::Count)), + AggIntent::Sum { .. } => Some((ExactKind::Sum, ExactParams::Sum)), + AggIntent::Min { .. } => Some((ExactKind::Min, ExactParams::Min)), + AggIntent::Max { .. } => Some((ExactKind::Max, ExactParams::Max)), + AggIntent::Rate => Some((ExactKind::Rate, ExactParams::Rate)), + AggIntent::IRate => Some((ExactKind::IRate, ExactParams::IRate)), + AggIntent::Increase => Some((ExactKind::Increase, ExactParams::Increase)), + _ => None, + }; + if let Some((kind, params)) = exact { + choices.push(Realization::ExactAggregate { kind, params }); + } + if let Some(target) = accuracy_target(intent) { + if *target != AccuracyTarget::Exact { + let (epsilon, delta) = accuracy_budget(target); + if !epsilon.is_finite() + || epsilon <= 0.0 + || !delta.is_finite() + || !(0.0..1.0).contains(&delta) + || delta == 0.0 + { + return Err(LogicalCandidateError::InvalidAccuracy); + } + for algorithm in summary_candidates(intent) { + choices.push(Realization::Sketch(SketchKind::new( + algorithm.clone(), + default_size_params(algorithm.clone(), intent, epsilon, delta), + ))); + } + } + } + Ok(choices) +} + +/// Discover single-measure targets, including operator plans read by scalar roots. +/// Multi-measure aggregates remain intact pending a semantics-preserving split. +pub fn enumerate_local_logical_candidates( + roots: Vec<(Id, QueryRoot)>, +) -> Result, LogicalCandidateError> { + let mut seen = HashSet::new(); + let mut targets = Vec::new(); + for (_, root) in &roots { + root.validate_structure()?; + let operators = match root { + QueryRoot::Operator(node) => vec![node], + QueryRoot::Scalar(expr) => expr.operator_refs(), + }; + for root in operators { + for node in OperatorNode::reachable(root) { + if !seen.insert(Rc::as_ptr(&node)) { + continue; + } + if node.timing.is_some() { + return Err(LogicalCandidateError::AssignedTiming); + } + if let Some(NonASAPOp::Aggregate { measures, .. }) = node.non_asap() { + if let [intent] = measures.as_slice() { + targets.push(LocalLogicalTarget { + alternatives: local_realizations_for_intent(intent)?, + target: node, + }); + } + } + } + } + } + Ok(LocalLogicalCandidates { roots, targets }) +} + +#[cfg(test)] +mod tests { + use super::*; + /// Approximate requests must retain the exact execution alternative too. + #[test] + fn approximate_count_keeps_exact_and_universal_choices() { + let choices = local_realizations_for_intent(&AggIntent::Count { + accuracy: AccuracyTarget::EpsilonDelta { + epsilon: 0.05, + delta: 0.01, + }, + }) + .unwrap(); + assert!(choices + .iter() + .any(|choice| matches!(choice, Realization::PassThrough))); + assert!(choices.iter().any(|choice| matches!( + choice, + Realization::ExactAggregate { + kind: ExactKind::Count, + .. + } + ))); + assert!(choices.iter().any(|choice| matches!(choice, Realization::Sketch(kind) if *kind.algorithm() == asap_types::post_asap::SketchAlgorithm::UnivMon))); + } +} diff --git a/crates/asap-aware-mapping/src/maintained_population.rs b/crates/asap-aware-mapping/src/maintained_population.rs index b749a6967..d37c31c11 100644 --- a/crates/asap-aware-mapping/src/maintained_population.rs +++ b/crates/asap-aware-mapping/src/maintained_population.rs @@ -2,22 +2,14 @@ use crate::replacement::{ Replacement, ReplacementProvenance, ReplacementStrategy, ReplacementSubDAG, TargetSubDAG, }; -use asap_types::post_asap::{ - maintained_population::*, ExecutionTiming, ResultGuarantee, SummaryExpr, SummaryNode, - ValueOperation, -}; -use asap_types::pre_asap::{ - any_measure_filtered, AggIntent, CompareOpKind, DataType, QueryExpr, Reduction, ScalarValue, - Schema, Source, -}; +use asap_types::ir::non_asap::any_measure_filtered; +use asap_types::ir::{ASAPOp, NonASAPOp, Operator, OperatorNode, ScalarExpr}; +use asap_types::post_asap::{maintained_population::*, ResultGuarantee}; +use asap_types::pre_asap::{AggIntent, CompareOpKind, DataType, Reduction, ScalarValue, Source}; use std::rc::Rc; -fn plain(schema: Schema) -> Schema { - Schema::lifted(schema.fields, schema.time_index) -} - -fn strip_projection(mut root: &QueryExpr) -> &QueryExpr { - while let QueryExpr::Project { child, .. } = root { +fn strip_projection(mut root: &OperatorNode) -> &OperatorNode { + while let Some(NonASAPOp::Project { child, .. }) = root.non_asap() { root = child; } root @@ -26,17 +18,20 @@ fn strip_projection(mut root: &QueryExpr) -> &QueryExpr { /// Skips a projection that keeps every column in place, such as the one /// `SELECT *` lowers to: it changes neither the rows nor the column positions /// a Sort key refers to. -fn strip_identity_projection(expr: &Rc) -> &Rc { - if let QueryExpr::Project { +fn strip_identity_projection(expr: &Rc) -> &Rc { + if let Some(NonASAPOp::Project { cols, qualifier: None, child, - } = expr.as_ref() + }) = expr.non_asap() { - let width = child.output_schema().map(|schema| schema.fields.len()); + let width = child + .operator + .output_schema() + .map(|schema| schema.fields.len()); if width.ok() == Some(cols.len()) && cols.iter().enumerate().all(|(i, item)| { - item.alias.is_none() && matches!(item.expr, QueryExpr::Column(c) if c == i) + item.alias.is_none() && matches!(item.expr, ScalarExpr::Column(c) if c == i) }) { return child; @@ -46,11 +41,11 @@ fn strip_identity_projection(expr: &Rc) -> &Rc { } fn recognize( - root: &QueryExpr, -) -> Option<(MaintainedPopulation, PopulationStatistic, Rc)> { + root: &OperatorNode, +) -> Option<(MaintainedPopulation, PopulationStatistic, Rc)> { let root = strip_projection(root); - let (source, grouping, readout, value_column) = match root { - QueryExpr::Aggregate { + let (source, grouping, evaluation, value_column) = match root.non_asap()? { + NonASAPOp::Aggregate { child, reduction: Reduction::Reduce(grouping), measures, @@ -64,7 +59,7 @@ fn recognize( if any_measure_filtered(filters) { return None; } - let (col, readout) = match intent { + let (col, evaluation) = match intent { AggIntent::Quantile { q, col, .. } if q.is_finite() => { (*col, PopulationStatistic::Quantile { q: *q }) } @@ -74,29 +69,30 @@ fn recognize( AggIntent::Avg { col } => (*col, PopulationStatistic::Average), _ => return None, }; - let schema = child.output_schema().ok()?; + let schema = &child.schema; if col.is_some_and(|c| schema.fields.get(c).is_none()) { return None; } - (child, grouping, readout, col) + (child, grouping, evaluation, col) } - QueryExpr::Limit { - n, + NonASAPOp::Limit { + n: Some(n), offset: 0, child, + .. } => { - let QueryExpr::Sort { + let Some(NonASAPOp::Sort { child, keys, partition_by, - } = child.as_ref() + }) = child.non_asap() else { return None; }; let [key] = keys.as_slice() else { return None; }; - let QueryExpr::Column(col) = &key.expr else { + let ScalarExpr::Column(col) = &key.expr else { return None; }; if key.ascending { @@ -111,11 +107,11 @@ fn recognize( } _ => return None, }; - if let QueryExpr::Scan { + if let Some(NonASAPOp::Scan { source: Source::Table { .. }, schema, .. - } = source.as_ref() + }) = source.non_asap() { let value_column = value_column.or_else(|| { schema @@ -132,29 +128,29 @@ fn recognize( max_k: 0, quantiles: false, }; - if !schema.closed || !population.matches_input(source) { + if !schema.closed || !population.matches_node(source) { return None; } - return Some((population, readout, Rc::clone(source))); + return Some((population, evaluation, Rc::clone(source))); } // A bare PromQL selector carries the declared ingestion interval as a // temporal input scope. Membership must expire at that horizon; retain // the wrapper as the maintained input so validation can check agreement. - let (series_source, lookback_ms) = match source.as_ref() { - QueryExpr::TimeRange { range, child } => { + let (series_source, lookback_ms) = match source.non_asap() { + Some(NonASAPOp::TimeRange { range, child, .. }) => { let ms = u64::try_from(range.as_millis()).ok()?; if ms == 0 || std::time::Duration::from_millis(ms) != *range { return None; } (child.as_ref(), ms) } - other => (other, 300_000), + _ => (source.as_ref(), 300_000), }; - let QueryExpr::Scan { + let Some(NonASAPOp::Scan { source: Source::TimeSeries { metric }, predicates, schema, - } = series_source + }) = series_source.non_asap() else { return None; }; @@ -174,10 +170,13 @@ fn recognize( }; let mut matchers = Vec::new(); for predicate in predicates { - let QueryExpr::Compare { left, op, right } = predicate.0.as_ref() else { + let ScalarExpr::Compare { + left, op, right, .. + } = &predicate.0 + else { return None; }; - let (QueryExpr::Column(col), QueryExpr::Literal(ScalarValue::Utf8(value))) = + let (ScalarExpr::Column(col), ScalarExpr::Literal(ScalarValue::Utf8(value))) = (left.as_ref(), right.as_ref()) else { return None; @@ -216,46 +215,46 @@ fn recognize( max_k: 0, quantiles: false, }, - readout, + evaluation, Rc::clone(source), )) } -/// Workload-aware rule: compatible readouts share one retractable population. +/// Workload-aware rule: compatible evaluations share one retractable population. /// Deployments opt in by registering this strategy when they can maintain complete -/// population updates and price the maintenance/readout boundary. -/// The population is exact; max_k bounds the shared readout cache, not its members. +/// population updates and price the maintenance/evaluation boundary. +/// The population is exact; max_k bounds the shared evaluation cache, not its members. pub struct MaintainedPopulationStrategy { - roots: Vec>, + roots: Vec>, } impl MaintainedPopulationStrategy { - pub fn new(roots: &[Rc]) -> Self { + pub fn new(roots: &[Rc]) -> Self { Self { roots: roots.to_vec(), } } - pub fn candidate(&self, root: &Rc) -> Option> { - if let QueryExpr::Project { + pub fn candidate(&self, root: &Rc) -> Option> { + if let Some(NonASAPOp::Project { cols, qualifier, child, - } = root.as_ref() + }) = root.non_asap() { let child = self.candidate(child)?; - return Some(Rc::new(SummaryNode { - guarantee: child.guarantee.clone(), - schema: plain(root.output_schema().ok()?), - expr: SummaryExpr::ValueOperation { - child, - operation: ValueOperation::Project { + let guarantee = child.guarantee.clone(); + return Some(Rc::new( + OperatorNode::with_schema( + Operator::NonASAP(NonASAPOp::Project { cols: cols.clone(), qualifier: qualifier.clone(), - }, - timing: ExecutionTiming::QueryTime, - }, - })); + child, + }), + root.schema.clone(), + ) + .with_guarantee(guarantee), + )); } - let (mut population, readout, source) = recognize(root)?; + let (mut population, evaluation, source) = recognize(root)?; let identity = population.clone(); for other in self.roots.iter().chain(std::iter::once(root)) { if let Some((p, r, _)) = recognize(other) { @@ -272,36 +271,39 @@ impl MaintainedPopulationStrategy { } } } - let input_schema = plain(source.output_schema().ok()?); - let scan = Rc::new(SummaryNode { - expr: SummaryExpr::KeepPreAsap(source), - schema: input_schema.clone(), - guarantee: Some(ResultGuarantee::exact("source samples")), - }); - // Query time is only the initial layout: whether the population is - // retained at ingestion or rebuilt per query is its lifecycle choice - // (`SummaryMaintenanceLifecyclePlan::execution_timed_dag`). The readout - // and projection above it are query-time by construction. - let maintained = Rc::new(SummaryNode { - expr: SummaryExpr::ValueOperation { - child: scan, - operation: ValueOperation::MaintainPopulation { population }, - timing: ExecutionTiming::QueryTime, - }, - schema: input_schema, - guarantee: Some(ResultGuarantee::exact( + let input_schema = source.schema.clone(); + // The source node itself is the maintained input (a non-ASAP node + // keeps its derived schema), kept with its exact guarantee. + let scan = Rc::new( + source + .as_ref() + .clone() + .with_guarantee(Some(ResultGuarantee::exact("source samples"))), + ); + let maintained = std::rc::Rc::new( + OperatorNode::with_schema( + asap_types::ir::Operator::ASAP(ASAPOp::MaintainPopulation { + child: scan, + population, + }), + input_schema, + ) + .with_guarantee(Some(ResultGuarantee::exact( "exact members under the declared population semantics", - )), - }); - Some(Rc::new(SummaryNode { - expr: SummaryExpr::ValueOperation { - child: maintained, - operation: ValueOperation::ReadPopulation { readout }, - timing: ExecutionTiming::QueryTime, - }, - schema: plain(root.output_schema().ok()?), - guarantee: Some(ResultGuarantee::exact("exact current-population readout")), - })) + ))), + ); + Some(std::rc::Rc::new( + OperatorNode::with_schema( + asap_types::ir::Operator::ASAP(ASAPOp::EvaluatePopulation { + child: maintained, + evaluation, + }), + root.schema.clone(), + ) + .with_guarantee(Some(ResultGuarantee::exact( + "exact current-population evaluation", + ))), + )) } } impl ReplacementStrategy for MaintainedPopulationStrategy { @@ -312,10 +314,10 @@ impl ReplacementStrategy for MaintainedPopulationStrategy { self.candidate(target.root) .map(|node| ReplacementSubDAG { strategy: "MaintainedPopulationStrategy", - replacement: Replacement::Summary(node), + replacement: Replacement::SubDAG(node), provenance: ReplacementProvenance::SummaryRealization, rationale: - "share an exact maintained population across compatible aggregate readouts" + "share an exact maintained population across compatible aggregate evaluations" .into(), }) .into_iter() @@ -327,10 +329,28 @@ impl ReplacementStrategy for MaintainedPopulationStrategy { mod tests { use super::*; use crate::test_support::lower_promql; - use asap_types::post_asap::{compile_post_asap_dag, share_common_summary_sub_dags}; + use asap_types::ir::cse::share_common_sub_dags; + use asap_types::ir::export::compile_physical_asap_dag as export_timed; + use asap_types::ir::timing::{ + apply_materialization_timings, MaterializationAssignment, TimingMemo, + }; + + /// Time `root` under the default materialization assignment (which runs the + /// data-state / population-contract validation) and export it. + fn compile_physical_asap_dag(root: &Rc) -> Result<(), String> { + root.validate_structure().map_err(|e| e.to_string())?; + let timed = apply_materialization_timings( + root, + &MaterializationAssignment::all_query_time(), + &mut TimingMemo::new(), + ) + .map_err(|e| format!("{e:?}"))?; + export_timed(&timed).map_err(|e| format!("{e:?}"))?; + Ok(()) + } - fn lower(q: &str) -> Rc { - Rc::new(lower_promql(q, asap_types::types::AccuracyTarget::Exact)) + fn lower(q: &str) -> Rc { + lower_promql(q, asap_types::types::AccuracyTarget::Exact) } // Instant scalar aggregations share the same retractable series population. @@ -351,11 +371,11 @@ mod tests { let candidate = rule .candidate(&root) .expect("current-series rule candidate"); - compile_post_asap_dag(&candidate).expect("typed post-ASAP DAG"); + compile_physical_asap_dag(&candidate).expect("typed post-ASAP DAG"); } } - // Different readout parameters retain one shared maintenance producer in the DAG. + // Different evaluation parameters retain one shared maintenance producer in the DAG. #[test] fn quantiles_and_topk_share_a_planner_population() { let roots: Vec<_> = [ @@ -379,7 +399,7 @@ mod tests { .target_subdag_candidates() .flat_map(|g| &g.candidates) .any(|c| c.strategy == "MaintainedPopulationStrategy")); - let plans = share_common_summary_sub_dags( + let plans = share_common_sub_dags( roots .iter() .enumerate() @@ -388,19 +408,11 @@ mod tests { ); let mut producers = Vec::new(); for (_, plan) in &plans { - compile_post_asap_dag(plan).unwrap(); - let SummaryExpr::ValueOperation { - child, - operation: ValueOperation::ReadPopulation { .. }, - .. - } = &plan.expr - else { - panic!("missing typed readout") + compile_physical_asap_dag(plan).unwrap(); + let Operator::ASAP(ASAPOp::EvaluatePopulation { child, .. }) = &plan.operator else { + panic!("missing typed evaluation") }; - let SummaryExpr::ValueOperation { - operation: ValueOperation::MaintainPopulation { population }, - .. - } = &child.expr + let Operator::ASAP(ASAPOp::MaintainPopulation { population, .. }) = &child.operator else { panic!("missing maintained population") }; @@ -426,14 +438,10 @@ mod tests { let (p, _, _) = recognize(&roots[0]).unwrap(); assert!(matches!(p.input, PopulationInput::CurrentSeries(ref s) if s.grouping.is_empty())); let candidate = strategy.candidate(&roots[0]).unwrap(); - let SummaryExpr::ValueOperation { child, .. } = &candidate.expr else { + let Operator::ASAP(ASAPOp::EvaluatePopulation { child, .. }) = &candidate.operator else { unreachable!() }; - let SummaryExpr::ValueOperation { - operation: ValueOperation::MaintainPopulation { population }, - .. - } = &child.expr - else { + let Operator::ASAP(ASAPOp::MaintainPopulation { population, .. }) = &child.operator else { unreachable!() }; assert_eq!(population.max_k, 5); @@ -459,59 +467,51 @@ mod tests { assert_eq!(p.grouping, ["instance"]); assert_eq!(p.matchers[0].operation, CurrentSeriesMatch::Regex); } - // Population timing is a lifecycle choice: a retained or rebuilt - // population both validate, while its readout must stay at query time. + // Population timing is a materialization choice: a retained or rebuilt + // population both validate, while its evaluation must stay at query time. #[test] fn population_timing_is_not_structural() { let root = lower("topk(5,a)"); let candidate = MaintainedPopulationStrategy::new(std::slice::from_ref(&root)) .candidate(&root) .unwrap(); - let with_timings = |population: ExecutionTiming, readout: ExecutionTiming| { + use asap_types::post_asap::ExecutionTiming; + let with_timings = |population: ExecutionTiming, evaluation: ExecutionTiming| { let mut node = (*candidate).clone(); - let SummaryExpr::ValueOperation { child, timing, .. } = &mut node.expr else { - unreachable!() - }; - *timing = readout; - let SummaryExpr::ValueOperation { timing, .. } = &mut Rc::make_mut(child).expr else { + node.timing = Some(evaluation); + let Operator::ASAP(ASAPOp::EvaluatePopulation { child, .. }) = &mut node.operator + else { unreachable!() }; - *timing = population; - compile_post_asap_dag(&Rc::new(node)) + Rc::make_mut(child).timing = Some(population); + compile_physical_asap_dag(&Rc::new(node)) }; use ExecutionTiming::{IngestionTime, QueryTime}; assert!(with_timings(IngestionTime, QueryTime).is_ok()); assert!(with_timings(QueryTime, QueryTime).is_ok()); assert!(with_timings(IngestionTime, IngestionTime).is_err()); } - // A readout cannot reinterpret arbitrary rows as maintained state or exceed its producer's contract. + // A evaluation cannot reinterpret arbitrary rows as maintained state or exceed its producer's contract. #[test] fn malformed_population_dags_fail_closed() { let root = lower("topk(5,a)"); let strategy = MaintainedPopulationStrategy::new(std::slice::from_ref(&root)); let candidate = strategy.candidate(&root).unwrap(); + compile_physical_asap_dag(&candidate).expect("the unmodified candidate is legal"); let mut bad = (*candidate).clone(); - let SummaryExpr::ValueOperation { operation, .. } = &mut bad.expr else { + let Operator::ASAP(ASAPOp::EvaluatePopulation { evaluation, .. }) = &mut bad.operator + else { unreachable!() }; - *operation = ValueOperation::ReadPopulation { - readout: PopulationStatistic::TopK { k: 6 }, - }; - assert!(compile_post_asap_dag(&Rc::new(bad.clone())).is_err()); - let SummaryExpr::ValueOperation { - child, operation, .. - } = &mut bad.expr + *evaluation = PopulationStatistic::TopK { k: 6 }; + assert!(compile_physical_asap_dag(&Rc::new(bad.clone())).is_err()); + let Operator::ASAP(ASAPOp::EvaluatePopulation { child, evaluation }) = &mut bad.operator else { unreachable!() }; - *operation = ValueOperation::ReadPopulation { - readout: PopulationStatistic::TopK { k: 5 }, - }; + *evaluation = PopulationStatistic::TopK { k: 5 }; let producer = Rc::make_mut(child); - let SummaryExpr::ValueOperation { - operation: ValueOperation::MaintainPopulation { population }, - .. - } = &mut producer.expr + let Operator::ASAP(ASAPOp::MaintainPopulation { population, .. }) = &mut producer.operator else { unreachable!() }; @@ -519,6 +519,6 @@ mod tests { unreachable!() }; spec.metric = "b".into(); - assert!(compile_post_asap_dag(&Rc::new(bad)).is_err()); + assert!(compile_physical_asap_dag(&Rc::new(bad)).is_err()); } } diff --git a/crates/asap-aware-mapping/src/pane_sharing.rs b/crates/asap-aware-mapping/src/pane_sharing.rs index b5f5bff3a..0d944b2da 100644 --- a/crates/asap-aware-mapping/src/pane_sharing.rs +++ b/crates/asap-aware-mapping/src/pane_sharing.rs @@ -1,6 +1,6 @@ //! Costed reuse of compatible physical pane producers. The executor supplies //! an equality key covering source, state, phase and evidence. This pass never -//! changes logical readout windows or assumes compatibility from metric names. +//! changes logical evaluation windows or assumes compatibility from metric names. /// A concrete mergeable-pane implementation and its horizon costs. #[derive(Debug, Clone)] @@ -9,9 +9,9 @@ pub struct PaneReuseCandidate { pub lookback_ms: u64, /// Build, update, residency and retirement for this producer. Candidates /// with the same key must use the same unit costs and pane width, making - /// the longest-lived producer sufficient for every readout in the group. + /// the longest-lived producer sufficient for every evaluation in the group. pub producer_cost: f64, - /// Readout cost for all consumers of this distinct producer. + /// Evaluation cost for all consumers of this distinct producer. pub read_cost: f64, } @@ -84,7 +84,7 @@ mod tests { read_cost: 2.0, } } - // Share source work once while retaining both readout charges and longest history. + // Share source work once while retaining both evaluation charges and longest history. #[test] fn shares_compatible_windows() { assert_eq!( diff --git a/crates/asap-aware-mapping/src/pass/major.rs b/crates/asap-aware-mapping/src/pass/major.rs index 3671ece58..b8306c65a 100644 --- a/crates/asap-aware-mapping/src/pass/major.rs +++ b/crates/asap-aware-mapping/src/pass/major.rs @@ -6,18 +6,14 @@ //! it *one* pass rather than *the* algorithm. `ReplacementStrategy` is //! therefore a concept of this pass, not of the optimization interface. +use asap_types::ir::cse::share_common_sub_dags; use std::rc::Rc; -use asap_types::post_asap::{share_common_summary_sub_dags, SummaryNode}; -use asap_types::pre_asap::query_expr::QueryExpr; +use asap_types::ir::OperatorNode; use asap_types::types::AccuracyTarget; -use super::{OptimizationInput, OptimizationPass, OptimizeError, PlanOutput, QueryLifecyclePlan}; +use super::{OptimizationInput, OptimizationPass, OptimizeError, PlanOutput, QueryPlan}; use crate::replacement::{default_strategies_with_evidence, search_workload_with_targets}; -use crate::summary_maintenance_lifecycle::{ - global_selection_with_summary_maintenance_lifecycles, plan_assembled_dag, shared_state_cost, - summary_states, WorkloadDemand, -}; /// The shipped algorithm. Unit struct: its strategy set is the crate default, /// and a caller who wants a different one now has a better option than @@ -36,13 +32,12 @@ impl OptimizationPass for MajorPass { let strategies = default_strategies_with_evidence(models.cost, models.evidence); // `Id` is the entry's position in `QueryWorkload::entries()`, so the - // search result carries the workload binding the lifecycle stage and - // the output both need. CSE may make two identical queries share one + // search result carries the workload binding the output needs. CSE may make two identical queries share one // `Rc`, but it never drops or reorders a root, so this stays aligned. - let roots: Vec<(usize, Rc, Option)> = workload + let roots: Vec<(usize, Rc, Option)> = workload .entries() - .enumerate() - .map(|(index, (entry, expr))| { + .zip(workload.operator_indices().iter().copied()) + .map(|((entry, expr), index)| { ( index, Rc::clone(expr), @@ -53,32 +48,7 @@ impl OptimizationPass for MajorPass { let space = search_workload_with_targets(roots, &strategies, models.accuracy); - let lifecycle = input.lifecycle; - - // One index per root, in `CandidateLogicalASAPDAGs::roots` order — which is the order - // the roots went in, which is `entries()` order. - let entry_indices: Vec = (0..workload.len()).collect(); - let demand = WorkloadDemand { - workload: workload.query_workload(), - data_workload: workload.data_workload(), - entry_indices: &entry_indices, - }; - - let selection = global_selection_with_summary_maintenance_lifecycles( - &space, - demand, - lifecycle.now_ms, - lifecycle.horizon, - lifecycle.capabilities, - models.cost, - ) - .map_err(OptimizeError::LifecycleSelection)?; - // Each root's lifecycle is planned against the entries that consume - // it — the same binding selection costed it with — not the whole - // workload, so one query's reads never amortize another's state. - let bindings = space - .workload_entries_by_target(demand.workload, &entry_indices) - .map_err(|error| OptimizeError::LifecycleSelection(error.into()))?; + let selection = space.global_selection(models.cost); // Assemble every root, then intern structurally identical summary // producers across them once, so two queries that selected the same @@ -87,103 +57,20 @@ impl OptimizationPass for MajorPass { for (entry_index, root) in &space.roots { let dag = selection .assemble_selected_dag(root) - .map_err(|source| OptimizeError::LifecycleAssembly { + .map_err(|source| OptimizeError::Realization { entry_index: *entry_index, - source: source.into(), + source, })? .ok_or_else(|| self.missing_group(*entry_index))?; - assembled.push(dag); + assembled.push((*entry_index, dag)); } - let interned = - share_common_summary_sub_dags(assembled.iter().cloned().enumerate().collect()); - let states: Vec<_> = interned - .iter() - .map(|(_, dag)| summary_states(dag)) + let plans = share_common_sub_dags(assembled) + .into_iter() + .map(|(entry_index, root)| QueryPlan { entry_index, root }) .collect(); - - // A state reached from several roots is planned once against all of - // their entries, in every plan that reaches it, so each plan picks - // the same lifecycle for it. When that union cannot be costed the - // roots keep their own, unshared DAG and entries. - let mut shared_entries: Vec<(Rc, Option>)> = Vec::new(); - for (position, (entry_index, root)) in space.roots.iter().enumerate() { - for state in &states[position] { - if shared_entries.iter().any(|(s, _)| Rc::ptr_eq(s, state)) { - continue; - } - let readers: Vec<_> = (0..space.roots.len()) - .filter(|&other| states[other].iter().any(|s| Rc::ptr_eq(s, state))) - .map(|other| &space.roots[other].1) - .collect(); - if readers.iter().all(|reader| Rc::ptr_eq(reader, root)) { - continue; - } - let mut entries: Vec = readers - .iter() - .flat_map(|reader| bindings[&Rc::as_ptr(reader)].iter().copied()) - .collect(); - entries.sort_unstable(); - entries.dedup(); - let cost = shared_state_cost( - state, - WorkloadDemand { - entry_indices: &entries, - ..demand - }, - lifecycle.now_ms, - lifecycle.horizon, - lifecycle.capabilities, - models.cost, - ) - .map_err(|source| OptimizeError::LifecycleAssembly { - entry_index: *entry_index, - source: source.into(), - })?; - shared_entries.push((Rc::clone(state), cost.map(|_| entries))); - } - } - - let mut plans = Vec::with_capacity(space.roots.len()); - for (position, (entry_index, root)) in space.roots.iter().enumerate() { - let mut entries = bindings[&Rc::as_ptr(root)].clone(); - let mut dag = Rc::clone(&interned[position].1); - for (state, shared) in &shared_entries { - if !states[position].iter().any(|s| Rc::ptr_eq(s, state)) { - continue; - } - match shared { - Some(shared) => entries.extend(shared), - None => { - entries = bindings[&Rc::as_ptr(root)].clone(); - dag = Rc::clone(&assembled[position]); - break; - } - } - } - entries.sort_unstable(); - entries.dedup(); - let plan = plan_assembled_dag( - dag, - root, - WorkloadDemand { - entry_indices: &entries, - ..demand - }, - lifecycle.now_ms, - lifecycle.horizon, - lifecycle.capabilities, - models.cost, - ) - .map_err(|source| OptimizeError::LifecycleAssembly { - entry_index: *entry_index, - source, - })?; - plans.push(QueryLifecyclePlan { - entry_index: *entry_index, - plan, - }); - } - Ok(PlanOutput::new(plans)) + let mut output = PlanOutput::new(plans); + output.scalar_roots = workload.scalar_roots().to_vec(); + Ok(output) } } diff --git a/crates/asap-aware-mapping/src/pass/mod.rs b/crates/asap-aware-mapping/src/pass/mod.rs index a0b993d97..6355b8915 100644 --- a/crates/asap-aware-mapping/src/pass/mod.rs +++ b/crates/asap-aware-mapping/src/pass/mod.rs @@ -17,20 +17,20 @@ mod major; use std::collections::BTreeMap; use std::rc::Rc; +use asap_types::ir::export::compile_physical_asap_workload; +use asap_types::ir::timing::{ + apply_materialization_timings, MaterializationAssignment, TimingMemo, +}; +use asap_types::ir::OperatorNode; use asap_types::parsed_workload::ParsedWorkload; -use asap_types::post_asap::SummaryNode; +use asap_types::post_asap::ExecutionDataStateError; use asap_types::workload::WorkloadError; use crate::accuracy::{ AccuracyEvidenceProvider, AccuracyModel, DefaultAccuracyModel, NoAccuracyEvidence, }; use crate::cost_model::{CostModel, DefaultCostModel}; -use crate::recurrence::Horizon; use crate::replacement::RealizationError; -use crate::summary_maintenance_lifecycle::{ - SummaryMaintenanceLifecycleAssemblyError, SummaryMaintenanceLifecycleCapabilities, - SummaryMaintenanceLifecyclePlan, SummaryMaintenanceLifecycleSelectionError, -}; pub use major::MajorPass; @@ -90,66 +90,22 @@ impl<'a> PlanningModels<'a> { } } -/// Supplying this asks the pass to also decide summary maintenance versus raw -/// recomputation; leaving it out asks only for the logical DAG. -#[derive(Clone, Copy)] -#[non_exhaustive] -pub struct LifecycleInput { - /// Planning clock, Unix milliseconds. - pub now_ms: u64, - /// Seconds. Required to turn recurring demand into a finite total. - pub horizon: Option, - pub capabilities: SummaryMaintenanceLifecycleCapabilities, -} - -impl LifecycleInput { - pub fn new(now_ms: u64, capabilities: SummaryMaintenanceLifecycleCapabilities) -> Self { - Self { - now_ms, - horizon: None, - capabilities, - } - } - - pub fn with_horizon(mut self, horizon: Horizon) -> Self { - self.horizon = Some(horizon); - self - } -} - #[derive(Clone, Copy)] #[non_exhaustive] pub struct OptimizationInput<'a> { pub workload: &'a ParsedWorkload, pub models: PlanningModels<'a>, - /// Every plan carries the maintenance-versus-recomputation decision, so - /// the planning clock and runtime capabilities are always required. - pub lifecycle: LifecycleInput, } impl<'a> OptimizationInput<'a> { - pub fn new( - workload: &'a ParsedWorkload, - models: PlanningModels<'a>, - lifecycle: LifecycleInput, - ) -> Self { - Self { - workload, - models, - lifecycle, - } + pub fn new(workload: &'a ParsedWorkload, models: PlanningModels<'a>) -> Self { + Self { workload, models } } pub fn validate(&self) -> Result<(), OptimizationInputError> { self.workload .validate() - .map_err(OptimizationInputError::Workload)?; - if let Some(horizon) = self.lifecycle.horizon { - if !horizon.0.is_finite() || horizon.0 <= 0.0 { - return Err(OptimizationInputError::InvalidHorizon(horizon.0)); - } - } - Ok(()) + .map_err(OptimizationInputError::Workload) } } @@ -158,51 +114,122 @@ impl<'a> OptimizationInput<'a> { pub enum OptimizationInputError { #[error("workload: {0}")] Workload(WorkloadError), - #[error("planning horizon must be finite and positive, got {0}")] - InvalidHorizon(f64), } // ── Output ─────────────────────────────────────────────────────────────── -/// One query's selected post-ASAP DAG plus the maintenance decisions taken -/// for it. The DAG is `plan.root`. +/// One query's selected post-ASAP DAG. #[derive(Debug, Clone)] -pub struct QueryLifecyclePlan { +pub struct QueryPlan { /// Index into `QueryWorkload::entries()`. pub entry_index: usize, - pub plan: SummaryMaintenanceLifecyclePlan, + pub root: Rc, } -/// One plan per workload entry, in `QueryWorkload::entries()` order; +/// One multi-root workload DAG with query bindings in entry order; /// [`check_contract`] enforces that. /// /// Plans are not deduplicated across entries: a summary state that several -/// queries share appears in each of their plans as the same `Rc` (with the -/// same lifecycle), so a consumer that deploys or costs the workload must -/// dedupe deployments by `Rc::ptr_eq` on the summary node. +/// queries share appears in each of their plans as the same `Rc`, so a +/// consumer that deploys or costs the workload must dedupe by `Rc::ptr_eq`. #[derive(Debug, Clone)] #[non_exhaustive] pub struct PlanOutput { - pub plans: Vec, + pub plans: Vec, + /// Exact scalar expressions, keyed by workload entry; embedded plan reads remain visible. + pub scalar_roots: Vec<(usize, asap_types::ir::ScalarExpr)>, } impl PlanOutput { - pub fn new(plans: Vec) -> Self { - Self { plans } + pub fn new(plans: Vec) -> Self { + Self { + plans, + scalar_roots: Vec::new(), + } } /// Entry indices in output order. pub fn entry_indices(&self) -> Vec { - self.plans.iter().map(|p| p.entry_index).collect() + let mut indices: Vec<_> = self + .plans + .iter() + .map(|p| p.entry_index) + .chain(self.scalar_roots.iter().map(|(i, _)| *i)) + .collect(); + if !self.scalar_roots.is_empty() { + indices.sort_unstable(); + } + indices + } + + /// All query roots in workload order, including standalone scalars. + pub fn roots(&self) -> Vec { + let mut roots: Vec<_> = self + .plans + .iter() + .map(|p| { + ( + p.entry_index, + asap_types::ir::QueryRoot::Operator(Rc::clone(&p.root)), + ) + }) + .chain( + self.scalar_roots + .iter() + .map(|(i, expr)| (*i, asap_types::ir::QueryRoot::Scalar(expr.clone()))), + ) + .collect(); + roots.sort_by_key(|(i, _)| *i); + roots.into_iter().map(|(_, root)| root).collect() } - /// The selected DAG root per query. - pub fn dags(&self) -> Vec> { - self.plans.iter().map(|p| Rc::clone(&p.plan.root)).collect() + /// The selected operator roots. Use `roots()` to include scalar queries. + pub fn operator_roots(&self) -> Vec> { + self.plans.iter().map(|p| Rc::clone(&p.root)).collect() + } + + /// Unique operators in the entire workload DAG, including scalar-plan dependencies. + /// Several query roots can reach the same operator; it is returned once. + pub fn operators(&self) -> Vec> { + let mut seen = std::collections::HashSet::new(); + let mut nodes = Vec::new(); + for root in self.roots() { + let inputs = match root { + asap_types::ir::QueryRoot::Operator(node) => vec![node], + asap_types::ir::QueryRoot::Scalar(expr) => { + expr.operator_refs().into_iter().cloned().collect() + } + }; + for input in inputs { + for node in OperatorNode::reachable(&input) { + if seen.insert(Rc::as_ptr(&node)) { + nodes.push(node); + } + } + } + } + nodes + } + + /// The workload as one physical ASAP DAG: a root per operator query, in + /// plan order, with shared sub-DAGs exported once. Standalone scalar + /// roots have no physical form yet and are left out. + pub fn execution_timed_dag( + &self, + ) -> Result { + // One memo, so a node shared by several roots is timed and exported once. + let mut memo = TimingMemo::new(); + let assignment = MaterializationAssignment::all_query_time(); + let timed = self + .plans + .iter() + .map(|p| apply_materialization_timings(&p.root, &assignment, &mut memo)) + .collect::, _>>()?; + compile_physical_asap_workload(&timed) } pub fn len(&self) -> usize { - self.plans.len() + self.plans.len() + self.scalar_roots.len() } pub fn is_empty(&self) -> bool { @@ -220,13 +247,6 @@ pub enum OptimizeError { entry_index: usize, source: RealizationError, }, - #[error("summary-maintenance-lifecycle selection: {0}")] - LifecycleSelection(SummaryMaintenanceLifecycleSelectionError), - #[error("entry {entry_index}: {source}")] - LifecycleAssembly { - entry_index: usize, - source: SummaryMaintenanceLifecycleAssemblyError, - }, /// The pass returned something the downstream contract forbids. This is a /// defect in the pass, not in its input. #[error("pass `{pass}` violated the output contract: {detail}")] diff --git a/crates/asap-aware-mapping/src/physical_operator_statistics.rs b/crates/asap-aware-mapping/src/physical_operator_statistics.rs index 9cf8045bb..1d2b9ebb0 100644 --- a/crates/asap-aware-mapping/src/physical_operator_statistics.rs +++ b/crates/asap-aware-mapping/src/physical_operator_statistics.rs @@ -6,7 +6,9 @@ use std::collections::HashMap; -use asap_types::pre_asap::query_expr::{InfoMatcher, Predicate, Source}; +use asap_types::ir::operator_properties::{InfoMatcher, Source}; +use asap_types::ir::Predicate; + use asap_types::workload::{ DataArrival, DataWorkload, DurationMs, QueryRecurrence, QueryWorkloadEntry, RepeatedDemand, TimeSelection, TimestampMs, @@ -26,12 +28,12 @@ pub struct ComparisonScope { pub horizon: DurationMs, pub recurrence: QueryRecurrence, pub time_selection: TimeSelection, - pub sources: Vec, + pub sources: Vec, } /// Exact source selection covered by a physical plan. #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] -pub struct SourceCoverage { +pub struct ScanSelection { pub source: Source, /// Provider-owned stable identifier for the physical source contents, /// such as a catalog snapshot, table version, or object generation. @@ -53,7 +55,7 @@ impl ComparisonScope { query: &QueryWorkloadEntry, planning_time: TimestampMs, horizon: DurationMs, - sources: Vec, + sources: Vec, ) -> Result { let scope = Self { data_arrival: data.arrival, @@ -87,7 +89,7 @@ impl ComparisonScope { .any(|(index, source)| self.sources[..index].contains(source)) { return Err(AnalyticalCostError::MissingComparisonScope( - "duplicate source coverage", + "duplicate scan selection", )); } if self @@ -278,8 +280,8 @@ pub struct PartitionStatistics { /// is the authoritative operator vocabulary: every one of its variants has a /// matching statistics variant here. /// -/// This enum intentionally does not mirror either logical IR. `QueryExpr` and -/// `SummaryExpr` are inputs to physical lowering, and one logical node may +/// This enum intentionally does not mirror the logical IR. `OperatorNode`s +/// are inputs to physical lowering, and one logical node may /// expand into several physical nodes or choose among several algorithms. /// Physical configuration such as a Top-K limit or hash-join build side lives /// on `PhysicalOperator`; this enum contains only workload/catalog evidence diff --git a/crates/asap-aware-mapping/src/physical_plan_cost_model.rs b/crates/asap-aware-mapping/src/physical_plan_cost_model.rs index 307fb9a61..d846f907b 100644 --- a/crates/asap-aware-mapping/src/physical_plan_cost_model.rs +++ b/crates/asap-aware-mapping/src/physical_plan_cost_model.rs @@ -2,8 +2,9 @@ use std::{cell::RefCell, rc::Rc}; -use asap_types::post_asap::{SketchAlgorithm, SummaryExpr, SummaryNode}; -use asap_types::pre_asap::{AggIntent, QueryExpr}; +use asap_types::ir::OperatorNode; +use asap_types::post_asap::SketchAlgorithm; +use asap_types::pre_asap::AggIntent; use asap_types::resources::CacheProfile; use crate::analytical_cost::{ @@ -40,7 +41,7 @@ pub struct PhysicalEvidenceSnapshot { /// operator. Post-ASAP summary operators need a physical plan provider because their /// implementation, placement, and retained-state layout are deployment /// choices; that provider must return the complete summary DAG, including any -/// embedded `KeepPreAsap` work. +/// non-ASAP work kept inside it. pub trait PlannerPhysicalPlanProvider { /// Atomically captures the comparison scope and evidence generation. fn capture_evidence_snapshot( @@ -57,7 +58,7 @@ pub trait PlannerPhysicalPlanProvider { fn summary_physical_dag( &self, snapshot: &PhysicalEvidenceSnapshot, - summary: &Rc, + summary: &Rc, target: &TargetSubDAG<'_>, ) -> Result; } @@ -91,7 +92,7 @@ pub struct PhysicalPlanCostModel<'a> { } struct CachedTargetEvidence { - root: Rc, + root: Rc, consumer_count: usize, snapshot: PhysicalEvidenceSnapshot, raw: PhysicalDAG, @@ -188,15 +189,14 @@ impl<'a> PhysicalPlanCostModel<'a> { Replacement::ExactComposition(_) => { return Err(AnalyticalCostError::UnsupportedCandidate) } - Replacement::Rewrite(query) => lower_query_physical_dag(query, scope, &evidence)?, - Replacement::Summary(summary) => match &summary.expr { - SummaryExpr::KeepPreAsap(query) => { - lower_query_physical_dag(query, scope, &evidence)? - } - _ => self - .provider - .summary_physical_dag(&snapshot, summary, target)?, - }, + // A sub-DAG without summary state is the planner's own query + // lowering; anything with summary state is deployment-provided. + Replacement::SubDAG(sub_dag) if !sub_dag.contains_asap() => { + lower_query_physical_dag(sub_dag, scope, &evidence)? + } + Replacement::SubDAG(summary) => self + .provider + .summary_physical_dag(&snapshot, summary, target)?, }; let resources = estimate_physical_dag_comparison( PhysicalDAGEstimateRequest { @@ -359,7 +359,8 @@ mod tests { use std::cell::Cell; use std::collections::HashMap; - use asap_types::pre_asap::{DataType, Field, QueryExpr, Reduction, Schema, Source}; + use asap_types::ir::{NonASAPOp, OperatorNode}; + use asap_types::pre_asap::{DataType, Field, Reduction, Schema, Source}; use asap_types::types::AccuracyTarget; use asap_types::workload::{ DataArrival, DurationMs, QueryRecurrence, QueryTimeScope, TimeSelection, TimestampMs, @@ -367,7 +368,7 @@ mod tests { use crate::analytical_cost::{ExecutionMultiplicity, PhysicalDAGNode, PhysicalOperator}; use crate::physical_operator_statistics::{ - EdgeStatistics, OperatorStatistics, SourceCoverage, UnaryEdgeStatistics, + EdgeStatistics, OperatorStatistics, ScanSelection, UnaryEdgeStatistics, }; use crate::replacement::ReplacementStrategy; @@ -405,8 +406,16 @@ mod tests { } } - fn query() -> Rc { - Rc::new(QueryExpr::Aggregate { + fn query() -> Rc { + let scan = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Scan { + source: Source::Table { + table_ref: "events".into(), + }, + predicates: vec![], + schema: Schema::new(vec![Field::plain("value", DataType::Float64, false)]), + })) + .unwrap(); + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { reduction: Reduction::by(vec![]), measures: vec![AggIntent::Count { accuracy: AccuracyTarget::Epsilon(0.01), @@ -414,14 +423,9 @@ mod tests { output_names: vec![], filters: vec![], having: None, - child: Rc::new(QueryExpr::Scan { - source: Source::Table { - table_ref: "events".into(), - }, - predicates: vec![], - schema: Schema::new(vec![Field::plain("value", DataType::Float64, false)]), - }), - }) + child: scan, + })) + .unwrap() } fn scope() -> ComparisonScope { @@ -438,7 +442,7 @@ mod tests { lookback: Some(DurationMs(10_000)), as_of: Some(TimestampMs(1_000)), }, - sources: vec![SourceCoverage { + sources: vec![ScanSelection { source: Source::Table { table_ref: "events".into(), }, @@ -506,7 +510,7 @@ mod tests { id: "candidate-scan".into(), operator: PhysicalOperator::Scan, children: vec![], - source_coverage: Some(scope.sources[0].clone()), + scan_selection: Some(scope.sources[0].clone()), output_buffer_bytes: 8, retained_bytes: 0, execution: ExecutionMultiplicity::Once, @@ -518,7 +522,7 @@ mod tests { accumulator_count: 1, }, children: vec!["candidate-scan".into()], - source_coverage: None, + scan_selection: None, output_buffer_bytes: 8, retained_bytes: 8, execution: ExecutionMultiplicity::Once, @@ -527,7 +531,7 @@ mod tests { id: "candidate-read".into(), operator: PhysicalOperator::PassThrough, children: vec!["candidate-state".into()], - source_coverage: None, + scan_selection: None, output_buffer_bytes: 8, retained_bytes: 0, execution: ExecutionMultiplicity::PerEvaluation, @@ -583,7 +587,7 @@ mod tests { fn summary_physical_dag( &self, snapshot: &PhysicalEvidenceSnapshot, - _summary: &Rc, + _summary: &Rc, _target: &TargetSubDAG<'_>, ) -> Result { assert_eq!(snapshot.version, "test-snapshot-1"); @@ -687,7 +691,7 @@ mod tests { version: "unused-base-v1".into(), }; let candidates = - crate::replacement::SketchAlgorithmStrategy::default_cost_model().replacements(&target); + crate::replacement::ASAPStrategies::default_cost_model().replacements(&target); provider.storage_io = Some(profile.clone()); let model = PhysicalPlanCostModel::new(&provider, base.clone()).unwrap(); let estimate = model.estimate_candidate(&candidates[0], &target).unwrap(); @@ -718,7 +722,7 @@ mod tests { let root = query(); let target = TargetSubDAG::new(&root); let candidates = - crate::replacement::SketchAlgorithmStrategy::default_cost_model().replacements(&target); + crate::replacement::ASAPStrategies::default_cost_model().replacements(&target); let provider = TestProvider::new(true, 800); let model = PhysicalPlanCostModel::new(&provider, calibration()).unwrap(); let estimate = model.estimate_candidate(&candidates[0], &target).unwrap(); @@ -913,7 +917,7 @@ mod tests { fn summary_physical_dag( &self, snapshot: &PhysicalEvidenceSnapshot, - summary: &Rc, + summary: &Rc, target: &TargetSubDAG<'_>, ) -> Result { self.0.summary_physical_dag(snapshot, summary, target) @@ -1001,12 +1005,12 @@ mod tests { fn summary_physical_dag( &self, snapshot: &PhysicalEvidenceSnapshot, - summary: &Rc, + summary: &Rc, target: &TargetSubDAG<'_>, ) -> Result { let mut dag = self.0.summary_physical_dag(snapshot, summary, target)?; dag.nodes[0] - .source_coverage + .scan_selection .as_mut() .unwrap() .source_snapshot_id = "other".into(); @@ -1015,7 +1019,7 @@ mod tests { } let root = query(); - let candidates = crate::replacement::SketchAlgorithmStrategy::default_cost_model() + let candidates = crate::replacement::ASAPStrategies::default_cost_model() .replacements(&TargetSubDAG::new(&root)); let provider = WrongScope(TestProvider::new(true, 800)); let model = PhysicalPlanCostModel::new(&provider, calibration()).unwrap(); @@ -1053,7 +1057,7 @@ mod tests { fn summary_physical_dag( &self, _snapshot: &PhysicalEvidenceSnapshot, - _summary: &Rc, + _summary: &Rc, _target: &TargetSubDAG<'_>, ) -> Result { panic!("blank snapshot versions must fail before summary binding") @@ -1061,7 +1065,7 @@ mod tests { } let root = query(); - let candidates = crate::replacement::SketchAlgorithmStrategy::default_cost_model() + let candidates = crate::replacement::ASAPStrategies::default_cost_model() .replacements(&TargetSubDAG::new(&root)); let model = PhysicalPlanCostModel::new(&BlankVersionProvider, calibration()).unwrap(); assert_eq!( @@ -1088,7 +1092,7 @@ mod tests { #[test] fn sibling_candidates_share_one_scope_and_raw_baseline() { let root = query(); - let candidates = crate::replacement::SketchAlgorithmStrategy::default_cost_model() + let candidates = crate::replacement::ASAPStrategies::default_cost_model() .replacements(&TargetSubDAG::new(&root)); assert!(candidates.len() >= 2); let provider = TestProvider::new(true, 800); diff --git a/crates/asap-aware-mapping/src/query_physical_lowering.rs b/crates/asap-aware-mapping/src/query_physical_lowering.rs index 1b8e5a751..055d19c79 100644 --- a/crates/asap-aware-mapping/src/query_physical_lowering.rs +++ b/crates/asap-aware-mapping/src/query_physical_lowering.rs @@ -1,7 +1,9 @@ -//! Recursive lowering from the canonical query IR to evidenced physical DAGs. +//! Recursive lowering from the operator IR to evidenced physical DAGs. use std::rc::Rc; +use asap_types::ir::{NonASAPOp, OperatorNode, ScalarExpr}; + use crate::analytical_cost::{ validate_operator_semantics, AnalyticalCostError, EvidenceBackedPhysicalDAG, ExecutionMultiplicity, HashJoinBuildSide, PhysicalDAGNode, PhysicalNodeEvidence, @@ -9,16 +11,16 @@ use crate::analytical_cost::{ PromqlSeriesSampleKind, PromqlVectorCardinality, }; use crate::physical_operator_statistics::{ - ComparisonScope, EdgeStatistics, OperatorStatistics, SourceCoverage, + ComparisonScope, EdgeStatistics, OperatorStatistics, ScanSelection, }; pub struct PhysicalNodeRequest<'a> { - pub logical_node: &'a asap_types::pre_asap::QueryExpr, + pub logical_node: &'a OperatorNode, pub operator: PhysicalOperator, pub occurrence: usize, pub synthetic: bool, pub children: &'a [String], - pub source_coverage: Option<&'a SourceCoverage>, + pub scan_selection: Option<&'a ScanSelection>, } pub trait PhysicalNodeEvidenceProvider { @@ -40,19 +42,19 @@ where } } -/// Lower a resolved query operator DAG to the physical operators understood by +/// Lower a non-ASAP operator DAG to the physical operators understood by /// this cost model. The authoritative provider supplies statistics by the /// stable physical IDs owned by that provider; missing evidence makes the /// complete query unavailable. Scalar expressions remain part of their -/// containing operator's local cost. +/// containing operator's local cost. An ASAP node is unsupported here. pub fn lower_query_physical_dag( - root: &Rc, + root: &Rc, scope: &ComparisonScope, evidence: &dyn PhysicalNodeEvidenceProvider, ) -> Result { use std::collections::HashMap; - use asap_types::pre_asap::{GroupKeys, QueryExpr, RelationalSetOpKind}; + use asap_types::pre_asap::{GroupKeys, RelationalSetOpKind}; scope.validate()?; @@ -65,7 +67,7 @@ pub fn lower_query_physical_dag( } impl Lowerer<'_> { - fn lower(&mut self, query: &QueryExpr) -> Result { + fn lower(&mut self, query: &OperatorNode) -> Result { let occurrence = self.next_id; self.next_id += 1; self.lower_new(query, occurrence) @@ -73,12 +75,12 @@ pub fn lower_query_physical_dag( fn resolve( &self, - query: &QueryExpr, + query: &OperatorNode, operator: PhysicalOperator, occurrence: usize, synthetic: bool, children: &[String], - source_coverage: Option<&SourceCoverage>, + scan_selection: Option<&ScanSelection>, ) -> Result { let evidence = self.provider.evidence(PhysicalNodeRequest { logical_node: query, @@ -86,7 +88,7 @@ pub fn lower_query_physical_dag( occurrence, synthetic, children, - source_coverage, + scan_selection, })?; if evidence.physical_id.is_empty() { return Err(AnalyticalCostError::InvalidPhysicalDAG( @@ -101,14 +103,14 @@ pub fn lower_query_physical_dag( evidence: PhysicalNodeEvidence, operator: PhysicalOperator, children: Vec, - source_coverage: Option, + scan_selection: Option, ) -> Result { let id = evidence.physical_id.clone(); let node = PhysicalDAGNode { id: id.clone(), operator, children, - source_coverage, + scan_selection, output_buffer_bytes: evidence.output_buffer_bytes, retained_bytes: 0, execution: ExecutionMultiplicity::PerEvaluation, @@ -128,12 +130,23 @@ pub fn lower_query_physical_dag( fn lower_unary( &mut self, - query: &QueryExpr, + query: &OperatorNode, occurrence: usize, operator: PhysicalOperator, - child: &QueryExpr, + child: &OperatorNode, ) -> Result { let child_id = self.lower(child)?; + self.push_unary(query, occurrence, operator, child_id) + } + + /// `operator` over an already-lowered child. + fn push_unary( + &mut self, + query: &OperatorNode, + occurrence: usize, + operator: PhysicalOperator, + child_id: String, + ) -> Result { let children = vec![child_id.clone()]; let evidence = self.resolve(query, operator, occurrence, false, &children, None)?; let statistics = &evidence.statistics; @@ -151,17 +164,17 @@ pub fn lower_query_physical_dag( fn lower_promql_unary( &mut self, - query: &QueryExpr, + query: &OperatorNode, occurrence: usize, operator: PhysicalOperator, - child: &QueryExpr, + child: &OperatorNode, ) -> Result { self.lower_unary(query, occurrence, operator, child) } fn lower_promql_scalar_leaf( &mut self, - query: &QueryExpr, + query: &OperatorNode, occurrence: usize, ) -> Result { let operator = PhysicalOperator::PromqlScalarLeaf; @@ -171,6 +184,28 @@ pub fn lower_query_physical_dag( self.push(evidence, operator, vec![], None) } + /// Lower the owned scalar operand of `vector(s)`. A literal or + /// `time()` is a physical scalar leaf; `scalar(v)` reads its vector + /// through `PromqlVectorToScalar`. + fn lower_scalar_operand( + &mut self, + query: &OperatorNode, + occurrence: usize, + expr: &ScalarExpr, + ) -> Result { + match expr { + ScalarExpr::Literal(asap_types::pre_asap::ScalarValue::Float64(_)) + | ScalarExpr::EvalTimestamp => self.lower_promql_scalar_leaf(query, occurrence), + ScalarExpr::PromqlScalarFromVector(vector) => self.lower_promql_unary( + query, + occurrence, + PhysicalOperator::PromqlVectorToScalar, + vector, + ), + _ => Err(AnalyticalCostError::UnsupportedQueryOperator), + } + } + fn node_statistics(&self, id: &str) -> Result<&OperatorStatistics, AnalyticalCostError> { self.evidence .get(id) @@ -182,11 +217,14 @@ pub fn lower_query_physical_dag( fn lower_new( &mut self, - query: &QueryExpr, + query: &OperatorNode, occurrence: usize, ) -> Result { - match query { - QueryExpr::Scan { + let Some(op) = query.non_asap() else { + return Err(AnalyticalCostError::UnsupportedQueryOperator); + }; + match op { + NonASAPOp::Scan { source, predicates, .. } => { let coverage = bind_scan_coverage( @@ -252,13 +290,13 @@ pub fn lower_query_physical_dag( require_operator_statistics(filter_operator, &filter_evidence.statistics)?; self.push(filter_evidence, filter_operator, children, None) } - QueryExpr::Filter { pred, child } => { + NonASAPOp::Filter { pred, child } => { let operator = PhysicalOperator::Filter { predicate_operations_per_row: scalar_operation_count(&pred.0)?.max(1), }; self.lower_unary(query, occurrence, operator, child) } - QueryExpr::Project { cols, child, .. } => { + NonASAPOp::Project { cols, child, .. } => { let expression_operations_per_row = cols .iter() .try_fold(0_u64, |total, item| { @@ -280,7 +318,7 @@ pub fn lower_query_physical_dag( child, ) } - QueryExpr::Aggregate { + NonASAPOp::Aggregate { reduction, measures, filters, @@ -289,7 +327,7 @@ pub fn lower_query_physical_dag( .. } => { if having.is_some() - || asap_types::pre_asap::any_measure_filtered(filters) + || asap_types::ir::non_asap::any_measure_filtered(filters) || measures.is_empty() { return Err(AnalyticalCostError::UnsupportedQueryOperator); @@ -338,13 +376,9 @@ pub fn lower_query_physical_dag( child, ) } - QueryExpr::Dedup { cols, child } => { + NonASAPOp::Dedup { cols, child } => { let key_count = if cols.is_empty() { - child - .output_schema() - .map_err(|_| AnalyticalCostError::UnsupportedQueryOperator)? - .fields - .len() + child.schema.fields.len() } else { cols.len() }; @@ -361,7 +395,7 @@ pub fn lower_query_physical_dag( child, ) } - QueryExpr::Sort { + NonASAPOp::Sort { keys, partition_by, child, @@ -381,13 +415,26 @@ pub fn lower_query_physical_dag( child, ) } - QueryExpr::Limit { n, offset, child } => { - if let QueryExpr::Sort { + NonASAPOp::Limit { + n, + offset, + partition_by: limit_partition_by, + child, + } => { + // Offset-only and per-group limits have no physical + // operator here. + let Some(n) = n else { + return Err(AnalyticalCostError::UnsupportedQueryOperator); + }; + if limit_partition_by != &GroupKeys::none() { + return Err(AnalyticalCostError::UnsupportedQueryOperator); + } + if let Some(NonASAPOp::Sort { keys, partition_by, child: sorted_child, .. - } = child.as_ref() + }) = child.non_asap() { if !keys.is_empty() && partition_by == &GroupKeys::none() { let child_id = self.lower(sorted_child)?; @@ -442,7 +489,7 @@ pub fn lower_query_physical_dag( require_operator_statistics(operator, statistics)?; self.push(evidence, operator, children, None) } - QueryExpr::SQLWindowFunc { + NonASAPOp::SQLWindowFunc { func, partition_by, order_by, @@ -472,7 +519,7 @@ pub fn lower_query_physical_dag( child, ) } - QueryExpr::TimeRange { range, child } => { + NonASAPOp::TimeRange { range, child, .. } => { let range_millis = duration_millis(*range, "range")?; self.lower_promql_unary( query, @@ -481,7 +528,7 @@ pub fn lower_query_physical_dag( child, ) } - QueryExpr::PromqlSubquery { + NonASAPOp::PromqlSubquery { range, resolution, child, @@ -513,7 +560,7 @@ pub fn lower_query_physical_dag( } Ok(id) } - QueryExpr::PromqlRelabel { value, child, .. } => self.lower_promql_unary( + NonASAPOp::PromqlRelabel { value, child, .. } => self.lower_promql_unary( query, occurrence, PhysicalOperator::PromqlRelabel { @@ -521,7 +568,7 @@ pub fn lower_query_physical_dag( }, child, ), - QueryExpr::PromqlSeriesSample { + NonASAPOp::PromqlSeriesSample { by, kind, child, .. } => { if by.is_without() { @@ -557,7 +604,7 @@ pub fn lower_query_physical_dag( child, ) } - QueryExpr::PromqlInfoEnrich { selector, child } => { + NonASAPOp::PromqlInfoEnrich { selector, child } => { let left_id = self.lower(child)?; let coverage = bind_info_coverage( &format!("occurrence-{occurrence}-info"), @@ -609,34 +656,13 @@ pub fn lower_query_physical_dag( require_operator_statistics(operator, &evidence.statistics)?; self.push(evidence, operator, children, None) } - QueryExpr::BinaryOp { - op, - lhs, - rhs, - vector_match, + NonASAPOp::BinaryOp { + operator, lhs, rhs, .. } => { - let left_scalar = is_promql_scalar(lhs); - let right_scalar = is_promql_scalar(rhs); - if left_scalar && right_scalar { - return Err(AnalyticalCostError::UnsupportedQueryOperator); - } + let op = &operator.kind; + let vector_match = &operator.vector_match; let operation = promql_binary_operation(op); - if (left_scalar || right_scalar) - && !matches!(operation, PromqlBinaryOperation::ArithmeticOrComparison) - { - return Err(AnalyticalCostError::UnsupportedQueryOperator); - } - let operand_mode = match (left_scalar, right_scalar) { - (false, false) => PromqlBinaryOperandMode::VectorVector, - (false, true) => PromqlBinaryOperandMode::VectorScalar, - (true, false) => PromqlBinaryOperandMode::ScalarVector, - (true, true) => unreachable!("scalar/scalar returned above"), - }; - if operand_mode != PromqlBinaryOperandMode::VectorVector - && vector_match.is_some() - { - return Err(AnalyticalCostError::UnsupportedQueryOperator); - } + let operand_mode = PromqlBinaryOperandMode::VectorVector; let cardinality = promql_vector_cardinality(vector_match.as_ref()); let left_id = self.lower(lhs)?; let right_id = self.lower(rhs)?; @@ -670,41 +696,31 @@ pub fn lower_query_physical_dag( require_operator_statistics(operator, &evidence.statistics)?; self.push(evidence, operator, children, None) } - QueryExpr::PromqlVectorFromScalar(child) => self.lower_promql_unary( - query, - occurrence, - PhysicalOperator::PromqlScalarToVector, - child, - ), - QueryExpr::PromqlScalarFromVector(child) => self.lower_promql_unary( - query, - occurrence, - PhysicalOperator::PromqlVectorToScalar, - child, - ), - QueryExpr::PromqlScalarBridge(inner) - if matches!( - inner.as_ref(), - QueryExpr::Literal(asap_types::pre_asap::ScalarValue::Float64(_)) - ) => - { - self.lower_promql_scalar_leaf(query, occurrence) + NonASAPOp::PromqlVectorFromScalar(scalar) => { + let scalar_occurrence = self.next_id; + self.next_id += 1; + let child_id = self.lower_scalar_operand(query, scalar_occurrence, scalar)?; + self.push_unary( + query, + occurrence, + PhysicalOperator::PromqlScalarToVector, + child_id, + ) } - QueryExpr::EvalTimestamp => self.lower_promql_scalar_leaf(query, occurrence), - QueryExpr::TimeShift { shift, child } => { + NonASAPOp::TimeShift { shift, child } => { if !shift.is_identity() { return Err(AnalyticalCostError::UnsupportedQueryOperator); } self.lower_unary(query, occurrence, PhysicalOperator::PassThrough, child) } - QueryExpr::Concat { children, .. } => { + NonASAPOp::Concat { children, .. } => { let child_ids = children .iter() .map(|child| self.lower(child)) .collect::, _>>()?; self.lower_concat(query, occurrence, child_ids) } - QueryExpr::SetOp { + NonASAPOp::SetOp { kind: RelationalSetOpKind::Union, all: true, left, @@ -714,7 +730,7 @@ pub fn lower_query_physical_dag( let right_id = self.lower(right)?; self.lower_concat(query, occurrence, vec![left_id, right_id]) } - QueryExpr::Join { + NonASAPOp::Join { kind, pred, left, @@ -764,7 +780,7 @@ pub fn lower_query_physical_dag( fn lower_concat( &mut self, - query: &QueryExpr, + query: &OperatorNode, occurrence: usize, child_ids: Vec, ) -> Result { @@ -837,7 +853,7 @@ fn validate_source_consumption( let consumed = nodes .iter() .filter(|node| matches!(node.operator, PhysicalOperator::Scan)) - .filter_map(|node| node.source_coverage.as_ref()) + .filter_map(|node| node.scan_selection.as_ref()) .collect::>(); for coverage in &consumed { if !scope.sources.contains(coverage) { @@ -957,9 +973,9 @@ fn require_operator_statistics( fn bind_scan_coverage( node_id: &str, source: &asap_types::pre_asap::Source, - predicates: &[asap_types::pre_asap::Predicate], + predicates: &[asap_types::ir::Predicate], scope: &ComparisonScope, -) -> Result { +) -> Result { let mut matches = scope.sources.iter().filter(|coverage| { coverage.source == *source && coverage.predicates == predicates @@ -971,7 +987,7 @@ fn bind_scan_coverage( .ok_or_else(|| AnalyticalCostError::ScanOutsideComparisonScope(node_id.into()))?; if matches.any(|candidate| candidate != &coverage) { return Err(AnalyticalCostError::InvalidPhysicalDAG( - "scan source coverage is ambiguous", + "scan selection is ambiguous", )); } Ok(coverage) @@ -981,7 +997,7 @@ fn bind_info_coverage( node_id: &str, selector: &[asap_types::pre_asap::InfoMatcher], scope: &ComparisonScope, -) -> Result { +) -> Result { use asap_types::pre_asap::{CompareOpKind, Source}; let mut metric: Option<&str> = None; @@ -1009,7 +1025,7 @@ fn bind_info_coverage( .ok_or_else(|| AnalyticalCostError::ScanOutsideComparisonScope(node_id.into()))?; if matches.next().is_some() { return Err(AnalyticalCostError::InvalidPhysicalDAG( - "info source coverage is ambiguous", + "info scan selection is ambiguous", )); } Ok(coverage) @@ -1051,17 +1067,14 @@ fn promql_vector_cardinality( } fn hash_join_key_count( - expr: &asap_types::pre_asap::QueryExpr, - left: &asap_types::pre_asap::QueryExpr, - right: &asap_types::pre_asap::QueryExpr, + expr: &ScalarExpr, + left: &OperatorNode, + right: &OperatorNode, ) -> Option { - use asap_types::pre_asap::{CompareOpKind, QueryExpr}; + use asap_types::pre_asap::CompareOpKind; - let (Ok(left_schema), Ok(right_schema)) = (left.output_schema(), right.output_schema()) else { - return None; - }; - let left_width = left_schema.fields.len(); - let total_width = left_width.saturating_add(right_schema.fields.len()); + let left_width = left.schema.fields.len(); + let total_width = left_width.saturating_add(right.schema.fields.len()); fn column_side(column: usize, left_width: usize, total_width: usize) -> Option { if column < left_width { @@ -1073,14 +1086,15 @@ fn hash_join_key_count( } } - fn predicate(expr: &QueryExpr, left_width: usize, total_width: usize) -> Option { + fn predicate(expr: &ScalarExpr, left_width: usize, total_width: usize) -> Option { match expr { - QueryExpr::Compare { + ScalarExpr::Compare { left, op: CompareOpKind::Eq, right, + .. } => match (left.as_ref(), right.as_ref()) { - (QueryExpr::Column(left), QueryExpr::Column(right)) => match ( + (ScalarExpr::Column(left), ScalarExpr::Column(right)) => match ( column_side(*left, left_width, total_width), column_side(*right, left_width, total_width), ) { @@ -1089,7 +1103,7 @@ fn hash_join_key_count( }, _ => None, }, - QueryExpr::BoolAnd(parts) if !parts.is_empty() => { + ScalarExpr::BoolAnd(parts) if !parts.is_empty() => { parts.iter().try_fold(0_u64, |count, part| { count.checked_add(predicate(part, left_width, total_width)?) }) @@ -1101,12 +1115,8 @@ fn hash_join_key_count( predicate(expr, left_width, total_width) } -fn scalar_operation_count( - expr: &asap_types::pre_asap::QueryExpr, -) -> Result { - use asap_types::pre_asap::QueryExpr; - - let add = |parts: &[&QueryExpr]| { +fn scalar_operation_count(expr: &ScalarExpr) -> Result { + let add = |parts: &[&ScalarExpr]| { parts.iter().try_fold(0_u64, |total, part| { total .checked_add(scalar_operation_count(part)?) @@ -1119,14 +1129,14 @@ fn scalar_operation_count( .ok_or(AnalyticalCostError::Overflow) }; match expr { - QueryExpr::Column(_) - | QueryExpr::Literal(_) - | QueryExpr::EvalTimestamp - | QueryExpr::CurrentTimestamp => Ok(0), - QueryExpr::Compare { left, right, .. } | QueryExpr::Arithmetic { left, right, .. } => { + ScalarExpr::Column(_) + | ScalarExpr::Literal(_) + | ScalarExpr::EvalTimestamp + | ScalarExpr::CurrentTimestamp => Ok(0), + ScalarExpr::Compare { left, right, .. } | ScalarExpr::Arithmetic { left, right, .. } => { with_local(&[left, right]) } - QueryExpr::BoolAnd(parts) | QueryExpr::BoolOr(parts) => { + ScalarExpr::BoolAnd(parts) | ScalarExpr::BoolOr(parts) => { let children = parts.iter().collect::>(); add(&children)? .checked_add( @@ -1135,12 +1145,11 @@ fn scalar_operation_count( ) .ok_or(AnalyticalCostError::Overflow) } - QueryExpr::Not(child) - | QueryExpr::IsNull(child) - | QueryExpr::IsNotNull(child) - | QueryExpr::PromqlScalarBridge(child) => with_local(&[child]), - QueryExpr::Cast { expr, .. } => with_local(&[expr]), - QueryExpr::InList { expr, list, .. } => { + ScalarExpr::Not(child) | ScalarExpr::IsNull(child) | ScalarExpr::IsNotNull(child) => { + with_local(&[child]) + } + ScalarExpr::Cast { expr, .. } => with_local(&[expr]), + ScalarExpr::InList { expr, list, .. } => { let mut children = Vec::with_capacity(list.len() + 1); children.push(expr.as_ref()); children.extend(list.iter()); @@ -1148,11 +1157,11 @@ fn scalar_operation_count( .checked_add(u64::try_from(list.len()).map_err(|_| AnalyticalCostError::Overflow)?) .ok_or(AnalyticalCostError::Overflow) } - QueryExpr::FunctionCall { args, .. } => { + ScalarExpr::FunctionCall { args, .. } => { let children = args.iter().collect::>(); with_local(&children) } - QueryExpr::Case { + ScalarExpr::Case { operand, branches, else_expr, @@ -1246,16 +1255,6 @@ fn fixed_state_per_series_intent(intent: &asap_types::pre_asap::AggIntent) -> bo ) } -fn is_promql_scalar(query: &asap_types::pre_asap::QueryExpr) -> bool { - use asap_types::pre_asap::QueryExpr; - matches!( - query, - QueryExpr::PromqlScalarBridge(_) - | QueryExpr::PromqlScalarFromVector(_) - | QueryExpr::EvalTimestamp - ) -} - #[cfg(test)] mod tests { use super::*; @@ -1266,6 +1265,7 @@ mod tests { validate_comparison_scopes, BinaryEdgeStatistics, PartitionStatistics, PromqlEdgeStatistics, PromqlUnaryEdgeStatistics, PromqlValueKind, UnaryEdgeStatistics, }; + use asap_types::ir::{BinaryOperator, ExprSemantics, Predicate, SortKey, TimeRangeKind}; use asap_types::workload::{ DataArrival, DurationMs, QueryRecurrence, QueryTimeScope, TimeSelection, TimestampMs, }; @@ -1383,7 +1383,7 @@ mod tests { } } - fn scope(sources: Vec) -> ComparisonScope { + fn scope(sources: Vec) -> ComparisonScope { ComparisonScope { data_arrival: DataArrival::AtRest, planning_time: TimestampMs(1_000), @@ -1401,11 +1401,8 @@ mod tests { } } - fn coverage( - source: asap_types::pre_asap::Source, - predicates: Vec, - ) -> SourceCoverage { - SourceCoverage { + fn coverage(source: asap_types::pre_asap::Source, predicates: Vec) -> ScanSelection { + ScanSelection { source, source_snapshot_id: "snapshot-1".into(), predicates, @@ -1414,7 +1411,7 @@ mod tests { } #[test] - fn info_source_coverage_includes_symbolic_selector_matchers() { + fn info_scan_selection_includes_symbolic_selector_matchers() { use asap_types::pre_asap::{CompareOpKind, InfoMatcher, Source}; let selector = vec![InfoMatcher { @@ -1422,7 +1419,7 @@ mod tests { op: CompareOpKind::Eq, value: "prod".into(), }]; - let info_coverage = SourceCoverage { + let info_coverage = ScanSelection { source: Source::TimeSeries { metric: "target_info".into(), }, @@ -1451,27 +1448,30 @@ mod tests { // Correlation can be costed as an exact hash aggregate using provider-supplied state size. #[test] fn correlation_lowers_to_physical_hash_aggregate() { - use asap_types::pre_asap::{ - AggIntent, DataType, Field, QueryExpr, Reduction, Schema, Source, - }; + use asap_types::pre_asap::{AggIntent, DataType, Field, Reduction, Schema, Source}; let source = Source::Table { table_ref: "pairs".into(), }; - let root = Rc::new(QueryExpr::Aggregate { - reduction: Reduction::by(vec![]), - measures: vec![AggIntent::PearsonCorr { left: 0, right: 1 }], - output_names: vec!["r".into()], - filters: vec![], - having: None, - child: Rc::new(QueryExpr::Scan { - source: source.clone(), - predicates: vec![], - schema: Schema::new(vec![ - Field::plain("x", DataType::Float64, true), - Field::plain("y", DataType::Float64, true), - ]), - }), - }); + let root = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { + reduction: Reduction::by(vec![]), + measures: vec![AggIntent::PearsonCorr { left: 0, right: 1 }], + output_names: vec!["r".into()], + filters: vec![], + having: None, + child: OperatorNode::new_shared(asap_types::ir::Operator::NonASAP( + NonASAPOp::Scan { + source: source.clone(), + predicates: vec![], + schema: Schema::new(vec![ + Field::plain("x", DataType::Float64, true), + Field::plain("y", DataType::Float64, true), + ]), + }, + )) + .unwrap(), + })) + .unwrap(); let scope = scope(vec![coverage(source, vec![])]); let provided = HashMap::from([ ( @@ -1501,51 +1501,57 @@ mod tests { #[test] fn query_lowering_recurses_and_fuses_global_sort_limit() { - use asap_types::pre_asap::{AggIntent, GroupKeys, QueryExpr, Reduction, SortKey, Source}; + use asap_types::pre_asap::{AggIntent, GroupKeys, Reduction, Source}; use asap_types::pre_asap::{DataType, Field, Schema}; use std::rc::Rc; - let scan = Rc::new(QueryExpr::Scan { + let scan = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Scan { source: Source::Table { table_ref: "events".into(), }, - predicates: vec![asap_types::pre_asap::Predicate(Rc::new( - QueryExpr::Literal(asap_types::pre_asap::ScalarValue::Boolean(true)), + predicates: vec![Predicate(ScalarExpr::Literal( + asap_types::pre_asap::ScalarValue::Boolean(true), ))], schema: Schema::new(vec![ Field::plain("service", DataType::Utf8, false), Field::plain("value", DataType::Float64, false), ]), - }); - let aggregate = Rc::new(QueryExpr::Aggregate { - reduction: Reduction::by(vec![0]), - measures: vec![AggIntent::Sum { col: Some(1) }], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::clone(&scan), - }); - let sort = Rc::new(QueryExpr::Sort { + })) + .unwrap(); + let aggregate = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { + reduction: Reduction::by(vec![0]), + measures: vec![AggIntent::Sum { col: Some(1) }], + output_names: vec![], + filters: vec![], + having: None, + child: Rc::clone(&scan), + })) + .unwrap(); + let sort = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Sort { keys: vec![SortKey { - expr: QueryExpr::Column(0), + expr: ScalarExpr::Column(0), ascending: false, nulls_first: false, }], partition_by: GroupKeys::none(), child: aggregate, - }); - let root = Rc::new(QueryExpr::Limit { - n: 10, + })) + .unwrap(); + let root = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Limit { + n: Some(10), offset: 5, + partition_by: GroupKeys::none(), child: sort, - }); + })) + .unwrap(); let scan_coverage = coverage( Source::Table { table_ref: "events".into(), }, - vec![asap_types::pre_asap::Predicate(Rc::new( - QueryExpr::Literal(asap_types::pre_asap::ScalarValue::Boolean(true)), + vec![Predicate(ScalarExpr::Literal( + asap_types::pre_asap::ScalarValue::Boolean(true), ))], ); let scope = scope(vec![scan_coverage]); @@ -1611,10 +1617,7 @@ mod tests { )); let physical_scan = &dag.nodes[0]; assert_eq!(physical_scan.id, "query-2-scan"); - assert_eq!( - physical_scan.source_coverage, - Some(scope.sources[0].clone()) - ); + assert_eq!(physical_scan.scan_selection, Some(scope.sources[0].clone())); assert_eq!(physical_scan.output_buffer_bytes, 1_024); assert_ne!( physical_scan.output_buffer_bytes, @@ -1641,33 +1644,36 @@ mod tests { #[test] fn query_lowering_shares_only_provider_identified_physical_nodes() { use asap_types::pre_asap::{CompareOpKind, DataType, Field, Schema}; - use asap_types::pre_asap::{JoinKind, Predicate, QueryExpr, Source}; + use asap_types::pre_asap::{JoinKind, Source}; use std::rc::Rc; - let shared = Rc::new(QueryExpr::Scan { + let shared = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Scan { source: Source::Table { table_ref: "dimensions".into(), }, predicates: vec![], schema: Schema::new(vec![Field::plain("id", DataType::Int64, false)]), - }); - let root = Rc::new(QueryExpr::Join { + })) + .unwrap(); + let root = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Join { kind: JoinKind::Inner, - pred: Predicate(Rc::new(QueryExpr::Compare { - left: Rc::new(QueryExpr::Column(0)), + pred: Predicate(ScalarExpr::Compare { + left: Box::new(ScalarExpr::Column(0)), op: CompareOpKind::Eq, - right: Rc::new(QueryExpr::Column(1)), - })), + right: Box::new(ScalarExpr::Column(1)), + semantics: ExprSemantics::Sql, + }), left: Rc::clone(&shared), right: Rc::clone(&shared), - }); - let source_coverage = coverage( + })) + .unwrap(); + let scan_selection = coverage( Source::Table { table_ref: "dimensions".into(), }, vec![], ); - let independent_scope = scope(vec![source_coverage.clone()]); + let independent_scope = scope(vec![scan_selection.clone()]); let scan_statistics = scan_stats(edge(100, 800), 800); let join_statistics = OperatorStatistics::HashJoin { edges: BinaryEdgeStatistics { @@ -1703,7 +1709,7 @@ mod tests { statistics, }) }; - let shared_scope = scope(vec![source_coverage]); + let shared_scope = scope(vec![scan_selection]); let no_cache = crate::analytical_cost::CacheProfile::no_cache(); let shared_dag = lower_query_physical_dag(&root, &shared_scope, &shared_provider).unwrap(); assert_eq!(shared_dag.nodes.len(), 2); @@ -1784,16 +1790,19 @@ mod tests { )) ); - let invalid = Rc::new(QueryExpr::Join { - kind: JoinKind::Inner, - pred: Predicate(Rc::new(QueryExpr::Compare { - left: Rc::new(QueryExpr::Column(0)), - op: CompareOpKind::Eq, - right: Rc::new(QueryExpr::Column(0)), - })), - left: Rc::clone(&shared), - right: Rc::clone(&shared), - }); + let invalid = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Join { + kind: JoinKind::Inner, + pred: Predicate(ScalarExpr::Compare { + left: Box::new(ScalarExpr::Column(0)), + op: CompareOpKind::Eq, + right: Box::new(ScalarExpr::Column(0)), + semantics: ExprSemantics::Sql, + }), + left: Rc::clone(&shared), + right: Rc::clone(&shared), + })) + .unwrap(); assert_eq!( lower_query_physical_dag(&invalid, &shared_scope, &shared_provider), Err(AnalyticalCostError::UnsupportedQueryOperator) @@ -1803,70 +1812,81 @@ mod tests { #[test] fn query_lowering_covers_relational_unary_operators() { use asap_types::pre_asap::{DataType, Field, ScalarValue, Schema}; - use asap_types::pre_asap::{ - GroupKeys, Predicate, QueryExpr, SortKey, Source, TimeShift, WindowFuncKind, - }; - use std::rc::Rc; + use asap_types::pre_asap::{GroupKeys, Source, TimeShift, WindowFuncKind}; - let scan = Rc::new(QueryExpr::Scan { + let scan = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Scan { source: Source::Table { table_ref: "events".into(), }, predicates: vec![], schema: Schema::new(vec![Field::plain("id", DataType::Int64, false)]), - }); - let filter = Rc::new(QueryExpr::Filter { - pred: Predicate(Rc::new(QueryExpr::Literal(ScalarValue::Boolean(true)))), - child: scan, - }); - let project = Rc::new(QueryExpr::Project { - cols: vec![], - qualifier: None, - child: filter, - }); - let dedup = Rc::new(QueryExpr::Dedup { + })) + .unwrap(); + let filter = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Filter { + pred: Predicate(ScalarExpr::Literal(ScalarValue::Boolean(true))), + child: scan, + })) + .unwrap(); + let project = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Project { + cols: vec![], + qualifier: None, + child: filter, + })) + .unwrap(); + let dedup = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Dedup { cols: vec![0], child: project, - }); - let window = Rc::new(QueryExpr::SQLWindowFunc { - func: WindowFuncKind::RowNumber, - args: vec![], - partition_by: GroupKeys::none(), - order_by: vec![SortKey { - expr: QueryExpr::Column(0), - ascending: true, - nulls_first: false, - }], - frame: None, - output_name: "rn".into(), - child: dedup, - }); - let sort = Rc::new(QueryExpr::Sort { + })) + .unwrap(); + let window = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP( + NonASAPOp::SQLWindowFunc { + func: WindowFuncKind::RowNumber, + args: vec![], + partition_by: GroupKeys::none(), + order_by: vec![SortKey { + expr: ScalarExpr::Column(0), + ascending: true, + nulls_first: false, + }], + frame: None, + output_name: "rn".into(), + child: dedup, + }, + )) + .unwrap(); + let sort = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Sort { keys: vec![SortKey { - expr: QueryExpr::Column(0), + expr: ScalarExpr::Column(0), ascending: true, nulls_first: false, }], partition_by: GroupKeys::by(vec![0]), child: window, - }); - let limit = Rc::new(QueryExpr::Limit { - n: 20, + })) + .unwrap(); + let limit = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Limit { + n: Some(20), offset: 0, + partition_by: GroupKeys::none(), child: sort, - }); - let root = Rc::new(QueryExpr::TimeShift { - shift: TimeShift::default(), - child: limit, - }); - - let source_coverage = coverage( + })) + .unwrap(); + let root = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::TimeShift { + shift: TimeShift::default(), + child: limit, + })) + .unwrap(); + + let scan_selection = coverage( Source::Table { table_ref: "events".into(), }, vec![], ); - let scope = scope(vec![source_coverage]); + let scope = scope(vec![scan_selection]); let scan_statistics = scan_stats(edge(1_000, 8_000), 8_000); let dedup_statistics = OperatorStatistics::HashDeduplicate { edges: unary_edges(edge(800, 3_200), edge(500, 2_000)), @@ -1977,22 +1997,25 @@ mod tests { #[test] fn query_lowering_maps_concat_and_union_all_but_rejects_distinct_set_ops() { use asap_types::pre_asap::{DataType, Field, Schema}; - use asap_types::pre_asap::{QueryExpr, RelationalSetOpKind, Source}; - use std::rc::Rc; + use asap_types::pre_asap::{RelationalSetOpKind, Source}; - let scan = |name: &str| QueryExpr::Scan { - source: Source::Table { - table_ref: name.into(), - }, - predicates: vec![], - schema: Schema::new(vec![Field::plain("id", DataType::Int64, false)]), + let scan = |name: &str| { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Scan { + source: Source::Table { + table_ref: name.into(), + }, + predicates: vec![], + schema: Schema::new(vec![Field::plain("id", DataType::Int64, false)]), + })) + .unwrap() }; - let union = Rc::new(QueryExpr::SetOp { + let union = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::SetOp { kind: RelationalSetOpKind::Union, all: true, - left: Rc::new(scan("a")), - right: Rc::new(scan("b")), - }); + left: scan("a"), + right: scan("b"), + })) + .unwrap(); let scope = scope(vec![ coverage( Source::Table { @@ -2032,23 +2055,27 @@ mod tests { assert_eq!( duplicate_scope.validate(), Err(AnalyticalCostError::MissingComparisonScope( - "duplicate source coverage" + "duplicate scan selection" )) ); - let concat = Rc::new(QueryExpr::Concat { - children: vec![scan("a"), scan("b")], - discriminator_unique_key: None, - }); + let concat = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Concat { + children: vec![scan("a"), scan("b")], + discriminator_unique_key: None, + })) + .unwrap(); let dag = lower_query_physical_dag(&concat, &scope, &scripted(&provided)).unwrap(); assert_eq!(dag.nodes.last().unwrap().operator, PhysicalOperator::Concat); - let distinct_union = Rc::new(QueryExpr::SetOp { - kind: RelationalSetOpKind::Union, - all: false, - left: Rc::new(scan("a")), - right: Rc::new(scan("b")), - }); + let distinct_union = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::SetOp { + kind: RelationalSetOpKind::Union, + all: false, + left: scan("a"), + right: scan("b"), + })) + .unwrap(); assert_eq!( lower_query_physical_dag(&distinct_union, &scope, &scripted(&provided)), Err(AnalyticalCostError::UnsupportedQueryOperator) @@ -2057,22 +2084,24 @@ mod tests { #[test] fn query_lowering_fails_closed_for_missing_or_inconsistent_statistics() { + use asap_types::pre_asap::Source; use asap_types::pre_asap::{DataType, Field, Schema}; - use asap_types::pre_asap::{QueryExpr, Source}; - use std::rc::Rc; - let scan = Rc::new(QueryExpr::Scan { + let scan = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Scan { source: Source::Table { table_ref: "events".into(), }, predicates: vec![], schema: Schema::new(vec![Field::plain("id", DataType::Int64, false)]), - }); - let root = Rc::new(QueryExpr::Project { - cols: vec![], - qualifier: None, - child: scan, - }); + })) + .unwrap(); + let root = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Project { + cols: vec![], + qualifier: None, + child: scan, + })) + .unwrap(); let comparison_scope = scope(vec![coverage( Source::Table { @@ -2142,7 +2171,7 @@ mod tests { assert_eq!( lower_query_physical_dag(&root, &ambiguous_scope, &scripted(&conflicting)), Err(AnalyticalCostError::InvalidPhysicalDAG( - "scan source coverage is ambiguous" + "scan selection is ambiguous" )) ); @@ -2174,25 +2203,29 @@ mod tests { #[test] fn query_lowering_accepts_a_consistently_empty_edge() { use asap_types::pre_asap::{DataType, Field, ScalarValue, Schema}; - use asap_types::pre_asap::{Predicate, QueryExpr, Source}; - use std::rc::Rc; + use asap_types::pre_asap::{GroupKeys, Source}; - let scan = Rc::new(QueryExpr::Scan { + let scan = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Scan { source: Source::Table { table_ref: "events".into(), }, predicates: vec![], schema: Schema::new(vec![Field::plain("id", DataType::Int64, false)]), - }); - let filter = Rc::new(QueryExpr::Filter { - pred: Predicate(Rc::new(QueryExpr::Literal(ScalarValue::Boolean(false)))), - child: scan, - }); - let root = Rc::new(QueryExpr::Limit { - n: 10, + })) + .unwrap(); + let filter = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Filter { + pred: Predicate(ScalarExpr::Literal(ScalarValue::Boolean(false))), + child: scan, + })) + .unwrap(); + let root = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Limit { + n: Some(10), offset: 0, + partition_by: GroupKeys::none(), child: filter, - }); + })) + .unwrap(); let scope = scope(vec![coverage( Source::Table { @@ -2233,59 +2266,70 @@ mod tests { #[test] fn query_lowering_rejects_aggregates_without_a_hash_implementation() { - use asap_types::pre_asap::{ - AggIntent, GroupKeys, QueryExpr, Reduction, Source, WindowFuncKind, - }; + use asap_types::pre_asap::{AggIntent, GroupKeys, Reduction, Source, WindowFuncKind}; use asap_types::pre_asap::{DataType, Field, Schema}; use asap_types::types::AccuracyTarget; - use std::rc::Rc; let scan = || { - Rc::new(QueryExpr::Scan { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Scan { source: Source::Table { table_ref: "events".into(), }, predicates: vec![], schema: Schema::new(vec![Field::plain("value", DataType::Float64, false)]), - }) + })) + .unwrap() }; - let exact_quantile = Rc::new(QueryExpr::Aggregate { - reduction: Reduction::by(vec![]), - measures: vec![AggIntent::Quantile { - col: Some(0), - q: 0.99, - accuracy: AccuracyTarget::Exact, - }], - output_names: vec![], - filters: vec![], - having: None, - child: scan(), - }); - let empty_sort_limit = Rc::new(QueryExpr::Limit { - n: 10, - offset: 0, - child: Rc::new(QueryExpr::Sort { - keys: vec![], + let exact_quantile = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { + reduction: Reduction::by(vec![]), + measures: vec![AggIntent::Quantile { + col: Some(0), + q: 0.99, + accuracy: AccuracyTarget::Exact, + }], + output_names: vec![], + filters: vec![], + having: None, + child: scan(), + })) + .unwrap(); + let empty_sort_limit = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Limit { + n: Some(10), + offset: 0, partition_by: GroupKeys::none(), + child: OperatorNode::new_shared(asap_types::ir::Operator::NonASAP( + NonASAPOp::Sort { + keys: vec![], + partition_by: GroupKeys::none(), + child: scan(), + }, + )) + .unwrap(), + })) + .unwrap(); + let unsupported_window = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP( + NonASAPOp::SQLWindowFunc { + func: WindowFuncKind::Lag, + args: vec![ScalarExpr::Column(0)], + partition_by: GroupKeys::none(), + order_by: vec![], + frame: None, + output_name: "lag".into(), child: scan(), - }), - }); - let unsupported_window = Rc::new(QueryExpr::SQLWindowFunc { - func: WindowFuncKind::Lag, - args: vec![QueryExpr::Column(0)], - partition_by: GroupKeys::none(), - order_by: vec![], - frame: None, - output_name: "lag".into(), - child: scan(), - }); - let shifted = Rc::new(QueryExpr::TimeShift { - shift: asap_types::pre_asap::TimeShift { - offset_ms: 60_000, - at: None, }, - child: scan(), - }); + )) + .unwrap(); + let shifted = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::TimeShift { + shift: asap_types::pre_asap::TimeShift { + offset_ms: 60_000, + at: None, + }, + child: scan(), + })) + .unwrap(); let scope = scope(vec![coverage( Source::Table { table_ref: "events".into(), @@ -2308,40 +2352,42 @@ mod tests { #[test] fn scalar_work_counts_every_local_predicate_operation() { - use asap_types::pre_asap::{CompareOpKind, QueryExpr, ScalarValue}; + use asap_types::pre_asap::{CompareOpKind, ScalarValue}; - let comparison = || QueryExpr::Compare { - left: Rc::new(QueryExpr::Column(0)), + let comparison = || ScalarExpr::Compare { + left: Box::new(ScalarExpr::Column(0)), op: CompareOpKind::Eq, - right: Rc::new(QueryExpr::Literal(ScalarValue::Int64(1))), + right: Box::new(ScalarExpr::Literal(ScalarValue::Int64(1))), + semantics: ExprSemantics::Sql, }; - let predicate = QueryExpr::BoolAnd(vec![comparison(), comparison()]); + let predicate = ScalarExpr::BoolAnd(vec![comparison(), comparison()]); assert_eq!(scalar_operation_count(&predicate), Ok(3)); } #[test] fn promql_presence_is_lowered_with_a_per_step_output_bound() { - use asap_types::pre_asap::{ - AggIntent, DataType, Field, QueryExpr, Reduction, Schema, Source, - }; + use asap_types::pre_asap::{AggIntent, DataType, Field, Reduction, Schema, Source}; let source = Source::TimeSeries { metric: "missing".into(), }; - let scan = Rc::new(QueryExpr::Scan { + let scan = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Scan { source: source.clone(), predicates: vec![], schema: Schema::new(vec![Field::plain("value", DataType::Float64, false)]), - }); - let root = Rc::new(QueryExpr::Aggregate { - reduction: Reduction::PerEntity, - measures: vec![AggIntent::Absent], - output_names: vec![], - filters: vec![], - having: None, - child: scan, - }); + })) + .unwrap(); + let root = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { + reduction: Reduction::PerEntity, + measures: vec![AggIntent::Absent], + output_names: vec![], + filters: vec![], + having: None, + child: scan, + })) + .unwrap(); let vector = promql_edge(0, 2, PromqlValueKind::Vector); let scan_statistics = OperatorStatistics::Scan { edges: promql_unary_edges(edge(0, 0), edge(0, 0), vector, vector), @@ -2390,24 +2436,31 @@ mod tests { #[test] fn promql_range_and_subquery_preserve_internal_steps() { - use asap_types::pre_asap::{DataType, Field, QueryExpr, Schema, Source}; + use asap_types::pre_asap::{DataType, Field, Schema, Source}; use std::time::Duration; let source = Source::TimeSeries { metric: "m".into() }; - let scan = Rc::new(QueryExpr::Scan { + let scan = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Scan { source: source.clone(), predicates: vec![], schema: Schema::new(vec![Field::plain("value", DataType::Float64, false)]), - }); - let range = Rc::new(QueryExpr::TimeRange { - range: Duration::from_secs(300), - child: scan, - }); - let root = Rc::new(QueryExpr::PromqlSubquery { - range: Duration::from_secs(300), - resolution: Some(Duration::from_secs(60)), - child: range, - }); + })) + .unwrap(); + let range = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::TimeRange { + range: Duration::from_secs(300), + kind: TimeRangeKind::Range, + child: scan, + })) + .unwrap(); + let root = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP( + NonASAPOp::PromqlSubquery { + range: Duration::from_secs(300), + resolution: Some(Duration::from_secs(60)), + child: range, + }, + )) + .unwrap(); let vector = promql_edge(10, 6, PromqlValueKind::Vector); let range_vector = promql_edge(10, 6, PromqlValueKind::RangeVector); let outer_range = promql_edge(10, 1, PromqlValueKind::RangeVector); @@ -2465,32 +2518,40 @@ mod tests { #[test] fn promql_binary_lowering_keeps_operation_and_matching_cardinality() { use asap_types::pre_asap::{ - ArithmeticOpKind, BinaryOpKind, DataType, Field, GroupSide, QueryExpr, Schema, Source, + ArithmeticOpKind, BinaryOpKind, DataType, Field, GroupSide, Schema, Source, VectorGrouping, VectorMatch, VectorMatchKind, }; let left_source = Source::TimeSeries { metric: "a".into() }; let right_source = Source::TimeSeries { metric: "b".into() }; let scan = |source| { - Rc::new(QueryExpr::Scan { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Scan { source, predicates: vec![], schema: Schema::new(vec![Field::plain("value", DataType::Float64, false)]), - }) + })) + .unwrap() }; - let root = Rc::new(QueryExpr::BinaryOp { - op: BinaryOpKind::Arithmetic(ArithmeticOpKind::Div), - lhs: scan(left_source.clone()), - rhs: scan(right_source.clone()), - vector_match: Some(VectorMatch { - kind: VectorMatchKind::On, - labels: vec!["service".into()], - grouping: Some(VectorGrouping { - side: GroupSide::Left, - labels: vec!["region".into()], - }), - }), - }); + let root = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::BinaryOp { + operator: BinaryOperator { + kind: BinaryOpKind::Arithmetic(ArithmeticOpKind::Div), + vector_match: Some(VectorMatch { + kind: VectorMatchKind::On, + labels: vec!["service".into()], + grouping: Some(VectorGrouping { + side: GroupSide::Left, + labels: vec!["region".into()], + }), + }), + checked_relative_division: false, + checked_finite_division: false, + }, + return_bool: false, + lhs: scan(left_source.clone()), + rhs: scan(right_source.clone()), + })) + .unwrap(); let left_promql = promql_edge(10, 10, PromqlValueKind::Vector); let right_promql = promql_edge(5, 10, PromqlValueKind::Vector); let output_promql = promql_edge(8, 10, PromqlValueKind::Vector); @@ -2548,36 +2609,45 @@ mod tests { #[test] fn promql_relabel_sample_and_per_series_lower_as_a_complete_chain() { use asap_types::pre_asap::{ - AggIntent, DataType, Field, GroupKeys, QueryExpr, Reduction, SampleKind, ScalarValue, - Schema, Source, + AggIntent, DataType, Field, GroupKeys, Reduction, SampleKind, ScalarValue, Schema, + Source, }; let source = Source::TimeSeries { metric: "requests".into(), }; - let scan = Rc::new(QueryExpr::Scan { + let scan = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Scan { source: source.clone(), predicates: vec![], schema: Schema::new(vec![Field::plain("value", DataType::Float64, false)]), - }); - let relabel = Rc::new(QueryExpr::PromqlRelabel { - dst: "service".into(), - value: Rc::new(QueryExpr::Literal(ScalarValue::Utf8("api".into()))), - child: scan, - }); - let sample = Rc::new(QueryExpr::PromqlSeriesSample { - by: GroupKeys::none(), - kind: SampleKind::LimitK(5), - child: relabel, - }); - let root = Rc::new(QueryExpr::Aggregate { - reduction: Reduction::PerEntity, - measures: vec![AggIntent::Sum { col: None }], - output_names: vec![], - filters: vec![], - having: None, - child: sample, - }); + })) + .unwrap(); + let relabel = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP( + NonASAPOp::PromqlRelabel { + dst: "service".into(), + value: ScalarExpr::Literal(ScalarValue::Utf8("api".into())), + child: scan, + }, + )) + .unwrap(); + let sample = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP( + NonASAPOp::PromqlSeriesSample { + by: GroupKeys::none(), + kind: SampleKind::LimitK(5), + child: relabel, + }, + )) + .unwrap(); + let root = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { + reduction: Reduction::PerEntity, + measures: vec![AggIntent::Sum { col: None }], + output_names: vec![], + filters: vec![], + having: None, + child: sample, + })) + .unwrap(); let input = edge(100, 1_600); let sampled = edge(50, 800); diff --git a/crates/asap-aware-mapping/src/recurrence.rs b/crates/asap-aware-mapping/src/recurrence.rs index 660787cdb..835a35a65 100644 --- a/crates/asap-aware-mapping/src/recurrence.rs +++ b/crates/asap-aware-mapping/src/recurrence.rs @@ -394,7 +394,7 @@ pub enum RootRecurrence { // ── Explanation ────────────────────────────────────────────────────────── -/// The full readout [`CostModel::cse_share_decision_with_recurrence`] +/// The full evaluation [`CostModel::cse_share_decision_with_recurrence`] /// returns: which alternative was selected, both compared cost rates /// (and, when a [`Horizon`] was supplied, both compared totals), every /// input that went into them, their units, and provenance — meant to be @@ -779,17 +779,20 @@ mod tests { // ── decide (structural fallback) ───────────────────────────────────── use crate::cost_model::CseCandidate; + use asap_types::ir::operator_properties::{Reduction, Source}; + use asap_types::ir::{ + ASAPOp, BinaryOperator, ExprSemantics, NonASAPOp, OperatorNode, Predicate, ScalarExpr, + }; use asap_types::post_asap::{ ExactKind, ExactParams, Field, FieldDataType, GroupingStrategy, ResultGuarantee, Schema, - SummaryExpr, SummaryNode, }; use asap_types::pre_asap::expr_ir::ColumnRef; - use asap_types::pre_asap::query_expr::{QueryExpr, Reduction, Source}; use asap_types::pre_asap::schema::DataType; + use std::rc::Rc; - fn scan() -> QueryExpr { - QueryExpr::Scan { + fn scan() -> Rc { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Scan { source: Source::TimeSeries { metric: "m".into() }, predicates: vec![], schema: Schema::with_time_index( @@ -800,28 +803,34 @@ mod tests { 0, vec![], ), - } + })) + .unwrap() } - fn summary_node(family: FieldDataType) -> SummaryNode { - SummaryNode { - expr: SummaryExpr::SummaryAgg { - child: Rc::new(SummaryNode { - expr: SummaryExpr::KeepPreAsap(Rc::new(scan())), - schema: Schema::lifted(vec![], None), - guarantee: Some(ResultGuarantee::exact("KeepPreAsap")), + /// A summary of `family` over the kept pre-ASAP scan. + fn summary_node(family: FieldDataType) -> Rc { + let kept = Rc::new( + scan() + .as_ref() + .clone() + .with_guarantee(Some(ResultGuarantee::exact("RetainedExact"))), + ); + std::rc::Rc::new( + OperatorNode::with_schema( + asap_types::ir::Operator::ASAP(ASAPOp::SummaryAgg { + child: kept, + family: family.clone(), + input: asap_types::post_asap::SummaryUpdate::column(ColumnRef::Named( + "value".into(), + )), + reduction: Reduction::by(vec![]), + grouping: GroupingStrategy::default(), + filter: None, }), - family: family.clone(), - input: asap_types::post_asap::SummaryUpdate::column(ColumnRef::Named( - "value".into(), - )), - reduction: Reduction::by(vec![]), - grouping: GroupingStrategy::default(), - filter: None, - }, - schema: Schema::lifted(vec![Field::new("state", family, false)], None), - guarantee: None, - } + Schema::lifted(vec![Field::new("state", family, false)], None), + ) + .with_guarantee(None), + ) } #[test] @@ -1120,9 +1129,9 @@ mod tests { // ── multiple roots sharing a sub-DAG, via CandidateLogicalASAPDAGs ────────────────── use crate::replacement::search_workload; + use asap_types::ir::operator_properties::Reduction as QueryReduction; use asap_types::pre_asap::agg_intent::AggIntent; - use asap_types::pre_asap::expr_ir::ScalarValue; - use asap_types::pre_asap::query_expr::{Predicate, Reduction as QueryReduction}; + use asap_types::pre_asap::expr_ir::{CompareOpKind, ScalarValue}; /// Like `scan()`, plus a "job" label column to group by — CSE's /// sharing legality gate requires a provable unique key @@ -1132,8 +1141,8 @@ mod tests { /// real one, matching the pattern /// `replacement.rs`'s own CSE fixtures already use (`metric_scan`/`agg` /// grouped by a label column). - fn labeled_scan() -> QueryExpr { - QueryExpr::Scan { + fn labeled_scan() -> Rc { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Scan { source: Source::TimeSeries { metric: "m".into() }, predicates: vec![], schema: Schema::with_time_index( @@ -1145,18 +1154,20 @@ mod tests { 0, vec![], ), - } + })) + .unwrap() } - fn sum_agg() -> QueryExpr { - QueryExpr::Aggregate { + fn sum_agg() -> Rc { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { reduction: QueryReduction::by(vec![2]), measures: vec![AggIntent::Sum { col: Some(1) }], output_names: vec![], filters: vec![], having: None, - child: Rc::new(labeled_scan()), - } + child: labeled_scan(), + })) + .unwrap() } /// A root wrapping a fresh, independently-built (but structurally @@ -1167,13 +1178,19 @@ mod tests { /// `shared_aggregate_across_two_roots_gets_both_strategies_candidates`'s /// own doc) while letting `share_common_sub_dags` unify their /// identical `sum_agg()` children onto one shared `Rc`. - fn filtered_root(distinguishing_literal: i64) -> QueryExpr { - QueryExpr::Filter { - pred: Predicate(Rc::new(QueryExpr::Literal(ScalarValue::Int64( - distinguishing_literal, - )))), - child: Rc::new(sum_agg()), - } + fn filtered_root(distinguishing_literal: i64) -> Rc { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Filter { + pred: Predicate(ScalarExpr::Compare { + left: Box::new(ScalarExpr::Column(1)), + op: CompareOpKind::Gt, + right: Box::new(ScalarExpr::Literal(ScalarValue::Int64( + distinguishing_literal, + ))), + semantics: ExprSemantics::Sql, + }), + child: sum_agg(), + })) + .unwrap() } /// Three workload roots share one underlying `sum_agg()` sub-DAG: two @@ -1185,10 +1202,10 @@ mod tests { /// roots sharing a sub-DAG" acceptance criteria. #[test] fn recurrence_profiles_aggregates_mixed_intervals_across_roots_sharing_a_subdag() { - let roots: Vec<(&str, Rc)> = vec![ - ("root_a", Rc::new(filtered_root(1))), - ("root_b", Rc::new(filtered_root(2))), - ("root_c", Rc::new(filtered_root(3))), + let roots: Vec<(&str, Rc)> = vec![ + ("root_a", filtered_root(1)), + ("root_b", filtered_root(2)), + ("root_c", filtered_root(3)), ]; let space = search_workload(roots); @@ -1206,7 +1223,7 @@ mod tests { ); let shared_group = space .target_subdag_candidates() - .find(|g| matches!(g.target.as_ref(), QueryExpr::Aggregate { .. })) + .find(|g| matches!(g.target.non_asap(), Some(NonASAPOp::Aggregate { .. }))) .expect("the shared sum_agg() is a discovered target"); assert_eq!(shared_group.consumer_count, 3, "shared by all 3 roots"); @@ -1250,14 +1267,11 @@ mod tests { #[test] fn plan_selection_uses_recurrence_profiles_for_cse_choices() { - let roots = vec![ - ("a", Rc::new(filtered_root(1))), - ("b", Rc::new(filtered_root(2))), - ]; + let roots = vec![("a", filtered_root(1)), ("b", filtered_root(2))]; let space = search_workload(roots); let shared = space .target_subdag_candidates() - .find(|group| matches!(group.target.as_ref(), QueryExpr::Aggregate { .. })) + .find(|group| matches!(group.target.non_asap(), Some(NonASAPOp::Aggregate { .. }))) .expect("the aggregate is shared by both roots"); let update_rate = Some(UpdateRate(10.0)); @@ -1315,8 +1329,8 @@ mod tests { #[test] fn recurrence_profiles_rejects_an_invalid_evaluation_rate() { - let root = Rc::new(scan()); - let roots: Vec<(&str, Rc)> = vec![("only", root)]; + let root = scan(); + let roots: Vec<(&str, Rc)> = vec![("only", root)]; let space = search_workload(roots); let err = space .recurrence_profiles(&[RootRecurrence::Repeating(EvaluationRate(f64::NAN))], None) @@ -1329,8 +1343,8 @@ mod tests { /// signature promises a `Result`. #[test] fn recurrence_profiles_reports_a_root_count_mismatch_as_an_error_not_a_panic() { - let root = Rc::new(scan()); - let roots: Vec<(&str, Rc)> = vec![("only", root)]; + let root = scan(); + let roots: Vec<(&str, Rc)> = vec![("only", root)]; let space = search_workload(roots); let err = space.recurrence_profiles(&[], None).unwrap_err(); assert_eq!( @@ -1344,8 +1358,8 @@ mod tests { #[test] fn recurrence_profiles_rejects_an_invalid_update_rate() { - let root = Rc::new(scan()); - let roots: Vec<(&str, Rc)> = vec![("only", root)]; + let root = scan(); + let roots: Vec<(&str, Rc)> = vec![("only", root)]; let space = search_workload(roots); let err = space .recurrence_profiles( @@ -1373,23 +1387,25 @@ mod tests { /// `consumer_count`. #[test] fn recurrence_profiles_does_not_stamp_update_rate_on_a_site_unreachable_from_any_root() { - let avg_root = QueryExpr::Aggregate { - reduction: QueryReduction::by(vec![]), - measures: vec![AggIntent::Avg { col: None }], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(scan()), - }; - let roots: Vec<(&str, Rc)> = vec![("q", Rc::new(avg_root))]; + let avg_root = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { + reduction: QueryReduction::by(vec![]), + measures: vec![AggIntent::Avg { col: None }], + output_names: vec![], + filters: vec![], + having: None, + child: scan(), + })) + .unwrap(); + let roots: Vec<(&str, Rc)> = vec![("q", avg_root)]; let space = search_workload(roots); let count_group = space .target_subdag_candidates() .find(|g| { matches!( - g.target.as_ref(), - QueryExpr::Aggregate { measures, .. } + g.target.non_asap(), + Some(NonASAPOp::Aggregate { measures, .. }) if measures.iter().any(|m| matches!(m, AggIntent::Count { .. })) ) }) @@ -1428,19 +1444,26 @@ mod tests { /// reachability-set walk would (wrongly) collapse it to. #[test] fn recurrence_profiles_credits_a_direct_repeated_reference_by_its_multiplicity() { - let root = QueryExpr::BinaryOp { - op: asap_types::pre_asap::query_expr::BinaryOpKind::Compare( - asap_types::pre_asap::expr_ir::CompareOpKind::Eq, - ), - lhs: Rc::new(sum_agg()), - rhs: Rc::new(sum_agg()), - vector_match: None, - }; - let space = search_workload(vec![("q", Rc::new(root))]); + let root = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::BinaryOp { + operator: BinaryOperator { + checked_relative_division: false, + checked_finite_division: false, + kind: asap_types::ir::operator_properties::BinaryOpKind::Compare( + CompareOpKind::Eq, + ), + vector_match: None, + }, + return_bool: false, + lhs: sum_agg(), + rhs: sum_agg(), + })) + .unwrap(); + let space = search_workload(vec![("q", root)]); let shared_group = space .target_subdag_candidates() - .find(|g| matches!(g.target.as_ref(), QueryExpr::Aggregate { .. })) + .find(|g| matches!(g.target.non_asap(), Some(NonASAPOp::Aggregate { .. }))) .expect("sum_agg() should merge onto one shared Rc, referenced twice from BinaryOp"); assert_eq!( shared_group.consumer_count, 2, @@ -1463,7 +1486,7 @@ mod tests { let scan_group = space .target_subdag_candidates() - .find(|group| matches!(group.target.as_ref(), QueryExpr::Scan { .. })) + .find(|group| matches!(group.target.non_asap(), Some(NonASAPOp::Scan { .. }))) .expect("the shared aggregate has a scan descendant"); assert_eq!( profiles diff --git a/crates/asap-aware-mapping/src/replacement.rs b/crates/asap-aware-mapping/src/replacement.rs index 44ffef189..2020be8a5 100644 --- a/crates/asap-aware-mapping/src/replacement.rs +++ b/crates/asap-aware-mapping/src/replacement.rs @@ -3,9 +3,9 @@ //! under "Key concepts (not yet implemented)", implemented for real (issue //! #251, part of #33). //! -//! ## One step, not two: `SketchAlgorithmStrategy::replacements()` decides *and* builds +//! ## One step, not two: `ASAPStrategies::replacements()` decides *and* builds //! -//! For a bindable `Aggregate`, `SketchAlgorithmStrategy::replacements()` is the +//! For a bindable `Aggregate`, `ASAPStrategies::replacements()` is the //! single place this crate both decides what an `AggIntent` may become and //! turns each of those candidates into a real, executable //! [`ReplacementSubDAG`]: @@ -18,8 +18,8 @@ //! `CostModel::size_params`, not a placeholder filled in later). //! 2. **Build**: for each candidate in that list, [`construct_summary`] //! mechanically turns the already-decided `(kind, params)` into a real -//! [`SummaryNode`] — derives the child schema, resolves the summarized -//! column, builds the readout query, recurses into the child (via +//! [`OperatorNode`] — derives the child schema, resolves the summarized +//! column, builds the evaluation query, recurses into the child (via //! [`realize_child`], so a nested aggregate gets its own //! independent enumeration, never the outer target's forced choice), and //! assembles the `SummaryAgg`/`SummaryEstimate` node. @@ -31,13 +31,13 @@ //! has to run regardless of how `(kind, params)` were chosen, so it lives //! directly inside the one method that needs it. //! -//! - [`TargetSubDAG`] — a reference to a pre-ASAP [`QueryExpr`] node that is a +//! - [`TargetSubDAG`] — a reference to a pre-ASAP [`OperatorNode`] that is a //! candidate for replacement, plus how many places in the workload already //! reference it (its `consumer_count`) — the one piece of cross-node //! context [`SharedSubDAGStrategy`] needs that a bare node reference alone //! doesn't carry. //! - [`ReplacementSubDAG`] — one candidate replacement for a `TargetSubDAG`: -//! either a fully bound [`SummaryNode`] or a pre-ASAP [`QueryExpr`] rewrite +//! either a fully bound summary sub-DAG or a pre-ASAP logical rewrite //! (still logical, structurally different from the target but semantically //! equivalent) — see [`Replacement`] — plus a human-readable `rationale`. //! - [`ReplacementStrategy`] — `matches` + `replacements`, the same @@ -56,9 +56,7 @@ //! does not establish a compatible workload plan or physical deployability. //! For Planner-owned logical selection, call [`CandidateLogicalASAPDAGs::global_selection`] //! once and [`GlobalSelection::assemble_selected_dag`] for each wanted query -//! root. Alternatively, use the summary-maintenance-lifecycle-aware helpers -//! when Planner should also compare maintenance against raw recomputation. -//! Physical binding, deployment, and execution remain downstream. +//! root. Physical binding, deployment, and execution remain downstream. //! //! Internally, [`realize_child`] and [`realize_one`] may take a preferred local //! realization while constructing or costing a candidate. That local operation @@ -72,15 +70,15 @@ //! //! ## The two strategies, and why these two //! -//! - [`SketchAlgorithmStrategy`] wraps [`realizations_for_intent`]'s exhaustive, +//! - [`ASAPStrategies`] wraps [`realizations_for_intent`]'s exhaustive, //! ranked list directly: for the same bindable-`Aggregate` shape this crate //! binds (single intent, no `HAVING`), every entry becomes its own bound //! candidate. //! - [`SharedSubDAGStrategy`] wraps -//! `asap_types::pre_asap::cse::share_common_sub_dags`'s sharing decision. +//! `asap_types::ir::cse::share_common_sub_dags`'s sharing decision. //! Wherever a [`TargetSubDAG`] already has two or more consumers (i.e. //! `share_common_sub_dags` already collapsed two or more workload -//! locations onto the same `Rc` — [`discover_targets`] below +//! locations onto the same `Rc` — [`discover_targets`] below //! does the identical workload-wide discovery for [`search_workload_with`]; //! this module's own tests reuse the same dedup logic to build realistic //! fixtures), it reports the two-way candidate CSE's own detection pass @@ -98,7 +96,7 @@ //! unchanged.** Same inputs still produce the same exhaustive, ranked //! list — only its home moved (from a separate `implementation` module //! into this one) and its own visibility dropped to module-private, since -//! [`SketchAlgorithmStrategy`] is now its only caller. +//! [`ASAPStrategies`] is now its only caller. //! //! ## Workload-wide search — merged in from the former `search.rs` (issue #252, part of #33) //! @@ -143,12 +141,12 @@ //! //! 1. **Per-target candidates, not flat plans.** [`TargetSubDAGCandidates`] //! stores the alternatives for one distinct [`TargetSubDAG`] (identified by -//! its own `Rc` pointer identity — the same currency -//! [`asap_types::pre_asap::cse::share_common_sub_dags`] already +//! its own `Rc` pointer identity — the same currency +//! [`asap_types::ir::cse::share_common_sub_dags`] already //! established across the workload) holding every //! [`ReplacementSubDAG`] alternative discovered for it. [`CandidateLogicalASAPDAGs`] is //! a collection of these groups, keyed by `TargetSubDAG` — a candidate -//! "plan" is never materialized as a distinct top-level `Rc` +//! "plan" is never materialized as a distinct top-level `Rc` //! at all; two logically-different overall choices at two different //! targets are just two different entries in two different groups, //! sharing every other node in the workload by construction (they *are* @@ -157,7 +155,7 @@ //! discipline.** [`asap_types::pre_asap::cse::structural_hash`] (made //! `pub` for exactly this reuse) is only ever a candidate-narrowing //! filter; [`TargetSubDAGCandidates::add_candidate`]'s actual duplicate check is -//! `QueryExpr`'s derived `PartialEq` — the same "hash is a filter, +//! `OperatorNode`'s derived `PartialEq` — the same "hash is a filter, //! `PartialEq` is the decision, no exceptions" rule `cse.rs`'s own //! "Correctness" section states and this module inherits rather than //! reinvents. See [`is_duplicate_rewrite`] for the one deliberate @@ -175,7 +173,7 @@ //! line above stands for: every `TargetSubDAG` this pass discovers is one //! iteration of that loop. It walks every workload root's whole DAG (the //! same **relational-skeleton** operator-child scope -//! `asap_types::pre_asap::cse::share_common_sub_dags` itself uses — see +//! `asap_types::ir::cse::share_common_sub_dags` itself uses — see //! that module's "Algorithm" section), discovering one `TargetSubDAG` per //! distinct `Rc` and a *real* `consumer_count`: how many operator-child //! positions anywhere in the workload reference that exact `Rc`, not just @@ -212,10 +210,10 @@ //! an alternative *for* the target just processed, not a new target of its //! own; see [`discover_new_descendant_targets`]) are scanned for pointers //! not already known, and any found become next round's frontier. Both shipped -//! strategies are idempotent in exactly this sense: [`SketchAlgorithmStrategy`] -//! produces terminal [`Replacement::Summary`] candidates (no `QueryExpr` -//! children to scan at all), and [`SharedSubDAGStrategy`]'s two -//! [`Replacement::Rewrite`] candidates both reuse the target's own +//! strategies are idempotent in exactly this sense: [`ASAPStrategies`] +//! produces terminal bound-summary [`Replacement::SubDAG`] candidates (no +//! logical-rewrite children to scan at all), and [`SharedSubDAGStrategy`]'s +//! two logical-rewrite [`Replacement::SubDAG`] candidates both reuse the target's own //! already-known child `Rc`s verbatim (`Rc::clone`/a shallow top-level //! `.clone()` — see that strategy's own doc). So for both, the frontier is //! always empty after round one: real workloads converge in exactly one @@ -248,7 +246,7 @@ //! share-vs-recompute pair is ranked by calling //! [`CostModel::cse_share_decision`] via this module's own //! [`cse_preference`] — rather than re-deriving a competing comparison. -//! - A group whose candidates are [`SketchAlgorithmStrategy`]'s sketch-family +//! - A group whose candidates are [`ASAPStrategies`]'s sketch-family //! candidates is ranked via [`CostModel::rank_candidates`] (the same hook //! `realizations_for_intent` itself consults), applied to the //! candidates' own [`SketchAlgorithm`]s. @@ -317,8 +315,8 @@ //! documented follow-up rather than silently overclaimed: //! //! - [`CostModel::rank_candidates`]/[`CostModel::size_params`] — the hooks -//! [`SketchAlgorithmStrategy`] groups rank by — take no `consumer_count` -//! parameter at all today, so a `SketchAlgorithmStrategy` group's selection +//! [`ASAPStrategies`] groups rank by — take no `consumer_count` +//! parameter at all today, so a `ASAPStrategies` group's selection //! here still falls back to [`rank_group`]'s ordinary (consumer-count- //! blind) local ranking, even though its own //! [`TargetSubDAGSelection::effective_consumer_count`] is computed and exposed @@ -345,31 +343,34 @@ use crate::accuracy::estimators::{ cms::{cms_depth, cms_width}, saturating_ceil, }; +use asap_types::ir::non_asap::any_measure_filtered; +use asap_types::pre_asap::resolve_column_ref; use std::cell::RefCell; use std::collections::{HashMap, HashSet, VecDeque}; +use asap_types::ir::cse::{share_common_sub_dags, structural_hash, HashCache}; +use asap_types::ir::operator_properties::{BinaryOpKind, JoinKind, Reduction}; +use asap_types::ir::summary_coverage::{CoverageRegion, SummaryCoverage}; +use asap_types::ir::timing::validate_maintained; +use asap_types::ir::SchemaDerivationError; +use asap_types::ir::{ + ASAPOp, BinaryOperator, NonASAPOp, Operator, OperatorNode, Predicate, ProjectItem, ScalarExpr, + SortKey, +}; +use asap_types::post_asap::{AccuracyError, CompositionOperator, GuaranteeSource, ResultGuarantee}; use asap_types::post_asap::{ - validate_execution_data_states_at, EntityIdentity, ExactKind, ExactOperation, - ExactOperationSchemaError, ExactParams, ExecutionDataState, ExecutionDataStateError, + EntityIdentity, ExactKind, ExactOperationSchemaError, ExactParams, ExecutionDataStateError, ExecutionTiming, Field, FieldDataType, GroupingStrategy, NonNegativeWeightProof, SamplingKind, SamplingParams, Schema, SketchAlgorithm, SketchKind, SketchParams, - SketchStatistic as PostAsapSketchStatistic, StatModelKind, StatModelParams, SummaryExpr, - SummaryInputExpr, SummaryNode, SummaryUpdate, ValueOperation, WaveletKind, WaveletParams, - WeightDomain, + SketchStatistic as PostAsapSketchStatistic, StatModelKind, StatModelParams, SummaryInputExpr, + SummaryUpdate, WaveletKind, WaveletParams, WeightDomain, }; -use asap_types::post_asap::{AccuracyError, CompositionOperator, GuaranteeSource, ResultGuarantee}; use asap_types::pre_asap::agg_intent::{agg_is_mergeable, AggIntent}; -use asap_types::pre_asap::column_resolution::resolve_column_ref; -use asap_types::pre_asap::cse::{share_common_sub_dags, structural_hash, HashCache}; use asap_types::pre_asap::expr_ir::{ArithmeticOpKind, ColumnRef}; -use asap_types::pre_asap::query_expr::any_measure_filtered; -use asap_types::pre_asap::query_expr::{ - BinaryOpKind, Predicate, QueryExpr, QueryExprError, Reduction, -}; use asap_types::pre_asap::schema::ColumnId; use asap_types::types::AccuracyTarget; use asap_types::workload::{DataWorkload, QueryRecurrence, QueryWorkload, RepeatedDemand}; -use std::rc::Rc; +use std::rc::{Rc, Weak}; use thiserror::Error; use crate::accuracy::reconciliation::AccuracyReconciliationStrategy; @@ -378,8 +379,8 @@ use crate::accuracy::{ DefaultAccuracyModel, EqualSplitAllocator, NoAccuracyEvidence, }; use crate::cost_model::{ - raw_recompute_cost_rate, Cost, CostModel, CseCandidate, DefaultCostModel, - ExactCompositionCostInputs, ExactCompositionCostRequest, ShareDecision, + raw_recompute_cost_rate, CostModel, CseCandidate, DefaultCostModel, ExactCompositionCostInputs, + ExactCompositionCostRequest, ShareDecision, }; use crate::exact_composition::{ExactComposition, ExactCompositionStrategy, OperationPlacement}; use crate::grouping::HydraGroupingStrategy; @@ -391,20 +392,20 @@ use crate::rollup::RollupStrategy; use crate::topk_reuse::TopKLimitReuseStrategy; /// Errors from the pre-ASAP → post-ASAP replacement/construction path -/// ([`realize_child`] and [`keep_pre_asap`]). Moved here from the former +/// ([`realize_child`] and [`retain_exact`]). Moved here from the former /// `bind.rs` (issue #251): this is what a [`ReplacementStrategy`] /// implementor's own construction path can realistically fail with — -/// schema derivation over a pre-ASAP [`QueryExpr`] — not something specific -/// to workload-wide orchestration. +/// schema derivation over a pre-ASAP [`OperatorNode`] sub-DAG — not +/// something specific to workload-wide orchestration. #[derive(Debug, Error)] pub enum RealizationError { /// Schema derivation failed while lifting an edge to `Schema`. #[error("schema derivation failed during pre-ASAP → post-ASAP binding: {0}")] - Schema(#[from] QueryExprError), + Schema(#[from] SchemaDerivationError), /// The candidate is accuracy-illegal (issue #172): its composed /// guarantee has no sound propagation rule, or misses the applicable /// `AccuracyTarget`. Fail-closed — the candidate is never constructed - /// with the child "treated as exact". [`SketchAlgorithmStrategy::propose`] + /// with the child "treated as exact". [`ASAPStrategies::propose`] /// records it as a [`RejectedCandidate`] instead of a candidate. #[error("accuracy-illegal candidate: {0}")] Accuracy(#[from] AccuracyError), @@ -414,8 +415,8 @@ pub enum RealizationError { /// would change its semantics. #[error("unsupported physical summary realization: {0}")] PhysicalRealization(&'static str), - /// A constructed plan violates the update/readout phase contract - /// (issue #171) — e.g. a summary readout placed beneath a maintained + /// A constructed plan violates the update/evaluation phase contract + /// (issue #171) — e.g. a summary evaluation placed beneath a maintained /// `SummaryAgg`. Detected at construction, never at runtime. #[error("execution-data_state violation in post-ASAP plan: {0}")] ExecutionDataState(#[from] ExecutionDataStateError), @@ -427,10 +428,10 @@ pub enum RealizationError { /// A pre-ASAP sub-DAG a [`ReplacementStrategy`] knows how to replace. /// -/// `root` is a reference into the workload's own [`QueryExpr`] DAG (an -/// `Rc`, the same currency [`search_workload`] and -/// `asap_types::pre_asap::cse::share_common_sub_dags` already thread through -/// this crate's public API — not a bare `&QueryExpr` — so a strategy that +/// `root` is a reference into the workload's own [`OperatorNode`] DAG (an +/// `Rc`, the same currency [`search_workload`] and +/// `asap_types::ir::cse::share_common_sub_dags` already thread through +/// this crate's public API — not a bare `&OperatorNode` — so a strategy that /// needs the node's own `Rc` identity, not just its shape, has it available /// without the caller re-deriving it). /// @@ -439,16 +440,16 @@ pub enum RealizationError { /// [`search_workload_with`] computes the workload-wide value during target /// discovery. [`TargetSubDAG::new`] defaults it to `1` for callers invoking a /// strategy against one node in isolation. A strategy that only cares about -/// `root`'s shape (for example, [`SketchAlgorithmStrategy`]) can ignore the +/// `root`'s shape (for example, [`ASAPStrategies`]) can ignore the /// count; [`SharedSubDAGStrategy`] consults it directly. /// /// `strictest_sibling_accuracy` is the strictest accuracy among workload /// siblings that read the same summary input as `root`, when stricter than -/// `root`'s own. [`search_workload_with`] sets it; [`SketchAlgorithmStrategy`] +/// `root`'s own. [`search_workload_with`] sets it; [`ASAPStrategies`] /// also sizes a candidate to it. #[derive(Debug, Clone, Copy)] pub struct TargetSubDAG<'a> { - pub root: &'a Rc, + pub root: &'a Rc, pub consumer_count: usize, pub strictest_sibling_accuracy: Option<&'a AccuracyTarget>, } @@ -456,7 +457,7 @@ pub struct TargetSubDAG<'a> { impl<'a> TargetSubDAG<'a> { /// A target assumed to have exactly one consumer — the common case for a /// caller that isn't already tracking cross-workload sharing. - pub fn new(root: &'a Rc) -> Self { + pub fn new(root: &'a Rc) -> Self { Self { root, consumer_count: 1, @@ -466,7 +467,7 @@ impl<'a> TargetSubDAG<'a> { /// A target with an explicit `consumer_count`, used by workload discovery /// and by callers that already know how many locations reference `root`. - pub fn with_consumer_count(root: &'a Rc, consumer_count: usize) -> Self { + pub fn with_consumer_count(root: &'a Rc, consumer_count: usize) -> Self { Self { root, consumer_count, @@ -482,25 +483,35 @@ impl<'a> TargetSubDAG<'a> { /// — into "one candidate among several", each with its own /// [`ReplacementSubDAG`]. #[derive(Debug, Clone)] +#[allow(clippy::large_enum_variant)] // Keep the public strategy API value-based. pub enum Replacement { - /// A fully bound post-ASAP summary decision, for one particular - /// candidate realization of the target. - Summary(Rc), - /// A pre-ASAP rewrite: still a logical [`QueryExpr`], structurally - /// different from the target's own `root` (e.g. sharing vs. not sharing - /// a sub-DAG) but semantically equivalent to it. - Rewrite(Rc), + /// A sub-DAG that replaces the target: either a bound summary decision + /// (a DAG containing ASAP operators, for one particular candidate + /// realization of the target) or a pre-ASAP rewrite (a logical sub-DAG + /// with no ASAP operator, structurally different from the target's own + /// `root` — e.g. sharing vs. not sharing a sub-DAG — but semantically + /// equivalent to it). [`is_logical_rewrite`] tells the two apart. + SubDAG(Rc), /// An exact operator composed over another target's *own* selected - /// decision across an explicit update/readout boundary (issue #171): - /// `ValueOperationAtQueryTime` over a child's summary readout, or + /// decision across an explicit update/evaluation boundary (issue #171): + /// `ValueOperationAtQueryTime` over a child's summary evaluation, or /// `ValueOperationAtIngestionTime` feeding a maintained summary above. Carries only a /// reference to the child target — [`CandidateLogicalASAPDAGs::global_selection`] /// commits the compatible parent/child pair and /// [`GlobalSelection::assemble_selected_dag`] links it into one validated - /// `SummaryNode`. See [`crate::exact_composition`]. + /// `OperatorNode` DAG. See [`crate::exact_composition`]. ExactComposition(ExactComposition), } +/// Whether a [`Replacement::SubDAG`] is a pure logical rewrite: a sub-DAG +/// with no ASAP operator and no guarantee established yet (the shape every +/// front end emits and every rewrite strategy builds). A bound summary +/// decision contains an ASAP operator, or is a kept pre-ASAP sub-DAG that +/// already carries its exact guarantee. +pub fn is_logical_rewrite(node: &OperatorNode) -> bool { + node.guarantee.is_none() && !node.contains_asap() +} + /// One candidate replacement for a [`TargetSubDAG`], plus a human-readable /// `rationale` explaining why it's a valid candidate (meant for a /// report/log/debugging a search engine's choices, not machine parsing — @@ -523,11 +534,12 @@ pub struct ReplacementSubDAG { impl ReplacementSubDAG { /// Whether this summary still needs accuracy/domain evidence before it can /// be treated as certified. A missing guarantee on any summary candidate - /// is unknown; exact `KeepPreAsap` carries an explicit exact guarantee. + /// (a sub-DAG whose root is an ASAP operator) is unknown; a kept + /// pre-ASAP sub-DAG carries an explicit exact guarantee. pub fn has_missing_accuracy_evidence(&self) -> bool { matches!( &self.replacement, - Replacement::Summary(node) if has_missing_accuracy_evidence(node) + Replacement::SubDAG(node) if !is_logical_rewrite(node) && has_missing_accuracy_evidence(node) ) } @@ -539,8 +551,12 @@ impl ReplacementSubDAG { Replacement::ExactComposition(composition) => { cost_model.value_operation_support_evidence(&composition.op, composition.placement) } - Replacement::Summary(node) => cost_model.summary_support_evidence(node), - Replacement::Rewrite(_) => Some(true), + // Any summary decision, including one rooted in a relational + // operator above its evaluations, asks the deployment for support. + Replacement::SubDAG(node) if !is_logical_rewrite(node) => { + cost_model.summary_support_evidence(node) + } + Replacement::SubDAG(_) => Some(true), } } } @@ -574,7 +590,7 @@ pub enum ReplacementProvenance { /// A finalized whole-query result over rows carrying the PromQL series /// identity, which the logical root does not expose (see /// [`ReplacementStrategy::propose_for_root`]). Default selection never - /// commits it, because its readout must be validated and priced by + /// commits it, because its evaluation must be validated and priced by /// deployment; otherwise it would silently replace the logical plan. RootPhysicalRealization, } @@ -615,7 +631,7 @@ pub struct Proposals { /// of this trait or any existing strategy required. /// /// `replacements` is only meaningful when `matches` would return `true` for -/// the same target; both [`SketchAlgorithmStrategy`] and [`SharedSubDAGStrategy`] +/// the same target; both [`ASAPStrategies`] and [`SharedSubDAGStrategy`] /// return an empty `Vec` rather than panicking when called on a target they /// don't match, so a caller that skips the `matches` check first still gets a /// safe (merely uninformative) answer instead of a crash. @@ -657,7 +673,7 @@ pub trait ReplacementStrategy { /// (for example, the PromQL series identity), so /// [`search_workload_with_targets`] asks only workload roots, once each. /// They decide what to compute, never placement. Default: none. - fn propose_for_root(&self, _root: &Rc, _target: &AccuracyTarget) -> Proposals { + fn propose_for_root(&self, _root: &Rc, _target: &AccuracyTarget) -> Proposals { Proposals::default() } } @@ -674,41 +690,41 @@ pub trait ReplacementStrategy { /// [`realizations_for_intent`] is where every valid realization gets /// enumerated, exhaustive and ranked (most-preferred first) — this crate has /// no separate function that computes just "the one" `Realization` -/// independently of that list. [`SketchAlgorithmStrategy`] is the sole +/// independently of that list. [`ASAPStrategies`] is the sole /// consumer: it wraps every entry of this list into its own bound -/// [`SummaryNode`] and returns all of them, ranked — a caller wanting a +/// [`OperatorNode`] and returns all of them, ranked — a caller wanting a /// single answer keeps the first one itself (see the module docs above). #[derive(Debug, Clone, PartialEq)] pub enum Realization { /// An exact **mergeable** accumulator (partial state ≡ the value /// itself: `Sum` / `Count` / `Min` / `Max` / `Rate` / `Increase`). The - /// built state *is* the answer already — no `SummaryEstimate` readout + /// built state *is* the answer already — no `SummaryEstimate` evaluation /// step. ExactAggregate { kind: ExactKind, params: ExactParams, }, /// An approximate sketch sized to the intent's [`AccuracyTarget`]. - /// Needs a `SummaryEstimate` readout to recover a value. Already + /// Needs a `SummaryEstimate` evaluation to recover a value. Already /// classified into its [`SketchKind`] category (`SketchKind::new` /// having been called) — construction always goes through that /// classifier, never this variant directly. Sketch(SketchKind), /// A sampling-based summary (a retained row subset). Needs a - /// `SummaryEstimate` readout. Not chosen by any core `AggIntent` + /// `SummaryEstimate` evaluation. Not chosen by any core `AggIntent` /// dispatch today — see the module docs. Sample { kind: SamplingKind, params: SamplingParams, }, - /// A wavelet-transform summary. Needs a `SummaryEstimate` readout. Not + /// A wavelet-transform summary. Needs a `SummaryEstimate` evaluation. Not /// chosen by any core `AggIntent` dispatch today — see the module docs. Wavelet { kind: WaveletKind, params: WaveletParams, }, /// A fitted statistical/parametric-model summary. Needs a - /// `SummaryEstimate` readout. Not chosen by any core `AggIntent` + /// `SummaryEstimate` evaluation. Not chosen by any core `AggIntent` /// dispatch today — see the module docs. StatModel { kind: StatModelKind, @@ -827,7 +843,7 @@ pub fn accuracy_target(intent: &AggIntent) -> Option<&AccuracyTarget> { /// (most-preferred first via `cost_model`) — the *only* place this crate /// decides what an `AggIntent` may become. Nothing in this crate computes /// "the one" `Realization` independently of this list: -/// [`SketchAlgorithmStrategy`] keeps every entry as a candidate, and a caller +/// [`ASAPStrategies`] keeps every entry as a candidate, and a caller /// that wants a single executable answer takes the head of *that* strategy's /// output itself. /// @@ -835,7 +851,7 @@ pub fn accuracy_target(intent: &AggIntent) -> Option<&AccuracyTarget> { /// explicit realization is a compile error, and the coverage-matrix test pins /// each variant's category. /// -/// `pub(crate)`: [`SketchAlgorithmStrategy::replacements`] is this module's +/// `pub(crate)`: [`ASAPStrategies::replacements`] is this module's /// own caller; `grouping::HydraGroupingStrategy` (issue #256) is the one /// caller outside it, needing the exact same already-ranked candidate list /// to find the `Realization::Sketch` matching the Hydra-eligible kind it @@ -1190,9 +1206,9 @@ pub fn posterior_aware_size_params( } } -// ── SketchAlgorithmStrategy ───────────────────────────────────────────────── +// ── ASAPStrategies ───────────────────────────────────────────────── -/// A single static instance so [`SketchAlgorithmStrategy::default_cost_model`] +/// A single static instance so [`ASAPStrategies::default_cost_model`] /// can hand out a `&'static dyn CostModel` without heap-allocating one — /// `DefaultCostModel` is a unit struct with no state, so one instance serves /// every caller. @@ -1227,14 +1243,17 @@ impl<'a> CandidatePlanningInputs<'a> { } } -/// Wraps [`realizations_for_intent`]'s exhaustive, ranked list directly: for -/// a bindable `Aggregate`, every valid candidate summary realization as its -/// own [`ReplacementSubDAG`]. +/// Proposes the supported ASAP realizations for a bindable aggregate, including +/// exact accumulators, approximate sketches, and supported maintained populations. +/// Each valid realization becomes its own [`ReplacementSubDAG`]. +/// +/// [`realizations_for_intent`] enumerates summary families; extension hooks can +/// supply additional supported families. This is not limited to sketch algorithms. /// /// Ranked (only to *order the enumeration*, never to drop a candidate) via a /// [`CostModel`] — [`DefaultCostModel`] unless constructed with -/// [`SketchAlgorithmStrategy::new`] — so a deployment-specific cost model's -/// other hooks (`size_params`, `realize_extension`, `readout_extension`) are +/// [`ASAPStrategies::new`] — so a deployment-specific cost model's +/// other hooks (`size_params`, `realize_extension`, `evaluation_extension`) are /// still consulted while binding each candidate. /// /// The one thing that *does* drop a candidate is accuracy legality (issue @@ -1245,11 +1264,11 @@ impl<'a> CandidatePlanningInputs<'a> { /// [`ReplacementStrategy::propose`] as a [`RejectedCandidate`]. See /// [`crate::accuracy`]'s module docs for the rules and the precedence /// between root and per-node targets. -pub struct SketchAlgorithmStrategy<'a> { +pub struct ASAPStrategies<'a> { planning_inputs: CandidatePlanningInputs<'a>, } -impl SketchAlgorithmStrategy<'static> { +impl ASAPStrategies<'static> { /// A strategy that ranks/binds via the built-in [`DefaultCostModel`] — /// what a deployment gets with no custom cost model plugged in. pub fn default_cost_model() -> Self { @@ -1259,7 +1278,7 @@ impl SketchAlgorithmStrategy<'static> { } } -impl<'a> SketchAlgorithmStrategy<'a> { +impl<'a> ASAPStrategies<'a> { /// A strategy that ranks/binds via `cost_model` instead of the built-in /// static preference order — the same customization point /// [`realizations_for_intent`] already offers. Accuracy legality stays @@ -1314,34 +1333,33 @@ impl<'a> SketchAlgorithmStrategy<'a> { /// treats a range of historical samples as the instant vector. pub fn current_series_topk_candidates( &self, - root: &Rc, + root: &Rc, accuracy: &AccuracyTarget, ) -> Proposals { - let QueryExpr::Limit { - n, + let Some(NonASAPOp::Limit { + n: Some(n), offset: 0, child, - } = root.as_ref() + .. + }) = root.non_asap() else { return Proposals::default(); }; - let QueryExpr::Sort { + let Some(NonASAPOp::Sort { keys, partition_by, child, - } = child.as_ref() + }) = child.non_asap() else { return Proposals::default(); }; let [key] = keys.as_slice() else { return Proposals::default(); }; - let QueryExpr::Column(value) = key.expr else { - return Proposals::default(); - }; - let Ok(schema) = child.output_schema() else { + let ScalarExpr::Column(value) = key.expr else { return Proposals::default(); }; + let schema = &child.schema; if key.ascending || key.nulls_first || partition_by.is_without() @@ -1354,20 +1372,102 @@ impl<'a> SketchAlgorithmStrategy<'a> { { return Proposals::default(); } - let ranked = Rc::new(QueryExpr::Aggregate { - reduction: Reduction::Reduce(partition_by.clone()), - measures: vec![AggIntent::TopK { - k: *n, - accuracy: accuracy.clone(), - }], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::clone(child), - }); + let Ok(ranked) = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { + reduction: Reduction::Reduce(partition_by.clone()), + measures: vec![AggIntent::TopK { + k: *n, + accuracy: accuracy.clone(), + }], + output_names: vec![], + filters: vec![], + having: None, + child: Rc::clone(child), + })) + else { + return Proposals::default(); + }; self.propose_with(&ranked, None, None) } + /// Fixed-window maintenance can finalize each series' counter state and + /// build a fresh heap or grouped Sum for that evaluation window. Deployment must provide + /// a complete, synchronized population and bind the matching window; this + /// candidate never incrementally adds one window's rates to another. + /// + pub fn fixed_window_rate_candidates(&self, root: &Rc) -> Proposals { + fn place(node: &Rc) -> Option> { + retime_rate_finalize(node, ExecutionTiming::IngestionTime, true) + } + // Legal only if the candidate stays executable with its states maintained. + let timed = |node: &Rc| { + asap_types::ir::timing::apply_materialization_timings( + node, + &asap_types::ir::timing::MaterializationAssignment::all_ingestion_time(), + &mut asap_types::ir::timing::TimingMemo::new(), + ) + .ok() + .and_then(|timed| asap_types::ir::export::compile_physical_asap_dag(&timed).ok()) + }; + let mut proposals = self.propose_with(root, None, None); + proposals.candidates.retain_mut(|candidate| { + let Replacement::SubDAG(node) = &candidate.replacement else { + return false; + }; + let Some(dag) = timed(node) else { + return false; + }; + if !dag.nodes.iter().any(|node| match &node.payload { + asap_types::ir::export::PhysicalASAPOperatorPayload::SummaryAgg { + family: FieldDataType::Sketch(kind, _), + .. + } => matches!( + kind.algorithm(), + SketchAlgorithm::CmsWithHeap | SketchAlgorithm::CountSketchWithHeap + ), + asap_types::ir::export::PhysicalASAPOperatorPayload::SummaryAgg { + family: FieldDataType::ExactAggregate(ExactKind::Sum, _), + .. + } => true, + _ => false, + }) { + return false; + } + let Some(placed) = place(node) else { + return false; + }; + if timed(&placed).is_none() { + return false; + } + let Ok(placed) = finalize_query_candidate(placed, root) else { + return false; + }; + candidate.replacement = Replacement::SubDAG(placed); + candidate + .rationale + .push_str("; fixed-window precompute over complete per-series counter states"); + true + }); + proposals + } + + /// Retain grouped Sum after a per-series Rate evaluation as a query-time + /// candidate alongside its complete-window maintenance placement. + /// + pub fn query_time_rate_aggregation_candidates(&self, root: &Rc) -> Proposals { + let mut proposals = self.fixed_window_rate_candidates(root); + proposals.candidates.retain_mut(|candidate| { + let Replacement::SubDAG(node) = &candidate.replacement else { return false }; + if !matches!(&node.operator, Operator::ASAP(ASAPOp::FinalizeExactAccumulator { child }) + if matches!(&child.operator, Operator::ASAP(ASAPOp::SummaryAgg { family: FieldDataType::ExactAggregate(ExactKind::Sum, _), .. }))) { return false; } + let Some(query_time) = retime_rate_finalize(node, ExecutionTiming::QueryTime, false) else { return false }; + candidate.replacement = Replacement::SubDAG(query_time); + candidate.rationale = "query-time grouped Sum over complete per-series Rate evaluations".into(); + true + }); + proposals + } + pub(crate) fn from_planning_inputs(planning_inputs: CandidatePlanningInputs<'a>) -> Self { Self { planning_inputs } } @@ -1380,20 +1480,21 @@ impl<'a> SketchAlgorithmStrategy<'a> { /// with the sibling that needs it. fn propose_with( &self, - root: &Rc, + root: &Rc, intent_override: Option<&AggIntent>, strictest_sibling: Option<&AccuracyTarget>, ) -> Proposals { let mut proposals = Proposals::default(); - // A selected logical rewrite otherwise remains KeepPreAsap during DAG - // assembly. Also expose its concrete summary realization for selection. + // A selected logical rewrite otherwise stays a kept pre-ASAP sub-DAG + // during DAG assembly. Also expose its concrete summary realization + // for selection. if intent_override.is_none() { if let Some(rewritten) = crate::rewrite::composed_aggregate_rewrite(root) { if let Ok(node) = realize_child_with(&rewritten, self.planning_inputs, None) { - if !matches!(node.expr, SummaryExpr::KeepPreAsap(_)) { + if node.contains_asap() { proposals.candidates.push(ReplacementSubDAG { - replacement: Replacement::Summary(node), - strategy: "SketchAlgorithmStrategy", + replacement: Replacement::SubDAG(node), + strategy: "ASAPStrategies", provenance: ReplacementProvenance::SummaryRealization, rationale: "realize a schema-preserving composition of temporal and grouped accumulators".into(), }); @@ -1403,8 +1504,8 @@ impl<'a> SketchAlgorithmStrategy<'a> { } if let Ok(Some(node)) = exact_topk_over_temporal_values(root, self.planning_inputs) { proposals.candidates.push(ReplacementSubDAG { - replacement: Replacement::Summary(node), - strategy: "SketchAlgorithmStrategy", + replacement: Replacement::SubDAG(node), + strategy: "ASAPStrategies", provenance: ReplacementProvenance::SummaryRealization, rationale: "select exact Top-K from independently maintained temporal values" .into(), @@ -1413,8 +1514,8 @@ impl<'a> SketchAlgorithmStrategy<'a> { if intent_override.is_none() { if let Ok(Some(node)) = realize_temporal_average(root, self.planning_inputs, None) { proposals.candidates.push(ReplacementSubDAG { - replacement: Replacement::Summary(node), - strategy: "SketchAlgorithmStrategy", + replacement: Replacement::SubDAG(node), + strategy: "ASAPStrategies", provenance: ReplacementProvenance::SummaryRealization, rationale: "read temporal average from sum/count only within the finite arithmetic domain; otherwise execute the original average".into(), }); @@ -1428,8 +1529,8 @@ impl<'a> SketchAlgorithmStrategy<'a> { "preserve exact PromQL arithmetic over independently realized summary operands" }; proposals.candidates.push(ReplacementSubDAG { - replacement: Replacement::Summary(node), - strategy: "SketchAlgorithmStrategy", + replacement: Replacement::SubDAG(node), + strategy: "ASAPStrategies", provenance: ReplacementProvenance::SummaryRealization, rationale: rationale.into(), }); @@ -1516,17 +1617,17 @@ impl<'a> SketchAlgorithmStrategy<'a> { let Some(child) = aggregate_child(root) else { continue; }; - let QueryExpr::Aggregate { reduction, .. } = root.as_ref() else { + let Some(NonASAPOp::Aggregate { reduction, .. }) = root.non_asap() else { continue; }; let Ok(input) = realize_physical_summary_input(intent, &family, reduction, child) else { continue; }; - let readout_query = readout(intent, &input.input, planning_inputs.cost); + let evaluation_query = evaluation(intent, &input.input, planning_inputs.cost); let Some(local) = planning_inputs .accuracy - .local_guarantee(&family, &readout_query) + .local_guarantee(&family, &evaluation_query) else { continue; }; @@ -1537,7 +1638,7 @@ impl<'a> SketchAlgorithmStrategy<'a> { let allocations = planning_inputs.allocator.allocations(target, &shape); if allocations.is_empty() { proposals.rejected.push(RejectedCandidate { - strategy: "SketchAlgorithmStrategy", + strategy: "ASAPStrategies", description: rationale.clone(), error: AccuracyError::NoLegalAllocation { target: target.clone(), @@ -1591,10 +1692,10 @@ impl<'a> SketchAlgorithmStrategy<'a> { } if proposals.candidates.is_empty() { if let Some(error) = &proposals.domain_error { - if let Ok(node) = keep_pre_asap(root) { + if let Ok(node) = retain_exact(root) { proposals.candidates.push(ReplacementSubDAG { - strategy: "SketchAlgorithmStrategy", - replacement: Replacement::Summary(node), + strategy: "ASAPStrategies", + replacement: Replacement::SubDAG(node), provenance: ReplacementProvenance::SummaryRealization, rationale: format!( "{} stays pre-ASAP because summary construction crosses an illegal \ @@ -1613,16 +1714,16 @@ impl Proposals { /// File one construction attempt: a legal node becomes a candidate, an /// [`RealizationError::Accuracy`] becomes a [`RejectedCandidate`], and a /// schema-derivation failure is skipped exactly as it always was. - fn record(&mut self, rationale: String, built: Result, RealizationError>) { + fn record(&mut self, rationale: String, built: Result, RealizationError>) { match built { Ok(node) => self.candidates.push(ReplacementSubDAG { - strategy: "SketchAlgorithmStrategy", - replacement: Replacement::Summary(node), + strategy: "ASAPStrategies", + replacement: Replacement::SubDAG(node), provenance: ReplacementProvenance::SummaryRealization, rationale, }), Err(RealizationError::Accuracy(error)) => self.rejected.push(RejectedCandidate { - strategy: "SketchAlgorithmStrategy", + strategy: "ASAPStrategies", description: rationale, error, }), @@ -1639,14 +1740,14 @@ impl Proposals { } /// The `child` of a [`bindable_intent`]-shaped `Aggregate`. -fn aggregate_child(node: &QueryExpr) -> Option<&Rc> { - match node { - QueryExpr::Aggregate { child, .. } => Some(child), +fn aggregate_child(node: &OperatorNode) -> Option<&Rc> { + match node.non_asap() { + Some(NonASAPOp::Aggregate { child, .. }) => Some(child), _ => None, } } -impl ReplacementStrategy for SketchAlgorithmStrategy<'_> { +impl ReplacementStrategy for ASAPStrategies<'_> { fn matches(&self, target: &TargetSubDAG<'_>) -> bool { bindable_intent(target.root).is_some() || is_supported_exact_binary(target.root) } @@ -1664,25 +1765,25 @@ impl ReplacementStrategy for SketchAlgorithmStrategy<'_> { /// the logical root does not expose, so each is a finalized query result /// for the identity-carrying root. Placement variants (for example, /// fixed-window or query-time Rate aggregation) are not listed here: the - /// lifecycle assigns timing and the physical compiler reads it. - fn propose_for_root(&self, root: &Rc, target: &AccuracyTarget) -> Proposals { - let Ok(typed) = asap_types::pre_asap::schema::with_promql_series_identity(root) else { + /// materialization assigns timing and the physical compiler reads it. + fn propose_for_root(&self, root: &Rc, target: &AccuracyTarget) -> Proposals { + let Ok(typed) = asap_types::ir::schema_support::with_promql_series_identity(root) else { return Proposals::default(); }; - let typed = Rc::new(typed); + let mut proposals = self.current_series_topk_candidates(&typed, target); for mut candidate in std::mem::take(&mut proposals.candidates) { - let Replacement::Summary(node) = candidate.replacement else { + let Replacement::SubDAG(node) = candidate.replacement else { continue; }; let Ok(node) = finalize_query_candidate(node, &typed) else { continue; }; let duplicate = proposals.candidates.iter().any(|existing| { - matches!(&existing.replacement, Replacement::Summary(other) if *other == node) + matches!(&existing.replacement, Replacement::SubDAG(other) if *other == node) }); if !duplicate { - candidate.replacement = Replacement::Summary(node); + candidate.replacement = Replacement::SubDAG(node); candidate.provenance = ReplacementProvenance::RootPhysicalRealization; proposals.candidates.push(candidate); } @@ -1755,11 +1856,11 @@ pub(crate) fn describe_intent(intent: &AggIntent) -> String { } } -// ── realize_child / keep_pre_asap: rank-and-take-first, and its fallback ── +// ── realize_child / retain_exact: rank-and-take-first, and its fallback ── -/// Rank-and-take-first selector for a single [`QueryExpr`] node: enumerate -/// every candidate via [`SketchAlgorithmStrategy::replacements`], keep the -/// `cost_model`-preferred (first) one, and fall back to [`keep_pre_asap`] +/// Rank-and-take-first selector for a single [`OperatorNode`]: enumerate +/// every candidate via [`ASAPStrategies::replacements`], keep the +/// `cost_model`-preferred (first) one, and fall back to [`retain_exact`] /// when there's no candidate at all — **not** a general single-answer API /// for a whole workload. Use [`CandidateLogicalASAPDAGs::global_selection`] and DAG assembly /// for coordinated logical selection; physical deployment remains downstream. @@ -1771,16 +1872,16 @@ pub(crate) fn describe_intent(intent: &AggIntent) -> String { /// ([`construct_summary_agg`], so a nested aggregate gets its own /// independent enumeration instead of inheriting the parent's forced /// candidate), from this module's own [`realize_one`] (the representative -/// bound `SummaryNode` [`cse_preference`] needs for a +/// bound `OperatorNode` [`cse_preference`] needs for a /// [`CostModel::cse_share_decision`] comparison), and from /// [`crate::cost_model::DefaultCostModel::estimate_cost`] (the same /// representative-node need, for a [`Replacement::Rewrite`] candidate's own /// cost estimate). Every other caller goes through -/// [`SketchAlgorithmStrategy::replacements`] directly and decides for itself. +/// [`ASAPStrategies::replacements`] directly and decides for itself. pub(crate) fn realize_child( - root: &Rc, + root: &Rc, cost_model: &dyn CostModel, -) -> Result, RealizationError> { +) -> Result, RealizationError> { realize_child_with( root, CandidatePlanningInputs::with_default_accuracy(cost_model), @@ -1797,17 +1898,17 @@ pub(crate) fn realize_child( /// budget. A child whose declared target is `Exact` keeps it: an allocation /// never approximates something the caller declared exact. fn exact_topk_over_temporal_values( - root: &Rc, + root: &Rc, planning_inputs: CandidatePlanningInputs<'_>, -) -> Result>, RealizationError> { - let QueryExpr::Aggregate { +) -> Result>, RealizationError> { + let Some(NonASAPOp::Aggregate { reduction, measures, output_names: _, filters, having: None, child, - } = root.as_ref() + }) = root.non_asap() else { return Ok(None); }; @@ -1817,19 +1918,19 @@ fn exact_topk_over_temporal_values( let [AggIntent::TopK { k, .. }] = measures.as_slice() else { return Ok(None); }; - let QueryExpr::Aggregate { + let Some(NonASAPOp::Aggregate { reduction: Reduction::PerEntity, child: input, .. - } = child.as_ref() + }) = child.non_asap() else { return Ok(None); }; - if !matches!(input.as_ref(), QueryExpr::TimeRange { .. }) { + if !matches!(input.non_asap(), Some(NonASAPOp::TimeRange { .. })) { return Ok(None); } let values = realize_child_with(child, planning_inputs, Some(&AccuracyTarget::Exact))?; - if matches!(values.expr, SummaryExpr::KeepPreAsap(_)) + if !values.contains_asap() || !values .guarantee .as_ref() @@ -1845,61 +1946,63 @@ fn exact_topk_over_temporal_values( ))? .clone(); let score = ranking_score_index(child, &values.schema)?; - let sorted = Rc::new(SummaryNode { - guarantee: values.guarantee.clone(), - schema: values.schema.clone(), - expr: SummaryExpr::ValueOperation { - child: values, - operation: ValueOperation::Sort { - keys: vec![asap_types::pre_asap::SortKey { - expr: QueryExpr::Column(score), + let guarantee = values.guarantee.clone(); + let schema = values.schema.clone(); + let sorted = Rc::new( + OperatorNode::with_schema( + Operator::NonASAP(NonASAPOp::Sort { + keys: vec![SortKey { + expr: ScalarExpr::Column(score), ascending: false, nulls_first: false, }], partition_by: partition_by.clone(), - }, - timing: ExecutionTiming::QueryTime, - }, - }); - let node = Rc::new(SummaryNode { - guarantee: sorted.guarantee.clone(), - schema: sorted.schema.clone(), - expr: SummaryExpr::ValueOperation { - child: sorted, - operation: ValueOperation::Limit { - n: *k, + child: values, + }), + schema.clone(), + ) + .with_guarantee(guarantee.clone()), + ); + let node = Rc::new( + OperatorNode::with_schema( + Operator::NonASAP(NonASAPOp::Limit { + n: Some(*k), offset: 0, partition_by, - }, - timing: ExecutionTiming::QueryTime, - }, - }); - validate_execution_data_states_at(&node, ExecutionDataState::QUERY_ROWS)?; + child: sorted, + }), + schema, + ) + .with_guarantee(guarantee), + ); + validate_maintained(&node, ExecutionTiming::QueryTime)?; Ok(Some(node)) } fn realize_temporal_average( - root: &Rc, + root: &Rc, planning_inputs: CandidatePlanningInputs<'_>, target: Option<&AccuracyTarget>, -) -> Result>, RealizationError> { +) -> Result>, RealizationError> { let Some(components) = crate::rewrite::temporal_average_components(root) else { return Ok(None); }; let mut node = realize_child_with(&components, planning_inputs, target)?; - let SummaryExpr::BinaryOp { operator, .. } = &mut Rc::make_mut(&mut node).expr else { + let Operator::NonASAP(NonASAPOp::BinaryOp { operator, .. }) = + &mut Rc::make_mut(&mut node).operator + else { return Ok(None); }; operator.checked_finite_division = true; - validate_execution_data_states_at(&node, ExecutionDataState::QUERY_ROWS)?; + validate_maintained(&node, ExecutionTiming::QueryTime)?; Ok(Some(node)) } pub(crate) fn realize_child_with( - root: &Rc, + root: &Rc, planning_inputs: CandidatePlanningInputs<'_>, end_to_end_target: Option<&AccuracyTarget>, -) -> Result, RealizationError> { +) -> Result, RealizationError> { if let Some(node) = realize_temporal_average(root, planning_inputs, end_to_end_target)? { return Ok(node); } @@ -1913,29 +2016,29 @@ pub(crate) fn realize_child_with( Some(_) => Some(override_accuracy(declared, target)), } }); - match SketchAlgorithmStrategy::from_planning_inputs(planning_inputs) + match ASAPStrategies::from_planning_inputs(planning_inputs) .propose_with(root, overridden.as_ref(), None) .candidates .into_iter() .next() { Some(ReplacementSubDAG { - replacement: Replacement::Summary(node), + replacement: Replacement::SubDAG(node), .. }) => Ok(node), Some(ReplacementSubDAG { - replacement: Replacement::Rewrite(_) | Replacement::ExactComposition(_), + replacement: Replacement::ExactComposition(_), .. }) => { - unreachable!("SketchAlgorithmStrategy never returns a Rewrite/composition candidate") + unreachable!("ASAPStrategies never returns a composition candidate") } // No candidate at all: `root` isn't `bindable_intent` shape (or its // intent has no realization `realizations_for_intent` can't // produce — never happens, that match is exhaustive), or every // candidate was accuracy-illegal — either way the same conservative - // fallback `SketchAlgorithmStrategy::matches` uses: keep the + // fallback `ASAPStrategies::matches` uses: keep the // pre-ASAP sub-DAG, executed exactly. - None => keep_pre_asap(root), + None => retain_exact(root), } } @@ -1944,29 +2047,24 @@ pub(crate) fn realize_child_with( /// accelerated, return `None` so the caller keeps the whole query exact; /// mixed raw/summary snapshots are never constructed. fn realize_binary( - root: &Rc, + root: &Rc, planning_inputs: CandidatePlanningInputs<'_>, end_to_end_target: Option<&AccuracyTarget>, -) -> Result>, RealizationError> { - let QueryExpr::BinaryOp { - op, +) -> Result>, RealizationError> { + let Some(NonASAPOp::BinaryOp { + operator, + return_bool, lhs, rhs, - vector_match, - } = root.as_ref() + }) = root.non_asap() else { return Ok(None); }; + let (op, vector_match) = (&operator.kind, &operator.vector_match); if !matches!(op, BinaryOpKind::Arithmetic(_)) || vector_match.is_some() { return Ok(None); } - let lhs_scalar = is_promql_scalar(lhs); - let rhs_scalar = is_promql_scalar(rhs); - if lhs_scalar && rhs_scalar { - return Ok(None); - } - let mut lhs_node = realize_binary_operand(lhs, planning_inputs, None)?; let mut rhs_node = realize_binary_operand(rhs, planning_inputs, None)?; @@ -2085,8 +2183,8 @@ fn realize_binary( return Ok(None); } - let lhs_accelerated = lhs_scalar || !matches!(lhs_node.expr, SummaryExpr::KeepPreAsap(_)); - let rhs_accelerated = rhs_scalar || !matches!(rhs_node.expr, SummaryExpr::KeepPreAsap(_)); + let lhs_accelerated = lhs_node.contains_asap(); + let rhs_accelerated = rhs_node.contains_asap(); if !lhs_accelerated || !rhs_accelerated { return Ok(None); } @@ -2133,47 +2231,130 @@ fn realize_binary( return Ok(None); } - Ok(Some(Rc::new(SummaryNode { - expr: SummaryExpr::BinaryOp { - timing: ExecutionTiming::QueryTime, - lhs: lhs_node, - rhs: rhs_node, - operator: asap_types::post_asap::BinaryOperator { - checked_relative_division: false, - checked_finite_division: false, - kind: op.clone(), - vector_match: vector_match.clone(), - }, - }, - schema: lift(&root.output_schema()?), + Ok(Some(Rc::new( + OperatorNode::with_schema( + Operator::NonASAP(NonASAPOp::BinaryOp { + operator: BinaryOperator { + checked_relative_division: false, + checked_finite_division: false, + kind: op.clone(), + vector_match: vector_match.clone(), + }, + return_bool: *return_bool, + lhs: lhs_node, + rhs: rhs_node, + }), + root.schema.clone(), + ) // Exact arithmetic does not erase approximation error. Until the // accuracy algebra has an operator-specific rule (and any value-range // evidence needed by multiplication/division), unknown stays unknown. - guarantee, - }))) + .with_guarantee(guarantee), + ))) +} + +/// Coverage of a summary built over `child`: every observation of the one +/// source scanned beneath it. Today's planner proves no time or population +/// restriction, so this whole-source declaration is trusted, not derived from +/// the scan (#570). `None` when `child` does not read exactly one source. +pub(crate) fn whole_source_coverage(child: &Rc) -> Option { + let mut sources = OperatorNode::reachable(child) + .into_iter() + .filter_map(|node| match node.non_asap() { + Some(NonASAPOp::Scan { source, .. }) => Some(source.clone()), + _ => None, + }); + let source = sources.next()?; + sources + .all(|other| other == source) + .then(|| SummaryCoverage { + source, + regions: vec![CoverageRegion { + time_ms: None, + population: Default::default(), + }], + }) +} + +/// Rebuild the summary chain above a per-series `Rate` accumulator with its +/// `FinalizeExactAccumulator` placed at `timing`. `strict` additionally +/// requires the fixed-window shape (a `PerEntity` Rate over a `TimeRange`); +/// `None` when no such boundary exists (strict only). +fn retime_rate_finalize( + node: &Rc, + timing: ExecutionTiming, + strict: bool, +) -> Option> { + let is_rate_boundary = |child: &OperatorNode| match &child.operator { + Operator::ASAP(ASAPOp::SummaryAgg { + family: FieldDataType::ExactAggregate(ExactKind::Rate, _), + reduction, + child: source, + .. + }) => { + !strict + || (matches!(reduction, Reduction::PerEntity) + && matches!(source.non_asap(), Some(NonASAPOp::TimeRange { .. }))) + } + _ => false, + }; + let rebuilt = |operator: Operator, timing: Option| { + Rc::new(OperatorNode { + operator, + timing, + ..node.as_ref().clone() + }) + }; + match &node.operator { + Operator::ASAP(ASAPOp::FinalizeExactAccumulator { child }) if is_rate_boundary(child) => { + Some(rebuilt(node.operator.clone(), Some(timing))) + } + Operator::ASAP( + ASAPOp::FinalizeExactAccumulator { child } + | ASAPOp::SummaryAgg { child, .. } + | ASAPOp::SummaryEstimate { + summary_input: child, + .. + }, + ) => { + let placed = match retime_rate_finalize(child, timing, strict) { + Some(placed) => placed, + None if strict => return None, + None => return Some(Rc::clone(node)), + }; + let operator = node.operator.map_children(|_| Rc::clone(&placed)); + Some(rebuilt(operator, node.timing)) + } + _ if strict => None, + _ => Some(Rc::clone(node)), + } } /// Put an explicit read boundary between maintained exact state and a /// query-time value consumer. Approximate summaries must already carry a /// `SummaryEstimate`, so they deliberately do not pass this predicate. pub fn finalize_query_candidate( - node: Rc, - logical_output: &QueryExpr, -) -> Result, RealizationError> { - finalize_exact_accumulator_at(node, logical_output, ExecutionTiming::QueryTime) -} - -fn finalize_exact_accumulator_at( - node: Rc, - logical_output: &QueryExpr, - timing: ExecutionTiming, -) -> Result, RealizationError> { + node: Rc, + logical_output: &OperatorNode, +) -> Result, RealizationError> { + finalize_exact_accumulator(node, logical_output, ExecutionTiming::QueryTime) +} + +/// The read boundary's placement is fixed here, where the candidate's +/// semantics decide it (a fresh query-time summary over this evaluation's +/// finalized values vs. finalized values feeding maintenance); the materialization +/// timing pass honors it. +fn finalize_exact_accumulator( + node: Rc, + logical_output: &OperatorNode, + placement: ExecutionTiming, +) -> Result, RealizationError> { let is_exact_state = matches!( - node.expr, - SummaryExpr::SummaryAgg { + node.operator, + Operator::ASAP(ASAPOp::SummaryAgg { family: FieldDataType::ExactAggregate(..), .. - } + }) ); if !is_exact_state { return Ok(node); @@ -2182,41 +2363,36 @@ fn finalize_exact_accumulator_at( // boundary produces the logical operator's ordinary values. Preserve the // canonical pre-ASAP output types instead of leaking ExactAggregate into // query-time operators that follow this node. - let schema = lift(&logical_output.output_schema()?); + let schema = logical_output.schema.clone(); let guarantee = node.guarantee.clone(); - Ok(Rc::new(SummaryNode { - expr: SummaryExpr::ValueOperation { - child: node, - operation: ValueOperation::FinalizeExactAccumulator, - timing, - }, - schema, - guarantee, - })) + Ok(Rc::new( + OperatorNode::with_schema( + Operator::ASAP(ASAPOp::FinalizeExactAccumulator { child: node }), + schema, + ) + .with_guarantee(guarantee) + .with_timing(Some(placement)), + )) } -fn is_supported_exact_binary(root: &QueryExpr) -> bool { +fn is_supported_exact_binary(root: &OperatorNode) -> bool { matches!( - root, - QueryExpr::BinaryOp { - op: BinaryOpKind::Arithmetic(_), - vector_match: None, + root.non_asap(), + Some(NonASAPOp::BinaryOp { + operator: BinaryOperator { + kind: BinaryOpKind::Arithmetic(_), + vector_match: None, + .. + }, .. - } - ) -} - -fn is_promql_scalar(expr: &QueryExpr) -> bool { - matches!( - expr, - QueryExpr::PromqlScalarBridge(_) | QueryExpr::Literal(_) + }) ) } /// Quantile operands inherit one workload target. A temporal mean is exact /// on its checked finite domain and needs no approximation budget. -fn shared_quantile_target(lhs: &QueryExpr, rhs: &QueryExpr) -> Option { - let quantile_target = |expr: &QueryExpr| match bindable_intent(expr) { +fn shared_quantile_target(lhs: &OperatorNode, rhs: &OperatorNode) -> Option { + let quantile_target = |expr: &OperatorNode| match bindable_intent(expr) { Some(AggIntent::Quantile { accuracy, q, .. }) if q.is_finite() && (0.0..=1.0).contains(q) => { @@ -2254,18 +2430,18 @@ fn ddsketch_ratio_operand_target(target: &AccuracyTarget) -> Option Option { - let SummaryExpr::SummaryEstimate { +fn ddsketch_quantile_alpha(node: &OperatorNode) -> Option { + let Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, query: PostAsapSketchStatistic::Quantile { .. }, - } = &node.expr + }) = &node.operator else { return None; }; - let SummaryExpr::SummaryAgg { + let Operator::ASAP(ASAPOp::SummaryAgg { family: FieldDataType::Sketch(kind, _), .. - } = &summary_input.expr + }) = &summary_input.operator else { return None; }; @@ -2275,7 +2451,7 @@ fn ddsketch_quantile_alpha(node: &SummaryNode) -> Option { } } -fn has_missing_accuracy_evidence(node: &SummaryNode) -> bool { +fn has_missing_accuracy_evidence(node: &OperatorNode) -> bool { node.guarantee .as_ref() .is_none_or(ResultGuarantee::has_unknown) @@ -2284,10 +2460,10 @@ fn has_missing_accuracy_evidence(node: &SummaryNode) -> bool { /// A direct ratio has an operator-specific DDSketch proof, so it must select /// DDSketch rather than the cost model's generally preferred KLL candidate. fn realize_ddsketch_quantile_operand( - operand: &Rc, + operand: &Rc, planning_inputs: CandidatePlanningInputs<'_>, target: &AccuracyTarget, -) -> Result, RealizationError> { +) -> Result, RealizationError> { let intent = bindable_intent(operand).and_then(|intent| match intent { AggIntent::Quantile { .. } => Some(override_accuracy(intent, target)), _ => None, @@ -2306,17 +2482,10 @@ fn realize_ddsketch_quantile_operand( } fn realize_binary_operand( - operand: &Rc, + operand: &Rc, planning_inputs: CandidatePlanningInputs<'_>, end_to_end_target: Option<&AccuracyTarget>, -) -> Result, RealizationError> { - if is_promql_scalar(operand) { - return Ok(Rc::new(SummaryNode { - expr: SummaryExpr::KeepPreAsap(Rc::clone(operand)), - schema: Schema::lifted(Vec::new(), None), - guarantee: Some(ResultGuarantee::exact("PromQL scalar")), - })); - } +) -> Result, RealizationError> { realize_child_with(operand, planning_inputs, end_to_end_target) } @@ -2334,43 +2503,77 @@ fn override_accuracy(intent: &AggIntent, target: &AccuracyTarget) -> AggIntent { out } -/// Wrap an unrewritten pre-ASAP sub-DAG, lifting its schema with every column -/// `FieldDataType::Plain`. `pub` so a caller can fall back to this -/// explicitly — e.g. when `SketchAlgorithmStrategy::replacements()` returns no -/// candidate for a target, or a deployment wants to force a node its own -/// runtime can't actually implement — through the same fallback this -/// crate's own dispatch uses, without duplicating the schema-lift logic. -pub fn keep_pre_asap(expr: &Rc) -> Result, RealizationError> { - keep_pre_asap_rc(Rc::clone(expr)) -} - -fn keep_pre_asap_rc(expr: Rc) -> Result, RealizationError> { - let schema = expr.output_schema()?; - Ok(Rc::new(SummaryNode { - expr: SummaryExpr::KeepPreAsap(expr), - schema: lift(&schema), - // A kept pre-ASAP sub-DAG is executed exactly by the runtime - // (`Realization::PassThrough`'s contract) — zero error. - guarantee: Some(ResultGuarantee::exact("KeepPreAsap")), - })) +/// Keep an unrewritten pre-ASAP sub-DAG as it is. There is no wrapper node: +/// the sub-DAG itself is the plan, carrying an exact guarantee. The same +/// `Rc` is returned when the node already has a guarantee; otherwise a copy +/// with `guarantee = exact("RetainedExact")` — only for a sub-DAG with no +/// ASAP operator (a sub-DAG containing one keeps whatever its construction +/// established). `pub` so a caller can fall back to this explicitly — e.g. +/// when `ASAPStrategies::replacements()` returns no candidate for a +/// target, or a deployment wants to force a node its own runtime can't +/// actually implement — through the same fallback this crate's own dispatch +/// uses. +pub fn retain_exact(expr: &Rc) -> Result, RealizationError> { + retain_exact_rc(Rc::clone(expr)) +} + +fn retain_exact_rc(expr: Rc) -> Result, RealizationError> { + if expr.guarantee.is_some() || expr.contains_asap() { + return Ok(expr); + } + // Keeping the same sub-DAG twice (e.g. one `Scan` read by an exact + // aggregate and by a sketch, or by two candidates) must yield one node: + // sharing is pointer identity. Memoize the kept copy per input node while + // both are alive; weak references keep the memo from extending lifetimes + // or matching a reused address. + type KeptMemo = HashMap<*const OperatorNode, (Weak, Weak)>; + thread_local! { + static KEPT: RefCell = RefCell::new(HashMap::new()); + } + let key = Rc::as_ptr(&expr); + if let Some(kept) = KEPT.with(|memo| { + memo.borrow().get(&key).and_then(|(input, kept)| { + input + .upgrade() + .filter(|input| Rc::ptr_eq(input, &expr)) + .and_then(|_| kept.upgrade()) + }) + }) { + return Ok(kept); + } + let kept = Rc::new( + expr.as_ref() + .clone() + // A kept pre-ASAP sub-DAG is executed exactly by the runtime + // (`Realization::PassThrough`'s contract) — zero error. + .with_guarantee(Some(ResultGuarantee::exact("RetainedExact"))), + ); + KEPT.with(|memo| { + let mut memo = memo.borrow_mut(); + if memo.len() > 4096 { + memo.retain(|_, (input, kept)| input.strong_count() > 0 && kept.strong_count() > 0); + } + memo.insert(key, (Rc::downgrade(&expr), Rc::downgrade(&kept))); + }); + Ok(kept) } -// ── Construction: turn one already-decided Realization into a SummaryNode ─ +// ── Construction: turn one already-decided Realization into an OperatorNode ─ -/// The bindable shape [`SketchAlgorithmStrategy`] targets: a single intent, no +/// The bindable shape [`ASAPStrategies`] targets: a single intent, no /// `HAVING`. A multi-intent node (SQL `SELECT SUM(a), AVG(b)`), or one with a /// `HAVING` predicate (the filter would need the estimate first), stays -/// logical. Unsupported logical parents still conservatively become one -/// [`SummaryExpr::KeepPreAsap`] sub-DAG. Composable query-time value -/// operators (`Project`, `Filter`, `Sort`, and `Limit`) are retained during final -/// DAG assembly so their independently planned children remain visible. -pub fn bindable_intent(node: &QueryExpr) -> Option<&AggIntent> { - if let QueryExpr::Aggregate { +/// logical. Unsupported logical parents are conservatively kept as pre-ASAP +/// sub-DAGs ([`retain_exact`]). Relational operators are retained during +/// final DAG assembly so their independently planned children remain +/// visible. +pub fn bindable_intent(node: &OperatorNode) -> Option<&AggIntent> { + if let Some(NonASAPOp::Aggregate { measures, filters, having, .. - } = node + }) = node.non_asap() { if let ([intent], None) = (measures.as_slice(), having) { if !any_measure_filtered(filters) { @@ -2382,7 +2585,7 @@ pub fn bindable_intent(node: &QueryExpr) -> Option<&AggIntent> { } /// `expr` must still be the [`bindable_intent`] shape for `realization` to -/// have any effect; anything else falls back to [`keep_pre_asap`]. +/// have any effect; anything else falls back to [`retain_exact`]. /// Only `expr`'s own top-level decision is forced — recursion into `expr`'s /// child goes back through [`realize_child`] (fresh candidate /// enumeration, not a forced pick), so choosing one candidate for a target @@ -2390,10 +2593,10 @@ pub fn bindable_intent(node: &QueryExpr) -> Option<&AggIntent> { /// /// `pub(crate)`: `grouping::HydraGroupingStrategy` (issue #256) is the one /// caller outside this module — the same first-class, -/// one-candidate-at-a-time primitive [`SketchAlgorithmStrategy`] itself +/// one-candidate-at-a-time primitive [`ASAPStrategies`] itself /// calls once per candidate, reused rather than duplicated so a Hydra /// candidate gets exactly the same schema derivation/column -/// resolution/readout construction as every other candidate, patching only +/// resolution/evaluation construction as every other candidate, patching only /// the `grouping` field this axis owns. /// Construct a summary with every model explicit (issue #172). `intent` /// is `expr`'s own [`bindable_intent`], or a copy of it with an allocated @@ -2404,13 +2607,13 @@ pub fn bindable_intent(node: &QueryExpr) -> Option<&AggIntent> { /// fail-closed answer for a composition with no sound rule or one that /// misses `intent`'s target. pub(crate) fn construct_summary_with( - expr: &QueryExpr, + expr: &OperatorNode, intent: &AggIntent, realization: Realization, planning_inputs: CandidatePlanningInputs<'_>, child_target: Option<&AccuracyTarget>, allocation: Option, -) -> Result, RealizationError> { +) -> Result, RealizationError> { let local_target = match allocation.as_ref() { Some(GuaranteeSource::BudgetAllocation { local_target, .. }) => Some(local_target), _ => accuracy_target(intent), @@ -2427,9 +2630,9 @@ pub(crate) fn construct_summary_with( }, other => other, }; - if let QueryExpr::Aggregate { + if let Some(NonASAPOp::Aggregate { reduction, child, .. - } = expr + }) = expr.non_asap() { // `bindable_intent` already established the shape: exactly one // intent, no HAVING. (Multi-intent nodes and HAVING stay logical.) @@ -2454,28 +2657,28 @@ pub(crate) fn construct_summary_with( } } } - keep_pre_asap_rc(Rc::new(expr.clone())) + retain_exact_rc(Rc::new(expr.clone())) } fn finish_weighted_topk( - candidate: Rc, - logical: &QueryExpr, + candidate: Rc, + logical: &OperatorNode, intent: &AggIntent, -) -> Result, RealizationError> { +) -> Result, RealizationError> { let AggIntent::TopK { k, .. } = intent else { unreachable!() }; - let QueryExpr::Aggregate { + let Some(NonASAPOp::Aggregate { reduction: Reduction::Reduce(groups), child, .. - } = logical + }) = logical.non_asap() else { return Err(RealizationError::PhysicalRealization( "TopK requires explicit grouping", )); }; - let schema = lift(&child.output_schema()?); + let schema = child.schema.clone(); let score = ranking_score_index(child, &schema)?; let cols = schema .fields @@ -2502,84 +2705,81 @@ fn finish_weighted_topk( } } }; - Ok(asap_types::pre_asap::query_expr::ProjectItem { + Ok(ProjectItem { alias: Some(field.name.clone()), - expr: QueryExpr::Column(source), + expr: ScalarExpr::Column(source), }) }) .collect::, _>>()?; let guarantee = candidate.guarantee.clone(); - let projected = Rc::new(SummaryNode { - expr: SummaryExpr::ValueOperation { - child: candidate, - operation: ValueOperation::Project { + let projected = Rc::new( + OperatorNode::with_schema( + Operator::NonASAP(NonASAPOp::Project { cols, qualifier: None, - }, - timing: ExecutionTiming::QueryTime, - }, - schema: schema.clone(), - guarantee: guarantee.clone(), - }); - let sorted = Rc::new(SummaryNode { - expr: SummaryExpr::ValueOperation { - child: projected, - operation: ValueOperation::Sort { - keys: vec![asap_types::pre_asap::SortKey { - expr: QueryExpr::Column(score), + child: candidate, + }), + schema.clone(), + ) + .with_guarantee(guarantee.clone()), + ); + let sorted = Rc::new( + OperatorNode::with_schema( + Operator::NonASAP(NonASAPOp::Sort { + keys: vec![SortKey { + expr: ScalarExpr::Column(score), ascending: false, nulls_first: false, }], partition_by: groups.clone(), - }, - timing: ExecutionTiming::QueryTime, - }, - schema: schema.clone(), - guarantee: guarantee.clone(), - }); - let result = Rc::new(SummaryNode { - expr: SummaryExpr::ValueOperation { - child: sorted, - operation: ValueOperation::Limit { - n: *k, + child: projected, + }), + schema.clone(), + ) + .with_guarantee(guarantee.clone()), + ); + let result = Rc::new( + OperatorNode::with_schema( + Operator::NonASAP(NonASAPOp::Limit { + n: Some(*k), offset: 0, partition_by: groups.clone(), - }, - timing: ExecutionTiming::QueryTime, - }, - schema, - guarantee, - }); - validate_execution_data_states_at(&result, ExecutionDataState::QUERY_ROWS)?; + child: sorted, + }), + schema, + ) + .with_guarantee(guarantee), + ); + validate_maintained(&result, ExecutionTiming::QueryTime)?; Ok(result) } -fn is_current_series_source(child: &QueryExpr) -> bool { - let source = match child { - QueryExpr::TimeRange { child, .. } => child.as_ref(), - source => source, +fn is_current_series_source(child: &OperatorNode) -> bool { + let source = match child.non_asap() { + Some(NonASAPOp::TimeRange { child, .. }) => child.as_ref(), + _ => child, }; - matches!(source, QueryExpr::Scan { + matches!(source.non_asap(), Some(NonASAPOp::Scan { source: asap_types::pre_asap::Source::TimeSeries { .. }, schema, .. - } if schema.has_promql_series_identity()) + }) if schema.has_promql_series_identity()) } -fn is_snapshot_weighted_topk(intent: &AggIntent, child: &QueryExpr) -> bool { +fn is_snapshot_weighted_topk(intent: &AggIntent, child: &OperatorNode) -> bool { matches!(intent, AggIntent::TopK { .. }) && (is_current_series_source(child) - || matches!(child, - QueryExpr::Aggregate { measures, child, .. } + || matches!(child.non_asap(), + Some(NonASAPOp::Aggregate { measures, child, .. }) if matches!(measures.as_slice(), [AggIntent::Rate | AggIntent::Increase]) || (matches!(measures.as_slice(), [AggIntent::Sum { .. }]) - && matches!(child.as_ref(), QueryExpr::Aggregate { measures, .. } + && matches!(child.non_asap(), Some(NonASAPOp::Aggregate { measures, .. }) if matches!(measures.as_slice(), [AggIntent::Rate | AggIntent::Increase]))))) } /// Translate an [`Realization`] into the `(family, needs a -/// SummaryEstimate readout)` pair [`construct_summary_agg`] needs, or `None` -/// for `PassThrough` (the caller falls back to [`keep_pre_asap`]). +/// SummaryEstimate evaluation)` pair [`construct_summary_agg`] needs, or `None` +/// for `PassThrough` (the caller falls back to [`retain_exact`]). /// -/// Every family's partial state needs a readout to recover a value, except +/// Every family's partial state needs a evaluation to recover a value, except /// `ExactAggregate` — its partial state *is* the value already, so no /// estimate step follows it. fn summary_family(realization: Realization) -> Option<(FieldDataType, bool)> { @@ -2603,7 +2803,7 @@ fn summary_family(realization: Realization) -> Option<(FieldDataType, bool)> { /// input value. Composite realizations can instead consume a larger /// logical sub-DAG and bind a different key or value. struct PhysicalSummaryInput { - child: Rc, + child: Rc, input: SummaryUpdate, } @@ -2614,7 +2814,7 @@ enum PhysicalSummaryInputRuleResult { } type PhysicalSummaryInputRule = - fn(&AggIntent, &FieldDataType, &Reduction, &Rc) -> PhysicalSummaryInputRuleResult; + fn(&AggIntent, &FieldDataType, &Reduction, &Rc) -> PhysicalSummaryInputRuleResult; /// Ordered physical-realization rules for realizations that consume more /// than the immediate logical input. New composite primitives add a rule here @@ -2631,7 +2831,7 @@ fn realize_value_frequency_summary_input( intent: &AggIntent, family: &FieldDataType, _reduction: &Reduction, - child: &Rc, + child: &Rc, ) -> PhysicalSummaryInputRuleResult { // Frequency counts hash sample values as items but add one per observation. // Using the sample as a weight would turn counts into sums and admit signed CMS updates. @@ -2642,11 +2842,7 @@ fn realize_value_frequency_summary_input( { return PhysicalSummaryInputRuleResult::NotApplicable; } - let Ok(schema) = child.output_schema() else { - return PhysicalSummaryInputRuleResult::Unsupported( - "value frequency input needs a valid schema", - ); - }; + let schema = &child.schema; // One item per observation is a single value stream. `summary_candidates` // already withholds UnivMon from a distinct-tuple count; refused here too // so the invariant does not rest on that table alone. @@ -2658,7 +2854,7 @@ fn realize_value_frequency_summary_input( PhysicalSummaryInputRuleResult::Realized(PhysicalSummaryInput { child: Rc::clone(child), input: SummaryUpdate { - item: Some(SummaryInputExpr::Column(summarised_column(intent, &schema))), + item: Some(SummaryInputExpr::Column(summarised_column(intent, schema))), weight: SummaryInputExpr::Constant(1.0), weight_domain: WeightDomain::NonNegative { proof: NonNegativeWeightProof::UnitCount, @@ -2671,7 +2867,7 @@ fn realize_physical_summary_input( intent: &AggIntent, family: &FieldDataType, reduction: &Reduction, - child: &Rc, + child: &Rc, ) -> Result { for rule in PHYSICAL_SUMMARY_INPUT_RULES { match rule(intent, family, reduction, child) { @@ -2683,7 +2879,7 @@ fn realize_physical_summary_input( } } - let child_schema = child.output_schema()?; + let child_schema = &child.schema; if matches!(intent, AggIntent::TopK { .. }) { return Err(RealizationError::PhysicalRealization( "Top-K needs an explicit item identity and additive update input", @@ -2693,76 +2889,70 @@ fn realize_physical_summary_input( child: Rc::clone(child), input: SummaryUpdate { item: None, - weight: summarised_input(intent, &child_schema)?, + weight: summarised_input(intent, child_schema)?, weight_domain: WeightDomain::UnknownOrSigned, }, }) } /// Emit `SummaryAgg` (recursively binding the child), plus the -/// `SummaryEstimate` readout when `estimate` is set. +/// `SummaryEstimate` evaluation when `estimate` is set. // Retain the exact expression and schema while placing its value production -// on the update path. This is the initial layout for values feeding a summary; -// lifecycle timing is authoritative. Read-time consumers keep their original -// shared nodes. -fn maintenance_exact_values(node: Rc) -> Option> { - let expr = match &node.expr { +// on the update path (a node runs when its consumer runs, so beneath a +// maintained summary this value production is ingestion-time work). +// Read-time consumers keep their original shared nodes. +fn maintenance_exact_values(node: Rc) -> Option> { + let operator = match &node.operator { // These guards can fall back at read time, but cannot recover a parent // sketch after an invalid value has entered its maintained state. - SummaryExpr::BinaryOp { operator, .. } + Operator::NonASAP(NonASAPOp::BinaryOp { operator, .. }) if operator.checked_finite_division || operator.checked_relative_division => { return None; } - SummaryExpr::BinaryOp { - lhs, rhs, operator, .. - } if operator.vector_match.is_none() - && matches!( - operator.kind, - asap_types::pre_asap::BinaryOpKind::Arithmetic(_) - ) + Operator::NonASAP(NonASAPOp::BinaryOp { + lhs, + rhs, + operator, + return_bool, + }) if operator.vector_match.is_none() + && matches!(operator.kind, BinaryOpKind::Arithmetic(_)) && node .guarantee .as_ref() .is_some_and(ResultGuarantee::is_exact) => { - SummaryExpr::BinaryOp { + Operator::NonASAP(NonASAPOp::BinaryOp { lhs: maintenance_exact_values(lhs.clone())?, rhs: maintenance_exact_values(rhs.clone())?, operator: operator.clone(), - timing: ExecutionTiming::IngestionTime, - } + return_bool: *return_bool, + }) } - SummaryExpr::ValueOperation { - child, - operation: ValueOperation::FinalizeExactAccumulator, - .. - } if matches!( - child.expr, - SummaryExpr::SummaryAgg { - family: FieldDataType::ExactAggregate(..), - .. - } - ) => + Operator::ASAP(ASAPOp::FinalizeExactAccumulator { child }) + if matches!( + child.operator, + Operator::ASAP(ASAPOp::SummaryAgg { + family: FieldDataType::ExactAggregate(..), + .. + }) + ) => { - SummaryExpr::ValueOperation { + Operator::ASAP(ASAPOp::FinalizeExactAccumulator { child: child.clone(), - operation: ValueOperation::FinalizeExactAccumulator, - timing: ExecutionTiming::IngestionTime, - } + }) } _ => return Some(node), }; - Some(Rc::new(SummaryNode { - expr, - schema: node.schema.clone(), - guarantee: node.guarantee.clone(), - })) + Some(Rc::new( + OperatorNode::with_schema(operator, node.schema.clone()) + .with_guarantee(node.guarantee.clone()), + )) } #[allow(clippy::too_many_arguments)] fn construct_summary_agg( - node: &QueryExpr, + node: &OperatorNode, reduction: &Reduction, intent: &AggIntent, input: PhysicalSummaryInput, @@ -2771,7 +2961,7 @@ fn construct_summary_agg( planning_inputs: CandidatePlanningInputs<'_>, child_target: Option<&AccuracyTarget>, allocation: Option, -) -> Result, RealizationError> { +) -> Result, RealizationError> { // The single canonical pre-ASAP derivation (per-series vs cross-series, // name overrides) already computes the row shape; binding only retypes // the summary state column. @@ -2781,7 +2971,7 @@ fn construct_summary_agg( FieldDataType::Sketch(kind, _) if matches!(kind.algorithm(), SketchAlgorithm::CmsWithHeap | SketchAlgorithm::CountSketchWithHeap) ); - let snapshot_weighted = matches!(node, QueryExpr::Aggregate { child, .. } + let snapshot_weighted = matches!(node.non_asap(), Some(NonASAPOp::Aggregate { child, .. }) if is_snapshot_weighted_topk(intent, child)); let mut family = family; let score_population = if snapshot_weighted { @@ -2809,10 +2999,10 @@ fn construct_summary_agg( None }; let physical_reduction = if snapshot_weighted { - let QueryExpr::Aggregate { child, .. } = node else { + let Some(NonASAPOp::Aggregate { child, .. }) = node.non_asap() else { unreachable!() }; - let source = input.child.output_schema()?; + let source = &input.child.schema; let Reduction::Reduce(keys) = reduction else { return Err(RealizationError::PhysicalRealization( "TopK requires explicit partitions", @@ -2850,19 +3040,19 @@ fn construct_summary_agg( } else { reduction.clone() }; - let out_schema = node.output_schema()?; - let measures = match node { - QueryExpr::Aggregate { measures, .. } => measures.len(), + let out_schema = &node.schema; + let measures = match node.non_asap() { + Some(NonASAPOp::Aggregate { measures, .. }) => measures.len(), _ => 1, }; - let state_idx = summary_col_index(&out_schema, reduction, measures); + let state_idx = summary_col_index(out_schema, reduction, measures); - let readout_schema = if keyed_heap - && matches!(node, QueryExpr::Aggregate { child, .. } if is_snapshot_weighted_topk(intent, child)) + let evaluation_schema = if keyed_heap + && matches!(node.non_asap(), Some(NonASAPOp::Aggregate { child, .. }) if is_snapshot_weighted_topk(intent, child)) { - keyed_heap_readout_schema(&input, node)? + keyed_heap_evaluation_schema(&input, node)? } else { - lift(&out_schema) + out_schema.clone() }; let summary_input = input.input; @@ -2879,15 +3069,15 @@ fn construct_summary_agg( }; } } - readout(intent, &summary_input, planning_inputs.cost) + evaluation(intent, &summary_input, planning_inputs.cost) }); - let mut state_schema = lift(&out_schema); + let mut state_schema = out_schema.clone(); if keyed_heap { let mut state = state_schema.fields[state_idx].clone(); state.dtype = family.clone(); let mut fields = if snapshot_weighted { - readout_schema.fields[..reduction.group_keys().map_or(0, |keys| keys.len())].to_vec() + evaluation_schema.fields[..reduction.group_keys().map_or(0, |keys| keys.len())].to_vec() } else { Vec::new() }; @@ -2895,6 +3085,7 @@ fn construct_summary_agg( state_schema = Schema::lifted(fields, None); } else if let Some(field) = state_schema.fields.get_mut(state_idx) { field.dtype = family.clone(); + field.nullable = false; if matches!(&family, FieldDataType::Sketch(kind, _) if kind.algorithm() == &SketchAlgorithm::UnivMon) { // State identity is independent of which statistic reads it. @@ -2902,9 +3093,9 @@ fn construct_summary_agg( } else if let (AggIntent::Quantile { .. }, SummaryInputExpr::Column(col)) = (intent, &summary_input.weight) { - // The quantile is a readout parameter: name the state after the + // The quantile is a evaluation parameter: name the state after the // column it summarizes, not after the query's output column. - let child_schema = input.child.output_schema()?; + let child_schema = input.child.schema.clone(); if let Ok(i) = resolve_column_ref(col, &child_schema) { field.name = child_schema.fields[i].name.clone(); } @@ -2931,39 +3122,26 @@ fn construct_summary_agg( .ok_or(RealizationError::PhysicalRealization( "snapshot ranking requires a supported current-series population", ))?; - let SummaryExpr::ValueOperation { child, .. } = &population.expr else { + let Operator::ASAP(ASAPOp::EvaluatePopulation { child, .. }) = &population.operator else { return Err(RealizationError::PhysicalRealization( - "missing population readout", + "missing population evaluation", )); }; Rc::clone(child) } else if snapshot_weighted { // Each evaluation's finalized rates feed a fresh summary; rate snapshots // must never accumulate across evaluations. Query time is only the - // initial layout; a retained summary's lifecycle moves it to ingestion. + // initial layout; a maintained summary's materialization moves it to ingestion. finalize_query_candidate(bound_child, &input.child)? } else { - let child = finalize_exact_accumulator_at( - bound_child, - &input.child, - ExecutionTiming::IngestionTime, - )?; - let child = maintenance_exact_values(child).unwrap_or(keep_pre_asap(&input.child)?); - // Maintenance arithmetic must satisfy the ingestion contract; e.g. a - // per-series sum over different selectors has no exact aligned - // layout, so this candidate fails closed and exact execution remains. - // Unlike checked division, it does not fall back to `keep_pre_asap`: - // that retains the range expression at ingestion time, where range - // functions cannot run (they need a query evaluation time). - if matches!(child.expr, SummaryExpr::BinaryOp { .. }) { - validate_execution_data_states_at(&child, ExecutionDataState::INGESTION_ROWS)?; - } - child + let child = + finalize_exact_accumulator(bound_child, &input.child, ExecutionTiming::IngestionTime)?; + maintenance_exact_values(child).unwrap_or(retain_exact(&input.child)?) }; // ── Guarantee (issue #172) ────────────────────────────────────────── // Derived *before* the node exists, so an illegal composition is never - // materialized: the local guarantee of this family's readout (or exact + // materialized: the local guarantee of this family's evaluation (or exact // accumulator) composed over the child's, under the operator this // family applies to the child's values. let local_target = match allocation.as_ref() { @@ -2976,7 +3154,7 @@ fn construct_summary_agg( local_target, ); let membership_query = if snapshot_weighted { - Some(readout(intent, &summary_input, planning_inputs.cost)) + Some(evaluation(intent, &summary_input, planning_inputs.cost)) } else { query.clone() }; @@ -3054,56 +3232,65 @@ fn construct_summary_agg( // a genuine empty-`by` reduction apart from a per-entity shape with no // grouping concept at all (issue #163). `construct_summary_agg` is the // single place that decides this; nothing downstream re-derives it. - let agg = Rc::new(SummaryNode { - expr: SummaryExpr::SummaryAgg { + let coverage = whole_source_coverage(&bound_child); + let agg = OperatorNode::with_schema( + asap_types::ir::Operator::ASAP(ASAPOp::SummaryAgg { child: bound_child, family, input: summary_input, reduction: physical_reduction, grouping: GroupingStrategy::default(), filter: None, - }, - schema: state_schema, + }), + state_schema, + ) + .with_guarantee( // Summary *state* carries no caller-visible guarantee; only a // finalized value does. An exact accumulator's state is its value. - guarantee: if estimate { None } else { guarantee.clone() }, + if estimate { None } else { guarantee.clone() }, + ); + let agg = std::rc::Rc::new(match coverage { + Some(coverage) => agg.with_coverage(coverage)?, + None => agg, }); match query { - // The readout: downstream of the estimate the schema is the plain + // The evaluation: downstream of the estimate the schema is the plain // pre-ASAP row shape again (the summary-state type does not // propagate). - Some(query) => Ok(Rc::new(SummaryNode { - expr: SummaryExpr::SummaryEstimate { - summary_input: agg, - query, - }, - schema: readout_schema, - guarantee, - })), + Some(query) => Ok(std::rc::Rc::new( + OperatorNode::with_schema( + asap_types::ir::Operator::ASAP(ASAPOp::SummaryEstimate { + summary_input: agg, + query, + }), + evaluation_schema, + ) + .with_guarantee(guarantee), + )), None => Ok(agg), } } -// Heap readout rows contain the encoded item identity, subpopulation keys, +// Heap evaluation rows contain the encoded item identity, subpopulation keys, // and an estimated score. They never inherit the exact-value producer's schema. -fn keyed_heap_readout_schema( +fn keyed_heap_evaluation_schema( input: &PhysicalSummaryInput, - node: &QueryExpr, + node: &OperatorNode, ) -> Result { - let source = input.child.output_schema()?; + let source = &input.child.schema; let mut refs = Vec::new(); - let QueryExpr::Aggregate { + let Some(NonASAPOp::Aggregate { reduction, child, .. - } = node + }) = node.non_asap() else { return Err(RealizationError::PhysicalRealization( - "heap readout requires an aggregate", + "heap evaluation requires an aggregate", )); }; if let Reduction::Reduce(groups) = reduction { if groups.is_without() { return Err(RealizationError::PhysicalRealization( - "heap readout requires explicit grouping", + "heap evaluation requires explicit grouping", )); } for index in groups.iter() { @@ -3161,7 +3348,7 @@ fn keyed_heap_readout_schema( .ok_or(RealizationError::PhysicalRealization( "heap item identity is missing", ))?, - &source, + source, &mut refs, )?; let mut fields = Vec::::new(); @@ -3197,7 +3384,7 @@ fn keyed_heap_readout_schema( } if fields.is_empty() { return Err(RealizationError::PhysicalRealization( - "heap readout has no identity columns", + "heap evaluation has no identity columns", )); } fields.push(Field::new( @@ -3208,7 +3395,7 @@ fn keyed_heap_readout_schema( Ok(Schema::lifted(fields, None)) } -fn ranking_score_index(logical: &QueryExpr, values: &Schema) -> Result { +fn ranking_score_index(logical: &OperatorNode, values: &Schema) -> Result { if is_current_series_source(logical) { return values .fields @@ -3221,11 +3408,11 @@ fn ranking_score_index(logical: &QueryExpr, values: &Schema) -> Result, + child: &Rc, ) -> PhysicalSummaryInputRuleResult { if !matches!(intent, AggIntent::TopK { .. }) || !matches!(family, FieldDataType::Sketch(kind, _) if matches!(kind.algorithm(), SketchAlgorithm::CmsWithHeap | SketchAlgorithm::CountSketchWithHeap)) - || !matches!(child.as_ref(), QueryExpr::Aggregate { reduction: Reduction::PerEntity, measures, .. } if matches!(measures.as_slice(), [AggIntent::Rate | AggIntent::Increase])) + || !matches!(child.non_asap(), Some(NonASAPOp::Aggregate { reduction: Reduction::PerEntity, measures, .. }) if matches!(measures.as_slice(), [AggIntent::Rate | AggIntent::Increase])) { return PhysicalSummaryInputRuleResult::NotApplicable; } - let Ok(schema) = child.output_schema() else { - return PhysicalSummaryInputRuleResult::Unsupported( - "counter ranking needs a valid value schema", - ); - }; + let schema = &child.schema; if !schema.closed { return PhysicalSummaryInputRuleResult::Unsupported( "counter ranking needs the complete resolved series identity", @@ -3332,7 +3515,7 @@ fn realize_current_series_summary_input( intent: &AggIntent, family: &FieldDataType, output_reduction: &Reduction, - child: &Rc, + child: &Rc, ) -> PhysicalSummaryInputRuleResult { if !matches!(intent, AggIntent::TopK { .. }) || !is_current_series_source(child) { return PhysicalSummaryInputRuleResult::NotApplicable; @@ -3359,11 +3542,7 @@ fn realize_current_series_summary_input( "snapshot ranking requires resolved partitions", ); } - let Ok(schema) = child.output_schema() else { - return PhysicalSummaryInputRuleResult::Unsupported( - "snapshot ranking requires a valid source schema", - ); - }; + let schema = &child.schema; let items = schema .fields .iter() @@ -3393,7 +3572,7 @@ fn realize_keyed_additive_summary_input( intent: &AggIntent, family: &FieldDataType, output_reduction: &Reduction, - child: &Rc, + child: &Rc, ) -> PhysicalSummaryInputRuleResult { if !matches!(intent, AggIntent::TopK { .. }) { return PhysicalSummaryInputRuleResult::NotApplicable; @@ -3408,18 +3587,18 @@ fn realize_keyed_additive_summary_input( ) { return PhysicalSummaryInputRuleResult::NotApplicable; } - let QueryExpr::Aggregate { + let Some(NonASAPOp::Aggregate { reduction, measures, having: None, child: raw_child, .. - } = child.as_ref() + }) = child.non_asap() else { return PhysicalSummaryInputRuleResult::NotApplicable; }; let counter_input = matches!(measures.as_slice(), [AggIntent::Sum { .. }]) - && matches!(raw_child.as_ref(), QueryExpr::Aggregate { measures, .. } + && matches!(raw_child.non_asap(), Some(NonASAPOp::Aggregate { measures, .. }) if matches!(measures.as_slice(), [AggIntent::Rate | AggIntent::Increase])); let weight = match measures.as_slice() { [AggIntent::Count { .. }] => SummaryInputExpr::Constant(1.0), @@ -3511,9 +3690,8 @@ fn realize_keyed_additive_summary_input( }) } -fn schema_column_ref(child: &QueryExpr, index: usize) -> Option { - let schema = child.output_schema().ok()?; - let column = schema.fields.get(index)?; +fn schema_column_ref(child: &OperatorNode, index: usize) -> Option { + let column = child.schema.fields.get(index)?; Some(match &column.table { Some(table) => ColumnRef::Qualified { table: table.clone(), @@ -3535,7 +3713,7 @@ fn schema_column_ref(child: &QueryExpr, index: usize) -> Option { fn compose_guarantee( family: &FieldDataType, query: Option<&PostAsapSketchStatistic>, - child: &SummaryNode, + child: &OperatorNode, intent: &AggIntent, accuracy: &dyn AccuracyModel, evidence: &dyn AccuracyEvidenceProvider, @@ -3685,8 +3863,8 @@ fn summarised_input( )) } -/// The `SummaryEstimate` readout for a summary-bound intent. -fn readout( +/// The `SummaryEstimate` evaluation for a summary-bound intent. +fn evaluation( intent: &AggIntent, input: &SummaryUpdate, cost_model: &dyn CostModel, @@ -3706,13 +3884,15 @@ fn readout( value: None, }, // Core doesn't know the shape of a deployment-specific `Extension` - // intent, so it can't build its readout either — delegate to the + // intent, so it can't build its evaluation either — delegate to the // same `CostModel` that decided (via `realize_extension`) this - // intent gets a summary realization at all. See `readout_extension`'s + // intent gets a summary realization at all. See `evaluation_extension`'s // doc for the invariant this depends on. AggIntent::Extension { ext_kind, payload } => match &input.weight { - SummaryInputExpr::Column(col) => cost_model.readout_extension(ext_kind, payload, col), - _ => unreachable!("extension readout requires one column"), + SummaryInputExpr::Column(col) => { + cost_model.evaluation_extension(ext_kind, payload, col) + } + _ => unreachable!("extension evaluation requires one column"), }, other => { unreachable!("no summary realization for {other:?} (realizations_for_intent)") @@ -3720,16 +3900,9 @@ fn readout( } } -/// Lift a pre-ASAP [`Schema`] to a [`Schema`] with every column -/// `FieldDataType::Plain` — shared by [`construct_summary_agg`] and -/// [`keep_pre_asap`], both in this module. -fn lift(schema: &Schema) -> Schema { - Schema::lifted(schema.fields.clone(), schema.time_index) -} - // ── SharedSubDAGStrategy ──────────────────────────────────────────────── -/// Wraps `asap_types::pre_asap::cse::share_common_sub_dags`'s sharing +/// Wraps `asap_types::ir::cse::share_common_sub_dags`'s sharing /// decision as an explicit candidate pair, wherever a [`TargetSubDAG`] /// already has two or more consumers. /// @@ -3762,11 +3935,11 @@ impl ReplacementStrategy for SharedSubDAGStrategy { strategy: "SharedSubDAGStrategy", // The already-interned `Rc` itself: reusing it verbatim *is* // "build once and share" — no new node to construct. - replacement: Replacement::Rewrite(Rc::clone(target.root)), + replacement: Replacement::SubDAG(Rc::clone(target.root)), provenance: ReplacementProvenance::CseShare, rationale: format!( "build once and share: share_common_sub_dags already interned this \ - sub-DAG once and reused it across {count} consumers — one build can \ + sub_dag once and reused it across {count} consumers — one build can \ answer all of them instead of computing it {count} times" ), }, @@ -3775,11 +3948,11 @@ impl ReplacementStrategy for SharedSubDAGStrategy { // A structurally-identical but freshly-allocated `Rc`: same // value (`PartialEq`), deliberately *not* the same pointer, // representing "undo the sharing and recompute independently". - replacement: Replacement::Rewrite(Rc::new((**target.root).clone())), + replacement: Replacement::SubDAG(Rc::new((**target.root).clone())), provenance: ReplacementProvenance::CseRecompute, rationale: format!( "build independently: undo the sharing share_common_sub_dags found and \ - recompute this sub-DAG separately at each of its {count} consumers — \ + recompute this sub_dag separately at each of its {count} consumers — \ worth it only when independence outweighs the shared-maintenance cost, \ a CostModel's call (e.g. CostModel::cse_share_decision) and not this \ strategy's" @@ -3798,14 +3971,14 @@ impl ReplacementStrategy for SharedSubDAGStrategy { /// A generous, documented backstop against a hypothetically ill-behaved /// future [`ReplacementStrategy`] (see the module docs' "Termination" /// section) — not a bound either shipped strategy could ever approach. -/// [`SketchAlgorithmStrategy`] and [`SharedSubDAGStrategy`] both converge in +/// [`ASAPStrategies`] and [`SharedSubDAGStrategy`] both converge in /// exactly 2 passes over a fixed target set, regardless of workload size. pub const MAX_SEARCH_ITERATIONS: usize = 1_000; // ── TargetSubDAGCandidates ────────────────────────────────────────────── /// Candidates for one distinct [`TargetSubDAG`] (its -/// own `target` `Rc`, keyed by pointer identity in +/// own `target` `Rc`, keyed by pointer identity in /// [`CandidateLogicalASAPDAGs`]'s internal map — never re-derived by value) plus every /// [`ReplacementSubDAG`] alternative any registered [`ReplacementStrategy`] /// proposed for it. @@ -3818,7 +3991,7 @@ pub const MAX_SEARCH_ITERATIONS: usize = 1_000; #[derive(Debug, Clone)] pub struct TargetSubDAGCandidates { /// The target sub-DAG this group is for. - pub target: Rc, + pub target: Rc, /// How many operator-child positions across the whole workload /// reference this exact `Rc` — see [`discover_targets`]. pub consumer_count: usize, @@ -3835,7 +4008,7 @@ pub struct TargetSubDAGCandidates { } impl TargetSubDAGCandidates { - fn new(target: Rc, consumer_count: usize) -> Self { + fn new(target: Rc, consumer_count: usize) -> Self { Self { target, consumer_count, @@ -3852,10 +4025,12 @@ impl TargetSubDAGCandidates { fn add_candidate(&mut self, candidate: ReplacementSubDAG) -> bool { let is_duplicate = self.candidates.iter().any(|existing| { match (&existing.replacement, &candidate.replacement) { - (Replacement::Rewrite(existing_rc), Replacement::Rewrite(rc)) => { + (Replacement::SubDAG(existing_rc), Replacement::SubDAG(rc)) + if is_logical_rewrite(existing_rc) && is_logical_rewrite(rc) => + { is_duplicate_rewrite(existing_rc, rc, &self.target) } - (Replacement::Summary(existing_node), Replacement::Summary(node)) => { + (Replacement::SubDAG(existing_node), Replacement::SubDAG(node)) => { is_duplicate_summary(existing_node, node) } ( @@ -3876,11 +4051,11 @@ impl TargetSubDAGCandidates { } } -/// Are `existing` and `candidate` the same [`Replacement::Rewrite`] -/// candidate for a group targeting `target`? +/// Are `existing` and `candidate` the same logical-rewrite +/// [`Replacement::SubDAG`] candidate for a group targeting `target`? /// -/// Structural (`QueryExpr`) value equality alone is *not* enough here: this -/// module's one shipped multi-candidate `Replacement::Rewrite` source, +/// Structural (`OperatorNode`) value equality alone is *not* enough here: +/// this module's one shipped multi-candidate logical-rewrite source, /// [`SharedSubDAGStrategy`], deliberately returns **two** candidates that /// are value-equal to each other (`build once and share` vs. `build /// independently` — see that strategy's own doc) but represent genuinely @@ -3898,7 +4073,7 @@ impl TargetSubDAGCandidates { /// So: two candidates whose "is this the target's own `Rc`?" bit disagrees /// are never duplicates of each other, full stop. Only when that bit /// *agrees* does this fall through to the real dedup discipline — -/// [`structural_hash`] as a candidate-narrowing filter, `QueryExpr`'s +/// [`structural_hash`] as a candidate-narrowing filter, `OperatorNode`'s /// derived `PartialEq` as the actual decision — protecting against the /// (currently hypothetical, since neither shipped strategy causes it) /// case of the exact same alternative being proposed twice. A fresh @@ -3907,9 +4082,9 @@ impl TargetSubDAGCandidates { /// wider traversal to amortize the cache across the way `InternTable`'s own /// use of `structural_hash` does. fn is_duplicate_rewrite( - existing: &Rc, - candidate: &Rc, - target: &Rc, + existing: &Rc, + candidate: &Rc, + target: &Rc, ) -> bool { let existing_is_target = Rc::ptr_eq(existing, target); let candidate_is_target = Rc::ptr_eq(candidate, target); @@ -3921,16 +4096,16 @@ fn is_duplicate_rewrite( && existing == candidate } -/// Are `existing` and `candidate` the same [`Replacement::Summary`] -/// candidate? +/// Are `existing` and `candidate` the same bound-summary +/// [`Replacement::SubDAG`] candidate? /// -/// [`SummaryNode`] derives neither `PartialEq` nor `Hash` (it embeds -/// `SketchParams`/`f64`-bearing accuracy targets deep inside `SummaryExpr`, -/// the same reason `QueryExpr` can't derive `Hash` either — see -/// [`structural_hash`]'s own doc). Per this module's inherited "hash is a -/// filter, `PartialEq` is the decision, no exceptions" rule, there is no -/// real equality check to back a dedup *decision* here — and skipping the -/// check is the only choice that rule permits: never merging two candidates +/// A bound summary embeds `SketchParams`/`f64`-bearing accuracy targets and +/// guarantees, so value equality is not a dedup decision this module is +/// willing to make (see [`structural_hash`]'s own doc on `f64` hashing). +/// Per this module's inherited "hash is a filter, `PartialEq` is the +/// decision, no exceptions" rule, there is no real equality check to back a +/// dedup *decision* here — and skipping the check is the only choice that +/// rule permits: never merging two candidates /// is harmless (at worst, a redundant entry in a group's candidate list), /// while comparing by some proxy this module can't actually verify (e.g. /// `Debug` text, or `ReplacementSubDAG::rationale` — documented elsewhere in @@ -3939,7 +4114,7 @@ fn is_duplicate_rewrite( /// shipped today already return a structurally distinct candidate for every /// entry of one `replacements()` call, so this is future-proofing against a /// hypothetical repeat call, not a gap either strategy's own tests exercise. -fn is_duplicate_summary(_existing: &Rc, _candidate: &Rc) -> bool { +fn is_duplicate_summary(_existing: &Rc, _candidate: &Rc) -> bool { false } @@ -3948,34 +4123,34 @@ fn is_duplicate_summary(_existing: &Rc, _candidate: &Rc` whose -/// group holds its alternatives. +/// caller can still map a `Root`'s `Id` back to the `Rc` whose +/// group holds its alternatives. Memos are keyed by `*const OperatorNode`. pub struct CandidateLogicalASAPDAGs { /// The workload's roots, after the one `share_common_sub_dags` pass /// [`search_workload_with`] runs up front — the same post-CSE roots /// every `TargetSubDAG` in `groups` was discovered from. - pub roots: Vec<(Id, Rc)>, - groups: HashMap<*const QueryExpr, TargetSubDAGCandidates>, + pub roots: Vec<(Id, Rc)>, + groups: HashMap<*const OperatorNode, TargetSubDAGCandidates>, /// Discovery order — stable iteration for [`CandidateLogicalASAPDAGs::target_subdag_candidates`]/ /// [`CandidateLogicalASAPDAGs::cost_sorted`], since `HashMap` iteration order isn't. - order: Vec<*const QueryExpr>, + order: Vec<*const OperatorNode>, /// Composition proofs are computed with the search model, then retained /// through costing and DAG assembly so no later default can replace it. composition_plans: Vec, } struct PreparedComposition { - target: *const QueryExpr, + target: *const OperatorNode, operation: ExactComposition, - child: Rc, - plan: Rc, + child: Rc, + plan: Rc, } impl CandidateLogicalASAPDAGs { fn prepare_compositions( &mut self, accuracy: &dyn AccuracyModel, - targets: &HashMap<*const QueryExpr, Vec>, + targets: &HashMap<*const OperatorNode, Vec>, ) { self.composition_plans.clear(); for group in self.groups.values() { @@ -3990,14 +4165,16 @@ impl CandidateLogicalASAPDAGs { .into_iter() .flat_map(|g| &g.candidates) .filter_map(|c| match &c.replacement { - Replacement::Summary(child) if operation.accepts_child(child) => { + Replacement::SubDAG(child) + if !is_logical_rewrite(child) && operation.accepts_child(child) => + { Some(Rc::clone(child)) } _ => None, }) .collect(), OperationPlacement::Maintenance => { - keep_pre_asap(&operation.child_target).into_iter().collect() + retain_exact(&operation.child_target).into_iter().collect() } }; for child in children { @@ -4029,17 +4206,17 @@ impl CandidateLogicalASAPDAGs { } /// DAG candidates assembled from an unpriced search space. -/// This is an internal planning stage: callers must still validate lifecycle +/// This is an internal planning stage: callers must still validate materialization /// requirements and compile supported physical operators before deployment. /// The caller supplies a finite expansion budget; exceeding it is an error, /// never a silently truncated inventory presented as exhaustive. #[derive(Debug)] pub struct CandidateDAGInventory { - pub candidates: Vec)>>, + pub candidates: Vec)>>, pub rejected_assemblies: Vec, } -type CandidateDAGChoice<'a> = (Option<&'a ReplacementSubDAG>, Option>); +type CandidateDAGChoice<'a> = (Option<&'a ReplacementSubDAG>, Option>); impl CandidateLogicalASAPDAGs { pub fn enumerate_candidate_dags( @@ -4074,7 +4251,7 @@ impl CandidateLogicalASAPDAGs { fn enumerate_candidate_roots( &self, - roots: &[(Id, Rc)], + roots: &[(Id, Rc)], expansion_limit: usize, ) -> Result, RealizationError> { let mut reachable = Vec::new(); @@ -4090,8 +4267,10 @@ impl CandidateLogicalASAPDAGs { cursor += 1; if let Some(group) = self.groups.get(&ptr) { for candidate in &group.candidates { - if let Replacement::Rewrite(rewritten) = &candidate.replacement { - walk(rewritten, &mut reachable, &mut nodes, &mut counts); + if let Replacement::SubDAG(rewritten) = &candidate.replacement { + if is_logical_rewrite(rewritten) { + walk(rewritten, &mut reachable, &mut nodes, &mut counts); + } } } } @@ -4185,77 +4364,12 @@ impl CandidateLogicalASAPDAGs { .collect::, _>>(); match roots { Ok(roots) => { - let roots = asap_types::post_asap::share_common_summary_sub_dags(roots); + let roots = share_common_sub_dags(roots); use std::hash::{Hash, Hasher}; let mut hash = std::collections::hash_map::DefaultHasher::new(); - let mut pending = roots - .iter() - .map(|(_, node)| node.as_ref()) - .collect::>(); - while let Some(node) = pending.pop() { - std::mem::discriminant(&node.expr).hash(&mut hash); - let raw = match &node.expr { - SummaryExpr::KeepPreAsap(raw) => Some(raw.as_ref()), - _ => None, - }; - let operation = match &node.expr { - SummaryExpr::ValueOperation { - timing, operation, .. - } => serde_json::json!((timing, operation)), - SummaryExpr::BinaryOp { - timing, operator, .. - } => serde_json::json!((timing, operator)), - SummaryExpr::SummaryMerge { timing, .. } => serde_json::json!(timing), - _ => serde_json::Value::Null, - }; - let mut value = - serde_json::to_value((&node.schema, &node.guarantee, raw, operation)) - .map_err(|_| { - RealizationError::PhysicalRealization( - "candidate identity serialization failed", - ) - })?; - fn normalize(value: &mut serde_json::Value) { - match value { - serde_json::Value::Number(number) - if number.as_f64() == Some(0.0) => - { - *value = serde_json::json!(0); - } - serde_json::Value::Array(values) => { - values.iter_mut().for_each(normalize) - } - serde_json::Value::Object(values) => { - values.values_mut().for_each(normalize) - } - _ => {} - } - } - normalize(&mut value); - value.sort_all_objects(); - value.to_string().hash(&mut hash); - match &node.expr { - SummaryExpr::KeepPreAsap(_) => {} - SummaryExpr::BinaryOp { lhs, rhs, .. } => { - pending.extend([lhs.as_ref(), rhs.as_ref()]) - } - SummaryExpr::RelationalJoin { left, right, .. } - | SummaryExpr::SummarySubtract { left, right } => { - pending.extend([left.as_ref(), right.as_ref()]) - } - SummaryExpr::ValueOperation { child, .. } - | SummaryExpr::SummaryAgg { child, .. } => pending.push(child.as_ref()), - SummaryExpr::SummaryJoin { outer, inner, .. } => { - pending.extend([outer.as_ref(), inner.as_ref()]) - } - SummaryExpr::SummaryDelete { summary_input, .. } - | SummaryExpr::SummaryEstimate { summary_input, .. } => { - pending.push(summary_input.as_ref()) - } - SummaryExpr::SummaryMerge { children, .. } => { - pending.extend(children.iter().map(|child| child.as_ref())) - } - } + let mut cache = HashCache::new(); + for (_, node) in &roots { + structural_hash(node, &mut cache).hash(&mut hash); } let bucket = seen.entry(hash.finish()).or_default(); if !bucket @@ -4278,50 +4392,6 @@ impl CandidateLogicalASAPDAGs { } } -/// Lifecycle-aware whole-subplan costs keyed by target and candidate identity. -#[derive(Default, Clone)] -pub(crate) struct CandidateCostOverrides { - costs: HashMap<(*const QueryExpr, *const ReplacementSubDAG), Cost>, - raw_costs: HashMap<*const QueryExpr, Cost>, - /// Targets for which the caller requested an atomic raw-vs-summary - /// decision. Other memo groups continue through ordinary CSE selection. - finalized_targets: HashSet<*const QueryExpr>, -} - -impl CandidateCostOverrides { - pub(crate) fn finalize_target(&mut self, target: &Rc) { - self.finalized_targets.insert(Rc::as_ptr(target)); - } - - fn finalizes(&self, target: &Rc) -> bool { - self.finalized_targets.contains(&Rc::as_ptr(target)) - } - - pub(crate) fn insert( - &mut self, - target: &Rc, - candidate: &ReplacementSubDAG, - cost: Cost, - ) { - self.costs - .insert((Rc::as_ptr(target), candidate as *const _), cost); - } - - fn get(&self, target: &Rc, candidate: &ReplacementSubDAG) -> Option { - self.costs - .get(&(Rc::as_ptr(target), candidate as *const _)) - .copied() - } - - pub(crate) fn insert_raw(&mut self, target: &Rc, cost: Cost) { - self.raw_costs.insert(Rc::as_ptr(target), cost); - } - - fn raw(&self, target: &Rc) -> Option { - self.raw_costs.get(&Rc::as_ptr(target)).copied() - } -} - impl CandidateLogicalASAPDAGs { /// One candidate set per discovered target sub-DAG, in discovery order. pub fn target_subdag_candidates(&self) -> impl Iterator { @@ -4334,7 +4404,7 @@ impl CandidateLogicalASAPDAGs { } /// Whether no targets were discovered at all (an empty workload, or one - /// with no `QueryExpr` nodes reachable from any root — never true for a + /// with no `OperatorNode`s reachable from any root — never true for a /// non-empty `roots`, since every root is itself a target). pub fn is_empty(&self) -> bool { self.groups.is_empty() @@ -4343,7 +4413,10 @@ impl CandidateLogicalASAPDAGs { /// The candidate set for `target`, if `target`'s own `Rc` is a discovered /// `TargetSubDAG` (i.e. `Rc::ptr_eq` to some node reachable from /// `roots`). - pub fn candidates_for_target(&self, target: &Rc) -> Option<&TargetSubDAGCandidates> { + pub fn candidates_for_target( + &self, + target: &Rc, + ) -> Option<&TargetSubDAGCandidates> { self.groups.get(&Rc::as_ptr(target)) } @@ -4465,17 +4538,17 @@ impl CandidateLogicalASAPDAGs { /// half of issue #287. Looked up by `Rc` pointer identity, the same /// currency [`CandidateLogicalASAPDAGs::candidates_for_target`]/[`GlobalSelection::for_target`] already /// use. -/// Holds an owned `Rc` clone alongside each profile (not just its -/// raw pointer) so this map keeps every node it describes alive for as long -/// as the map itself lives — a `RecurrenceProfileMap` is safe to outlive the -/// `CandidateLogicalASAPDAGs` it was built from. Without this, a raw `*const QueryExpr` key +/// Holds an owned `Rc` clone alongside each profile (not just +/// its raw pointer) so this map keeps every node it describes alive for as +/// long as the map itself lives — a `RecurrenceProfileMap` is safe to outlive +/// the `CandidateLogicalASAPDAGs` it was built from. Without this, a raw `*const OperatorNode` key /// could, after the originating `CandidateLogicalASAPDAGs` (the only other owner of those /// `Rc`s) is dropped, collide with an unrelated, later allocation that /// happens to reuse the same freed address — silently returning a stale /// profile for the wrong node (issue #287 review, bug 4). #[derive(Debug, Clone)] pub struct RecurrenceProfileMap { - profiles: HashMap<*const QueryExpr, (Rc, RecurrenceProfile)>, + profiles: HashMap<*const OperatorNode, (Rc, RecurrenceProfile)>, } impl RecurrenceProfileMap { @@ -4484,7 +4557,7 @@ impl RecurrenceProfileMap { /// in the [`CandidateLogicalASAPDAGs`] this map was built from (or carried no /// recurring/one-shot/update-rate metadata at all) — always a valid, /// "no metadata" answer, never a panic. - pub fn for_target(&self, target: &Rc) -> RecurrenceProfile { + pub fn for_target(&self, target: &Rc) -> RecurrenceProfile { self.profiles .get(&Rc::as_ptr(target)) .map(|(_, profile)| *profile) @@ -4504,7 +4577,7 @@ impl CandidateLogicalASAPDAGs { /// `self.roots[i]` — the same order [`search_workload`]/ /// [`search_workload_with`] were originally called with (post-CSE /// dedup preserves both root count and order — see - /// `asap_types::pre_asap::cse::share_common_sub_dags`'s own + /// `asap_types::ir::cse::share_common_sub_dags`'s own /// `.map(...).collect()` body). This keeps `Id` fully opaque (no `Eq`/ /// `Hash`/`Clone` bound needed on it at all — issue #287's "keep /// caller/query identifiers opaque" requirement) at the cost of the @@ -4581,12 +4654,12 @@ impl CandidateLogicalASAPDAGs { } } - let mut rates: HashMap<*const QueryExpr, f64> = HashMap::new(); - let mut one_shot_counts: HashMap<*const QueryExpr, usize> = HashMap::new(); + let mut rates: HashMap<*const OperatorNode, f64> = HashMap::new(); + let mut one_shot_counts: HashMap<*const OperatorNode, usize> = HashMap::new(); // Sites actually reached by at least one root's own recurrence tag // during the walk below — see this method's own "Unreachable // sites" doc. - let mut reached: HashSet<*const QueryExpr> = HashSet::new(); + let mut reached: HashSet<*const OperatorNode> = HashSet::new(); for ((_, root), recurrence) in self.roots.iter().zip(root_recurrence) { let recurrence = *recurrence; @@ -4596,7 +4669,7 @@ impl CandidateLogicalASAPDAGs { // recomputed occurrence is evaluated twice as well; stopping // expansion after the first pointer visit undercounts exactly // the effective-consumer rate recurrence-aware costing needs. - let mut queue: VecDeque<(*const QueryExpr, usize)> = VecDeque::new(); + let mut queue: VecDeque<(*const OperatorNode, usize)> = VecDeque::new(); queue.push_back((root_ptr, 1)); while let Some((ptr, path_count)) = queue.pop_front() { @@ -4733,54 +4806,6 @@ impl CandidateLogicalASAPDAGs { .map(|rate| UpdateRate(rate.0)); self.recurrence_profiles(&recurrences, update_rate) } - - /// Associate every discovered target with the normalized workload entries - /// whose roots can reach it. - pub(crate) fn workload_entries_by_target( - &self, - workload: &QueryWorkload, - root_workload_entries: &[usize], - ) -> Result>, RecurrenceError> { - let entry_count = workload.entries().count(); - if root_workload_entries.len() != self.roots.len() { - return Err(RecurrenceError::RootCountMismatch { - expected: self.roots.len(), - got: root_workload_entries.len(), - }); - } - let mut bindings: HashMap<*const QueryExpr, HashSet> = HashMap::new(); - for ((_, root), &entry_index) in self.roots.iter().zip(root_workload_entries) { - if entry_index >= entry_count { - return Err(RecurrenceError::InvalidWorkloadEntry { - index: entry_index, - entry_count, - }); - } - let mut seen = HashSet::new(); - let mut queue = VecDeque::from([Rc::as_ptr(root)]); - while let Some(ptr) = queue.pop_front() { - if !seen.insert(ptr) { - continue; - } - bindings.entry(ptr).or_default().insert(entry_index); - if let Some(group) = self.groups.get(&ptr) { - queue.extend( - direct_child_counts(&group.target) - .into_iter() - .map(|(child, _)| child), - ); - } - } - } - Ok(bindings - .into_iter() - .map(|(ptr, entries)| { - let mut entries: Vec<_> = entries.into_iter().collect(); - entries.sort_unstable(); - (ptr, entries) - }) - .collect()) - } } /// Record `times` occurrences of `recurrence` against `ptr` — `times > 1` @@ -4790,12 +4815,12 @@ impl CandidateLogicalASAPDAGs { /// child always has `edge_count >= 1` in practice, but this keeps the /// helper correct regardless). fn contribute( - ptr: *const QueryExpr, + ptr: *const OperatorNode, times: usize, recurrence: RootRecurrence, - rates: &mut HashMap<*const QueryExpr, f64>, - one_shot_counts: &mut HashMap<*const QueryExpr, usize>, - reached: &mut HashSet<*const QueryExpr>, + rates: &mut HashMap<*const OperatorNode, f64>, + one_shot_counts: &mut HashMap<*const OperatorNode, usize>, + reached: &mut HashSet<*const OperatorNode>, ) { if times == 0 { return; @@ -4816,7 +4841,7 @@ fn contribute( /// [`CandidateLogicalASAPDAGs::cost_sorted`]. #[derive(Debug)] pub struct RankedTargetSubDAGCandidates<'a> { - pub target: &'a Rc, + pub target: &'a Rc, pub consumer_count: usize, pub candidates: Vec<&'a ReplacementSubDAG>, /// `costs[i]` is `candidates[i]`'s own grouping-state cost when available, @@ -4864,7 +4889,7 @@ fn rank_group<'a>( // estimate, compare N independent states with the shared grid directly. let target = TargetSubDAG::with_consumer_count(&group.target, group.consumer_count); let has_hydra = ranked.iter().any(|candidate| { - let Replacement::Summary(node) = &candidate.replacement else { + let Replacement::SubDAG(node) = &candidate.replacement else { return false; }; summary_grouping(node).is_some_and(|grouping| { @@ -4896,7 +4921,7 @@ fn rank_group<'a>( return ranked; } - // Shape 3: `SketchAlgorithmStrategy`'s sketch-family candidates (every + // Shape 3: `ASAPStrategies`'s sketch-family candidates (every // candidate is a `Summary` that realizes a `SketchAlgorithm`) — rank via // `CostModel::rank_candidates`, the same hook `realizations_for_intent` // itself consults. @@ -4904,16 +4929,16 @@ fn rank_group<'a>( let kinds: Option> = ranked .iter() .map(|c| match &c.replacement { - Replacement::Summary(node) => sketch_kind_of(node), - Replacement::Rewrite(_) | Replacement::ExactComposition(_) => None, + Replacement::SubDAG(node) => sketch_kind_of(node), + Replacement::ExactComposition(_) => None, }) .collect(); if let Some(kinds) = kinds { let order = crate::cost_model::validated_candidate_ranking(cost_model, intent, &kinds); ranked.sort_by_key(|c| { let kind = match &c.replacement { - Replacement::Summary(node) => sketch_kind_of(node), - Replacement::Rewrite(_) | Replacement::ExactComposition(_) => None, + Replacement::SubDAG(node) => sketch_kind_of(node), + Replacement::ExactComposition(_) => None, }; kind.and_then(|k| order.iter().position(|o| *o == k)) .unwrap_or(usize::MAX) @@ -4970,21 +4995,21 @@ fn cse_preference(group: &TargetSubDAGCandidates, cost_model: &dyn CostModel) -> }) } -/// [`cse_preference`] only needs one representative bound [`SummaryNode`] +/// [`cse_preference`] only needs one representative bound [`OperatorNode`] /// for `target` (to build a [`CseCandidate`] for /// [`CostModel::cse_share_decision`]), not the full ranked candidate list -/// [`SketchAlgorithmStrategy::replacements`] returns — so this just reuses +/// [`ASAPStrategies::replacements`] returns — so this just reuses /// [`realize_child`], the same rank-and-take-first helper /// `construct_summary_agg`'s own recursion and /// [`crate::cost_model::DefaultCostModel::estimate_cost`] already use, /// wrapped to swallow the (here, uninteresting) error into `None`. -fn realize_one(target: &Rc, cost_model: &dyn CostModel) -> Option> { +fn realize_one(target: &Rc, cost_model: &dyn CostModel) -> Option> { realize_child(target, cost_model).ok() } -/// The `SketchAlgorithm` a bound [`Replacement::Summary`] candidate ultimately +/// The `SketchAlgorithm` a bound [`Replacement::SubDAG`] candidate ultimately /// realizes, if any (`None` for an `ExactAggregate`/pass-through -/// `Summary` — nothing to rank against another `SketchAlgorithm`). +/// sub-DAG — nothing to rank against another `SketchAlgorithm`). /// /// Mirrors this module's own `#[cfg(test)]`-only `summary_family_algorithm` /// helper (in the test module below), which does the identical @@ -4993,23 +5018,27 @@ fn realize_one(target: &Rc, cost_model: &dyn CostModel) -> Option Option { - match &node.expr { - SummaryExpr::SummaryEstimate { summary_input, .. } => sketch_kind_of(summary_input), - SummaryExpr::SummaryAgg { +fn sketch_kind_of(node: &OperatorNode) -> Option { + match &node.operator { + Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) => { + sketch_kind_of(summary_input) + } + Operator::ASAP(ASAPOp::SummaryAgg { family: FieldDataType::Sketch(kind, _), .. - } => Some(kind.algorithm().clone()), + }) => Some(kind.algorithm().clone()), _ => None, } } /// The grouping strategy used by a bound summary candidate, unwrapping its -/// readout node when necessary. -fn summary_grouping(node: &SummaryNode) -> Option<&GroupingStrategy> { - match &node.expr { - SummaryExpr::SummaryEstimate { summary_input, .. } => summary_grouping(summary_input), - SummaryExpr::SummaryAgg { grouping, .. } => Some(grouping), +/// evaluation node when necessary. +fn summary_grouping(node: &OperatorNode) -> Option<&GroupingStrategy> { + match &node.operator { + Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) => { + summary_grouping(summary_input) + } + Operator::ASAP(ASAPOp::SummaryAgg { grouping, .. }) => Some(grouping), _ => None, } } @@ -5034,7 +5063,7 @@ fn summary_grouping(node: &SummaryNode) -> Option<&GroupingStrategy> { #[derive(Debug)] pub struct TargetSubDAGSelection<'a> { /// The target sub-DAG this selection is for. - pub target: &'a Rc, + pub target: &'a Rc, /// [`TargetSubDAGCandidates::consumer_count`] — how many operator-child positions /// directly reference `target`, ignoring every ancestor's own choice. pub consumer_count: usize, @@ -5065,18 +5094,18 @@ pub struct TargetSubDAGSelection<'a> { #[derive(Debug)] pub struct CompositionDecision<'a> { /// The exact child/operation pair validated by the search accuracy model. - pub plan: Rc, + pub plan: Rc, /// The child target the composed operator consumes. - pub child_target: &'a Rc, + pub child_target: &'a Rc, /// For a read-time operation: the child's own candidate committed alongside - /// (the summary readout the operator folds). `None` for an update-path + /// (the summary evaluation the operator folds). `None` for an update-path /// transform, whose input is raw update data — its cost is charged to /// the maintained summary *above* it instead. pub child_candidate: Option<&'a ReplacementSubDAG>, /// The composed plan's recurring rate — `read_operation_plan_cost_rate` /// or `maintenance_operation_plan_cost_rate`. pub cost_rate: CostRate, - /// `raw_recompute_cost_rate` — the `KeepPreAsap` baseline it beat. + /// `raw_recompute_cost_rate` — the kept-sub-DAG baseline it beat. pub baseline_rate: CostRate, /// The statistics (and their provenance) both rates were computed from. pub inputs: ExactCompositionCostInputs, @@ -5087,12 +5116,13 @@ pub struct CompositionDecision<'a> { /// [`CandidateLogicalASAPDAGs::cost_sorted`] use. #[derive(Debug)] pub struct GlobalSelection<'a> { - order: Vec<*const QueryExpr>, - groups: HashMap<*const QueryExpr, TargetSubDAGSelection<'a>>, + order: Vec<*const OperatorNode>, + groups: HashMap<*const OperatorNode, TargetSubDAGSelection<'a>>, /// [`Self::assemble_selected_dag`]'s memo — one bound node per target for the /// life of this selection, so two parents composing over one shared - /// child get the *same* `Rc`. - assembled_nodes: RefCell>>, + /// child get the *same* `Rc` (a kept pre-ASAP sub-DAG + /// shared by two parents stays one `Rc` the same way). + assembled_nodes: RefCell>>, } fn normalize_cross_input_equi_predicate( @@ -5100,15 +5130,17 @@ fn normalize_cross_input_equi_predicate( left_width: usize, total_width: usize, ) -> Option { - let QueryExpr::Compare { + let ScalarExpr::Compare { left, op: asap_types::pre_asap::CompareOpKind::Eq, right, - } = pred.0.as_ref() + semantics, + } = &pred.0 else { return None; }; - let (QueryExpr::Column(left_id), QueryExpr::Column(right_id)) = (left.as_ref(), right.as_ref()) + let (ScalarExpr::Column(left_id), ScalarExpr::Column(right_id)) = + (left.as_ref(), right.as_ref()) else { return None; }; @@ -5121,20 +5153,12 @@ fn normalize_cross_input_equi_predicate( } else { return None; }; - Some(Predicate(Rc::new(QueryExpr::Compare { - left: Rc::new(QueryExpr::Column(left_id)), + Some(Predicate(ScalarExpr::Compare { + left: Box::new(ScalarExpr::Column(left_id)), op: asap_types::pre_asap::CompareOpKind::Eq, - right: Rc::new(QueryExpr::Column(right_id)), - }))) -} - -fn relational_join_guarantee( - left: Option<&ResultGuarantee>, - right: Option<&ResultGuarantee>, -) -> Option { - left.zip(right) - .filter(|(left, right)| left.is_exact() && right.is_exact()) - .map(|_| ResultGuarantee::exact("RelationalJoin over exact inputs")) + right: Box::new(ScalarExpr::Column(right_id)), + semantics: *semantics, + })) } impl<'a> GlobalSelection<'a> { @@ -5146,62 +5170,69 @@ impl<'a> GlobalSelection<'a> { /// The selection for `target`, if `target`'s own `Rc` is a discovered /// site (i.e. `Rc::ptr_eq` to some node reachable from the workload's /// roots). - pub fn for_target(&self, target: &Rc) -> Option<&TargetSubDAGSelection<'a>> { + pub fn for_target(&self, target: &Rc) -> Option<&TargetSubDAGSelection<'a>> { self.groups.get(&Rc::as_ptr(target)) } /// Link this selection's per-site decisions into one data_state-validated /// post-ASAP DAG rooted at `target` — the one place a committed - /// composition's child *reference* becomes an actual `Rc` + /// composition's child *reference* becomes an actual `Rc` /// edge (issue #171). `None` if `target` is not a discovered site. /// /// Per site: a [`Replacement::ExactComposition`] uses its validated /// operation/child plan, retaining the search model's guarantee; - /// a [`Replacement::Summary`] is + /// a bound-summary [`Replacement::SubDAG`] is /// re-linked so its `SummaryAgg` child is the child target's own /// DAG assembly whenever that is phase-legal beneath maintenance /// (so a child that chose an `ValueOperationAtIngestionTime` actually ends up under - /// the summary); a [`Replacement::Rewrite`] or an unmatched site stays - /// the conservative `KeepPreAsap`. Memoized by target identity, so a - /// shared inner summary is one `Rc` no matter how many roots reach it. + /// the summary); a logical-rewrite [`Replacement::SubDAG`] is kept + /// as it is (exact); an unmatched site keeps its own operator with each + /// child assembled independently ([`Self::assemble_residual`]). + /// Memoized by target identity, so a shared inner summary is one `Rc` + /// no matter how many roots reach it. pub fn assemble_selected_dag( &self, - target: &Rc, - ) -> Result>, RealizationError> { + target: &Rc, + ) -> Result>, RealizationError> { if !self.groups.contains_key(&Rc::as_ptr(target)) { return Ok(None); } self.assemble_target(target).map(Some) } - /// Assemble a complete query result, including an exact-state readout when + /// Assemble a complete query result, including an exact-state evaluation when /// needed. `assemble_selected_dag` also serves internal state frontiers; /// callers exposing query results must use this boundary instead. pub fn assemble_selected_query( &self, - target: &Rc, - ) -> Result>, RealizationError> { + target: &Rc, + ) -> Result>, RealizationError> { self.assemble_selected_dag(target)? .map(|node| finalize_query_candidate(node, target)) .transpose() } - fn assemble_target(&self, target: &Rc) -> Result, RealizationError> { + fn assemble_target( + &self, + target: &Rc, + ) -> Result, RealizationError> { let ptr = Rc::as_ptr(target); if let Some(node) = self.assembled_nodes.borrow().get(&ptr) { return Ok(Rc::clone(node)); } // A selected summary that realizes its inner aggregate, instead of - // hiding it in `KeepPreAsap`, is kept; lifecycle assignment decides + // hiding it in `KeepPreAsap`, is kept; materialization assignment decides // whether it runs in precompute or at query time. let selected_composed_summary = self .groups .get(&ptr) .and_then(|sel| sel.chosen) - .is_some_and(|candidate| matches!(&candidate.replacement, - Replacement::Summary(node) if matches!(&node.expr, - SummaryExpr::SummaryAgg { child, .. } - if !matches!(&child.expr, SummaryExpr::KeepPreAsap(raw) if contains_aggregate(raw))))); + .is_some_and(|candidate| { + matches!(&candidate.replacement, + Replacement::SubDAG(node) if matches!(&node.operator, + Operator::ASAP(ASAPOp::SummaryAgg { child, .. }) + if child.contains_asap() || !contains_aggregate(child))) + }); let node = if query_time_nested_sum(target) && !selected_composed_summary { self.assemble_residual(target)? } else { @@ -5212,8 +5243,10 @@ impl<'a> GlobalSelection<'a> { .map(|c| &c.replacement) { None => self.assemble_residual(target)?, - Some(Replacement::Rewrite(rewritten)) => keep_pre_asap(rewritten)?, - Some(Replacement::Summary(node)) => self.relink_summary(node, target)?, + Some(Replacement::SubDAG(node)) if node.contains_asap() => { + self.relink_summary(node, target)? + } + Some(Replacement::SubDAG(kept)) => retain_exact(kept)?, Some(Replacement::ExactComposition(_)) => Rc::clone( &self.groups[&ptr] .composition @@ -5229,130 +5262,124 @@ impl<'a> GlobalSelection<'a> { Ok(node) } - /// Preserve composable query-time value operators in post-ASAP form even - /// when the operator itself has no summary realization. Its child is - /// assembled independently, so a selected summary remains visible - /// beneath `Project`/`Filter`/`Sort`/`Limit` instead of being swallowed by - /// one opaque `KeepPreAsap` sub-DAG. + /// Keep `target`'s own operator and assemble each child independently, + /// so a selected summary remains visible beneath a relational operator + /// that has no summary realization of its own instead of being + /// swallowed by one opaque kept sub-DAG. Every child that is a + /// discovered target is assembled (and finalized to query-time values); + /// any other child is kept as it is. The guarantee is composed from the + /// assembled children: all exact → exact; exactly one child → that + /// child's guarantee; otherwise unknown. An inner `Join` first has its + /// cross-input equi-predicate normalized; any other join is kept whole. fn assemble_residual( &self, - target: &Rc, - ) -> Result, RealizationError> { - if let QueryExpr::Join { + target: &Rc, + ) -> Result, RealizationError> { + if target.children().is_empty() { + // A leaf has nothing to assemble beneath it: keep it as it is. + return retain_exact(target); + } + let mut operator = target.operator.clone(); + if let Operator::NonASAP(NonASAPOp::Join { left, right, kind, pred, - } = target.as_ref() + }) = &mut operator { - let left_width = left.output_schema()?.fields.len(); - let total_width = left_width + right.output_schema()?.fields.len(); - let normalized_pred = matches!(kind, asap_types::pre_asap::JoinKind::Inner) + let left_width = left.schema.fields.len(); + let total_width = left_width + right.schema.fields.len(); + let normalized_pred = matches!(kind, JoinKind::Inner) .then(|| normalize_cross_input_equi_predicate(pred, left_width, total_width)) .flatten(); - let Some(pred) = normalized_pred else { - return keep_pre_asap(target); + let Some(normalized) = normalized_pred else { + return retain_exact(target); }; - let left = finalize_query_candidate(self.assemble_target(left)?, left)?; - let right = finalize_query_candidate(self.assemble_target(right)?, right)?; - let guarantee = - relational_join_guarantee(left.guarantee.as_ref(), right.guarantee.as_ref()); - let node = Rc::new(SummaryNode { - expr: SummaryExpr::RelationalJoin { - left, - right, - kind: kind.clone(), - pred, - pruning: None, - }, - schema: lift(&target.output_schema()?), - guarantee, - }); - validate_execution_data_states_at(&node, ExecutionDataState::QUERY_ROWS)?; - return Ok(node); + *pred = normalized; } - let (child_target, operation) = match target.as_ref() { - QueryExpr::Project { - cols, - qualifier, - child, - } => ( - child, - ValueOperation::Project { - cols: cols.clone(), - qualifier: qualifier.clone(), - }, - ), - QueryExpr::Filter { pred, child } => { - (child, ValueOperation::Filter { pred: pred.clone() }) + let mut failure = None; + let mut children = Vec::new(); + let operator = operator.map_children(|child| { + if failure.is_some() { + return Rc::clone(child); } - QueryExpr::Sort { - keys, - partition_by, - child, - } => ( - child, - ValueOperation::Sort { - keys: keys.clone(), - partition_by: partition_by.clone(), - }, - ), - QueryExpr::Limit { n, offset, child } => ( - child, - ValueOperation::Limit { - n: *n, - offset: *offset, - partition_by: match child.as_ref() { - QueryExpr::Sort { partition_by, .. } => partition_by.clone(), - _ => Default::default(), - }, - }, - ), - QueryExpr::Aggregate { - reduction, - measures, - output_names, - filters, - having, - child, - } if query_time_nested_sum(target) => ( - child, - ValueOperation::Exact(ExactOperation::Aggregate { - reduction: reduction.clone(), - measures: measures.clone(), - output_names: output_names.clone(), - filters: filters.clone(), - having: having.clone(), - }), - ), - _ => return keep_pre_asap(target), - }; - let child = finalize_query_candidate(self.assemble_target(child_target)?, child_target)?; - let guarantee = child.guarantee.clone(); - let node = Rc::new(SummaryNode { - expr: SummaryExpr::ValueOperation { - child, - operation, - timing: ExecutionTiming::QueryTime, - }, - schema: lift(&target.output_schema()?), - guarantee, + let assembled = if self.groups.contains_key(&Rc::as_ptr(child)) { + self.assemble_target(child) + .and_then(|node| finalize_query_candidate(node, child)) + } else { + Ok(Rc::clone(child)) + }; + match assembled { + Ok(node) => { + children.push(Rc::clone(&node)); + node + } + Err(error) => { + failure = Some(error); + Rc::clone(child) + } + } + }); + if let Some(error) = failure { + return Err(error); + } + // An operator that computes new values from its input rows has no + // sound accuracy composition over an approximate input (e.g. `max` + // over a quantile evaluation's rank error). Without a selected + // composition such a node stays an exact pre-ASAP sub-DAG; only the + // read-time nested SUM keeps its assembled children. + let computes_values = matches!( + target.non_asap(), + Some( + NonASAPOp::Aggregate { .. } + | NonASAPOp::BinaryOp { .. } + | NonASAPOp::SQLWindowFunc { .. } + ) + ) && !query_time_nested_sum(target); + let approximate_input = children.iter().any(|child| { + !child + .guarantee + .as_ref() + .is_some_and(ResultGuarantee::is_exact) }); - validate_execution_data_states_at(&node, ExecutionDataState::QUERY_ROWS)?; + if computes_values && approximate_input { + return retain_exact(target); + } + let guarantee = match children.as_slice() { + [child] => child.guarantee.clone(), + children + if children.iter().all(|child| { + child + .guarantee + .as_ref() + .is_some_and(ResultGuarantee::is_exact) + }) => + { + Some(ResultGuarantee::exact(format!( + "{} over exact inputs", + target.operator.kind_name() + ))) + } + _ => None, + }; + let node = Rc::new( + OperatorNode::with_schema(operator, target.schema.clone()).with_guarantee(guarantee), + ); + validate_maintained(&node, ExecutionTiming::QueryTime)?; Ok(node) } - /// Re-link a bound `Summary` candidate's `SummaryAgg` child to the + /// Re-link a bound summary candidate's `SummaryAgg` child to the /// child target's own DAG assembly when that is legal beneath /// maintenance; otherwise keep the candidate exactly as constructed. fn relink_summary( &self, - node: &Rc, - target: &Rc, - ) -> Result, RealizationError> { - let QueryExpr::Aggregate { + node: &Rc, + target: &Rc, + ) -> Result, RealizationError> { + let Some(NonASAPOp::Aggregate { child: pre_child, .. - } = target.as_ref() + }) = target.non_asap() else { return Ok(Rc::clone(node)); }; @@ -5377,16 +5404,16 @@ impl<'a> GlobalSelection<'a> { /// A mergeable outer SUM over a relationally wrapped aggregate is a read-time /// reduction of the inner summary values. Maintaining the outer SUM directly -/// would hide that inner temporal aggregate inside `KeepPreAsap` and lose its -/// independently selected summary. -fn query_time_nested_sum(target: &QueryExpr) -> bool { - let QueryExpr::Aggregate { +/// would hide that inner temporal aggregate inside one kept sub-DAG and lose +/// its independently selected summary. +fn query_time_nested_sum(target: &OperatorNode) -> bool { + let Some(NonASAPOp::Aggregate { measures, filters, having: None, child, .. - } = target + }) = target.non_asap() else { return false; }; @@ -5395,13 +5422,15 @@ fn query_time_nested_sum(target: &QueryExpr) -> bool { && contains_aggregate(child) } -fn contains_aggregate(expr: &QueryExpr) -> bool { - match expr { - QueryExpr::Aggregate { .. } => true, - QueryExpr::Project { child, .. } - | QueryExpr::Filter { child, .. } - | QueryExpr::Sort { child, .. } - | QueryExpr::Limit { child, .. } => contains_aggregate(child), +fn contains_aggregate(expr: &OperatorNode) -> bool { + match expr.non_asap() { + Some(NonASAPOp::Aggregate { .. }) => true, + Some( + NonASAPOp::Project { child, .. } + | NonASAPOp::Filter { child, .. } + | NonASAPOp::Sort { child, .. } + | NonASAPOp::Limit { child, .. }, + ) => contains_aggregate(child), _ => false, } } @@ -5409,50 +5438,55 @@ fn contains_aggregate(expr: &QueryExpr) -> bool { /// Rebuild `node` (a `SummaryAgg`, possibly under a `SummaryEstimate`) with /// `new_child` as the `SummaryAgg`'s child, if the result still validates /// as maintained state; otherwise return `node` unchanged. -fn relink_agg_child(node: &Rc, new_child: &Rc) -> Rc { - match &node.expr { - SummaryExpr::SummaryEstimate { +fn relink_agg_child(node: &Rc, new_child: &Rc) -> Rc { + match &node.operator { + Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, query, - } => { + }) => { let inner = relink_agg_child(summary_input, new_child); if Rc::ptr_eq(&inner, summary_input) { return Rc::clone(node); } - Rc::new(SummaryNode { - expr: SummaryExpr::SummaryEstimate { - summary_input: inner, - query: query.clone(), - }, - schema: node.schema.clone(), - guarantee: node.guarantee.clone(), - }) + std::rc::Rc::new( + OperatorNode::with_schema( + asap_types::ir::Operator::ASAP(ASAPOp::SummaryEstimate { + summary_input: inner, + query: query.clone(), + }), + node.schema.clone(), + ) + .with_guarantee(node.guarantee.clone()), + ) } - SummaryExpr::SummaryAgg { + Operator::ASAP(ASAPOp::SummaryAgg { child, family, input, reduction, grouping, filter, - } => { + }) => { if Rc::ptr_eq(child, new_child) { return Rc::clone(node); } - let rebuilt = Rc::new(SummaryNode { - expr: SummaryExpr::SummaryAgg { - child: Rc::clone(new_child), - family: family.clone(), - input: input.clone(), - reduction: reduction.clone(), - grouping: grouping.clone(), - filter: filter.clone(), - }, - schema: node.schema.clone(), - guarantee: node.guarantee.clone(), + // The same summary over a re-placed input keeps its coverage. + let rebuilt = std::rc::Rc::new(OperatorNode { + coverage: node.coverage.clone(), + ..OperatorNode::with_schema( + asap_types::ir::Operator::ASAP(ASAPOp::SummaryAgg { + child: Rc::clone(new_child), + family: family.clone(), + input: input.clone(), + reduction: reduction.clone(), + grouping: grouping.clone(), + filter: filter.clone(), + }), + node.schema.clone(), + ) + .with_guarantee(node.guarantee.clone()) }); - match validate_execution_data_states_at(&rebuilt, ExecutionDataState::INGESTION_SUMMARY) - { + match validate_maintained(&rebuilt, ExecutionTiming::IngestionTime) { Ok(_) => rebuilt, Err(_) => Rc::clone(node), } @@ -5461,13 +5495,15 @@ fn relink_agg_child(node: &Rc, new_child: &Rc) -> Rc) -> Option<&Rc> { - match &node.expr { - SummaryExpr::SummaryEstimate { summary_input, .. } => maintained_summary(summary_input), - SummaryExpr::SummaryAgg { .. } => Some(node), +fn maintained_summary(node: &Rc) -> Option<&Rc> { + match &node.operator { + Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) => { + maintained_summary(summary_input) + } + Operator::ASAP(ASAPOp::SummaryAgg { .. }) => Some(node), _ => None, } } @@ -5484,10 +5520,10 @@ struct CompositionContext { /// child target ptr → the child's candidate an ancestor's composition /// already committed to (a later parent must compose with the *same* /// one, and the child's own selection is forced to it). - committed_child: HashMap<*const QueryExpr, *const ReplacementSubDAG>, + committed_child: HashMap<*const OperatorNode, *const ReplacementSubDAG>, /// site ptr → the maintained `SummaryAgg` directly above it, when its - /// parent chose a bound `Summary` — what an `ValueOperationAtIngestionTime` here feeds. - maintaining_parent: HashMap<*const QueryExpr, Rc>, + /// parent chose a bound summary — what an `ValueOperationAtIngestionTime` here feeds. + maintaining_parent: HashMap<*const OperatorNode, Rc>, } /// One eligible composed alternative at a site, before the cheapest wins. @@ -5500,10 +5536,10 @@ struct CompositionOption<'a> { /// composed-plan rate is *known* and beats the raw-recompute baseline — /// costed against each compatible child candidate already in `CandidateLogicalASAPDAGs` /// (or the one an earlier parent committed). Unknown statistics yield no -/// option at all: the conservative `KeepPreAsap` path stays. +/// option at all: the conservative kept-sub-DAG path stays. fn composition_options<'a>( group: &'a TargetSubDAGCandidates, - groups: &'a HashMap<*const QueryExpr, TargetSubDAGCandidates>, + groups: &'a HashMap<*const OperatorNode, TargetSubDAGCandidates>, effective: usize, cost_model: &dyn CostModel, context: &CompositionContext, @@ -5522,7 +5558,7 @@ fn composition_options<'a>( continue; }; let already_committed = context.committed_child.get(&child_ptr).copied(); - let cost = |summary: &SummaryNode, shared: bool| { + let cost = |summary: &OperatorNode, shared: bool| { let request = ExactCompositionCostRequest { target: &group.target, composition, @@ -5558,10 +5594,10 @@ fn composition_options<'a>( if !is_automatically_selectable(child_candidate, cost_model) { continue; } - let Replacement::Summary(summary) = &child_candidate.replacement else { + let Replacement::SubDAG(summary) = &child_candidate.replacement else { continue; }; - if !composition.accepts_child(summary) { + if is_logical_rewrite(summary) || !composition.accepts_child(summary) { continue; } let Some(prepared) = plans.iter().find(|p| { @@ -5632,7 +5668,7 @@ impl CandidateLogicalASAPDAGs { /// Uncertified DDSketch ratios remain in [`CandidateLogicalASAPDAGs`] for downstream /// inspection but are not chosen automatically by this selector. pub fn global_selection(&self, cost_model: &dyn CostModel) -> GlobalSelection<'_> { - self.global_selection_impl(cost_model, None, None, None) + self.global_selection_impl(cost_model, None, None) .expect("structural global selection cannot produce a recurrence error") } @@ -5646,17 +5682,7 @@ impl CandidateLogicalASAPDAGs { profiles: &RecurrenceProfileMap, horizon: Option, ) -> Result, RecurrenceError> { - self.global_selection_impl(cost_model, Some(profiles), horizon, None) - } - - pub(crate) fn global_selection_with_candidate_costs( - &self, - cost_model: &dyn CostModel, - profiles: &RecurrenceProfileMap, - horizon: Option, - costs: &CandidateCostOverrides, - ) -> Result, RecurrenceError> { - self.global_selection_impl(cost_model, Some(profiles), horizon, Some(costs)) + self.global_selection_impl(cost_model, Some(profiles), horizon) } fn global_selection_impl( @@ -5664,14 +5690,13 @@ impl CandidateLogicalASAPDAGs { cost_model: &dyn CostModel, profiles: Option<&RecurrenceProfileMap>, horizon: Option, - candidate_costs: Option<&CandidateCostOverrides>, ) -> Result, RecurrenceError> { let dag = reference_dag(self); let topo = topological_order(&self.order, &dag); let mut effective_uses = dag.external_root_uses.clone(); - let mut chosen_share: HashMap<*const QueryExpr, ShareDecision> = HashMap::new(); - let mut groups: HashMap<*const QueryExpr, TargetSubDAGSelection<'_>> = HashMap::new(); + let mut chosen_share: HashMap<*const OperatorNode, ShareDecision> = HashMap::new(); + let mut groups: HashMap<*const OperatorNode, TargetSubDAGSelection<'_>> = HashMap::new(); let mut context = CompositionContext::default(); for ptr in &topo { @@ -5725,30 +5750,8 @@ impl CandidateLogicalASAPDAGs { } } - let lifecycle_choice = candidate_costs - .filter(|costs| costs.finalizes(&group.target)) - .map(|costs| { - let summary = group - .candidates - .iter() - .filter(|candidate| !is_composition_candidate(candidate)) - .filter(|candidate| is_automatically_selectable(candidate, cost_model)) - .filter_map(|candidate| { - costs - .get(&group.target, candidate) - .map(|cost| (candidate, cost)) - }) - .min_by(|(_, left), (_, right)| left.0.total_cmp(&right.0)); - match (summary, costs.raw(&group.target)) { - (Some((_, summary_cost)), Some(raw)) if raw.0 <= summary_cost.0 => None, - (Some((candidate, _)), _) => Some(candidate), - (None, _) => None, - } - }); - let complete_plan_choice = (!forced.is_some() && composed.is_none() - && lifecycle_choice.is_none() && cost_model.candidate_cost_covers_complete_plan()) .then(|| { let effective_target = TargetSubDAG::with_consumer_count(&group.target, effective); @@ -5788,8 +5791,6 @@ impl CandidateLogicalASAPDAGs { } else if let Some(option) = composed { composition_decision = Some(option.decision); Some(option.candidate) - } else if let Some(choice) = lifecycle_choice { - choice } else if cost_model.candidate_cost_covers_complete_plan() { complete_plan_choice } else if effective >= 2 && cse_candidate_pair(group).is_some() { @@ -5898,8 +5899,8 @@ impl CandidateLogicalASAPDAGs { // Record the maintained summary this site's bound candidate // builds, for a child that may compose an `ValueOperationAtIngestionTime` // beneath it. - if let (Some(Replacement::Summary(node)), QueryExpr::Aggregate { child, .. }) = - (chosen.map(|c| &c.replacement), group.target.as_ref()) + if let (Some(Replacement::SubDAG(node)), Some(NonASAPOp::Aggregate { child, .. })) = + (chosen.map(|c| &c.replacement), group.target.non_asap()) { if let Some(summary) = maintained_summary(node) { context @@ -5911,7 +5912,7 @@ impl CandidateLogicalASAPDAGs { let outgoing_multiplier = multiplier(*ptr, &effective_uses, &chosen_share); match chosen { Some(ReplacementSubDAG { - replacement: Replacement::Rewrite(source), + replacement: Replacement::SubDAG(source), provenance: ReplacementProvenance::AccuracyReconciliation, .. }) => { @@ -5924,8 +5925,10 @@ impl CandidateLogicalASAPDAGs { } _ => { let selected_rewrite = match chosen.map(|candidate| &candidate.replacement) { - Some(Replacement::Rewrite(rewrite)) => rewrite, - Some(Replacement::Summary(_) | Replacement::ExactComposition(_)) | None => { + Some(Replacement::SubDAG(rewrite)) if is_logical_rewrite(rewrite) => { + rewrite + } + Some(Replacement::SubDAG(_) | Replacement::ExactComposition(_)) | None => { &group.target } }; @@ -5991,9 +5994,9 @@ fn is_automatically_selectable(candidate: &ReplacementSubDAG, cost_model: &dyn C /// ancestor sits anywhere on the path from a root to a site — see the /// module docs' "Whole-plan (cross-group) selection" section. fn multiplier( - parent_ptr: *const QueryExpr, - effective_uses: &HashMap<*const QueryExpr, usize>, - chosen_share: &HashMap<*const QueryExpr, ShareDecision>, + parent_ptr: *const OperatorNode, + effective_uses: &HashMap<*const OperatorNode, usize>, + chosen_share: &HashMap<*const OperatorNode, ShareDecision>, ) -> usize { let effective = *effective_uses.get(&parent_ptr).expect( "topological_order guarantees a parent is processed (and its effective_consumer_count \ @@ -6017,7 +6020,7 @@ fn cse_candidate_pair( for candidate in &group.candidates { match candidate.provenance { ReplacementProvenance::CseShare => { - let Replacement::Rewrite(rc) = &candidate.replacement else { + let Replacement::SubDAG(rc) = &candidate.replacement else { return None; }; if !Rc::ptr_eq(rc, &group.target) || share.replace(candidate).is_some() { @@ -6025,7 +6028,7 @@ fn cse_candidate_pair( } } ReplacementProvenance::CseRecompute => { - let Replacement::Rewrite(rc) = &candidate.replacement else { + let Replacement::SubDAG(rc) = &candidate.replacement else { return None; }; if Rc::ptr_eq(rc, &group.target) @@ -6103,26 +6106,25 @@ fn pick_shared_sub_dag_candidate( /// The parent/child structure [`CandidateLogicalASAPDAGs::global_selection`]'s DP walks — /// built separately from [`discover_targets`]'s own `order`/`nodes`/`counts` /// maps (which only track *aggregate* reference counts, not per-parent -/// breakdown or direction) rather than extending that already-reviewed, -/// already-tested pass. Same "small duplicated traversal over reshaping -/// proven code" call as [`is_shared_subtree_group`]. +/// breakdown or direction). Selection needs per-parent edge counts to +/// distinguish shared producers from repeated uses within one consumer. struct ReferenceDAG { /// child ptr -> `(parent ptr, edge count from that one parent)`, for /// every direct operator-child edge in the relational-skeleton scope /// [`walk_children`] itself uses (an edge count above 1 happens when /// one parent references the same child from two different fields, /// e.g. a `Join`'s `left`/`right` both being the same `Rc`). - parents_of: HashMap<*const QueryExpr, Vec<(*const QueryExpr, usize)>>, + parents_of: HashMap<*const OperatorNode, Vec<(*const OperatorNode, usize)>>, /// parent ptr -> every distinct child ptr it directly references — the /// reverse of `parents_of`, for [`topological_order`]'s Kahn's-algorithm /// traversal. - children_of: HashMap<*const QueryExpr, Vec<*const QueryExpr>>, + children_of: HashMap<*const OperatorNode, Vec<*const OperatorNode>>, /// How many of the workload's own `roots` point directly at each node — /// a node's "external" use. Nothing inside the DAG decides this (it /// isn't a reference from another discovered site), so it's never /// subject to any ancestor's Share/Recompute choice — it's the base /// case [`CandidateLogicalASAPDAGs::global_selection`]'s recurrence starts from. - external_root_uses: HashMap<*const QueryExpr, usize>, + external_root_uses: HashMap<*const OperatorNode, usize>, } /// Build an ordering DAG containing every edge that could be selected: @@ -6145,7 +6147,10 @@ fn reference_dag(space: &CandidateLogicalASAPDAGs) -> ReferenceDAG { let group = &space.groups[ptr]; record_possible_edges(*ptr, &group.target, &mut dag); for candidate in &group.candidates { - if let Replacement::Rewrite(rewrite) = &candidate.replacement { + if let Replacement::SubDAG(rewrite) = &candidate.replacement { + if !is_logical_rewrite(rewrite) { + continue; + } if candidate.provenance == ReplacementProvenance::AccuracyReconciliation { add_edge(*ptr, Rc::as_ptr(rewrite), 1, &mut dag); } else { @@ -6161,8 +6166,8 @@ fn reference_dag(space: &CandidateLogicalASAPDAGs) -> ReferenceDAG { /// [`ReferenceDAG`]'s fields), retaining the greatest multiplicity seen /// when the target and alternative rewrites expose the same edge. fn add_edge( - parent_ptr: *const QueryExpr, - child_ptr: *const QueryExpr, + parent_ptr: *const OperatorNode, + child_ptr: *const OperatorNode, edge_count: usize, dag: &mut ReferenceDAG, ) { @@ -6177,7 +6182,11 @@ fn add_edge( } } -fn record_possible_edges(parent_ptr: *const QueryExpr, node: &QueryExpr, dag: &mut ReferenceDAG) { +fn record_possible_edges( + parent_ptr: *const OperatorNode, + node: &OperatorNode, + dag: &mut ReferenceDAG, +) { for (child_ptr, edge_count) in direct_child_counts(node) { add_edge(parent_ptr, child_ptr, edge_count, dag); } @@ -6185,8 +6194,8 @@ fn record_possible_edges(parent_ptr: *const QueryExpr, node: &QueryExpr, dag: &m /// Direct relational-skeleton children and their edge multiplicities. /// `Concat` is transparent, matching [`walk_children`]'s site scope. -fn direct_child_counts(node: &QueryExpr) -> Vec<(*const QueryExpr, usize)> { - fn push(children: &mut Vec<(*const QueryExpr, usize)>, child: &Rc) { +fn direct_child_counts(node: &OperatorNode) -> Vec<(*const OperatorNode, usize)> { + fn push(children: &mut Vec<(*const OperatorNode, usize)>, child: &Rc) { let ptr = Rc::as_ptr(child); match children.iter_mut().find(|(existing, _)| *existing == ptr) { Some((_, count)) => *count += 1, @@ -6194,57 +6203,19 @@ fn direct_child_counts(node: &QueryExpr) -> Vec<(*const QueryExpr, usize)> { } } - fn collect(node: &QueryExpr, children: &mut Vec<(*const QueryExpr, usize)>) { - use QueryExpr::*; - match node { - Scan { .. } | PromqlScalarBridge(_) | EvalTimestamp | CurrentTimestamp => {} - PromqlVectorFromScalar(c) | PromqlScalarFromVector(c) => { - push(children, c); - } - PromqlRelabel { child, .. } - | PromqlInfoEnrich { child, .. } - | PromqlSeriesSample { child, .. } - | Filter { child, .. } - | Project { child, .. } - | Aggregate { child, .. } - | Dedup { child, .. } - | PromqlSubquery { child, .. } - | TimeRange { child, .. } - | TimeShift { child, .. } - | SQLWindowFunc { child, .. } - | Sort { child, .. } - | Limit { child, .. } => { - push(children, child); - } - Concat { - children: concat_children, - .. - } => { - for c in concat_children { - collect(c, children); - } - } - Join { left, right, .. } | SetOp { left, right, .. } => { - push(children, left); - push(children, right); - } - BinaryOp { lhs, rhs, .. } => { - push(children, lhs); - push(children, rhs); + fn collect(node: &OperatorNode, children: &mut Vec<(*const OperatorNode, usize)>) { + if let Some(NonASAPOp::Concat { + children: concat_children, + .. + }) = node.non_asap() + { + for c in concat_children { + collect(c, children); } - Column(_) - | Literal(_) - | Compare { .. } - | BoolAnd(_) - | BoolOr(_) - | Not(_) - | IsNull(_) - | IsNotNull(_) - | Cast { .. } - | InList { .. } - | FunctionCall { .. } - | Arithmetic { .. } - | Case { .. } => {} + return; + } + for child in node.children() { + push(children, child); } } @@ -6260,14 +6231,17 @@ fn direct_child_counts(node: &QueryExpr) -> Vec<(*const QueryExpr, usize)> { /// different root paths can have a parent that's discovered *after* it (see /// this function's own test for a worked diamond example), which is exactly /// backwards for [`CandidateLogicalASAPDAGs::global_selection`]'s recurrence. -fn topological_order(order: &[*const QueryExpr], dag: &ReferenceDAG) -> Vec<*const QueryExpr> { - let mut in_degree: HashMap<*const QueryExpr, usize> = HashMap::new(); +fn topological_order( + order: &[*const OperatorNode], + dag: &ReferenceDAG, +) -> Vec<*const OperatorNode> { + let mut in_degree: HashMap<*const OperatorNode, usize> = HashMap::new(); for ptr in order { let degree = dag.parents_of.get(ptr).map(Vec::len).unwrap_or(0); in_degree.insert(*ptr, degree); } - let mut queue: VecDeque<*const QueryExpr> = order + let mut queue: VecDeque<*const OperatorNode> = order .iter() .copied() .filter(|ptr| in_degree[ptr] == 0) @@ -6291,9 +6265,9 @@ fn topological_order(order: &[*const QueryExpr], dag: &ReferenceDAG) -> Vec<*con assert_eq!( topo.len(), order.len(), - "topological_order: the discovered-site reference DAG has a cycle — every QueryExpr \ - node is built from Rc children, which can't form one, so this indicates a bug in \ - reference_dag rather than a real cyclic workload", + "topological_order: the discovered-site reference dag has a cycle — every \ + OperatorNode is built from Rc children, which can't form one, so this indicates a bug \ + in reference_dag rather than a real cyclic workload", ); topo } @@ -6319,13 +6293,13 @@ fn topological_order(order: &[*const QueryExpr], dag: &ReferenceDAG) -> Vec<*con /// the target itself) exactly like [`SharedSubDAGStrategy`], so it belongs /// in this list rather than being derived per-workload the way /// [`RollupStrategy`] is. Rewriting `avg` into `sum`/`count` upfront is what -/// lets [`SketchAlgorithmStrategy`] and [`SharedSubDAGStrategy`] see a +/// lets [`ASAPStrategies`] and [`SharedSubDAGStrategy`] see a /// mergeable accumulator to sketch or share at all — see that module's own /// doc comment for why a bare `avg` node otherwise never becomes a /// [`ReplacementStrategy`] target for anything. pub fn default_strategies() -> Vec> { vec![ - Box::new(SketchAlgorithmStrategy::default_cost_model()), + Box::new(ASAPStrategies::default_cost_model()), Box::new(HydraGroupingStrategy::default_cost_model()), Box::new(SharedSubDAGStrategy), Box::new(crate::rewrite::AvgToSumOverCountStrategy), @@ -6333,14 +6307,14 @@ pub fn default_strategies() -> Vec> { ] } -/// Like [`default_strategies`], but [`SketchAlgorithmStrategy`] ranks/binds via +/// Like [`default_strategies`], but [`ASAPStrategies`] ranks/binds via /// `cost_model` instead of the built-in [`DefaultCostModel`] — the same -/// customization point [`SketchAlgorithmStrategy::new`] itself offers. +/// customization point [`ASAPStrategies::new`] itself offers. pub fn default_strategies_with<'a>( cost_model: &'a dyn CostModel, ) -> Vec> { vec![ - Box::new(SketchAlgorithmStrategy::new(cost_model)), + Box::new(ASAPStrategies::new(cost_model)), Box::new(HydraGroupingStrategy::new(cost_model)), Box::new(SharedSubDAGStrategy), Box::new(crate::rewrite::SemanticEquivalentRewriteStrategy), @@ -6350,21 +6324,19 @@ pub fn default_strategies_with<'a>( /// Default context-free strategies with both deployment costing and typed /// planning-time accuracy evidence. This is the production counterpart of -/// constructing [`SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence`] and +/// constructing [`ASAPStrategies::new_with_planning_inputs_and_evidence`] and /// [`HydraGroupingStrategy::new_with_planning_inputs_and_evidence`] separately. pub fn default_strategies_with_evidence<'a>( cost_model: &'a dyn CostModel, evidence: &'a dyn AccuracyEvidenceProvider, ) -> Vec> { vec![ - Box::new( - SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence( - cost_model, - &DEFAULT_ACCURACY_MODEL, - &DEFAULT_ALLOCATOR, - evidence, - ), - ), + Box::new(ASAPStrategies::new_with_planning_inputs_and_evidence( + cost_model, + &DEFAULT_ACCURACY_MODEL, + &DEFAULT_ALLOCATOR, + evidence, + )), Box::new( HydraGroupingStrategy::new_with_planning_inputs_and_evidence( cost_model, @@ -6384,12 +6356,12 @@ pub fn default_strategies_with_evidence<'a>( /// Search a whole workload's pre-ASAP roots for every candidate replacement /// [`default_strategies`] can find, deduped into a [`CandidateLogicalASAPDAGs`]. Candidate /// *generation* uses the built-in [`DefaultCostModel`] (via -/// [`default_strategies`], the same way [`SketchAlgorithmStrategy::default_cost_model`] +/// [`default_strategies`], the same way [`ASAPStrategies::default_cost_model`] /// does); call [`CandidateLogicalASAPDAGs::cost_sorted`] on the result for the final /// `sorted_by(cost_model)` step. Use [`search_workload_with`] to plug in a /// custom strategy set (e.g. built via [`default_strategies_with`] for a /// deployment-specific [`CostModel`]). -pub fn search_workload(roots: Vec<(Id, Rc)>) -> CandidateLogicalASAPDAGs { +pub fn search_workload(roots: Vec<(Id, Rc)>) -> CandidateLogicalASAPDAGs { search_workload_with(roots, &default_strategies()) } @@ -6409,10 +6381,10 @@ pub fn search_workload(roots: Vec<(Id, Rc)>) -> CandidateLogicalA /// section). Deduping candidate plans this way needs no /// [`CostModel`] at all — that only enters at two well-defined points: each /// [`ReplacementStrategy`] in `strategies` may already carry its own (e.g. -/// [`SketchAlgorithmStrategy::new`]'s), and [`CandidateLogicalASAPDAGs::cost_sorted`]'s final +/// [`ASAPStrategies::new`]'s), and [`CandidateLogicalASAPDAGs::cost_sorted`]'s final /// ranking step takes one explicitly. pub fn search_workload_with<'s, Id>( - roots: Vec<(Id, Rc)>, + roots: Vec<(Id, Rc)>, strategies: &[Box], ) -> CandidateLogicalASAPDAGs { let mut space = search_cse_workload_with(cse_workload(roots), strategies); @@ -6423,7 +6395,7 @@ pub fn search_workload_with<'s, Id>( /// [`search_workload_with`] plus a per-root end-to-end `AccuracyTarget` /// (issue #172) — the workload's `QueryRequirements.accuracy`, threaded /// alongside each root. After the search, every root that carries a target -/// has its group's bound [`Replacement::Summary`] candidates checked with +/// has its group's bound-summary [`Replacement::SubDAG`] candidates checked with /// `accuracy_model`'s [`AccuracyModel::satisfies`]: a candidate whose /// guarantee is fully known and misses the target is moved from /// [`TargetSubDAGCandidates::candidates`] to [`TargetSubDAGCandidates::rejected`] *before* @@ -6431,16 +6403,16 @@ pub fn search_workload_with<'s, Id>( /// group. A constructible candidate with unknown accuracy remains visible for /// downstream review under an approximate target, but default whole-plan /// selection does not commit it. An exact target cannot accept an unknown -/// approximate summary. A `KeepPreAsap` candidate is +/// approximate summary. A kept pre-ASAP candidate is /// exact and always survives — the raw/pre-ASAP alternative is what an -/// unsatisfiable root keeps. Logical [`Replacement::Rewrite`] candidates -/// are not bound values and are left alone; the targets *inside* a rewrite -/// are their own groups. +/// unsatisfiable root keeps. Logical-rewrite [`Replacement::SubDAG`] +/// candidates are not bound values and are left alone; the targets *inside* +/// a rewrite are their own groups. /// /// Precedence against per-node `AggIntent.accuracy` is documented in /// [`crate::accuracy`]'s module docs. pub fn search_workload_with_targets<'s, Id>( - roots: Vec<(Id, Rc, Option)>, + roots: Vec<(Id, Rc, Option)>, strategies: &[Box], accuracy_model: &dyn AccuracyModel, ) -> CandidateLogicalASAPDAGs { @@ -6454,7 +6426,7 @@ pub fn search_workload_with_targets<'s, Id>( .collect(); let mut space = search_cse_workload_with(cse_workload(roots), strategies); // `cse_workload` preserves root order, so targets zip by position. - let root_ptrs: Vec<(*const QueryExpr, AccuracyTarget)> = space + let root_ptrs: Vec<(*const OperatorNode, AccuracyTarget)> = space .roots .iter() .zip(targets) @@ -6496,11 +6468,11 @@ pub fn search_workload_with_targets<'s, Id>( .candidates .drain(..) .partition(|candidate| match &candidate.replacement { - Replacement::Summary(node) => node.guarantee.as_ref().map_or_else( + Replacement::SubDAG(node) if is_logical_rewrite(node) => true, + Replacement::SubDAG(node) => node.guarantee.as_ref().map_or_else( || !matches!(target, AccuracyTarget::Exact), |g| accuracy_model.satisfies(&g.optimistic_floor(), &target), ), - Replacement::Rewrite(_) => true, // A composition's guarantee depends on the concrete child; // prepare_compositions checks those pairs after all roots. Replacement::ExactComposition(_) => true, @@ -6508,7 +6480,7 @@ pub fn search_workload_with_targets<'s, Id>( group.candidates = legal; group.rejected.extend(illegal.into_iter().map(|candidate| { let (metric, bound, failure_probability) = match &candidate.replacement { - Replacement::Summary(node) => node + Replacement::SubDAG(node) => node .guarantee .as_ref() .map(|g| { @@ -6523,7 +6495,6 @@ pub fn search_workload_with_targets<'s, Id>( None, None, )), - Replacement::Rewrite(_) => unreachable!("rewrites are never rejected here"), Replacement::ExactComposition(_) => ( asap_types::post_asap::ErrorMetric::AbsoluteValue, None, @@ -6548,22 +6519,22 @@ pub fn search_workload_with_targets<'s, Id>( /// The strictest accuracy among `siblings` that read the same summary input /// as `root` — same child, grouping and filters, and the same intent apart -/// from its accuracy (and a quantile's rank, a readout parameter) — when +/// from its accuracy (and a quantile's rank, a evaluation parameter) — when /// stricter than `root`'s own. One summary sized for the strictest consumer /// serves every sibling: #509's summary-capability rule. fn strictest_sibling_accuracy( - root: &QueryExpr, - siblings: &[Rc], + root: &OperatorNode, + siblings: &[Rc], ) -> Option { fn approximate(intent: &AggIntent) -> Option<&AccuracyTarget> { accuracy_target(intent).filter(|accuracy| !matches!(accuracy, AccuracyTarget::Exact)) } - let QueryExpr::Aggregate { + let Some(NonASAPOp::Aggregate { reduction, filters, child, .. - } = root + }) = root.non_asap() else { return None; }; @@ -6571,12 +6542,12 @@ fn strictest_sibling_accuracy( let own = accuracy_budget(approximate(intent)?); let (mut eps, mut delta) = own; for sibling in siblings { - let QueryExpr::Aggregate { + let Some(NonASAPOp::Aggregate { reduction: sibling_reduction, filters: sibling_filters, child: sibling_child, .. - } = sibling.as_ref() + }) = sibling.non_asap() else { continue; }; @@ -6614,48 +6585,45 @@ fn strictest_sibling_accuracy( } } -fn cse_workload(roots: Vec<(Id, Rc)>) -> Vec<(Id, Rc)> { - // `share_common_sub_dags` wants owned `QueryExpr`s, not already-`Rc` - // roots — the same `Rc::try_unwrap`-with-clone-fallback pattern - // `asap_types::pre_asap::cse::intern_child` itself uses to recover an - // owned node without cloning in the common (uniquely-owned) case. - let owned_roots: Vec<(Id, QueryExpr)> = roots - .into_iter() - .map(|(id, rc)| { - let expr = Rc::try_unwrap(rc).unwrap_or_else(|shared| (*shared).clone()); - (id, expr) - }) - .collect(); - share_common_sub_dags(owned_roots) +fn cse_workload(roots: Vec<(Id, Rc)>) -> Vec<(Id, Rc)> { + share_common_sub_dags(roots) } fn search_cse_workload_with<'s, Id>( - cse_roots: Vec<(Id, Rc)>, + cse_roots: Vec<(Id, Rc)>, strategies: &[Box], ) -> CandidateLogicalASAPDAGs { + for (_, root) in &cse_roots { + assert!( + !root.contains_asap(), + "search_workload: a workload root already contains an ASAP operator \ + ({}); replacement search takes the front end's pre-ASAP DAG only", + root.operator.kind_name() + ); + } let mut order = Vec::new(); let mut nodes = HashMap::new(); - let mut counts: HashMap<*const QueryExpr, usize> = HashMap::new(); + let mut counts: HashMap<*const OperatorNode, usize> = HashMap::new(); discover_targets(&cse_roots, &mut order, &mut nodes, &mut counts); - let siblings: Vec> = order + let siblings: Vec> = order .iter() .filter_map(|ptr| { let node = &nodes[ptr]; - matches!(node.as_ref(), QueryExpr::Aggregate { .. }).then(|| Rc::clone(node)) + matches!(node.non_asap(), Some(NonASAPOp::Aggregate { .. })).then(|| Rc::clone(node)) }) .collect(); let rollup_strategy = RollupStrategy::new(&siblings); let accuracy_reconciliation_strategy = AccuracyReconciliationStrategy::new(&siblings); - let limits: Vec> = order + let limits: Vec> = order .iter() .filter_map(|ptr| { let node = &nodes[ptr]; - matches!(node.as_ref(), QueryExpr::Limit { .. }).then(|| Rc::clone(node)) + matches!(node.non_asap(), Some(NonASAPOp::Limit { .. })).then(|| Rc::clone(node)) }) .collect(); let topk_reuse_strategy = TopKLimitReuseStrategy::new(&limits); - let mut groups: HashMap<*const QueryExpr, TargetSubDAGCandidates> = HashMap::new(); + let mut groups: HashMap<*const OperatorNode, TargetSubDAGCandidates> = HashMap::new(); for ptr in &order { groups.insert( *ptr, @@ -6678,7 +6646,7 @@ fn search_cse_workload_with<'s, Id>( "search_workload: fixpoint search did not converge within {MAX_SEARCH_ITERATIONS} \ rounds — a registered ReplacementStrategy's Replacement::Rewrite candidates keep \ exposing new, never-before-seen descendant structure every round. \ - SketchAlgorithmStrategy/SharedSubDAGStrategy never do this (see replacement.rs's \ + ASAPStrategies/SharedSubDAGStrategy never do this (see replacement.rs's \ module docs' \"Termination\" section); check any custom strategies passed to \ search_workload_with.", ); @@ -6741,8 +6709,10 @@ fn search_cse_workload_with<'s, Id>( } for candidate in &proposed { - if let Replacement::Rewrite(rc) = &candidate.replacement { - discover_new_descendant_targets(rc, &mut order, &mut nodes, &mut counts); + if let Replacement::SubDAG(rc) = &candidate.replacement { + if is_logical_rewrite(rc) { + discover_new_descendant_targets(rc, &mut order, &mut nodes, &mut counts); + } } } @@ -6782,10 +6752,11 @@ fn search_cse_workload_with<'s, Id>( /// ancestor is recomputed. We only do this when an ordinary repeated group /// proves that `SharedSubDAGStrategy` is part of this search's strategy set. fn add_effective_count_cse_candidates( - order: &[*const QueryExpr], - groups: &mut HashMap<*const QueryExpr, TargetSubDAGCandidates>, + order: &[*const OperatorNode], + groups: &mut HashMap<*const OperatorNode, TargetSubDAGCandidates>, ) { - let mut possible_children: HashMap<*const QueryExpr, Vec<*const QueryExpr>> = HashMap::new(); + let mut possible_children: HashMap<*const OperatorNode, Vec<*const OperatorNode>> = + HashMap::new(); for ptr in order { let group = &groups[ptr]; let children = possible_children.entry(*ptr).or_default(); @@ -6795,7 +6766,10 @@ fn add_effective_count_cse_candidates( } } for candidate in &group.candidates { - if let Replacement::Rewrite(rewrite) = &candidate.replacement { + if let Replacement::SubDAG(rewrite) = &candidate.replacement { + if !is_logical_rewrite(rewrite) { + continue; + } for (child, _) in direct_child_counts(rewrite) { if !children.contains(&child) { children.push(child); @@ -6853,10 +6827,10 @@ fn add_effective_count_cse_candidates( /// `Rc` and its real `consumer_count` — see the module docs' "Where /// `TargetSubDAG` discovery comes from" section for the full rationale. fn discover_targets( - roots: &[(Id, Rc)], - order: &mut Vec<*const QueryExpr>, - nodes: &mut HashMap<*const QueryExpr, Rc>, - counts: &mut HashMap<*const QueryExpr, usize>, + roots: &[(Id, Rc)], + order: &mut Vec<*const OperatorNode>, + nodes: &mut HashMap<*const OperatorNode, Rc>, + counts: &mut HashMap<*const OperatorNode, usize>, ) { for (_, root) in roots { walk(root, order, nodes, counts); @@ -6865,17 +6839,17 @@ fn discover_targets( /// Scan `candidate`'s **children** (deliberately never `candidate`'s own /// top-level pointer — see the module docs' "Termination" section: a -/// [`Replacement::Rewrite`]'s value is an alternative *for* the target that +/// logical rewrite's value is an alternative *for* the target that /// proposed it, never a new target of its own) for any `Rc` not already /// known, appending each to `order`/`nodes`/`counts` so /// [`search_workload_with`]'s next round processes it. A no-op when every /// child is already known — the case both shipped strategies always produce /// (see that section). fn discover_new_descendant_targets( - candidate: &Rc, - order: &mut Vec<*const QueryExpr>, - nodes: &mut HashMap<*const QueryExpr, Rc>, - counts: &mut HashMap<*const QueryExpr, usize>, + candidate: &Rc, + order: &mut Vec<*const OperatorNode>, + nodes: &mut HashMap<*const OperatorNode, Rc>, + counts: &mut HashMap<*const OperatorNode, usize>, ) { walk_children(candidate, order, nodes, counts); } @@ -6883,10 +6857,10 @@ fn discover_new_descendant_targets( /// Visit `node`: count this occurrence, and — the first time this exact /// `Rc` is seen — record it as a target and recurse into its children. fn walk( - node: &Rc, - order: &mut Vec<*const QueryExpr>, - nodes: &mut HashMap<*const QueryExpr, Rc>, - counts: &mut HashMap<*const QueryExpr, usize>, + node: &Rc, + order: &mut Vec<*const OperatorNode>, + nodes: &mut HashMap<*const OperatorNode, Rc>, + counts: &mut HashMap<*const OperatorNode, usize>, ) { let ptr = Rc::as_ptr(node); let already_visited = counts.contains_key(&ptr); @@ -6898,61 +6872,25 @@ fn walk( } } -/// `node`'s own **relational-skeleton** operator children — the same scope -/// `asap_types::pre_asap::cse::share_common_sub_dags`/`rebuild_children` -/// itself uses (see that module's "Algorithm" section) and -/// `tests::count_consumers` mirrors for its own fixtures. Exhaustive over -/// every `QueryExpr` variant: a new variant fails to compile here until this -/// match is extended too. +/// `node`'s own operator children ([`OperatorNode::children`]: operator +/// inputs plus the operator nodes its scalar expressions read), the same +/// scope `asap_types::ir::cse::share_common_sub_dags` itself uses and +/// `tests::count_consumers` mirrors for its own fixtures. `Concat` is +/// transparent: its branches are walked in place of it. fn walk_children( - node: &QueryExpr, - order: &mut Vec<*const QueryExpr>, - nodes: &mut HashMap<*const QueryExpr, Rc>, - counts: &mut HashMap<*const QueryExpr, usize>, + node: &OperatorNode, + order: &mut Vec<*const OperatorNode>, + nodes: &mut HashMap<*const OperatorNode, Rc>, + counts: &mut HashMap<*const OperatorNode, usize>, ) { - use QueryExpr::*; - match node { - Scan { .. } | PromqlScalarBridge(_) | EvalTimestamp | CurrentTimestamp => {} - PromqlVectorFromScalar(c) | PromqlScalarFromVector(c) => walk(c, order, nodes, counts), - PromqlRelabel { child, .. } - | PromqlInfoEnrich { child, .. } - | PromqlSeriesSample { child, .. } - | Filter { child, .. } - | Project { child, .. } - | Aggregate { child, .. } - | Dedup { child, .. } - | PromqlSubquery { child, .. } - | TimeRange { child, .. } - | TimeShift { child, .. } - | SQLWindowFunc { child, .. } - | Sort { child, .. } - | Limit { child, .. } => walk(child, order, nodes, counts), - Concat { children, .. } => { - for c in children { - walk_children(c, order, nodes, counts); - } - } - Join { left, right, .. } | SetOp { left, right, .. } => { - walk(left, order, nodes, counts); - walk(right, order, nodes, counts); - } - BinaryOp { lhs, rhs, .. } => { - walk(lhs, order, nodes, counts); - walk(rhs, order, nodes, counts); - } - Column(_) - | Literal(_) - | Compare { .. } - | BoolAnd(_) - | BoolOr(_) - | Not(_) - | IsNull(_) - | IsNotNull(_) - | Cast { .. } - | InList { .. } - | FunctionCall { .. } - | Arithmetic { .. } - | Case { .. } => {} + if let Some(NonASAPOp::Concat { children, .. }) = node.non_asap() { + for c in children { + walk_children(c, order, nodes, counts); + } + return; + } + for child in node.children() { + walk(child, order, nodes, counts); } } @@ -6961,17 +6899,19 @@ mod tests { use super::*; use crate::accuracy::PropagationStats; use crate::cost_model::Cost; - use crate::test_support::lower_promql; + use crate::test_support::{agg, agg_per_entity, lower_promql, maintained, metric_scan, timed}; + use asap_types::ir::operator_properties::{Reduction as ReductionTy, Source}; + use asap_types::ir::TimeRangeKind; use asap_types::pre_asap::agg_intent::{ agg_is_exact, default_cardinality, default_quantile, MathFunc, TimeFunc, }; - use asap_types::pre_asap::query_expr::{Reduction as ReductionTy, Source}; use asap_types::pre_asap::schema::{DataType, Field, Schema as SchemaTy}; + use asap_types::types::AccuracyTarget; use std::collections::HashMap; // Candidate shape without execution timing: what is computed, not where. - fn timing_free_shape(node: &Rc) -> serde_json::Value { + fn timing_free_shape(node: &Rc) -> serde_json::Value { fn strip(value: &mut serde_json::Value) { match value { serde_json::Value::Object(fields) => { @@ -6982,9 +6922,10 @@ mod tests { _ => {} } } - let mut shape = - serde_json::to_value(asap_types::post_asap::compile_post_asap_dag(node).unwrap()) - .unwrap(); + let mut shape = serde_json::to_value( + asap_types::ir::export::compile_physical_asap_dag(&timed(node)).unwrap(), + ) + .unwrap(); strip(&mut shape); shape } @@ -6996,7 +6937,7 @@ mod tests { ("sum by(job)(rate(m[1m]))", AccuracyTarget::Exact), ("topk by(job)(2, rate(m[1m]))", AccuracyTarget::Epsilon(0.1)), ] { - let root = Rc::new(lower_promql(query, accuracy)); + let root = lower_promql(query, accuracy); let inventory = search_workload(vec![(0usize, root)]) .enumerate_candidate_dags(4096) .unwrap(); @@ -7011,37 +6952,32 @@ mod tests { } } - // Grouped Sum over Rate readouts stays a summary state in the inventory, - // so lifecycle assignment can place it in precompute or at query time. + // Grouped Sum over Rate evaluations stays a summary state in the inventory, + // so materialization assignment can place it in precompute or at query time. #[test] - fn grouped_rate_sum_inventory_keeps_sum_state_for_lifecycle_placement() { - let root = Rc::new(lower_promql( - "sum by(job)(rate(m[1m]))", - AccuracyTarget::Exact, - )); + fn grouped_rate_sum_inventory_keeps_sum_state_for_materialization_placement() { + let root = lower_promql("sum by(job)(rate(m[1m]))", AccuracyTarget::Exact); let inventory = search_workload(vec![(0usize, root)]) .enumerate_candidate_dags(4096) .unwrap(); - let is_exact = |node: &SummaryNode, kind: ExactKind| { - matches!(&node.expr, SummaryExpr::SummaryAgg { + let is_exact = |node: &OperatorNode, kind: ExactKind| { + matches!(&node.operator, Operator::ASAP(ASAPOp::SummaryAgg { family: FieldDataType::ExactAggregate(k, _), .. - } if *k == kind) + }) if *k == kind) }; assert!(inventory.candidates.iter().any(|forest| { - let SummaryExpr::ValueOperation { child: sum, .. } = &forest[0].1.expr else { + let Operator::ASAP(ASAPOp::FinalizeExactAccumulator { child: sum }) = &forest[0].1.operator else { return false; }; - let SummaryExpr::SummaryAgg { child: rate, .. } = &sum.expr else { + let Operator::ASAP(ASAPOp::SummaryAgg { child: rate, .. }) = &sum.operator else { return false; }; is_exact(sum, ExactKind::Sum) - && matches!(&rate.expr, SummaryExpr::ValueOperation { - child, operation: ValueOperation::FinalizeExactAccumulator, .. - } if is_exact(child, ExactKind::Rate)) + && matches!(&rate.operator, Operator::ASAP(ASAPOp::FinalizeExactAccumulator { child }) if is_exact(child, ExactKind::Rate)) })); } - // Every exposed query result has a readout; internal accumulator frontiers stay states. + // Every exposed query result has a evaluation; internal accumulator frontiers stay states. #[test] fn query_candidate_roots_do_not_leak_exact_accumulator_state() { for query in [ @@ -7049,13 +6985,13 @@ mod tests { "sum by(job)(m)", "sum_over_time(m[1m])", ] { - let root = Rc::new(lower_promql(query, AccuracyTarget::Exact)); + let root = lower_promql(query, AccuracyTarget::Exact); let space = search_workload(vec![(0usize, root.clone())]); let inventory = space.enumerate_candidate_dags(4096).unwrap(); assert!(!inventory.candidates.is_empty()); - let strategy = SketchAlgorithmStrategy::new(&DefaultCostModel); + let strategy = ASAPStrategies::new(&DefaultCostModel); for candidate in strategy.propose(&TargetSubDAG::new(&root)).candidates { - if let Replacement::Summary(node) = candidate.replacement { + if let Replacement::SubDAG(node) = candidate.replacement { let output = finalize_query_candidate(node, &root).unwrap(); assert!( output @@ -7092,7 +7028,7 @@ mod tests { #[test] fn unpriced_inventory_retains_quantile_families_and_raw_execution() { - let query = Rc::new(agg(vec![2], default_quantile(0.9), metric_scan(&["job"]))); + let query = agg(vec![2], default_quantile(0.9), metric_scan(&["job"])); let space = search_workload(vec![(0usize, query)]); let inventory = space.enumerate_candidate_dags(4096).unwrap(); let roots = inventory @@ -7105,7 +7041,7 @@ mod tests { assert!(inventory .candidates .iter() - .any(|forest| matches!(forest[0].1.expr, SummaryExpr::KeepPreAsap(_)))); + .any(|forest| !forest[0].1.contains_asap())); } // Independent roots must not require materializing their Cartesian product. @@ -7115,11 +7051,11 @@ mod tests { .map(|id| { ( id, - Rc::new(agg( + agg( vec![2], default_quantile((id + 1) as f64 / 25.0), metric_scan(&["job"]), - )), + ), ) }) .collect(); @@ -7141,7 +7077,7 @@ mod tests { assert!(inventory .candidates .iter() - .any(|forest| matches!(forest[0].1.expr, SummaryExpr::KeepPreAsap(_)))); + .any(|forest| !forest[0].1.contains_asap())); } assert!(space.enumerate_candidate_dags_for_root(&24, 4096).is_err()); assert!(space.enumerate_candidate_dags_for_root(&0, 0).is_err()); @@ -7154,11 +7090,11 @@ mod tests { .map(|id| { ( id, - Rc::new(agg( + agg( vec![2], default_quantile(0.5 + id as f64 * 0.4), metric_scan(&["job"]), - )), + ), ) }) .collect(); @@ -7180,30 +7116,31 @@ mod tests { #[test] fn inventory_budget_never_returns_a_silent_partial_search() { - let query = Rc::new(agg(vec![2], default_quantile(0.9), metric_scan(&["job"]))); + let query = agg(vec![2], default_quantile(0.9), metric_scan(&["job"])); let space = search_workload(vec![(0usize, query)]); assert!(space.enumerate_candidate_dags(0).is_err()); } fn equi_pred(left: ColumnId, right: ColumnId) -> Predicate { - Predicate(Rc::new(QueryExpr::Compare { - left: Rc::new(QueryExpr::Column(left)), + Predicate(ScalarExpr::Compare { + left: Box::new(ScalarExpr::Column(left)), op: asap_types::pre_asap::CompareOpKind::Eq, - right: Rc::new(QueryExpr::Column(right)), - })) + right: Box::new(ScalarExpr::Column(right)), + semantics: asap_types::ir::ExprSemantics::Sql, + }) } // Finite samples can overflow a sum although their native average is finite. #[test] fn temporal_average_requires_finite_division_guard() { - let root = Rc::new(lower_promql("avg_over_time(a[5m])", AccuracyTarget::Exact)); + let root = lower_promql("avg_over_time(a[5m])", AccuracyTarget::Exact); let candidates = - SketchAlgorithmStrategy::default_cost_model().replacements(&TargetSubDAG::new(&root)); + ASAPStrategies::default_cost_model().replacements(&TargetSubDAG::new(&root)); let operator = candidates .iter() .find_map(|c| match &c.replacement { - Replacement::Summary(node) => match &node.expr { - SummaryExpr::BinaryOp { operator, .. } => Some(operator), + Replacement::SubDAG(node) => match &node.operator { + Operator::NonASAP(NonASAPOp::BinaryOp { operator, .. }) => Some(operator), _ => None, }, _ => None, @@ -7221,20 +7158,20 @@ mod tests { // Approximate requests also admit exact temporal ranking candidates. #[test] fn approximate_temporal_topk_admits_exact_maintained_values() { - let root = Rc::new(lower_promql( + let root = lower_promql( "topk by(job)(1,count_over_time(a[5m]))", AccuracyTarget::EpsilonDelta { epsilon: 0.01, delta: 0.01, }, - )); + ); let planning_inputs = CandidatePlanningInputs::with_default_accuracy(&crate::cost_model::DefaultCostModel); let node = exact_topk_over_temporal_values(&root, planning_inputs) .unwrap() .expect("exact ranking is legal for an approximate request"); assert!(node.guarantee.as_ref().unwrap().is_exact()); - asap_types::post_asap::compile_post_asap_dag(&node).unwrap(); + crate::test_support::time_and_export(&node).unwrap(); } // Exact Top-K consumes the Planner's maintained temporal values. @@ -7244,7 +7181,7 @@ mod tests { "topk(5, sum_over_time(a[5m]))", "topk by(job)(5, count_over_time(a[5m]))", ] { - let root = Rc::new(lower_promql(query, AccuracyTarget::Exact)); + let root = lower_promql(query, AccuracyTarget::Exact); let planning_inputs = CandidatePlanningInputs::with_default_accuracy( &crate::cost_model::DefaultCostModel, ); @@ -7252,29 +7189,21 @@ mod tests { .unwrap() .expect("exact Top-K candidate"); assert!(node.guarantee.as_ref().unwrap().is_exact()); - let SummaryExpr::ValueOperation { + let Operator::NonASAP(NonASAPOp::Limit { child: sorted, - operation: - ValueOperation::Limit { - n, - offset, - partition_by, - }, - .. - } = &node.expr + n, + offset, + partition_by, + }) = &node.operator else { panic!("temporal TopK must compose Sort and Limit"); }; - assert_eq!((*n, *offset), (5, 0)); - let SummaryExpr::ValueOperation { - operation: - ValueOperation::Sort { - keys, - partition_by: sort_groups, - }, + assert_eq!((*n, *offset), (Some(5), 0)); + let Operator::NonASAP(NonASAPOp::Sort { + keys, + partition_by: sort_groups, child: values, - .. - } = &sorted.expr + }) = &sorted.operator else { panic!("Limit must consume sorted temporal values"); }; @@ -7286,7 +7215,7 @@ mod tests { assert_eq!(keys.len(), 1); assert!(!keys[0].ascending); assert_eq!(node.schema, values.schema); - asap_types::post_asap::compile_post_asap_dag(&node).unwrap(); + crate::test_support::time_and_export(&node).unwrap(); } } @@ -7297,7 +7226,7 @@ mod tests { impl AccuracyEvidenceProvider for Domain { fn quantile_input_domain( &self, - _: &QueryExpr, + _: &OperatorNode, ) -> Option { Some(crate::accuracy::QuantileInputDomain { lower: 1.0, @@ -7319,7 +7248,7 @@ mod tests { "avg_over_time(a[5m]) / quantile_over_time(0.5,a[5m])", "quantile_over_time(0.5,a[5m]) / avg_over_time(a[5m])", ] { - let root = Rc::new(lower_promql(query, target.clone())); + let root = lower_promql(query, target.clone()); let node = realize_binary(&root, inputs, Some(&target)) .unwrap() .expect("bounded ratio candidate"); @@ -7334,10 +7263,10 @@ mod tests { epsilon: 0.01, delta: 0.01, }; - let root = Rc::new(lower_promql( + let root = lower_promql( "quantile_over_time(0.5,a[5m]) / quantile_over_time(0.9,a[5m])", target.clone(), - )); + ); let planning_inputs = CandidatePlanningInputs::with_default_accuracy(&crate::cost_model::DefaultCostModel); let candidate = realize_binary(&root, planning_inputs, Some(&target)) @@ -7345,10 +7274,10 @@ mod tests { .expect("direct quantile ratio candidate"); assert!(candidate.guarantee.is_none()); - let other = Rc::new(lower_promql( + let other = lower_promql( "avg_over_time(a[5m]) / quantile_over_time(0.5,a[5m])", target.clone(), - )); + ); assert!(realize_binary(&other, planning_inputs, Some(&target)) .unwrap() .is_none()); @@ -7367,11 +7296,65 @@ mod tests { #[test] fn relational_join_is_exact_only_when_both_inputs_are_exact() { - let exact = ResultGuarantee::exact("test exact input"); - assert!(relational_join_guarantee(Some(&exact), Some(&exact)) - .is_some_and(|guarantee| guarantee.is_exact())); - assert!(relational_join_guarantee(Some(&exact), None).is_none()); - assert!(relational_join_guarantee(None, Some(&exact)).is_none()); + // `relational_join_guarantee` folded into assembly's generic + // "keep the operator, assemble its children" branch: an assembled + // inner equi-`Join` is exact exactly when both assembled inputs are. + let join = |left_intent: AggIntent, right_intent: AggIntent| { + let left = agg(vec![2], left_intent, metric_scan(&["job"])); + let right = agg( + vec![2], + right_intent, + crate::test_support::scan("n", metric_scan(&["job"]).schema.clone()), + ); + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Join { + kind: asap_types::ir::operator_properties::JoinKind::Inner, + pred: equi_pred(0, 2), + left, + right, + })) + .unwrap() + }; + let is_exact = |node: &OperatorNode| { + node.guarantee + .as_ref() + .is_some_and(ResultGuarantee::is_exact) + }; + for (root, both_exact_expected) in [ + ( + join(AggIntent::Sum { col: None }, AggIntent::Sum { col: None }), + true, + ), + ( + join(AggIntent::Sum { col: None }, quantile_eps_intent(0.5, 0.05)), + false, + ), + ] { + let space = search_workload(vec![(0usize, Rc::clone(&root))]); + let assembled = space + .global_selection(&DefaultCostModel) + .assemble_selected_query(&space.roots[0].1) + .unwrap() + .unwrap(); + let Some(NonASAPOp::Join { left, right, .. }) = assembled.non_asap() else { + panic!("the join is kept and its inputs assembled: {assembled:?}"); + }; + assert_eq!( + is_exact(&assembled), + is_exact(left) && is_exact(right), + "join guarantee must be exact iff both inputs are exact" + ); + if both_exact_expected { + assert!(is_exact(&assembled), "exact inputs give an exact join"); + } + } + } + + fn quantile_eps_intent(q: f64, e: f64) -> AggIntent { + AggIntent::Quantile { + col: None, + q, + accuracy: AccuracyTarget::Epsilon(e), + } } fn eps(e: f64) -> AccuracyTarget { @@ -7921,68 +7904,44 @@ mod tests { ); } - // ── SketchAlgorithmStrategy / SharedSubDAGStrategy fixtures ─────────── + // ── ASAPStrategies / SharedSubDAGStrategy fixtures ─────────── - fn metric_scan(labels: &[&str]) -> QueryExpr { - let mut columns = vec![ - Field::plain("ts", DataType::Timestamp, false), - Field::plain("value", DataType::Float64, false), - ]; - columns.extend( - labels - .iter() - .map(|n| Field::plain(*n, DataType::Utf8, true)), - ); - QueryExpr::Scan { - source: Source::TimeSeries { metric: "m".into() }, - predicates: vec![], - schema: SchemaTy::with_time_index(columns, 0, vec![]), - } - } - - fn agg(by: Vec, intent: AggIntent, child: QueryExpr) -> QueryExpr { - QueryExpr::Aggregate { - reduction: ReductionTy::by(by), - measures: vec![intent], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(child), - } - } - - // ── SketchAlgorithmStrategy ───────────────────────────────────────────── + // ── ASAPStrategies ───────────────────────────────────────────── #[test] fn matches_a_bindable_aggregate() { - let q = Rc::new(agg(vec![2], default_quantile(0.99), metric_scan(&["job"]))); + let q = agg(vec![2], default_quantile(0.99), metric_scan(&["job"])); let target = TargetSubDAG::new(&q); - assert!(SketchAlgorithmStrategy::default_cost_model().matches(&target)); + assert!(ASAPStrategies::default_cost_model().matches(&target)); } #[test] fn does_not_match_a_multi_intent_or_having_aggregate() { - let strategy = SketchAlgorithmStrategy::default_cost_model(); - - let multi = Rc::new(QueryExpr::Aggregate { - reduction: ReductionTy::by(vec![2]), - measures: vec![AggIntent::Sum { col: None }, AggIntent::Avg { col: None }], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(metric_scan(&["job"])), - }); + let strategy = ASAPStrategies::default_cost_model(); + + let multi = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { + reduction: ReductionTy::by(vec![2]), + measures: vec![AggIntent::Sum { col: None }, AggIntent::Avg { col: None }], + output_names: vec![], + filters: vec![], + having: None, + child: metric_scan(&["job"]), + })) + .unwrap(); let target = TargetSubDAG::new(&multi); assert!(!strategy.matches(&target)); assert!(strategy.replacements(&target).is_empty()); - let mut having_q = agg(vec![2], default_quantile(0.99), metric_scan(&["job"])); - if let QueryExpr::Aggregate { having, .. } = &mut having_q { - *having = Some(asap_types::pre_asap::query_expr::Predicate(Rc::new( - QueryExpr::Literal(asap_types::pre_asap::expr_ir::ScalarValue::Boolean(true)), - ))); - } - let having_q = Rc::new(having_q); + let having_q = crate::test_support::aggregate( + ReductionTy::by(vec![2]), + vec![default_quantile(0.99)], + vec![], + Some(asap_types::ir::Predicate(ScalarExpr::Literal( + asap_types::pre_asap::expr_ir::ScalarValue::Boolean(true), + ))), + metric_scan(&["job"]), + ); let target = TargetSubDAG::new(&having_q); assert!(!strategy.matches(&target)); assert!(strategy.replacements(&target).is_empty()); @@ -7990,10 +7949,10 @@ mod tests { #[test] fn does_not_match_a_non_aggregate_node() { - let scan = Rc::new(metric_scan(&["job"])); + let scan = metric_scan(&["job"]); let target = TargetSubDAG::new(&scan); - assert!(!SketchAlgorithmStrategy::default_cost_model().matches(&target)); - assert!(SketchAlgorithmStrategy::default_cost_model() + assert!(!ASAPStrategies::default_cost_model().matches(&target)); + assert!(ASAPStrategies::default_cost_model() .replacements(&target) .is_empty()); } @@ -8001,11 +7960,11 @@ mod tests { #[test] fn approximate_quantile_enumerates_every_summary_candidate() { // Quantile's candidate list is [Kll, DDSketch] (summary_candidates) — - // every entry must come back as its own bound SummaryNode candidate, + // every entry must come back as its own bound summary candidate, // not just Kll (the CostModel-ranked head realizations_for_intent commits to). - let q = Rc::new(agg(vec![2], default_quantile(0.99), metric_scan(&["job"]))); + let q = agg(vec![2], default_quantile(0.99), metric_scan(&["job"])); let target = TargetSubDAG::new(&q); - let replacements = SketchAlgorithmStrategy::default_cost_model().replacements(&target); + let replacements = ASAPStrategies::default_cost_model().replacements(&target); assert_eq!( replacements.len(), 2, @@ -8015,8 +7974,8 @@ mod tests { let kinds: Vec = replacements .iter() .map(|r| match &r.replacement { - Replacement::Summary(node) => summary_family_algorithm(node), - Replacement::Rewrite(_) | Replacement::ExactComposition(_) => { + Replacement::SubDAG(node) => summary_family_algorithm(node), + Replacement::ExactComposition(_) => { panic!("expected a Summary replacement") } }) @@ -8031,14 +7990,14 @@ mod tests { #[test] fn cardinality_epsilon_delta_keeps_unknown_accuracy_candidates() { - let q = Rc::new(agg(vec![2], default_cardinality(), metric_scan(&["job"]))); + let q = agg(vec![2], default_cardinality(), metric_scan(&["job"])); let target = TargetSubDAG::new(&q); - let replacements = SketchAlgorithmStrategy::default_cost_model().replacements(&target); + let replacements = ASAPStrategies::default_cost_model().replacements(&target); let kinds: Vec = replacements .iter() .map(|r| match &r.replacement { - Replacement::Summary(node) => summary_family_algorithm(node), - Replacement::Rewrite(_) | Replacement::ExactComposition(_) => { + Replacement::SubDAG(node) => summary_family_algorithm(node), + Replacement::ExactComposition(_) => { panic!("expected a Summary replacement") } }) @@ -8053,7 +8012,7 @@ mod tests { ] ); - let q = Rc::new(agg( + let q = agg( vec![2], AggIntent::Cardinality { cols: vec![], @@ -8063,13 +8022,13 @@ mod tests { }, }, metric_scan(&["job"]), - )); - let kinds: Vec<_> = SketchAlgorithmStrategy::default_cost_model() + ); + let kinds: Vec<_> = ASAPStrategies::default_cost_model() .replacements(&TargetSubDAG::new(&q)) .iter() .map(|r| match &r.replacement { - Replacement::Summary(node) => summary_family_algorithm(node), - Replacement::Rewrite(_) | Replacement::ExactComposition(_) => { + Replacement::SubDAG(node) => summary_family_algorithm(node), + Replacement::ExactComposition(_) => { panic!("expected a Summary replacement") } }) @@ -8094,35 +8053,28 @@ mod tests { q: 0.99, accuracy: AccuracyTarget::Exact, }; - let q = Rc::new(agg(vec![2], intent, metric_scan(&["job"]))); + let q = agg(vec![2], intent, metric_scan(&["job"])); let target = TargetSubDAG::new(&q); - let replacements = SketchAlgorithmStrategy::default_cost_model().replacements(&target); + let replacements = ASAPStrategies::default_cost_model().replacements(&target); assert_eq!(replacements.len(), 1, "{replacements:?}"); assert!(matches!( &replacements[0].replacement, - Replacement::Summary(node) if matches!( - node.expr, - asap_types::post_asap::SummaryExpr::KeepPreAsap(_) - ) + Replacement::SubDAG(node) if !node.contains_asap() )); assert!(replacements[0].rationale.contains("only realization")); } #[test] fn exact_mergeable_intent_yields_exactly_one_accumulator_candidate() { - let q = Rc::new(agg( - vec![2], - AggIntent::Sum { col: None }, - metric_scan(&["job"]), - )); + let q = agg(vec![2], AggIntent::Sum { col: None }, metric_scan(&["job"])); let target = TargetSubDAG::new(&q); - let replacements = SketchAlgorithmStrategy::default_cost_model().replacements(&target); + let replacements = ASAPStrategies::default_cost_model().replacements(&target); assert_eq!(replacements.len(), 1, "{replacements:?}"); assert!(matches!( &replacements[0].replacement, - Replacement::Summary(node) if matches!( - node.expr, - asap_types::post_asap::SummaryExpr::SummaryAgg { .. } + Replacement::SubDAG(node) if matches!( + node.operator, + Operator::ASAP(ASAPOp::SummaryAgg { .. }) ) )); } @@ -8149,15 +8101,15 @@ mod tests { #[test] fn custom_cost_model_still_enumerates_every_candidate_not_just_its_own_pick() { - let q = Rc::new(agg(vec![2], default_quantile(0.99), metric_scan(&["job"]))); + let q = agg(vec![2], default_quantile(0.99), metric_scan(&["job"])); let target = TargetSubDAG::new(&q); let custom = PreferDDSketch; - let replacements = SketchAlgorithmStrategy::new(&custom).replacements(&target); + let replacements = ASAPStrategies::new(&custom).replacements(&target); let kinds: Vec = replacements .iter() .map(|r| match &r.replacement { - Replacement::Summary(node) => summary_family_algorithm(node), - Replacement::Rewrite(_) | Replacement::ExactComposition(_) => { + Replacement::SubDAG(node) => summary_family_algorithm(node), + Replacement::ExactComposition(_) => { panic!("expected a Summary replacement") } }) @@ -8181,9 +8133,9 @@ mod tests { // so this test injects `RankAdditiveModel` to admit the composition // and keep exercising the per-node enumeration property it is about. let inner = agg(vec![2], default_quantile(0.5), metric_scan(&["job"])); - let outer = Rc::new(agg(vec![], default_quantile(0.99), inner)); + let outer = agg(vec![], default_quantile(0.99), inner); let target = TargetSubDAG::new(&outer); - let replacements = SketchAlgorithmStrategy::new_with_planning_inputs( + let replacements = ASAPStrategies::new_with_planning_inputs( &DefaultCostModel, &RankAdditiveModel, &EqualSplitAllocator, @@ -8191,9 +8143,9 @@ mod tests { .replacements(&target); assert_eq!(replacements.len(), 2, "{replacements:?}"); - assert!(replacements - .iter() - .all(|candidate| { matches!(candidate.replacement, Replacement::Summary(_)) })); + assert!(replacements.iter().all(|candidate| { + matches!(&candidate.replacement, Replacement::SubDAG(n) if n.contains_asap()) + })); // The inner target is still independently enumerated and ranked — // a custom cost model that prefers DDSketch for it is honored, and // nothing about the outer target's choice reaches it. @@ -8201,7 +8153,7 @@ mod tests { vec![("q", Rc::clone(&outer))], &default_strategies_with(&PreferDDSketchViaCostModel), ); - let QueryExpr::Aggregate { child, .. } = space.roots[0].1.as_ref() else { + let Some(NonASAPOp::Aggregate { child, .. }) = space.roots[0].1.non_asap() else { unreachable!() }; let inner_group = space @@ -8211,7 +8163,7 @@ mod tests { .candidates .iter() .filter_map(|c| match &c.replacement { - Replacement::Summary(node) => sketch_kind_of(node), + Replacement::SubDAG(node) => sketch_kind_of(node), _ => None, }) .collect(); @@ -8225,12 +8177,12 @@ mod tests { /// The `FieldDataType`'s committed `SketchAlgorithm`, from the top /// `SummaryAgg` reachable under a (possibly `SummaryEstimate`-wrapped) /// bound root. - fn summary_family_algorithm(node: &SummaryNode) -> SketchAlgorithm { - match &node.expr { - asap_types::post_asap::SummaryExpr::SummaryEstimate { summary_input, .. } => { + fn summary_family_algorithm(node: &OperatorNode) -> SketchAlgorithm { + match &node.operator { + Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) => { summary_family_algorithm(summary_input) } - asap_types::post_asap::SummaryExpr::SummaryAgg { family, .. } => match family { + Operator::ASAP(ASAPOp::SummaryAgg { family, .. }) => match family { asap_types::post_asap::FieldDataType::Sketch(kind, _) => kind.algorithm().clone(), other => panic!("expected a Sketch family, got {other:?}"), }, @@ -8242,11 +8194,7 @@ mod tests { #[test] fn does_not_match_a_single_consumer_target() { - let q = Rc::new(agg( - vec![2], - AggIntent::Sum { col: None }, - metric_scan(&["job"]), - )); + let q = agg(vec![2], AggIntent::Sum { col: None }, metric_scan(&["job"])); let target = TargetSubDAG::new(&q); assert_eq!(target.consumer_count, 1); assert!(!SharedSubDAGStrategy.matches(&target)); @@ -8255,11 +8203,7 @@ mod tests { #[test] fn two_or_more_consumers_yields_the_share_vs_independent_pair() { - let q = Rc::new(agg( - vec![2], - AggIntent::Sum { col: None }, - metric_scan(&["job"]), - )); + let q = agg(vec![2], AggIntent::Sum { col: None }, metric_scan(&["job"])); let target = TargetSubDAG::with_consumer_count(&q, 2); assert!(SharedSubDAGStrategy.matches(&target)); @@ -8267,7 +8211,7 @@ mod tests { assert_eq!(replacements.len(), 2, "{replacements:?}"); let shared = match &replacements[0].replacement { - Replacement::Rewrite(rc) => rc, + Replacement::SubDAG(rc) => rc, other => panic!("expected a Rewrite replacement, got {other:?}"), }; assert!( @@ -8277,7 +8221,7 @@ mod tests { assert!(replacements[0].rationale.contains("build once and share")); let independent = match &replacements[1].replacement { - Replacement::Rewrite(rc) => rc, + Replacement::SubDAG(rc) => rc, other => panic!("expected a Rewrite replacement, got {other:?}"), }; assert!( @@ -8293,11 +8237,7 @@ mod tests { #[test] fn three_consumers_are_reported_verbatim_in_both_rationales() { - let q = Rc::new(agg( - vec![2], - AggIntent::Sum { col: None }, - metric_scan(&["job"]), - )); + let q = agg(vec![2], AggIntent::Sum { col: None }, metric_scan(&["job"])); let target = TargetSubDAG::with_consumer_count(&q, 3); let replacements = SharedSubDAGStrategy.replacements(&target); assert!(replacements[0].rationale.contains('3')); @@ -8307,13 +8247,13 @@ mod tests { /// Builds realistic multi-consumer `TargetSubDAG`s the same way this /// module's own [`discover_targets`]/`walk` does: dedup by `Rc::as_ptr`, /// walking only the relational-skeleton operator children - /// `asap_types::pre_asap::cse::share_common_sub_dags` itself scopes to, + /// `asap_types::ir::cse::share_common_sub_dags` itself scopes to, /// so a shared node nested below another shared node is only ever /// counted at the highest (maximal) point sharing starts. Test-only: /// this module deliberately does not ship a workload-wide discovery /// pass of its own (see the module docs' "Non-goals"). - fn count_consumers(roots: &[Rc]) -> HashMap<*const QueryExpr, usize> { - fn walk(node: &Rc, counts: &mut HashMap<*const QueryExpr, usize>) { + fn count_consumers(roots: &[Rc]) -> HashMap<*const OperatorNode, usize> { + fn walk(node: &Rc, counts: &mut HashMap<*const OperatorNode, usize>) { let ptr = Rc::as_ptr(node); let already_visited = counts.contains_key(&ptr); *counts.entry(ptr).or_insert(0) += 1; @@ -8321,50 +8261,15 @@ mod tests { walk_children(node, counts); } } - fn walk_children(node: &QueryExpr, counts: &mut HashMap<*const QueryExpr, usize>) { - use QueryExpr::*; - match node { - Scan { .. } | PromqlScalarBridge(_) | EvalTimestamp | CurrentTimestamp => {} - PromqlVectorFromScalar(c) | PromqlScalarFromVector(c) => walk(c, counts), - PromqlRelabel { child, .. } - | PromqlInfoEnrich { child, .. } - | PromqlSeriesSample { child, .. } - | Filter { child, .. } - | Project { child, .. } - | Aggregate { child, .. } - | Dedup { child, .. } - | PromqlSubquery { child, .. } - | TimeRange { child, .. } - | TimeShift { child, .. } - | SQLWindowFunc { child, .. } - | Sort { child, .. } - | Limit { child, .. } => walk(child, counts), - Concat { children, .. } => { - for c in children { - walk_children(c, counts); - } - } - Join { left, right, .. } | SetOp { left, right, .. } => { - walk(left, counts); - walk(right, counts); + fn walk_children(node: &OperatorNode, counts: &mut HashMap<*const OperatorNode, usize>) { + if let Some(NonASAPOp::Concat { children, .. }) = node.non_asap() { + for c in children { + walk_children(c, counts); } - BinaryOp { lhs, rhs, .. } => { - walk(lhs, counts); - walk(rhs, counts); - } - Column(_) - | Literal(_) - | Compare { .. } - | BoolAnd(_) - | BoolOr(_) - | Not(_) - | IsNull(_) - | IsNotNull(_) - | Cast { .. } - | InList { .. } - | FunctionCall { .. } - | Arithmetic { .. } - | Case { .. } => {} + return; + } + for child in node.children() { + walk(child, counts); } } @@ -8382,13 +8287,13 @@ mod tests { // Sum aggregate over the same scan, built independently at each root. let a = agg(vec![2], AggIntent::Sum { col: None }, metric_scan(&["job"])); let b = agg(vec![2], AggIntent::Sum { col: None }, metric_scan(&["job"])); - let shared = asap_types::pre_asap::cse::share_common_sub_dags(vec![("a", a), ("b", b)]); + let shared = asap_types::ir::cse::share_common_sub_dags(vec![("a", a), ("b", b)]); let [(_, ra), (_, rb)] = shared.as_slice() else { panic!("expected 2 roots"); }; assert!(Rc::ptr_eq(ra, rb), "fixture sanity: the two roots merged"); - let roots: Vec> = shared.into_iter().map(|(_, rc)| rc).collect(); + let roots: Vec> = shared.into_iter().map(|(_, rc)| rc).collect(); let counts = count_consumers(&roots); let count = counts[&Rc::as_ptr(&roots[0])]; assert_eq!(count, 2); @@ -8416,7 +8321,7 @@ mod tests { delta: 0.01, }, }; - let root = Rc::new(agg(vec![2], intent, metric_scan(&["job"]))); + let root = agg(vec![2], intent, metric_scan(&["job"])); let space = search_workload(vec![("q", root)]); // One group for the Aggregate, one for its Scan child. @@ -8424,7 +8329,7 @@ mod tests { let agg_group = space .target_subdag_candidates() - .find(|g| matches!(g.target.as_ref(), QueryExpr::Aggregate { .. })) + .find(|g| matches!(g.target.non_asap(), Some(NonASAPOp::Aggregate { .. }))) .expect("an Aggregate group must be discovered"); assert_eq!(agg_group.consumer_count, 1); assert_eq!( @@ -8436,24 +8341,26 @@ mod tests { assert!(agg_group .candidates .iter() - .all(|c| matches!(c.replacement, Replacement::Summary(_)))); + .all(|c| matches!(&c.replacement, Replacement::SubDAG(n) if n.contains_asap()))); assert_eq!( agg_group .candidates .iter() .filter(|candidate| { - let Replacement::Summary(node) = &candidate.replacement else { + let Replacement::SubDAG(node) = &candidate.replacement else { return false; }; - let SummaryExpr::SummaryEstimate { summary_input, .. } = &node.expr else { + let Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) = + &node.operator + else { return false; }; matches!( - &summary_input.expr, - SummaryExpr::SummaryAgg { + &summary_input.operator, + Operator::ASAP(ASAPOp::SummaryAgg { grouping: GroupingStrategy::SharedMultiSubpopulation { .. }, .. - } + }) ) }) .count(), @@ -8477,7 +8384,7 @@ mod tests { let scan_group = space .target_subdag_candidates() - .find(|g| matches!(g.target.as_ref(), QueryExpr::Scan { .. })) + .find(|g| matches!(g.target.non_asap(), Some(NonASAPOp::Scan { .. }))) .expect("a Scan group must be discovered"); assert_eq!(scan_group.consumer_count, 1); assert!( @@ -8488,20 +8395,20 @@ mod tests { #[test] fn cardinality_group_keeps_all_four_candidates() { - let root = Rc::new(agg(vec![2], default_cardinality(), metric_scan(&["job"]))); + let root = agg(vec![2], default_cardinality(), metric_scan(&["job"])); let space = search_workload(vec![("q", root)]); let agg_group = space .target_subdag_candidates() - .find(|g| matches!(g.target.as_ref(), QueryExpr::Aggregate { .. })) + .find(|g| matches!(g.target.non_asap(), Some(NonASAPOp::Aggregate { .. }))) .unwrap(); assert_eq!(agg_group.candidates.len(), 4); assert!(agg_group.candidates.iter().any(|candidate| matches!( &candidate.replacement, - Replacement::Summary(node) if node.guarantee.is_none() + Replacement::SubDAG(node) if node.guarantee.is_none() && candidate.has_missing_accuracy_evidence() ))); - let root = Rc::new(agg(vec![2], default_cardinality(), metric_scan(&["job"]))); + let root = agg(vec![2], default_cardinality(), metric_scan(&["job"])); let targeted = search_workload_with_targets( vec![( "q", @@ -8522,7 +8429,7 @@ mod tests { .iter() .any(|candidate| matches!( &candidate.replacement, - Replacement::Summary(node) if node.guarantee.is_none() + Replacement::SubDAG(node) if node.guarantee.is_none() && candidate.has_missing_accuracy_evidence() ))); assert!(!targeted @@ -8535,7 +8442,7 @@ mod tests { let exact_target = search_workload_with_targets( vec![( "q", - Rc::new(agg(vec![2], default_cardinality(), metric_scan(&["job"]))), + agg(vec![2], default_cardinality(), metric_scan(&["job"])), Some(AccuracyTarget::Exact), )], &default_strategies(), @@ -8554,11 +8461,11 @@ mod tests { // Two independently-built, structurally identical Sum aggregates: // share_common_sub_dags (run inside search_workload) collapses them // onto one Rc with consumer_count 2, so this single group should - // carry SketchAlgorithmStrategy's one ExactAggregate candidate *and* + // carry ASAPStrategies's one ExactAggregate candidate *and* // SharedSubDAGStrategy's share-vs-recompute pair. let a = agg(vec![2], AggIntent::Sum { col: None }, metric_scan(&["job"])); let b = agg(vec![2], AggIntent::Sum { col: None }, metric_scan(&["job"])); - let space = search_workload(vec![("a", Rc::new(a)), ("b", Rc::new(b))]); + let space = search_workload(vec![("a", a), ("b", b)]); // roots[0] and roots[1] must have merged onto the same Rc. assert!(Rc::ptr_eq(&space.roots[0].1, &space.roots[1].1)); @@ -8572,15 +8479,17 @@ mod tests { group.candidates ); + // Old `Replacement::Summary` ↔ a `Subtree` containing an ASAP node; + // old `Replacement::Rewrite` ↔ a pure pre-ASAP `Subtree`. let summary_count = group .candidates .iter() - .filter(|c| matches!(c.replacement, Replacement::Summary(_))) + .filter(|c| matches!(&c.replacement, Replacement::SubDAG(n) if n.contains_asap())) .count(); let rewrite_count = group .candidates .iter() - .filter(|c| matches!(c.replacement, Replacement::Rewrite(_))) + .filter(|c| matches!(&c.replacement, Replacement::SubDAG(n) if !n.contains_asap())) .count(); assert_eq!(summary_count, 1); assert_eq!(rewrite_count, 2); @@ -8589,11 +8498,11 @@ mod tests { // (the "false-positive dedup" failure mode `is_duplicate_rewrite` // exists to prevent). let one_is_the_target = group.candidates.iter().any( - |c| matches!(&c.replacement, Replacement::Rewrite(rc) if Rc::ptr_eq(rc, &group.target)), + |c| matches!(&c.replacement, Replacement::SubDAG(rc) if Rc::ptr_eq(rc, &group.target)), + ); + let one_is_not = group.candidates.iter().any( + |c| matches!(&c.replacement, Replacement::SubDAG(rc) if !Rc::ptr_eq(rc, &group.target)), ); - let one_is_not = group.candidates.iter().any(|c| { - matches!(&c.replacement, Replacement::Rewrite(rc) if !Rc::ptr_eq(rc, &group.target)) - }); assert!(one_is_the_target && one_is_not); } @@ -8604,27 +8513,27 @@ mod tests { // walking the whole DAG, not just root-level pointer identity // (a naive whole-root-only consumer-count pass would miss this; // this module's discover_targets must not). + use asap_types::ir::Predicate; use asap_types::pre_asap::expr_ir::ScalarValue; - use asap_types::pre_asap::query_expr::Predicate; - let shared = Rc::new(agg( - vec![2], - AggIntent::Sum { col: None }, - metric_scan(&["job"]), - )); + let shared = agg(vec![2], AggIntent::Sum { col: None }, metric_scan(&["job"])); // Different predicates so the two Filter *parents* stay distinct // (don't themselves merge under CSE) — only their shared `child` // should collapse onto one `Rc`. - let root_a = QueryExpr::Filter { - pred: Predicate(Rc::new(QueryExpr::Literal(ScalarValue::Int64(1)))), - child: Rc::clone(&shared), - }; - let root_b = QueryExpr::Filter { - pred: Predicate(Rc::new(QueryExpr::Literal(ScalarValue::Int64(2)))), - child: Rc::clone(&shared), - }; + let root_a = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Filter { + pred: Predicate(ScalarExpr::Literal(ScalarValue::Int64(1))), + child: Rc::clone(&shared), + })) + .unwrap(); + let root_b = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Filter { + pred: Predicate(ScalarExpr::Literal(ScalarValue::Int64(2))), + child: Rc::clone(&shared), + })) + .unwrap(); - let space = search_workload(vec![("a", Rc::new(root_a)), ("b", Rc::new(root_b))]); + let space = search_workload(vec![("a", root_a), ("b", root_b)]); assert_eq!( space.len(), 4, @@ -8638,17 +8547,17 @@ mod tests { // pointer as) the pre-search `shared` variable. Recover it from the // post-CSE root's own `child` field instead of the stale `shared` // handle. - let QueryExpr::Filter { + let Some(NonASAPOp::Filter { child: post_cse_shared_a, .. - } = space.roots[0].1.as_ref() + }) = space.roots[0].1.non_asap() else { panic!("expected a Filter root"); }; - let QueryExpr::Filter { + let Some(NonASAPOp::Filter { child: post_cse_shared_b, .. - } = space.roots[1].1.as_ref() + }) = space.roots[1].1.non_asap() else { panic!("expected a Filter root"); }; @@ -8674,14 +8583,10 @@ mod tests { #[test] fn add_candidate_rejects_a_true_rewrite_duplicate() { // SharedSubDAGStrategy's `Replacement::Rewrite` candidates are - // real `QueryExpr` values with `PartialEq`, so `add_candidate` can + // real `OperatorNode` values with `PartialEq`, so `add_candidate` can // (and must) actually reject a genuine repeat — unlike the // `Replacement::Summary` case (see the test below). - let root = Rc::new(agg( - vec![2], - AggIntent::Sum { col: None }, - metric_scan(&["job"]), - )); + let root = agg(vec![2], AggIntent::Sum { col: None }, metric_scan(&["job"])); let mut group = TargetSubDAGCandidates::new(Rc::clone(&root), 2); let target = TargetSubDAG::with_consumer_count(&root, 2); let mut inserted = 0; @@ -8712,8 +8617,8 @@ mod tests { #[test] fn add_candidate_never_dedups_summary_candidates() { - // Documented, deliberate consequence of `SummaryNode` deriving no - // `PartialEq` (see `is_duplicate_summary`'s own doc): re-proposing + // Documented, deliberate consequence of `is_duplicate_summary` + // refusing value equality on `f64`-bearing summaries: re-proposing // the same `Replacement::Summary` candidates DOES grow the group — // this module refuses to guess at an equality check it can't back // with a real `PartialEq`. `search_workload_with` never actually @@ -8721,9 +8626,9 @@ mod tests { // module docs' "Termination" section), so this test exists to pin // the documented behavior, not to endorse calling `replacements` // twice for the same target. - let root = Rc::new(agg(vec![2], default_quantile(0.99), metric_scan(&["job"]))); + let root = agg(vec![2], default_quantile(0.99), metric_scan(&["job"])); let mut group = TargetSubDAGCandidates::new(Rc::clone(&root), 1); - let strategy = SketchAlgorithmStrategy::default_cost_model(); + let strategy = ASAPStrategies::default_cost_model(); let target = TargetSubDAG::new(&root); for candidate in strategy.replacements(&target) { group.add_candidate(candidate); @@ -8742,11 +8647,7 @@ mod tests { #[test] fn is_duplicate_rewrite_never_merges_share_with_recompute() { - let target = Rc::new(agg( - vec![2], - AggIntent::Sum { col: None }, - metric_scan(&["job"]), - )); + let target = agg(vec![2], AggIntent::Sum { col: None }, metric_scan(&["job"])); let share = Rc::clone(&target); let recompute = Rc::new((*target).clone()); assert!(!Rc::ptr_eq(&share, &recompute)); @@ -8760,11 +8661,7 @@ mod tests { #[test] fn is_duplicate_rewrite_catches_a_real_repeat() { - let target = Rc::new(agg( - vec![2], - AggIntent::Sum { col: None }, - metric_scan(&["job"]), - )); + let target = agg(vec![2], AggIntent::Sum { col: None }, metric_scan(&["job"])); let first_recompute = Rc::new((*target).clone()); let second_recompute = Rc::new((*target).clone()); assert!(!Rc::ptr_eq(&first_recompute, &second_recompute)); @@ -8785,7 +8682,7 @@ mod tests { let mut roots = Vec::new(); let shared = agg(vec![2], AggIntent::Sum { col: None }, metric_scan(&["job"])); for i in 0..20 { - roots.push((i, Rc::new(shared.clone()))); + roots.push((i, Rc::new((*shared).clone()))); } let space = search_workload(roots); let group = space.candidates_for_target(&space.roots[0].1).unwrap(); @@ -8798,18 +8695,18 @@ mod tests { .unwrap(); assert!(matches!( &ranked_group.candidates[0].replacement, - Replacement::Rewrite(rc) if Rc::ptr_eq(rc, &group.target) + Replacement::SubDAG(rc) if Rc::ptr_eq(rc, &group.target) )); let rewrites: Vec<&ReplacementSubDAG> = ranked_group .candidates .iter() - .filter(|c| matches!(c.replacement, Replacement::Rewrite(_))) + .filter(|c| matches!(&c.replacement, Replacement::SubDAG(n) if !n.contains_asap())) .copied() .collect(); assert_eq!(rewrites.len(), 2); let first_shares_target = match &rewrites[0].replacement { - Replacement::Rewrite(rc) => Rc::ptr_eq(rc, &group.target), - Replacement::Summary(_) | Replacement::ExactComposition(_) => false, + Replacement::SubDAG(rc) => Rc::ptr_eq(rc, &group.target), + Replacement::ExactComposition(_) => false, }; assert!( first_shares_target, @@ -8835,17 +8732,17 @@ mod tests { } } - let root = Rc::new(agg(vec![2], default_quantile(0.99), metric_scan(&["job"]))); + let root = agg(vec![2], default_quantile(0.99), metric_scan(&["job"])); let space = search_workload(vec![("q", root)]); let ranked = space.cost_sorted(&PreferDDSketch); let agg_group = ranked .iter() - .find(|g| matches!(g.target.as_ref(), QueryExpr::Aggregate { .. })) + .find(|g| matches!(g.target.non_asap(), Some(NonASAPOp::Aggregate { .. }))) .unwrap(); assert_eq!(agg_group.candidates.len(), 2); let first_kind = match &agg_group.candidates[0].replacement { - Replacement::Summary(node) => sketch_kind_of(node), - Replacement::Rewrite(_) | Replacement::ExactComposition(_) => None, + Replacement::SubDAG(node) => sketch_kind_of(node), + Replacement::ExactComposition(_) => None, }; assert_eq!(first_kind, Some(SketchAlgorithm::DDSketch)); } @@ -8863,7 +8760,7 @@ mod tests { candidates.to_vec() } - fn estimated_subpopulation_count(&self, _target: &QueryExpr) -> Option { + fn estimated_subpopulation_count(&self, _target: &OperatorNode) -> Option { Some(self.0) } } @@ -8876,19 +8773,15 @@ mod tests { delta: 0.01, }, }; - let root = Rc::new(agg( - vec![2, 3], - intent, - metric_scan(&["tenant_id", "endpoint"]), - )); + let root = agg(vec![2, 3], intent, metric_scan(&["tenant_id", "endpoint"])); let strategies = default_strategies_with(&model); let space = search_workload_with(vec![("tenant_endpoint_count", root)], &strategies); let ranked = space.cost_sorted(&model); let aggregate = ranked .iter() - .find(|group| matches!(group.target.as_ref(), QueryExpr::Aggregate { .. })) + .find(|group| matches!(group.target.non_asap(), Some(NonASAPOp::Aggregate { .. }))) .expect("aggregate group"); - let Replacement::Summary(node) = &aggregate.candidates[0].replacement else { + let Replacement::SubDAG(node) = &aggregate.candidates[0].replacement else { panic!("grouping candidate must be a summary") }; summary_grouping(node) @@ -8912,12 +8805,12 @@ mod tests { /// and target produces, not some other (or stale) number. #[test] fn cost_sorted_pairs_each_candidate_with_its_own_estimate_cost() { - let root = Rc::new(agg(vec![2], default_quantile(0.99), metric_scan(&["job"]))); + let root = agg(vec![2], default_quantile(0.99), metric_scan(&["job"])); let space = search_workload(vec![("q", root)]); let ranked = space.cost_sorted(&DefaultCostModel); let agg_group = ranked .iter() - .find(|g| matches!(g.target.as_ref(), QueryExpr::Aggregate { .. })) + .find(|g| matches!(g.target.non_asap(), Some(NonASAPOp::Aggregate { .. }))) .unwrap(); assert_eq!( agg_group.costs.len(), @@ -8939,7 +8832,7 @@ mod tests { // ── global_selection (issue #271) ─────────────────────────────────── - /// A `CostModel` with a constant, `sub_dag`-independent recompute cost + /// A `CostModel` with a constant, `sub-DAG`-independent recompute cost /// and shared-maintenance cost, chosen (40 recompute-per-use, 100 /// maintenance) so that a `SharedSubDAGStrategy` group's /// `cse_share_decision` flips exactly between a consumer count of 2 @@ -8996,7 +8889,7 @@ mod tests { } } - let aggregate = Rc::new(agg(vec![2], default_quantile(0.99), metric_scan(&["job"]))); + let aggregate = agg(vec![2], default_quantile(0.99), metric_scan(&["job"])); let space = search_workload(vec![("left", Rc::clone(&aggregate)), ("right", aggregate)]); let root = &space.roots[0].1; assert!(cse_candidate_pair(space.candidates_for_target(root).unwrap()).is_some()); @@ -9011,7 +8904,7 @@ mod tests { // must equal the group's own raw consumer_count, and its `chosen` // candidate must be cost_sorted's top pick, for both the sketch // group and its child Scan. - let root = Rc::new(agg(vec![2], default_quantile(0.99), metric_scan(&["job"]))); + let root = agg(vec![2], default_quantile(0.99), metric_scan(&["job"])); let space = search_workload(vec![("q", root)]); let ranked = space.cost_sorted(&DefaultCostModel); @@ -9038,12 +8931,12 @@ mod tests { // A bare Scan: no registered strategy has an opinion on it, so it // gets a group with an empty candidate list (see TargetSubDAGCandidates's own // doc) — global_selection must not invent a candidate for it. - let root = Rc::new(metric_scan(&["job"])); + let root = metric_scan(&["job"]); let space = search_workload(vec![("q", root)]); let selected = space.global_selection(&DefaultCostModel); let scan_group = selected .target_selections() - .find(|g| matches!(g.target.as_ref(), QueryExpr::Scan { .. })) + .find(|g| matches!(g.target.non_asap(), Some(NonASAPOp::Scan { .. }))) .unwrap(); assert!(scan_group.chosen.is_none()); assert_eq!(scan_group.effective_consumer_count, 1); @@ -9051,7 +8944,7 @@ mod tests { #[test] fn global_selection_falls_back_to_local_ranking_for_sketch_family_groups() { - // SketchAlgorithmStrategy groups have no cross-group-aware cost hook + // ASAPStrategies groups have no cross-group-aware cost hook // (rank_candidates takes no consumer_count) — global_selection must // still return cost_sorted's own top pick for them (documented in // the module docs' "Whole-plan (cross-group) selection" section), @@ -9076,16 +8969,16 @@ mod tests { } } - let root = Rc::new(agg(vec![2], default_quantile(0.99), metric_scan(&["job"]))); + let root = agg(vec![2], default_quantile(0.99), metric_scan(&["job"])); let space = search_workload(vec![("q", root)]); let selected = space.global_selection(&PreferDDSketch); let agg_group = selected .target_selections() - .find(|g| matches!(g.target.as_ref(), QueryExpr::Aggregate { .. })) + .find(|g| matches!(g.target.non_asap(), Some(NonASAPOp::Aggregate { .. }))) .unwrap(); let kind = match &agg_group.chosen.unwrap().replacement { - Replacement::Summary(node) => sketch_kind_of(node), - Replacement::Rewrite(_) | Replacement::ExactComposition(_) => None, + Replacement::SubDAG(node) => sketch_kind_of(node), + Replacement::ExactComposition(_) => None, }; assert_eq!(kind, Some(SketchAlgorithm::DDSketch)); @@ -9109,24 +9002,29 @@ mod tests { #[test] fn mixed_rewrite_group_keeps_and_selects_its_explicit_cse_pair() { - let target = Rc::new(metric_scan(&["job"])); + let target = metric_scan(&["job"]); let mut group = TargetSubDAGCandidates::new(Rc::clone(&target), 2); group.candidates = vec![ ReplacementSubDAG { strategy: "TestStrategy", - replacement: Replacement::Rewrite(Rc::clone(&target)), + replacement: Replacement::SubDAG(Rc::clone(&target)), provenance: ReplacementProvenance::CseShare, rationale: "share".into(), }, ReplacementSubDAG { strategy: "TestStrategy", - replacement: Replacement::Rewrite(Rc::new(target.as_ref().clone())), + replacement: Replacement::SubDAG(Rc::new(target.as_ref().clone())), provenance: ReplacementProvenance::CseRecompute, rationale: "recompute".into(), }, ReplacementSubDAG { strategy: "TestStrategy", - replacement: Replacement::Rewrite(Rc::new(QueryExpr::CurrentTimestamp)), + replacement: Replacement::SubDAG( + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP( + NonASAPOp::PromqlVectorFromScalar(ScalarExpr::EvalTimestamp), + )) + .unwrap(), + ), provenance: ReplacementProvenance::LogicalRewrite, rationale: "different rewrite strategy".into(), }, @@ -9166,7 +9064,7 @@ mod tests { // `a` and `c` are both non-`Aggregate` nodes (`Filter`/`Dedup`) so // neither is bindable — each group is a *clean* two-candidate // SharedSubDAGStrategy share-vs-recompute pair, with no - // SketchAlgorithmStrategy `Summary` candidate mixed in to complicate + // ASAPStrategies `Summary` candidate mixed in to complicate // ranking (see `shared_aggregate_across_two_roots_gets_both_strategies_candidates` // for what a *mixed*-shape group looks like — deliberately avoided // here to isolate the SharedSubDAGStrategy-only interaction). @@ -9182,23 +9080,25 @@ mod tests { // which flips its own decision to Share. Only global_selection, // which folds `a`'s decision into `c`'s effective_consumer_count // before deciding `c`, gets this right. + use asap_types::ir::Predicate; use asap_types::pre_asap::expr_ir::ScalarValue; - use asap_types::pre_asap::query_expr::Predicate; - let c = || QueryExpr::Dedup { - cols: vec![0], - child: Rc::new(metric_scan(&["job"])), + let c = || { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Dedup { + cols: vec![0], + child: metric_scan(&["job"]), + })) + .unwrap() }; - let a = || QueryExpr::Filter { - pred: Predicate(Rc::new(QueryExpr::Literal(ScalarValue::Boolean(true)))), - child: Rc::new(c()), + let a = || { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Filter { + pred: Predicate(ScalarExpr::Literal(ScalarValue::Boolean(true))), + child: c(), + })) + .unwrap() }; - let space = search_workload(vec![ - ("root1", Rc::new(a())), - ("root2", Rc::new(a())), - ("root3", Rc::new(c())), - ]); + let space = search_workload(vec![("root1", a()), ("root2", a()), ("root3", c())]); // Fixture sanity: root1/root2 merged onto one shared `a`, and `c` // (root1/root2's shared child, and root3 itself) merged onto one @@ -9206,7 +9106,7 @@ mod tests { // (non-mixed) two-candidate SharedSubDAGStrategy pairs. assert!(Rc::ptr_eq(&space.roots[0].1, &space.roots[1].1)); let a_rc = &space.roots[0].1; - let QueryExpr::Filter { child: c_via_a, .. } = a_rc.as_ref() else { + let Some(NonASAPOp::Filter { child: c_via_a, .. }) = a_rc.non_asap() else { panic!("expected root1/root2 to still be a Filter"); }; assert!(Rc::ptr_eq(c_via_a, &space.roots[2].1)); @@ -9240,7 +9140,7 @@ mod tests { .unwrap(); let c_top_shares = matches!( &c_ranked.candidates[0].replacement, - Replacement::Rewrite(rc) if Rc::ptr_eq(rc, c_via_a) + Replacement::SubDAG(rc) if Rc::ptr_eq(rc, c_via_a) ); assert!( !c_top_shares, @@ -9261,7 +9161,7 @@ mod tests { ); let a_shares = matches!( &a_selected.chosen.unwrap().replacement, - Replacement::Rewrite(rc) if Rc::ptr_eq(rc, a_rc) + Replacement::SubDAG(rc) if Rc::ptr_eq(rc, a_rc) ); assert!( !a_shares, @@ -9274,7 +9174,7 @@ mod tests { ); let c_shares = matches!( &c_selected.chosen.unwrap().replacement, - Replacement::Rewrite(rc) if Rc::ptr_eq(rc, c_via_a) + Replacement::SubDAG(rc) if Rc::ptr_eq(rc, c_via_a) ); assert!( c_shares, @@ -9312,10 +9212,12 @@ mod tests { } } - let shared = Rc::new(QueryExpr::Dedup { - cols: vec![0], - child: Rc::new(metric_scan(&["job"])), - }); + let shared = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Dedup { + cols: vec![0], + child: metric_scan(&["job"]), + })) + .unwrap(); let space = search_workload(vec![ ("left", Rc::clone(&shared)), ("right", Rc::clone(&shared)), @@ -9328,20 +9230,26 @@ mod tests { #[test] fn effective_repetition_materializes_a_cse_choice_for_a_single_edge_child() { + use asap_types::ir::Predicate; use asap_types::pre_asap::expr_ir::ScalarValue; - use asap_types::pre_asap::query_expr::Predicate; - let c = || QueryExpr::Dedup { - cols: vec![0], - child: Rc::new(metric_scan(&["job"])), + let c = || { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Dedup { + cols: vec![0], + child: metric_scan(&["job"]), + })) + .unwrap() }; - let a = || QueryExpr::Filter { - pred: Predicate(Rc::new(QueryExpr::Literal(ScalarValue::Boolean(true)))), - child: Rc::new(c()), + let a = || { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Filter { + pred: Predicate(ScalarExpr::Literal(ScalarValue::Boolean(true))), + child: c(), + })) + .unwrap() }; - let space = search_workload(vec![("root1", Rc::new(a())), ("root2", Rc::new(a()))]); + let space = search_workload(vec![("root1", a()), ("root2", a())]); let a_rc = &space.roots[0].1; - let QueryExpr::Filter { child: c_rc, .. } = a_rc.as_ref() else { + let Some(NonASAPOp::Filter { child: c_rc, .. }) = a_rc.non_asap() else { panic!("expected Filter root"); }; @@ -9356,8 +9264,8 @@ mod tests { #[test] fn shared_ancestor_keeps_a_single_use_cse_descendant_selected() { + use asap_types::ir::Predicate; use asap_types::pre_asap::expr_ir::ScalarValue; - use asap_types::pre_asap::query_expr::Predicate; struct AlwaysShare; impl CostModel for AlwaysShare { @@ -9378,22 +9286,25 @@ mod tests { } } - let child = || QueryExpr::Dedup { - cols: vec![0], - child: Rc::new(metric_scan(&["job"])), + let child = || { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Dedup { + cols: vec![0], + child: metric_scan(&["job"]), + })) + .unwrap() }; - let parent = || QueryExpr::Filter { - pred: Predicate(Rc::new(QueryExpr::Literal(ScalarValue::Boolean(true)))), - child: Rc::new(child()), + let parent = || { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Filter { + pred: Predicate(ScalarExpr::Literal(ScalarValue::Boolean(true))), + child: child(), + })) + .unwrap() }; - let space = search_workload(vec![ - ("root1", Rc::new(parent())), - ("root2", Rc::new(parent())), - ]); + let space = search_workload(vec![("root1", parent()), ("root2", parent())]); let parent_rc = &space.roots[0].1; - let QueryExpr::Filter { + let Some(NonASAPOp::Filter { child: child_rc, .. - } = parent_rc.as_ref() + }) = parent_rc.non_asap() else { panic!("expected Filter root"); }; @@ -9417,38 +9328,44 @@ mod tests { #[test] fn global_selection_propagates_uses_through_the_selected_rewrite() { + use asap_types::ir::Predicate; use asap_types::pre_asap::expr_ir::ScalarValue; - use asap_types::pre_asap::query_expr::Predicate; struct ReplaceFilterChild; impl ReplacementStrategy for ReplaceFilterChild { fn matches(&self, target: &TargetSubDAG<'_>) -> bool { - matches!(target.root.as_ref(), QueryExpr::Filter { .. }) + matches!(target.root.non_asap(), Some(NonASAPOp::Filter { .. })) } fn replacements(&self, _target: &TargetSubDAG<'_>) -> Vec { vec![ReplacementSubDAG { strategy: "ReplaceFilterChild", - replacement: Replacement::Rewrite(Rc::new(QueryExpr::Dedup { - cols: vec![0], - child: Rc::new(metric_scan(&["replacement"])), - })), + replacement: Replacement::SubDAG( + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP( + NonASAPOp::Dedup { + cols: vec![0], + child: metric_scan(&["replacement"]), + }, + )) + .unwrap(), + ), provenance: ReplacementProvenance::LogicalRewrite, rationale: "replace the Filter and its input".into(), }] } } - let original_child = Rc::new(metric_scan(&["original"])); - let root = Rc::new(QueryExpr::Filter { - pred: Predicate(Rc::new(QueryExpr::Literal(ScalarValue::Boolean(true)))), + let original_child = metric_scan(&["original"]); + let root = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Filter { + pred: Predicate(ScalarExpr::Literal(ScalarValue::Boolean(true))), child: Rc::clone(&original_child), - }); + })) + .unwrap(); let strategies: Vec> = vec![Box::new(ReplaceFilterChild)]; let space = search_workload_with(vec![("q", root)], &strategies); let root = &space.roots[0].1; let selected = space.global_selection(&DefaultCostModel); - let Replacement::Rewrite(rewrite) = &selected + let Replacement::SubDAG(rewrite) = &selected .for_target(root) .unwrap() .chosen @@ -9457,17 +9374,17 @@ mod tests { else { panic!("expected logical rewrite"); }; - let QueryExpr::Dedup { + let Some(NonASAPOp::Dedup { child: replacement_child, .. - } = rewrite.as_ref() + }) = rewrite.non_asap() else { panic!("expected Dedup rewrite"); }; - let QueryExpr::Filter { + let Some(NonASAPOp::Filter { child: original_child, .. - } = root.as_ref() + }) = root.non_asap() else { panic!("expected Filter root"); }; @@ -9503,11 +9420,11 @@ mod tests { fn candidate_cost(&self, _: &ReplacementSubDAG, _: &TargetSubDAG<'_>) -> Option { Some(Cost(1.0)) } - fn summary_support_evidence(&self, _: &SummaryNode) -> Option { + fn summary_support_evidence(&self, _: &OperatorNode) -> Option { Some(false) } } - let root = Rc::new(lower_promql("sum_over_time(a[1m])", AccuracyTarget::Exact)); + let root = lower_promql("sum_over_time(a[1m])", AccuracyTarget::Exact); let space = search_workload(vec![("q", root)]); let selected = space.global_selection(&Unsupported); assert!(selected @@ -9520,18 +9437,15 @@ mod tests { // Composable temporal/grouped Sum must be executable as one producer. #[test] fn grouped_temporal_sum_has_one_summary_producer_candidate() { - let root = Rc::new(lower_promql( - "sum by(job)(sum_over_time(a[1m]))", - AccuracyTarget::Exact, - )); + let root = lower_promql("sum by(job)(sum_over_time(a[1m]))", AccuracyTarget::Exact); let candidates = - SketchAlgorithmStrategy::default_cost_model().replacements(&TargetSubDAG::new(&root)); + ASAPStrategies::default_cost_model().replacements(&TargetSubDAG::new(&root)); assert!(candidates .iter() .any(|candidate| matches!(&candidate.replacement, - Replacement::Summary(node) if matches!(&node.expr, - SummaryExpr::SummaryAgg { reduction: Reduction::Reduce(_), child, .. } - if matches!(child.expr, SummaryExpr::KeepPreAsap(_)))))); + Replacement::SubDAG(node) if matches!(&node.operator, + Operator::ASAP(ASAPOp::SummaryAgg { reduction: Reduction::Reduce(_), child, .. }) + if !child.contains_asap())))); struct PreferComposed; impl CostModel for PreferComposed { fn rank_candidates( @@ -9548,9 +9462,9 @@ mod tests { ) -> Option { Some(Cost( if matches!(&candidate.replacement, - Replacement::Summary(node) if matches!(&node.expr, - SummaryExpr::SummaryAgg { reduction: Reduction::Reduce(_), child, .. } - if matches!(child.expr, SummaryExpr::KeepPreAsap(_)))) + Replacement::SubDAG(node) if matches!(&node.operator, + Operator::ASAP(ASAPOp::SummaryAgg { reduction: Reduction::Reduce(_), child, .. }) + if !child.contains_asap())) { 1.0 } else { @@ -9562,9 +9476,9 @@ mod tests { let space = search_workload(vec![("q", root.clone())]); let selected = space.global_selection(&PreferComposed); let node = selected.assemble_target(&space.roots[0].1).unwrap(); - assert!(matches!(&node.expr, - SummaryExpr::SummaryAgg { reduction: Reduction::Reduce(_), child, .. } - if matches!(child.expr, SummaryExpr::KeepPreAsap(_)))); + assert!(matches!(&node.operator, + Operator::ASAP(ASAPOp::SummaryAgg { reduction: Reduction::Reduce(_), child, .. }) + if !child.contains_asap())); } // Mixed candidate ranking must honor explicit costs, not legacy estimates. @@ -9593,10 +9507,7 @@ mod tests { )) } } - let root = Rc::new(lower_promql( - "sum by(job)(sum_over_time(a[1m]))", - AccuracyTarget::Exact, - )); + let root = lower_promql("sum by(job)(sum_over_time(a[1m]))", AccuracyTarget::Exact); let space = search_workload(vec![("q", root)]); let selection = space.global_selection(&ExplicitCosts); let selected = selection @@ -9632,16 +9543,8 @@ mod tests { } } - let a = Rc::new(agg( - vec![2], - AggIntent::Avg { col: None }, - metric_scan(&["job"]), - )); - let b = Rc::new(agg( - vec![2], - AggIntent::Avg { col: None }, - metric_scan(&["job"]), - )); + let a = agg(vec![2], AggIntent::Avg { col: None }, metric_scan(&["job"])); + let b = agg(vec![2], AggIntent::Avg { col: None }, metric_scan(&["job"])); let space = search_workload(vec![("a", a), ("b", b)]); let root = &space.roots[0].1; let selected = space.global_selection(&PreferLogicalRewrite); @@ -9657,26 +9560,30 @@ mod tests { #[test] fn topological_order_puts_a_later_discovered_parent_before_its_child() { - // Mirrors nested_shared_sub_dag_below_an_unshared_parent_is_still_discovered's + // Mirrors nested_shared_sub-DAG_below_an_unshared_parent_is_still_discovered's // diamond fixture: discover_targets's own `order` visits root_b (a // parent of `shared`) *after* `shared` itself, because `shared` was // already fully walked via root_a first. A naive "process // discover_targets's own order" DP would see root_b's child edge // after already processing `shared` — topological_order must not // make that mistake. + use asap_types::ir::Predicate; use asap_types::pre_asap::expr_ir::ScalarValue; - use asap_types::pre_asap::query_expr::Predicate; let shared = agg(vec![2], AggIntent::Sum { col: None }, metric_scan(&["job"])); - let root_a = QueryExpr::Filter { - pred: Predicate(Rc::new(QueryExpr::Literal(ScalarValue::Int64(1)))), - child: Rc::new(shared.clone()), - }; - let root_b = QueryExpr::Filter { - pred: Predicate(Rc::new(QueryExpr::Literal(ScalarValue::Int64(2)))), - child: Rc::new(shared), - }; - let roots = vec![("a", Rc::new(root_a)), ("b", Rc::new(root_b))]; + let root_a = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Filter { + pred: Predicate(ScalarExpr::Literal(ScalarValue::Int64(1))), + child: shared.clone(), + })) + .unwrap(); + let root_b = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Filter { + pred: Predicate(ScalarExpr::Literal(ScalarValue::Int64(2))), + child: shared, + })) + .unwrap(); + let roots = vec![("a", root_a), ("b", root_b)]; let mut order = Vec::new(); let mut nodes = HashMap::new(); @@ -9702,10 +9609,10 @@ mod tests { // Discovery-order sanity: root_b comes after the shared child in // discover_targets's own order (the exact non-topological case this // test exists to cover). - let QueryExpr::Filter { + let Some(NonASAPOp::Filter { child: shared_via_a, .. - } = space.roots[0].1.as_ref() + }) = space.roots[0].1.non_asap() else { panic!("expected a Filter root"); }; @@ -9738,7 +9645,7 @@ mod tests { // module docs — so this always converges in exactly 2 passes). let a = agg(vec![2], default_quantile(0.99), metric_scan(&["job"])); let b = agg(vec![2], default_quantile(0.99), metric_scan(&["job"])); - let space = search_workload(vec![("a", Rc::new(a)), ("b", Rc::new(b))]); + let space = search_workload(vec![("a", a), ("b", b)]); assert!(!space.is_empty()); } @@ -9764,19 +9671,23 @@ mod tests { fn replacements(&self, target: &TargetSubDAG<'_>) -> Vec { let n = self.next.get(); self.next.set(n + 1); + use asap_types::ir::Predicate; use asap_types::pre_asap::expr_ir::ScalarValue; - use asap_types::pre_asap::query_expr::Predicate; - let fresh_inner_layer = QueryExpr::Filter { - pred: Predicate(Rc::new(QueryExpr::Literal(ScalarValue::Int64(n)))), - child: Rc::clone(target.root), - }; - let outer_wrapper = QueryExpr::Filter { - pred: Predicate(Rc::new(QueryExpr::Literal(ScalarValue::Boolean(true)))), - child: Rc::new(fresh_inner_layer), - }; + let fresh_inner_layer = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Filter { + pred: Predicate(ScalarExpr::Literal(ScalarValue::Int64(n))), + child: Rc::clone(target.root), + })) + .unwrap(); + let outer_wrapper = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Filter { + pred: Predicate(ScalarExpr::Literal(ScalarValue::Boolean(true))), + child: fresh_inner_layer, + })) + .unwrap(); vec![ReplacementSubDAG { strategy: "AlwaysGrowingStrategy", - replacement: Replacement::Rewrite(Rc::new(outer_wrapper)), + replacement: Replacement::SubDAG(outer_wrapper), provenance: ReplacementProvenance::LogicalRewrite, rationale: format!("pathological candidate #{n}"), }] @@ -9786,13 +9697,13 @@ mod tests { #[test] #[should_panic(expected = "did not converge")] fn a_pathologically_growing_strategy_trips_the_iteration_cap() { - let root = Rc::new(metric_scan(&["job"])); + let root = metric_scan(&["job"]); let strategies: Vec> = vec![Box::new(AlwaysGrowingStrategy { next: std::cell::Cell::new(0), })]; let _ = search_workload_with(vec![("q", root)], &strategies); } - // ── realize_child / keep_pre_asap: end-to-end single-target realization ── + // ── realize_child / retain_exact: end-to-end single-target realization ── // // Moved from the former `bind.rs` (issue #251): `bind.rs`'s own // workload-wide orchestration (`implement_workload`/ @@ -9805,17 +9716,6 @@ mod tests { // pattern by hand since `realize_child` is `pub(crate)`), these tests // call `realize_child` directly. - fn agg_per_entity(intent: AggIntent, child: QueryExpr) -> QueryExpr { - QueryExpr::Aggregate { - reduction: ReductionTy::PerEntity, - measures: vec![intent], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(child), - } - } - fn field<'a>(schema: &'a Schema, name: &str) -> &'a Field { schema .fields @@ -9825,29 +9725,29 @@ mod tests { } fn realize_first( - expr: &QueryExpr, + expr: &OperatorNode, cost_model: &dyn CostModel, - ) -> Result, RealizationError> { + ) -> Result, RealizationError> { realize_child(&Rc::new(expr.clone()), cost_model) } - fn realize(expr: &QueryExpr) -> Result, RealizationError> { + fn realize(expr: &OperatorNode) -> Result, RealizationError> { realize_first(expr, &DefaultCostModel) } #[test] fn quantile_realizes_kll_wrapped_in_estimate() { // quantile by (job) (m) at ε=0.01 → Estimate(Quantile) over - // SummaryAgg(Kll{k:269}) over KeepPreAsap(Scan). job = col 2. + // SummaryAgg(Kll{k:269}) over the kept Scan. job = col 2. let q = agg(vec![2], default_quantile(0.99), metric_scan(&["job"])); let root = realize(&q).unwrap(); - let SummaryExpr::SummaryEstimate { + let Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, query, - } = &root.expr + }) = &root.operator else { - panic!("expected SummaryEstimate root, got {:?}", root.expr); + panic!("expected SummaryEstimate root, got {:?}", root.operator); }; assert!(matches!(query, PostAsapSketchStatistic::Quantile { q } if *q == 0.99)); // Estimate edge: plain row shape — group key + Float64 answer. @@ -9860,15 +9760,15 @@ mod tests { FieldDataType::Plain(DataType::Utf8) ); - let SummaryExpr::SummaryAgg { + let Operator::ASAP(ASAPOp::SummaryAgg { child, family, input, reduction, .. - } = &summary_input.expr + }) = &summary_input.operator else { - panic!("expected SummaryAgg, got {:?}", summary_input.expr); + panic!("expected SummaryAgg, got {:?}", summary_input.operator); }; assert_eq!( family, @@ -9888,8 +9788,9 @@ mod tests { GroupingStrategy::default() ) ); - assert!(matches!(child.expr, SummaryExpr::KeepPreAsap(ref e) - if matches!(**e, QueryExpr::Scan { .. }))); + // The kept pre-ASAP leaf is the Scan node itself (no wrapper). + assert!(matches!(child.non_asap(), Some(NonASAPOp::Scan { .. }))); + assert!(!child.contains_asap()); } /// A deployment-supplied [`CostModel`] can override the default KLL @@ -9919,11 +9820,15 @@ mod tests { // Default: KLL (see `quantile_realizes_kll_wrapped_in_estimate` above). let default_root = realize(&q).unwrap(); - let SummaryExpr::SummaryEstimate { summary_input, .. } = &default_root.expr else { - panic!("expected SummaryEstimate root, got {:?}", default_root.expr); + let Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) = &default_root.operator + else { + panic!( + "expected SummaryEstimate root, got {:?}", + default_root.operator + ); }; - let SummaryExpr::SummaryAgg { family, .. } = &summary_input.expr else { - panic!("expected SummaryAgg, got {:?}", summary_input.expr); + let Operator::ASAP(ASAPOp::SummaryAgg { family, .. }) = &summary_input.operator else { + panic!("expected SummaryAgg, got {:?}", summary_input.operator); }; assert!(matches!( family, @@ -9932,11 +9837,15 @@ mod tests { // With `PreferDDSketchViaCostModel`: DDSketch instead, same query. let custom_root = realize_first(&q, &PreferDDSketchViaCostModel).unwrap(); - let SummaryExpr::SummaryEstimate { summary_input, .. } = &custom_root.expr else { - panic!("expected SummaryEstimate root, got {:?}", custom_root.expr); + let Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) = &custom_root.operator + else { + panic!( + "expected SummaryEstimate root, got {:?}", + custom_root.operator + ); }; - let SummaryExpr::SummaryAgg { family, .. } = &summary_input.expr else { - panic!("expected SummaryAgg, got {:?}", summary_input.expr); + let Operator::ASAP(ASAPOp::SummaryAgg { family, .. }) = &summary_input.operator else { + panic!("expected SummaryAgg, got {:?}", summary_input.operator); }; assert_eq!( family, @@ -9953,8 +9862,8 @@ mod tests { /// A deployment-supplied `CostModel` can realize an `AggIntent::Extension` /// intent as a real sketch instead of the default `PassThrough` (issue /// #150) — `realizations_for_intent` must consult `realize_extension` - /// for the `Extension` arm, and `readout` must consult - /// `readout_extension` to build its `SketchStatistic` without panicking. + /// for the `Extension` arm, and `evaluation` must consult + /// `evaluation_extension` to build its `SketchStatistic` without panicking. struct FrequencyCostModel; impl CostModel for FrequencyCostModel { @@ -9980,7 +9889,7 @@ mod tests { } } - fn readout_extension( + fn evaluation_extension( &self, ext_kind: &str, payload: &serde_json::Value, @@ -10006,7 +9915,7 @@ mod tests { }; let q = agg(vec![], intent, metric_scan(&[])); let root = realize(&q).unwrap(); - assert!(matches!(root.expr, SummaryExpr::KeepPreAsap(_))); + assert!(!root.contains_asap()); } #[test] @@ -10018,12 +9927,12 @@ mod tests { let q = agg(vec![], intent, metric_scan(&[])); let root = realize_first(&q, &FrequencyCostModel).unwrap(); - let SummaryExpr::SummaryEstimate { + let Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, query, - } = &root.expr + }) = &root.operator else { - panic!("expected SummaryEstimate root, got {:?}", root.expr); + panic!("expected SummaryEstimate root, got {:?}", root.operator); }; assert!(matches!( query, @@ -10031,8 +9940,8 @@ mod tests { if k == "item" && v == "checkout" )); - let SummaryExpr::SummaryAgg { family, .. } = &summary_input.expr else { - panic!("expected SummaryAgg, got {:?}", summary_input.expr); + let Operator::ASAP(ASAPOp::SummaryAgg { family, .. }) = &summary_input.operator else { + panic!("expected SummaryAgg, got {:?}", summary_input.operator); }; assert_eq!( family, @@ -10053,10 +9962,10 @@ mod tests { fn exact_sum_realizes_accumulator_without_estimate() { let q = agg(vec![2], AggIntent::Sum { col: None }, metric_scan(&["job"])); let root = realize(&q).unwrap(); - let SummaryExpr::SummaryAgg { family, .. } = &root.expr else { + let Operator::ASAP(ASAPOp::SummaryAgg { family, .. }) = &root.operator else { panic!( "expected bare SummaryAgg (no estimate), got {:?}", - root.expr + root.operator ); }; assert_eq!( @@ -10076,14 +9985,16 @@ mod tests { use std::time::Duration; let q = agg_per_entity( AggIntent::Rate, - QueryExpr::TimeRange { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::TimeRange { + kind: TimeRangeKind::Range, range: Duration::from_secs(300), - child: Rc::new(metric_scan(&["job"])), - }, + child: metric_scan(&["job"]), + })) + .unwrap(), ); let root = realize(&q).unwrap(); - let SummaryExpr::SummaryAgg { family, .. } = &root.expr else { - panic!("expected SummaryAgg, got {:?}", root.expr); + let Operator::ASAP(ASAPOp::SummaryAgg { family, .. }) = &root.operator else { + panic!("expected SummaryAgg, got {:?}", root.operator); }; assert_eq!( family, @@ -10114,17 +10025,19 @@ mod tests { use std::time::Duration; let q = agg_per_entity( default_quantile(0.99), - QueryExpr::TimeRange { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::TimeRange { + kind: TimeRangeKind::Range, range: Duration::from_secs(10), - child: Rc::new(metric_scan(&["job"])), - }, + child: metric_scan(&["job"]), + })) + .unwrap(), ); let root = realize(&q).unwrap(); - let SummaryExpr::SummaryEstimate { summary_input, .. } = &root.expr else { - panic!("expected estimate root, got {:?}", root.expr); + let Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) = &root.operator else { + panic!("expected estimate root, got {:?}", root.operator); }; - let SummaryExpr::SummaryAgg { reduction, .. } = &summary_input.expr else { - panic!("expected SummaryAgg, got {:?}", summary_input.expr); + let Operator::ASAP(ASAPOp::SummaryAgg { reduction, .. }) = &summary_input.operator else { + panic!("expected SummaryAgg, got {:?}", summary_input.operator); }; assert_eq!(reduction, &ReductionTy::PerEntity); } @@ -10142,11 +10055,11 @@ mod tests { }; let q = agg(vec![], intent, metric_scan(&["job"])); let root = realize(&q).unwrap(); - let SummaryExpr::SummaryEstimate { summary_input, .. } = &root.expr else { - panic!("expected estimate root, got {:?}", root.expr); + let Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) = &root.operator else { + panic!("expected estimate root, got {:?}", root.operator); }; - let SummaryExpr::SummaryAgg { reduction, .. } = &summary_input.expr else { - panic!("expected SummaryAgg, got {:?}", summary_input.expr); + let Operator::ASAP(ASAPOp::SummaryAgg { reduction, .. }) = &summary_input.operator else { + panic!("expected SummaryAgg, got {:?}", summary_input.operator); }; assert_eq!(reduction, &ReductionTy::by(vec![])); } @@ -10158,39 +10071,41 @@ mod tests { // accumulator. let inner = agg(vec![2], AggIntent::Sum { col: None }, metric_scan(&["job"])); let outer = agg(vec![], default_quantile(0.9), inner); - let root = realize(&outer).unwrap(); + // Timing is not stored during realization: time the candidate under + // a maintained materialization assignment to read the maintenance boundary. + let root = maintained(&realize(&outer).unwrap()); - let SummaryExpr::SummaryEstimate { summary_input, .. } = &root.expr else { - panic!("expected estimate root, got {:?}", root.expr); + let Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) = &root.operator else { + panic!("expected estimate root, got {:?}", root.operator); }; - let SummaryExpr::SummaryAgg { child, family, .. } = &summary_input.expr else { - panic!("expected outer SummaryAgg, got {:?}", summary_input.expr); + let Operator::ASAP(ASAPOp::SummaryAgg { child, family, .. }) = &summary_input.operator + else { + panic!( + "expected outer SummaryAgg, got {:?}", + summary_input.operator + ); }; assert!(matches!( family, FieldDataType::Sketch(kind, _) if kind.algorithm() == &SketchAlgorithm::Kll )); - let SummaryExpr::ValueOperation { - child, - operation: ValueOperation::FinalizeExactAccumulator, - timing: ExecutionTiming::IngestionTime, - } = &child.expr - else { - panic!("expected explicit maintenance readout"); + assert_eq!(child.timing, Some(ExecutionTiming::IngestionTime)); + let Operator::ASAP(ASAPOp::FinalizeExactAccumulator { child }) = &child.operator else { + panic!("expected explicit maintenance evaluation"); }; - let SummaryExpr::SummaryAgg { + let Operator::ASAP(ASAPOp::SummaryAgg { family: inner_family, child: leaf, .. - } = &child.expr + }) = &child.operator else { - panic!("expected inner SummaryAgg, got {:?}", child.expr); + panic!("expected inner SummaryAgg, got {:?}", child.operator); }; assert_eq!( inner_family, &FieldDataType::ExactAggregate(ExactKind::Sum, ExactParams::Sum) ); - assert!(matches!(leaf.expr, SummaryExpr::KeepPreAsap(_))); + assert!(!leaf.contains_asap()); } /// Issue #115: the summary is built over the intent's own input columns. @@ -10225,13 +10140,15 @@ mod tests { } } - /// The update expression of the first `SummaryAgg` in the DAG. - fn find_summary_input(node: &SummaryNode) -> Option { - match &node.expr { - SummaryExpr::SummaryAgg { input, .. } if input.item.is_none() => { + /// The update expression of the first `SummaryAgg` in the tree. + fn find_summary_input(node: &OperatorNode) -> Option { + match &node.operator { + Operator::ASAP(ASAPOp::SummaryAgg { input, .. }) if input.item.is_none() => { Some(input.weight.clone()) } - SummaryExpr::SummaryEstimate { summary_input, .. } => find_summary_input(summary_input), + Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) => { + find_summary_input(summary_input) + } _ => None, } } @@ -10252,59 +10169,62 @@ mod tests { ] { let q = agg(vec![2], intent.clone(), metric_scan(&["job"])); let root = realize(&q).unwrap(); + // Kept pass-through: the pre-ASAP node itself, not a wrapper. assert!( - matches!(root.expr, SummaryExpr::KeepPreAsap(ref e) if **e == q), - "expected KeepPreAsap passthrough for {intent:?}" + !root.contains_asap() && root.operator == q.operator && root.schema == q.schema, + "expected kept pre-ASAP passthrough for {intent:?}" ); } } #[test] fn logical_parent_subsumes_bindable_child() { - // Filter over a bindable quantile: `KeepPreAsap` has no post-ASAP - // children, so the conservative fallback keeps the whole sub-DAG + // Filter over a bindable quantile: a kept non-ASAP sub-DAG has no + // summary children, so the conservative fallback keeps the whole sub-DAG // logical. + use asap_types::ir::Predicate; use asap_types::pre_asap::expr_ir::{CompareOpKind, ScalarValue}; - use asap_types::pre_asap::query_expr::Predicate; - let q = QueryExpr::Filter { - pred: Predicate(Rc::new(QueryExpr::Compare { - left: Rc::new(QueryExpr::Column(0)), + let q = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Filter { + pred: Predicate(ScalarExpr::Compare { + left: Box::new(ScalarExpr::Column(0)), op: CompareOpKind::Gt, - right: Rc::new(QueryExpr::Literal(ScalarValue::Float64(0.5))), - })), - child: Rc::new(agg(vec![], default_quantile(0.99), metric_scan(&[]))), - }; + right: Box::new(ScalarExpr::Literal(ScalarValue::Float64(0.5))), + semantics: asap_types::ir::ExprSemantics::Promql, + }), + child: agg(vec![], default_quantile(0.99), metric_scan(&[])), + })) + .unwrap(); let root = realize(&q).unwrap(); - assert!(matches!(root.expr, SummaryExpr::KeepPreAsap(ref e) if **e == q)); + assert!( + !root.contains_asap() && root.operator == q.operator && root.schema == q.schema, + "expected the whole Filter sub_dag kept pre-ASAP" + ); } #[test] fn having_and_multi_intent_stay_logical() { + use asap_types::ir::Predicate; use asap_types::pre_asap::expr_ir::ScalarValue; - use asap_types::pre_asap::query_expr::Predicate; - let mut q = agg(vec![2], default_quantile(0.99), metric_scan(&["job"])); - if let QueryExpr::Aggregate { having, .. } = &mut q { - *having = Some(Predicate(Rc::new(QueryExpr::Literal( - ScalarValue::Boolean(true), - )))); - } - assert!(matches!( - realize(&q).unwrap().expr, - SummaryExpr::KeepPreAsap(_) - )); - - let multi = QueryExpr::Aggregate { - reduction: ReductionTy::by(vec![2]), - measures: vec![AggIntent::Sum { col: None }, AggIntent::Avg { col: None }], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(metric_scan(&["job"])), - }; - assert!(matches!( - realize(&multi).unwrap().expr, - SummaryExpr::KeepPreAsap(_) - )); + let q = crate::test_support::aggregate( + ReductionTy::by(vec![2]), + vec![default_quantile(0.99)], + vec![], + Some(Predicate(ScalarExpr::Literal(ScalarValue::Boolean(true)))), + metric_scan(&["job"]), + ); + assert!(!realize(&q).unwrap().contains_asap()); + + let multi = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { + reduction: ReductionTy::by(vec![2]), + measures: vec![AggIntent::Sum { col: None }, AggIntent::Avg { col: None }], + output_names: vec![], + filters: vec![], + having: None, + child: metric_scan(&["job"]), + })) + .unwrap(); + assert!(!realize(&multi).unwrap().contains_asap()); } // No binding rule applies a per-measure `FILTER` (#466), so the @@ -10312,18 +10232,16 @@ mod tests { #[test] fn filtered_measure_stays_logical() { use asap_types::pre_asap::expr_ir::ScalarValue; - use asap_types::pre_asap::query_expr::Predicate; let mut q = agg(vec![2], default_quantile(0.99), metric_scan(&["job"])); - if let QueryExpr::Aggregate { filters, .. } = &mut q { - *filters = vec![Some(Predicate(Rc::new(QueryExpr::Literal( - ScalarValue::Boolean(true), + if let Operator::NonASAP(NonASAPOp::Aggregate { filters, .. }) = + &mut Rc::make_mut(&mut q).operator + { + *filters = vec![Some(Predicate(ScalarExpr::Literal(ScalarValue::Boolean( + true, ))))]; } assert!(bindable_intent(&q).is_none()); - assert!(matches!( - realize(&q).unwrap().expr, - SummaryExpr::KeepPreAsap(_) - )); + assert!(!realize(&q).unwrap().contains_asap()); } #[test] @@ -10337,7 +10255,7 @@ mod tests { metric_scan(&["job"]), ); let root = realize(&q).unwrap(); - assert!(matches!(root.expr, SummaryExpr::KeepPreAsap(_))); + assert!(!root.contains_asap()); } #[test] @@ -10349,20 +10267,20 @@ mod tests { }, metric_scan(&["job"]), ); - let root = Rc::new(agg( + let root = agg( vec![], AggIntent::TopK { k: 5, accuracy: AccuracyTarget::Epsilon(0.01), }, inner, - )); + ); let proposals = - SketchAlgorithmStrategy::default_cost_model().replacements(&TargetSubDAG::new(&root)); + ASAPStrategies::default_cost_model().replacements(&TargetSubDAG::new(&root)); assert!(!proposals.is_empty()); assert!(proposals.iter().any(|candidate| matches!( &candidate.replacement, - Replacement::Summary(node) if node.guarantee.as_ref().is_some_and(|g| + Replacement::SubDAG(node) if node.guarantee.as_ref().is_some_and(|g| g.bound.evaluate().is_none() && g.failure_probability.evaluate().is_none()) ))); @@ -10402,7 +10320,7 @@ mod tests { }, metric_scan(&["job"]), ); - let q = Rc::new(agg( + let q = agg( vec![], AggIntent::TopK { k: 5, @@ -10412,8 +10330,8 @@ mod tests { }, }, inner, - )); - let strategy = SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence( + ); + let strategy = ASAPStrategies::new_with_planning_inputs_and_evidence( &DefaultCostModel, &DefaultAccuracyModel, &EqualSplitAllocator, @@ -10423,7 +10341,7 @@ mod tests { assert!(!replacements.is_empty()); assert!(replacements.iter().all(|candidate| matches!( &candidate.replacement, - Replacement::Summary(node) + Replacement::SubDAG(node) if node.guarantee.as_ref().is_some_and(|g| g.metric == ErrorMetric::TopKMembership && g.failure_probability.evaluate() == Some(0.005)) @@ -10439,15 +10357,15 @@ mod tests { }, metric_scan(&["service"]), ); - let outer = Rc::new(agg( + let outer = agg( vec![], AggIntent::TopK { k: 10, accuracy: AccuracyTarget::Epsilon(0.01), }, inner, - )); - let strategy = SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence( + ); + let strategy = ASAPStrategies::new_with_planning_inputs_and_evidence( &DefaultCostModel, &DefaultAccuracyModel, &EqualSplitAllocator, @@ -10457,26 +10375,26 @@ mod tests { let node = candidates .iter() .find_map(|candidate| match &candidate.replacement { - Replacement::Summary(node) if candidate.rationale.contains("CmsWithHeap") => { + Replacement::SubDAG(node) if candidate.rationale.contains("CmsWithHeap") => { Some(node) } _ => None, }) .expect("CmsWithHeap candidate"); - let SummaryExpr::SummaryEstimate { + let Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, query, - } = &node.expr + }) = &node.operator else { - panic!("expected Top-K readout") + panic!("expected Top-K evaluation") }; assert!(matches!(query, PostAsapSketchStatistic::TopK { k: 10 })); - let SummaryExpr::SummaryAgg { + let Operator::ASAP(ASAPOp::SummaryAgg { child, family, input, .. - } = &summary_input.expr + }) = &summary_input.operator else { panic!("expected fused summary aggregation") }; @@ -10496,7 +10414,7 @@ mod tests { FieldDataType::Sketch(kind, _) if kind.algorithm() == &SketchAlgorithm::CmsWithHeap )); - assert!(matches!(child.expr, SummaryExpr::KeepPreAsap(_))); + assert!(!child.contains_asap()); } #[test] @@ -10506,15 +10424,15 @@ mod tests { AggIntent::Sum { col: None }, metric_scan(&["service"]), ); - let outer = Rc::new(agg( + let outer = agg( vec![], AggIntent::TopK { k: 5, accuracy: AccuracyTarget::Epsilon(0.01), }, inner, - )); - let strategy = SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence( + ); + let strategy = ASAPStrategies::new_with_planning_inputs_and_evidence( &DefaultCostModel, &DefaultAccuracyModel, &EqualSplitAllocator, @@ -10531,7 +10449,7 @@ mod tests { let node = candidates .iter() .find_map(|candidate| match &candidate.replacement { - Replacement::Summary(node) + Replacement::SubDAG(node) if candidate.rationale.contains("CountSketchWithHeap") => { Some(node) @@ -10539,15 +10457,16 @@ mod tests { _ => None, }) .expect("CountSketchWithHeap candidate"); - let SummaryExpr::SummaryEstimate { + let Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, query, - } = &node.expr + }) = &node.operator else { - panic!("expected Top-K readout") + panic!("expected Top-K evaluation") }; assert!(matches!(query, PostAsapSketchStatistic::TopK { k: 5 })); - let SummaryExpr::SummaryAgg { child, input, .. } = &summary_input.expr else { + let Operator::ASAP(ASAPOp::SummaryAgg { child, input, .. }) = &summary_input.operator + else { panic!("expected fused summary aggregation") }; assert!(matches!( @@ -10558,31 +10477,37 @@ mod tests { input.weight, SummaryInputExpr::Column(ColumnRef::SampleValue) ); - assert!(matches!(child.expr, SummaryExpr::KeepPreAsap(_))); + assert!(!child.contains_asap()); } #[test] fn temporal_per_entity_topk_uses_series_identity_and_sample_value() { - let inner = QueryExpr::Aggregate { - reduction: ReductionTy::PerEntity, - measures: vec![AggIntent::Sum { col: None }], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(QueryExpr::TimeRange { - range: std::time::Duration::from_secs(60), - child: Rc::new(metric_scan(&["service"])), - }), - }; - let outer = Rc::new(agg( + let inner = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { + reduction: ReductionTy::PerEntity, + measures: vec![AggIntent::Sum { col: None }], + output_names: vec![], + filters: vec![], + having: None, + child: OperatorNode::new_shared(asap_types::ir::Operator::NonASAP( + NonASAPOp::TimeRange { + kind: TimeRangeKind::Range, + range: std::time::Duration::from_secs(60), + child: metric_scan(&["service"]), + }, + )) + .unwrap(), + })) + .unwrap(); + let outer = agg( vec![2], AggIntent::TopK { k: 5, accuracy: AccuracyTarget::Epsilon(0.01), }, inner, - )); - let strategy = SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence( + ); + let strategy = ASAPStrategies::new_with_planning_inputs_and_evidence( &DefaultCostModel, &DefaultAccuracyModel, &EqualSplitAllocator, @@ -10590,13 +10515,14 @@ mod tests { ); let candidates = strategy.replacements(&TargetSubDAG::new(&outer)); let input = candidates.iter().find_map(|candidate| { - let Replacement::Summary(node) = &candidate.replacement else { + let Replacement::SubDAG(node) = &candidate.replacement else { return None; }; - let SummaryExpr::SummaryEstimate { summary_input, .. } = &node.expr else { + let Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) = &node.operator + else { return None; }; - let SummaryExpr::SummaryAgg { input, .. } = &summary_input.expr else { + let Operator::ASAP(ASAPOp::SummaryAgg { input, .. }) = &summary_input.operator else { return None; }; input.item.is_some().then_some(input) @@ -10625,15 +10551,15 @@ mod tests { }, metric_scan(&["service", "region"]), ); - let outer = Rc::new(agg( + let outer = agg( vec![], AggIntent::TopK { k: 10, accuracy: AccuracyTarget::Epsilon(0.01), }, inner, - )); - let strategy = SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence( + ); + let strategy = ASAPStrategies::new_with_planning_inputs_and_evidence( &DefaultCostModel, &DefaultAccuracyModel, &EqualSplitAllocator, @@ -10644,10 +10570,10 @@ mod tests { .replacements(&TargetSubDAG::new(&outer)) .into_iter() .find_map(|candidate| match candidate.replacement { - Replacement::Summary(node) => match &node.expr { - SummaryExpr::SummaryEstimate { summary_input, .. } => { - match &summary_input.expr { - SummaryExpr::SummaryAgg { input, .. } => Some(input.clone()), + Replacement::SubDAG(node) => match &node.operator { + Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) => { + match &summary_input.operator { + Operator::ASAP(ASAPOp::SummaryAgg { input, .. }) => Some(input.clone()), _ => None, } } @@ -10678,15 +10604,15 @@ mod tests { ); // The inner aggregate outputs its grouping keys first, so column 2 is // `region`. Each region is a separate Top-K subpopulation. - let outer = Rc::new(agg( + let outer = agg( vec![2], AggIntent::TopK { k: 10, accuracy: AccuracyTarget::Epsilon(0.01), }, inner, - )); - let strategy = SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence( + ); + let strategy = ASAPStrategies::new_with_planning_inputs_and_evidence( &DefaultCostModel, &DefaultAccuracyModel, &EqualSplitAllocator, @@ -10696,12 +10622,12 @@ mod tests { .replacements(&TargetSubDAG::new(&outer)) .into_iter() .find_map(|candidate| match candidate.replacement { - Replacement::Summary(node) => match &node.expr { - SummaryExpr::SummaryEstimate { summary_input, .. } => { - match &summary_input.expr { - SummaryExpr::SummaryAgg { + Replacement::SubDAG(node) => match &node.operator { + Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) => { + match &summary_input.operator { + Operator::ASAP(ASAPOp::SummaryAgg { input, reduction, .. - } => Some((input.clone(), reduction.clone())), + }) => Some((input.clone(), reduction.clone())), _ => None, } } @@ -10726,7 +10652,7 @@ mod tests { fn sql_reducer_resolves_named_input_column() { // SUM(bytes) over a tabular scan: `col` resolves positionally to the // named column, not the PromQL sample value. - let scan = QueryExpr::Scan { + let scan = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Scan { source: Source::Table { table_ref: "t".into(), }, @@ -10740,11 +10666,12 @@ mod tests { unique_keys: vec![], closed: true, }, - }; + })) + .unwrap(); let q = agg(vec![0], AggIntent::Sum { col: Some(1) }, scan); let root = realize(&q).unwrap(); - let SummaryExpr::SummaryAgg { input, .. } = &root.expr else { - panic!("expected SummaryAgg, got {:?}", root.expr); + let Operator::ASAP(ASAPOp::SummaryAgg { input, .. }) = &root.operator else { + panic!("expected SummaryAgg, got {:?}", root.operator); }; let SummaryInputExpr::Column(col) = &input.weight else { panic!("expected observation column") @@ -10809,10 +10736,12 @@ mod tests { } } - fn summary_child(node: &SummaryNode) -> &Rc { - match &node.expr { - SummaryExpr::SummaryEstimate { summary_input, .. } => summary_child(summary_input), - SummaryExpr::SummaryAgg { child, .. } => child, + fn summary_child(node: &OperatorNode) -> &Rc { + match &node.operator { + Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) => { + summary_child(summary_input) + } + Operator::ASAP(ASAPOp::SummaryAgg { child, .. }) => child, other => panic!("expected a SummaryAgg, got {other:?}"), } } @@ -10823,9 +10752,8 @@ mod tests { // registered rule, so every outer sketch candidate is refused with a // typed reason and the raw/pre-ASAP alternative is what remains. let inner = agg(vec![2], default_quantile(0.5), metric_scan(&["job"])); - let outer = Rc::new(agg(vec![], default_quantile(0.99), inner)); - let proposals = - SketchAlgorithmStrategy::default_cost_model().propose(&TargetSubDAG::new(&outer)); + let outer = agg(vec![], default_quantile(0.99), inner); + let proposals = ASAPStrategies::default_cost_model().propose(&TargetSubDAG::new(&outer)); assert!( proposals.candidates.is_empty(), "no outer sketch may be proposed over an approximate child without a rule: {:?}", @@ -10848,7 +10776,7 @@ mod tests { } // Fallback keeps the whole sub-DAG pre-ASAP — executed exactly. let realized = realize_child(&outer, &DefaultCostModel).unwrap(); - assert!(matches!(realized.expr, SummaryExpr::KeepPreAsap(_))); + assert!(!realized.contains_asap()); assert!(realized .guarantee .as_ref() @@ -10856,9 +10784,8 @@ mod tests { // Cross-metric: a quantile over a cardinality estimate. let inner = agg(vec![2], default_cardinality(), metric_scan(&["job"])); - let outer = Rc::new(agg(vec![], default_quantile(0.99), inner)); - let proposals = - SketchAlgorithmStrategy::default_cost_model().propose(&TargetSubDAG::new(&outer)); + let outer = agg(vec![], default_quantile(0.99), inner); + let proposals = ASAPStrategies::default_cost_model().propose(&TargetSubDAG::new(&outer)); assert!(proposals.candidates.is_empty()); assert!(proposals.rejected.iter().all(|r| matches!( &r.error, @@ -10870,14 +10797,14 @@ mod tests { #[test] fn exact_child_contributes_zero_error() { // quantile(0.9, sum by (job) (m)): KLL over an exact Sum accumulator - // — the readout's guarantee is exactly KLL's own local guarantee. + // — the evaluation's guarantee is exactly KLL's own local guarantee. let inner = agg(vec![2], AggIntent::Sum { col: None }, metric_scan(&["job"])); let outer = agg(vec![], default_quantile(0.9), inner); let root = realize(&outer).unwrap(); let guarantee = root .guarantee .as_ref() - .expect("a readout carries a guarantee"); + .expect("a evaluation carries a guarantee"); assert_eq!(guarantee.metric, ErrorMetric::Rank); assert_eq!( guarantee.bound.evaluate(), @@ -10894,7 +10821,7 @@ mod tests { ))); // The sketch *state* node carries no guarantee; the exact // accumulator's state is its value and does. - let SummaryExpr::SummaryEstimate { summary_input, .. } = &root.expr else { + let Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) = &root.operator else { panic!() }; assert!(summary_input.guarantee.is_none()); @@ -10905,16 +10832,19 @@ mod tests { } #[test] - fn exact_sum_can_consume_an_approximate_readout() { + fn exact_sum_can_consume_an_approximate_evaluation() { // sum(count_distinct by (job) (m)) is an outer exact summary over - // the inner HLL readout. Both summary levels remain explicit. + // the inner HLL evaluation. Both summary levels remain explicit. let inner = agg(vec![2], default_cardinality(), metric_scan(&["job"])); let outer = agg(vec![], AggIntent::Sum { col: None }, inner); let root = realize(&outer).unwrap(); - let SummaryExpr::SummaryAgg { child, .. } = &root.expr else { + let Operator::ASAP(ASAPOp::SummaryAgg { child, .. }) = &root.operator else { panic!("outer exact sum should remain a SummaryAgg") }; - assert!(matches!(child.expr, SummaryExpr::SummaryEstimate { .. })); + assert!(matches!( + child.operator, + Operator::ASAP(ASAPOp::SummaryEstimate { .. }) + )); assert!(root.guarantee.is_some()); // count(...) over the same child is exact: a row count does not @@ -10935,12 +10865,12 @@ mod tests { } #[test] - fn equal_split_allocation_supports_nested_summary_readouts() { + fn equal_split_allocation_supports_nested_summary_evaluations() { // A registered rank-additive rule and valid budget split make both // summary levels explicit while preserving the composed guarantee. let inner = agg(vec![2], quantile_eps(0.5, 0.1), metric_scan(&["job"])); - let outer = Rc::new(agg(vec![], quantile_eps(0.99, 0.1), inner)); - let strategy = SketchAlgorithmStrategy::new_with_planning_inputs( + let outer = agg(vec![], quantile_eps(0.99, 0.1), inner); + let strategy = ASAPStrategies::new_with_planning_inputs( &DefaultCostModel, &RankAdditiveModel, &EqualSplitAllocator, @@ -10949,13 +10879,15 @@ mod tests { assert!(!proposals.candidates.is_empty()); assert!(proposals.candidates.iter().all(|candidate| { - let Replacement::Summary(node) = &candidate.replacement else { + let Replacement::SubDAG(node) = &candidate.replacement else { return false; }; - matches!(node.expr, SummaryExpr::SummaryEstimate { .. }) - && node.guarantee.as_ref().is_some_and(|guarantee| { - DefaultAccuracyModel.satisfies(guarantee, &AccuracyTarget::Epsilon(0.1)) - }) + matches!( + node.operator, + Operator::ASAP(ASAPOp::SummaryEstimate { .. }) + ) && node.guarantee.as_ref().is_some_and(|guarantee| { + DefaultAccuracyModel.satisfies(guarantee, &AccuracyTarget::Epsilon(0.1)) + }) })); } @@ -10964,9 +10896,9 @@ mod tests { // The same nested summary remains available through workload search // and global cost ranking. let inner = agg(vec![2], quantile_eps(0.5, 0.1), metric_scan(&["job"])); - let outer = Rc::new(agg(vec![], quantile_eps(0.99, 0.1), inner)); + let outer = agg(vec![], quantile_eps(0.99, 0.1), inner); let strategies: Vec> = - vec![Box::new(SketchAlgorithmStrategy::new_with_planning_inputs( + vec![Box::new(ASAPStrategies::new_with_planning_inputs( &DefaultCostModel, &RankAdditiveModel, &EqualSplitAllocator, @@ -10976,10 +10908,14 @@ mod tests { let group = space.candidates_for_target(root).unwrap(); assert!(!group.rejected.is_empty()); assert!(group.candidates.iter().all(|c| match &c.replacement { - Replacement::Summary(node) => node.guarantee.as_ref().is_some_and(|g| { - DefaultAccuracyModel.satisfies(g, &AccuracyTarget::Epsilon(0.1)) - }), - Replacement::Rewrite(_) => false, + // A summary candidate (old `Replacement::Summary`) contains an + // ASAP node; a logical rewrite (old `Replacement::Rewrite`) does not. + Replacement::SubDAG(node) if node.contains_asap() => { + node.guarantee.as_ref().is_some_and(|g| { + DefaultAccuracyModel.satisfies(g, &AccuracyTarget::Epsilon(0.1)) + }) + } + Replacement::SubDAG(_) => false, Replacement::ExactComposition(_) => false, })); let ranked = space.cost_sorted(&DefaultCostModel); @@ -10992,15 +10928,18 @@ mod tests { .unwrap() .chosen .expect("a nested summary candidate wins"); - let Replacement::Summary(node) = &chosen.replacement else { + let Replacement::SubDAG(node) = &chosen.replacement else { panic!() }; - assert!(matches!(node.expr, SummaryExpr::SummaryEstimate { .. })); + assert!(matches!( + node.operator, + Operator::ASAP(ASAPOp::SummaryEstimate { .. }) + )); } #[test] fn root_target_check_removes_candidates_before_cost_ranking() { - let q = Rc::new(agg(vec![2], default_quantile(0.99), metric_scan(&["job"]))); + let q = agg(vec![2], default_quantile(0.99), metric_scan(&["job"])); // A root target tighter than the node's own ε=0.01: every sketch // candidate misses it and is moved to `rejected`; nothing is left // for the cost model to rank. @@ -11014,7 +10953,7 @@ mod tests { assert!(group .candidates .iter() - .all(|c| matches!(c.replacement, Replacement::Rewrite(_)))); + .all(|c| matches!(&c.replacement, Replacement::SubDAG(n) if !n.contains_asap()))); assert!(group.rejected.iter().all(|r| matches!( r.error, AccuracyError::TargetNotSatisfied { target: AccuracyTarget::Epsilon(e), .. } if e == 0.001 @@ -11033,7 +10972,7 @@ mod tests { assert!(group .candidates .iter() - .any(|c| matches!(c.replacement, Replacement::Summary(_)))); + .any(|c| matches!(&c.replacement, Replacement::SubDAG(n) if n.contains_asap()))); // An `Exact` root target admits only exact candidates. let space = search_workload_with_targets( @@ -11043,11 +10982,11 @@ mod tests { ); let group = space.candidates_for_target(&space.roots[0].1).unwrap(); assert!(group.candidates.iter().all(|c| match &c.replacement { - Replacement::Summary(node) => node + Replacement::SubDAG(node) if node.contains_asap() => node .guarantee .as_ref() .is_some_and(ResultGuarantee::is_exact), - Replacement::Rewrite(_) => true, + Replacement::SubDAG(_) => true, Replacement::ExactComposition(_) => false, })); } @@ -11061,14 +11000,14 @@ mod tests { }, metric_scan(&["job"]), ); - let q = Rc::new(agg( + let q = agg( vec![], AggIntent::TopK { k: 10, accuracy: AccuracyTarget::Epsilon(0.01), }, inner, - )); + ); let space = search_workload_with_targets( vec![("q", Rc::clone(&q), Some(AccuracyTarget::Epsilon(0.01)))], &default_strategies(), @@ -11078,14 +11017,14 @@ mod tests { assert!(group.candidates.iter().any(|candidate| matches!( &candidate.replacement, - Replacement::Summary(node) if node.guarantee.as_ref().is_some_and(ResultGuarantee::has_unknown) + Replacement::SubDAG(node) if node.guarantee.as_ref().is_some_and(ResultGuarantee::has_unknown) ))); let candidate = group .candidates .iter() .find(|candidate| candidate.has_missing_accuracy_evidence()) .unwrap(); - let Replacement::Summary(node) = &candidate.replacement else { + let Replacement::SubDAG(node) = &candidate.replacement else { unreachable!() }; let exported = asap_types::dag_export::export_summary(node); @@ -11109,13 +11048,13 @@ mod tests { fn scoped_hll_evidence_sizes_and_certifies_without_a_deployment_model() { use crate::accuracy::EstimatorContract; struct SourceEvidence { - expression: QueryExpr, + expression: OperatorNode, max_distinct: u32, } impl AccuracyEvidenceProvider for SourceEvidence { - fn estimator_contract(&self, expression: &QueryExpr) -> Option { + fn estimator_contract(&self, expression: &OperatorNode) -> Option { (expression == &self.expression).then_some(EstimatorContract::ClassicHll { - max_distinct_per_readout: self.max_distinct, + max_distinct_per_evaluation: self.max_distinct, }) } } @@ -11123,19 +11062,19 @@ mod tests { epsilon: 0.05, delta: 0.01, }; - let root = Rc::new(agg( + let root = agg( vec![], AggIntent::Cardinality { cols: vec![], accuracy: target.clone(), }, metric_scan(&[]), - )); + ); let evidence = SourceEvidence { expression: (*root).clone(), max_distinct: 128, }; - let strategy = SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence( + let strategy = ASAPStrategies::new_with_planning_inputs_and_evidence( &DefaultCostModel, &DefaultAccuracyModel, &EqualSplitAllocator, @@ -11145,7 +11084,7 @@ mod tests { let hll = candidates .iter() .find_map(|candidate| match &candidate.replacement { - Replacement::Summary(node) + Replacement::SubDAG(node) if summary_family_algorithm(node) == SketchAlgorithm::Hll => { Some(node) @@ -11155,13 +11094,13 @@ mod tests { .expect("HLL candidate"); assert!(DefaultAccuracyModel .satisfies(hll.guarantee.as_ref().expect("HLL confidence"), &target)); - let SummaryExpr::SummaryEstimate { summary_input, .. } = &hll.expr else { - panic!("readout") + let Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) = &hll.operator else { + panic!("evaluation") }; - let SummaryExpr::SummaryAgg { + let Operator::ASAP(ASAPOp::SummaryAgg { family: FieldDataType::Sketch(kind, _), .. - } = &summary_input.expr + }) = &summary_input.operator else { panic!("HLL state") }; @@ -11175,9 +11114,8 @@ mod tests { precision: expected } ); - let absent = - SketchAlgorithmStrategy::default_cost_model().replacements(&TargetSubDAG::new(&root)); - assert!(!absent.iter().any(|candidate| matches!(&candidate.replacement, Replacement::Summary(node) + let absent = ASAPStrategies::default_cost_model().replacements(&TargetSubDAG::new(&root)); + assert!(!absent.iter().any(|candidate| matches!(&candidate.replacement, Replacement::SubDAG(node) if summary_family_algorithm(node) == SketchAlgorithm::Hll && node.guarantee.as_ref().is_some_and(|g| DefaultAccuracyModel.satisfies(g, &target))))); // Invalid contracts, infeasible targets and evidence for another source // must never authorize a confidence-bearing HLL candidate. @@ -11191,30 +11129,30 @@ mod tests { epsilon: 0.05, delta, }; - let query = Rc::new(agg( + let query = agg( vec![], AggIntent::Cardinality { cols: vec![], accuracy: target.clone(), }, metric_scan(&[]), - )); + ); let evidence = SourceEvidence { expression: if wrong_scope { - metric_scan(&["other"]) + (*metric_scan(&["other"])).clone() } else { (*query).clone() }, max_distinct, }; - let strategy = SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence( + let strategy = ASAPStrategies::new_with_planning_inputs_and_evidence( &DefaultCostModel, &DefaultAccuracyModel, &EqualSplitAllocator, &evidence, ); assert!(!strategy.replacements(&TargetSubDAG::new(&query)).iter().any(|candidate| - matches!(&candidate.replacement, Replacement::Summary(node) + matches!(&candidate.replacement, Replacement::SubDAG(node) if summary_family_algorithm(node) == SketchAlgorithm::Hll && node.guarantee.as_ref().is_some_and(|g| DefaultAccuracyModel.satisfies(g, &target))))); } } @@ -11222,40 +11160,42 @@ mod tests { // A value projection cannot consume an opaque exact accumulator edge. #[test] fn residual_projection_finalizes_selected_exact_state() { - let inner = Rc::new(agg(vec![], AggIntent::Sum { col: None }, metric_scan(&[]))); - let root = Rc::new(QueryExpr::Project { - cols: vec![asap_types::pre_asap::ProjectItem { - expr: QueryExpr::Column(0), - alias: Some("result".into()), - }], - qualifier: None, - child: inner.clone(), - }); + let inner = agg(vec![], AggIntent::Sum { col: None }, metric_scan(&[])); + let root = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Project { + cols: vec![ProjectItem { + expr: ScalarExpr::Column(0), + alias: Some("result".into()), + }], + qualifier: None, + child: inner.clone(), + })) + .unwrap(); let space = search_workload_with_targets( vec![("q", root.clone(), Some(AccuracyTarget::Exact))], &default_strategies(), &DefaultAccuracyModel, ); let selected = space.global_selection(&DefaultCostModel); + // CSE re-interns the workload, so the space's root/child `Rc`s are not + // the fixture's. Assembly only assembles children that are discovered + // targets, so seed the memo under the space's own child pointer. + let root = Rc::clone(&space.roots[0].1); + let Some(NonASAPOp::Project { child: inner, .. }) = root.non_asap() else { + unreachable!() + }; + assert!(space.candidates_for_target(inner).is_some()); selected .assembled_nodes .borrow_mut() - .insert(Rc::as_ptr(&inner), realize(inner.as_ref()).unwrap()); + .insert(Rc::as_ptr(inner), realize(inner.as_ref()).unwrap()); let node = selected.assemble_target(&root).unwrap(); - let SummaryExpr::ValueOperation { - child, - operation: ValueOperation::Project { .. }, - .. - } = &node.expr - else { + let Operator::NonASAP(NonASAPOp::Project { child, .. }) = &node.operator else { panic!("expected Project"); }; assert!(matches!( - child.expr, - SummaryExpr::ValueOperation { - operation: ValueOperation::FinalizeExactAccumulator, - .. - } + child.operator, + Operator::ASAP(ASAPOp::FinalizeExactAccumulator { .. }) )); assert!(child .schema @@ -11267,18 +11207,16 @@ mod tests { #[test] fn ranking_uses_aggregate_output_position_not_first_numeric_column() { let logical = agg(vec![2], AggIntent::Sum { col: None }, metric_scan(&["id"])); - let mut values = lift(&logical.output_schema().unwrap()); + let mut values = logical.schema.clone(); values.fields[0].dtype = FieldDataType::Plain(DataType::Int64); assert_eq!(ranking_score_index(&logical, &values).unwrap(), 1); } // A heap's key schema is derived from its encoded item, not all label columns. #[test] - fn heap_readout_preserves_numeric_item_identity() { - let mut raw = metric_scan(&["id", "description"]); - let QueryExpr::Scan { schema, .. } = &mut raw else { - unreachable!() - }; + fn heap_evaluation_preserves_numeric_item_identity() { + let mut schema = metric_scan(&["id", "description"]).schema.clone(); schema.fields[2].dtype = FieldDataType::Plain(DataType::Int64); + let raw = crate::test_support::scan("m", schema); let node = agg( vec![], AggIntent::TopK { @@ -11288,7 +11226,7 @@ mod tests { agg(vec![2], AggIntent::Sum { col: None }, raw.clone()), ); let input = PhysicalSummaryInput { - child: Rc::new(raw), + child: raw, input: SummaryUpdate { item: Some(SummaryInputExpr::Column(ColumnRef::Named("id".into()))), weight: SummaryInputExpr::Constant(1.0), @@ -11297,7 +11235,7 @@ mod tests { }, }, }; - let schema = keyed_heap_readout_schema(&input, &node).unwrap(); + let schema = keyed_heap_evaluation_schema(&input, &node).unwrap(); assert_eq!( schema .fields @@ -11311,4 +11249,59 @@ mod tests { FieldDataType::Plain(DataType::Int64) ); } + + // Every SummaryAgg a strategy proposes declares whole-source coverage of + // the one source it reads (trusted, #570). + #[test] + fn proposed_summary_states_cover_their_whole_source() { + let root = agg( + vec![], + AggIntent::Quantile { + q: 0.9, + col: None, + accuracy: AccuracyTarget::Epsilon(0.01), + }, + metric_scan(&["job"]), + ); + let source = Source::TimeSeries { metric: "m".into() }; + let proposals = ASAPStrategies::default_cost_model().propose(&TargetSubDAG::new(&root)); + let states: Vec<_> = proposals + .candidates + .iter() + .filter_map(|candidate| match &candidate.replacement { + Replacement::SubDAG(node) => Some(node), + _ => None, + }) + .flat_map(OperatorNode::reachable) + .filter(|node| matches!(node.asap(), Some(ASAPOp::SummaryAgg { .. }))) + .collect(); + assert!(!states.is_empty()); + for state in states { + let coverage = state.coverage.as_ref().expect("summary state has coverage"); + assert_eq!(coverage.source, source); + assert_eq!( + coverage.regions, + [CoverageRegion { + time_ms: None, + population: Default::default(), + }] + ); + } + } + + // Whole-source coverage names one source; over two it is not declared. + #[test] + fn whole_source_coverage_needs_exactly_one_source() { + let left = metric_scan(&["job"]); + let right = crate::test_support::scan("n", left.schema.clone()); + assert!(whole_source_coverage(&left).is_some()); + let join = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Join { + kind: asap_types::ir::operator_properties::JoinKind::Inner, + pred: equi_pred(0, 2), + left, + right, + })) + .unwrap(); + assert_eq!(whole_source_coverage(&join), None); + } } diff --git a/crates/asap-aware-mapping/src/rewrite.rs b/crates/asap-aware-mapping/src/rewrite.rs index 94a3d638c..ca752a971 100644 --- a/crates/asap-aware-mapping/src/rewrite.rs +++ b/crates/asap-aware-mapping/src/rewrite.rs @@ -35,7 +35,7 @@ //! - **`without(...)` grouping** leaves an `Aggregate`'s own output schema //! *open* (`closed: false`, see `without_output_schema`), while the //! `Project` this strategy always wraps the rewrite in forces -//! `closed: true` (see `QueryExpr::output_schema`'s `Project` arm). Under +//! `closed: true` (see `NonASAPOp::output_schema`'s `Project` arm). Under //! `without(...)` the rewritten form's `closed` flag would silently flip //! relative to the original — exactly the kind of schema drift this //! module exists to avoid. @@ -43,7 +43,7 @@ //! Both are follow-ups (issue #253 itself scopes to "the concrete case in //! Peilin's comment"), not correctness bugs in what ships here — a node //! outside this scope simply doesn't `match`, the same "safe but -//! uninformative" fallback [`SketchAlgorithmStrategy`]/[`SharedSubDAGStrategy`] +//! uninformative" fallback [`ASAPStrategies`]/[`SharedSubDAGStrategy`] //! already use for shapes they don't have an opinion on. //! //! ## Non-goals (mirrors [`replacement`]'s own discipline) @@ -57,14 +57,15 @@ //! the rewritten form is actually worth picking, by letting the original //! and rewritten forms compete on cost — not this strategy. +use asap_types::ir::non_asap::any_measure_filtered; use std::rc::Rc; +use asap_types::ir::operator_properties::{BinaryOpKind, Reduction}; +use asap_types::ir::{BinaryOperator, NonASAPOp, OperatorNode, ProjectItem, ScalarExpr}; use asap_types::pre_asap::agg_intent::AggIntent; use asap_types::pre_asap::expr_ir::ArithmeticOpKind; -use asap_types::pre_asap::query_expr::{ - any_measure_filtered, BinaryOpKind, ProjectItem, QueryExpr, Reduction, -}; use asap_types::pre_asap::schema::{ColumnId, DataType}; + use asap_types::types::AccuracyTarget; use crate::replacement::{Replacement, ReplacementStrategy, ReplacementSubDAG, TargetSubDAG}; @@ -74,15 +75,35 @@ use crate::replacement::{Replacement, ReplacementStrategy, ReplacementSubDAG, Ta /// the module docs' "Scope" for why `without(...)`/`PerEntity` are /// excluded). Returns the grouping key count and the summed column so /// [`build_rewrite`] doesn't have to re-match. -fn avg_rewrite_target(node: &QueryExpr) -> Option<(usize, Option)> { - let QueryExpr::Aggregate { +/// `a / b` with PromQL arithmetic semantics and no vector matching. +fn arithmetic( + op: ArithmeticOpKind, + lhs: Rc, + rhs: Rc, +) -> Option> { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::BinaryOp { + operator: BinaryOperator { + checked_relative_division: false, + checked_finite_division: false, + kind: BinaryOpKind::Arithmetic(op), + vector_match: None, + }, + return_bool: false, + lhs, + rhs, + })) + .ok() +} + +fn avg_rewrite_target(node: &OperatorNode) -> Option<(usize, Option)> { + let Some(NonASAPOp::Aggregate { reduction, measures, filters, having: None, child, .. - } = node + }) = node.non_asap() else { return None; }; @@ -102,7 +123,7 @@ fn avg_rewrite_target(node: &QueryExpr) -> Option<(usize, Option)> { // therefore be decomposed through it only when the averaged input is // provably non-null; otherwise NULL rows would incorrectly contribute to // the denominator. - let input_schema = child.output_schema().ok()?; + let input_schema = &child.schema; let value_col = col .or_else(|| input_schema.column_id("value")) .or_else(|| (0..input_schema.fields.len()).find(|i| !by.contains(i)))?; @@ -129,21 +150,21 @@ fn avg_rewrite_target(node: &QueryExpr) -> Option<(usize, Option)> { /// exactly regardless of the summed column's own type (integer division /// would otherwise silently reappear whenever the input column is itself /// integer-typed: `Sum`'s output type tracks its input, `Count`'s is always -/// `Int64`, and `QueryExpr::output_schema`'s own `Arithmetic` type inference +/// `Int64`, and `ScalarExpr::scalar_type`'s own `Arithmetic` type inference /// types a `Div` of two `Int64` operands as `Int64` — the explicit operand /// `Cast` is what keeps both the division and rewritten `avg` column /// `Float64` the way the original always was, not an incidental extra step). // These are conditional physical components, never an unconditional Rewrite. // The caller must attach the finite-division execution guard before admission. -pub(crate) fn temporal_average_components(root: &Rc) -> Option> { - let QueryExpr::Aggregate { +pub(crate) fn temporal_average_components(root: &Rc) -> Option> { + let Some(NonASAPOp::Aggregate { reduction: Reduction::PerEntity, measures, filters, child, having: None, .. - } = root.as_ref() + }) = root.non_asap() else { return None; }; @@ -153,10 +174,10 @@ pub(crate) fn temporal_average_components(root: &Rc) -> Option) -> Option) -> Option> { +fn build_rewrite(root: &Rc) -> Option> { let (group_count, col) = avg_rewrite_target(root)?; - let QueryExpr::Aggregate { + let Some(NonASAPOp::Aggregate { reduction, output_names, child, .. - } = root.as_ref() + }) = root.non_asap() else { unreachable!("avg_rewrite_target already confirmed an Aggregate shape"); }; // The original `avg` column's own name: `output_names[0]` if the // producing front end overrode it (SQL threading DataFusion's own - // generated name — see `QueryExpr::Aggregate::output_names`'s docs), + // generated name — see `NonASAPOp::Aggregate::output_names`'s docs), // else `AggIntent::Avg`'s synthetic default. Either way this is the // *only* thing about the original output column this rewrite needs to // reproduce — `AggIntent::Avg::output_column`'s `(Float64, nullable: @@ -210,77 +231,78 @@ fn build_rewrite(root: &Rc) -> Option> { .cloned() .unwrap_or_else(|| "avg".to_string()); - let sum_agg = Rc::new(QueryExpr::Aggregate { - reduction: reduction.clone(), - measures: vec![AggIntent::Sum { col }], - output_names: Vec::new(), - filters: vec![], - having: None, - child: Rc::clone(child), - }); - let count_agg = Rc::new(QueryExpr::Aggregate { - reduction: reduction.clone(), - measures: vec![AggIntent::Count { - accuracy: AccuracyTarget::Exact, - }], - output_names: Vec::new(), - filters: vec![], - having: None, - child: Rc::clone(child), - }); + let sum_agg = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { + reduction: reduction.clone(), + measures: vec![AggIntent::Sum { col }], + output_names: Vec::new(), + filters: vec![], + having: None, + child: Rc::clone(child), + })) + .ok()?; + let count_agg = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { + reduction: reduction.clone(), + measures: vec![AggIntent::Count { + accuracy: AccuracyTarget::Exact, + }], + output_names: Vec::new(), + filters: vec![], + having: None, + child: Rc::clone(child), + })) + .ok()?; let sum_idx = group_count; let mut cols: Vec = (0..group_count) .map(|i| ProjectItem { alias: None, - expr: QueryExpr::Column(i), + expr: ScalarExpr::Column(i), }) .collect(); cols.push(ProjectItem { alias: Some(avg_name), - expr: QueryExpr::Cast { - expr: Rc::new(QueryExpr::Column(sum_idx)), + expr: ScalarExpr::Cast { + expr: Box::new(ScalarExpr::Column(sum_idx)), to: DataType::Float64, try_cast: false, }, }); - let float_sum = Rc::new(QueryExpr::Project { - cols, - qualifier: None, - child: sum_agg, - }); - Some(Rc::new(QueryExpr::BinaryOp { - op: BinaryOpKind::Arithmetic(ArithmeticOpKind::Div), - lhs: float_sum, - rhs: count_agg, - vector_match: None, - })) + let float_sum = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Project { + cols, + qualifier: None, + child: sum_agg, + })) + .ok()?; + arithmetic(ArithmeticOpKind::Div, float_sum, count_agg) } /// Compose adjacent per-entity and cross-entity accumulators when their /// algebra, rather than a query-language spelling, proves equivalence. -pub(crate) fn composed_aggregate_rewrite(root: &Rc) -> Option> { - let original_schema = root.output_schema().ok()?; - let QueryExpr::Aggregate { +pub(crate) fn composed_aggregate_rewrite(root: &Rc) -> Option> { + let original_schema = &root.schema; + let Some(NonASAPOp::Aggregate { reduction: outer_reduction @ Reduction::Reduce(_), measures: outer_measures, output_names, filters: outer_filters, having: None, child, - } = root.as_ref() + }) = root.non_asap() else { return None; }; - let QueryExpr::Aggregate { + let Some(NonASAPOp::Aggregate { reduction: Reduction::PerEntity, measures: inner_measures, filters: inner_filters, having: None, child: inner_child, .. - } = child.as_ref() + }) = child.non_asap() else { return None; }; @@ -297,14 +319,16 @@ pub(crate) fn composed_aggregate_rewrite(root: &Rc) -> Option inner.clone(), _ => return None, }; - let aggregate = Rc::new(QueryExpr::Aggregate { - reduction: outer_reduction.clone(), - measures: vec![composed], - output_names: output_names.clone(), - filters: vec![], - having: None, - child: Rc::clone(inner_child), - }); + let aggregate = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { + reduction: outer_reduction.clone(), + measures: vec![composed], + output_names: output_names.clone(), + filters: vec![], + having: None, + child: Rc::clone(inner_child), + })) + .ok()?; // The outer Sum sees PromQL's Float64 sample value, whereas the composed // Count accumulator is Int64. Keep the original observable type. @@ -321,7 +345,7 @@ pub(crate) fn composed_aggregate_rewrite(root: &Rc) -> Option = (0..by.keys().len()) .map(|i| ProjectItem { alias: None, - expr: QueryExpr::Column(i), + expr: ScalarExpr::Column(i), }) .collect(); cols.push(ProjectItem { @@ -332,17 +356,18 @@ pub(crate) fn composed_aggregate_rewrite(root: &Rc) -> Option) -> Option) -> Option QueryExpr { - let mut columns = vec![ - Field::plain("ts", DataType::Timestamp, false), - Field::plain("value", DataType::Float64, false), - ]; - columns.extend( - labels - .iter() - .map(|n| Field::plain(*n, DataType::Utf8, true)), - ); - QueryExpr::Scan { - source: Source::TimeSeries { metric: "m".into() }, - predicates: vec![], - schema: Schema::with_time_index(columns, 0, vec![]), - } + use crate::test_support::metric_scan; + use asap_types::ir::TimeRangeKind; + + fn avg_agg( + by: Vec, + col: Option, + child: Rc, + ) -> Rc { + avg_agg_with(by, col, vec![], None, child) } - fn avg_agg(by: Vec, col: Option, child: QueryExpr) -> QueryExpr { - QueryExpr::Aggregate { + fn avg_agg_with( + by: Vec, + col: Option, + output_names: Vec, + having: Option, + child: Rc, + ) -> Rc { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { reduction: Reduction::by(by), measures: vec![AggIntent::Avg { col }], - output_names: vec![], + output_names, filters: vec![], - having: None, - child: Rc::new(child), - } + having, + child, + })) + .unwrap() } // Temporal averages expose two single-measure children without closing labels. #[test] fn temporal_average_components_preserves_schema_and_exposes_sum_count() { - let root = Rc::new(lower_promql( - "avg_over_time(a{job=\"api\"}[5m])", - AccuracyTarget::Exact, - )); + let root = lower_promql("avg_over_time(a{job=\"api\"}[5m])", AccuracyTarget::Exact); assert!(SemanticEquivalentRewriteStrategy .replacements(&TargetSubDAG::new(&root)) .is_empty()); let rewritten = temporal_average_components(&root).expect("conditional sum/count components"); - assert_eq!( - root.output_schema().unwrap(), - rewritten.output_schema().unwrap() - ); - assert!(matches!(rewritten.as_ref(), QueryExpr::BinaryOp { .. })); + assert_eq!(root.schema.clone(), rewritten.schema.clone()); + assert!(matches!( + rewritten.non_asap(), + Some(NonASAPOp::BinaryOp { .. }) + )); } // ── matches ────────────────────────────────────────────────────────── #[test] fn matches_a_bare_avg_aggregate() { - let q = Rc::new(avg_agg(vec![], None, metric_scan(&[]))); + let q = avg_agg(vec![], None, metric_scan(&[])); let target = TargetSubDAG::new(&q); assert!(AvgToSumOverCountStrategy.matches(&target)); } #[test] fn matches_a_grouped_avg_aggregate() { - let q = Rc::new(avg_agg(vec![2], None, metric_scan(&["job"]))); + let q = avg_agg(vec![2], None, metric_scan(&["job"])); let target = TargetSubDAG::new(&q); assert!(AvgToSumOverCountStrategy.matches(&target)); } #[test] fn does_not_match_a_multi_measure_aggregate() { - let q = Rc::new(QueryExpr::Aggregate { + let q = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { reduction: Reduction::by(vec![2]), measures: vec![AggIntent::Sum { col: None }, AggIntent::Avg { col: None }], output_names: vec![], filters: vec![], having: None, - child: Rc::new(metric_scan(&["job"])), - }); + child: metric_scan(&["job"]), + })) + .unwrap(); let target = TargetSubDAG::new(&q); assert!(!AvgToSumOverCountStrategy.matches(&target)); assert!(AvgToSumOverCountStrategy.replacements(&target).is_empty()); @@ -494,13 +518,15 @@ mod tests { #[test] fn does_not_match_a_having_bearing_avg_aggregate() { - let mut q = avg_agg(vec![2], None, metric_scan(&["job"])); - if let QueryExpr::Aggregate { having, .. } = &mut q { - *having = Some(asap_types::pre_asap::query_expr::Predicate(Rc::new( - QueryExpr::Literal(asap_types::pre_asap::expr_ir::ScalarValue::Boolean(true)), - ))); - } - let q = Rc::new(q); + let q = avg_agg_with( + vec![2], + None, + vec![], + Some(asap_types::ir::Predicate(ScalarExpr::Literal( + asap_types::pre_asap::expr_ir::ScalarValue::Boolean(true), + ))), + metric_scan(&["job"]), + ); let target = TargetSubDAG::new(&q); assert!(!AvgToSumOverCountStrategy.matches(&target)); assert!(AvgToSumOverCountStrategy.replacements(&target).is_empty()); @@ -515,14 +541,16 @@ mod tests { }, AggIntent::Min { col: None }, ] { - let q = Rc::new(QueryExpr::Aggregate { - reduction: Reduction::by(vec![2]), - measures: vec![intent.clone()], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(metric_scan(&["job"])), - }); + let q = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { + reduction: Reduction::by(vec![2]), + measures: vec![intent.clone()], + output_names: vec![], + filters: vec![], + having: None, + child: metric_scan(&["job"]), + })) + .unwrap(); let target = TargetSubDAG::new(&q); assert!( !AvgToSumOverCountStrategy.matches(&target), @@ -534,16 +562,17 @@ mod tests { #[test] fn does_not_match_a_without_grouped_avg_aggregate() { - let q = Rc::new(QueryExpr::Aggregate { - reduction: Reduction::Reduce(asap_types::pre_asap::query_expr::GroupKeys::without( + let q = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { + reduction: Reduction::Reduce(asap_types::ir::operator_properties::GroupKeys::without( vec![2], )), measures: vec![AggIntent::Avg { col: None }], output_names: vec![], filters: vec![], having: None, - child: Rc::new(metric_scan(&["job"])), - }); + child: metric_scan(&["job"]), + })) + .unwrap(); let target = TargetSubDAG::new(&q); assert!(!AvgToSumOverCountStrategy.matches(&target)); assert!(AvgToSumOverCountStrategy.replacements(&target).is_empty()); @@ -551,14 +580,15 @@ mod tests { #[test] fn does_not_match_a_per_entity_avg_aggregate() { - let q = Rc::new(QueryExpr::Aggregate { + let q = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { reduction: Reduction::PerEntity, measures: vec![AggIntent::Avg { col: None }], output_names: vec![], filters: vec![], having: None, - child: Rc::new(metric_scan(&[])), - }); + child: metric_scan(&[]), + })) + .unwrap(); let target = TargetSubDAG::new(&q); assert!(!AvgToSumOverCountStrategy.matches(&target)); assert!(AvgToSumOverCountStrategy.replacements(&target).is_empty()); @@ -566,7 +596,7 @@ mod tests { #[test] fn does_not_match_a_non_aggregate_node() { - let scan = Rc::new(metric_scan(&["job"])); + let scan = metric_scan(&["job"]); let target = TargetSubDAG::new(&scan); assert!(!AvgToSumOverCountStrategy.matches(&target)); assert!(AvgToSumOverCountStrategy.replacements(&target).is_empty()); @@ -579,7 +609,7 @@ mod tests { #[test] fn avg_rewrites_and_schema_matches_exactly_when_ungrouped() { let original = avg_agg(vec![], None, metric_scan(&[])); - let original_rc = Rc::new(original.clone()); + let original_rc = Rc::clone(&original); let target = TargetSubDAG::new(&original_rc); let replacements = AvgToSumOverCountStrategy.replacements(&target); @@ -587,28 +617,26 @@ mod tests { assert!(!replacements[0].rationale.is_empty()); let rewritten = match &replacements[0].replacement { - Replacement::Rewrite(rc) => rc, + Replacement::SubDAG(rc) => rc, other => panic!("expected a Rewrite replacement, got {other:?}"), }; - let QueryExpr::BinaryOp { lhs, rhs, .. } = rewritten.as_ref() else { + let Some(NonASAPOp::BinaryOp { lhs, rhs, .. }) = rewritten.non_asap() else { panic!("expected sum/count BinaryOp, got {rewritten:?}"); }; - let QueryExpr::Project { child: sum, .. } = lhs.as_ref() else { + let Some(NonASAPOp::Project { child: sum, .. }) = lhs.non_asap() else { panic!("expected cast Project above Sum, got {lhs:?}"); }; - assert!(matches!( - sum.as_ref(), - QueryExpr::Aggregate { measures, .. } + assert!(matches!(sum.non_asap(), + Some(NonASAPOp::Aggregate { measures, .. }) if matches!(measures.as_slice(), [AggIntent::Sum { col: None }]) )); - assert!(matches!( - rhs.as_ref(), - QueryExpr::Aggregate { measures, .. } + assert!(matches!(rhs.non_asap(), + Some(NonASAPOp::Aggregate { measures, .. }) if matches!(measures.as_slice(), [AggIntent::Count { accuracy: AccuracyTarget::Exact }]) )); - let original_schema = original.output_schema().unwrap(); - let rewritten_schema = rewritten.output_schema().unwrap(); + let original_schema = original.schema.clone(); + let rewritten_schema = rewritten.schema.clone(); assert_eq!( original_schema, rewritten_schema, "the rewritten DAG must report exactly the same output schema as the original avg" @@ -620,20 +648,22 @@ mod tests { /// synthetic `"avg"` default. #[test] fn preserves_an_explicit_output_name_override() { - let mut q = avg_agg(vec![], None, metric_scan(&[])); - if let QueryExpr::Aggregate { output_names, .. } = &mut q { - *output_names = vec!["avg_latency".to_string()]; - } - let original_schema = q.output_schema().unwrap(); - let q = Rc::new(q); + let q = avg_agg_with( + vec![], + None, + vec!["avg_latency".to_string()], + None, + metric_scan(&[]), + ); + let original_schema = q.schema.clone(); let target = TargetSubDAG::new(&q); let replacements = AvgToSumOverCountStrategy.replacements(&target); let rewritten = match &replacements[0].replacement { - Replacement::Rewrite(rc) => rc, + Replacement::SubDAG(rc) => rc, other => panic!("expected a Rewrite replacement, got {other:?}"), }; - let rewritten_schema = rewritten.output_schema().unwrap(); + let rewritten_schema = rewritten.schema.clone(); assert_eq!(original_schema, rewritten_schema); assert_eq!(rewritten_schema.fields[0].name, "avg_latency"); } @@ -643,23 +673,23 @@ mod tests { #[test] fn grouped_avg_rewrite_preserves_the_whole_schema() { let original = avg_agg(vec![2], None, metric_scan(&["job"])); - let original_schema = original.output_schema().unwrap(); - let original_rc = Rc::new(original); + let original_schema = original.schema.clone(); + let original_rc = Rc::clone(&original); let target = TargetSubDAG::new(&original_rc); let replacements = AvgToSumOverCountStrategy.replacements(&target); let rewritten = match &replacements[0].replacement { - Replacement::Rewrite(rc) => rc, + Replacement::SubDAG(rc) => rc, other => panic!("expected a Rewrite replacement, got {other:?}"), }; - let rewritten_schema = rewritten.output_schema().unwrap(); + let rewritten_schema = rewritten.schema.clone(); assert_eq!(rewritten_schema, original_schema); } #[test] fn default_search_discovers_bindable_sum_and_count_targets() { - let root = Rc::new(avg_agg(vec![2], None, metric_scan(&["job"]))); + let root = avg_agg(vec![2], None, metric_scan(&["job"])); let space = crate::replacement::search_workload(vec![("avg", Rc::clone(&root))]); let avg_group = space @@ -672,7 +702,7 @@ mod tests { let mut found_sum = false; let mut found_count = false; for group in space.target_subdag_candidates() { - let QueryExpr::Aggregate { measures, .. } = group.target.as_ref() else { + let Some(NonASAPOp::Aggregate { measures, .. }) = group.target.non_asap() else { continue; }; let expected = matches!(measures.as_slice(), [AggIntent::Sum { .. }]) @@ -689,7 +719,8 @@ mod tests { group .candidates .iter() - .any(|candidate| matches!(candidate.replacement, Replacement::Summary(_))), + .any(|candidate| matches!(&candidate.replacement, + Replacement::SubDAG(node) if node.contains_asap())), "rewritten accumulator must be independently bindable: {measures:?}" ); found_sum |= matches!(measures.as_slice(), [AggIntent::Sum { .. }]); @@ -710,25 +741,26 @@ mod tests { Field::plain("job", DataType::Utf8, true), Field::plain("bytes", DataType::Int64, false), ]; - let child = QueryExpr::Scan { + let child = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Scan { source: Source::TimeSeries { metric: "m".into() }, predicates: vec![], schema: { let cols = std::mem::take(&mut schema_cols); Schema::with_time_index(cols, 0, vec![]) }, - }; + })) + .unwrap(); let original = avg_agg(vec![1], Some(2), child); - let original_schema = original.output_schema().unwrap(); - let original_rc = Rc::new(original); + let original_schema = original.schema.clone(); + let original_rc = Rc::clone(&original); let target = TargetSubDAG::new(&original_rc); let replacements = AvgToSumOverCountStrategy.replacements(&target); let rewritten = match &replacements[0].replacement { - Replacement::Rewrite(rc) => rc, + Replacement::SubDAG(rc) => rc, other => panic!("expected a Rewrite replacement, got {other:?}"), }; - let rewritten_schema = rewritten.output_schema().unwrap(); + let rewritten_schema = rewritten.schema.clone(); // The whole reason for the explicit `Cast` in `build_rewrite`: an // `Int64` input column (`bytes`) makes `Sum`'s own output `Int64` @@ -741,15 +773,15 @@ mod tests { DataType::Float64 ); - let QueryExpr::BinaryOp { lhs, .. } = rewritten.as_ref() else { + let Some(NonASAPOp::BinaryOp { lhs, .. }) = rewritten.non_asap() else { panic!("expected sum/count BinaryOp"); }; - let QueryExpr::Project { cols, .. } = lhs.as_ref() else { + let Some(NonASAPOp::Project { cols, .. }) = lhs.non_asap() else { panic!("expected cast Project above Sum"); }; assert!(matches!( &cols.last().unwrap().expr, - QueryExpr::Cast { + ScalarExpr::Cast { to: DataType::Float64, .. } @@ -758,7 +790,7 @@ mod tests { #[test] fn does_not_rewrite_avg_of_a_nullable_column_via_count_star() { - let child = QueryExpr::Scan { + let child = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Scan { source: Source::TimeSeries { metric: "m".into() }, predicates: vec![], schema: Schema::with_time_index( @@ -770,27 +802,34 @@ mod tests { 0, vec![], ), - }; - let q = Rc::new(avg_agg(vec![], Some(2), child)); + })) + .unwrap(); + let q = avg_agg(vec![], Some(2), child); let target = TargetSubDAG::new(&q); assert!(!AvgToSumOverCountStrategy.matches(&target)); assert!(AvgToSumOverCountStrategy.replacements(&target).is_empty()); } - fn nested_aggregate(outer: AggIntent, inner: AggIntent) -> Rc { - let temporal = QueryExpr::Aggregate { - reduction: Reduction::PerEntity, - measures: vec![inner], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(QueryExpr::TimeRange { - range: Duration::from_secs(300), - child: Rc::new(metric_scan(&["service"])), - }), - }; - Rc::new(QueryExpr::Aggregate { + fn nested_aggregate(outer: AggIntent, inner: AggIntent) -> Rc { + let temporal = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { + reduction: Reduction::PerEntity, + measures: vec![inner], + output_names: vec![], + filters: vec![], + having: None, + child: OperatorNode::new_shared(asap_types::ir::Operator::NonASAP( + NonASAPOp::TimeRange { + kind: TimeRangeKind::Range, + range: Duration::from_secs(300), + child: metric_scan(&["service"]), + }, + )) + .unwrap(), + })) + .unwrap(); + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { reduction: Reduction::by(vec![2]), measures: vec![outer], // Match the PromQL front end: an empty entry selects the intent's @@ -798,8 +837,9 @@ mod tests { output_names: vec![String::new()], filters: vec![], having: None, - child: Rc::new(temporal), - }) + child: temporal, + })) + .unwrap() } #[test] @@ -820,34 +860,30 @@ mod tests { let [candidate] = candidates.as_slice() else { panic!("supported pair should produce exactly one rewrite") }; - let Replacement::Rewrite(rewritten) = &candidate.replacement else { + let Replacement::SubDAG(rewritten) = &candidate.replacement else { panic!("expected a logical rewrite") }; - assert_eq!( - original.output_schema().unwrap(), - rewritten.output_schema().unwrap() - ); - let aggregate = match rewritten.as_ref() { - QueryExpr::Aggregate { .. } => rewritten.as_ref(), - QueryExpr::Project { child, .. } => child.as_ref(), + assert_eq!(original.schema.clone(), rewritten.schema.clone()); + let aggregate = match rewritten.non_asap() { + Some(NonASAPOp::Aggregate { .. }) => rewritten.as_ref(), + Some(NonASAPOp::Project { child, .. }) => child.as_ref(), other => panic!("expected Aggregate or cast Project, got {other:?}"), }; - let QueryExpr::Aggregate { + let Some(NonASAPOp::Aggregate { reduction: Reduction::Reduce(by), measures, child, .. - } = aggregate + }) = aggregate.non_asap() else { panic!("expected composed cross-entity aggregate") }; assert_eq!(by.keys(), &[2]); assert_eq!(measures, &[expected]); - assert!(matches!( - child.as_ref(), - QueryExpr::TimeRange { range, child } + assert!(matches!(child.non_asap(), + Some(NonASAPOp::TimeRange { range, child, .. }) if *range == Duration::from_secs(300) - && matches!(child.as_ref(), QueryExpr::Scan { .. }) + && matches!(child.non_asap(), Some(NonASAPOp::Scan { .. })) )); } } @@ -880,9 +916,9 @@ mod tests { .iter() .find(|candidate| candidate.strategy == "SemanticEquivalentRewriteStrategy") .expect("default search should run semantic rewrites"); - let Replacement::Rewrite(rewritten) = &candidate.replacement else { + let Replacement::SubDAG(rewritten) = &candidate.replacement else { panic!("expected logical rewrite") }; - assert_eq!(rewritten.output_schema().unwrap().fields[1].name, "sum"); + assert_eq!(rewritten.schema.clone().fields[1].name, "sum"); } } diff --git a/crates/asap-aware-mapping/src/rollup.rs b/crates/asap-aware-mapping/src/rollup.rs index ab6eff3d9..572d2c60a 100644 --- a/crates/asap-aware-mapping/src/rollup.rs +++ b/crates/asap-aware-mapping/src/rollup.rs @@ -20,7 +20,7 @@ //! "Rolling up aggregations on a fine-grained group by to get a //! coarse-grained group by (like AHA)," alongside "CSE across aggregations, //! and group by key management" — this strategy is the *cross-aggregate* -//! sibling of `pre_asap::cse::share_common_sub_dags`'s *identical*-sub-DAG +//! sibling of `ir::cse::share_common_sub_dags`'s *identical*-sub-DAG //! sharing: CSE shares two structurally-*equal* aggregates onto one `Rc`; //! this strategy relates two structurally-*different* (differently grouped) //! aggregates over the same shared source. @@ -88,7 +88,7 @@ //! - **No materialized roll-up operator.** Actually building a pre-aggregated //! summary/scan leaf at execution time is separate, larger work outside //! `asap-aware-mapping`'s scope (see issue #254's own "Non-goal" section) -//! — this module only constructs the pre-ASAP [`QueryExpr::Aggregate`] +//! — this module only constructs the pre-ASAP `NonASAPOp::Aggregate` //! rewrite; a `CostModel`/search engine decides whether to prefer it. //! - **No cross-schema reconciliation** (see "`ColumnId` comparability" //! above) and **no `without(...)` grouping support** — `without`'s kept @@ -97,34 +97,37 @@ //! against a superset/subset relationship at all; [`is_legal_rollup_source`] //! declines both directions. +use asap_types::ir::non_asap::any_measure_filtered; use std::collections::HashSet; use std::rc::Rc; +use asap_types::ir::operator_properties::{GroupKeys, Reduction}; +use asap_types::ir::{NonASAPOp, OperatorNode}; use asap_types::pre_asap::agg_intent::AggIntent; -use asap_types::pre_asap::query_expr::{any_measure_filtered, GroupKeys, QueryExpr, Reduction}; use asap_types::pre_asap::schema::{ColumnId, Schema}; + use asap_types::types::AccuracyTarget; use crate::replacement::{Replacement, ReplacementStrategy, ReplacementSubDAG, TargetSubDAG}; /// The `(by, intent, child)` shape this strategy operates on: a single /// measure, no `HAVING` — the same bindable shape -/// [`crate::replacement::SketchAlgorithmStrategy`] requires (see that module's +/// [`crate::replacement::ASAPStrategies`] requires (see that module's /// private `bindable_intent`) — **plus** a genuine [`Reduction::Reduce`] /// grouping to compare (not [`Reduction::PerEntity`], which has no `by` set /// at all). `None` for anything else, including a multi-measure or `HAVING` /// aggregate, a non-`Aggregate` node, or a `PerEntity` reduction. fn bindable_grouped_aggregate( - node: &QueryExpr, -) -> Option<(&GroupKeys, &AggIntent, &Rc)> { - let QueryExpr::Aggregate { + node: &OperatorNode, +) -> Option<(&GroupKeys, &AggIntent, &Rc)> { + let Some(NonASAPOp::Aggregate { reduction, measures, filters, having, child, .. - } = node + }) = node.non_asap() else { return None; }; @@ -204,7 +207,7 @@ fn rollup_combinator(intent: &AggIntent, finer_measure_col: ColumnId) -> Option< /// 4. `finer_output_schema` (the finer aggregate's own *output* schema, not /// the shared child's) carries a provable unique key /// ([`Schema::has_unique_key`]) — **the exact legality gate -/// `pre_asap::cse::share_common_sub_dags` already applies to its own +/// `ir::cse::share_common_sub_dags` already applies to its own /// sharing decisions**, reused verbatim here rather than re-invented: /// `share_common_sub_dags`'s own doc ("Legality: gated by /// `Schema::unique_keys`") states a producer's output is only safely @@ -263,7 +266,7 @@ fn is_strict_column_superset(finer: &[ColumnId], coarser: &[ColumnId]) -> bool { /// docs' "Non-goals" on why finding the full sibling set across a workload /// is a workload-wide traversal this strategy does not own. pub struct RollupStrategy { - siblings: Vec>, + siblings: Vec>, } impl RollupStrategy { @@ -271,7 +274,7 @@ impl RollupStrategy { /// each as a candidate roll-up source (or target) — typically the full set of `Aggregate` /// nodes a workload-wide discovery pass (issue #252) already found /// sharing at least one child `Rc` with something else. - pub fn new(siblings: &[Rc]) -> Self { + pub fn new(siblings: &[Rc]) -> Self { Self { siblings: siblings.to_vec(), } @@ -280,7 +283,7 @@ impl RollupStrategy { /// Every sibling that is a legal, strictly finer roll-up source for /// `target` — shared between `matches` and `replacements` so the two /// can never disagree about which siblings qualify. - fn finer_sources(&self, target: &TargetSubDAG<'_>) -> Vec<&Rc> { + fn finer_sources(&self, target: &TargetSubDAG<'_>) -> Vec<&Rc> { let Some((coarser_by, coarser_intent, coarser_child)) = bindable_grouped_aggregate(target.root) else { @@ -301,12 +304,9 @@ impl RollupStrategy { if !Rc::ptr_eq(finer_child, coarser_child) && finer_child != coarser_child { return false; } - let Ok(finer_schema) = candidate.output_schema() else { - return false; - }; is_legal_rollup_source( finer_by, - &finer_schema, + &candidate.schema, finer_intent, coarser_by, coarser_intent, @@ -325,7 +325,7 @@ impl ReplacementStrategy for RollupStrategy { let Some((coarser_by, coarser_intent, _)) = bindable_grouped_aggregate(target.root) else { return Vec::new(); }; - let QueryExpr::Aggregate { output_names, .. } = target.root.as_ref() else { + let Some(NonASAPOp::Aggregate { output_names, .. }) = target.root.non_asap() else { unreachable!("bindable_grouped_aggregate already confirmed Aggregate"); }; self.finer_sources(target) @@ -335,7 +335,7 @@ impl ReplacementStrategy for RollupStrategy { } } -/// Build the coarser replacement: a new `QueryExpr::Aggregate` grouped by +/// Build the coarser replacement: a new `NonASAPOp::Aggregate` grouped by /// `coarser_by`'s columns (repositioned into `finer`'s own output schema — /// see below), computing `rollup_combinator(intent, ..)` over `finer`'s own /// measure column, with `child = finer` instead of the original shared @@ -350,7 +350,7 @@ impl ReplacementStrategy for RollupStrategy { /// position in the shared child to its position in `finer`'s output: the /// index its `ColumnId` occupies within `finer_by`'s own ordered list. fn build_rollup( - finer: &Rc, + finer: &Rc, coarser_by: &GroupKeys, intent: &AggIntent, output_names: &[String], @@ -367,18 +367,20 @@ fn build_rollup( .map(|id| finer_by.keys().iter().position(|f| f == id)) .collect::>>()?; - let rewritten = QueryExpr::Aggregate { - reduction: Reduction::by(remapped_by), - measures: vec![combinator], - output_names: output_names.to_vec(), - filters: vec![], - having: None, - child: Rc::clone(finer), - }; + let rewritten = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { + reduction: Reduction::by(remapped_by), + measures: vec![combinator], + output_names: output_names.to_vec(), + filters: vec![], + having: None, + child: Rc::clone(finer), + })) + .ok()?; Some(ReplacementSubDAG { strategy: "RollupStrategy", - replacement: Replacement::Rewrite(Rc::new(rewritten)), + replacement: Replacement::SubDAG(rewritten), provenance: crate::replacement::ReplacementProvenance::LogicalRewrite, rationale: format!( "rolls up from the finer Aggregate grouped by {:?} (a strict superset of this \ @@ -394,13 +396,13 @@ fn build_rollup( #[cfg(test)] mod tests { use super::*; - use asap_types::pre_asap::query_expr::Source; + use asap_types::ir::operator_properties::Source; use asap_types::pre_asap::schema::{DataType, Field}; use asap_types::types::AccuracyTarget; /// `[ts(0), value(1), job(2), region(3)]`. - fn metric_scan() -> QueryExpr { - QueryExpr::Scan { + fn metric_scan() -> Rc { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Scan { source: Source::TimeSeries { metric: "m".into() }, predicates: vec![], schema: Schema::with_time_index( @@ -413,33 +415,36 @@ mod tests { 0, vec![], ), - } + })) + .unwrap() } - fn agg(by: Vec, intent: AggIntent, child: &Rc) -> Rc { - Rc::new(QueryExpr::Aggregate { + fn agg(by: Vec, intent: AggIntent, child: &Rc) -> Rc { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { reduction: Reduction::by(by), measures: vec![intent], output_names: vec![], filters: vec![], having: None, child: Rc::clone(child), - }) + })) + .unwrap() } fn without_agg( excluded: Vec, intent: AggIntent, - child: &Rc, - ) -> Rc { - Rc::new(QueryExpr::Aggregate { + child: &Rc, + ) -> Rc { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { reduction: Reduction::Reduce(GroupKeys::without(excluded)), measures: vec![intent], output_names: vec![], filters: vec![], having: None, child: Rc::clone(child), - }) + })) + .unwrap() } // ── is_legal_rollup_source (the standalone predicate) ─────────────── @@ -569,7 +574,7 @@ mod tests { #[test] fn superset_by_over_identical_mergeable_intent_and_shared_child_rolls_up() { - let scan = Rc::new(metric_scan()); + let scan = metric_scan(); let fine = agg(vec![2, 3], AggIntent::Sum { col: Some(1) }, &scan); let coarse = agg(vec![2], AggIntent::Sum { col: Some(1) }, &scan); @@ -581,16 +586,16 @@ mod tests { let replacements = strategy.replacements(&target); assert_eq!(replacements.len(), 1, "{replacements:?}"); - let Replacement::Rewrite(rewritten) = &replacements[0].replacement else { + let Replacement::SubDAG(rewritten) = &replacements[0].replacement else { panic!("expected a Rewrite replacement"); }; - let QueryExpr::Aggregate { + let Some(NonASAPOp::Aggregate { reduction, measures, child, having, .. - } = rewritten.as_ref() + }) = rewritten.non_asap() else { panic!("expected an Aggregate rewrite, got {rewritten:?}"); }; @@ -620,7 +625,7 @@ mod tests { // Count is not self-combining (see the module docs) — the rewritten // measure must be Sum over the finer Count's own output column, not // Count reapplied. - let scan = Rc::new(metric_scan()); + let scan = metric_scan(); let fine = agg( vec![2, 3], AggIntent::Count { @@ -642,10 +647,10 @@ mod tests { let replacements = strategy.replacements(&target); assert_eq!(replacements.len(), 1, "{replacements:?}"); - let Replacement::Rewrite(rewritten) = &replacements[0].replacement else { + let Replacement::SubDAG(rewritten) = &replacements[0].replacement else { panic!("expected a Rewrite replacement"); }; - let QueryExpr::Aggregate { measures, .. } = rewritten.as_ref() else { + let Some(NonASAPOp::Aggregate { measures, .. }) = rewritten.non_asap() else { panic!("expected an Aggregate rewrite"); }; assert_eq!( @@ -657,7 +662,7 @@ mod tests { #[test] fn approximate_count_does_not_roll_up_via_sum() { - let scan = Rc::new(metric_scan()); + let scan = metric_scan(); let intent = AggIntent::Count { accuracy: AccuracyTarget::Epsilon(0.01), }; @@ -673,8 +678,8 @@ mod tests { #[test] fn default_workload_search_adds_rollup_for_two_query_workload() { - let fine_scan = Rc::new(metric_scan()); - let coarse_scan = Rc::new(metric_scan()); + let fine_scan = metric_scan(); + let coarse_scan = metric_scan(); let fine = agg(vec![2, 3], AggIntent::Sum { col: Some(1) }, &fine_scan); let coarse = agg(vec![2], AggIntent::Sum { col: Some(1) }, &coarse_scan); @@ -682,12 +687,11 @@ mod tests { let coarse_group = space .target_subdag_candidates() .find(|group| { - matches!( - group.target.as_ref(), - QueryExpr::Aggregate { + matches!(group.target.non_asap(), + Some(NonASAPOp::Aggregate { reduction: Reduction::Reduce(by), .. - } if by.keys() == [2] + }) if by.keys() == [2] ) }) .expect("coarser aggregate group"); @@ -696,19 +700,19 @@ mod tests { .candidates .iter() .find_map(|candidate| match &candidate.replacement { - Replacement::Rewrite(rewrite) => Some(rewrite), - Replacement::Summary(_) | Replacement::ExactComposition(_) => None, + // Old `Replacement::Rewrite`: a pure pre-ASAP sub-DAG. + Replacement::SubDAG(rewrite) if !rewrite.contains_asap() => Some(rewrite), + Replacement::SubDAG(_) | Replacement::ExactComposition(_) => None, }) .expect("default search must include the roll-up rewrite"); - let QueryExpr::Aggregate { child, .. } = rewrite.as_ref() else { + let Some(NonASAPOp::Aggregate { child, .. }) = rewrite.non_asap() else { panic!("expected aggregate rewrite, got {rewrite:?}"); }; - assert!(matches!( - child.as_ref(), - QueryExpr::Aggregate { + assert!(matches!(child.non_asap(), + Some(NonASAPOp::Aggregate { reduction: Reduction::Reduce(by), .. - } if by.keys() == [2, 3] + }) if by.keys() == [2, 3] )); } @@ -717,18 +721,17 @@ mod tests { let intent = AggIntent::Count { accuracy: AccuracyTarget::Epsilon(0.01), }; - let fine = agg(vec![2, 3], intent.clone(), &Rc::new(metric_scan())); - let coarse = agg(vec![2], intent, &Rc::new(metric_scan())); + let fine = agg(vec![2, 3], intent.clone(), &metric_scan()); + let coarse = agg(vec![2], intent, &metric_scan()); let space = crate::replacement::search_workload(vec![("fine", fine), ("coarse", coarse)]); let coarse_group = space .target_subdag_candidates() .find(|group| { - matches!( - group.target.as_ref(), - QueryExpr::Aggregate { + matches!(group.target.non_asap(), + Some(NonASAPOp::Aggregate { reduction: Reduction::Reduce(by), .. - } if by.keys() == [2] + }) if by.keys() == [2] ) }) .expect("coarser aggregate group"); @@ -736,32 +739,35 @@ mod tests { assert!(coarse_group .candidates .iter() - .all(|candidate| !matches!(candidate.replacement, Replacement::Rewrite(_)))); + .all(|candidate| !matches!(&candidate.replacement, + Replacement::SubDAG(rewrite) if !rewrite.contains_asap()))); } #[test] fn rollup_preserves_the_coarser_output_name() { - let scan = Rc::new(metric_scan()); + let scan = metric_scan(); let fine = agg(vec![2, 3], AggIntent::Sum { col: Some(1) }, &scan); - let coarse = Rc::new(QueryExpr::Aggregate { - reduction: Reduction::by(vec![2]), - measures: vec![AggIntent::Sum { col: Some(1) }], - output_names: vec!["total_requests".into()], - filters: vec![], - having: None, - child: Rc::clone(&scan), - }); - let original_schema = coarse.output_schema().unwrap(); + let coarse = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { + reduction: Reduction::by(vec![2]), + measures: vec![AggIntent::Sum { col: Some(1) }], + output_names: vec!["total_requests".into()], + filters: vec![], + having: None, + child: Rc::clone(&scan), + })) + .unwrap(); + let original_schema = coarse.schema.clone(); let siblings = vec![Rc::clone(&fine), Rc::clone(&coarse)]; let strategy = RollupStrategy::new(&siblings); let replacements = strategy.replacements(&TargetSubDAG::new(&coarse)); - let Replacement::Rewrite(rewritten) = &replacements[0].replacement else { + let Replacement::SubDAG(rewritten) = &replacements[0].replacement else { panic!("expected a Rewrite replacement"); }; - assert_eq!(rewritten.output_schema().unwrap(), original_schema); - let QueryExpr::Aggregate { output_names, .. } = rewritten.as_ref() else { + assert_eq!(rewritten.schema.clone(), original_schema); + let Some(NonASAPOp::Aggregate { output_names, .. }) = rewritten.non_asap() else { unreachable!(); }; assert_eq!(output_names, &vec!["total_requests".to_string()]); @@ -769,7 +775,7 @@ mod tests { #[test] fn non_mergeable_intent_does_not_roll_up() { - let scan = Rc::new(metric_scan()); + let scan = metric_scan(); let fine = agg(vec![2, 3], AggIntent::Avg { col: Some(1) }, &scan); let coarse = agg(vec![2], AggIntent::Avg { col: Some(1) }, &scan); @@ -789,12 +795,12 @@ mod tests { // numerically a superset of the coarser side's *kept* positions — // `is_legal_rollup_source` rejects any `without` grouping outright, // and would reject on the missing unique key regardless. - let scan = Rc::new(metric_scan()); + let scan = metric_scan(); let fine = without_agg(vec![2, 3], AggIntent::Sum { col: Some(1) }, &scan); let coarse = agg(vec![2], AggIntent::Sum { col: Some(1) }, &scan); assert!( - !fine.output_schema().unwrap().has_unique_key(), + !fine.schema.clone().has_unique_key(), "fixture sanity: a without(...) aggregate has no provable unique key" ); @@ -809,7 +815,7 @@ mod tests { #[test] fn unrelated_by_sets_do_not_roll_up() { // Neither `[job]` nor `[region]` is a superset of the other. - let scan = Rc::new(metric_scan()); + let scan = metric_scan(); let a = agg(vec![2], AggIntent::Sum { col: Some(1) }, &scan); let b = agg(vec![3], AggIntent::Sum { col: Some(1) }, &scan); @@ -830,7 +836,7 @@ mod tests { // Equal groupings are `SharedSubDAGStrategy`'s CSE-sharing // question (build once and share, or build independently) — a // roll-up requires a *strict* superset, not equality. - let scan = Rc::new(metric_scan()); + let scan = metric_scan(); let a = agg(vec![2], AggIntent::Sum { col: Some(1) }, &scan); let b = agg(vec![2], AggIntent::Sum { col: Some(1) }, &scan); @@ -845,16 +851,8 @@ mod tests { // Scans without unique keys are deliberately not pointer-aliased by // CSE. Structural equality still proves identical schemas and makes // the two aggregates' positional ColumnIds comparable. - let fine = agg( - vec![2, 3], - AggIntent::Sum { col: Some(1) }, - &Rc::new(metric_scan()), - ); - let coarse = agg( - vec![2], - AggIntent::Sum { col: Some(1) }, - &Rc::new(metric_scan()), - ); + let fine = agg(vec![2, 3], AggIntent::Sum { col: Some(1) }, &metric_scan()); + let coarse = agg(vec![2], AggIntent::Sum { col: Some(1) }, &metric_scan()); let siblings = vec![Rc::clone(&fine), Rc::clone(&coarse)]; let strategy = RollupStrategy::new(&siblings); @@ -865,21 +863,23 @@ mod tests { #[test] fn does_not_match_a_multi_measure_or_having_aggregate() { - let scan = Rc::new(metric_scan()); + let scan = metric_scan(); let fine = agg(vec![2, 3], AggIntent::Sum { col: Some(1) }, &scan); - let multi = Rc::new(QueryExpr::Aggregate { - reduction: Reduction::by(vec![2]), - measures: vec![ - AggIntent::Sum { col: Some(1) }, - AggIntent::Count { - accuracy: AccuracyTarget::Exact, - }, - ], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::clone(&scan), - }); + let multi = + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { + reduction: Reduction::by(vec![2]), + measures: vec![ + AggIntent::Sum { col: Some(1) }, + AggIntent::Count { + accuracy: AccuracyTarget::Exact, + }, + ], + output_names: vec![], + filters: vec![], + having: None, + child: Rc::clone(&scan), + })) + .unwrap(); let siblings = vec![Rc::clone(&fine), Rc::clone(&multi)]; let strategy = RollupStrategy::new(&siblings); diff --git a/crates/asap-aware-mapping/src/storage_io.rs b/crates/asap-aware-mapping/src/storage_io.rs index 646a3532c..125ec915b 100644 --- a/crates/asap-aware-mapping/src/storage_io.rs +++ b/crates/asap-aware-mapping/src/storage_io.rs @@ -121,7 +121,7 @@ pub fn estimate_storage_io( profile: &StorageIoProfile, evidence_version: &str, ) -> Result { - // Also prove source coverage, edge consistency, execution legality and DAG + // Also prove scan selection, edge consistency, execution legality and DAG // identity before using supplementary deployment evidence. estimate_physical_dag(&dag.nodes, &dag.root, scope, dag)?; let evaluations = scope.validate()?; diff --git a/crates/asap-aware-mapping/src/summary_maintenance_cost/estimator.rs b/crates/asap-aware-mapping/src/summary_maintenance_cost/estimator.rs deleted file mode 100644 index 5bf42d2e4..000000000 --- a/crates/asap-aware-mapping/src/summary_maintenance_cost/estimator.rs +++ /dev/null @@ -1,1320 +0,0 @@ -use super::*; - -pub(super) fn estimate_heterogeneous_summary( - root: &SummaryNode, - deployments: &[CostedSummaryDeployment<'_>], - evidence: &SummaryNodeEvidence, - scope: &ComparisonScope, - raw: &RawInputEvidence, - window_frameworks: &[Option], -) -> Result { - if window_frameworks.len() != deployments.len() { - return Err(AnalyticalCostError::ComparisonScopeMismatch( - "window framework assignments", - )); - } - let frameworks_by_node: HashMap<_, _> = deployments - .iter() - .zip(window_frameworks) - .map(|(deployment, framework)| (deployment.summary as *const _, framework)) - .collect(); - validate_summary_edges_and_physical_ids(root, evidence, &frameworks_by_node)?; - fn summary_source_selections( - node: &SummaryNode, - seen: &mut HashSet<*const SummaryNode>, - out: &mut Vec, - ) -> Result<(), AnalyticalCostError> { - if !seen.insert(node as *const _) { - return Ok(()); - } - match &node.expr { - SummaryExpr::KeepPreAsap(query) => query_source_selections(query, out)?, - SummaryExpr::SummaryAgg { child, .. } | SummaryExpr::ValueOperation { child, .. } => { - summary_source_selections(child, seen, out)? - } - SummaryExpr::SummaryMerge { children, .. } => { - for child in children { - summary_source_selections(child, seen, out)?; - } - } - SummaryExpr::SummarySubtract { left, right } - | SummaryExpr::RelationalJoin { left, right, .. } - | SummaryExpr::BinaryOp { - lhs: left, - rhs: right, - .. - } - | SummaryExpr::SummaryJoin { - outer: left, - inner: right, - .. - } => { - summary_source_selections(left, seen, out)?; - summary_source_selections(right, seen, out)?; - } - SummaryExpr::SummaryDelete { summary_input, .. } - | SummaryExpr::SummaryEstimate { summary_input, .. } => { - summary_source_selections(summary_input, seen, out)? - } - } - Ok(()) - } - let evaluation_count = scope.validate()?; - let by_node: HashMap<_, _> = deployments - .iter() - .map(|deployment| (deployment.summary as *const _, deployment)) - .collect(); - let mut cpu_ops = 0.0; - let mut persistent_bytes = 0_u64; - let mut ephemeral_state_bytes = 0_u64; - let mut scans = HashMap::::new(); - let mut physical_states = HashMap::< - String, - ( - SummaryAggregateEvidence, - SummaryMaintenanceLifecycleGuarantee, - String, - Option, - ), - >::new(); - for deployment in deployments { - let node_evidence = evidence - .aggregation(deployment.summary) - .ok_or(AnalyticalCostError::MissingOrStale("summary_agg"))?; - let SummaryExpr::SummaryAgg { child, .. } = &deployment.summary.expr else { - return Err(AnalyticalCostError::UnsupportedCandidate); - }; - let inputs = node_evidence.inputs.validate()?; - validate_arrival_rate(scope.data_arrival, inputs.ingestion_rate_per_second)?; - match node_evidence.source_coverage_index { - Some(index) => { - let declared = - scope - .sources - .get(index) - .ok_or(AnalyticalCostError::MissingComparisonScope( - "summary source coverage", - ))?; - if !matches!(&child.expr, SummaryExpr::KeepPreAsap(_)) - || inputs.initial_input_rows != raw.planning_time_input_rows - || inputs.initial_input_bytes != raw.planning_time_input_bytes - || inputs.initial_source_scan_bytes != raw.planning_time_source_scan_bytes - || inputs.ingestion_rate_per_second != raw.ingestion_rate_per_second - { - return Err(AnalyticalCostError::ComparisonScopeMismatch( - "source-root bootstrap evolution", - )); - } - let mut actual_selections = Vec::new(); - summary_source_selections(child, &mut HashSet::new(), &mut actual_selections)?; - let actual_selections = deduplicate_source_selections(actual_selections); - let expected = ( - declared.source.clone(), - declared.predicates.clone(), - declared.info_matchers.clone(), - ); - if actual_selections.as_slice() != [expected] { - return Err(AnalyticalCostError::ComparisonScopeMismatch( - "summary source lineage", - )); - } - } - None => { - if matches!(&child.expr, SummaryExpr::KeepPreAsap(_)) - || inputs.initial_source_scan_bytes != 0 - || !node_evidence.bootstrap_read_identity.is_empty() - { - return Err(AnalyticalCostError::ComparisonScopeMismatch( - "intermediate bootstrap source ownership", - )); - } - } - } - validate_guarantee(deployment.guarantee, scope.data_arrival)?; - let logical_state = format!("{:?}", deployment.summary.expr); - let window_framework = (*frameworks_by_node - .get(&(deployment.summary as *const _)) - .ok_or(AnalyticalCostError::MissingOrStale( - "window framework assignment", - ))?) - .clone(); - match physical_states.entry(node_evidence.physical_id.clone()) { - std::collections::hash_map::Entry::Vacant(entry) => { - entry.insert(( - node_evidence.clone(), - deployment.guarantee.clone(), - logical_state, - window_framework, - )); - } - std::collections::hash_map::Entry::Occupied(entry) - if entry.get() - != &( - node_evidence.clone(), - deployment.guarantee.clone(), - logical_state, - window_framework, - ) => - { - return Err(AnalyticalCostError::ComparisonScopeMismatch( - "summary physical identity", - )); - } - std::collections::hash_map::Entry::Occupied(_) => continue, - } - let ephemeral = matches!( - deployment.guarantee.summary_maintenance_lifecycle, - SummaryMaintenanceLifecycle::Ephemeral - ); - let (bootstrap, updates, source_scan_bytes) = if ephemeral { - ( - ephemeral_rows_over_horizon(inputs, scope)?, - 0, - ephemeral_scan_bytes_over_horizon(inputs, raw, scope)?, - ) - } else { - let (bootstrap, updates, _) = - lifecycle_row_counts(inputs, deployment.guarantee, scope)?; - let bootstrap_extra_rows = bootstrap - .checked_sub(inputs.initial_input_rows) - .ok_or(AnalyticalCostError::Overflow)?; - let source_scan_bytes = if node_evidence.source_coverage_index.is_some() { - inputs - .initial_source_scan_bytes - .checked_add( - bootstrap_extra_rows - .checked_mul(raw.arriving_source_row_bytes) - .ok_or(AnalyticalCostError::Overflow)?, - ) - .ok_or(AnalyticalCostError::Overflow)? - } else { - 0 - }; - (bootstrap, updates, source_scan_bytes) - }; - let insert = validated_operator_cpu("insert_cpu_ops", node_evidence.insert_cpu_ops)?; - let insert_calls = bootstrap - .checked_mul(inputs.bootstrap_window_count) - .and_then(|calls| { - updates - .checked_mul(inputs.active_window_count) - .and_then(|updates| calls.checked_add(updates)) - }) - .ok_or(AnalyticalCostError::Overflow)?; - cpu_ops += insert_calls as f64 * insert; - let live_window_count = if ephemeral { - inputs.bootstrap_window_count - } else { - inputs - .active_window_count - .checked_add(inputs.retained_window_count) - .ok_or(AnalyticalCostError::Overflow)? - }; - let state_bytes = live_window_count - .checked_mul(inputs.physical_summary_count) - .and_then(|states| states.checked_mul(inputs.state_bytes_per_summary)) - .ok_or(AnalyticalCostError::Overflow)?; - if ephemeral { - ephemeral_state_bytes = ephemeral_state_bytes - .checked_add(state_bytes) - .ok_or(AnalyticalCostError::Overflow)?; - } else { - persistent_bytes = persistent_bytes - .checked_add(state_bytes) - .ok_or(AnalyticalCostError::Overflow)?; - } - if let Some(source_index) = node_evidence.source_coverage_index { - if node_evidence.bootstrap_read_identity.is_empty() { - return Err(AnalyticalCostError::MissingOrStale( - "bootstrap_read_identity", - )); - } - match scans.entry(node_evidence.bootstrap_read_identity.clone()) { - std::collections::hash_map::Entry::Vacant(entry) => { - entry.insert((source_index, source_scan_bytes)); - } - std::collections::hash_map::Entry::Occupied(entry) - if *entry.get() != (source_index, source_scan_bytes) => - { - return Err(AnalyticalCostError::ComparisonScopeMismatch( - "bootstrap source bytes", - )); - } - _ => {} - } - } - } - let covered_sources: HashSet<_> = scans.values().map(|(index, _)| *index).collect(); - if covered_sources.len() != scope.sources.len() - || !(0..scope.sources.len()).all(|index| covered_sources.contains(&index)) - { - return Err(AnalyticalCostError::ComparisonScopeMismatch("sources")); - } - - #[expect(clippy::too_many_arguments, reason = "CPU and I/O traversal state")] - fn visit_ops( - node: &SummaryNode, - seen: &mut HashSet, - by_node: &HashMap<*const SummaryNode, &CostedSummaryDeployment<'_>>, - evidence: &SummaryNodeEvidence, - scope: &ComparisonScope, - evaluation_count: u64, - cpu_ops: &mut f64, - io_bytes: &mut u64, - ) -> Result<(), AnalyticalCostError> { - let physical_id = summary_physical_id(node, evidence)?; - if !seen.insert(physical_id) { - return Ok(()); - } - match &node.expr { - SummaryExpr::BinaryOp { lhs, rhs, .. } - | SummaryExpr::RelationalJoin { - left: lhs, - right: rhs, - .. - } => { - let operation = summary_operation_evidence(node, evidence)?.resource(); - *cpu_ops += evaluation_count as f64 - * validated_operator_executions("exact_binary", operation)? as f64 - * validated_operator_cpu("exact_binary", operation.cpu_ops)?; - add_operator_io(io_bytes, operation, evaluation_count)?; - visit_ops( - lhs, - seen, - by_node, - evidence, - scope, - evaluation_count, - cpu_ops, - io_bytes, - )?; - visit_ops( - rhs, - seen, - by_node, - evidence, - scope, - evaluation_count, - cpu_ops, - io_bytes, - )?; - } - - SummaryExpr::ValueOperation { child, .. } => { - let operation = summary_operation_evidence(node, evidence)?.resource(); - *cpu_ops += evaluation_count as f64 - * validated_operator_executions("value_operation", operation)? as f64 - * validated_operator_cpu("value_operation", operation.cpu_ops)?; - add_operator_io(io_bytes, operation, evaluation_count)?; - visit_ops( - child, - seen, - by_node, - evidence, - scope, - evaluation_count, - cpu_ops, - io_bytes, - )?; - } - SummaryExpr::KeepPreAsap(_) => { - let retained = evidence - .retained_queries - .get(&(node as *const _)) - .ok_or(AnalyticalCostError::MissingOrStale("keep_pre_asap"))?; - if !retained.preprocessing_cpu_ops_over_horizon.is_finite() - || retained.preprocessing_cpu_ops_over_horizon < 0.0 - { - return Err(AnalyticalCostError::InvalidOperationCost( - "keep_pre_asap", - retained.preprocessing_cpu_ops_over_horizon, - )); - } - *cpu_ops += retained.preprocessing_cpu_ops_over_horizon; - } - SummaryExpr::SummaryAgg { child, .. } => { - visit_ops( - child, - seen, - by_node, - evidence, - scope, - evaluation_count, - cpu_ops, - io_bytes, - )?; - } - SummaryExpr::SummaryMerge { children, .. } => { - let operation = summary_operation_evidence(node, evidence)?.resource(); - let merge = validated_operator_cpu("summary_merge", operation.cpu_ops)?; - *cpu_ops += evaluation_count as f64 - * validated_operator_executions("summary_merge", operation)? as f64 - * merge; - add_operator_io(io_bytes, operation, evaluation_count)?; - for child in children { - visit_ops( - child, - seen, - by_node, - evidence, - scope, - evaluation_count, - cpu_ops, - io_bytes, - )?; - } - } - SummaryExpr::SummarySubtract { left, right } => { - let operation = summary_operation_evidence(node, evidence)?.resource(); - *cpu_ops += evaluation_count as f64 - * validated_operator_executions("summary_subtract", operation)? as f64 - * validated_operator_cpu("summary_subtract", operation.cpu_ops)?; - add_operator_io(io_bytes, operation, evaluation_count)?; - visit_ops( - left, - seen, - by_node, - evidence, - scope, - evaluation_count, - cpu_ops, - io_bytes, - )?; - visit_ops( - right, - seen, - by_node, - evidence, - scope, - evaluation_count, - cpu_ops, - io_bytes, - )?; - } - SummaryExpr::SummaryDelete { summary_input, .. } => { - let delete = summary_operation_evidence(node, evidence)?; - let SummaryOperatorEvidence::Delete { - resource: operation, - events_per_second, - routing_fanout, - } = delete - else { - unreachable!("operation kind was validated") - }; - let state_ptr = evidence - .operation_state_owners - .get(&(node as *const _)) - .ok_or(AnalyticalCostError::MissingOrStale("summary_delete_owner"))?; - fn collect_aggs( - node: &SummaryNode, - seen: &mut HashSet<*const SummaryNode>, - out: &mut Vec<*const SummaryNode>, - ) { - if !seen.insert(node as *const _) { - return; - } - match &node.expr { - SummaryExpr::SummaryAgg { child, .. } => { - out.push(node as *const _); - collect_aggs(child, seen, out); - } - SummaryExpr::ValueOperation { child, .. } => collect_aggs(child, seen, out), - SummaryExpr::SummaryMerge { children, .. } => { - children - .iter() - .for_each(|child| collect_aggs(child, seen, out)); - } - SummaryExpr::SummarySubtract { left, right } - | SummaryExpr::RelationalJoin { left, right, .. } - | SummaryExpr::BinaryOp { - lhs: left, - rhs: right, - .. - } - | SummaryExpr::SummaryJoin { - outer: left, - inner: right, - .. - } => { - collect_aggs(left, seen, out); - collect_aggs(right, seen, out); - } - SummaryExpr::SummaryDelete { summary_input, .. } - | SummaryExpr::SummaryEstimate { summary_input, .. } => { - collect_aggs(summary_input, seen, out) - } - SummaryExpr::KeepPreAsap(_) => {} - } - } - let mut reachable = Vec::new(); - collect_aggs(summary_input, &mut HashSet::new(), &mut reachable); - if reachable.as_slice() != [*state_ptr] { - return Err(AnalyticalCostError::ComparisonScopeMismatch( - "summary delete owner", - )); - } - let deployment = by_node - .get(state_ptr) - .copied() - .ok_or(AnalyticalCostError::MissingOrStale("summary_delete_owner"))?; - let state = evidence - .aggregation(deployment.summary) - .ok_or(AnalyticalCostError::MissingOrStale("summary_delete_owner"))?; - let (_, _, active_ms) = - lifecycle_row_counts(state.inputs, deployment.guarantee, scope)?; - if !events_per_second.is_finite() || *events_per_second < 0.0 { - return Err(AnalyticalCostError::InvalidIngestionRate( - *events_per_second, - )); - } - if *routing_fanout == 0 { - return Err(AnalyticalCostError::MissingOrZero("delete_routing_fanout")); - } - let delete_events = (events_per_second * active_ms as f64 / 1_000.0).ceil() - * *routing_fanout as f64; - if !delete_events.is_finite() || delete_events > u64::MAX as f64 { - return Err(AnalyticalCostError::Overflow); - } - let delete_events = delete_events as u64; - *cpu_ops += delete_events as f64 - * validated_operator_executions("summary_delete", operation)? as f64 - * validated_operator_cpu("summary_delete", operation.cpu_ops)?; - add_operator_io(io_bytes, operation, delete_events)?; - visit_ops( - summary_input, - seen, - by_node, - evidence, - scope, - evaluation_count, - cpu_ops, - io_bytes, - )?; - } - SummaryExpr::SummaryEstimate { summary_input, .. } => { - let operation = summary_operation_evidence(node, evidence)?.resource(); - *cpu_ops += evaluation_count as f64 - * validated_operator_executions("summary_readout", operation)? as f64 - * validated_operator_cpu("summary_readout", operation.cpu_ops)?; - add_operator_io(io_bytes, operation, evaluation_count)?; - visit_ops( - summary_input, - seen, - by_node, - evidence, - scope, - evaluation_count, - cpu_ops, - io_bytes, - )?; - } - SummaryExpr::SummaryJoin { outer, inner, .. } => { - let join = evidence - .joins - .get(&(node as *const _)) - .ok_or(AnalyticalCostError::MissingOrStale("summary_join"))?; - if !join.cpu_ops_per_execution.is_finite() - || join.cpu_ops_per_execution <= 0.0 - || join.working_memory_bytes == 0 - || join.executions_per_evaluation == 0 - { - return Err(AnalyticalCostError::MissingOrStale("summary_join")); - } - *cpu_ops += evaluation_count as f64 - * join.executions_per_evaluation as f64 - * join.cpu_ops_per_execution; - let join_io = join - .io_bytes_per_execution - .ok_or(AnalyticalCostError::MissingOrStale("summary_join_io"))?; - *io_bytes = io_bytes - .checked_add( - join_io - .checked_mul(join.executions_per_evaluation) - .and_then(|bytes| bytes.checked_mul(evaluation_count)) - .ok_or(AnalyticalCostError::Overflow)?, - ) - .ok_or(AnalyticalCostError::Overflow)?; - visit_ops( - outer, - seen, - by_node, - evidence, - scope, - evaluation_count, - cpu_ops, - io_bytes, - )?; - visit_ops( - inner, - seen, - by_node, - evidence, - scope, - evaluation_count, - cpu_ops, - io_bytes, - )?; - } - } - Ok(()) - } - - let mut operator_io_bytes = 0; - visit_ops( - root, - &mut HashSet::new(), - &by_node, - evidence, - scope, - evaluation_count, - &mut cpu_ops, - &mut operator_io_bytes, - )?; - let transient_bytes = estimate_transient_liveness(root, evidence)?; - if !cpu_ops.is_finite() { - return Err(AnalyticalCostError::Overflow); - } - Ok(ResourceEstimate::new( - cpu_ops, - persistent_bytes - .checked_add(transient_bytes) - .and_then(|bytes| bytes.checked_add(ephemeral_state_bytes)) - .ok_or(AnalyticalCostError::Overflow)?, - scans - .values() - .try_fold(operator_io_bytes, |sum, (_, bytes)| { - sum.checked_add(*bytes).ok_or(AnalyticalCostError::Overflow) - })?, - )) -} - -fn add_operator_io( - total: &mut u64, - operation: &SummaryOperatorResourceEvidence, - execution_units: u64, -) -> Result<(), AnalyticalCostError> { - let bytes = operation - .io_bytes_per_execution - .ok_or(AnalyticalCostError::MissingOrStale("summary operator io"))?; - if operation.executions_per_evaluation == 0 { - return Err(AnalyticalCostError::MissingOrStale( - "summary operator executions", - )); - } - *total = total - .checked_add( - bytes - .checked_mul(operation.executions_per_evaluation) - .and_then(|value| value.checked_mul(execution_units)) - .ok_or(AnalyticalCostError::Overflow)?, - ) - .ok_or(AnalyticalCostError::Overflow)?; - Ok(()) -} - -fn validate_summary_edges_and_physical_ids( - root: &SummaryNode, - evidence: &SummaryNodeEvidence, - frameworks_by_node: &HashMap<*const SummaryNode, &Option>, -) -> Result<(), AnalyticalCostError> { - fn children(node: &SummaryNode) -> Vec<&SummaryNode> { - match &node.expr { - SummaryExpr::KeepPreAsap(_) => vec![], - SummaryExpr::SummaryAgg { child, .. } | SummaryExpr::ValueOperation { child, .. } => { - vec![child] - } - SummaryExpr::SummaryMerge { children, .. } => { - children.iter().map(|child| child.as_ref()).collect() - } - SummaryExpr::SummarySubtract { left, right } - | SummaryExpr::RelationalJoin { left, right, .. } - | SummaryExpr::BinaryOp { - lhs: left, - rhs: right, - .. - } - | SummaryExpr::SummaryJoin { - outer: left, - inner: right, - .. - } => vec![left, right], - SummaryExpr::SummaryDelete { summary_input, .. } - | SummaryExpr::SummaryEstimate { summary_input, .. } => vec![summary_input], - } - } - fn metadata( - node: &SummaryNode, - evidence: &SummaryNodeEvidence, - ) -> Result<(String, Vec, EdgeStatistics), AnalyticalCostError> { - match &node.expr { - SummaryExpr::KeepPreAsap(_) => { - let retained = evidence - .retained_queries - .get(&(node as *const _)) - .ok_or(AnalyticalCostError::MissingOrStale("keep_pre_asap"))?; - Ok((retained.physical_id.clone(), vec![], retained.output)) - } - SummaryExpr::SummaryAgg { .. } => { - let value = evidence - .aggregations - .get(&(node as *const _)) - .ok_or(AnalyticalCostError::MissingOrStale("summary_agg"))?; - Ok((value.physical_id.clone(), vec![value.input], value.output)) - } - SummaryExpr::SummaryJoin { .. } => { - let value = evidence - .joins - .get(&(node as *const _)) - .ok_or(AnalyticalCostError::MissingOrStale("summary_join"))?; - Ok(( - value.physical_id.clone(), - value.inputs.clone(), - value.output, - )) - } - _ => { - let value = summary_operation_evidence(node, evidence)?.resource(); - Ok(( - value.physical_id.clone(), - value.inputs.clone(), - value.output, - )) - } - } - } - fn visit( - node: &SummaryNode, - evidence: &SummaryNodeEvidence, - frameworks_by_node: &HashMap<*const SummaryNode, &Option>, - seen: &mut HashSet<*const SummaryNode>, - physical: &mut HashMap, EdgeStatistics, String)>, - ) -> Result { - if !seen.insert(node as *const _) { - return metadata(node, evidence).map(|(_, _, output)| output); - } - let child_nodes = children(node); - let child_outputs = child_nodes - .iter() - .map(|child| visit(child, evidence, frameworks_by_node, seen, physical)) - .collect::, _>>()?; - let child_physical_ids = child_nodes - .iter() - .map(|child| summary_physical_id(child, evidence)) - .collect::, _>>()?; - let (id, inputs, output) = metadata(node, evidence)?; - let local_fingerprint = match &node.expr { - SummaryExpr::KeepPreAsap(_) => { - format!("{:?}", evidence.retained_queries.get(&(node as *const _))) - } - SummaryExpr::SummaryAgg { .. } => { - format!("{:?}", evidence.aggregations.get(&(node as *const _))) - } - SummaryExpr::SummaryJoin { .. } => { - format!("{:?}", evidence.joins.get(&(node as *const _))) - } - _ => format!("{:?}", evidence.operations.get(&(node as *const _))), - }; - // A provider identity names the complete physical operator, including - // its inputs. Equal local widths/costs do not make operators consuming - // different physical children the same deployment. - let framework = frameworks_by_node.get(&(node as *const _)); - let fingerprint = format!( - "logical={:?}|framework={framework:?}|{local_fingerprint}|children={child_physical_ids:?}", - node.expr - ); - if id.is_empty() - || inputs != child_outputs - || !output.is_consistent() - || inputs.iter().any(|edge| !edge.is_consistent()) - { - return Err(AnalyticalCostError::ComparisonScopeMismatch( - "summary physical edge statistics", - )); - } - match physical.entry(id) { - std::collections::hash_map::Entry::Vacant(entry) => { - entry.insert((inputs, output, fingerprint)); - } - std::collections::hash_map::Entry::Occupied(entry) - if entry.get() != &(inputs, output, fingerprint) => - { - return Err(AnalyticalCostError::ComparisonScopeMismatch( - "summary physical identity", - )); - } - _ => {} - } - Ok(output) - } - visit( - root, - evidence, - frameworks_by_node, - &mut HashSet::new(), - &mut HashMap::new(), - ) - .map(|_| ()) -} - -fn summary_physical_id( - node: &SummaryNode, - evidence: &SummaryNodeEvidence, -) -> Result { - match &node.expr { - SummaryExpr::KeepPreAsap(_) => evidence - .retained_queries - .get(&(node as *const _)) - .map(|value| value.physical_id.clone()), - SummaryExpr::SummaryAgg { .. } => evidence - .aggregations - .get(&(node as *const _)) - .map(|value| value.physical_id.clone()), - SummaryExpr::SummaryJoin { .. } => evidence - .joins - .get(&(node as *const _)) - .map(|value| value.physical_id.clone()), - _ => summary_operation_evidence(node, evidence) - .ok() - .map(|value| value.resource().physical_id.clone()), - } - .ok_or(AnalyticalCostError::MissingOrStale( - "summary physical identity", - )) -} - -/// Simulate a deterministic child-before-parent physical schedule. Completed -/// child output buffers remain live until their final consumer executes; -/// operator workspace and its output buffer coexist during that execution. -pub(super) fn estimate_transient_liveness( - root: &SummaryNode, - evidence: &SummaryNodeEvidence, -) -> Result { - fn children(node: &SummaryNode) -> Vec<&SummaryNode> { - match &node.expr { - SummaryExpr::KeepPreAsap(_) => vec![], - SummaryExpr::SummaryAgg { child, .. } | SummaryExpr::ValueOperation { child, .. } => { - vec![child] - } - SummaryExpr::SummaryMerge { children, .. } => { - children.iter().map(|child| child.as_ref()).collect() - } - SummaryExpr::SummarySubtract { left, right } - | SummaryExpr::RelationalJoin { left, right, .. } - | SummaryExpr::BinaryOp { - lhs: left, - rhs: right, - .. - } - | SummaryExpr::SummaryJoin { - outer: left, - inner: right, - .. - } => vec![left, right], - SummaryExpr::SummaryDelete { summary_input, .. } - | SummaryExpr::SummaryEstimate { summary_input, .. } => vec![summary_input], - } - } - fn visit<'a>( - node: &'a SummaryNode, - evidence: &SummaryNodeEvidence, - seen: &mut HashSet, - uses: &mut HashMap, - order: &mut Vec<&'a SummaryNode>, - ) -> Result<(), AnalyticalCostError> { - if !seen.insert(summary_physical_id(node, evidence)?) { - return Ok(()); - } - for child in children(node) { - *uses - .entry(summary_physical_id(child, evidence)?) - .or_default() += 1; - visit(child, evidence, seen, uses, order)?; - } - order.push(node); - Ok(()) - } - fn memory( - node: &SummaryNode, - evidence: &SummaryNodeEvidence, - ) -> Result<(u64, u64), AnalyticalCostError> { - match &node.expr { - SummaryExpr::KeepPreAsap(_) => evidence - .retained_queries - .get(&(node as *const _)) - .map(|value| (value.working_memory_bytes, value.output_buffer_bytes)) - .ok_or(AnalyticalCostError::MissingOrStale("keep_pre_asap")), - SummaryExpr::SummaryAgg { .. } => Ok((0, 0)), - SummaryExpr::SummaryJoin { .. } => evidence - .joins - .get(&(node as *const _)) - .map(|value| (value.working_memory_bytes, value.output_buffer_bytes)) - .ok_or(AnalyticalCostError::MissingOrStale("summary_join")), - SummaryExpr::SummaryMerge { .. } - | SummaryExpr::BinaryOp { .. } - | SummaryExpr::RelationalJoin { .. } - | SummaryExpr::ValueOperation { .. } - | SummaryExpr::SummarySubtract { .. } - | SummaryExpr::SummaryDelete { .. } - | SummaryExpr::SummaryEstimate { .. } => { - let value = summary_operation_evidence(node, evidence)?.resource(); - Ok((value.working_memory_bytes, value.output_buffer_bytes)) - } - } - } - - let mut uses = HashMap::new(); - let mut order = Vec::new(); - visit(root, evidence, &mut HashSet::new(), &mut uses, &mut order)?; - let outputs: HashMap<_, _> = order - .iter() - .map(|node| { - memory(node, evidence) - .and_then(|(_, output)| summary_physical_id(node, evidence).map(|id| (id, output))) - }) - .collect::>()?; - let mut live = 0_u64; - let mut peak = 0_u64; - for node in order { - let (workspace, output) = memory(node, evidence)?; - peak = peak.max( - live.checked_add(workspace) - .and_then(|bytes| bytes.checked_add(output)) - .ok_or(AnalyticalCostError::Overflow)?, - ); - live = live - .checked_add(output) - .ok_or(AnalyticalCostError::Overflow)?; - for child in children(node) { - let child_id = summary_physical_id(child, evidence)?; - let remaining = - uses.get_mut(&child_id) - .ok_or(AnalyticalCostError::InvalidPhysicalDAG( - "missing summary consumer count", - ))?; - *remaining -= 1; - if *remaining == 0 { - live = live - .checked_sub(outputs[&child_id]) - .ok_or(AnalyticalCostError::Overflow)?; - } - } - } - Ok(peak) -} -#[cfg(test)] -pub(super) fn evidence_nodes(root: &SummaryNode) -> (Vec<&SummaryNode>, Vec<&SummaryNode>) { - fn visit<'a>( - node: &'a SummaryNode, - seen: &mut HashSet<*const SummaryNode>, - aggregations: &mut Vec<&'a SummaryNode>, - joins: &mut Vec<&'a SummaryNode>, - ) { - if !seen.insert(node as *const _) { - return; - } - match &node.expr { - SummaryExpr::SummaryAgg { child, .. } => { - aggregations.push(node); - visit(child, seen, aggregations, joins); - } - SummaryExpr::ValueOperation { child, .. } => visit(child, seen, aggregations, joins), - SummaryExpr::SummaryMerge { children, .. } => { - for child in children { - visit(child, seen, aggregations, joins); - } - } - SummaryExpr::SummarySubtract { left, right } - | SummaryExpr::RelationalJoin { left, right, .. } - | SummaryExpr::BinaryOp { - lhs: left, - rhs: right, - .. - } - | SummaryExpr::SummaryJoin { - outer: left, - inner: right, - .. - } => { - if matches!(&node.expr, SummaryExpr::SummaryJoin { .. }) { - joins.push(node); - } - visit(left, seen, aggregations, joins); - visit(right, seen, aggregations, joins); - } - SummaryExpr::SummaryDelete { summary_input, .. } - | SummaryExpr::SummaryEstimate { summary_input, .. } => { - visit(summary_input, seen, aggregations, joins); - } - SummaryExpr::KeepPreAsap(_) => {} - } - } - let mut aggregations = Vec::new(); - let mut joins = Vec::new(); - visit(root, &mut HashSet::new(), &mut aggregations, &mut joins); - (aggregations, joins) -} - -#[derive(Debug, Clone, Copy, Default, PartialEq, Eq)] -#[cfg(test)] -struct SummaryOperationCounts { - state_builds: u64, - merges_per_read: u64, - subtracts_per_read: u64, - deletes_per_update: u64, - readouts_per_read: u64, - joins_per_read: u64, -} - -/// Low-level diagnostic for a homogeneous deployment. Final planner ranking -/// uses the per-node whole-DAG estimator above. Shared `Rc` nodes are visited -/// once; explicit delete frequency comes from deletion evidence. -#[cfg(test)] -pub(super) fn estimate_incremental_summary_maintenance( - root: &SummaryNode, - guarantee: &SummaryMaintenanceLifecycleGuarantee, - inputs: SummaryMaintenanceInputs, - cpu: SummaryOperationCpuEvidence, - scope: &ComparisonScope, -) -> Result { - estimate_incremental_summary_maintenance_with_join(root, guarantee, inputs, cpu, None, scope) -} -#[cfg(test)] -pub(super) fn estimate_incremental_summary_maintenance_with_join( - root: &SummaryNode, - guarantee: &SummaryMaintenanceLifecycleGuarantee, - inputs: SummaryMaintenanceInputs, - cpu: SummaryOperationCpuEvidence, - join: Option, - scope: &ComparisonScope, -) -> Result { - let inputs = inputs.validate()?; - let evaluation_count = scope.validate()?; - validate_guarantee(guarantee, scope.data_arrival)?; - let (bootstrap_input_rows, arriving_input_rows, active_ms) = - lifecycle_row_counts(inputs, guarantee, scope)?; - let counts = count_operations(root)?; - if counts.state_builds == 0 { - return Err(AnalyticalCostError::UnsupportedCandidate); - } - - let insert = required_cpu("insert_cpu_ops", cpu.insert_cpu_ops)?; - let merge = required_cpu_when(counts.merges_per_read, "merge_cpu_ops", cpu.merge_cpu_ops)?; - let subtract = required_cpu_when( - counts.subtracts_per_read, - "subtract_cpu_ops", - cpu.subtract_cpu_ops, - )?; - let delete = required_cpu_when( - counts.deletes_per_update, - "delete_cpu_ops", - cpu.delete_cpu_ops, - )?; - let delete_events = if counts.deletes_per_update == 0 { - 0_u64 - } else { - let rate = cpu - .delete_events_per_second - .filter(|rate| rate.is_finite() && *rate >= 0.0) - .ok_or(AnalyticalCostError::MissingOrStale( - "delete_events_per_second", - ))?; - let fanout = cpu - .delete_routing_fanout - .filter(|fanout| *fanout > 0) - .ok_or(AnalyticalCostError::MissingOrStale("delete_routing_fanout"))?; - let events = (rate * active_ms as f64 / 1_000.0).ceil(); - if !events.is_finite() || events > u64::MAX as f64 { - return Err(AnalyticalCostError::Overflow); - } - (events as u64) - .checked_mul(fanout) - .ok_or(AnalyticalCostError::Overflow)? - }; - let readout = required_cpu_when( - counts.readouts_per_read, - "readout_cpu_ops", - cpu.readout_cpu_ops, - )?; - let join_cpu = match (counts.joins_per_read, join.as_ref()) { - (0, _) => 0.0, - (_, Some(evidence)) - if evidence.cpu_ops_per_execution.is_finite() - && evidence.cpu_ops_per_execution > 0.0 - && evidence.working_memory_bytes > 0 => - { - evidence.cpu_ops_per_execution - } - (_, Some(evidence)) - if !evidence.cpu_ops_per_execution.is_finite() - || evidence.cpu_ops_per_execution <= 0.0 => - { - return Err(AnalyticalCostError::InvalidOperationCost( - "summary_join_cpu_ops_per_execution", - evidence.cpu_ops_per_execution, - )); - } - _ => return Err(AnalyticalCostError::MissingOrStale("summary_join")), - }; - - let build_inserts = bootstrap_input_rows - .checked_mul(inputs.bootstrap_window_count) - .ok_or(AnalyticalCostError::Overflow)? - .checked_mul(counts.state_builds) - .ok_or(AnalyticalCostError::Overflow)?; - let update_inserts = arriving_input_rows - .checked_mul(inputs.active_window_count) - .and_then(|n| n.checked_mul(counts.state_builds)) - .ok_or(AnalyticalCostError::Overflow)?; - let instances = inputs.physical_summary_count as f64; - let evaluations = evaluation_count as f64; - let cpu_ops = (build_inserts as f64 + update_inserts as f64) * insert - + evaluations * counts.merges_per_read as f64 * instances * merge - + evaluations * counts.subtracts_per_read as f64 * instances * subtract - + delete_events as f64 * counts.deletes_per_update as f64 * delete - + evaluations * counts.readouts_per_read as f64 * instances * readout - + evaluations * counts.joins_per_read as f64 * join_cpu; - if !cpu_ops.is_finite() { - return Err(AnalyticalCostError::Overflow); - } - - let state_instances = inputs - .active_window_count - .checked_add(inputs.retained_window_count) - .and_then(|n| n.checked_mul(inputs.physical_summary_count)) - .and_then(|n| n.checked_mul(counts.state_builds)) - .ok_or(AnalyticalCostError::Overflow)?; - let retained_bytes = state_instances - .checked_mul(inputs.state_bytes_per_summary) - .ok_or(AnalyticalCostError::Overflow)?; - // Merge/subtract may stream over persistent inputs but still needs one - // result state per physical instance. Persistent retained windows are - // already included above and are not loaded a second time. - let transient_bytes = if counts.merges_per_read > 0 || counts.subtracts_per_read > 0 { - inputs - .physical_summary_count - .checked_mul(inputs.state_bytes_per_summary) - .ok_or(AnalyticalCostError::Overflow)? - } else { - 0 - }; - let join_bytes = match (counts.joins_per_read, join.as_ref()) { - (0, _) => 0, - (_, Some(evidence)) => evidence.working_memory_bytes, - _ => return Err(AnalyticalCostError::MissingOrStale("summary_join")), - }; - let bootstrap_row_buffer = if inputs.initial_input_rows == 0 { - 0 - } else { - inputs - .initial_input_bytes - .div_ceil(inputs.initial_input_rows) - }; - Ok(ResourceEstimate::new( - cpu_ops, - retained_bytes - .checked_add(transient_bytes) - .and_then(|bytes| bytes.checked_add(join_bytes)) - .ok_or(AnalyticalCostError::Overflow)? - .max(bootstrap_row_buffer), - inputs.initial_source_scan_bytes, - )) -} - -pub(super) fn lifecycle_row_counts( - inputs: SummaryMaintenanceInputs, - guarantee: &SummaryMaintenanceLifecycleGuarantee, - scope: &ComparisonScope, -) -> Result<(u64, u64, u64), AnalyticalCostError> { - validate_arrival_rate(scope.data_arrival, inputs.ingestion_rate_per_second)?; - let horizon_end = scope - .planning_time - .0 - .checked_add(scope.horizon.0) - .ok_or(AnalyticalCostError::Overflow)?; - let (bootstrap_extra_ms, active_ms) = match guarantee.summary_maintenance_lifecycle { - SummaryMaintenanceLifecycle::Prepared { - activate_at, - retire_at, - } => { - if activate_at.0 >= retire_at.0 { - return Err(AnalyticalCostError::IncompatibleLifecycleGuarantee); - } - let covers_every_evaluation = evaluation_offsets_ms(scope)?.into_iter().all(|offset| { - scope - .planning_time - .0 - .checked_add(offset) - .is_some_and(|at| at >= activate_at.0 && at < retire_at.0) - }); - if !covers_every_evaluation { - return Err(AnalyticalCostError::IncompatibleLifecycleGuarantee); - } - let activation = activate_at.0.max(scope.planning_time.0).min(horizon_end); - let bootstrap_extra_ms = activation.saturating_sub(scope.planning_time.0); - let start = activation; - let end = retire_at.0.min(horizon_end); - (bootstrap_extra_ms, end.saturating_sub(start)) - } - SummaryMaintenanceLifecycle::Shared { .. } => (0, scope.horizon.0), - SummaryMaintenanceLifecycle::ContinuouslyMaintained => (0, scope.horizon.0), - SummaryMaintenanceLifecycle::Ephemeral => { - return Err(AnalyticalCostError::IncompatibleLifecycleGuarantee) - } - }; - let bootstrap_extra = inputs.ingestion_rate_per_second * bootstrap_extra_ms as f64 / 1000.0; - let updates = inputs.ingestion_rate_per_second * active_ms as f64 / 1000.0; - if !bootstrap_extra.is_finite() - || !updates.is_finite() - || bootstrap_extra > u64::MAX as f64 - || updates > u64::MAX as f64 - { - return Err(AnalyticalCostError::Overflow); - } - Ok(( - inputs - .initial_input_rows - .checked_add(bootstrap_extra.ceil() as u64) - .ok_or(AnalyticalCostError::Overflow)?, - updates.ceil() as u64, - active_ms, - )) -} - -fn validate_guarantee( - guarantee: &SummaryMaintenanceLifecycleGuarantee, - arrival: DataArrival, -) -> Result<(), AnalyticalCostError> { - if guarantee.output_representation != asap_types::post_asap::OutputRepresentation::SummaryState - || guarantee.summary_maintenance_mode - != maintenance_mode(&guarantee.summary_maintenance_lifecycle, arrival) - || guarantee.evaluation_schedule - != evaluation_schedule(&guarantee.summary_maintenance_lifecycle, arrival) - { - return Err(AnalyticalCostError::IncompatibleLifecycleGuarantee); - } - Ok(()) -} - -#[cfg(test)] -fn required_cpu(name: &'static str, value: Option) -> Result { - let value = value.ok_or(AnalyticalCostError::MissingOrStale(name))?; - if !value.is_finite() || value <= 0.0 { - return Err(AnalyticalCostError::InvalidOperationCost(name, value)); - } - Ok(value) -} - -pub(super) fn validated_operator_cpu( - name: &'static str, - value: f64, -) -> Result { - if !value.is_finite() || value <= 0.0 { - Err(AnalyticalCostError::InvalidOperationCost(name, value)) - } else { - Ok(value) - } -} - -fn validated_operator_executions( - name: &'static str, - evidence: &SummaryOperatorResourceEvidence, -) -> Result { - if evidence.executions_per_evaluation == 0 { - return Err(AnalyticalCostError::MissingOrZero(name)); - } - Ok(evidence.executions_per_evaluation) -} - -#[cfg(test)] -fn required_cpu_when( - count: u64, - name: &'static str, - value: Option, -) -> Result { - if count == 0 { - return Ok(0.0); - } - required_cpu(name, value) -} - -#[cfg(test)] -fn count_operations(root: &SummaryNode) -> Result { - fn visit( - node: &SummaryNode, - seen: &mut HashSet<*const SummaryNode>, - counts: &mut SummaryOperationCounts, - ) -> Result<(), AnalyticalCostError> { - if !seen.insert(node as *const SummaryNode) { - return Ok(()); - } - match &node.expr { - SummaryExpr::KeepPreAsap(_) => {} - SummaryExpr::SummaryAgg { child, .. } => { - counts.state_builds = counts - .state_builds - .checked_add(1) - .ok_or(AnalyticalCostError::Overflow)?; - visit(child, seen, counts)?; - } - SummaryExpr::SummaryMerge { children, .. } => { - if children.is_empty() { - return Err(AnalyticalCostError::InvalidPhysicalDAG( - "summary merge has no children", - )); - } - counts.merges_per_read = counts - .merges_per_read - .checked_add(children.len().saturating_sub(1) as u64) - .ok_or(AnalyticalCostError::Overflow)?; - for child in children { - visit(child, seen, counts)?; - } - } - SummaryExpr::SummarySubtract { left, right } => { - counts.subtracts_per_read = counts - .subtracts_per_read - .checked_add(1) - .ok_or(AnalyticalCostError::Overflow)?; - visit(left, seen, counts)?; - visit(right, seen, counts)?; - } - SummaryExpr::BinaryOp { lhs, rhs, .. } => { - visit(lhs, seen, counts)?; - visit(rhs, seen, counts)?; - } - SummaryExpr::RelationalJoin { left, right, .. } => { - visit(left, seen, counts)?; - visit(right, seen, counts)?; - } - - SummaryExpr::ValueOperation { child, .. } => visit(child, seen, counts)?, - SummaryExpr::SummaryDelete { summary_input, .. } => { - counts.deletes_per_update = counts - .deletes_per_update - .checked_add(1) - .ok_or(AnalyticalCostError::Overflow)?; - visit(summary_input, seen, counts)?; - } - SummaryExpr::SummaryEstimate { summary_input, .. } => { - counts.readouts_per_read = counts - .readouts_per_read - .checked_add(1) - .ok_or(AnalyticalCostError::Overflow)?; - visit(summary_input, seen, counts)?; - } - SummaryExpr::SummaryJoin { outer, inner, .. } => { - counts.joins_per_read = counts - .joins_per_read - .checked_add(1) - .ok_or(AnalyticalCostError::Overflow)?; - visit(outer, seen, counts)?; - visit(inner, seen, counts)?; - } - } - Ok(()) - } - - let mut counts = SummaryOperationCounts::default(); - visit(root, &mut HashSet::new(), &mut counts)?; - Ok(counts) -} diff --git a/crates/asap-aware-mapping/src/summary_maintenance_cost/evidence.rs b/crates/asap-aware-mapping/src/summary_maintenance_cost/evidence.rs deleted file mode 100644 index f396e3cd8..000000000 --- a/crates/asap-aware-mapping/src/summary_maintenance_cost/evidence.rs +++ /dev/null @@ -1,381 +0,0 @@ -use super::*; - -/// Physical evidence that is not represented by [`DataWorkload`] for one -/// summary deployment. Window counts describe the -/// already-selected physical deployment; this layer does not define another -/// tumbling/sliding policy enum. -#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)] -pub struct SummaryPhysicalInputEvidence { - /// Logical bytes in the snapshot used to bootstrap the state. - pub initial_input_bytes: u64, - /// Source bytes read while bootstrapping. Arriving stream bytes are not a - /// disk scan and are therefore excluded. - pub initial_source_scan_bytes: u64, - /// Simultaneously open windows receiving each arriving item. - pub active_window_count: u64, - /// Window/state partitions receiving each bootstrap row. - pub bootstrap_window_count: u64, - /// Completed windows retained for query coverage. - pub retained_window_count: u64, - /// Independent state instances per window: one for shared - /// multi-subpopulation state, otherwise the resolved group count. - pub physical_summary_count: u64, - /// Resident bytes of one concrete state instance. - pub state_bytes_per_summary: u64, -} - -/// Workload-normalized inputs for summary construction and maintenance over one finite -/// comparison horizon. -#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)] -pub struct SummaryMaintenanceInputs { - pub initial_input_rows: u64, - pub initial_input_bytes: u64, - pub initial_source_scan_bytes: u64, - pub ingestion_rate_per_second: f64, - pub active_window_count: u64, - pub bootstrap_window_count: u64, - pub retained_window_count: u64, - pub physical_summary_count: u64, - pub state_bytes_per_summary: u64, -} - -impl SummaryMaintenanceInputs { - /// Resolve snapshot size, arriving rows, and reads from the canonical - /// workload. Positive fractional expected work rounds up conservatively. - /// - /// `AtRest` needs snapshot cardinality and implies zero arrivals; continuous - /// ingestion additionally requires fresh rate evidence. - /// `Mixed` fails closed because today's workload schema cannot distinguish - /// its at-rest backlog from its continuing-arrival cardinality. - pub fn from_workload( - physical: SummaryPhysicalInputEvidence, - data: &DataWorkload, - scope: &ComparisonScope, - ) -> Result { - let _ = scope.validate()?; - if scope.data_arrival != data.arrival { - return Err(AnalyticalCostError::ComparisonScopeMismatch("data arrival")); - } - let initial_input_rows = data - .input_cardinality - .value_at(scope.planning_time.0) - .copied() - .ok_or(AnalyticalCostError::MissingOrStale("input_cardinality"))?; - let ingestion_rate = match data.arrival { - DataArrival::AtRest => { - // A declared snapshot has no arrivals. Reject contradictory fresh - // evidence rather than silently pricing the wrong workload. - if let Some(rate) = data.ingestion_rate.value_at(scope.planning_time.0) { - validate_arrival_rate(data.arrival, rate.0)?; - } - 0.0 - } - DataArrival::ContinuouslyIngesting => { - data.ingestion_rate - .value_at(scope.planning_time.0) - .copied() - .ok_or(AnalyticalCostError::MissingOrStale("ingestion_rate"))? - .0 - } - arrival => return Err(AnalyticalCostError::UnsupportedDataArrival(arrival)), - }; - validate_arrival_rate(data.arrival, ingestion_rate)?; - Self { - initial_input_rows, - initial_input_bytes: physical.initial_input_bytes, - initial_source_scan_bytes: physical.initial_source_scan_bytes, - ingestion_rate_per_second: ingestion_rate, - active_window_count: physical.active_window_count, - bootstrap_window_count: physical.bootstrap_window_count, - retained_window_count: physical.retained_window_count, - physical_summary_count: physical.physical_summary_count, - state_bytes_per_summary: physical.state_bytes_per_summary, - } - .validate() - } - - pub fn validate(self) -> Result { - for (name, value) in [ - ("active_window_count", self.active_window_count), - ("bootstrap_window_count", self.bootstrap_window_count), - ("physical_summary_count", self.physical_summary_count), - ("state_bytes_per_summary", self.state_bytes_per_summary), - ] { - if value == 0 { - return Err(AnalyticalCostError::MissingOrZero(name)); - } - } - if (self.initial_input_rows == 0) != (self.initial_input_bytes == 0) - || (self.initial_input_rows == 0 && self.initial_source_scan_bytes != 0) - { - return Err(AnalyticalCostError::InconsistentBootstrapEvidence); - } - if !self.ingestion_rate_per_second.is_finite() || self.ingestion_rate_per_second < 0.0 { - return Err(AnalyticalCostError::InvalidIngestionRate( - self.ingestion_rate_per_second, - )); - } - Ok(self) - } -} - -/// CPU operations for one concrete state operation on one state instance. -/// Missing evidence is legal only when the selected summary DAG does not use -/// that operation. -#[cfg(test)] -#[derive(Debug, Clone, Copy, Default, PartialEq, Serialize, Deserialize)] -pub struct SummaryOperationCpuEvidence { - pub insert_cpu_ops: Option, - pub merge_cpu_ops: Option, - pub subtract_cpu_ops: Option, - pub delete_cpu_ops: Option, - /// Expirations/retractions routed to this DAG per second. Required only - /// when an explicit `SummaryDelete` is present. - pub delete_events_per_second: Option, - /// Concrete state instances touched by one delete event. - pub delete_routing_fanout: Option, - pub readout_cpu_ops: Option, -} - -/// Physical evidence for one `SummaryJoin` implementation. Total work, -/// cardinality, and memory cannot be inferred from the logical join key alone. -#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] -pub struct SummaryJoinEvidence { - pub physical_id: String, - pub inputs: Vec, - pub output: EdgeStatistics, - /// Total build, probe, match-production, and output CPU for one complete - /// execution of the selected physical join algorithm. - pub cpu_ops_per_execution: f64, - pub working_memory_bytes: u64, - pub output_buffer_bytes: u64, - pub executions_per_evaluation: u64, - pub io_bytes_per_execution: Option, -} - -#[derive(Debug, Clone, PartialEq)] -pub struct SummaryAggregateEvidence { - pub physical_id: String, - pub input: EdgeStatistics, - pub output: EdgeStatistics, - /// Index into `ComparisonScope.sources` when this state bootstraps directly - /// from storage. `None` means its input is an already-materialized child - /// edge and therefore has no additional source read. - pub source_coverage_index: Option, - /// Provider-owned identity of the physical bootstrap read. Equal source - /// coverage alone does not prove two independent builds share I/O. - pub bootstrap_read_identity: String, - pub inputs: SummaryMaintenanceInputs, - /// CPU operations to insert one routed row into one state instance. - pub insert_cpu_ops: f64, -} - -#[derive(Debug, Clone, PartialEq)] -pub struct SummaryOperatorResourceEvidence { - pub physical_id: String, - pub inputs: Vec, - pub output: EdgeStatistics, - pub cpu_ops: f64, - pub working_memory_bytes: u64, - pub output_buffer_bytes: u64, - /// Executions of this physical operator for one query evaluation. - /// This is provider evidence, not inferred from a descendant state. - pub executions_per_evaluation: u64, - pub io_bytes_per_execution: Option, -} - -/// Evidence is structured by logical summary operation so delete-only facts -/// cannot be attached to merge, subtract, or readout nodes. -#[derive(Debug, Clone, PartialEq)] -pub enum SummaryOperatorEvidence { - /// Exact query-time arithmetic over two independently realized operands. - Binary(SummaryOperatorResourceEvidence), - /// Query-time or maintenance-time plain-value work. For `Sort`/`Limit`, - /// providers report the actual comparison/heap work and working set here; - /// the estimator charges it at query multiplicity. - ValueOperation(SummaryOperatorResourceEvidence), - Merge(SummaryOperatorResourceEvidence), - Subtract(SummaryOperatorResourceEvidence), - Delete { - resource: SummaryOperatorResourceEvidence, - events_per_second: f64, - routing_fanout: u64, - }, - Readout(SummaryOperatorResourceEvidence), -} - -impl SummaryOperatorEvidence { - pub(super) fn resource(&self) -> &SummaryOperatorResourceEvidence { - match self { - Self::Binary(resource) - | Self::ValueOperation(resource) - | Self::Merge(resource) - | Self::Subtract(resource) - | Self::Delete { resource, .. } - | Self::Readout(resource) => resource, - } - } - - #[cfg(test)] - pub(super) fn resource_mut(&mut self) -> &mut SummaryOperatorResourceEvidence { - match self { - Self::Binary(resource) - | Self::ValueOperation(resource) - | Self::Merge(resource) - | Self::Subtract(resource) - | Self::Delete { resource, .. } - | Self::Readout(resource) => resource, - } - } -} - -/// Non-aggregation work for a retained pre-ASAP sub-DAG over the comparison -/// horizon. Bootstrap/source I/O belongs exclusively to the owning aggregate, -/// and summary insertion belongs exclusively to its insert evidence. -#[derive(Debug, Clone, PartialEq)] -pub struct RetainedSubDAGEvidence { - pub physical_id: String, - /// Logical output edge consumed by the parent summary operator. - pub output: EdgeStatistics, - pub preprocessing_cpu_ops_over_horizon: f64, - /// Execution workspace, excluding the separately declared output buffer. - pub working_memory_bytes: u64, - pub output_buffer_bytes: u64, -} - -/// Physical evidence bound to the selected DAG's `Rc` identity. A copied, -/// structurally equal node is not silently treated as the same deployment. -#[derive(Debug, Clone, Default)] -pub struct SummaryNodeEvidence { - pub(super) aggregations: HashMap<*const SummaryNode, SummaryAggregateEvidence>, - pub(super) joins: HashMap<*const SummaryNode, SummaryJoinEvidence>, - pub(super) operations: HashMap<*const SummaryNode, SummaryOperatorEvidence>, - pub(super) operation_state_owners: HashMap<*const SummaryNode, *const SummaryNode>, - pub(super) retained_queries: HashMap<*const SummaryNode, RetainedSubDAGEvidence>, -} - -impl SummaryNodeEvidence { - pub fn insert_aggregation( - &mut self, - node: &Rc, - evidence: SummaryAggregateEvidence, - ) { - self.aggregations.insert(Rc::as_ptr(node), evidence); - } - - pub fn insert_join(&mut self, node: &Rc, evidence: SummaryJoinEvidence) { - self.joins.insert(Rc::as_ptr(node), evidence); - } - - pub fn insert_operation(&mut self, node: &Rc, evidence: SummaryOperatorEvidence) { - self.operations.insert(Rc::as_ptr(node), evidence); - } - - /// Bind a stateful operation (currently `SummaryDelete`) to the exact - /// aggregation deployment whose active interval it follows. - pub fn insert_state_operation( - &mut self, - node: &Rc, - state: &Rc, - evidence: SummaryOperatorEvidence, - ) { - self.operations.insert(Rc::as_ptr(node), evidence); - self.operation_state_owners - .insert(Rc::as_ptr(node), Rc::as_ptr(state)); - } - - pub fn insert_retained_query( - &mut self, - node: &Rc, - evidence: RetainedSubDAGEvidence, - ) { - self.retained_queries.insert(Rc::as_ptr(node), evidence); - } - - pub(super) fn aggregation(&self, node: &SummaryNode) -> Option { - self.aggregations.get(&(node as *const _)).cloned() - } -} - -pub(super) fn summary_operation_evidence<'a>( - node: &SummaryNode, - evidence: &'a SummaryNodeEvidence, -) -> Result<&'a SummaryOperatorEvidence, AnalyticalCostError> { - let operation = evidence - .operations - .get(&(node as *const _)) - .ok_or(AnalyticalCostError::MissingOrStale("summary operation"))?; - let matches = matches!( - (&node.expr, operation), - ( - SummaryExpr::BinaryOp { .. }, - SummaryOperatorEvidence::Binary(_) - ) | ( - SummaryExpr::ValueOperation { .. }, - SummaryOperatorEvidence::ValueOperation(_) - ) | ( - SummaryExpr::SummaryMerge { .. }, - SummaryOperatorEvidence::Merge(_) - ) | ( - SummaryExpr::SummarySubtract { .. }, - SummaryOperatorEvidence::Subtract(_) - ) | ( - SummaryExpr::SummaryDelete { .. }, - SummaryOperatorEvidence::Delete { .. } - ) | ( - SummaryExpr::SummaryEstimate { .. }, - SummaryOperatorEvidence::Readout(_) - ) - ); - if matches { - Ok(operation) - } else { - Err(AnalyticalCostError::InconsistentOperatorStatistics( - "summary operation evidence kind does not match SummaryExpr", - )) - } -} - -/// Evidence for recomputing the raw target over the full comparison horizon. -/// Planning-time dimensions describe the initial snapshot. Each scheduled -/// evaluation adds arrivals since planning time; `physical_dag` is therefore -/// a once-counted DAG whose edge statistics already aggregate all evaluations. -#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] -pub struct RawInputEvidence { - pub planning_time_input_rows: u64, - pub planning_time_input_bytes: u64, - pub planning_time_source_scan_bytes: u64, - /// Decoded logical bytes added to operator edges by one arriving row. - pub arriving_logical_row_bytes: u64, - /// Physical storage bytes read for one arriving row. Kept separate from - /// logical width so compression and encoding are not silently conflated. - pub arriving_source_row_bytes: u64, - pub ingestion_rate_per_second: f64, - pub physical_dag: EvidenceBackedPhysicalDAG, -} - -/// One complete provider-enumerated physical implementation of the selected -/// summary DAG. The identifier is stable provenance; concrete -/// framework selection is performed by ranking these complete alternatives. -#[derive(Debug, Clone)] -pub struct SummaryPhysicalPlanAlternative { - pub physical_plan_id: String, - pub node_evidence: SummaryNodeEvidence, -} - -/// Apply arrival semantics to both workload-derived and directly bound evidence. -pub(super) fn validate_arrival_rate( - arrival: DataArrival, - rate: f64, -) -> Result<(), AnalyticalCostError> { - if !rate.is_finite() || rate < 0.0 { - return Err(AnalyticalCostError::InvalidIngestionRate(rate)); - } - match arrival { - DataArrival::AtRest if rate != 0.0 => Err(AnalyticalCostError::ComparisonScopeMismatch( - "at-rest ingestion rate", - )), - DataArrival::AtRest | DataArrival::ContinuouslyIngesting => Ok(()), - other => Err(AnalyticalCostError::UnsupportedDataArrival(other)), - } -} diff --git a/crates/asap-aware-mapping/src/summary_maintenance_cost/mod.rs b/crates/asap-aware-mapping/src/summary_maintenance_cost/mod.rs deleted file mode 100644 index bc1b7ddaf..000000000 --- a/crates/asap-aware-mapping/src/summary_maintenance_cost/mod.rs +++ /dev/null @@ -1,52 +0,0 @@ -//! Analytical resource cost for at-rest and incrementally maintained summary deployments. -//! -//! The canonical workload and lifecycle types own deployment semantics. This -//! module only adds physical evidence absent from those schemas: state size, -//! window counts, and per-operation CPU measurements or complexity estimates. - -use std::collections::{HashMap, HashSet}; -use std::rc::Rc; - -use asap_types::post_asap::{ - BoundExpr, ErrorMetric, ExactKind, FieldDataType, GuaranteeSource, ProbabilityExpr, - ResultGuarantee, SketchAlgorithm, SummaryExpr, SummaryMaintenanceLifecycle, - SummaryMaintenanceLifecycleGuarantee, SummaryNode, SummaryWindowFramework, -}; -use asap_types::pre_asap::{ - agg_intent::AggIntent, CompareOpKind, InfoMatcher, Predicate, QueryExpr, Source, -}; -use asap_types::types::AccuracyTarget; -use asap_types::workload::{DataArrival, DataWorkload, QueryRecurrence, RepeatedDemand}; -use serde::{Deserialize, Serialize}; - -use crate::accuracy::{AccuracyModel, DefaultAccuracyModel}; -use crate::analytical_cost::ExecutionMultiplicity; -#[cfg(test)] -use crate::analytical_cost::PhysicalNodeEvidence; -use crate::analytical_cost::{ - estimate_physical_dag, AnalyticalCostError, EvidenceBackedPhysicalDAG, PhysicalDAGNode, - PhysicalOperator, ResourceCalibration, ResourceEstimate, -}; -use crate::cost_model::{ - CompleteSummaryCandidateEstimate, Cost, CostModel, CostedSummaryDeployment, DefaultCostModel, -}; -#[cfg(test)] -use crate::physical_operator_statistics::UnaryEdgeStatistics; -use crate::physical_operator_statistics::{ComparisonScope, EdgeStatistics, OperatorStatistics}; -use crate::recurrence::CostRate; -use crate::replacement::{Replacement, ReplacementSubDAG, TargetSubDAG}; -use crate::summary_maintenance_lifecycle::{ - evaluation_schedule, maintenance_mode, SummaryMaintenanceCapabilities, - SummaryMaintenanceLifecycleCostInputs, -}; - -pub const SUMMARY_MAINTENANCE_COST_MODEL_VERSION: &str = "summary-maintenance-resource-v2"; - -mod estimator; -mod evidence; -mod model; -mod window; - -pub use evidence::*; -pub use model::*; -pub use window::*; diff --git a/crates/asap-aware-mapping/src/summary_maintenance_cost/model.rs b/crates/asap-aware-mapping/src/summary_maintenance_cost/model.rs deleted file mode 100644 index 331b7e1a5..000000000 --- a/crates/asap-aware-mapping/src/summary_maintenance_cost/model.rs +++ /dev/null @@ -1,3651 +0,0 @@ -use super::*; -/// Adapter that supplies the existing lifecycle planner with analytical -/// summary costs across at-rest and continuously ingesting workloads. The -/// planner's existing lifecycle enums and legality checks remain authoritative. -#[derive(Debug, Clone)] -pub struct SummaryMaintenanceCostModel { - pub node_evidence: SummaryNodeEvidence, - pub calibration: ResourceCalibration, - pub capabilities: SummaryMaintenanceCapabilities, - target_comparisons: HashMap<*const QueryExpr, SummaryTargetComparison>, - candidate_comparisons: HashMap, - physical_plan_alternatives: - HashMap>, - window_framework_candidates: - HashMap>, -} - -type CandidateComparisonKey = (*const QueryExpr, *const SummaryNode); - -#[derive(Debug, Clone)] -struct BoundCandidateIdentity { - _target: Rc, - _root: Rc, -} - -#[derive(Debug, Clone)] -struct SummaryTargetComparison { - _target: Rc, - scope: ComparisonScope, - raw: RawInputEvidence, -} - -pub(super) type LogicalSourceSelection = (Source, Vec, Vec); - -pub(super) fn deduplicate_source_selections( - values: Vec, -) -> Vec { - values.into_iter().fold(Vec::new(), |mut unique, value| { - if !unique.contains(&value) { - unique.push(value); - } - unique - }) -} - -fn info_source(selector: &[InfoMatcher]) -> Result { - let mut metric: Option<&str> = None; - for matcher in selector - .iter() - .filter(|matcher| matcher.label == "__name__") - { - if matcher.op != CompareOpKind::Eq || metric.is_some_and(|value| value != matcher.value) { - return Err(AnalyticalCostError::UnsupportedQueryOperator); - } - metric = Some(&matcher.value); - } - Ok(Source::TimeSeries { - metric: metric.unwrap_or("target_info").into(), - }) -} - -pub(super) fn query_source_selections( - query: &QueryExpr, - out: &mut Vec, -) -> Result<(), AnalyticalCostError> { - use QueryExpr::*; - match query { - Scan { - source, predicates, .. - } => out.push((source.clone(), predicates.clone(), vec![])), - PromqlVectorFromScalar(child) | PromqlScalarFromVector(child) => { - query_source_selections(child, out)? - } - PromqlInfoEnrich { selector, child } => { - query_source_selections(child, out)?; - out.push((info_source(selector)?, vec![], selector.clone())); - } - PromqlRelabel { child, .. } - | Filter { child, .. } - | Project { child, .. } - | Aggregate { child, .. } - | Dedup { child, .. } - | PromqlSubquery { child, .. } - | TimeRange { child, .. } - | TimeShift { child, .. } - | SQLWindowFunc { child, .. } - | PromqlSeriesSample { child, .. } - | Sort { child, .. } - | Limit { child, .. } => query_source_selections(child, out)?, - Concat { children, .. } => { - for child in children { - query_source_selections(child, out)?; - } - } - Join { left, right, .. } | SetOp { left, right, .. } => { - query_source_selections(left, out)?; - query_source_selections(right, out)?; - } - BinaryOp { lhs, rhs, .. } => { - query_source_selections(lhs, out)?; - query_source_selections(rhs, out)?; - } - PromqlScalarBridge(_) - | EvalTimestamp - | CurrentTimestamp - | Column(_) - | Literal(_) - | Compare { .. } - | BoolAnd(_) - | BoolOr(_) - | Not(_) - | IsNull(_) - | IsNotNull(_) - | Cast { .. } - | InList { .. } - | FunctionCall { .. } - | Arithmetic { .. } - | Case { .. } => {} - } - Ok(()) -} - -fn validate_query_scope( - target: &QueryExpr, - scope: &ComparisonScope, -) -> Result<(), AnalyticalCostError> { - let mut actual = Vec::new(); - query_source_selections(target, &mut actual)?; - let actual = deduplicate_source_selections(actual); - let mut declared: Vec<_> = scope - .sources - .iter() - .map(|coverage| { - ( - coverage.source.clone(), - coverage.predicates.clone(), - coverage.info_matchers.clone(), - ) - }) - .collect(); - for selection in actual { - let Some(index) = declared.iter().position(|value| value == &selection) else { - return Err(AnalyticalCostError::ComparisonScopeMismatch( - "raw target source lineage", - )); - }; - declared.swap_remove(index); - } - if !declared.is_empty() { - return Err(AnalyticalCostError::ComparisonScopeMismatch( - "raw target source lineage", - )); - } - Ok(()) -} - -fn validate_physical_scope_coverage( - physical: &EvidenceBackedPhysicalDAG, - scope: &ComparisonScope, -) -> Result<(), AnalyticalCostError> { - let nodes = reachable_physical_nodes(physical)?; - let mut covered = HashSet::new(); - for node in nodes - .into_iter() - .filter(|node| node.operator == PhysicalOperator::Scan) - { - let coverage = node - .source_coverage - .as_ref() - .ok_or_else(|| AnalyticalCostError::MissingScanSourceCoverage(node.id.clone()))?; - let Some(index) = scope.sources.iter().position(|value| value == coverage) else { - return Err(AnalyticalCostError::ComparisonScopeMismatch( - "physical source coverage", - )); - }; - covered.insert(index); - } - if covered.len() != scope.sources.len() { - return Err(AnalyticalCostError::ComparisonScopeMismatch( - "physical source coverage", - )); - } - Ok(()) -} - -fn reachable_physical_nodes( - physical: &EvidenceBackedPhysicalDAG, -) -> Result, AnalyticalCostError> { - let by_id: HashMap<_, _> = physical - .nodes - .iter() - .map(|node| (node.id.as_str(), node)) - .collect(); - if by_id.len() != physical.nodes.len() { - return Err(AnalyticalCostError::InvalidPhysicalDAG("duplicate node id")); - } - fn visit<'a>( - id: &'a str, - by_id: &HashMap<&'a str, &'a PhysicalDAGNode>, - visiting: &mut HashSet<&'a str>, - visited: &mut HashSet<&'a str>, - nodes: &mut Vec<&'a PhysicalDAGNode>, - ) -> Result<(), AnalyticalCostError> { - if visited.contains(id) { - return Ok(()); - } - if !visiting.insert(id) { - return Err(AnalyticalCostError::InvalidPhysicalDAG("cycle")); - } - let node = by_id - .get(id) - .copied() - .ok_or(AnalyticalCostError::InvalidPhysicalDAG("missing node"))?; - for child in &node.children { - visit(child, by_id, visiting, visited, nodes)?; - } - visiting.remove(id); - visited.insert(id); - nodes.push(node); - Ok(()) - } - let mut nodes = Vec::new(); - visit( - physical.root.as_str(), - &by_id, - &mut HashSet::new(), - &mut HashSet::new(), - &mut nodes, - )?; - Ok(nodes) -} - -fn validate_raw_snapshot_dimensions( - raw: &RawInputEvidence, - scope: &ComparisonScope, -) -> Result<(), AnalyticalCostError> { - validate_arrival_rate(scope.data_arrival, raw.ingestion_rate_per_second)?; - if scope.sources.len() != 1 { - return Err(AnalyticalCostError::MissingComparisonScope( - "single-source raw evolution", - )); - } - if !raw.ingestion_rate_per_second.is_finite() || raw.ingestion_rate_per_second < 0.0 { - return Err(AnalyticalCostError::InvalidIngestionRate( - raw.ingestion_rate_per_second, - )); - } - let bootstrap_is_consistent = if raw.planning_time_input_rows == 0 { - raw.planning_time_input_bytes == 0 && raw.planning_time_source_scan_bytes == 0 - } else { - raw.planning_time_input_bytes > 0 && raw.planning_time_source_scan_bytes > 0 - }; - if !bootstrap_is_consistent - || (raw.ingestion_rate_per_second > 0.0 - && (raw.arriving_logical_row_bytes == 0 || raw.arriving_source_row_bytes == 0)) - { - return Err(AnalyticalCostError::InconsistentBootstrapEvidence); - } - let mut rows = 0_u64; - let mut bytes = 0_u64; - let mut scan = 0_u64; - for offset in evaluation_offsets_ms(scope)? { - let arrivals = (raw.ingestion_rate_per_second * offset as f64 / 1_000.0).ceil(); - if !arrivals.is_finite() || arrivals < 0.0 || arrivals > u64::MAX as f64 { - return Err(AnalyticalCostError::Overflow); - } - let arrivals = arrivals as u64; - rows = rows - .checked_add(raw.planning_time_input_rows) - .and_then(|value| value.checked_add(arrivals)) - .ok_or(AnalyticalCostError::Overflow)?; - bytes = bytes - .checked_add(raw.planning_time_input_bytes) - .and_then(|value| { - arrivals - .checked_mul(raw.arriving_logical_row_bytes) - .and_then(|arriving| value.checked_add(arriving)) - }) - .ok_or(AnalyticalCostError::Overflow)?; - scan = scan - .checked_add(raw.planning_time_source_scan_bytes) - .and_then(|value| { - arrivals - .checked_mul(raw.arriving_source_row_bytes) - .and_then(|arriving| value.checked_add(arriving)) - }) - .ok_or(AnalyticalCostError::Overflow)?; - } - let reachable = reachable_physical_nodes(&raw.physical_dag)?; - if reachable - .iter() - .any(|node| node.execution != ExecutionMultiplicity::Once) - { - return Err(AnalyticalCostError::InvalidPhysicalDAG( - "streaming raw horizon evidence must use once-counted aggregate statistics", - )); - } - let expected = EdgeStatistics { rows, bytes }; - let mut scan_count = 0; - for scan_node in reachable - .into_iter() - .filter(|node| node.operator == PhysicalOperator::Scan) - { - scan_count += 1; - let evidence = raw - .physical_dag - .evidence - .get(&scan_node.id) - .ok_or_else(|| AnalyticalCostError::MissingOperatorStatistics(scan_node.id.clone()))?; - let statistics = &evidence.statistics; - let OperatorStatistics::Scan { - edges, - source_read_bytes, - } = statistics - else { - return Err(AnalyticalCostError::InvalidOperatorStatistics { - node: scan_node.id.clone(), - reason: "raw scan evidence uses the wrong statistics variant", - }); - }; - if edges.input != expected || edges.output != expected || *source_read_bytes != scan { - return Err(AnalyticalCostError::ComparisonScopeMismatch( - "raw source evolution", - )); - } - } - if scan_count == 0 { - return Err(AnalyticalCostError::MissingComparisonScope("raw scan")); - } - Ok(()) -} - -pub(super) fn ephemeral_rows_over_horizon( - inputs: SummaryMaintenanceInputs, - scope: &ComparisonScope, -) -> Result { - evaluation_offsets_ms(scope)? - .into_iter() - .try_fold(0_u64, |total, offset| { - let arrivals = (inputs.ingestion_rate_per_second * offset as f64 / 1_000.0).ceil(); - if !arrivals.is_finite() || arrivals < 0.0 || arrivals > u64::MAX as f64 { - return Err(AnalyticalCostError::Overflow); - } - total - .checked_add(inputs.initial_input_rows) - .and_then(|value| value.checked_add(arrivals as u64)) - .ok_or(AnalyticalCostError::Overflow) - }) -} - -pub(super) fn ephemeral_scan_bytes_over_horizon( - inputs: SummaryMaintenanceInputs, - raw: &RawInputEvidence, - scope: &ComparisonScope, -) -> Result { - if inputs.initial_source_scan_bytes == 0 { - return Ok(0); - } - evaluation_offsets_ms(scope)? - .into_iter() - .try_fold(0_u64, |total, offset| { - let arrivals = (inputs.ingestion_rate_per_second * offset as f64 / 1_000.0).ceil(); - if !arrivals.is_finite() || arrivals < 0.0 || arrivals > u64::MAX as f64 { - return Err(AnalyticalCostError::Overflow); - } - total - .checked_add(inputs.initial_source_scan_bytes) - .and_then(|value| { - (arrivals as u64) - .checked_mul(raw.arriving_source_row_bytes) - .and_then(|arriving| value.checked_add(arriving)) - }) - .ok_or(AnalyticalCostError::Overflow) - }) -} - -pub(super) fn evaluation_offsets_ms( - scope: &ComparisonScope, -) -> Result, AnalyticalCostError> { - let count = scope.validate()?; - match &scope.recurrence { - QueryRecurrence::OneTime { - invocations, - execute_at, - } => Ok(vec![ - execute_at.map_or(0, |at| at - .0 - .saturating_sub(scope.planning_time.0)); - *invocations as usize - ]), - QueryRecurrence::Repeated(RepeatedDemand::FixedInterval(interval)) - | QueryRecurrence::Repeated(RepeatedDemand::FixedIntervalAt { interval, .. }) => { - Ok((1..=count).map(|n| n * u64::from(interval.0)).collect()) - } - QueryRecurrence::Repeated(RepeatedDemand::Scheduled(schedule)) => Ok(schedule - .iter() - .filter(|at| { - at.0 >= scope.planning_time.0 - && at.0 <= scope.planning_time.0.saturating_add(scope.horizon.0) - }) - .map(|at| at.0 - scope.planning_time.0) - .collect()), - QueryRecurrence::Repeated(RepeatedDemand::EstimatedRate(_)) => Ok((1..=count) - .map(|n| scope.horizon.0.saturating_mul(n) / count) - .collect()), - QueryRecurrence::Unknown => Err(AnalyticalCostError::InvalidRecurrence), - } -} - -impl SummaryMaintenanceCostModel { - pub fn new( - calibration: ResourceCalibration, - capabilities: SummaryMaintenanceCapabilities, - ) -> Self { - Self { - node_evidence: SummaryNodeEvidence::default(), - calibration, - capabilities, - target_comparisons: HashMap::new(), - candidate_comparisons: HashMap::new(), - physical_plan_alternatives: HashMap::new(), - window_framework_candidates: HashMap::new(), - } - } - - /// Bind one candidate and its raw baseline to the same target-specific - /// comparison context. Rebinding a target to different evidence is - /// rejected rather than silently replacing the canonical context. - pub fn bind_candidate_comparison( - &mut self, - target: &Rc, - root: &Rc, - scope: ComparisonScope, - raw: RawInputEvidence, - ) -> Result<(), AnalyticalCostError> { - scope.validate()?; - validate_query_scope(target, &scope)?; - validate_physical_scope_coverage(&raw.physical_dag, &scope)?; - validate_raw_snapshot_dimensions(&raw, &scope)?; - estimate_physical_dag( - &raw.physical_dag.nodes, - &raw.physical_dag.root, - &scope, - &raw.physical_dag, - )?; - let target_ptr = Rc::as_ptr(target); - if let Some(existing) = self.target_comparisons.get(&target_ptr) { - if existing.scope != scope || existing.raw != raw { - return Err(AnalyticalCostError::ComparisonScopeMismatch( - "target comparison", - )); - } - } - // Commit only after every validation above succeeds. Shared nodes do - // not carry one owning target; context identity is `(target, root)`. - self.target_comparisons - .entry(target_ptr) - .or_insert(SummaryTargetComparison { - _target: Rc::clone(target), - scope, - raw, - }); - self.candidate_comparisons.insert( - (target_ptr, Rc::as_ptr(root)), - BoundCandidateIdentity { - _target: Rc::clone(target), - _root: Rc::clone(root), - }, - ); - Ok(()) - } - - /// Add one complete physical implementation for an already-bound logical - /// candidate. Duplicate or empty provider identities are rejected. - pub fn bind_physical_plan_alternative( - &mut self, - target: &Rc, - root: &Rc, - alternative: SummaryPhysicalPlanAlternative, - ) -> Result<(), AnalyticalCostError> { - let key = (Rc::as_ptr(target), Rc::as_ptr(root)); - if !self.candidate_comparisons.contains_key(&key) { - return Err(AnalyticalCostError::MissingOrStale( - "candidate comparison binding", - )); - } - if alternative.physical_plan_id.trim().is_empty() { - return Err(AnalyticalCostError::MissingOrZero("physical_plan_id")); - } - if self.window_framework_candidates.contains_key(&key) { - return Err(AnalyticalCostError::ComparisonScopeMismatch( - "physical alternative binding mode", - )); - } - let alternatives = self.physical_plan_alternatives.entry(key).or_default(); - if alternatives - .iter() - .any(|existing| existing.physical_plan_id == alternative.physical_plan_id) - { - return Err(AnalyticalCostError::ComparisonScopeMismatch( - "physical plan identity", - )); - } - alternatives.push(alternative); - Ok(()) - } - - /// Add one complete abstract window assignment to Planner candidate search. - /// - /// The provider may bind multiple executor-feasible implementations for - /// the same framework assignment; their stable identities and complete - /// evidence keep the implementations distinct during ranking. - pub fn bind_window_framework_candidate( - &mut self, - target: &Rc, - root: &Rc, - candidate: SummaryWindowFrameworkCandidate, - ) -> Result<(), AnalyticalCostError> { - let key = (Rc::as_ptr(target), Rc::as_ptr(root)); - if !self.candidate_comparisons.contains_key(&key) { - return Err(AnalyticalCostError::MissingOrStale( - "candidate comparison binding", - )); - } - if candidate.physical_plan_id.trim().is_empty() { - return Err(AnalyticalCostError::MissingOrZero("physical_plan_id")); - } - if self.physical_plan_alternatives.contains_key(&key) { - return Err(AnalyticalCostError::ComparisonScopeMismatch( - "physical alternative binding mode", - )); - } - if candidate.assignments.is_empty() { - return Err(AnalyticalCostError::MissingOrZero( - "window framework assignments", - )); - } - let mut assigned = HashSet::new(); - if candidate - .assignments - .iter() - .any(|assignment| !assigned.insert(Rc::as_ptr(&assignment.summary))) - { - return Err(AnalyticalCostError::MissingOrZero( - "unique window framework assignments", - )); - } - if assigned != summary_aggregation_identities(root) { - return Err(AnalyticalCostError::ComparisonScopeMismatch( - "window framework assignments", - )); - } - let candidates = self.window_framework_candidates.entry(key).or_default(); - if candidates - .iter() - .any(|existing| existing.physical_plan_id == candidate.physical_plan_id) - { - return Err(AnalyticalCostError::ComparisonScopeMismatch( - "window framework candidate", - )); - } - candidates.push(candidate); - Ok(()) - } - - fn comparison_context( - &self, - root: &SummaryNode, - target: Option<&QueryExpr>, - horizon: Option, - expected_reads: Option, - ) -> Option<(CandidateComparisonKey, &SummaryTargetComparison)> { - let root_ptr = root as *const _; - let target_ptr = match target { - Some(target) => target as *const _, - None => { - let mut targets = self - .candidate_comparisons - .keys() - .filter_map(|(target, candidate)| (*candidate == root_ptr).then_some(*target)); - let only = targets.next()?; - if targets.next().is_some() { - return None; - } - only - } - }; - let key = (target_ptr, root_ptr); - if !self.candidate_comparisons.contains_key(&key) { - return None; - } - let comparison = self.target_comparisons.get(&target_ptr)?; - if horizon.map(|value| value.0 * 1_000.0) != Some(comparison.scope.horizon.0 as f64) - || expected_reads != Some(comparison.scope.validate().ok()? as f64) - { - return None; - } - Some((key, comparison)) - } - - fn complete_cost_with_evidence( - &self, - root: &SummaryNode, - deployments: &[CostedSummaryDeployment<'_>], - comparison: &SummaryTargetComparison, - evidence: &SummaryNodeEvidence, - window_frameworks: &[Option], - ) -> Option { - self.calibrated( - estimate_heterogeneous_summary( - root, - deployments, - evidence, - &comparison.scope, - &comparison.raw, - window_frameworks, - ) - .ok()?, - ) - } - - fn canonical_inputs(&self, summary: &SummaryNode) -> Option { - let evidence = self.node_evidence.aggregation(summary)?; - evidence.inputs.validate().ok()?; - Some(evidence) - } - - fn calibrated(&self, estimate: ResourceEstimate) -> Option { - estimate.calibrated_cost(&self.calibration).ok().map(Cost) - } - - fn lifecycle_inputs( - &self, - summary: &SummaryNode, - horizon: Option, - ) -> Option { - let evidence = self.canonical_inputs(summary)?; - let inputs = evidence.inputs; - let insert = validated_operator_cpu("insert_cpu_ops", evidence.insert_cpu_ops).ok()?; - let build = self.calibrated(ResourceEstimate::new( - inputs.initial_input_rows as f64 * inputs.bootstrap_window_count as f64 * insert, - 0, - inputs.initial_source_scan_bytes, - ))?; - let maintenance = self.calibrated(ResourceEstimate::new( - inputs.active_window_count as f64 * insert, - 0, - 0, - ))?; - let retained = inputs - .active_window_count - .checked_add(inputs.retained_window_count)? - .checked_mul(inputs.physical_summary_count)? - .checked_mul(inputs.state_bytes_per_summary)?; - let retention_total = self.calibrated(ResourceEstimate::new(0.0, retained, 0))?; - let horizon_seconds = horizon.filter(|value| value.0 > 0.0)?.0; - Some(SummaryMaintenanceLifecycleCostInputs { - build_cost: Some(build), - maintenance_cost_per_update: Some(maintenance), - // Readout is a separate physical operator in the complete DAG. - // A state-only candidate therefore does not fabricate readout - // evidence merely to keep a lifecycle alternative selectable. - summary_read_cost: Some(Cost::ZERO), - retention_cost_rate: Some(CostRate(retention_total.0 / horizon_seconds)), - // Releasing memory has no modeled CPU or I/O. This is not an - // implicit expiration/rebuild policy; those require an explicit - // SummaryDelete or future authoritative lifecycle evidence. - retirement_cost: Some(Cost::ZERO), - }) - } -} - -impl CostModel for SummaryMaintenanceCostModel { - fn candidate_cost( - &self, - candidate: &ReplacementSubDAG, - _target: &TargetSubDAG<'_>, - ) -> Option { - match &candidate.replacement { - Replacement::ExactComposition(_) => None, - // Lifecycle selection supplies a complete override. If it cannot, - // the candidate remains unavailable rather than receiving this - // trait's structural fallback. - Replacement::Summary(_) => None, - Replacement::Rewrite(_) => None, - } - } - - fn rank_candidates( - &self, - intent: &AggIntent, - candidates: &[SketchAlgorithm], - ) -> Vec { - DefaultCostModel.rank_candidates(intent, candidates) - } - - fn estimate_cost(&self, _candidate: &ReplacementSubDAG, _target: &TargetSubDAG<'_>) -> f64 { - f64::INFINITY - } - - fn summary_maintenance_lifecycle_cost_inputs( - &self, - _summary: &SummaryNode, - ) -> SummaryMaintenanceLifecycleCostInputs { - SummaryMaintenanceLifecycleCostInputs::default() - } - - fn summary_maintenance_lifecycle_cost_inputs_for_horizon( - &self, - summary: &SummaryNode, - horizon: Option, - ) -> SummaryMaintenanceLifecycleCostInputs { - self.lifecycle_inputs(summary, horizon).unwrap_or_default() - } - - fn summary_maintenance_capabilities( - &self, - _summary: &SummaryNode, - ) -> SummaryMaintenanceCapabilities { - self.capabilities - } - - fn complete_summary_candidate_cost( - &self, - root: &SummaryNode, - target: Option<&QueryExpr>, - deployments: &[CostedSummaryDeployment<'_>], - horizon: Option, - expected_reads: Option, - required_accuracy: &[AccuracyTarget], - ) -> Option { - self.complete_summary_candidate_estimate( - root, - target, - deployments, - horizon, - expected_reads, - required_accuracy, - ) - .map(|estimate| estimate.cost) - } - - fn complete_summary_candidate_estimate( - &self, - root: &SummaryNode, - target: Option<&QueryExpr>, - deployments: &[CostedSummaryDeployment<'_>], - horizon: Option, - expected_reads: Option, - required_accuracy: &[AccuracyTarget], - ) -> Option { - let (key, comparison) = self.comparison_context(root, target, horizon, expected_reads)?; - if let Some(candidates) = self.window_framework_candidates.get(&key) { - return candidates - .iter() - .filter_map(|candidate| { - if candidate.assignments.len() != deployments.len() { - return None; - } - if !candidate - .accuracy - .matches_assignments(&candidate.assignments) - { - return None; - } - let window_frameworks = deployments - .iter() - .map(|deployment| { - candidate - .assignments - .iter() - .find(|assignment| { - std::ptr::eq(assignment.summary.as_ref(), deployment.summary) - }) - .map(|assignment| assignment.framework.clone()) - }) - .collect::>>()?; - let uses_exponential_histogram = window_frameworks.iter().any(|framework| { - matches!( - framework, - Some(SummaryWindowFramework::ExponentialHistogram) - ) - }); - let window_accuracy_guarantee = candidate.accuracy.end_to_end_guarantee( - uses_exponential_histogram, - root.guarantee.as_ref(), - )?; - if !required_accuracy.iter().all(|target| { - DefaultAccuracyModel.satisfies(&window_accuracy_guarantee, target) - }) { - return None; - } - self.complete_cost_with_evidence( - root, - deployments, - comparison, - &candidate.node_evidence, - &window_frameworks, - ) - .map(|cost| CompleteSummaryCandidateEstimate { - cost, - physical_plan_id: Some(candidate.physical_plan_id.clone()), - window_frameworks, - window_accuracy_guarantee: Some(window_accuracy_guarantee), - }) - }) - .min_by(|left, right| left.cost.0.total_cmp(&right.cost.0)); - } - if let Some(alternatives) = self.physical_plan_alternatives.get(&key) { - return alternatives - .iter() - .filter_map(|alternative| { - let frameworks = vec![None; deployments.len()]; - self.complete_cost_with_evidence( - root, - deployments, - comparison, - &alternative.node_evidence, - &frameworks, - ) - .map(|cost| CompleteSummaryCandidateEstimate { - cost, - physical_plan_id: Some(alternative.physical_plan_id.clone()), - window_frameworks: frameworks, - window_accuracy_guarantee: None, - }) - }) - .min_by(|left, right| left.cost.0.total_cmp(&right.cost.0)); - } - let frameworks = vec![None; deployments.len()]; - self.complete_cost_with_evidence( - root, - deployments, - comparison, - &self.node_evidence, - &frameworks, - ) - .map(|cost| CompleteSummaryCandidateEstimate { - cost, - physical_plan_id: None, - window_frameworks: frameworks, - window_accuracy_guarantee: None, - }) - } - - fn complete_summary_candidate_estimate_covers_lifecycle_costs(&self) -> bool { - true - } - - fn raw_query_recompute_cost(&self, target: &QueryExpr) -> Option { - let _ = target; - None - } - - fn raw_query_recompute_total_cost( - &self, - target: &QueryExpr, - expected_reads: f64, - ) -> Option { - let target_ptr = target as *const _; - let comparison = self.target_comparisons.get(&target_ptr)?; - let evaluations = comparison.scope.validate().ok()?; - if expected_reads != evaluations as f64 { - return None; - } - self.calibrated( - estimate_physical_dag( - &comparison.raw.physical_dag.nodes, - &comparison.raw.physical_dag.root, - &comparison.scope, - &comparison.raw.physical_dag, - ) - .ok()?, - ) - } -} - -use super::estimator::*; -#[cfg(test)] -mod tests { - use std::rc::Rc; - - use asap_types::post_asap::{ - EvaluationSchedule, ExactKind, ExactParams, Field, FieldDataType, GroupingStrategy, - OutputRepresentation, Schema, SummaryExpr, SummaryMaintenanceLifecycle, - SummaryMaintenanceLifecycleGuarantee, SummaryMaintenanceMode, - }; - use asap_types::pre_asap::{ - agg_intent::AggIntent, ColumnRef, DataType, QueryExpr, Reduction, Source, - }; - use asap_types::workload::{ - DataWorkload, Evidence, EvidenceSource, Predictability, Query, QueryLanguage, - QueryRecurrence, QueryRequirements, QueryTimeScope, QueryWorkload, QueryWorkloadEntry, - Rate, RepeatedDemand, RepeatingEntry, RepetitionInterval, TimeSelection, - }; - - use super::*; - use crate::recurrence::Horizon; - use crate::summary_maintenance_lifecycle::{ - assemble_selected_dag_with_summary_maintenance_lifecycles, - global_selection_with_summary_maintenance_lifecycles, plan_summary_maintenance_lifecycles, - SummaryMaintenanceLifecycleCapabilities, WorkloadDemand, - }; - - fn estimate_test( - root: &SummaryNode, - guarantee: &SummaryMaintenanceLifecycleGuarantee, - inputs: SummaryMaintenanceInputs, - cpu: SummaryOperationCpuEvidence, - ) -> Result { - estimate_incremental_summary_maintenance(root, guarantee, inputs, cpu, &streaming_scope()) - } - - fn estimate_join_test( - root: &SummaryNode, - guarantee: &SummaryMaintenanceLifecycleGuarantee, - inputs: SummaryMaintenanceInputs, - cpu: SummaryOperationCpuEvidence, - join: Option, - ) -> Result { - estimate_incremental_summary_maintenance_with_join( - root, - guarantee, - inputs, - cpu, - join, - &streaming_scope(), - ) - } - - fn scope_for( - data: &DataWorkload, - query: &QueryWorkloadEntry, - planning_time_ms: u64, - horizon_ms: u64, - ) -> ComparisonScope { - ComparisonScope::from_workload( - data, - query, - asap_types::workload::TimestampMs(planning_time_ms), - asap_types::workload::DurationMs(horizon_ms), - vec![crate::physical_operator_statistics::SourceCoverage { - source: Source::TimeSeries { - metric: "metrics".into(), - }, - source_snapshot_id: "stream-start".into(), - predicates: vec![], - info_matchers: vec![], - }], - ) - .unwrap() - } - - fn physical() -> SummaryPhysicalInputEvidence { - SummaryPhysicalInputEvidence { - initial_input_bytes: 640, - initial_source_scan_bytes: 640, - active_window_count: 2, - bootstrap_window_count: 1, - retained_window_count: 3, - physical_summary_count: 2, - state_bytes_per_summary: 100, - } - } - - fn query() -> QueryWorkloadEntry { - QueryWorkloadEntry { - query: Query("streaming count".into()), - requirements: QueryRequirements::default(), - predictability: Predictability::Unknown, - recurrence: QueryRecurrence::Repeated(RepeatedDemand::FixedInterval( - RepetitionInterval(1_000), - )), - time_selection: TimeSelection { - scope: QueryTimeScope::Unknown, - lookback: None, - as_of: None, - }, - } - } - - fn continuous_guarantee() -> SummaryMaintenanceLifecycleGuarantee { - SummaryMaintenanceLifecycleGuarantee { - summary_maintenance_lifecycle: SummaryMaintenanceLifecycle::ContinuouslyMaintained, - summary_maintenance_mode: SummaryMaintenanceMode::Incremental, - evaluation_schedule: EvaluationSchedule::PerUpdate, - output_representation: OutputRepresentation::SummaryState, - } - } - - /// A fixed snapshot needs cardinality evidence, but no stream-rate evidence. - #[test] - fn at_rest_workload_adapter_builds_once_without_arrivals() { - let mut data = streaming_data_workload(); - data.arrival = DataArrival::AtRest; - data.ingestion_rate = Evidence::default(); - data.input_cardinality = Evidence { - value: Some(10), - source: EvidenceSource::Declared, - ..Default::default() - }; - let scope = scope_for(&data, &query(), 0, 5_000); - let inputs = SummaryMaintenanceInputs::from_workload(physical(), &data, &scope).unwrap(); - assert_eq!(inputs.initial_input_rows, 10); - assert_eq!(inputs.ingestion_rate_per_second, 0.0); - let guarantee = SummaryMaintenanceLifecycleGuarantee { - summary_maintenance_lifecycle: SummaryMaintenanceLifecycle::Shared { - retention: asap_types::workload::DurationMs(5_000), - }, - summary_maintenance_mode: SummaryMaintenanceMode::DirectBuild, - evaluation_schedule: EvaluationSchedule::OnRead, - output_representation: OutputRepresentation::SummaryState, - }; - assert_eq!( - lifecycle_row_counts(inputs, &guarantee, &scope).unwrap(), - (10, 0, 5_000) - ); - } - - /// Arrival semantics cannot be overridden by missing or contradictory rate evidence. - #[test] - fn workload_adapter_checks_arrival_scope_and_rate_evidence() { - let mut data = streaming_data_workload(); - data.input_cardinality = Evidence { - value: Some(10), - source: EvidenceSource::Declared, - ..Default::default() - }; - let mut scope = scope_for(&data, &query(), 0, 5_000); - data.ingestion_rate = Evidence::default(); - assert_eq!( - SummaryMaintenanceInputs::from_workload(physical(), &data, &scope), - Err(AnalyticalCostError::MissingOrStale("ingestion_rate")) - ); - data.arrival = DataArrival::AtRest; - assert_eq!( - SummaryMaintenanceInputs::from_workload(physical(), &data, &scope), - Err(AnalyticalCostError::ComparisonScopeMismatch("data arrival")) - ); - scope.data_arrival = DataArrival::AtRest; - for rate in [1.0, -1.0, f64::INFINITY, f64::NAN] { - data.ingestion_rate = Evidence { - value: Some(Rate(rate)), - source: EvidenceSource::Declared, - ..Default::default() - }; - assert!(SummaryMaintenanceInputs::from_workload(physical(), &data, &scope).is_err()); - } - data.ingestion_rate = Evidence::default(); - data.input_cardinality = Evidence::default(); - assert_eq!( - SummaryMaintenanceInputs::from_workload(physical(), &data, &scope), - Err(AnalyticalCostError::MissingOrStale("input_cardinality")) - ); - } - - /// The real lifecycle planner costs a fixed snapshot with the same node evidence API. - #[test] - fn lifecycle_planner_selects_fully_costed_at_rest_summary() { - let workload = streaming_workload(); - let mut data = streaming_data_workload(); - data.arrival = DataArrival::AtRest; - data.ingestion_rate = Evidence::default(); - data.input_cardinality = Evidence { - value: Some(10), - source: EvidenceSource::Declared, - ..Default::default() - }; - let mut scope = streaming_scope(); - scope.data_arrival = DataArrival::AtRest; - let inputs = SummaryMaintenanceInputs::from_workload(physical(), &data, &scope).unwrap(); - let target = streaming_sum_query(); - let root = summary_with_operations(false, false, false); - let mut provider = streaming_model(); - bind_aggregations(&mut provider, &target, &root, inputs, streaming_cpu()); - let mut model = streaming_model(); - model.node_evidence = provider.node_evidence; - let mut raw = streaming_raw(); - raw.ingestion_rate_per_second = 0.0; - let edge = EdgeStatistics { - rows: 50, - bytes: 3_200, - }; - raw.physical_dag - .evidence - .get_mut("raw-scan") - .unwrap() - .statistics = OperatorStatistics::Scan { - source_read_bytes: 3_200, - edges: UnaryEdgeStatistics { - input: edge, - output: edge, - promql: None, - }, - }; - model - .bind_candidate_comparison(&target, &root, scope.clone(), raw.clone()) - .unwrap(); - let plan = plan_summary_maintenance_lifecycles( - Rc::clone(&root), - WorkloadDemand::new_with_data(&workload, &data, &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &model, - ) - .unwrap(); - assert!(plan.summary_total_cost.is_some()); - assert!(!plan.selected_raw_recompute); - assert_eq!( - plan.deployments[0] - .summary_maintenance_lifecycle_guarantee - .as_ref() - .unwrap() - .summary_maintenance_mode, - SummaryMaintenanceMode::DirectBuild - ); - - // Directly supplied raw evidence must not bypass the workload invariant. - raw.ingestion_rate_per_second = 1.0; - assert_eq!( - streaming_model().bind_candidate_comparison(&target, &root, scope, raw), - Err(AnalyticalCostError::ComparisonScopeMismatch( - "at-rest ingestion rate" - )) - ); - // Nor may a provider hide arrivals on a summary edge. - for aggregation in model.node_evidence.aggregations.values_mut() { - aggregation.inputs.ingestion_rate_per_second = 1.0; - } - let invalid = plan_summary_maintenance_lifecycles( - root, - WorkloadDemand::new_with_data(&workload, &data, &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &model, - ) - .unwrap(); - assert_eq!(invalid.summary_total_cost, None); - } - - #[test] - fn workload_adapter_derives_updates_and_reads_over_one_horizon() { - let data = DataWorkload { - arrival: DataArrival::ContinuouslyIngesting, - ingestion_rate: Evidence { - value: Some(Rate(2.0)), - source: EvidenceSource::Observed, - observed_at_ms: Some(100), - valid_for_ms: Some(10_000), - }, - input_cardinality: Evidence { - value: Some(10), - source: EvidenceSource::Observed, - observed_at_ms: Some(100), - valid_for_ms: Some(10_000), - }, - ..DataWorkload::default() - }; - - let scope = scope_for(&data, &query(), 100, 5_000); - let inputs = SummaryMaintenanceInputs::from_workload(physical(), &data, &scope).unwrap(); - assert_eq!(inputs.initial_input_rows, 10); - assert_eq!( - lifecycle_row_counts(inputs, &continuous_guarantee(), &scope) - .unwrap() - .1, - 10 - ); - assert_eq!(scope.validate().unwrap(), 5); - } - - #[test] - fn pure_streaming_can_bootstrap_from_an_empty_state() { - let data = DataWorkload { - arrival: DataArrival::ContinuouslyIngesting, - ingestion_rate: Evidence { - value: Some(Rate(2.0)), - source: EvidenceSource::Declared, - observed_at_ms: None, - valid_for_ms: None, - }, - input_cardinality: Evidence { - value: Some(0), - source: EvidenceSource::Declared, - observed_at_ms: None, - valid_for_ms: None, - }, - ..DataWorkload::default() - }; - let mut empty = physical(); - empty.initial_input_bytes = 0; - empty.initial_source_scan_bytes = 0; - let scope = scope_for(&data, &query(), 0, 5_000); - let inputs = SummaryMaintenanceInputs::from_workload(empty, &data, &scope).unwrap(); - let estimate = estimate_test( - &summary_with_operations(false, false, false), - &continuous_guarantee(), - inputs, - SummaryOperationCpuEvidence { - insert_cpu_ops: Some(2.0), - readout_cpu_ops: Some(1.0), - ..SummaryOperationCpuEvidence::default() - }, - ) - .unwrap(); - // 10 arrivals * 2 active windows * 2 insert ops + 5 reads * 2 summaries. - assert_eq!(estimate.cpu_ops(), 50.0); - assert_eq!(estimate.scan_bytes(), 0); - } - - #[test] - fn bootstrap_rows_and_bytes_must_be_present_together() { - let mut inputs = SummaryMaintenanceInputs { - initial_input_rows: 0, - initial_input_bytes: 8, - initial_source_scan_bytes: 0, - ingestion_rate_per_second: 1.0, - active_window_count: 1, - bootstrap_window_count: 1, - retained_window_count: 1, - physical_summary_count: 1, - state_bytes_per_summary: 8, - }; - assert_eq!( - inputs.validate(), - Err(AnalyticalCostError::InconsistentBootstrapEvidence) - ); - inputs.initial_input_rows = 1; - inputs.initial_input_bytes = 0; - assert_eq!( - inputs.validate(), - Err(AnalyticalCostError::InconsistentBootstrapEvidence) - ); - } - - #[test] - fn no_completed_windows_is_a_valid_streaming_deployment() { - let mut inputs = streaming_inputs(); - inputs.retained_window_count = 0; - assert!(inputs.validate().is_ok()); - } - - #[test] - fn bootstrap_rows_are_routed_to_declared_window_assignments() { - let mut inputs = streaming_inputs(); - inputs.ingestion_rate_per_second = 0.0; - inputs.bootstrap_window_count = 3; - let estimate = estimate_test( - &summary_with_operations(false, false, false), - &continuous_guarantee(), - inputs, - SummaryOperationCpuEvidence { - insert_cpu_ops: Some(2.0), - readout_cpu_ops: Some(1.0), - ..SummaryOperationCpuEvidence::default() - }, - ) - .unwrap(); - // 10 bootstrap rows * 3 windows * 2 insert ops + 5 reads * 2 summaries. - assert_eq!(estimate.cpu_ops(), 70.0); - } - - #[test] - fn lifecycle_output_must_remain_summary_state() { - let mut guarantee = continuous_guarantee(); - guarantee.output_representation = OutputRepresentation::FinalizedValue; - assert_eq!( - estimate_test( - &summary_with_operations(false, false, false), - &guarantee, - streaming_inputs(), - streaming_cpu(), - ), - Err(AnalyticalCostError::IncompatibleLifecycleGuarantee) - ); - } - - #[test] - fn existing_lifecycle_planner_selects_a_fully_costed_streaming_alternative() { - let inputs = SummaryMaintenanceInputs { - initial_input_rows: 10, - initial_input_bytes: 640, - initial_source_scan_bytes: 640, - ingestion_rate_per_second: 2.0, - active_window_count: 2, - bootstrap_window_count: 1, - retained_window_count: 3, - physical_summary_count: 2, - state_bytes_per_summary: 100, - }; - let mut model = streaming_model(); - let workload = QueryWorkload { - language: QueryLanguage::PromQL, - query_batch: None, - repeating_queries: Some(vec![RepeatingEntry { - query: Query("streaming count".into()), - demand: RepeatedDemand::FixedInterval(RepetitionInterval(1_000)), - requirements: QueryRequirements::default(), - predictability: Predictability::Predictable { known_at: None }, - time_selection: TimeSelection::default(), - }]), - }; - let root = summary_with_operations(false, false, false); - let target = streaming_sum_query(); - bind_aggregations(&mut model, &target, &root, inputs, streaming_cpu()); - let plan = plan_summary_maintenance_lifecycles( - root, - WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &model, - ) - .unwrap(); - let selected = plan.deployments[0] - .summary_maintenance_lifecycle_guarantee - .as_ref() - .unwrap(); - assert_eq!( - selected.summary_maintenance_mode, - SummaryMaintenanceMode::Incremental - ); - assert!(matches!( - selected.summary_maintenance_lifecycle, - SummaryMaintenanceLifecycle::Shared { .. } - | SummaryMaintenanceLifecycle::ContinuouslyMaintained - )); - assert!(plan.summary_total_cost.is_some()); - assert_eq!(model.raw_query_recompute_cost(&target), None); - } - - #[test] - fn complete_streaming_cost_can_select_an_ephemeral_direct_build() { - let workload = streaming_workload(); - let target = streaming_sum_query(); - let root = summary_with_operations(false, false, false); - let mut model = streaming_model(); - bind_aggregations( - &mut model, - &target, - &root, - streaming_inputs(), - streaming_cpu(), - ); - - let plan = plan_summary_maintenance_lifecycles( - root, - WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities { - supports_ephemeral: true, - supports_prepared: false, - supports_shared: false, - supports_continuously_maintained: false, - }, - &model, - ) - .unwrap(); - - assert!(plan.summary_total_cost.is_some()); - assert!(matches!( - plan.deployments[0] - .summary_maintenance_lifecycle_guarantee - .as_ref() - .map(|guarantee| &guarantee.summary_maintenance_lifecycle), - Some(SummaryMaintenanceLifecycle::Ephemeral) - )); - } - - #[test] - fn complete_streaming_cost_ranks_provider_owned_physical_plans() { - let workload = streaming_workload(); - let target = streaming_sum_query(); - let root = summary_with_operations(false, false, false); - let mut model = streaming_model(); - bind_aggregations( - &mut model, - &target, - &root, - streaming_inputs(), - streaming_cpu(), - ); - - let mut high_retention = model.node_evidence.clone(); - for aggregate in high_retention.aggregations.values_mut() { - aggregate.inputs.retained_window_count = 20; - } - let mut low_retention = model.node_evidence.clone(); - for aggregate in low_retention.aggregations.values_mut() { - aggregate.inputs.retained_window_count = 2; - } - for alternative in [ - SummaryPhysicalPlanAlternative { - physical_plan_id: "high-retention-layout".into(), - node_evidence: high_retention, - }, - SummaryPhysicalPlanAlternative { - physical_plan_id: "low-retention-layout".into(), - node_evidence: low_retention, - }, - ] { - model - .bind_physical_plan_alternative(&target, &root, alternative) - .unwrap(); - } - - let plan = plan_summary_maintenance_lifecycles( - root, - WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities { - supports_ephemeral: false, - supports_prepared: false, - supports_shared: false, - supports_continuously_maintained: true, - }, - &model, - ) - .unwrap(); - - assert_eq!( - plan.selected_window_implementation_id.as_deref(), - Some("low-retention-layout") - ); - assert_eq!( - crate::summary_maintenance_dag_export::export_summary_maintenance_plan(&plan) - .selected_window_implementation_id - .as_deref(), - Some("low-retention-layout") - ); - } - - #[test] - fn global_selection_compares_streaming_summary_and_raw_over_one_horizon() { - let target = streaming_sum_query(); - let space = crate::replacement::search_workload(vec![("q", Rc::clone(&target))]); - let workload = streaming_workload(); - let mut model = streaming_model(); - for group in space.target_subdag_candidates() { - for candidate in &group.candidates { - if let Replacement::Summary(root) = &candidate.replacement { - bind_aggregations( - &mut model, - &group.target, - root, - streaming_inputs(), - streaming_cpu(), - ); - } - } - } - let selection = global_selection_with_summary_maintenance_lifecycles( - &space, - WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &model, - ) - .unwrap(); - let plan = assemble_selected_dag_with_summary_maintenance_lifecycles( - &selection, - &space.roots[0].1, - WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &model, - ) - .unwrap() - .unwrap(); - assert!(!plan.selected_raw_recompute); - assert_eq!(plan.raw_recompute_total_cost, Some(Cost(5_264.0))); - - let mut missing_baseline = model.clone(); - missing_baseline - .target_comparisons - .get_mut(&Rc::as_ptr(&space.roots[0].1)) - .unwrap() - .raw - .physical_dag - .evidence - .clear(); - let unavailable = global_selection_with_summary_maintenance_lifecycles( - &space, - WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &missing_baseline, - ) - .unwrap(); - assert!(unavailable - .for_target(&space.roots[0].1) - .unwrap() - .chosen - .is_none()); - - let mut raw_cheaper = model; - for evidence in raw_cheaper.node_evidence.aggregations.values_mut() { - evidence.insert_cpu_ops = 10_000.0; - } - let cheap_selection = global_selection_with_summary_maintenance_lifecycles( - &space, - WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &raw_cheaper, - ) - .unwrap(); - assert!(cheap_selection - .for_target(&space.roots[0].1) - .unwrap() - .chosen - .is_none()); - let cheap_plan = assemble_selected_dag_with_summary_maintenance_lifecycles( - &cheap_selection, - &space.roots[0].1, - WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &raw_cheaper, - ) - .unwrap() - .unwrap(); - assert!(cheap_plan.selected_raw_recompute); - assert_eq!(cheap_plan.raw_recompute_total_cost, Some(Cost(5_264.0))); - } - - #[test] - fn raw_evolution_is_bound_to_the_requested_target() { - let target_a = streaming_sum_query(); - let target_b = streaming_sum_query(); - let root_a = summary_with_operations(false, false, false); - let root_b = summary_with_operations(false, false, false); - let mut model = streaming_model(); - bind_aggregations( - &mut model, - &target_a, - &root_a, - streaming_inputs(), - streaming_cpu(), - ); - let mut faster = streaming_inputs(); - // Candidate-local intermediate cardinality is not the raw target's - // planning-time cardinality and must not constrain its baseline. - faster.initial_input_rows = 7; - faster.initial_input_bytes = 448; - faster.initial_source_scan_bytes = 448; - faster.ingestion_rate_per_second = 4.0; - bind_aggregations(&mut model, &target_b, &root_b, faster, streaming_cpu()); - model - .target_comparisons - .get_mut(&Rc::as_ptr(&target_b)) - .unwrap() - .raw = { - let mut raw = streaming_raw(); - raw.ingestion_rate_per_second = 4.0; - let statistics = &mut raw - .physical_dag - .evidence - .get_mut("raw-scan") - .unwrap() - .statistics; - let OperatorStatistics::Scan { - edges, - source_read_bytes, - } = statistics - else { - unreachable!() - }; - *source_read_bytes = 7_040; - edges.input = EdgeStatistics { - rows: 110, - bytes: 7_040, - }; - edges.output = edges.input; - raw - }; - - let a = model.raw_query_recompute_total_cost(&target_a, 5.0); - let b = model.raw_query_recompute_total_cost(&target_b, 5.0); - assert_eq!(a, Some(Cost(5_264.0))); - assert!(b.unwrap().0 > a.unwrap().0); - assert_eq!(model.raw_query_recompute_total_cost(&target_a, 5.0), a); - } - - #[test] - fn raw_validation_uses_reachable_nodes_and_allows_repeated_source_scans() { - let target = streaming_sum_query(); - let root = summary_with_operations(false, false, false); - let scope = streaming_scope(); - let mut raw = streaming_raw(); - let first_scan = raw.physical_dag.nodes[0].clone(); - let mut second_scan = first_scan.clone(); - second_scan.id = "raw-scan-2".into(); - let mut unreachable = first_scan.clone(); - unreachable.id = "unreachable-per-evaluation".into(); - unreachable.execution = ExecutionMultiplicity::PerEvaluation; - raw.physical_dag.nodes = vec![ - first_scan, - second_scan, - unreachable, - PhysicalDAGNode { - id: "raw-concat".into(), - operator: PhysicalOperator::Concat, - children: vec!["raw-scan".into(), "raw-scan-2".into()], - source_coverage: None, - output_buffer_bytes: 0, - retained_bytes: 0, - execution: ExecutionMultiplicity::Once, - }, - ]; - raw.physical_dag.root = "raw-concat".into(); - let scan_evidence = raw.physical_dag.evidence["raw-scan"].clone(); - let mut second_scan_evidence = scan_evidence.clone(); - second_scan_evidence.physical_id = "raw-scan-2".into(); - raw.physical_dag - .evidence - .insert("raw-scan-2".into(), second_scan_evidence); - let mut unreachable_evidence = scan_evidence; - unreachable_evidence.physical_id = "unreachable-per-evaluation".into(); - raw.physical_dag - .evidence - .insert("unreachable-per-evaluation".into(), unreachable_evidence); - raw.physical_dag.evidence.insert( - "raw-concat".into(), - PhysicalNodeEvidence { - physical_id: "raw-concat".into(), - statistics: OperatorStatistics::Concat { - inputs: vec![ - EdgeStatistics { - rows: 80, - bytes: 5_120, - }, - EdgeStatistics { - rows: 80, - bytes: 5_120, - }, - ], - output: EdgeStatistics { - rows: 160, - bytes: 10_240, - }, - promql: None, - }, - output_buffer_bytes: 0, - }, - ); - let mut model = streaming_model(); - assert!(model - .bind_candidate_comparison(&target, &root, scope, raw) - .is_ok()); - } - - #[test] - fn comparison_binding_is_transactional_and_shared_nodes_allow_two_targets() { - let target_a = streaming_sum_query(); - let target_b = streaming_sum_query(); - let root = summary_with_operations(false, false, false); - let mut model = streaming_model(); - let mut wrong_scope = streaming_scope(); - wrong_scope.sources[0].source = Source::TimeSeries { - metric: "wrong".into(), - }; - assert_eq!( - model.bind_candidate_comparison(&target_a, &root, wrong_scope, streaming_raw(),), - Err(AnalyticalCostError::ComparisonScopeMismatch( - "raw target source lineage" - )) - ); - assert!(model.target_comparisons.is_empty()); - assert!(model.candidate_comparisons.is_empty()); - - model - .bind_candidate_comparison(&target_a, &root, streaming_scope(), streaming_raw()) - .unwrap(); - model - .bind_candidate_comparison(&target_b, &root, streaming_scope(), streaming_raw()) - .unwrap(); - assert_eq!(model.candidate_comparisons.len(), 2); - } - - #[test] - fn target_scope_rejects_extra_sources_and_tracks_info_matchers() { - let target = streaming_sum_query(); - let mut extra = streaming_scope(); - extra - .sources - .push(crate::physical_operator_statistics::SourceCoverage { - source: Source::TimeSeries { - metric: "unused".into(), - }, - source_snapshot_id: "stream-start".into(), - predicates: vec![], - info_matchers: vec![], - }); - assert_eq!( - validate_query_scope(&target, &extra), - Err(AnalyticalCostError::ComparisonScopeMismatch( - "raw target source lineage" - )) - ); - - let selector = vec![InfoMatcher { - label: "job".into(), - op: CompareOpKind::Eq, - value: "api".into(), - }]; - let info_target = QueryExpr::PromqlInfoEnrich { - selector: selector.clone(), - child: target, - }; - let mut info_scope = streaming_scope(); - info_scope - .sources - .push(crate::physical_operator_statistics::SourceCoverage { - source: Source::TimeSeries { - metric: "target_info".into(), - }, - source_snapshot_id: "info-start".into(), - predicates: vec![], - info_matchers: selector, - }); - validate_query_scope(&info_target, &info_scope).unwrap(); - info_scope.sources[1].info_matchers[0].value = "worker".into(); - assert_eq!( - validate_query_scope(&info_target, &info_scope), - Err(AnalyticalCostError::ComparisonScopeMismatch( - "raw target source lineage" - )) - ); - } - - #[test] - fn delete_owner_must_be_the_unique_state_reachable_from_its_input() { - let workload = streaming_workload(); - let target = streaming_sum_query(); - let root = summary_with_operations(false, false, true); - let mut cpu = streaming_cpu(); - cpu.delete_cpu_ops = Some(1.0); - cpu.delete_events_per_second = Some(1.0); - cpu.delete_routing_fanout = Some(1); - let mut model = streaming_model(); - model.capabilities.delete = true; - bind_aggregations(&mut model, &target, &root, streaming_inputs(), cpu); - let SummaryExpr::SummaryEstimate { summary_input, .. } = &root.expr else { - unreachable!(); - }; - let delete_ptr = Rc::as_ptr(summary_input); - let unrelated = summary_with_operations(false, false, false); - let unrelated_agg = evidence_nodes(&unrelated).0[0] as *const _; - model - .node_evidence - .operation_state_owners - .insert(delete_ptr, unrelated_agg); - - let plan = plan_summary_maintenance_lifecycles( - Rc::clone(&root), - WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &model, - ) - .unwrap(); - assert_eq!(plan.summary_total_cost, None); - } - - #[test] - fn summary_edge_and_io_evidence_fail_closed() { - let workload = streaming_workload(); - let target = streaming_sum_query(); - let root = summary_join(); - let mut model = streaming_model(); - bind_aggregations( - &mut model, - &target, - &root, - streaming_inputs(), - streaming_cpu(), - ); - let join = evidence_nodes(&root).1[0]; - model.node_evidence.joins.insert( - join as *const _, - SummaryJoinEvidence { - physical_id: "join-edge".into(), - inputs: vec![test_edge(), EdgeStatistics { rows: 2, bytes: 16 }], - output: test_edge(), - cpu_ops_per_execution: 1.0, - working_memory_bytes: 1, - output_buffer_bytes: 0, - executions_per_evaluation: 1, - io_bytes_per_execution: Some(0), - }, - ); - let bad_edge = plan_summary_maintenance_lifecycles( - Rc::clone(&root), - WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &model, - ) - .unwrap(); - assert_eq!(bad_edge.summary_total_cost, None); - - model - .node_evidence - .joins - .get_mut(&(join as *const _)) - .unwrap() - .inputs = vec![test_edge(), test_edge()]; - model - .node_evidence - .operations - .get_mut(&Rc::as_ptr(&root)) - .unwrap() - .resource_mut() - .io_bytes_per_execution = None; - let missing_io = plan_summary_maintenance_lifecycles( - root, - WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &model, - ) - .unwrap(); - assert_eq!(missing_io.summary_total_cost, None); - } - - #[test] - fn summary_edges_io_and_physical_identity_fail_closed() { - let workload = streaming_workload(); - let target = streaming_sum_query(); - let root = summary_join(); - let mut model = streaming_model(); - bind_aggregations( - &mut model, - &target, - &root, - streaming_inputs(), - streaming_cpu(), - ); - let (_, joins) = evidence_nodes(&root); - model.node_evidence.insert_join( - &Rc::new(joins[0].clone()), - SummaryJoinEvidence { - physical_id: "unused".into(), - inputs: vec![test_edge(), test_edge()], - output: test_edge(), - cpu_ops_per_execution: 1.0, - working_memory_bytes: 1, - output_buffer_bytes: 0, - executions_per_evaluation: 1, - io_bytes_per_execution: Some(0), - }, - ); - // Bind the actual join, then make one parent input disagree with its - // child's output. - model.node_evidence.joins.insert( - joins[0] as *const _, - SummaryJoinEvidence { - physical_id: "join-edge".into(), - inputs: vec![test_edge(), EdgeStatistics { rows: 2, bytes: 16 }], - output: test_edge(), - cpu_ops_per_execution: 1.0, - working_memory_bytes: 1, - output_buffer_bytes: 0, - executions_per_evaluation: 1, - io_bytes_per_execution: Some(0), - }, - ); - let bad_edge = plan_summary_maintenance_lifecycles( - Rc::clone(&root), - WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &model, - ) - .unwrap(); - assert_eq!(bad_edge.summary_total_cost, None); - - model - .node_evidence - .joins - .get_mut(&(joins[0] as *const _)) - .unwrap() - .inputs = vec![test_edge(), test_edge()]; - model - .node_evidence - .operations - .get_mut(&Rc::as_ptr(&root)) - .unwrap() - .resource_mut() - .io_bytes_per_execution = None; - let missing_io = plan_summary_maintenance_lifecycles( - root, - WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &model, - ) - .unwrap(); - assert_eq!(missing_io.summary_total_cost, None); - } - - #[test] - fn liveness_does_not_add_disjoint_execution_workspaces() { - let target = streaming_sum_query(); - let root = summary_join(); - let mut model = streaming_model(); - bind_aggregations( - &mut model, - &target, - &root, - streaming_inputs(), - streaming_cpu(), - ); - let join = evidence_nodes(&root).1[0]; - model.node_evidence.joins.insert( - join as *const _, - SummaryJoinEvidence { - physical_id: "huge-join".into(), - inputs: vec![test_edge(), test_edge()], - output: test_edge(), - cpu_ops_per_execution: 1.0, - working_memory_bytes: u64::MAX, - output_buffer_bytes: 0, - executions_per_evaluation: 1, - io_bytes_per_execution: Some(0), - }, - ); - model - .node_evidence - .operations - .get_mut(&Rc::as_ptr(&root)) - .unwrap() - .resource_mut() - .working_memory_bytes = u64::MAX; - assert_eq!( - estimate_transient_liveness(&root, &model.node_evidence), - Ok(u64::MAX) - ); - } - - #[test] - fn conflicting_evidence_cannot_alias_one_provider_physical_identity() { - let workload = streaming_workload(); - let target = streaming_sum_query(); - let root = summary_join(); - let mut model = streaming_model(); - bind_aggregations( - &mut model, - &target, - &root, - streaming_inputs(), - streaming_cpu(), - ); - let aggregations = evidence_nodes(&root).0; - let first = aggregations[0] as *const _; - let second = aggregations[1] as *const _; - model - .node_evidence - .aggregations - .get_mut(&first) - .unwrap() - .physical_id = "aliased-state".into(); - let second_evidence = model.node_evidence.aggregations.get_mut(&second).unwrap(); - second_evidence.physical_id = "aliased-state".into(); - second_evidence.insert_cpu_ops = 99.0; - - let plan = plan_summary_maintenance_lifecycles( - root, - WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &model, - ) - .unwrap(); - assert_eq!(plan.summary_total_cost, None); - } - - #[test] - fn lifecycle_plan_does_not_fall_back_to_partial_agg_cost_for_a_join_root() { - let workload = streaming_workload(); - let root = summary_join(); - let target = streaming_sum_query(); - let mut model = streaming_model(); - bind_aggregations( - &mut model, - &target, - &root, - streaming_inputs(), - streaming_cpu(), - ); - let plan = plan_summary_maintenance_lifecycles( - Rc::clone(&root), - WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &model, - ) - .unwrap(); - assert_eq!(plan.deployments.len(), 2); - assert_eq!(plan.summary_total_cost, None); - - let mut costed = model; - let join_node = evidence_nodes(&root).1[0]; - costed.node_evidence.joins.insert( - join_node as *const _, - SummaryJoinEvidence { - physical_id: "costed-join".into(), - inputs: vec![test_edge(), test_edge()], - output: test_edge(), - cpu_ops_per_execution: 6.0, - working_memory_bytes: 64, - output_buffer_bytes: 64, - executions_per_evaluation: 1, - io_bytes_per_execution: Some(0), - }, - ); - let costed_plan = plan_summary_maintenance_lifecycles( - root, - WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &costed, - ) - .unwrap(); - assert!(costed_plan.summary_total_cost.is_some()); - } - - #[test] - fn whole_dag_cost_requires_and_uses_each_rc_bound_state_evidence() { - let workload = streaming_workload(); - let root = summary_join(); - let target = streaming_sum_query(); - let (aggregations, joins) = evidence_nodes(&root); - let mut model = streaming_model(); - bind_comparison(&mut model, &target, &root); - model.node_evidence.aggregations.insert( - aggregations[0] as *const _, - SummaryAggregateEvidence { - physical_id: "left-state".into(), - input: test_edge(), - output: test_edge(), - source_coverage_index: Some(0), - bootstrap_read_identity: "left-bootstrap".into(), - inputs: streaming_inputs(), - insert_cpu_ops: streaming_cpu().insert_cpu_ops.unwrap(), - }, - ); - let incomplete = plan_summary_maintenance_lifecycles( - Rc::clone(&root), - WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &model, - ) - .unwrap(); - assert_eq!(incomplete.summary_total_cost, None); - - let mut second_inputs = streaming_inputs(); - second_inputs.state_bytes_per_summary = 250; - let mut second_cpu = streaming_cpu(); - second_cpu.insert_cpu_ops = Some(5.0); - model.node_evidence.aggregations.insert( - aggregations[1] as *const _, - SummaryAggregateEvidence { - physical_id: "right-state".into(), - input: test_edge(), - output: test_edge(), - source_coverage_index: Some(0), - bootstrap_read_identity: "right-bootstrap".into(), - inputs: second_inputs, - insert_cpu_ops: second_cpu.insert_cpu_ops.unwrap(), - }, - ); - model.node_evidence.joins.insert( - joins[0] as *const _, - SummaryJoinEvidence { - physical_id: "join".into(), - inputs: vec![test_edge(), test_edge()], - output: test_edge(), - cpu_ops_per_execution: 6.0, - working_memory_bytes: 64, - output_buffer_bytes: 64, - executions_per_evaluation: 1, - io_bytes_per_execution: Some(0), - }, - ); - model.node_evidence.operations.insert( - Rc::as_ptr(&root), - SummaryOperatorEvidence::Readout(SummaryOperatorResourceEvidence { - physical_id: "root-readout".into(), - inputs: vec![test_edge()], - output: test_edge(), - cpu_ops: 3.0, - working_memory_bytes: 0, - output_buffer_bytes: 0, - executions_per_evaluation: 1, - io_bytes_per_execution: Some(0), - }), - ); - let complete = plan_summary_maintenance_lifecycles( - Rc::clone(&root), - WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &model, - ) - .unwrap(); - assert!(complete.summary_total_cost.is_some()); - - model - .node_evidence - .operations - .get_mut(&Rc::as_ptr(&root)) - .unwrap() - .resource_mut() - .working_memory_bytes = 128; - let larger_workspace = plan_summary_maintenance_lifecycles( - Rc::clone(&root), - WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &model, - ) - .unwrap(); - // The join's 64-byte output remains live while the readout's workspace - // is active. The join's execution workspace is released first. - assert_eq!( - larger_workspace.summary_total_cost.unwrap().0 - complete.summary_total_cost.unwrap().0, - 64.0 - ); - - // Equal SourceCoverage does not imply that two independent state - // builds share one physical read. Only a provider-owned read identity - // permits scan de-duplication. - let mut shared_read = model; - for aggregate in shared_read.node_evidence.aggregations.values_mut() { - aggregate.bootstrap_read_identity = "one-physical-read".into(); - } - let shared = plan_summary_maintenance_lifecycles( - root, - WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &shared_read, - ) - .unwrap(); - assert_eq!( - larger_workspace.summary_total_cost.unwrap().0 - shared.summary_total_cost.unwrap().0, - 640.0 - ); - } - - #[test] - fn planner_selects_an_abstract_window_framework_from_downstream_evidence() { - let mut workload = streaming_workload(); - workload.repeating_queries.as_mut().unwrap()[0] - .requirements - .accuracy = - asap_types::workload::AccuracyRequirement::Explicit(AccuracyTarget::EpsilonDelta { - epsilon: 0.10, - delta: 0.01, - }); - let target = streaming_sum_query(); - let root = summary_with_operations(false, false, false); - let SummaryExpr::SummaryEstimate { summary_input, .. } = &root.expr else { - unreachable!(); - }; - let windowed_summary = Rc::clone(summary_input); - let mut model = streaming_model(); - bind_aggregations( - &mut model, - &target, - &root, - streaming_inputs(), - streaming_cpu(), - ); - - let mut tumbling = model.node_evidence.clone(); - for aggregate in tumbling.aggregations.values_mut() { - aggregate.inputs.active_window_count = 1; - aggregate.inputs.retained_window_count = 20; - } - let mut sliding = model.node_evidence.clone(); - for aggregate in sliding.aggregations.values_mut() { - aggregate.inputs.active_window_count = 10; - aggregate.inputs.retained_window_count = 10; - } - let mut exponential_histogram = model.node_evidence.clone(); - for aggregate in exponential_histogram.aggregations.values_mut() { - aggregate.inputs.active_window_count = 2; - aggregate.inputs.retained_window_count = 2; - } - for candidate in [ - SummaryWindowFrameworkCandidate { - physical_plan_id: "tumbling-v1".into(), - assignments: vec![SummaryWindowFrameworkAssignment { - summary: Rc::clone(&windowed_summary), - framework: Some(SummaryWindowFramework::Tumbling), - }], - accuracy: SummaryWindowAccuracyEvidence::Exact, - node_evidence: tumbling, - }, - SummaryWindowFrameworkCandidate { - physical_plan_id: "sliding-v1".into(), - assignments: vec![SummaryWindowFrameworkAssignment { - summary: Rc::clone(&windowed_summary), - framework: Some(SummaryWindowFramework::Sliding), - }], - accuracy: SummaryWindowAccuracyEvidence::Exact, - node_evidence: sliding, - }, - SummaryWindowFrameworkCandidate { - physical_plan_id: "eh-v1".into(), - assignments: vec![SummaryWindowFrameworkAssignment { - summary: Rc::clone(&windowed_summary), - framework: Some(SummaryWindowFramework::ExponentialHistogram), - }], - accuracy: SummaryWindowAccuracyEvidence::ExponentialHistogram( - ExponentialHistogramAccuracyEvidence::UniversalGsum { - epsilon: 0.05, - failure_probability: 0.01, - range: ExponentialHistogramQueryRange::MostRecentWindow, - }, - ), - node_evidence: exponential_histogram, - }, - ] { - model - .bind_window_framework_candidate(&target, &root, candidate) - .unwrap(); - } - // Framework candidates are authoritative. Selection must not depend - // on duplicating one arbitrary implementation into the legacy global - // evidence map. - model.node_evidence = SummaryNodeEvidence::default(); - - let plan = plan_summary_maintenance_lifecycles( - Rc::clone(&root), - WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities { - supports_ephemeral: false, - supports_prepared: false, - supports_shared: false, - supports_continuously_maintained: true, - }, - &model, - ) - .unwrap(); - - assert_eq!( - plan.deployments[0].selected_window_framework, - Some(SummaryWindowFramework::ExponentialHistogram) - ); - assert_eq!( - plan.selected_window_implementation_id.as_deref(), - Some("eh-v1") - ); - let guarantee = plan.window_accuracy_guarantee.as_ref().unwrap(); - assert_eq!(guarantee.metric, ErrorMetric::RelativeValue); - assert!((guarantee.bound.evaluate().unwrap() - 0.05).abs() < f64::EPSILON); - let exported = - crate::summary_maintenance_dag_export::export_summary_maintenance_plan(&plan); - assert_eq!( - exported.deployments[0].selected_window_framework, - Some(SummaryWindowFramework::ExponentialHistogram) - ); - assert_eq!( - exported.selected_window_implementation_id.as_deref(), - Some("eh-v1") - ); - assert_eq!( - exported.window_accuracy_guarantee.unwrap().metric, - ErrorMetric::RelativeValue - ); - - workload.repeating_queries.as_mut().unwrap()[0] - .requirements - .accuracy = - asap_types::workload::AccuracyRequirement::Explicit(AccuracyTarget::Epsilon(0.01)); - let stricter = plan_summary_maintenance_lifecycles( - root, - WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities { - supports_ephemeral: false, - supports_prepared: false, - supports_shared: false, - supports_continuously_maintained: true, - }, - &model, - ) - .unwrap(); - assert_ne!( - stricter.deployments[0].selected_window_framework, - Some(SummaryWindowFramework::ExponentialHistogram) - ); - assert!(stricter.window_accuracy_guarantee.unwrap().is_exact()); - } - - #[test] - fn window_framework_candidates_require_unique_nonempty_planner_primitives() { - let target = streaming_sum_query(); - let root = summary_with_operations(false, false, false); - let SummaryExpr::SummaryEstimate { summary_input, .. } = &root.expr else { - unreachable!(); - }; - let windowed_summary = Rc::clone(summary_input); - let mut model = streaming_model(); - bind_comparison(&mut model, &target, &root); - - let empty = model.bind_window_framework_candidate( - &target, - &root, - SummaryWindowFrameworkCandidate { - physical_plan_id: "empty-assignments".into(), - assignments: vec![], - accuracy: SummaryWindowAccuracyEvidence::Exact, - node_evidence: model.node_evidence.clone(), - }, - ); - assert!(matches!(empty, Err(AnalyticalCostError::MissingOrZero(_)))); - - let candidate = SummaryWindowFrameworkCandidate { - physical_plan_id: "tumbling-v1".into(), - assignments: vec![SummaryWindowFrameworkAssignment { - summary: windowed_summary, - framework: Some(SummaryWindowFramework::Tumbling), - }], - accuracy: SummaryWindowAccuracyEvidence::Exact, - node_evidence: model.node_evidence.clone(), - }; - model - .bind_window_framework_candidate(&target, &root, candidate.clone()) - .unwrap(); - assert!(matches!( - model.bind_window_framework_candidate(&target, &root, candidate), - Err(AnalyticalCostError::ComparisonScopeMismatch(_)) - )); - } - - #[test] - fn one_physical_identity_cannot_alias_different_window_frameworks() { - let workload = streaming_workload(); - let target = streaming_sum_query(); - let root = summary_join(); - let mut model = streaming_model(); - bind_aggregations( - &mut model, - &target, - &root, - streaming_inputs(), - streaming_cpu(), - ); - let SummaryExpr::SummaryEstimate { summary_input, .. } = &root.expr else { - unreachable!(); - }; - let SummaryExpr::SummaryJoin { outer, inner, .. } = &summary_input.expr else { - unreachable!(); - }; - let aggregation_nodes = [Rc::clone(outer), Rc::clone(inner)]; - let (aggregations, joins) = evidence_nodes(&root); - model.node_evidence.joins.insert( - joins[0] as *const _, - SummaryJoinEvidence { - physical_id: "joined-readout".into(), - inputs: vec![test_edge(), test_edge()], - output: test_edge(), - cpu_ops_per_execution: 1.0, - working_memory_bytes: 8, - output_buffer_bytes: 0, - executions_per_evaluation: 1, - io_bytes_per_execution: Some(0), - }, - ); - - let mut shared_aggregation = - model.node_evidence.aggregations[&(aggregations[0] as *const _)].clone(); - shared_aggregation.physical_id = "shared-window-state".into(); - model - .node_evidence - .aggregations - .insert(aggregations[0] as *const _, shared_aggregation.clone()); - model - .node_evidence - .aggregations - .insert(aggregations[1] as *const _, shared_aggregation); - - let retained_children: Vec<_> = aggregation_nodes - .iter() - .map(|aggregate| match &aggregate.expr { - SummaryExpr::SummaryAgg { child, .. } => Rc::clone(child), - _ => unreachable!(), - }) - .collect(); - let mut shared_retained = - model.node_evidence.retained_queries[&Rc::as_ptr(&retained_children[0])].clone(); - shared_retained.physical_id = "shared-retained-input".into(); - for child in &retained_children { - model - .node_evidence - .retained_queries - .insert(Rc::as_ptr(child), shared_retained.clone()); - } - - let candidate = SummaryWindowFrameworkCandidate { - physical_plan_id: "mixed-framework-join".into(), - assignments: vec![ - SummaryWindowFrameworkAssignment { - summary: Rc::clone(&aggregation_nodes[0]), - framework: Some(SummaryWindowFramework::Tumbling), - }, - SummaryWindowFrameworkAssignment { - summary: Rc::clone(&aggregation_nodes[1]), - framework: Some(SummaryWindowFramework::Sliding), - }, - ], - accuracy: SummaryWindowAccuracyEvidence::Exact, - node_evidence: model.node_evidence.clone(), - }; - model - .bind_window_framework_candidate(&target, &root, candidate) - .unwrap(); - - let plan = plan_summary_maintenance_lifecycles( - root, - WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &model, - ) - .unwrap(); - assert_eq!(plan.summary_total_cost, None); - } - - #[test] - fn promsketch_eh_accuracy_composes_registered_full_and_subwindow_bounds() { - let full = SummaryWindowAccuracyEvidence::ExponentialHistogram( - ExponentialHistogramAccuracyEvidence::KllRank { - eh_epsilon: 0.01, - kll_epsilon: 0.02, - failure_probability: 0.01, - range: ExponentialHistogramQueryRange::MostRecentWindow, - }, - ) - .guarantee(true) - .unwrap(); - assert_eq!(full.metric, ErrorMetric::Rank); - assert!((full.bound.evaluate().unwrap() - 0.04).abs() < f64::EPSILON); - - let subwindow = SummaryWindowAccuracyEvidence::ExponentialHistogram( - ExponentialHistogramAccuracyEvidence::KllRank { - eh_epsilon: 0.01, - kll_epsilon: 0.02, - failure_probability: 0.01, - range: ExponentialHistogramQueryRange::SubWindow { - suffix_rows: 100, - query_rows: 25, - }, - }, - ) - .guarantee(true) - .unwrap(); - assert!((subwindow.bound.evaluate().unwrap() - 0.10).abs() < f64::EPSILON); - - let gsum = SummaryWindowAccuracyEvidence::ExponentialHistogram( - ExponentialHistogramAccuracyEvidence::UniversalGsum { - epsilon: 0.05, - failure_probability: 0.30, - range: ExponentialHistogramQueryRange::SubWindow { - suffix_rows: 100, - query_rows: 25, - }, - }, - ) - .guarantee(true) - .unwrap(); - assert_eq!(gsum.metric, ErrorMetric::RelativeValue); - assert!((gsum.bound.evaluate().unwrap() - 0.20).abs() < f64::EPSILON); - } - - #[test] - fn eh_accuracy_rejects_negative_components_and_mismatched_summary_guarantees() { - let evidence = SummaryWindowAccuracyEvidence::ExponentialHistogram( - ExponentialHistogramAccuracyEvidence::KllRank { - eh_epsilon: -0.01, - kll_epsilon: 0.03, - failure_probability: 0.01, - range: ExponentialHistogramQueryRange::MostRecentWindow, - }, - ); - assert!(evidence.guarantee(true).is_none()); - - let evidence = SummaryWindowAccuracyEvidence::ExponentialHistogram( - ExponentialHistogramAccuracyEvidence::KllRank { - eh_epsilon: 0.01, - kll_epsilon: 0.02, - failure_probability: 0.01, - range: ExponentialHistogramQueryRange::MostRecentWindow, - }, - ); - let actual_summary = ResultGuarantee { - metric: ErrorMetric::Rank, - bound: BoundExpr::Constant { value: 0.03 }, - failure_probability: ProbabilityExpr::Constant { value: 0.01 }, - provenance: vec![], - }; - assert!(evidence - .end_to_end_guarantee(true, Some(&actual_summary)) - .is_none()); - } - - #[test] - fn exponential_histogram_without_registered_accuracy_composition_fails_closed() { - let mut workload = streaming_workload(); - workload.repeating_queries.as_mut().unwrap()[0] - .requirements - .accuracy = - asap_types::workload::AccuracyRequirement::Explicit(AccuracyTarget::Epsilon(1.0)); - let target = streaming_sum_query(); - let root = summary_with_operations(false, false, false); - let SummaryExpr::SummaryEstimate { summary_input, .. } = &root.expr else { - unreachable!(); - }; - let mut model = streaming_model(); - bind_aggregations( - &mut model, - &target, - &root, - streaming_inputs(), - streaming_cpu(), - ); - model - .bind_window_framework_candidate( - &target, - &root, - SummaryWindowFrameworkCandidate { - physical_plan_id: "invalid-eh".into(), - assignments: vec![SummaryWindowFrameworkAssignment { - summary: Rc::clone(summary_input), - framework: Some(SummaryWindowFramework::ExponentialHistogram), - }], - accuracy: SummaryWindowAccuracyEvidence::Exact, - node_evidence: model.node_evidence.clone(), - }, - ) - .unwrap(); - - let plan = plan_summary_maintenance_lifecycles( - root, - WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &model, - ) - .unwrap(); - assert_eq!(plan.summary_total_cost, None); - } - - #[test] - fn whole_dag_fails_closed_for_missing_retained_work_or_false_source_lineage() { - let workload = streaming_workload(); - let target = streaming_sum_query(); - let root = summary_with_operations(false, false, false); - let mut model = streaming_model(); - bind_aggregations( - &mut model, - &target, - &root, - streaming_inputs(), - streaming_cpu(), - ); - model.node_evidence.retained_queries.clear(); - let missing_retained = plan_summary_maintenance_lifecycles( - Rc::clone(&root), - WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &model, - ) - .unwrap(); - assert_eq!(missing_retained.summary_total_cost, None); - - bind_comparison(&mut model, &target, &root); - model - .target_comparisons - .get_mut(&Rc::as_ptr(&target)) - .unwrap() - .scope - .sources[0] - .source = Source::TimeSeries { - metric: "other_metric".into(), - }; - let false_lineage = plan_summary_maintenance_lifecycles( - root, - WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &model, - ) - .unwrap(); - assert_eq!(false_lineage.summary_total_cost, None); - } - - #[test] - fn aggregate_recurses_into_child_operations_and_state_only_needs_no_readout() { - let workload = streaming_workload(); - let target = streaming_sum_query(); - let estimated = summary_with_operations(false, false, false); - let SummaryExpr::SummaryEstimate { summary_input, .. } = &estimated.expr else { - unreachable!(); - }; - let state_only = Rc::clone(summary_input); - let mut no_readout_cpu = streaming_cpu(); - no_readout_cpu.readout_cpu_ops = None; - let mut state_model = streaming_model(); - bind_aggregations( - &mut state_model, - &target, - &state_only, - streaming_inputs(), - no_readout_cpu, - ); - let state_plan = plan_summary_maintenance_lifecycles( - state_only, - WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &state_model, - ) - .unwrap(); - assert!(state_plan.summary_total_cost.is_some()); - - let child_readout = summary_with_operations(true, false, false); - let SummaryExpr::SummaryEstimate { - summary_input: child, - .. - } = &child_readout.expr - else { - unreachable!(); - }; - let child = Rc::clone(child); - let nested = Rc::new(SummaryNode { - expr: SummaryExpr::SummaryAgg { - child, - family: FieldDataType::ExactAggregate(ExactKind::Count, ExactParams::Count), - input: asap_types::post_asap::SummaryUpdate::column(ColumnRef::Wildcard), - reduction: Reduction::by(vec![]), - grouping: GroupingStrategy::PerSubpopulationInstance, - filter: None, - }, - schema: estimated.schema.clone(), - guarantee: None, - }); - let mut nested_cpu = streaming_cpu(); - nested_cpu.merge_cpu_ops = Some(1.0); - let mut nested_model = streaming_model(); - bind_aggregations( - &mut nested_model, - &target, - &nested, - streaming_inputs(), - nested_cpu, - ); - nested_model - .node_evidence - .operations - .retain(|_, operation| { - operation.resource().cpu_ops != 1.0 - || operation.resource().working_memory_bytes == 0 - }); - let nested_plan = plan_summary_maintenance_lifecycles( - nested, - WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &nested_model, - ) - .unwrap(); - assert_eq!(nested_plan.summary_total_cost, None); - } - - #[test] - fn mixed_arrival_fails_closed_until_backlog_and_stream_are_separate() { - let data = DataWorkload { - arrival: DataArrival::Mixed, - ..DataWorkload::default() - }; - let mut scope = streaming_scope(); - scope.data_arrival = DataArrival::Mixed; - assert_eq!( - SummaryMaintenanceInputs::from_workload(physical(), &data, &scope), - Err(AnalyticalCostError::UnsupportedDataArrival( - DataArrival::Mixed - )) - ); - } - - #[test] - fn direct_read_costs_build_updates_windows_and_recurrence() { - let estimate = estimate_test( - &summary_with_operations(false, false, false), - &continuous_guarantee(), - SummaryMaintenanceInputs { - initial_input_rows: 10, - initial_input_bytes: 640, - initial_source_scan_bytes: 640, - ingestion_rate_per_second: 2.0, - active_window_count: 2, - bootstrap_window_count: 1, - retained_window_count: 3, - physical_summary_count: 2, - state_bytes_per_summary: 100, - }, - SummaryOperationCpuEvidence { - insert_cpu_ops: Some(2.0), - readout_cpu_ops: Some(3.0), - ..SummaryOperationCpuEvidence::default() - }, - ) - .unwrap(); - // 10 bootstrap + 10 arrivals into two active windows; two states read 5 times. - assert_eq!(estimate.cpu_ops(), 90.0); - assert_eq!(estimate.peak_memory_bytes(), 1_000); - assert_eq!(estimate.scan_bytes(), 640); - } - - #[test] - fn operations_use_update_or_read_multiplicity_and_shared_state_once() { - let estimate = estimate_test( - &summary_with_operations(true, true, true), - &continuous_guarantee(), - SummaryMaintenanceInputs { - initial_input_rows: 1, - initial_input_bytes: 8, - initial_source_scan_bytes: 8, - ingestion_rate_per_second: 4.0, - active_window_count: 1, - bootstrap_window_count: 1, - retained_window_count: 2, - physical_summary_count: 2, - state_bytes_per_summary: 10, - }, - SummaryOperationCpuEvidence { - insert_cpu_ops: Some(1.0), - merge_cpu_ops: Some(2.0), - subtract_cpu_ops: Some(3.0), - delete_cpu_ops: Some(5.0), - delete_events_per_second: Some(4.0), - delete_routing_fanout: Some(2), - readout_cpu_ops: Some(7.0), - }, - ) - .unwrap(); - assert_eq!(estimate.cpu_ops(), 21.0 + 20.0 + 30.0 + 200.0 + 70.0); - // Three persistent windows plus one transient result, for two instances. - assert_eq!(estimate.peak_memory_bytes(), 80); - } - - #[test] - fn lifecycle_mode_and_schedule_must_match_existing_planner_semantics() { - let mut guarantee = continuous_guarantee(); - guarantee.evaluation_schedule = EvaluationSchedule::OnRead; - assert_eq!( - estimate_test( - &summary_with_operations(false, false, false), - &guarantee, - SummaryMaintenanceInputs { - initial_input_rows: 1, - initial_input_bytes: 8, - initial_source_scan_bytes: 8, - ingestion_rate_per_second: 1.0, - active_window_count: 1, - bootstrap_window_count: 1, - retained_window_count: 1, - physical_summary_count: 1, - state_bytes_per_summary: 8, - }, - SummaryOperationCpuEvidence { - insert_cpu_ops: Some(1.0), - readout_cpu_ops: Some(1.0), - ..SummaryOperationCpuEvidence::default() - }, - ), - Err(AnalyticalCostError::IncompatibleLifecycleGuarantee) - ); - } - - #[test] - fn missing_cost_for_an_operation_in_the_dag_fails_closed() { - assert_eq!( - estimate_test( - &summary_with_operations(true, false, false), - &continuous_guarantee(), - SummaryMaintenanceInputs { - initial_input_rows: 1, - initial_input_bytes: 8, - initial_source_scan_bytes: 8, - ingestion_rate_per_second: 1.0, - active_window_count: 1, - bootstrap_window_count: 1, - retained_window_count: 1, - physical_summary_count: 1, - state_bytes_per_summary: 8, - }, - SummaryOperationCpuEvidence { - insert_cpu_ops: Some(1.0), - readout_cpu_ops: Some(1.0), - ..SummaryOperationCpuEvidence::default() - }, - ), - Err(AnalyticalCostError::MissingOrStale("merge_cpu_ops")) - ); - } - - #[test] - fn direct_build_mode_is_not_mispriced_as_incremental_maintenance() { - let mut guarantee = continuous_guarantee(); - guarantee.summary_maintenance_lifecycle = SummaryMaintenanceLifecycle::Ephemeral; - guarantee.summary_maintenance_mode = SummaryMaintenanceMode::DirectBuild; - guarantee.evaluation_schedule = EvaluationSchedule::OneShot; - assert_eq!( - estimate_test( - &summary_with_operations(false, false, false), - &guarantee, - SummaryMaintenanceInputs { - initial_input_rows: 1, - initial_input_bytes: 8, - initial_source_scan_bytes: 8, - ingestion_rate_per_second: 1.0, - active_window_count: 1, - bootstrap_window_count: 1, - retained_window_count: 1, - physical_summary_count: 1, - state_bytes_per_summary: 8, - }, - SummaryOperationCpuEvidence { - insert_cpu_ops: Some(1.0), - readout_cpu_ops: Some(1.0), - ..SummaryOperationCpuEvidence::default() - }, - ), - Err(AnalyticalCostError::IncompatibleLifecycleGuarantee) - ); - } - - #[test] - fn prepared_maintenance_charges_only_its_active_interval() { - let guarantee = SummaryMaintenanceLifecycleGuarantee { - summary_maintenance_lifecycle: SummaryMaintenanceLifecycle::Prepared { - activate_at: asap_types::workload::TimestampMs(1_000), - retire_at: asap_types::workload::TimestampMs(6_000), - }, - summary_maintenance_mode: SummaryMaintenanceMode::Incremental, - evaluation_schedule: EvaluationSchedule::PerUpdate, - output_representation: OutputRepresentation::SummaryState, - }; - let estimate = estimate_test( - &summary_with_operations(false, false, false), - &guarantee, - SummaryMaintenanceInputs { - initial_input_rows: 10, - initial_input_bytes: 80, - initial_source_scan_bytes: 80, - ingestion_rate_per_second: 2.0, - active_window_count: 1, - bootstrap_window_count: 1, - retained_window_count: 1, - physical_summary_count: 1, - state_bytes_per_summary: 8, - }, - SummaryOperationCpuEvidence { - insert_cpu_ops: Some(1.0), - readout_cpu_ops: Some(1.0), - ..SummaryOperationCpuEvidence::default() - }, - ) - .unwrap(); - // Two pre-activation arrivals join the bootstrap; eight more are - // maintained through the horizon; five reads are served. - assert_eq!(estimate.cpu_ops(), 25.0); - } - - #[test] - fn shared_retention_is_not_the_comparison_horizon() { - let guarantee = SummaryMaintenanceLifecycleGuarantee { - summary_maintenance_lifecycle: SummaryMaintenanceLifecycle::Shared { - retention: asap_types::workload::DurationMs(999), - }, - summary_maintenance_mode: SummaryMaintenanceMode::Incremental, - evaluation_schedule: EvaluationSchedule::PerUpdate, - output_representation: OutputRepresentation::SummaryState, - }; - assert!(estimate_test( - &summary_with_operations(false, false, false), - &guarantee, - SummaryMaintenanceInputs { - initial_input_rows: 1, - initial_input_bytes: 8, - initial_source_scan_bytes: 8, - ingestion_rate_per_second: 1.0, - active_window_count: 1, - bootstrap_window_count: 1, - retained_window_count: 1, - physical_summary_count: 1, - state_bytes_per_summary: 8, - }, - SummaryOperationCpuEvidence { - insert_cpu_ops: Some(1.0), - readout_cpu_ops: Some(1.0), - ..SummaryOperationCpuEvidence::default() - }, - ) - .is_ok()); - } - - #[test] - fn lifecycle_retention_rate_integrates_to_one_peak_capacity_charge() { - let target = streaming_sum_query(); - let root = summary_with_operations(false, false, false); - let mut model = streaming_model(); - bind_aggregations( - &mut model, - &target, - &root, - streaming_inputs(), - streaming_cpu(), - ); - let aggregation = evidence_nodes(&root).0[0]; - let inputs = model - .lifecycle_inputs(aggregation, Some(Horizon(5.0))) - .unwrap(); - let integrated = inputs.retention_cost_rate.unwrap().0 * 5.0; - // (2 active + 3 retained) * 2 states * 100 bytes, calibrated once. - assert_eq!(integrated, 1_000.0); - } - - #[test] - fn summary_join_requires_cardinality_and_working_memory_evidence() { - let joined = summary_join(); - let inputs = SummaryMaintenanceInputs { - initial_input_rows: 1, - initial_input_bytes: 8, - initial_source_scan_bytes: 8, - ingestion_rate_per_second: 1.0, - active_window_count: 1, - bootstrap_window_count: 1, - retained_window_count: 1, - physical_summary_count: 1, - state_bytes_per_summary: 8, - }; - let cpu = SummaryOperationCpuEvidence { - insert_cpu_ops: Some(1.0), - readout_cpu_ops: Some(1.0), - ..SummaryOperationCpuEvidence::default() - }; - assert_eq!( - estimate_join_test(&joined, &continuous_guarantee(), inputs, cpu, None,), - Err(AnalyticalCostError::MissingOrStale("summary_join")) - ); - let estimate = estimate_join_test( - &joined, - &continuous_guarantee(), - inputs, - cpu, - Some(SummaryJoinEvidence { - physical_id: "diagnostic-join".into(), - inputs: vec![test_edge(), test_edge()], - output: test_edge(), - cpu_ops_per_execution: 12.0, - working_memory_bytes: 32, - output_buffer_bytes: 0, - executions_per_evaluation: 1, - io_bytes_per_execution: Some(0), - }), - ) - .unwrap(); - assert_eq!(estimate.cpu_ops(), 77.0); - assert_eq!(estimate.peak_memory_bytes(), 64); // 4 persistent states + join memory. - } - - fn summary_with_operations(merge: bool, subtract: bool, delete: bool) -> Rc { - let state_type = FieldDataType::ExactAggregate(ExactKind::Count, ExactParams::Count); - let schema = Schema::lifted(vec![Field::new("count", state_type.clone(), false)], None); - let leaf = Rc::new(SummaryNode { - expr: SummaryExpr::KeepPreAsap(Rc::new(QueryExpr::Scan { - source: Source::TimeSeries { - metric: "metrics".into(), - }, - predicates: vec![], - schema: Schema::with_time_index( - vec![ - Field::plain("ts", DataType::Timestamp, false), - Field::plain("value", DataType::Float64, false), - ], - 0, - vec![], - ), - })), - schema: schema.clone(), - guarantee: None, - }); - let agg = Rc::new(SummaryNode { - expr: SummaryExpr::SummaryAgg { - child: leaf, - family: state_type, - input: asap_types::post_asap::SummaryUpdate::column(ColumnRef::Wildcard), - reduction: Reduction::by(vec![]), - grouping: GroupingStrategy::PerSubpopulationInstance, - filter: None, - }, - schema: schema.clone(), - guarantee: None, - }); - let mut root = Rc::clone(&agg); - if merge { - root = Rc::new(SummaryNode { - expr: SummaryExpr::SummaryMerge { - timing: asap_types::post_asap::ExecutionTiming::IngestionTime, - children: vec![Rc::clone(&agg), Rc::clone(&agg)], - }, - schema: schema.clone(), - guarantee: None, - }); - } - if subtract { - root = Rc::new(SummaryNode { - expr: SummaryExpr::SummarySubtract { - left: Rc::clone(&root), - right: Rc::clone(&agg), - }, - schema: schema.clone(), - guarantee: None, - }); - } - if delete { - root = Rc::new(SummaryNode { - expr: SummaryExpr::SummaryDelete { - summary_input: root, - key: ColumnRef::Wildcard, - }, - schema: schema.clone(), - guarantee: None, - }); - } - Rc::new(SummaryNode { - expr: SummaryExpr::SummaryEstimate { - summary_input: root, - query: asap_types::post_asap::SketchStatistic::PointCount { - key: ColumnRef::Wildcard, - value: None, - }, - }, - schema, - guarantee: Some(ResultGuarantee::exact("exact count readout")), - }) - } - - fn summary_join() -> Rc { - let left = summary_with_operations(false, false, false); - let right = summary_with_operations(false, false, false); - let SummaryExpr::SummaryEstimate { - summary_input: left, - .. - } = &left.expr - else { - unreachable!() - }; - let SummaryExpr::SummaryEstimate { - summary_input: right, - .. - } = &right.expr - else { - unreachable!() - }; - let schema = left.schema.clone(); - let join = Rc::new(SummaryNode { - expr: SummaryExpr::SummaryJoin { - outer: Rc::clone(left), - inner: Rc::clone(right), - key: ColumnRef::Wildcard, - family: FieldDataType::ExactAggregate(ExactKind::Count, ExactParams::Count), - }, - schema: schema.clone(), - guarantee: None, - }); - Rc::new(SummaryNode { - expr: SummaryExpr::SummaryEstimate { - summary_input: join, - query: asap_types::post_asap::SketchStatistic::PointCount { - key: ColumnRef::Wildcard, - value: None, - }, - }, - schema, - guarantee: None, - }) - } - - fn summary_binary() -> Rc { - let operand = summary_with_operations(false, false, false); - Rc::new(SummaryNode { - expr: SummaryExpr::BinaryOp { - timing: asap_types::post_asap::ExecutionTiming::QueryTime, - lhs: Rc::clone(&operand), - rhs: operand, - operator: asap_types::post_asap::BinaryOperator { - checked_relative_division: false, - checked_finite_division: false, - kind: asap_types::pre_asap::BinaryOpKind::Arithmetic( - asap_types::pre_asap::ArithmeticOpKind::Add, - ), - vector_match: None, - }, - }, - schema: Schema::lifted( - vec![Field::new( - "value", - FieldDataType::Plain(DataType::Float64), - false, - )], - None, - ), - guarantee: Some(ResultGuarantee::exact("test binary")), - }) - } - - #[test] - fn exact_binary_is_costable_with_explicit_physical_evidence() { - let workload = streaming_workload(); - let target = streaming_sum_query(); - let root = summary_binary(); - let mut model = streaming_model(); - bind_aggregations( - &mut model, - &target, - &root, - streaming_inputs(), - streaming_cpu(), - ); - - let plan = plan_summary_maintenance_lifecycles( - root, - WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]), - 0, - Some(Horizon(5.0)), - SummaryMaintenanceLifecycleCapabilities { - supports_ephemeral: true, - supports_prepared: false, - supports_shared: false, - supports_continuously_maintained: false, - }, - &model, - ) - .expect("binary physical evidence should produce a complete cost"); - assert!(plan.summary_total_cost.is_some()); - } - - fn streaming_sum_query() -> Rc { - let scan = Rc::new(QueryExpr::Scan { - source: Source::TimeSeries { - metric: "metrics".into(), - }, - predicates: vec![], - schema: Schema::with_time_index( - vec![ - Field::plain("ts", DataType::Timestamp, false), - Field::plain("value", DataType::Float64, false), - ], - 0, - vec![], - ), - }); - Rc::new(QueryExpr::Aggregate { - reduction: Reduction::by(vec![]), - measures: vec![AggIntent::Sum { col: None }], - output_names: vec![], - filters: vec![], - having: None, - child: scan, - }) - } - - fn streaming_workload() -> QueryWorkload { - QueryWorkload { - language: QueryLanguage::PromQL, - query_batch: None, - repeating_queries: Some(vec![RepeatingEntry { - query: Query("sum(metrics)".into()), - demand: RepeatedDemand::FixedInterval(RepetitionInterval(1_000)), - requirements: QueryRequirements::default(), - predictability: Predictability::Predictable { known_at: None }, - time_selection: TimeSelection::default(), - }]), - } - } - - fn streaming_data_workload() -> DataWorkload { - DataWorkload { - arrival: DataArrival::ContinuouslyIngesting, - data_ingestion_interval: Evidence { - value: Some(asap_types::workload::DurationMs(1_000)), - ..Default::default() - }, - ingestion_rate: Evidence { - value: Some(Rate(2.0)), - source: EvidenceSource::Declared, - observed_at_ms: None, - valid_for_ms: None, - }, - ..Default::default() - } - } - - fn streaming_model() -> SummaryMaintenanceCostModel { - SummaryMaintenanceCostModel::new( - ResourceCalibration { - cost_per_cpu_op: 1.0, - cost_per_scan_byte: 1.0, - cost_per_retained_byte: 1.0, - version: "test".into(), - }, - SummaryMaintenanceCapabilities { - incremental_update: true, - merge: false, - delete: false, - }, - ) - } - - fn streaming_raw() -> RawInputEvidence { - let scope = streaming_scope(); - let node = PhysicalDAGNode { - id: "raw-scan".into(), - operator: PhysicalOperator::Scan, - children: vec![], - source_coverage: Some(scope.sources[0].clone()), - output_buffer_bytes: 0, - retained_bytes: 0, - execution: ExecutionMultiplicity::Once, - }; - let edge = EdgeStatistics { - rows: 80, - bytes: 5_120, - }; - let statistics = OperatorStatistics::Scan { - source_read_bytes: 5_120, - edges: UnaryEdgeStatistics { - input: edge, - output: edge, - promql: None, - }, - }; - RawInputEvidence { - planning_time_input_rows: 10, - planning_time_input_bytes: 640, - planning_time_source_scan_bytes: 640, - arriving_logical_row_bytes: 64, - arriving_source_row_bytes: 64, - ingestion_rate_per_second: 2.0, - physical_dag: EvidenceBackedPhysicalDAG { - nodes: vec![node], - root: "raw-scan".into(), - evidence: HashMap::from([( - "raw-scan".into(), - PhysicalNodeEvidence { - physical_id: "raw-scan".into(), - statistics, - output_buffer_bytes: 0, - }, - )]), - }, - } - } - - fn bind_comparison( - model: &mut SummaryMaintenanceCostModel, - target: &Rc, - root: &Rc, - ) { - model - .bind_candidate_comparison(target, root, streaming_scope(), streaming_raw()) - .unwrap(); - fn retained( - model: &mut SummaryMaintenanceCostModel, - node: &Rc, - seen: &mut HashSet<*const SummaryNode>, - ) { - if !seen.insert(Rc::as_ptr(node)) { - return; - } - match &node.expr { - SummaryExpr::KeepPreAsap(_) => { - model.node_evidence.insert_retained_query( - node, - RetainedSubDAGEvidence { - physical_id: format!("retained-{node:p}"), - output: test_edge(), - preprocessing_cpu_ops_over_horizon: 1.0, - working_memory_bytes: 8, - output_buffer_bytes: 0, - }, - ); - } - SummaryExpr::SummaryAgg { child, .. } - | SummaryExpr::ValueOperation { child, .. } => retained(model, child, seen), - SummaryExpr::SummaryMerge { children, .. } => { - for child in children { - retained(model, child, seen); - } - } - SummaryExpr::SummarySubtract { left, right } - | SummaryExpr::RelationalJoin { left, right, .. } - | SummaryExpr::BinaryOp { - lhs: left, - rhs: right, - .. - } - | SummaryExpr::SummaryJoin { - outer: left, - inner: right, - .. - } => { - retained(model, left, seen); - retained(model, right, seen); - } - SummaryExpr::SummaryDelete { summary_input, .. } - | SummaryExpr::SummaryEstimate { summary_input, .. } => { - retained(model, summary_input, seen) - } - } - } - retained(model, root, &mut HashSet::new()); - } - - fn streaming_inputs() -> SummaryMaintenanceInputs { - SummaryMaintenanceInputs { - initial_input_rows: 10, - initial_input_bytes: 640, - initial_source_scan_bytes: 640, - ingestion_rate_per_second: 2.0, - active_window_count: 2, - bootstrap_window_count: 1, - retained_window_count: 3, - physical_summary_count: 2, - state_bytes_per_summary: 100, - } - } - - fn test_edge() -> EdgeStatistics { - EdgeStatistics { rows: 1, bytes: 8 } - } - - fn streaming_cpu() -> SummaryOperationCpuEvidence { - SummaryOperationCpuEvidence { - insert_cpu_ops: Some(2.0), - readout_cpu_ops: Some(3.0), - ..SummaryOperationCpuEvidence::default() - } - } - - fn bind_aggregations( - model: &mut SummaryMaintenanceCostModel, - target: &Rc, - root: &Rc, - inputs: SummaryMaintenanceInputs, - cpu: SummaryOperationCpuEvidence, - ) { - bind_comparison(model, target, root); - for node in evidence_nodes(root).0 { - let source_root = matches!( - &node.expr, - SummaryExpr::SummaryAgg { child, .. } - if matches!(child.expr, SummaryExpr::KeepPreAsap(_)) - ); - let mut node_inputs = inputs; - if !source_root { - node_inputs.initial_input_rows = test_edge().rows; - node_inputs.initial_input_bytes = test_edge().bytes; - node_inputs.initial_source_scan_bytes = 0; - } - model.node_evidence.aggregations.insert( - node as *const _, - SummaryAggregateEvidence { - physical_id: format!("agg-{node:p}"), - input: test_edge(), - output: test_edge(), - source_coverage_index: source_root.then_some(0), - bootstrap_read_identity: if source_root { - "shared-bootstrap".into() - } else { - String::new() - }, - inputs: node_inputs, - insert_cpu_ops: cpu.insert_cpu_ops.unwrap(), - }, - ); - } - fn bind_ops( - model: &mut SummaryMaintenanceCostModel, - node: &SummaryNode, - seen: &mut HashSet<*const SummaryNode>, - inputs: SummaryMaintenanceInputs, - cpu: SummaryOperationCpuEvidence, - ) { - if !seen.insert(node as *const _) { - return; - } - let operation = match &node.expr { - SummaryExpr::BinaryOp { .. } => cpu.readout_cpu_ops.map(|cpu_ops| { - SummaryOperatorEvidence::Binary(SummaryOperatorResourceEvidence { - physical_id: format!("binary-{node:p}"), - inputs: vec![test_edge(), test_edge()], - output: test_edge(), - cpu_ops, - working_memory_bytes: 0, - output_buffer_bytes: 0, - executions_per_evaluation: 1, - io_bytes_per_execution: Some(0), - }) - }), - SummaryExpr::ValueOperation { .. } => cpu.readout_cpu_ops.map(|cpu_ops| { - SummaryOperatorEvidence::ValueOperation(SummaryOperatorResourceEvidence { - physical_id: format!("value-operation-{node:p}"), - inputs: vec![test_edge()], - output: test_edge(), - cpu_ops, - working_memory_bytes: 0, - output_buffer_bytes: 0, - executions_per_evaluation: 1, - io_bytes_per_execution: Some(0), - }) - }), - SummaryExpr::SummaryMerge { .. } => cpu.merge_cpu_ops.map(|cpu_ops| { - SummaryOperatorEvidence::Merge(SummaryOperatorResourceEvidence { - physical_id: format!("merge-{node:p}"), - inputs: match &node.expr { - SummaryExpr::SummaryMerge { children, .. } => { - vec![test_edge(); children.len()] - } - _ => unreachable!(), - }, - output: test_edge(), - cpu_ops, - working_memory_bytes: inputs.state_bytes_per_summary, - output_buffer_bytes: 0, - executions_per_evaluation: 1, - io_bytes_per_execution: Some(0), - }) - }), - SummaryExpr::SummarySubtract { .. } => cpu.subtract_cpu_ops.map(|cpu_ops| { - SummaryOperatorEvidence::Subtract(SummaryOperatorResourceEvidence { - physical_id: format!("subtract-{node:p}"), - inputs: vec![test_edge(), test_edge()], - output: test_edge(), - cpu_ops, - working_memory_bytes: inputs.state_bytes_per_summary, - output_buffer_bytes: 0, - executions_per_evaluation: 1, - io_bytes_per_execution: Some(0), - }) - }), - SummaryExpr::SummaryDelete { .. } => cpu.delete_cpu_ops.and_then(|cpu_ops| { - Some(SummaryOperatorEvidence::Delete { - resource: SummaryOperatorResourceEvidence { - physical_id: format!("delete-{node:p}"), - inputs: vec![test_edge()], - output: test_edge(), - cpu_ops, - working_memory_bytes: 0, - output_buffer_bytes: 0, - executions_per_evaluation: 1, - io_bytes_per_execution: Some(0), - }, - events_per_second: cpu.delete_events_per_second?, - routing_fanout: cpu.delete_routing_fanout?, - }) - }), - SummaryExpr::SummaryEstimate { .. } => cpu.readout_cpu_ops.map(|cpu_ops| { - SummaryOperatorEvidence::Readout(SummaryOperatorResourceEvidence { - physical_id: format!("readout-{node:p}"), - inputs: vec![test_edge()], - output: test_edge(), - cpu_ops, - working_memory_bytes: 0, - output_buffer_bytes: 0, - executions_per_evaluation: 1, - io_bytes_per_execution: Some(0), - }) - }), - _ => None, - }; - if let Some(operation) = operation { - model - .node_evidence - .operations - .insert(node as *const _, operation); - if let SummaryExpr::SummaryDelete { summary_input, .. } = &node.expr { - fn owning_aggs( - node: &SummaryNode, - seen: &mut HashSet<*const SummaryNode>, - owners: &mut Vec<*const SummaryNode>, - ) { - if !seen.insert(node as *const _) { - return; - } - match &node.expr { - SummaryExpr::SummaryAgg { child, .. } => { - owners.push(node as *const _); - owning_aggs(child, seen, owners); - } - SummaryExpr::ValueOperation { child, .. } => { - owning_aggs(child, seen, owners) - } - SummaryExpr::SummaryMerge { children, .. } => { - for child in children { - owning_aggs(child, seen, owners); - } - } - SummaryExpr::SummarySubtract { left, right } - | SummaryExpr::RelationalJoin { left, right, .. } - | SummaryExpr::BinaryOp { - lhs: left, - rhs: right, - .. - } - | SummaryExpr::SummaryJoin { - outer: left, - inner: right, - .. - } => { - owning_aggs(left, seen, owners); - owning_aggs(right, seen, owners); - } - SummaryExpr::SummaryDelete { summary_input, .. } - | SummaryExpr::SummaryEstimate { summary_input, .. } => { - owning_aggs(summary_input, seen, owners); - } - SummaryExpr::KeepPreAsap(_) => {} - } - } - let mut owners = Vec::new(); - owning_aggs(summary_input, &mut HashSet::new(), &mut owners); - owners.sort_unstable(); - owners.dedup(); - if let [owner] = owners.as_slice() { - model - .node_evidence - .operation_state_owners - .insert(node as *const _, *owner); - } - } - } - match &node.expr { - SummaryExpr::SummaryAgg { child, .. } - | SummaryExpr::ValueOperation { child, .. } => { - bind_ops(model, child, seen, inputs, cpu) - } - SummaryExpr::SummaryMerge { children, .. } => { - for child in children { - bind_ops(model, child, seen, inputs, cpu); - } - } - SummaryExpr::SummarySubtract { left, right } - | SummaryExpr::RelationalJoin { left, right, .. } - | SummaryExpr::BinaryOp { - lhs: left, - rhs: right, - .. - } - | SummaryExpr::SummaryJoin { - outer: left, - inner: right, - .. - } => { - bind_ops(model, left, seen, inputs, cpu); - bind_ops(model, right, seen, inputs, cpu); - } - SummaryExpr::SummaryDelete { summary_input, .. } - | SummaryExpr::SummaryEstimate { summary_input, .. } => { - bind_ops(model, summary_input, seen, inputs, cpu) - } - SummaryExpr::KeepPreAsap(_) => {} - } - } - bind_ops(model, root, &mut HashSet::new(), inputs, cpu); - } - - fn streaming_scope() -> ComparisonScope { - let workload = streaming_workload(); - let entry = workload.entries().next().unwrap(); - ComparisonScope::from_workload( - &DataWorkload { - arrival: DataArrival::ContinuouslyIngesting, - data_ingestion_interval: Evidence { - value: Some(asap_types::workload::DurationMs(1_000)), - ..Default::default() - }, - ingestion_rate: Evidence { - value: Some(Rate(2.0)), - source: EvidenceSource::Declared, - observed_at_ms: None, - valid_for_ms: None, - }, - ..Default::default() - }, - &entry, - asap_types::workload::TimestampMs(0), - asap_types::workload::DurationMs(5_000), - vec![crate::physical_operator_statistics::SourceCoverage { - source: Source::TimeSeries { - metric: "metrics".into(), - }, - source_snapshot_id: "stream-start".into(), - predicates: vec![], - info_matchers: vec![], - }], - ) - .unwrap() - } -} diff --git a/crates/asap-aware-mapping/src/summary_maintenance_cost/window.rs b/crates/asap-aware-mapping/src/summary_maintenance_cost/window.rs deleted file mode 100644 index c3c12c20b..000000000 --- a/crates/asap-aware-mapping/src/summary_maintenance_cost/window.rs +++ /dev/null @@ -1,278 +0,0 @@ -use super::*; - -/// One per-state window choice within a complete Planner candidate. -#[derive(Debug, Clone)] -pub struct SummaryWindowFrameworkAssignment { - pub summary: Rc, - /// `None` explicitly means that this state is not window-organized. - pub framework: Option, -} - -/// Cost evidence for one complete abstract window-framework assignment across -/// a summary DAG in Planner search. -/// -/// The provider derives this evidence from a concrete downstream -/// implementation under the current data workload. The stable identity is -/// provenance for the chosen implementation, while deployment placement and -/// runtime configuration remain downstream concerns. -#[derive(Debug, Clone)] -pub struct SummaryWindowFrameworkCandidate { - /// Stable identity of the complete provider implementation whose evidence - /// is bound to this planner-visible framework assignment. - pub physical_plan_id: String, - /// Exactly one assignment for every summary deployment in the DAG. - pub assignments: Vec, - /// Registered end-to-end accuracy composition for this complete window - /// assignment. EH combinations must use one of the specialized proofs; - /// unknown combinations fail closed. - pub accuracy: SummaryWindowAccuracyEvidence, - pub node_evidence: SummaryNodeEvidence, -} - -pub(super) fn summary_aggregation_identities(root: &SummaryNode) -> HashSet<*const SummaryNode> { - fn visit( - node: &SummaryNode, - seen: &mut HashSet<*const SummaryNode>, - out: &mut HashSet<*const SummaryNode>, - ) { - if !seen.insert(node as *const _) { - return; - } - match &node.expr { - SummaryExpr::KeepPreAsap(_) => {} - SummaryExpr::SummaryAgg { child, .. } => { - out.insert(node as *const _); - visit(child, seen, out); - } - SummaryExpr::ValueOperation { child, .. } => visit(child, seen, out), - SummaryExpr::SummaryMerge { children, .. } => { - for child in children { - visit(child, seen, out); - } - } - SummaryExpr::SummarySubtract { left, right } - | SummaryExpr::RelationalJoin { left, right, .. } - | SummaryExpr::BinaryOp { - lhs: left, - rhs: right, - .. - } - | SummaryExpr::SummaryJoin { - outer: left, - inner: right, - .. - } => { - visit(left, seen, out); - visit(right, seen, out); - } - SummaryExpr::SummaryDelete { summary_input, .. } - | SummaryExpr::SummaryEstimate { summary_input, .. } => { - visit(summary_input, seen, out); - } - } - } - - let mut out = HashSet::new(); - visit(root, &mut HashSet::new(), &mut out); - out -} - -/// Cardinality normalization used by the PromSketch EH bounds. The paper's -/// sub-window error is stated relative to the suffix beginning at the query's -/// left endpoint, so a query-relative bound needs `suffix_rows/query_rows`. -#[derive(Debug, Clone, Copy, PartialEq)] -pub enum ExponentialHistogramQueryRange { - MostRecentWindow, - SubWindow { suffix_rows: u64, query_rows: u64 }, -} - -/// Registered accuracy compositions for Exponential Histogram realizations. -#[derive(Debug, Clone, Copy, PartialEq)] -pub enum ExponentialHistogramAccuracyEvidence { - /// PromSketch EHKLL normalized rank error. - KllRank { - eh_epsilon: f64, - kll_epsilon: f64, - failure_probability: f64, - range: ExponentialHistogramQueryRange, - }, - /// PromSketch EHUniv/GSum relative error. - UniversalGsum { - epsilon: f64, - failure_probability: f64, - range: ExponentialHistogramQueryRange, - }, -} - -#[derive(Debug, Clone, PartialEq)] -pub enum SummaryWindowAccuracyEvidence { - /// The window implementation preserves exact query-time coverage and adds - /// no error. Used for exact tumbling/sliding realizations. - Exact, - ExponentialHistogram(ExponentialHistogramAccuracyEvidence), -} - -impl ExponentialHistogramQueryRange { - fn suffix_to_query_ratio(self) -> Option { - match self { - Self::MostRecentWindow => Some(1.0), - Self::SubWindow { - suffix_rows, - query_rows, - } if query_rows > 0 && suffix_rows >= query_rows => { - Some(suffix_rows as f64 / query_rows as f64) - } - Self::SubWindow { .. } => None, - } - } -} - -impl SummaryWindowAccuracyEvidence { - pub(super) fn matches_assignments( - &self, - assignments: &[SummaryWindowFrameworkAssignment], - ) -> bool { - let eh_summaries: Vec<_> = assignments - .iter() - .filter(|assignment| { - assignment.framework == Some(SummaryWindowFramework::ExponentialHistogram) - }) - .collect(); - match self { - Self::Exact => eh_summaries.is_empty(), - Self::ExponentialHistogram(ExponentialHistogramAccuracyEvidence::KllRank { - .. - }) => { - eh_summaries.len() == 1 - && eh_summaries.iter().all(|assignment| { - matches!( - &assignment.summary.expr, - SummaryExpr::SummaryAgg { - family: FieldDataType::Sketch(kind, _), - .. - } if kind.algorithm() == &SketchAlgorithm::Kll - ) - }) - } - Self::ExponentialHistogram(ExponentialHistogramAccuracyEvidence::UniversalGsum { - .. - }) => { - eh_summaries.len() == 1 - && eh_summaries.iter().all(|assignment| { - matches!( - &assignment.summary.expr, - SummaryExpr::SummaryAgg { - family: FieldDataType::ExactAggregate( - ExactKind::Count | ExactKind::Sum, - _ - ), - .. - } - ) - }) - } - } - } - - /// Compose the two EH combinations proved by PromSketch - /// (doi:10.14778/3742728.3742732). Unknown EH combinations deliberately - /// have no catch-all arm. - pub(super) fn guarantee(&self, uses_exponential_histogram: bool) -> Option { - match self { - Self::Exact if !uses_exponential_histogram => { - Some(ResultGuarantee::exact("exact window coverage")) - } - Self::Exact => None, - Self::ExponentialHistogram(evidence) if uses_exponential_histogram => { - let (metric, bound, failure_probability, rule) = match *evidence { - ExponentialHistogramAccuracyEvidence::KllRank { - eh_epsilon, - kll_epsilon, - failure_probability, - range, - } => { - if !eh_epsilon.is_finite() - || eh_epsilon < 0.0 - || !kll_epsilon.is_finite() - || kll_epsilon < 0.0 - { - return None; - } - ( - ErrorMetric::Rank, - 2.0 * eh_epsilon * range.suffix_to_query_ratio()? + kll_epsilon, - failure_probability, - "promsketch_eh_kll_rank", - ) - } - ExponentialHistogramAccuracyEvidence::UniversalGsum { - epsilon, - failure_probability, - range, - } => { - if !epsilon.is_finite() || epsilon < 0.0 { - return None; - } - ( - ErrorMetric::RelativeValue, - epsilon * range.suffix_to_query_ratio()?, - failure_probability, - "promsketch_eh_universal_gsum", - ) - } - }; - if !bound.is_finite() - || bound < 0.0 - || !failure_probability.is_finite() - || !(0.0..=1.0).contains(&failure_probability) - { - return None; - } - Some(ResultGuarantee { - metric, - bound: BoundExpr::Constant { value: bound }, - failure_probability: ProbabilityExpr::Constant { - value: failure_probability, - }, - provenance: vec![GuaranteeSource::RuntimeObservation { - source: rule.into(), - detail: serde_json::json!({ - "reference": "doi:10.14778/3742728.3742732" - }), - }], - }) - } - Self::ExponentialHistogram(_) => None, - } - } - - pub(super) fn end_to_end_guarantee( - &self, - uses_exponential_histogram: bool, - summary_guarantee: Option<&ResultGuarantee>, - ) -> Option { - let summary = summary_guarantee?; - match self { - Self::Exact if !uses_exponential_histogram => Some(summary.clone()), - Self::ExponentialHistogram(ExponentialHistogramAccuracyEvidence::KllRank { - kll_epsilon, - failure_probability, - .. - }) if uses_exponential_histogram => { - let summary_bound = summary.bound.evaluate()?; - let summary_failure = summary.failure_probability.evaluate()?; - if summary.metric != ErrorMetric::Rank - || summary_bound != *kll_epsilon - || summary_failure != *failure_probability - { - return None; - } - self.guarantee(true) - } - Self::ExponentialHistogram(ExponentialHistogramAccuracyEvidence::UniversalGsum { - .. - }) if uses_exponential_histogram && summary.is_exact() => self.guarantee(true), - _ => None, - } - } -} diff --git a/crates/asap-aware-mapping/src/summary_maintenance_dag_export.rs b/crates/asap-aware-mapping/src/summary_maintenance_dag_export.rs deleted file mode 100644 index 8e63a4ce1..000000000 --- a/crates/asap-aware-mapping/src/summary_maintenance_dag_export.rs +++ /dev/null @@ -1,162 +0,0 @@ -//! Serializable DAG export for a materialized summary-maintenance plan. -//! -//! `asap-types::dag_export` owns the crate-neutral post-ASAP DAG shape. This -//! adapter lives in the mapping layer, where summary-maintenance lifecycle -//! alternatives and their typed rejection reasons are available, and emits -//! both views together. - -use std::collections::HashMap; -use std::rc::Rc; - -use serde::Serialize; - -use asap_types::dag_export::{self, SummaryDAG}; -use asap_types::post_asap::{ - PostAsapNodeId, ResultGuarantee, SummaryExpr, SummaryMaintenanceLifecycle, - SummaryMaintenanceLifecycleGuarantee, SummaryNode, SummaryWindowFramework, -}; - -use crate::summary_maintenance_lifecycle::{ - SummaryMaintenanceLifecyclePlan, SummaryMaintenanceLifecycleRejection, -}; - -#[derive(Debug, Clone, Serialize)] -pub struct SummaryMaintenanceDAGExport { - pub dag: SummaryDAG, - pub deployments: Vec, - pub horizon_seconds: Option, - pub evaluation_rate_per_second: Option, - pub update_rate_per_second: Option, - pub expected_reads: Option, - pub selected_raw_recompute: bool, - #[serde(skip_serializing_if = "Option::is_none")] - /// Provider implementation key. The legacy JSON field name is retained - /// until the surrounding export receives its own schema-version bump. - #[serde(rename = "selected_physical_plan_id")] - pub selected_window_implementation_id: Option, - pub summary_total_cost: Option, - #[serde(skip_serializing_if = "Option::is_none")] - pub window_accuracy_guarantee: Option, - pub raw_recompute_total_cost: Option, -} - -#[derive(Debug, Clone, Serialize)] -pub struct SummaryMaintenanceDeploymentExport { - pub post_asap_node_id: PostAsapNodeId, - #[serde(skip_serializing_if = "Option::is_none")] - pub selected_window_framework: Option, - #[serde(skip_serializing_if = "Option::is_none")] - pub selected: Option, - pub alternatives: Vec, -} - -#[derive(Debug, Clone, Serialize)] -pub struct SummaryMaintenanceLifecycleAlternativeExport { - pub lifecycle: SummaryMaintenanceLifecycle, - pub total_cost: Option, - #[serde(skip_serializing_if = "Option::is_none")] - pub rejection: Option, - pub assumptions: Vec, -} - -pub type SummaryMaintenanceLifecycleGuaranteeExport = SummaryMaintenanceLifecycleGuarantee; - -pub fn export_summary_maintenance_plan( - plan: &SummaryMaintenanceLifecyclePlan, -) -> SummaryMaintenanceDAGExport { - let deployments: Vec<_> = plan - .deployments - .iter() - .map(|deployment| SummaryMaintenanceDeploymentExport { - post_asap_node_id: deployment.post_asap_node_id, - selected_window_framework: deployment.selected_window_framework.clone(), - selected: deployment - .summary_maintenance_lifecycle_guarantee - .as_ref() - .cloned(), - alternatives: deployment - .alternatives - .iter() - .map(|alternative| SummaryMaintenanceLifecycleAlternativeExport { - lifecycle: alternative.summary_maintenance_lifecycle.clone(), - total_cost: alternative.total_cost.map(|cost| cost.0), - rejection: alternative.rejection.clone(), - assumptions: alternative.assumptions.clone(), - }) - .collect(), - }) - .collect(); - let mut dag = dag_export::export_summary(&plan.root); - let deployment_by_summary: HashMap<_, _> = plan - .deployments - .iter() - .zip(&deployments) - .map(|(deployment, export)| (Rc::as_ptr(&deployment.summary), export)) - .collect(); - let mut next_node_id = 0; - annotate_lifecycle_deployments( - &plan.root, - &mut dag, - &deployment_by_summary, - &mut next_node_id, - ); - - SummaryMaintenanceDAGExport { - dag, - deployments, - horizon_seconds: plan.horizon.map(|horizon| horizon.0), - evaluation_rate_per_second: plan.evaluation_rate.map(|rate| rate.0), - update_rate_per_second: plan.update_rate.map(|rate| rate.0), - expected_reads: plan.expected_reads, - selected_raw_recompute: plan.selected_raw_recompute, - selected_window_implementation_id: plan.selected_window_implementation_id.clone(), - summary_total_cost: plan.summary_total_cost.map(|cost| cost.0), - window_accuracy_guarantee: plan.window_accuracy_guarantee.clone(), - raw_recompute_total_cost: plan.raw_recompute_total_cost.map(|cost| cost.0), - } -} - -/// Walk in the same post-order as `dag_export::export_summary` and attach a -/// deployment directly to every flattened occurrence of its state node. -/// This makes the decision visible to DAG consumers without asking them to -/// reconstruct pointer identity from DAG position. -fn annotate_lifecycle_deployments( - node: &SummaryNode, - dag: &mut SummaryDAG, - deployments: &HashMap<*const SummaryNode, &SummaryMaintenanceDeploymentExport>, - next_node_id: &mut usize, -) { - if !matches!(node.expr, SummaryExpr::KeepPreAsap(_)) { - for child in summary_children(&node.expr) { - annotate_lifecycle_deployments(child, dag, deployments, next_node_id); - } - } - let dag_node = &mut dag.nodes[*next_node_id]; - if let Some(deployment) = deployments.get(&(node as *const SummaryNode)) { - dag_node.detail["summary_maintenance"] = - serde_json::to_value(deployment).expect("lifecycle export is serializable"); - } - *next_node_id += 1; -} - -fn summary_children(expr: &SummaryExpr) -> Vec<&Rc> { - match expr { - SummaryExpr::KeepPreAsap(_) => vec![], - SummaryExpr::BinaryOp { lhs, rhs, .. } => vec![lhs, rhs], - SummaryExpr::SummaryAgg { child, .. } => vec![child], - SummaryExpr::ValueOperation { child, .. } => vec![child], - SummaryExpr::SummaryJoin { outer, inner, .. } - | SummaryExpr::RelationalJoin { - left: outer, - right: inner, - .. - } - | SummaryExpr::SummarySubtract { - left: outer, - right: inner, - } => vec![outer, inner], - SummaryExpr::SummaryDelete { summary_input, .. } - | SummaryExpr::SummaryEstimate { summary_input, .. } => vec![summary_input], - SummaryExpr::SummaryMerge { children, .. } => children.iter().collect(), - } -} diff --git a/crates/asap-aware-mapping/src/summary_maintenance_lifecycle.rs b/crates/asap-aware-mapping/src/summary_maintenance_lifecycle.rs deleted file mode 100644 index cf41efeff..000000000 --- a/crates/asap-aware-mapping/src/summary_maintenance_lifecycle.rs +++ /dev/null @@ -1,3847 +0,0 @@ -//! Workload-aware summary-maintenance lifecycle planning. -//! -//! A **summary-maintenance lifecycle** is the planner policy for when one -//! materialized summary state is created, retained or shared, updated as data -//! arrives, and retired. It is deliberately narrower than the end-to-end data -//! lifecycle and independent of query recurrence. Recurrence says when and how -//! often queries will read the result. The planner converts that demand into -//! expected reads and an evaluation rate, then uses those quantities to compare -//! rebuilding per query with retaining or continuously maintaining state. -//! Recurrence does not itself prescribe a state-maintenance policy. -//! -//! This module enumerates and costs `Ephemeral`, `Prepared`, `Shared`, and -//! `ContinuouslyMaintained` alternatives for every unique `SummaryAgg` in a -//! materialized plan, and for every maintained population (`MaintainPopulation`) -//! that is not an input of a `SummaryAgg`. [`SummaryMaintenanceMode`] is an orthogonal detail of -//! the selected deployment: state is either built directly or updated -//! incrementally. Unknown evidence stays unknown and therefore cannot make a -//! long-lived alternative win. - -use std::collections::{HashMap, HashSet}; -use std::rc::Rc; - -use asap_types::post_asap::{ - compile_post_asap_dag_with_node_ids, share_common_summary_sub_dags, EvaluationSchedule, - ExecutionDataStateError, ExecutionTiming, OutputRepresentation, PostAsapDAG, - PostAsapDAGValidationError, PostAsapNodeId, ResultGuarantee, SummaryExpr, - SummaryMaintenanceLifecycle, SummaryMaintenanceLifecycleGuarantee, SummaryMaintenanceMode, - SummaryNode, SummaryWindowFramework, ValueOperation, -}; -use asap_types::pre_asap::QueryExpr; -use asap_types::types::AccuracyTarget; -use asap_types::workload::{ - DataArrival, DataWorkload, Predictability, QueryRecurrence, QueryWorkload, RepeatedDemand, - TimestampMs, WorkloadError, -}; - -use crate::analytical_cost::AnalyticalCostError; -use crate::cost_model::{ - CompleteSummaryCandidateEstimate, Cost, CostModel, CostedSummaryDeployment, -}; -use crate::physical_operator_statistics::evaluations_in_horizon; -use crate::recurrence::{ - CostRate, EvaluationRate, Horizon, RecurrenceError, RecurrenceProfile, UpdateRate, -}; -use crate::replacement::{ - CandidateCostOverrides, CandidateLogicalASAPDAGs, GlobalSelection, RealizationError, - Replacement, -}; - -/// Summary-maintenance lifecycle shapes supported by the target runtime. -/// -/// These independent flags describe the set of lifecycle alternatives the -/// runtime implements, not simultaneous states of one deployment. Multiple -/// flags may be `true` (a runtime can support both ephemeral and prepared -/// state, for example); the planner still selects exactly one mutually -/// exclusive [`SummaryMaintenanceLifecycle`] for each deployment. A supported -/// alternative may still be rejected because workload evidence is missing or -/// its cost is unknown. -#[derive(Debug, Clone, Copy, PartialEq, Eq)] -pub struct SummaryMaintenanceLifecycleCapabilities { - /// The runtime can build a fresh state for each invocation and retire it - /// after that invocation finishes. - pub supports_ephemeral: bool, - /// The runtime can build state before a predictable execution and retain - /// it until that scheduled execution window ends. - pub supports_prepared: bool, - /// The runtime can retain one state and reuse it across multiple reads. - pub supports_shared: bool, - /// The runtime can keep state current by applying arriving data updates. - pub supports_continuously_maintained: bool, -} - -/// State operations supported by one concrete summary family and -/// representation. -/// -/// This differs from [`SummaryMaintenanceLifecycleCapabilities`]: these flags -/// describe what the summary algorithm itself can do, while lifecycle -/// capabilities describe what deployment policies the target runtime can -/// orchestrate. -#[derive(Debug, Clone, Copy, Default, PartialEq, Eq)] -pub struct SummaryMaintenanceCapabilities { - /// Existing state can incorporate arriving input without a full rebuild. - pub incremental_update: bool, - /// Two independently built states can be combined into one equivalent - /// state. - pub merge: bool, - /// Expired or retracted input can be removed from existing state. - pub delete: bool, -} - -impl SummaryMaintenanceLifecycleCapabilities { - pub const ALL: Self = Self { - supports_ephemeral: true, - supports_prepared: true, - supports_shared: true, - supports_continuously_maintained: true, - }; -} - -impl Default for SummaryMaintenanceLifecycleCapabilities { - fn default() -> Self { - Self::ALL - } -} - -/// Primitive costs for one concrete summary state. Every field is optional: -/// missing statistics produce an uncosted alternative, never a zero. -/// -/// The lifecycle planner combines these state-specific inputs with workload -/// rates, invocation counts, and the optimization horizon. All `Cost` fields -/// are one-time costs unless their name explicitly says otherwise. -#[derive(Debug, Clone, Default, PartialEq)] -pub struct SummaryMaintenanceLifecycleCostInputs { - /// One-time cost to construct the state from its input. - pub build_cost: Option, - /// Cost to incorporate one arriving input update into existing state. - pub maintenance_cost_per_update: Option, - /// Cost of one read or finalization from already-built summary state. - pub summary_read_cost: Option, - /// Cost per second for retaining the state over a lifecycle window. - pub retention_cost_rate: Option, - /// One-time cost to release or retire the state. - pub retirement_cost: Option, -} - -#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize)] -#[serde(rename_all = "snake_case")] -pub enum SummaryMaintenanceLifecycleRejection { - UnsupportedByRuntime, - RequiresPredictableOneTimeQuery, - RequiresMultipleReads, - RequiresHorizon, - RequiresContinuousData, - MissingOrStaleIngestionRate, - SummaryDoesNotSupportIncrementalUpdates, - SummaryDoesNotSupportDeletion, - MissingCostEvidence, -} - -/// One candidate lifecycle policy for a particular summary deployment. -/// -/// `total_cost: None` never means zero: it means the planner lacks enough -/// evidence to cost the candidate. Such a candidate is not selectable and its -/// `rejection` explains why. -#[derive(Debug, Clone, PartialEq)] -pub struct SummaryMaintenanceLifecycleAlternative { - /// State creation, retention, sharing, update, and retirement policy. - pub summary_maintenance_lifecycle: SummaryMaintenanceLifecycle, - /// Complete cost over the requested horizon, when every input is known. - pub total_cost: Option, - /// Why this alternative cannot be selected; `None` means it is legal and - /// fully costed. - pub rejection: Option, - /// Human-readable premises used when deriving and costing the alternative. - pub assumptions: Vec, -} - -impl SummaryMaintenanceLifecycleAlternative { - fn selectable(&self) -> bool { - self.rejection.is_none() && self.total_cost.is_some() - } -} - -/// One unique retained-state deployment. Shared `Rc` nodes are emitted once. -#[derive(Debug, Clone)] -pub struct SummaryMaintenanceDeployment { - /// Identity of this summary in the exported post-ASAP semantic DAG. - /// It is scoped to one plan version and is not a summary definition or - /// summary instance identity. - pub post_asap_node_id: PostAsapNodeId, - /// The unique materialized `SummaryAgg`, or maintained population - /// (`MaintainPopulation`) not consumed by a `SummaryAgg`, represented by - /// this deployment. Cost-model lifecycle hooks receive this node. - pub summary: Rc, - /// Lifecycle, evaluation, and representation commitment selected for this - /// state, or `None` when no alternative is selectable. - pub summary_maintenance_lifecycle_guarantee: Option, - /// Abstract window primitive selected for this state. Concrete runtime - /// implementation, placement, and identity remain downstream decisions. - pub selected_window_framework: Option, - /// Every lifecycle shape considered, including rejected and uncosted ones. - pub alternatives: Vec, -} - -/// Workload-aware lifecycle and window-framework decisions for every unique -/// summary state reachable from one materialized post-ASAP root. -#[derive(Debug, Clone)] -pub struct SummaryMaintenanceLifecyclePlan { - /// Root of the materialized post-ASAP DAG being deployed. - pub root: Rc, - /// One entry per unique reachable `SummaryAgg`, then per unique - /// maintained population outside any `SummaryAgg`'s inputs; shared `Rc` - /// nodes appear only once. - pub deployments: Vec, - /// Caller-supplied optimization horizon used to turn rates into total - /// costs. `None` keeps horizon-dependent alternatives unselectable. - pub horizon: Option, - /// Aggregate recurring query-evaluation rate derived from the workload. - pub evaluation_rate: Option, - /// Fresh source-data ingestion rate, when supplied by the workload. - pub update_rate: Option, - /// Total demand inside the horizon, when every recurrence is known. - pub expected_reads: Option, - /// Whether global costing preferred rebuilding the raw expression over all - /// summary deployments. - pub selected_raw_recompute: bool, - /// Provider-owned identity of the selected complete physical deployment - /// (for example a tumbling, sliding, or exponential-histogram plan). - pub selected_window_implementation_id: Option, - /// Cost of the selected set of summary deployments, when fully known. - pub summary_total_cost: Option, - /// Composed accuracy guarantee supplied by the selected physical window - /// evidence, when the window framework introduces approximation. - pub window_accuracy_guarantee: Option, - /// Cost of evaluating the original expression for the same demand, when - /// fully known. - pub raw_recompute_total_cost: Option, -} - -/// Why a lifecycle plan cannot assign execution timing to its DAG. -#[derive(Debug, thiserror::Error, PartialEq)] -pub enum SummaryMaintenanceTimingError { - #[error(transparent)] - InvalidPostAsapDAG(#[from] ExecutionDataStateError), - #[error("summary {0:?} has no selected lifecycle")] - UnselectedLifecycle(PostAsapNodeId), - /// A maintained population outside any `SummaryAgg`'s inputs has no - /// deployment, so its timing would be guessed. Enumeration always emits - /// one; this arises only for a plan whose root or deployments were edited. - #[error("node {0:?} maintains state that has no summary-maintenance lifecycle")] - UnplannedMaintainedState(PostAsapNodeId), - #[error(transparent)] - InvalidPhases(#[from] PostAsapDAGValidationError), -} - -impl SummaryMaintenanceLifecyclePlan { - /// The post-ASAP DAG of [`Self::root`] with every node's timing derived - /// from the selected lifecycles, so physical compilation places it. - /// - /// A retained (non-`Ephemeral`) state outlives one query, so it and every - /// input it consumes run at ingestion time. Every other node runs at query - /// time: readouts and consumers of retained state, and each `Ephemeral` - /// state not consumed by retained state together with its inputs, whose - /// raw data the deployment must supply as a query source. This applies to - /// maintained populations as to `SummaryAgg` states; a population feeding - /// a `SummaryAgg` is one of its inputs. Timings already on the root are - /// ignored. - pub fn execution_timed_dag(&self) -> Result { - let compiled = compile_post_asap_dag_with_node_ids(&self.root)?; - let dag = compiled.dag; - for population in &standalone_populations(&self.root) { - let id = compiled - .node_ids - .node_id(population) - .expect("collected population belongs to the compiled DAG"); - if !self - .deployments - .iter() - .any(|deployment| deployment.post_asap_node_id == id) - { - return Err(SummaryMaintenanceTimingError::UnplannedMaintainedState(id)); - } - } - let mut pending = Vec::new(); - for deployment in &self.deployments { - let guarantee = deployment - .summary_maintenance_lifecycle_guarantee - .as_ref() - .ok_or(SummaryMaintenanceTimingError::UnselectedLifecycle( - deployment.post_asap_node_id, - ))?; - if guarantee.summary_maintenance_lifecycle != SummaryMaintenanceLifecycle::Ephemeral { - pending.push(deployment.post_asap_node_id); - } - } - let mut ingestion = HashSet::new(); - while let Some(id) = pending.pop() { - if ingestion.insert(id) { - pending.extend( - dag.edges - .iter() - .filter(|edge| edge.consumer == id) - .map(|edge| edge.producer), - ); - } - } - let phases = dag - .nodes - .iter() - .map(|node| { - let timing = if ingestion.contains(&node.id) { - ExecutionTiming::IngestionTime - } else { - ExecutionTiming::QueryTime - }; - (node.id, timing) - }) - .collect(); - Ok(dag.with_execution_phases(&phases)?) - } -} - -/// Explicit association between a materialized target and the normalized -/// workload entries whose demand consumes it. -/// -/// [`QueryWorkload`] remains the source of query demand, while source-data -/// evidence is supplied independently. Indices avoid copying normalized entry -/// definitions while ensuring unrelated entries do not influence a target's -/// lifecycle decision. -#[derive(Debug, Clone, Copy)] -pub struct WorkloadDemand<'a> { - /// Original normalized query workload. - pub workload: &'a QueryWorkload, - /// Independent source-data evidence, when the caller has it. - pub data_workload: Option<&'a DataWorkload>, - /// Indices from [`QueryWorkload::entries`] that consume this target. - pub entry_indices: &'a [usize], -} - -impl<'a> WorkloadDemand<'a> { - /// Bind query demand without source-data evidence. Callers that have a - /// [`DataWorkload`] should use [`Self::new_with_data`] so ingestion facts - /// are not silently discarded. - pub const fn new_without_data(workload: &'a QueryWorkload, entry_indices: &'a [usize]) -> Self { - Self { - workload, - data_workload: None, - entry_indices, - } - } - - pub const fn new_with_data( - workload: &'a QueryWorkload, - data_workload: &'a DataWorkload, - entry_indices: &'a [usize], - ) -> Self { - Self { - workload, - data_workload: Some(data_workload), - entry_indices, - } - } -} - -#[derive(Debug, thiserror::Error)] -pub enum SummaryMaintenanceLifecyclePlanError { - #[error(transparent)] - InvalidWorkload(#[from] WorkloadError), - #[error("optimization horizon must be finite and strictly positive")] - InvalidHorizon, - #[error("workload entry index {index} is out of bounds for {entry_count} entries")] - InvalidWorkloadEntry { index: usize, entry_count: usize }, - #[error("a workload-demand binding must contain at least one entry")] - EmptyWorkloadDemand, - #[error("workload entry index {index} appears more than once in one demand binding")] - DuplicateWorkloadEntry { index: usize }, - #[error(transparent)] - InvalidPostAsapDAG(#[from] ExecutionDataStateError), -} - -#[derive(Debug, thiserror::Error)] -pub enum SummaryMaintenanceLifecycleAssemblyError { - #[error(transparent)] - AssembleDAG(#[from] RealizationError), - #[error(transparent)] - SummaryMaintenance(#[from] SummaryMaintenanceLifecyclePlanError), -} - -/// Failure while deriving workload-aware candidate costs before global -/// selection. -#[derive(Debug, thiserror::Error)] -pub enum SummaryMaintenanceLifecycleSelectionError { - #[error(transparent)] - Recurrence(#[from] RecurrenceError), - #[error(transparent)] - SummaryMaintenance(#[from] SummaryMaintenanceLifecyclePlanError), -} - -/// Every lifecycle alternative for each unique retained state of one fixed -/// root, before any lifecycle is chosen. -/// -/// Planner selection ([`plan_summary_maintenance_lifecycles`]) and a -/// deployment's explicit choice ([`Self::select`]) both finish from this value, -/// so they produce the same [`SummaryMaintenanceLifecyclePlan`] shape. -pub struct SummaryMaintenanceLifecycleCandidates<'a> { - /// Unselected plan: deployments carry alternatives but no guarantee or - /// window framework. - plan: SummaryMaintenanceLifecyclePlan, - components: Vec, - arrival: DataArrival, - required_accuracy: Vec, - cost_model: &'a dyn CostModel, - comparison_target: Option<&'a QueryExpr>, -} - -/// Why an explicit per-state lifecycle choice cannot be bound. -#[derive(Debug, thiserror::Error, PartialEq)] -pub enum SummaryMaintenanceLifecycleChoiceError { - #[error("summary {0:?} is not a deployment of this root")] - UnknownSummary(PostAsapNodeId), - #[error("summary {0:?} is chosen more than once")] - DuplicateChoice(PostAsapNodeId), - #[error("summary {0:?} has no chosen lifecycle")] - MissingChoice(PostAsapNodeId), - #[error("chosen lifecycle is not an enumerated alternative of summary {0:?}")] - NotAnAlternative(PostAsapNodeId), - #[error("chosen lifecycle of summary {post_asap_node_id:?} is rejected: {rejection:?}")] - Rejected { - post_asap_node_id: PostAsapNodeId, - rejection: Option, - }, - #[error("summary states on one maintenance path have different evaluation schedules")] - IncompatibleEvaluationSchedules, - #[error("the cost model supplied no complete estimate for the chosen combination")] - NoCompleteEstimate, -} - -impl SummaryMaintenanceLifecycleCandidates<'_> { - /// One entry per unique retained state (see - /// [`SummaryMaintenanceLifecyclePlan::deployments`]), with every - /// alternative and its rejection; no lifecycle or window framework is - /// selected. - pub fn deployments(&self) -> &[SummaryMaintenanceDeployment] { - &self.plan.deployments - } - - /// Guarantee that binding `lifecycle` would attach under this workload's - /// data arrival, so a caller can price an alternative before choosing it. - pub fn guarantee( - &self, - lifecycle: &SummaryMaintenanceLifecycle, - ) -> SummaryMaintenanceLifecycleGuarantee { - lifecycle_guarantee(lifecycle, self.arrival) - } - - fn context(&self) -> CompleteCostContext<'_> { - CompleteCostContext { - root: &self.plan.root, - components: &self.components, - cost_model: self.cost_model, - comparison_target: self.comparison_target, - horizon: self.plan.horizon, - expected_reads: self.plan.expected_reads, - required_accuracy: &self.required_accuracy, - } - } - - fn finish( - mut self, - estimate: Option, - ) -> SummaryMaintenanceLifecyclePlan { - if let Some(estimate) = estimate { - self.plan.summary_total_cost = Some(estimate.cost); - self.plan.selected_window_implementation_id = estimate.physical_plan_id; - self.plan.window_accuracy_guarantee = estimate.window_accuracy_guarantee; - } - self.plan - } - - /// Planner's choice: the cheapest complete combination of eligible - /// alternatives. - fn select_cheapest(mut self) -> SummaryMaintenanceLifecyclePlan { - let estimate = select_complete_lifecycle_combination( - &self.plan.root, - &mut self.plan.deployments, - &self.components, - self.arrival, - self.cost_model, - self.comparison_target, - self.plan.horizon, - self.plan.expected_reads, - &self.required_accuracy, - ); - self.finish(estimate) - } - - /// Bind one caller-chosen lifecycle per summary state. Each choice must be - /// an alternative Planner itself could select; the complete estimate is - /// then obtained exactly as for Planner selection, so window framework and - /// cost are the model's and unknown cost is never replaced by zero. - pub fn select( - mut self, - choices: &[(PostAsapNodeId, SummaryMaintenanceLifecycle)], - ) -> Result { - use SummaryMaintenanceLifecycleChoiceError as E; - let deployments = &self.plan.deployments; - let mut chosen: Vec> = - vec![None; deployments.len()]; - let context = self.context(); - for (id, lifecycle) in choices { - let index = deployments - .iter() - .position(|deployment| deployment.post_asap_node_id == *id) - .ok_or(E::UnknownSummary(*id))?; - if chosen[index].is_some() { - return Err(E::DuplicateChoice(*id)); - } - let alternative = deployments[index] - .alternatives - .iter() - .find(|alternative| alternative.summary_maintenance_lifecycle == *lifecycle) - .ok_or(E::NotAnAlternative(*id))?; - if !context.eligible(alternative) { - return Err(E::Rejected { - post_asap_node_id: *id, - rejection: alternative.rejection.clone(), - }); - } - chosen[index] = Some(alternative); - } - let selected = chosen - .into_iter() - .enumerate() - .map(|(index, alternative)| { - let alternative = - alternative.ok_or(E::MissingChoice(deployments[index].post_asap_node_id))?; - Ok(( - index, - lifecycle_guarantee(&alternative.summary_maintenance_lifecycle, self.arrival), - // Reached only for costed alternatives or when the - // complete hook is authoritative, matching Planner search. - alternative.total_cost.unwrap_or(Cost::ZERO), - )) - }) - .collect::, E>>()?; - if selected.is_empty() { - return Ok(self.finish(None)); - } - if !context.schedules_compatible(&selected) { - return Err(E::IncompatibleEvaluationSchedules); - } - let estimate = context - .estimate(deployments, &selected) - .ok_or(E::NoCompleteEstimate)?; - let guarantees = selected - .into_iter() - .map(|(index, guarantee, _)| (index, guarantee)) - .collect(); - apply_selection(&mut self.plan.deployments, guarantees, &estimate); - Ok(self.finish(Some(estimate))) - } -} - -/// Workload-wide evidence derived specifically for summary-maintenance -/// lifecycle enumeration and costing. -/// -/// This is not another workload input model. [`QueryWorkload`] and its -/// normalized entries remain the source of truth. Unlike one -/// [`asap_types::workload::QueryWorkloadEntry`], these values aggregate all -/// entries at a particular planning time and optional horizon. It also cannot -/// reuse [`crate::recurrence::RecurrenceProfile`], which describes recurrence -/// for one candidate target and counts consumers rather than invocations. -#[derive(Debug)] -struct SummaryMaintenanceWorkloadFacts { - required_accuracy: Vec, - /// Total one-time and recurring reads inside the horizon. `None` means a - /// recurrence or horizon was unknown, not zero reads. - reads: Option, - /// Sum of declared invocations across all one-time workload entries. - one_time_invocations: u64, - /// Sum of usable recurring query rates in evaluations per second. - evaluation_rate: Option, - /// Fresh workload-level ingestion rate in updates per second. - update_rate: Option, - /// Whether the workload's source data is static, arriving, mixed, or - /// unknown. - arrival: DataArrival, - /// Earliest known activation and latest scheduled execution across - /// predictable one-time entries. `None` means no valid preparation window. - prepared_window: Option<(TimestampMs, TimestampMs)>, - /// Whether every bound consumer is a predictable one-time query suitable - /// for prepared state. - prepared_eligible: bool, - /// Whether maintaining the selected moving time scope requires deleting - /// expired input from summary state. - requires_deletion: bool, -} - -/// Validate a materialized plan, enumerate lifecycle alternatives for each -/// unique summary state, and select the cheapest legal alternative whose cost -/// is fully known. -pub fn plan_summary_maintenance_lifecycles( - root: Rc, - demand: WorkloadDemand<'_>, - now_ms: u64, - horizon: Option, - capabilities: SummaryMaintenanceLifecycleCapabilities, - cost_model: &dyn CostModel, -) -> Result { - Ok(enumerate_summary_maintenance_lifecycles( - root, - demand, - now_ms, - horizon, - capabilities, - cost_model, - )? - .select_cheapest()) -} - -/// Validate a materialized plan and enumerate lifecycle alternatives for each -/// unique summary state without choosing one. A deployment that prices the -/// alternatives itself binds its choice with -/// [`SummaryMaintenanceLifecycleCandidates::select`]. -pub fn enumerate_summary_maintenance_lifecycles<'a>( - root: Rc, - demand: WorkloadDemand<'_>, - now_ms: u64, - horizon: Option, - capabilities: SummaryMaintenanceLifecycleCapabilities, - cost_model: &'a dyn CostModel, -) -> Result, SummaryMaintenanceLifecyclePlanError> { - enumerate_with_profile( - root, - demand, - now_ms, - horizon, - capabilities, - cost_model, - None, - None, - ) -} - -/// Internal candidate-costing form. The workload binding supplies temporal -/// eligibility and data-arrival facts; `profile` supplies effective uses after -/// DAG path multiplicity has been propagated by `CandidateLogicalASAPDAGs`. -#[expect(clippy::too_many_arguments, reason = "internal bound planning context")] -fn enumerate_with_profile<'a>( - root: Rc, - demand: WorkloadDemand<'_>, - now_ms: u64, - horizon: Option, - capabilities: SummaryMaintenanceLifecycleCapabilities, - cost_model: &'a dyn CostModel, - profile: Option, - comparison_target: Option<&'a QueryExpr>, -) -> Result, SummaryMaintenanceLifecyclePlanError> { - demand.workload.validate()?; - if let Some(data) = demand.data_workload { - data.validate()?; - } - if horizon.is_some_and(|h| !h.0.is_finite() || h.0 <= 0.0) { - return Err(SummaryMaintenanceLifecyclePlanError::InvalidHorizon); - } - let mut facts = workload_facts( - demand.workload, - demand.data_workload, - demand.entry_indices, - now_ms, - horizon, - )?; - if let Some(profile) = profile { - facts.one_time_invocations = u64::try_from(profile.one_shot_consumers).unwrap_or(u64::MAX); - facts.evaluation_rate = profile.evaluation_rate; - facts.update_rate = profile.update_rate; - facts.reads = match (profile.evaluation_rate, horizon) { - (Some(rate), Some(horizon)) => { - Some(profile.one_shot_consumers as f64 + rate.0 * horizon.0) - } - (Some(_), None) => None, - (None, _) if profile.one_shot_consumers > 0 => Some(profile.one_shot_consumers as f64), - // Preserve unknown recurrence from the normalized workload. An - // empty profile does not prove that the target is never read. - (None, _) => facts.reads, - }; - } - let mut summaries = Vec::new(); - collect_states( - &root, - &mut HashSet::new(), - &mut summaries, - StateKind::SummaryAgg, - ); - summaries.extend(standalone_populations(&root)); - let node_ids = compile_post_asap_dag_with_node_ids(&root)?.node_ids; - let components = summary_state_components(&summaries); - let deployments: Vec = summaries - .into_iter() - .map(|summary| { - let alternatives = alternatives_for( - &facts, - horizon, - capabilities, - cost_model.summary_maintenance_capabilities(&summary), - cost_model.summary_maintenance_lifecycle_cost_inputs_for_horizon(&summary, horizon), - ); - SummaryMaintenanceDeployment { - post_asap_node_id: node_ids - .node_id(&summary) - .expect("collected summary belongs to the compiled DAG"), - summary, - summary_maintenance_lifecycle_guarantee: None, - selected_window_framework: None, - alternatives, - } - }) - .collect(); - let selected_raw_recompute = matches!(root.expr, SummaryExpr::KeepPreAsap(_)); - Ok(SummaryMaintenanceLifecycleCandidates { - plan: SummaryMaintenanceLifecyclePlan { - root, - deployments, - horizon, - evaluation_rate: facts.evaluation_rate, - update_rate: facts.update_rate, - expected_reads: facts.reads, - selected_raw_recompute, - selected_window_implementation_id: None, - summary_total_cost: None, - window_accuracy_guarantee: None, - raw_recompute_total_cost: None, - }, - components, - arrival: facts.arrival, - required_accuracy: facts.required_accuracy, - cost_model, - comparison_target, - }) -} - -/// Rank semantic summary siblings using the cheapest legal -/// summary-maintenance lifecycle for each candidate before final global -/// selection. The candidate space stays compact; only cost overrides are -/// attached, so shared `Rc` identity and exact-composition commitments remain -/// the responsibility of `GlobalSelection`. -/// -/// Summary candidates of different targets whose outermost `SummaryAgg` is -/// structurally identical (for example p50 and p99 over one KLL) form a class. -/// When [`shared_state_cost`] can cost that state once against the union of -/// the targets' entries, each member is offered an equal split of it instead -/// of its independent cost. If selection then leaves any member of a class on -/// another choice, that class reverts to independent costs and selection runs -/// once more. -pub fn global_selection_with_summary_maintenance_lifecycles<'a, Id>( - space: &'a CandidateLogicalASAPDAGs, - demand: WorkloadDemand<'_>, - now_ms: u64, - horizon: Option, - capabilities: SummaryMaintenanceLifecycleCapabilities, - cost_model: &dyn CostModel, -) -> Result, SummaryMaintenanceLifecycleSelectionError> { - let WorkloadDemand { - workload, - data_workload, - entry_indices: root_workload_entries, - } = demand; - let profiles = space.recurrence_profiles_from_workload( - workload, - data_workload, - root_workload_entries, - now_ms, - horizon, - )?; - let bindings = space.workload_entries_by_target(workload, root_workload_entries)?; - let mut costs = CandidateCostOverrides::default(); - // Finalized summary candidates, as sharing-class members. - let mut members = Vec::new(); - for group in space.target_subdag_candidates() { - let Some(entry_indices) = bindings.get(&Rc::as_ptr(&group.target)) else { - continue; - }; - for candidate in &group.candidates { - let Replacement::Summary(summary) = &candidate.replacement else { - continue; - }; - costs.finalize_target(&group.target); - let plan = enumerate_with_profile( - Rc::clone(summary), - WorkloadDemand { - workload, - data_workload, - entry_indices, - }, - now_ms, - horizon, - capabilities, - cost_model, - Some(profiles.for_target(&group.target)), - Some(&group.target), - )? - .select_cheapest(); - let raw = plan - .expected_reads - .and_then(|reads| cost_model.raw_query_recompute_total_cost(&group.target, reads)); - // Final comparison is atomic: without the raw side, no summary - // override is published even when that summary alone is costed. - if let Some(raw) = raw { - costs.insert_raw(&group.target, raw); - if !plan.deployments.is_empty() { - if let Some(total) = plan.summary_total_cost { - costs.insert(&group.target, candidate, total); - } - members.push((group, candidate, Rc::clone(summary))); - } - } - } - } - - // Intern every member once; members whose outermost state (the - // `SummaryAgg` every other state of the candidate feeds) interns to the - // same node share it. Classes are kept in first-member order. - let interned = share_common_summary_sub_dags( - members - .iter() - .enumerate() - .map(|(index, (_, _, summary))| (index, Rc::clone(summary))) - .collect(), - ); - let mut classes: Vec<(Rc, Vec)> = Vec::new(); - for (index, root) in interned { - let states = summary_states(&root); - let Some(state) = states - .iter() - .find(|state| summary_states(state).len() == states.len()) - else { - continue; - }; - if !standalone_populations(&root).is_empty() { - continue; - } - match classes.iter_mut().find(|(s, _)| Rc::ptr_eq(s, state)) { - Some((_, class)) => class.push(index), - None => classes.push((Rc::clone(state), vec![index])), - } - } - let mut shared = Vec::new(); - for (state, class) in classes { - let mut targets: Vec<&Rc> = Vec::new(); - for &index in &class { - let target = &members[index].0.target; - if !targets.iter().any(|t| Rc::ptr_eq(t, target)) { - targets.push(target); - } - } - if targets.len() < 2 { - continue; - } - let mut entries: Vec = targets - .iter() - .flat_map(|target| bindings[&Rc::as_ptr(target)].iter().copied()) - .collect(); - entries.sort_unstable(); - entries.dedup(); - let Some(cost) = shared_state_cost( - &state, - WorkloadDemand { - workload, - data_workload, - entry_indices: &entries, - }, - now_ms, - horizon, - capabilities, - cost_model, - )? - else { - continue; - }; - shared.push((class, Cost(cost.0 / targets.len() as f64))); - } - - let with_shared = |kept: &[(Vec, Cost)]| { - let mut costs = costs.clone(); - for (class, split) in kept { - for &index in class { - let (group, candidate, _) = &members[index]; - costs.insert(&group.target, candidate, *split); - } - } - costs - }; - let selection = space.global_selection_with_candidate_costs( - cost_model, - &profiles, - horizon, - &with_shared(&shared), - )?; - let before = shared.len(); - shared.retain(|(class, _)| { - class.iter().all(|&index| { - let target = &members[index].0.target; - let chosen = selection.for_target(target).and_then(|s| s.chosen); - class.iter().any(|&other| { - Rc::ptr_eq(&members[other].0.target, target) - && chosen.is_some_and(|chosen| std::ptr::eq(chosen, members[other].1)) - }) - }) - }); - if shared.len() == before { - return Ok(selection); - } - Ok(space.global_selection_with_candidate_costs( - cost_model, - &profiles, - horizon, - &with_shared(&shared), - )?) -} - -/// Cost of one `SummaryAgg` state maintained once for every entry in -/// `demand`, or `None` when no lifecycle alternative is selectable for it. -/// No comparison target is supplied: the state serves several queries. -pub(crate) fn shared_state_cost( - state: &Rc, - demand: WorkloadDemand<'_>, - now_ms: u64, - horizon: Option, - capabilities: SummaryMaintenanceLifecycleCapabilities, - cost_model: &dyn CostModel, -) -> Result, SummaryMaintenanceLifecyclePlanError> { - Ok(enumerate_with_profile( - Rc::clone(state), - demand, - now_ms, - horizon, - capabilities, - cost_model, - None, - None, - )? - .select_cheapest() - .summary_total_cost) -} - -/// Every unique `SummaryAgg` reachable from `root`. -pub(crate) fn summary_states(root: &Rc) -> Vec> { - let mut states = Vec::new(); - collect_states( - root, - &mut HashSet::new(), - &mut states, - StateKind::SummaryAgg, - ); - states -} - -/// Assemble a globally selected phase-valid DAG and attach workload-aware -/// summary maintenance decisions. This does not create or maintain runtime state. -pub fn assemble_selected_dag_with_summary_maintenance_lifecycles( - selection: &GlobalSelection<'_>, - target: &Rc, - demand: WorkloadDemand<'_>, - now_ms: u64, - horizon: Option, - capabilities: SummaryMaintenanceLifecycleCapabilities, - cost_model: &dyn CostModel, -) -> Result, SummaryMaintenanceLifecycleAssemblyError> { - selection - .assemble_selected_dag(target)? - .map(|root| { - plan_assembled_dag( - root, - target, - demand, - now_ms, - horizon, - capabilities, - cost_model, - ) - }) - .transpose() -} - -/// The lifecycle half of -/// [`assemble_selected_dag_with_summary_maintenance_lifecycles`], for a root -/// the caller already assembled (and possibly interned across queries). -pub(crate) fn plan_assembled_dag( - root: Rc, - target: &Rc, - demand: WorkloadDemand<'_>, - now_ms: u64, - horizon: Option, - capabilities: SummaryMaintenanceLifecycleCapabilities, - cost_model: &dyn CostModel, -) -> Result { - let mut plan = enumerate_with_profile( - root, - demand, - now_ms, - horizon, - capabilities, - cost_model, - None, - Some(target), - )? - .select_cheapest(); - plan.raw_recompute_total_cost = plan - .expected_reads - .and_then(|reads| cost_model.raw_query_recompute_total_cost(target, reads)); - if !plan.selected_raw_recompute - && plan.raw_recompute_total_cost.is_none_or(|raw| { - plan.summary_total_cost - .is_none_or(|summary| raw.0 <= summary.0) - }) - { - plan.root = crate::replacement::keep_pre_asap(target)?; - plan.deployments.clear(); - plan.selected_raw_recompute = true; - plan.selected_window_implementation_id = None; - plan.summary_total_cost = None; - plan.window_accuracy_guarantee = None; - } - Ok(plan) -} - -fn workload_facts( - workload: &QueryWorkload, - data_workload: Option<&DataWorkload>, - workload_entry_indices: &[usize], - now_ms: u64, - horizon: Option, -) -> Result { - let mut one_time_invocations = 0u64; - let mut recurring_reads = 0.0; - let mut recurring_known = true; - let mut evaluation_rate = 0.0; - let mut has_evaluation_rate = false; - let mut prepared_start: Option = None; - let mut prepared_end: Option = None; - let mut prepared_eligible = true; - let mut requires_deletion = false; - let mut required_accuracy = Vec::new(); - - let entries: Vec<_> = workload.entries().collect(); - if workload_entry_indices.is_empty() { - return Err(SummaryMaintenanceLifecyclePlanError::EmptyWorkloadDemand); - } - let mut seen_indices = HashSet::new(); - for &index in workload_entry_indices { - if !seen_indices.insert(index) { - return Err(SummaryMaintenanceLifecyclePlanError::DuplicateWorkloadEntry { index }); - } - let entry = entries.get(index).ok_or( - SummaryMaintenanceLifecyclePlanError::InvalidWorkloadEntry { - index, - entry_count: entries.len(), - }, - )?; - required_accuracy.push(entry.requirements.accuracy.target()); - requires_deletion |= entry.time_selection.lookback.is_some() - && entry.time_selection.as_of.is_none() - && matches!( - entry.time_selection.scope, - asap_types::workload::QueryTimeScope::RealTime - | asap_types::workload::QueryTimeScope::Mixed - ); - match &entry.recurrence { - QueryRecurrence::OneTime { - invocations, - execute_at, - } => { - one_time_invocations = one_time_invocations.saturating_add(*invocations); - let covered = if let ( - Predictability::Predictable { - known_at: Some(known), - }, - Some(execute), - ) = (&entry.predictability, execute_at) - { - if known < execute && now_ms < execute.0 { - let activate = TimestampMs(known.0.max(now_ms)); - prepared_start = - Some(prepared_start.map_or(activate, |old| old.min(activate))); - prepared_end = Some(prepared_end.map_or(*execute, |old| old.max(*execute))); - true - } else { - false - } - } else { - false - }; - prepared_eligible &= covered; - } - QueryRecurrence::Repeated(RepeatedDemand::FixedInterval(interval)) - | QueryRecurrence::Repeated(RepeatedDemand::FixedIntervalAt { interval, .. }) => { - prepared_eligible = false; - let rate = 1000.0 / f64::from(interval.0); - evaluation_rate += rate; - has_evaluation_rate = true; - if let Some(h) = horizon { - recurring_reads += h.0 * rate; - } else { - recurring_known = false; - } - } - QueryRecurrence::Repeated(RepeatedDemand::Scheduled(schedule)) => { - prepared_eligible = false; - if let Some(h) = horizon { - let end_ms = now_ms.saturating_add((h.0 * 1000.0) as u64); - let reads_in_horizon = schedule - .iter() - .filter(|at| at.0 >= now_ms && at.0 <= end_ms) - .count() as f64; - recurring_reads += reads_in_horizon; - evaluation_rate += reads_in_horizon / h.0; - has_evaluation_rate = true; - } else { - recurring_known = false; - } - } - QueryRecurrence::Repeated(RepeatedDemand::EstimatedRate(estimate)) => { - prepared_eligible = false; - if !estimate.is_fresh_at(now_ms) { - recurring_known = false; - continue; - } - let rate = estimate.expected_rate.0; - evaluation_rate += rate; - has_evaluation_rate = true; - if let Some(h) = horizon { - recurring_reads += h.0 * rate; - } else { - recurring_known = false; - } - } - QueryRecurrence::Unknown => { - prepared_eligible = false; - recurring_known = false; - } - } - } - - let data = data_workload; - let arrival = data.map_or(DataArrival::Unknown, |data| data.arrival); - let update_rate = data - .and_then(|data| data.ingestion_rate.value_at(now_ms)) - .map(|rate| UpdateRate(rate.0)); - let reads = if let Some(horizon) = horizon { - let horizon_ms = horizon.0 * 1_000.0; - if !horizon_ms.is_finite() - || horizon_ms <= 0.0 - || horizon_ms > u64::MAX as f64 - || horizon_ms.fract() != 0.0 - { - None - } else { - workload_entry_indices - .iter() - .try_fold(0_u64, |total, index| { - let entry = entries.get(*index)?; - match evaluations_in_horizon(&entry.recurrence, now_ms, horizon_ms as u64) { - Ok(count) => total.checked_add(count), - Err(AnalyticalCostError::NoEvaluationsInHorizon) => Some(total), - Err(_) => None, - } - }) - .map(|count| count as f64) - } - } else { - recurring_known.then_some(one_time_invocations as f64 + recurring_reads) - }; - Ok(SummaryMaintenanceWorkloadFacts { - required_accuracy, - reads, - one_time_invocations, - evaluation_rate: has_evaluation_rate.then_some(EvaluationRate(evaluation_rate)), - update_rate, - arrival, - prepared_window: prepared_start.zip(prepared_end), - prepared_eligible, - requires_deletion, - }) -} - -fn alternatives_for( - facts: &SummaryMaintenanceWorkloadFacts, - horizon: Option, - capabilities: SummaryMaintenanceLifecycleCapabilities, - summary_capabilities: SummaryMaintenanceCapabilities, - costs: SummaryMaintenanceLifecycleCostInputs, -) -> Vec { - let alternatives = vec![ - ephemeral(facts, capabilities, &costs), - prepared(facts, capabilities, summary_capabilities, &costs), - shared(facts, horizon, capabilities, summary_capabilities, &costs), - continuous(facts, horizon, capabilities, summary_capabilities, &costs), - ]; - alternatives -} - -fn ephemeral( - facts: &SummaryMaintenanceWorkloadFacts, - capabilities: SummaryMaintenanceLifecycleCapabilities, - costs: &SummaryMaintenanceLifecycleCostInputs, -) -> SummaryMaintenanceLifecycleAlternative { - let lifecycle = SummaryMaintenanceLifecycle::Ephemeral; - if !capabilities.supports_ephemeral { - return rejected( - lifecycle, - SummaryMaintenanceLifecycleRejection::UnsupportedByRuntime, - ); - } - let total_cost = zip_costs(&[ - costs.build_cost, - costs.summary_read_cost, - costs.retirement_cost, - ]) - .zip(facts.reads) - .map(|(per_read, reads)| Cost(per_read * reads)); - costed_or_unknown( - lifecycle, - total_cost, - vec!["state is rebuilt per invocation".into()], - ) -} - -fn prepared( - facts: &SummaryMaintenanceWorkloadFacts, - capabilities: SummaryMaintenanceLifecycleCapabilities, - summary_capabilities: SummaryMaintenanceCapabilities, - costs: &SummaryMaintenanceLifecycleCostInputs, -) -> SummaryMaintenanceLifecycleAlternative { - if !facts.prepared_eligible { - return rejected( - SummaryMaintenanceLifecycle::Prepared { - activate_at: TimestampMs(0), - retire_at: TimestampMs(0), - }, - SummaryMaintenanceLifecycleRejection::RequiresPredictableOneTimeQuery, - ); - } - let Some((activate_at, retire_at)) = facts.prepared_window else { - return rejected( - SummaryMaintenanceLifecycle::Prepared { - activate_at: TimestampMs(0), - retire_at: TimestampMs(0), - }, - SummaryMaintenanceLifecycleRejection::RequiresPredictableOneTimeQuery, - ); - }; - let lifecycle = SummaryMaintenanceLifecycle::Prepared { - activate_at, - retire_at, - }; - if !capabilities.supports_prepared { - return rejected( - lifecycle, - SummaryMaintenanceLifecycleRejection::UnsupportedByRuntime, - ); - } - if let Some(rejection) = maintenance_capability_rejection(facts, summary_capabilities) { - return rejected(lifecycle, rejection); - } - let seconds = retire_at.0.saturating_sub(activate_at.0) as f64 / 1000.0; - let maintenance = maintenance_cost(facts, costs, seconds); - let total_cost = match ( - costs.build_cost, - costs.summary_read_cost, - costs.retention_cost_rate, - costs.retirement_cost, - maintenance, - ) { - (Some(build), Some(read), Some(retention), Some(retire), Some(maintenance)) => Some(Cost( - build.0 - + read.0 * facts.one_time_invocations as f64 - + retention.0 * seconds - + retire.0 - + maintenance, - )), - _ => None, - }; - costed_or_unknown( - lifecycle, - total_cost, - vec!["activation and retirement come from the declared schedule".into()], - ) -} - -fn shared( - facts: &SummaryMaintenanceWorkloadFacts, - horizon: Option, - capabilities: SummaryMaintenanceLifecycleCapabilities, - summary_capabilities: SummaryMaintenanceCapabilities, - costs: &SummaryMaintenanceLifecycleCostInputs, -) -> SummaryMaintenanceLifecycleAlternative { - let lifecycle = SummaryMaintenanceLifecycle::Shared { - retention: asap_types::workload::DurationMs(horizon.map_or(0, |h| (h.0 * 1000.0) as u64)), - }; - if !capabilities.supports_shared { - return rejected( - lifecycle, - SummaryMaintenanceLifecycleRejection::UnsupportedByRuntime, - ); - } - if let Some(rejection) = maintenance_capability_rejection(facts, summary_capabilities) { - return rejected(lifecycle, rejection); - } - if facts.reads.is_none_or(|reads| reads <= 1.0) { - return rejected( - lifecycle, - SummaryMaintenanceLifecycleRejection::RequiresMultipleReads, - ); - } - let Some(horizon) = horizon else { - return rejected( - lifecycle, - SummaryMaintenanceLifecycleRejection::RequiresHorizon, - ); - }; - let total_cost = retained_cost(facts, costs, horizon.0); - costed_or_unknown( - lifecycle, - total_cost, - vec!["one state is shared across reads".into()], - ) -} - -fn continuous( - facts: &SummaryMaintenanceWorkloadFacts, - horizon: Option, - capabilities: SummaryMaintenanceLifecycleCapabilities, - summary_capabilities: SummaryMaintenanceCapabilities, - costs: &SummaryMaintenanceLifecycleCostInputs, -) -> SummaryMaintenanceLifecycleAlternative { - let lifecycle = SummaryMaintenanceLifecycle::ContinuouslyMaintained; - if !capabilities.supports_continuously_maintained { - return rejected( - lifecycle, - SummaryMaintenanceLifecycleRejection::UnsupportedByRuntime, - ); - } - if !matches!( - facts.arrival, - DataArrival::ContinuouslyIngesting | DataArrival::Mixed - ) { - return rejected( - lifecycle, - SummaryMaintenanceLifecycleRejection::RequiresContinuousData, - ); - } - if facts.update_rate.is_none() { - return rejected( - lifecycle, - SummaryMaintenanceLifecycleRejection::MissingOrStaleIngestionRate, - ); - } - if let Some(rejection) = maintenance_capability_rejection(facts, summary_capabilities) { - return rejected(lifecycle, rejection); - } - let Some(horizon) = horizon else { - return rejected( - lifecycle, - SummaryMaintenanceLifecycleRejection::RequiresHorizon, - ); - }; - let total_cost = retained_cost(facts, costs, horizon.0); - costed_or_unknown( - lifecycle, - total_cost, - vec!["updates are applied for the optimization horizon".into()], - ) -} - -fn maintenance_capability_rejection( - facts: &SummaryMaintenanceWorkloadFacts, - capabilities: SummaryMaintenanceCapabilities, -) -> Option { - if matches!( - facts.arrival, - DataArrival::ContinuouslyIngesting | DataArrival::Mixed - ) && !capabilities.incremental_update - { - Some(SummaryMaintenanceLifecycleRejection::SummaryDoesNotSupportIncrementalUpdates) - } else if matches!( - facts.arrival, - DataArrival::ContinuouslyIngesting | DataArrival::Mixed - ) && facts.requires_deletion - && !capabilities.delete - { - Some(SummaryMaintenanceLifecycleRejection::SummaryDoesNotSupportDeletion) - } else { - None - } -} - -fn retained_cost( - facts: &SummaryMaintenanceWorkloadFacts, - costs: &SummaryMaintenanceLifecycleCostInputs, - seconds: f64, -) -> Option { - let reads = facts.reads?; - let maintenance = maintenance_cost(facts, costs, seconds)?; - Some(Cost( - costs.build_cost?.0 - + maintenance - + reads * costs.summary_read_cost?.0 - + seconds * costs.retention_cost_rate?.0 - + costs.retirement_cost?.0, - )) -} - -fn maintenance_cost( - facts: &SummaryMaintenanceWorkloadFacts, - costs: &SummaryMaintenanceLifecycleCostInputs, - seconds: f64, -) -> Option { - match facts.arrival { - DataArrival::AtRest => Some(0.0), - DataArrival::ContinuouslyIngesting | DataArrival::Mixed => { - Some(seconds * facts.update_rate?.0 * costs.maintenance_cost_per_update?.0) - } - DataArrival::Unknown => None, - } -} - -fn zip_costs(costs: &[Option]) -> Option { - costs - .iter() - .try_fold(0.0, |sum, cost| Some(sum + cost.as_ref()?.0)) -} - -fn costed_or_unknown( - summary_maintenance_lifecycle: SummaryMaintenanceLifecycle, - total_cost: Option, - assumptions: Vec, -) -> SummaryMaintenanceLifecycleAlternative { - SummaryMaintenanceLifecycleAlternative { - summary_maintenance_lifecycle, - total_cost, - rejection: total_cost - .is_none() - .then_some(SummaryMaintenanceLifecycleRejection::MissingCostEvidence), - assumptions, - } -} - -fn rejected( - summary_maintenance_lifecycle: SummaryMaintenanceLifecycle, - rejection: SummaryMaintenanceLifecycleRejection, -) -> SummaryMaintenanceLifecycleAlternative { - SummaryMaintenanceLifecycleAlternative { - summary_maintenance_lifecycle, - total_cost: None, - rejection: Some(rejection), - assumptions: Vec::new(), - } -} - -#[derive(Clone, Copy, PartialEq)] -enum StateKind { - SummaryAgg, - Population, -} - -/// Collect every unique node of `kind` reachable from `node`. -fn collect_states( - node: &Rc, - seen: &mut HashSet<*const SummaryNode>, - output: &mut Vec>, - kind: StateKind, -) { - if !seen.insert(Rc::as_ptr(node)) { - return; - } - match &node.expr { - SummaryExpr::SummaryAgg { child, .. } => { - if kind == StateKind::SummaryAgg { - output.push(Rc::clone(node)); - } - collect_states(child, seen, output, kind); - } - SummaryExpr::ValueOperation { - child, operation, .. - } => { - if kind == StateKind::Population - && matches!(operation, ValueOperation::MaintainPopulation { .. }) - { - output.push(Rc::clone(node)); - } - collect_states(child, seen, output, kind) - } - SummaryExpr::SummaryJoin { outer, inner, .. } - | SummaryExpr::RelationalJoin { - left: outer, - right: inner, - .. - } - | SummaryExpr::BinaryOp { - lhs: outer, - rhs: inner, - .. - } - | SummaryExpr::SummarySubtract { - left: outer, - right: inner, - } => { - collect_states(outer, seen, output, kind); - collect_states(inner, seen, output, kind); - } - SummaryExpr::SummaryDelete { summary_input, .. } - | SummaryExpr::SummaryEstimate { summary_input, .. } => { - collect_states(summary_input, seen, output, kind) - } - SummaryExpr::SummaryMerge { children, .. } => { - for child in children { - collect_states(child, seen, output, kind); - } - } - SummaryExpr::KeepPreAsap(_) => {} - } -} - -/// Maintained populations that are not an input of any `SummaryAgg`. A -/// population feeding summary state is on that state's maintenance path, so -/// that state's lifecycle times it, even when a readout also reads it directly. -fn standalone_populations(root: &Rc) -> Vec> { - let mut summaries = Vec::new(); - collect_states( - root, - &mut HashSet::new(), - &mut summaries, - StateKind::SummaryAgg, - ); - let mut nested = Vec::new(); - let mut seen = HashSet::new(); - for summary in &summaries { - collect_states(summary, &mut seen, &mut nested, StateKind::Population); - } - let nested: HashSet<_> = nested.iter().map(Rc::as_ptr).collect(); - let mut populations = Vec::new(); - collect_states( - root, - &mut HashSet::new(), - &mut populations, - StateKind::Population, - ); - populations.retain(|population| !nested.contains(&Rc::as_ptr(population))); - populations -} - -pub(crate) fn evaluation_schedule( - lifecycle: &SummaryMaintenanceLifecycle, - arrival: DataArrival, -) -> EvaluationSchedule { - match lifecycle { - SummaryMaintenanceLifecycle::Ephemeral => EvaluationSchedule::OneShot, - SummaryMaintenanceLifecycle::Prepared { .. } - | SummaryMaintenanceLifecycle::Shared { .. } - if matches!( - arrival, - DataArrival::ContinuouslyIngesting | DataArrival::Mixed - ) => - { - EvaluationSchedule::PerUpdate - } - SummaryMaintenanceLifecycle::Prepared { .. } => EvaluationSchedule::OneShot, - SummaryMaintenanceLifecycle::Shared { .. } => EvaluationSchedule::OnRead, - SummaryMaintenanceLifecycle::ContinuouslyMaintained => EvaluationSchedule::PerUpdate, - } -} - -/// Summary states composed on one maintenance path must be produced on the -/// same schedule. Return a component id for each collected state. -fn summary_state_components(summaries: &[Rc]) -> Vec { - let indices: HashMap<_, _> = summaries - .iter() - .enumerate() - .map(|(index, summary)| (Rc::as_ptr(summary), index)) - .collect(); - let mut parents: Vec<_> = (0..summaries.len()).collect(); - - fn find(parents: &mut [usize], index: usize) -> usize { - if parents[index] != index { - parents[index] = find(parents, parents[index]); - } - parents[index] - } - - for (parent_index, summary) in summaries.iter().enumerate() { - let SummaryExpr::SummaryAgg { child, .. } = &summary.expr else { - continue; - }; - if !matches!( - child.expr, - SummaryExpr::SummaryAgg { .. } - | SummaryExpr::SummaryJoin { .. } - | SummaryExpr::SummarySubtract { .. } - | SummaryExpr::SummaryDelete { .. } - | SummaryExpr::SummaryMerge { .. } - ) { - continue; - } - let mut descendants = Vec::new(); - collect_states( - child, - &mut HashSet::new(), - &mut descendants, - StateKind::SummaryAgg, - ); - for descendant in descendants { - let child_index = indices[&Rc::as_ptr(&descendant)]; - let parent_root = find(&mut parents, parent_index); - let child_root = find(&mut parents, child_index); - parents[child_root] = parent_root; - } - } - (0..parents.len()) - .map(|index| find(&mut parents, index)) - .collect() -} - -/// Inputs shared by every complete lifecycle-combination evaluation of one -/// root, whether Planner searches combinations or a caller supplies one. -struct CompleteCostContext<'a> { - root: &'a SummaryNode, - components: &'a [usize], - cost_model: &'a dyn CostModel, - comparison_target: Option<&'a QueryExpr>, - horizon: Option, - expected_reads: Option, - required_accuracy: &'a [AccuracyTarget], -} - -impl CompleteCostContext<'_> { - /// Planner's own admission rule for one alternative. Uncosted alternatives - /// are admitted only when the complete-candidate hook is authoritative. - fn eligible(&self, alternative: &SummaryMaintenanceLifecycleAlternative) -> bool { - alternative.selectable() - || (self - .cost_model - .complete_summary_candidate_estimate_covers_lifecycle_costs() - && alternative.rejection - == Some(SummaryMaintenanceLifecycleRejection::MissingCostEvidence)) - } - - /// `selected` holds one entry per deployment, in deployment order. - fn schedules_compatible( - &self, - selected: &[(usize, SummaryMaintenanceLifecycleGuarantee, Cost)], - ) -> bool { - !selected.iter().enumerate().any(|(left, (_, a, _))| { - selected.iter().enumerate().any(|(right, (_, b, _))| { - self.components[left] == self.components[right] - && a.evaluation_schedule != b.evaluation_schedule - }) - }) - } - - fn estimate( - &self, - deployments: &[SummaryMaintenanceDeployment], - selected: &[(usize, SummaryMaintenanceLifecycleGuarantee, Cost)], - ) -> Option { - if !self.schedules_compatible(selected) { - return None; - } - let costed: Vec<_> = selected - .iter() - .map(|(index, guarantee, cost)| CostedSummaryDeployment { - summary: &deployments[*index].summary, - guarantee, - selected_cost: *cost, - }) - .collect(); - let estimate = self.cost_model.complete_summary_candidate_estimate( - self.root, - self.comparison_target, - &costed, - self.horizon, - self.expected_reads, - self.required_accuracy, - )?; - (estimate.window_frameworks.len() == deployments.len()).then_some(estimate) - } -} - -fn lifecycle_guarantee( - lifecycle: &SummaryMaintenanceLifecycle, - arrival: DataArrival, -) -> SummaryMaintenanceLifecycleGuarantee { - SummaryMaintenanceLifecycleGuarantee { - summary_maintenance_mode: maintenance_mode(lifecycle, arrival), - evaluation_schedule: evaluation_schedule(lifecycle, arrival), - summary_maintenance_lifecycle: lifecycle.clone(), - output_representation: OutputRepresentation::SummaryState, - } -} - -fn apply_selection( - deployments: &mut [SummaryMaintenanceDeployment], - guarantees: Vec<(usize, SummaryMaintenanceLifecycleGuarantee)>, - estimate: &CompleteSummaryCandidateEstimate, -) { - for (index, guarantee) in guarantees { - deployments[index].summary_maintenance_lifecycle_guarantee = Some(guarantee); - } - for (deployment, framework) in deployments - .iter_mut() - .zip(estimate.window_frameworks.iter().cloned()) - { - deployment.selected_window_framework = framework; - } -} - -#[expect(clippy::too_many_arguments, reason = "complete combination context")] -fn select_complete_lifecycle_combination( - root: &SummaryNode, - deployments: &mut [SummaryMaintenanceDeployment], - components: &[usize], - arrival: DataArrival, - cost_model: &dyn CostModel, - comparison_target: Option<&QueryExpr>, - horizon: Option, - expected_reads: Option, - required_accuracy: &[AccuracyTarget], -) -> Option { - const MAX_COMPLETE_LIFECYCLE_COMBINATIONS: usize = 4_096; - if deployments.is_empty() { - return None; - } - let context = CompleteCostContext { - root, - components, - cost_model, - comparison_target, - horizon, - expected_reads, - required_accuracy, - }; - // The whole-candidate hook is intentionally arbitrary, so partial costs - // cannot soundly prune the search. Bound exhaustive enumeration and fail - // closed instead of allowing an adversarial DAG to consume exponential - // planner time. - let combinations = deployments - .iter() - .try_fold(1_usize, |product, deployment| { - let selectable = deployment - .alternatives - .iter() - .filter(|alternative| context.eligible(alternative)) - .count(); - product.checked_mul(selectable) - })?; - if combinations == 0 || combinations > MAX_COMPLETE_LIFECYCLE_COMBINATIONS { - return None; - } - type Best = Option<( - CompleteSummaryCandidateEstimate, - Vec<(usize, SummaryMaintenanceLifecycleGuarantee)>, - )>; - fn visit( - index: usize, - context: &CompleteCostContext<'_>, - deployments: &[SummaryMaintenanceDeployment], - arrival: DataArrival, - selected: &mut Vec<(usize, SummaryMaintenanceLifecycleGuarantee, Cost)>, - best: &mut Best, - ) { - if index == deployments.len() { - let Some(estimate) = context.estimate(deployments, selected) else { - return; - }; - if best - .as_ref() - .is_none_or(|(best_estimate, _)| estimate.cost.0 < best_estimate.cost.0) - { - *best = Some(( - estimate, - selected - .iter() - .map(|(index, guarantee, _)| (*index, guarantee.clone())) - .collect(), - )); - } - return; - } - for alternative in deployments[index] - .alternatives - .iter() - .filter(|alternative| context.eligible(alternative)) - { - selected.push(( - index, - lifecycle_guarantee(&alternative.summary_maintenance_lifecycle, arrival), - alternative.total_cost.unwrap_or(Cost::ZERO), - )); - visit(index + 1, context, deployments, arrival, selected, best); - selected.pop(); - } - } - - let mut best = None; - visit( - 0, - &context, - deployments, - arrival, - &mut Vec::new(), - &mut best, - ); - let (estimate, guarantees) = best?; - apply_selection(deployments, guarantees, &estimate); - Some(estimate) -} - -pub(crate) fn maintenance_mode( - lifecycle: &SummaryMaintenanceLifecycle, - arrival: DataArrival, -) -> SummaryMaintenanceMode { - match lifecycle { - SummaryMaintenanceLifecycle::Ephemeral => SummaryMaintenanceMode::DirectBuild, - SummaryMaintenanceLifecycle::ContinuouslyMaintained => SummaryMaintenanceMode::Incremental, - SummaryMaintenanceLifecycle::Prepared { .. } - | SummaryMaintenanceLifecycle::Shared { .. } => match arrival { - DataArrival::ContinuouslyIngesting | DataArrival::Mixed => { - SummaryMaintenanceMode::Incremental - } - DataArrival::AtRest | DataArrival::Unknown => SummaryMaintenanceMode::DirectBuild, - }, - } -} - -#[cfg(test)] -mod tests { - // Independent data evidence must be validated at both planning boundaries. - #[test] - fn rejects_invalid_parallel_data_evidence() { - let query = workload(vec![batch(Predictability::AdHoc)], vec![], at_rest()); - let space = crate::replacement::search_workload(vec![("q", quantile_query())]); - for rate in [1.0, -1.0, f64::NAN, f64::INFINITY] { - let mut data = at_rest(); - data.ingestion_rate.value = Some(Rate(rate)); - assert!(space - .recurrence_profiles_from_workload(&query, Some(&data), &[0], 0, None) - .is_err()); - assert!(plan_summary_maintenance_lifecycles( - summary(), - WorkloadDemand::new_with_data(&query, &data, &[0]), - 0, - None, - SummaryMaintenanceLifecycleCapabilities::ALL, - &crate::cost_model::DefaultCostModel, - ) - .is_err()); - } - } - use super::*; - use asap_types::post_asap::{ - ExactKind, ExactParams, Field, FieldDataType, GroupingStrategy, PostAsapOperatorPayload, - ResultGuarantee, Schema, SketchAlgorithm, - }; - use asap_types::pre_asap::AggIntent; - use asap_types::pre_asap::{ColumnRef, DataType, QueryExpr, Reduction, Source}; - use asap_types::types::AccuracyTarget; - use asap_types::workload::{ - BatchEntry, DataWorkload, DurationMs, Evidence, EvidenceSource, Predictability, Query, - QueryLanguage, QueryRequirements, Rate, RepeatingEntry, RepetitionInterval, TimeSelection, - }; - - struct UnitCosts; - - impl CostModel for UnitCosts { - fn rank_candidates( - &self, - _intent: &asap_types::pre_asap::AggIntent, - candidates: &[asap_types::post_asap::SketchAlgorithm], - ) -> Vec { - candidates.to_vec() - } - - fn summary_maintenance_lifecycle_cost_inputs( - &self, - _summary: &SummaryNode, - ) -> SummaryMaintenanceLifecycleCostInputs { - SummaryMaintenanceLifecycleCostInputs { - build_cost: Some(Cost(10.0)), - maintenance_cost_per_update: Some(Cost(1.0)), - summary_read_cost: Some(Cost(1.0)), - retention_cost_rate: Some(CostRate(0.1)), - retirement_cost: Some(Cost(1.0)), - } - } - - fn summary_maintenance_capabilities( - &self, - _summary: &SummaryNode, - ) -> SummaryMaintenanceCapabilities { - SummaryMaintenanceCapabilities { - incremental_update: true, - merge: true, - delete: true, - } - } - } - - struct RawCheaper; - - impl CostModel for RawCheaper { - fn rank_candidates( - &self, - _intent: &asap_types::pre_asap::AggIntent, - candidates: &[asap_types::post_asap::SketchAlgorithm], - ) -> Vec { - candidates.to_vec() - } - - fn summary_maintenance_lifecycle_cost_inputs( - &self, - summary: &SummaryNode, - ) -> SummaryMaintenanceLifecycleCostInputs { - UnitCosts.summary_maintenance_lifecycle_cost_inputs(summary) - } - - fn summary_maintenance_capabilities( - &self, - summary: &SummaryNode, - ) -> SummaryMaintenanceCapabilities { - UnitCosts.summary_maintenance_capabilities(summary) - } - - fn raw_query_recompute_cost(&self, _target: &QueryExpr) -> Option { - Some(Cost(1.0)) - } - } - - struct NoDelete; - - impl CostModel for NoDelete { - fn rank_candidates( - &self, - _intent: &asap_types::pre_asap::AggIntent, - candidates: &[asap_types::post_asap::SketchAlgorithm], - ) -> Vec { - candidates.to_vec() - } - - fn summary_maintenance_lifecycle_cost_inputs( - &self, - summary: &SummaryNode, - ) -> SummaryMaintenanceLifecycleCostInputs { - UnitCosts.summary_maintenance_lifecycle_cost_inputs(summary) - } - - fn summary_maintenance_capabilities( - &self, - _summary: &SummaryNode, - ) -> SummaryMaintenanceCapabilities { - SummaryMaintenanceCapabilities { - incremental_update: true, - merge: true, - delete: false, - } - } - } - - struct SummaryMaintenancePrefersDdSketch; - - impl CostModel for SummaryMaintenancePrefersDdSketch { - fn raw_query_recompute_total_cost( - &self, - _target: &QueryExpr, - _expected_reads: f64, - ) -> Option { - Some(Cost(1_000.0)) - } - - fn rank_candidates( - &self, - _intent: &AggIntent, - candidates: &[SketchAlgorithm], - ) -> Vec { - // Preserve semantic mapping's KLL-first order. The lifecycle - // total below must be what changes the final choice. - candidates.to_vec() - } - - fn summary_maintenance_lifecycle_cost_inputs( - &self, - summary: &SummaryNode, - ) -> SummaryMaintenanceLifecycleCostInputs { - let build = match sketch_algorithm(summary) { - Some(SketchAlgorithm::Kll) => 100.0, - Some(SketchAlgorithm::DDSketch) => 1.0, - _ => 10.0, - }; - SummaryMaintenanceLifecycleCostInputs { - build_cost: Some(Cost(build)), - maintenance_cost_per_update: Some(Cost(1.0)), - summary_read_cost: Some(Cost(1.0)), - retention_cost_rate: Some(CostRate(0.1)), - retirement_cost: Some(Cost(1.0)), - } - } - } - - struct IncompatibleNestedCosts; - - struct WholeCandidatePrefersContinuous; - - impl CostModel for WholeCandidatePrefersContinuous { - fn rank_candidates( - &self, - _intent: &AggIntent, - candidates: &[SketchAlgorithm], - ) -> Vec { - candidates.to_vec() - } - - fn complete_summary_candidate_cost( - &self, - _root: &SummaryNode, - _target: Option<&QueryExpr>, - deployments: &[CostedSummaryDeployment<'_>], - _horizon: Option, - _expected_reads: Option, - _required_accuracy: &[AccuracyTarget], - ) -> Option { - Some( - if deployments.iter().all(|deployment| { - matches!( - deployment.guarantee.summary_maintenance_lifecycle, - SummaryMaintenanceLifecycle::ContinuouslyMaintained - ) - }) { - Cost(1.0) - } else { - Cost(100.0) - }, - ) - } - } - - impl CostModel for IncompatibleNestedCosts { - fn rank_candidates( - &self, - _intent: &AggIntent, - candidates: &[SketchAlgorithm], - ) -> Vec { - candidates.to_vec() - } - - fn summary_maintenance_lifecycle_cost_inputs( - &self, - summary: &SummaryNode, - ) -> SummaryMaintenanceLifecycleCostInputs { - let is_leaf = matches!( - summary.expr, - SummaryExpr::SummaryAgg { ref child, .. } - if matches!(child.expr, SummaryExpr::KeepPreAsap(_)) - ); - SummaryMaintenanceLifecycleCostInputs { - build_cost: Some(Cost(if is_leaf { 1.0 } else { 100.0 })), - maintenance_cost_per_update: Some(Cost(if is_leaf { 100.0 } else { 0.0 })), - summary_read_cost: Some(Cost::ZERO), - retention_cost_rate: Some(CostRate(0.0)), - retirement_cost: Some(Cost::ZERO), - } - } - - fn summary_maintenance_capabilities( - &self, - _summary: &SummaryNode, - ) -> SummaryMaintenanceCapabilities { - SummaryMaintenanceCapabilities { - incremental_update: true, - merge: true, - delete: true, - } - } - } - - fn sketch_algorithm(node: &SummaryNode) -> Option { - match &node.expr { - SummaryExpr::SummaryEstimate { summary_input, .. } => sketch_algorithm(summary_input), - SummaryExpr::SummaryAgg { - family: FieldDataType::Sketch(kind, _), - .. - } => Some(kind.algorithm().clone()), - _ => None, - } - } - - fn query_root() -> Rc { - query_root_for("m") - } - - fn query_root_for(metric: &str) -> Rc { - Rc::new(QueryExpr::Scan { - source: Source::TimeSeries { - metric: metric.into(), - }, - predicates: vec![], - schema: Schema::with_time_index( - vec![ - Field::plain("ts", DataType::Timestamp, false), - Field::plain("value", DataType::Float64, false), - ], - 0, - vec![], - ), - }) - } - - fn sum_query() -> Rc { - Rc::new(QueryExpr::Aggregate { - reduction: Reduction::by(vec![]), - measures: vec![AggIntent::Sum { col: None }], - output_names: vec![], - filters: vec![], - having: None, - child: query_root(), - }) - } - - fn quantile_query() -> Rc { - Rc::new(QueryExpr::Aggregate { - reduction: Reduction::by(vec![]), - measures: vec![AggIntent::Quantile { - col: None, - q: 0.99, - accuracy: AccuracyTarget::Epsilon(0.1), - }], - output_names: vec![], - filters: vec![], - having: None, - child: query_root(), - }) - } - - fn summary() -> Rc { - let child = Rc::new(SummaryNode { - expr: SummaryExpr::KeepPreAsap(query_root()), - schema: Schema::lifted(vec![], None), - guarantee: Some(ResultGuarantee::exact("raw")), - }); - let family = FieldDataType::ExactAggregate(ExactKind::Sum, ExactParams::Sum); - Rc::new(SummaryNode { - expr: SummaryExpr::SummaryAgg { - child, - family: family.clone(), - input: asap_types::post_asap::SummaryUpdate::column(ColumnRef::Named( - "value".into(), - )), - reduction: Reduction::by(vec![]), - grouping: GroupingStrategy::default(), - filter: None, - }, - schema: Schema::lifted(vec![Field::new("state", family, false)], None), - guarantee: Some(ResultGuarantee::exact("sum")), - }) - } - - fn nested_summary() -> Rc { - let child = summary(); - let family = FieldDataType::ExactAggregate(ExactKind::Sum, ExactParams::Sum); - Rc::new(SummaryNode { - expr: SummaryExpr::SummaryAgg { - child, - family: family.clone(), - input: asap_types::post_asap::SummaryUpdate::column(ColumnRef::Named( - "state".into(), - )), - reduction: Reduction::by(vec![]), - grouping: GroupingStrategy::default(), - filter: None, - }, - schema: Schema::lifted(vec![Field::new("state", family, false)], None), - guarantee: Some(ResultGuarantee::exact("nested sum")), - }) - } - - fn batch(predictability: Predictability) -> BatchEntry { - BatchEntry { - query: Query("sum(m)".into()), - requirements: QueryRequirements::default(), - predictability, - invocations: 1, - execute_at: None, - time_selection: TimeSelection::default(), - } - } - - fn workload( - batches: Vec, - repeating: Vec, - _data: DataWorkload, - ) -> QueryWorkload { - QueryWorkload { - language: QueryLanguage::PromQL, - query_batch: (!batches.is_empty()).then_some(batches), - repeating_queries: (!repeating.is_empty()).then_some(repeating), - } - } - - fn at_rest() -> DataWorkload { - DataWorkload { - arrival: DataArrival::AtRest, - data_ingestion_interval: Evidence { - value: Some(DurationMs(1_000)), - ..Default::default() - }, - ..Default::default() - } - } - - fn continuous(observed_at_ms: u64, valid_for_ms: u64) -> DataWorkload { - DataWorkload { - arrival: DataArrival::ContinuouslyIngesting, - data_ingestion_interval: Evidence { - value: Some(DurationMs(1_000)), - ..Default::default() - }, - ingestion_rate: Evidence { - value: Some(Rate(1.0)), - source: EvidenceSource::Observed, - observed_at_ms: Some(observed_at_ms), - valid_for_ms: Some(valid_for_ms), - }, - ..Default::default() - } - } - - fn repeating() -> RepeatingEntry { - RepeatingEntry { - query: Query("sum(m)".into()), - demand: RepeatedDemand::FixedInterval(RepetitionInterval(1_000)), - requirements: QueryRequirements::default(), - predictability: Predictability::Predictable { known_at: None }, - time_selection: TimeSelection::default(), - } - } - - fn selected_summary_maintenance_lifecycle( - deployment: &SummaryMaintenanceDeployment, - ) -> Option<&SummaryMaintenanceLifecycle> { - deployment - .summary_maintenance_lifecycle_guarantee - .as_ref() - .map(|guarantee| &guarantee.summary_maintenance_lifecycle) - } - - #[test] - fn fixed_interval_reads_use_the_physical_horizon_multiplicity() { - let mut query = repeating(); - query.demand = RepeatedDemand::FixedInterval(RepetitionInterval(600)); - let workload = workload(vec![], vec![query], at_rest()); - - let facts = - workload_facts(&workload, Some(&at_rest()), &[0], 0, Some(Horizon(1.0))).unwrap(); - - assert_eq!(facts.reads, Some(1.0)); - } - - #[test] - fn unpredictable_one_time_at_rest_selects_ephemeral() { - let plan = plan_summary_maintenance_lifecycles( - summary(), - WorkloadDemand::new_without_data( - &workload(vec![batch(Predictability::AdHoc)], vec![], at_rest()), - &[0], - ), - 1_000, - None, - SummaryMaintenanceLifecycleCapabilities::ALL, - &UnitCosts, - ) - .unwrap(); - assert_eq!(plan.deployments.len(), 1); - assert_eq!( - selected_summary_maintenance_lifecycle(&plan.deployments[0]), - Some(&SummaryMaintenanceLifecycle::Ephemeral) - ); - let guarantee = plan.deployments[0] - .summary_maintenance_lifecycle_guarantee - .as_ref() - .unwrap(); - assert_eq!(guarantee.evaluation_schedule, EvaluationSchedule::OneShot); - assert_eq!( - guarantee.summary_maintenance_mode, - SummaryMaintenanceMode::DirectBuild - ); - assert_eq!( - guarantee.output_representation, - OutputRepresentation::SummaryState - ); - assert_eq!( - plan.deployments[0].alternatives[0].total_cost, - Some(Cost(12.0)) - ); - } - - #[test] - fn predictable_scheduled_one_time_offers_prepared_state() { - let mut entry = batch(Predictability::Predictable { - known_at: Some(TimestampMs(1_000)), - }); - entry.execute_at = Some(TimestampMs(11_000)); - let plan = plan_summary_maintenance_lifecycles( - summary(), - WorkloadDemand::new_with_data( - &workload(vec![entry], vec![], at_rest()), - &at_rest(), - &[0], - ), - 1_000, - None, - SummaryMaintenanceLifecycleCapabilities::ALL, - &UnitCosts, - ) - .unwrap(); - let prepared = &plan.deployments[0].alternatives[1]; - assert!(prepared.rejection.is_none()); - assert_eq!(prepared.total_cost, Some(Cost(13.0))); - } - - #[test] - fn prepared_state_starts_no_earlier_than_planning_time() { - let mut entry = batch(Predictability::Predictable { - known_at: Some(TimestampMs(1_000)), - }); - entry.execute_at = Some(TimestampMs(11_000)); - let plan = plan_summary_maintenance_lifecycles( - summary(), - WorkloadDemand::new_with_data( - &workload(vec![entry], vec![], at_rest()), - &at_rest(), - &[0], - ), - 6_000, - None, - SummaryMaintenanceLifecycleCapabilities::ALL, - &UnitCosts, - ) - .unwrap(); - let prepared = &plan.deployments[0].alternatives[1]; - assert_eq!( - prepared.summary_maintenance_lifecycle, - SummaryMaintenanceLifecycle::Prepared { - activate_at: TimestampMs(6_000), - retire_at: TimestampMs(11_000), - } - ); - assert_eq!(prepared.total_cost, Some(Cost(12.5))); - } - - #[test] - fn expired_one_time_execution_cannot_select_prepared_state() { - let mut entry = batch(Predictability::Predictable { - known_at: Some(TimestampMs(1_000)), - }); - entry.execute_at = Some(TimestampMs(2_000)); - let plan = plan_summary_maintenance_lifecycles( - summary(), - WorkloadDemand::new_without_data(&workload(vec![entry], vec![], at_rest()), &[0]), - 3_000, - None, - SummaryMaintenanceLifecycleCapabilities::ALL, - &UnitCosts, - ) - .unwrap(); - assert_eq!( - plan.deployments[0].alternatives[1].rejection, - Some(SummaryMaintenanceLifecycleRejection::RequiresPredictableOneTimeQuery) - ); - } - - #[test] - fn nested_summary_lifecycles_have_compatible_evaluation_schedules() { - let workload = workload(vec![], vec![repeating()], continuous(1_000, 20_000)); - let plan = plan_summary_maintenance_lifecycles( - nested_summary(), - WorkloadDemand::new_without_data(&workload, &[0]), - 1_000, - Some(Horizon(10.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &IncompatibleNestedCosts, - ) - .unwrap(); - - assert_eq!(plan.deployments.len(), 2); - let schedules: HashSet<_> = plan - .deployments - .iter() - .map(|deployment| { - deployment - .summary_maintenance_lifecycle_guarantee - .as_ref() - .unwrap() - .evaluation_schedule - }) - .collect(); - assert_eq!(schedules.len(), 1); - } - - #[test] - fn repeated_at_rest_selects_shared_without_inventing_updates() { - let plan = plan_summary_maintenance_lifecycles( - summary(), - WorkloadDemand::new_with_data( - &workload(vec![], vec![repeating()], at_rest()), - &at_rest(), - &[0], - ), - 1_000, - Some(Horizon(10.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &UnitCosts, - ) - .unwrap(); - assert_eq!( - selected_summary_maintenance_lifecycle(&plan.deployments[0]), - Some(&SummaryMaintenanceLifecycle::Shared { - retention: DurationMs(10_000) - }) - ); - assert_eq!( - plan.deployments[0] - .summary_maintenance_lifecycle_guarantee - .as_ref() - .unwrap() - .summary_maintenance_mode, - SummaryMaintenanceMode::DirectBuild - ); - assert_eq!( - plan.deployments[0].alternatives[3].rejection, - Some(SummaryMaintenanceLifecycleRejection::RequiresContinuousData) - ); - assert_eq!(plan.update_rate, None); - } - - #[test] - fn repeated_continuous_workload_can_select_continuous_maintenance() { - let capabilities = SummaryMaintenanceLifecycleCapabilities { - supports_shared: false, - ..SummaryMaintenanceLifecycleCapabilities::ALL - }; - let plan = plan_summary_maintenance_lifecycles( - summary(), - WorkloadDemand::new_with_data( - &workload(vec![], vec![repeating()], continuous(1_000, 60_000)), - &continuous(1_000, 60_000), - &[0], - ), - 1_000, - Some(Horizon(10.0)), - capabilities, - &UnitCosts, - ) - .unwrap(); - assert_eq!( - selected_summary_maintenance_lifecycle(&plan.deployments[0]), - Some(&SummaryMaintenanceLifecycle::ContinuouslyMaintained) - ); - assert_eq!( - plan.deployments[0] - .summary_maintenance_lifecycle_guarantee - .as_ref() - .unwrap() - .summary_maintenance_mode, - SummaryMaintenanceMode::Incremental - ); - assert_eq!(plan.evaluation_rate, Some(EvaluationRate(1.0))); - assert_eq!(plan.update_rate, Some(UpdateRate(1.0))); - } - - #[test] - fn stale_ingestion_evidence_cannot_enable_continuous_maintenance() { - let plan = plan_summary_maintenance_lifecycles( - summary(), - WorkloadDemand::new_with_data( - &workload(vec![], vec![repeating()], continuous(1_000, 1_000)), - &continuous(1_000, 1_000), - &[0], - ), - 3_000, - Some(Horizon(10.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &UnitCosts, - ) - .unwrap(); - assert_eq!( - plan.deployments[0].alternatives[3].rejection, - Some(SummaryMaintenanceLifecycleRejection::MissingOrStaleIngestionRate) - ); - assert_eq!(plan.update_rate, None); - } - - #[test] - fn unknown_costs_do_not_make_a_long_lived_lifecycle_win() { - let plan = plan_summary_maintenance_lifecycles( - summary(), - WorkloadDemand::new_without_data( - &workload(vec![], vec![repeating()], continuous(1_000, 60_000)), - &[0], - ), - 1_000, - Some(Horizon(10.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &crate::cost_model::DefaultCostModel, - ) - .unwrap(); - assert_eq!( - selected_summary_maintenance_lifecycle(&plan.deployments[0]), - None - ); - assert!(plan.deployments[0] - .alternatives - .iter() - .all(|alternative| alternative.rejection.is_some())); - } - - #[test] - fn unrelated_workload_entries_do_not_create_reuse_for_a_target() { - let plan = plan_summary_maintenance_lifecycles( - summary(), - WorkloadDemand::new_without_data( - &workload( - vec![batch(Predictability::AdHoc), batch(Predictability::AdHoc)], - vec![], - at_rest(), - ), - &[0], - ), - 1_000, - Some(Horizon(10.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &UnitCosts, - ) - .unwrap(); - assert_eq!( - selected_summary_maintenance_lifecycle(&plan.deployments[0]), - Some(&SummaryMaintenanceLifecycle::Ephemeral) - ); - assert_eq!( - plan.deployments[0].alternatives[2].rejection, - Some(SummaryMaintenanceLifecycleRejection::RequiresMultipleReads) - ); - } - - #[test] - fn scheduled_rate_counts_only_executions_inside_the_horizon() { - let mut entry = repeating(); - entry.demand = RepeatedDemand::Scheduled(vec![ - TimestampMs(999), - TimestampMs(5_000), - TimestampMs(20_000), - ]); - let plan = plan_summary_maintenance_lifecycles( - summary(), - WorkloadDemand::new_without_data(&workload(vec![], vec![entry], at_rest()), &[0]), - 1_000, - Some(Horizon(10.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &UnitCosts, - ) - .unwrap(); - assert_eq!(plan.evaluation_rate, Some(EvaluationRate(0.1))); - } - - #[test] - fn demand_binding_rejects_empty_and_duplicate_entries() { - let workload = workload(vec![batch(Predictability::AdHoc)], vec![], at_rest()); - assert!(matches!( - plan_summary_maintenance_lifecycles( - summary(), - WorkloadDemand::new_without_data(&workload, &[]), - 1_000, - None, - SummaryMaintenanceLifecycleCapabilities::ALL, - &UnitCosts, - ), - Err(SummaryMaintenanceLifecyclePlanError::EmptyWorkloadDemand) - )); - assert!(matches!( - plan_summary_maintenance_lifecycles( - summary(), - WorkloadDemand::new_without_data(&workload, &[0, 0]), - 1_000, - None, - SummaryMaintenanceLifecycleCapabilities::ALL, - &UnitCosts, - ), - Err(SummaryMaintenanceLifecyclePlanError::DuplicateWorkloadEntry { index: 0 }) - )); - } - - #[test] - fn prepared_requires_every_bound_consumer_to_be_scheduled_and_predictable() { - let mut predictable = batch(Predictability::Predictable { - known_at: Some(TimestampMs(1_000)), - }); - predictable.execute_at = Some(TimestampMs(2_000)); - let workload = workload( - vec![predictable, batch(Predictability::AdHoc)], - vec![], - at_rest(), - ); - let plan = plan_summary_maintenance_lifecycles( - summary(), - WorkloadDemand::new_without_data(&workload, &[0, 1]), - 1_000, - Some(Horizon(10.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &UnitCosts, - ) - .unwrap(); - assert_eq!( - plan.deployments[0].alternatives[1].rejection, - Some(SummaryMaintenanceLifecycleRejection::RequiresPredictableOneTimeQuery) - ); - } - - #[test] - fn moving_realtime_maintenance_requires_summary_deletion_support() { - let mut entry = repeating(); - entry.time_selection = TimeSelection { - scope: asap_types::workload::QueryTimeScope::RealTime, - lookback: Some(DurationMs(60_000)), - as_of: None, - }; - let plan = plan_summary_maintenance_lifecycles( - summary(), - WorkloadDemand::new_with_data( - &workload(vec![], vec![entry], continuous(1_000, 60_000)), - &continuous(1_000, 60_000), - &[0], - ), - 1_000, - Some(Horizon(10.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &NoDelete, - ) - .unwrap(); - assert_eq!( - plan.deployments[0].alternatives[3].rejection, - Some(SummaryMaintenanceLifecycleRejection::SummaryDoesNotSupportDeletion) - ); - } - - #[test] - fn lifecycle_cost_can_fall_back_to_raw_recomputation() { - let target = sum_query(); - let space = crate::replacement::search_workload(vec![("q", Rc::clone(&target))]); - let selection = space.global_selection(&RawCheaper); - let workload = workload(vec![batch(Predictability::AdHoc)], vec![], at_rest()); - let plan = assemble_selected_dag_with_summary_maintenance_lifecycles( - &selection, - &space.roots[0].1, - WorkloadDemand::new_without_data(&workload, &[0]), - 1_000, - None, - SummaryMaintenanceLifecycleCapabilities::ALL, - &RawCheaper, - ) - .unwrap() - .unwrap(); - assert!(plan.selected_raw_recompute); - assert_eq!(plan.raw_recompute_total_cost, Some(Cost(1.0))); - assert_eq!(plan.summary_total_cost, None); - assert!(plan.deployments.is_empty()); - assert!(matches!(plan.root.expr, SummaryExpr::KeepPreAsap(_))); - - let exported = - crate::summary_maintenance_dag_export::export_summary_maintenance_plan(&plan); - assert!(exported.selected_raw_recompute); - assert_eq!(exported.raw_recompute_total_cost, Some(1.0)); - assert_eq!(exported.summary_total_cost, None); - assert!(exported.deployments.is_empty()); - } - - #[test] - fn whole_candidate_cost_is_evaluated_before_selecting_a_lifecycle() { - let root = summary(); - let mut deployments = vec![SummaryMaintenanceDeployment { - post_asap_node_id: PostAsapNodeId(0), - summary: Rc::clone(&root), - summary_maintenance_lifecycle_guarantee: None, - selected_window_framework: None, - alternatives: vec![ - SummaryMaintenanceLifecycleAlternative { - summary_maintenance_lifecycle: SummaryMaintenanceLifecycle::Ephemeral, - total_cost: Some(Cost(1.0)), - rejection: None, - assumptions: vec![], - }, - SummaryMaintenanceLifecycleAlternative { - summary_maintenance_lifecycle: - SummaryMaintenanceLifecycle::ContinuouslyMaintained, - total_cost: Some(Cost(10.0)), - rejection: None, - assumptions: vec![], - }, - ], - }]; - - let total = select_complete_lifecycle_combination( - &root, - &mut deployments, - &[0], - DataArrival::ContinuouslyIngesting, - &WholeCandidatePrefersContinuous, - None, - Some(Horizon(10.0)), - Some(2.0), - &[], - ); - - assert_eq!(total.map(|estimate| estimate.cost), Some(Cost(1.0))); - assert!(matches!( - deployments[0] - .summary_maintenance_lifecycle_guarantee - .as_ref() - .unwrap() - .summary_maintenance_lifecycle, - SummaryMaintenanceLifecycle::ContinuouslyMaintained - )); - } - - #[test] - fn complete_lifecycle_enumeration_fails_closed_above_safe_bound() { - let root = summary(); - let alternatives = vec![ - SummaryMaintenanceLifecycleAlternative { - summary_maintenance_lifecycle: SummaryMaintenanceLifecycle::Ephemeral, - total_cost: Some(Cost(1.0)), - rejection: None, - assumptions: vec![], - }, - SummaryMaintenanceLifecycleAlternative { - summary_maintenance_lifecycle: SummaryMaintenanceLifecycle::ContinuouslyMaintained, - total_cost: Some(Cost(2.0)), - rejection: None, - assumptions: vec![], - }, - ]; - let mut deployments: Vec<_> = (0..13) - .map(|summary_index| SummaryMaintenanceDeployment { - post_asap_node_id: PostAsapNodeId(summary_index as u32), - summary: Rc::clone(&root), - summary_maintenance_lifecycle_guarantee: None, - selected_window_framework: None, - alternatives: alternatives.clone(), - }) - .collect(); - assert_eq!( - select_complete_lifecycle_combination( - &root, - &mut deployments, - &(0..13).collect::>(), - DataArrival::ContinuouslyIngesting, - &WholeCandidatePrefersContinuous, - None, - Some(Horizon(10.0)), - Some(2.0), - &[], - ), - None - ); - assert!(deployments - .iter() - .all(|deployment| deployment.summary_maintenance_lifecycle_guarantee.is_none())); - } - - #[test] - fn materialization_falls_back_to_raw_when_raw_cost_is_unavailable() { - let target = quantile_query(); - let space = crate::replacement::search_workload(vec![("q", target)]); - let selection = space.global_selection(&UnitCosts); - let workload = workload(vec![batch(Predictability::AdHoc)], vec![], at_rest()); - let plan = assemble_selected_dag_with_summary_maintenance_lifecycles( - &selection, - &space.roots[0].1, - WorkloadDemand::new_without_data(&workload, &[0]), - 1_000, - None, - SummaryMaintenanceLifecycleCapabilities::ALL, - &UnitCosts, - ) - .unwrap() - .unwrap(); - assert!(plan.selected_raw_recompute); - assert!(plan.raw_recompute_total_cost.is_none()); - assert!(matches!(plan.root.expr, SummaryExpr::KeepPreAsap(_))); - } - - #[test] - fn unmatched_target_is_reported_as_raw_recomputation() { - let target = query_root(); - let space = crate::replacement::search_workload(vec![("q", Rc::clone(&target))]); - let selection = space.global_selection(&RawCheaper); - let workload = workload(vec![batch(Predictability::AdHoc)], vec![], at_rest()); - let plan = assemble_selected_dag_with_summary_maintenance_lifecycles( - &selection, - &space.roots[0].1, - WorkloadDemand::new_without_data(&workload, &[0]), - 1_000, - None, - SummaryMaintenanceLifecycleCapabilities::ALL, - &RawCheaper, - ) - .unwrap() - .unwrap(); - - assert!(plan.selected_raw_recompute); - assert_eq!(plan.raw_recompute_total_cost, Some(Cost(1.0))); - assert_eq!(plan.summary_total_cost, None); - assert!(plan.deployments.is_empty()); - assert!(matches!(plan.root.expr, SummaryExpr::KeepPreAsap(_))); - } - - #[test] - fn lifecycle_cost_reorders_semantic_summary_candidates_before_materialization() { - let target = quantile_query(); - let space = crate::replacement::search_workload(vec![("q", target)]); - let workload = workload(vec![batch(Predictability::AdHoc)], vec![], at_rest()); - - let selection = global_selection_with_summary_maintenance_lifecycles( - &space, - WorkloadDemand::new_with_data(&workload, &at_rest(), &[0]), - 1_000, - None, - SummaryMaintenanceLifecycleCapabilities::ALL, - &SummaryMaintenancePrefersDdSketch, - ) - .unwrap(); - let materialized = selection - .assemble_selected_dag(&space.roots[0].1) - .unwrap() - .unwrap(); - - assert_eq!( - sketch_algorithm(&materialized), - Some(SketchAlgorithm::DDSketch) - ); - } - - #[test] - fn lifecycle_cost_counts_one_shared_summary_node_once() { - let shared = summary(); - let root = Rc::new(SummaryNode { - expr: SummaryExpr::SummaryMerge { - timing: asap_types::post_asap::ExecutionTiming::IngestionTime, - children: vec![Rc::clone(&shared), Rc::clone(&shared)], - }, - schema: shared.schema.clone(), - guarantee: None, - }); - let workload = workload( - vec![batch(Predictability::AdHoc), batch(Predictability::AdHoc)], - vec![], - at_rest(), - ); - let horizon = Some(Horizon(10.0)); - let plan = plan_summary_maintenance_lifecycles( - root, - WorkloadDemand::new_with_data(&workload, &at_rest(), &[0, 1]), - 1_000, - horizon, - SummaryMaintenanceLifecycleCapabilities::ALL, - &UnitCosts, - ) - .unwrap(); - assert_eq!(plan.deployments.len(), 1); - assert!(matches!( - selected_summary_maintenance_lifecycle(&plan.deployments[0]), - Some(SummaryMaintenanceLifecycle::Shared { .. }) - )); - } - - /// A state costs 10 however often it is read. Recomputing p50 raw costs - /// 1 and p99 costs 8. - struct P50PrefersRaw; - - impl CostModel for P50PrefersRaw { - fn rank_candidates( - &self, - _intent: &AggIntent, - candidates: &[SketchAlgorithm], - ) -> Vec { - candidates.to_vec() - } - - fn summary_maintenance_lifecycle_cost_inputs( - &self, - _summary: &SummaryNode, - ) -> SummaryMaintenanceLifecycleCostInputs { - SummaryMaintenanceLifecycleCostInputs { - build_cost: Some(Cost(10.0)), - maintenance_cost_per_update: Some(Cost::ZERO), - summary_read_cost: Some(Cost::ZERO), - retention_cost_rate: Some(CostRate(0.0)), - retirement_cost: Some(Cost::ZERO), - } - } - - fn summary_maintenance_capabilities( - &self, - summary: &SummaryNode, - ) -> SummaryMaintenanceCapabilities { - UnitCosts.summary_maintenance_capabilities(summary) - } - - fn raw_query_recompute_total_cost( - &self, - target: &QueryExpr, - _expected_reads: f64, - ) -> Option { - match target { - QueryExpr::Aggregate { measures, .. } => match measures[..] { - [AggIntent::Quantile { q: 0.5, .. }] => Some(Cost(1.0)), - _ => Some(Cost(8.0)), - }, - _ => None, - } - } - } - - /// p50 and p99 form a sharing class over one state (5 each), but p50's - /// raw recompute (1) still wins. The class reverts, so p99 is reselected - /// at its independent cost (10) and recomputes raw (8), as it does alone. - /// Checked at selection: the assembled plan's own raw comparison would - /// recompute p99 raw either way. - #[test] - fn sharing_class_reverts_when_a_member_selects_elsewhere() { - let quantile = |q| { - Rc::new(QueryExpr::Aggregate { - reduction: Reduction::by(vec![]), - measures: vec![AggIntent::Quantile { - col: None, - q, - accuracy: AccuracyTarget::Epsilon(0.1), - }], - // A shared output name keeps p50 and p99 on one state. - output_names: vec!["value".into()], - filters: vec![], - having: None, - child: query_root(), - }) - }; - let workload = workload(vec![], vec![repeating(), repeating()], at_rest()); - // Whether each root selected a summary rather than raw recompute. - let summaries = |space: &CandidateLogicalASAPDAGs<&str>, entries: &[usize]| { - let selection = global_selection_with_summary_maintenance_lifecycles( - space, - WorkloadDemand::new_with_data(&workload, &at_rest(), entries), - 1_000, - Some(Horizon(10.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &P50PrefersRaw, - ) - .unwrap(); - space - .roots - .iter() - .map(|(_, target)| selection.for_target(target).unwrap().chosen.is_some()) - .collect::>() - }; - - let space = crate::replacement::search_workload(vec![ - ("p50", quantile(0.5)), - ("p99", quantile(0.99)), - ]); - let alone = crate::replacement::search_workload(vec![("p99", quantile(0.99))]); - assert_eq!(summaries(&space, &[0, 1]), vec![false, false]); - assert_eq!(summaries(&alone, &[1]), vec![false]); - } - - #[test] - fn normalized_workload_drives_candidate_logical_asap_dags_recurrence_profiles() { - let root = query_root(); - let space = crate::replacement::search_workload(vec![("dashboard", Rc::clone(&root))]); - let workload = workload(vec![], vec![repeating()], continuous(1_000, 60_000)); - let profiles = space - .recurrence_profiles_from_workload( - &workload, - Some(&continuous(1_000, 60_000)), - &[0], - 1_000, - Some(Horizon(10.0)), - ) - .unwrap(); - // `search_workload` canonicalizes roots through CSE; recurrence - // profiles are keyed by that canonical post-CSE node. - let profile = profiles.for_target(&space.roots[0].1); - assert_eq!(profile.evaluation_rate, Some(EvaluationRate(1.0))); - assert_eq!(profile.update_rate, Some(UpdateRate(1.0))); - assert_eq!(profile.one_shot_consumers, 0); - } - - #[test] - fn recurrence_binding_is_explicit_when_root_order_differs_from_workload_order() { - let repeating_root = query_root_for("dashboard"); - let batch_root = query_root_for("batch"); - let space = crate::replacement::search_workload(vec![ - ("dashboard", repeating_root), - ("batch", batch_root), - ]); - let workload = workload( - vec![batch(Predictability::AdHoc)], - vec![repeating()], - at_rest(), - ); - let profiles = space - .recurrence_profiles_from_workload(&workload, None, &[1, 0], 1_000, Some(Horizon(10.0))) - .unwrap(); - let dashboard = profiles.for_target(&space.roots[0].1); - let batch = profiles.for_target(&space.roots[1].1); - assert_eq!(dashboard.evaluation_rate, Some(EvaluationRate(1.0))); - assert_eq!(dashboard.one_shot_consumers, 0); - assert_eq!(batch.evaluation_rate, None); - assert_eq!(batch.one_shot_consumers, 1); - } - - fn continuous_candidates<'a>( - workload: &QueryWorkload, - data: &DataWorkload, - model: &'a dyn CostModel, - ) -> SummaryMaintenanceLifecycleCandidates<'a> { - enumerate_summary_maintenance_lifecycles( - summary(), - WorkloadDemand::new_with_data(workload, data, &[0]), - 1_000, - Some(Horizon(10.0)), - SummaryMaintenanceLifecycleCapabilities { - supports_shared: false, - ..SummaryMaintenanceLifecycleCapabilities::ALL - }, - model, - ) - .unwrap() - } - - fn choose( - candidates: &SummaryMaintenanceLifecycleCandidates<'_>, - lifecycle: SummaryMaintenanceLifecycle, - ) -> Vec<(PostAsapNodeId, SummaryMaintenanceLifecycle)> { - candidates - .deployments() - .iter() - .map(|deployment| (deployment.post_asap_node_id, lifecycle.clone())) - .collect() - } - - // Enumeration reports all four lifecycle kinds with their rejections and - // selects nothing. - #[test] - fn enumeration_exposes_every_lifecycle_without_selecting() { - let data = continuous(1_000, 60_000); - let workload = workload(vec![], vec![repeating()], data.clone()); - let candidates = continuous_candidates(&workload, &data, &UnitCosts); - let [deployment] = candidates.deployments() else { - panic!("one summary state"); - }; - assert_eq!(deployment.summary_maintenance_lifecycle_guarantee, None); - assert_eq!(deployment.selected_window_framework, None); - let outcome: Vec<_> = deployment - .alternatives - .iter() - .map(|alternative| { - ( - &alternative.summary_maintenance_lifecycle, - alternative.rejection.clone(), - alternative.total_cost.is_some(), - ) - }) - .collect(); - assert!(matches!( - outcome.as_slice(), - [ - (SummaryMaintenanceLifecycle::Ephemeral, None, true), - ( - SummaryMaintenanceLifecycle::Prepared { .. }, - Some(SummaryMaintenanceLifecycleRejection::RequiresPredictableOneTimeQuery), - false - ), - ( - SummaryMaintenanceLifecycle::Shared { .. }, - Some(SummaryMaintenanceLifecycleRejection::UnsupportedByRuntime), - false - ), - ( - SummaryMaintenanceLifecycle::ContinuouslyMaintained, - None, - true - ), - ] - )); - let guarantee = candidates.guarantee(&SummaryMaintenanceLifecycle::ContinuouslyMaintained); - assert_eq!( - guarantee.summary_maintenance_mode, - SummaryMaintenanceMode::Incremental - ); - assert_eq!(guarantee.evaluation_schedule, EvaluationSchedule::PerUpdate); - } - - // Explicitly choosing Planner's own selection reproduces Planner's plan. - #[test] - fn explicit_choice_of_planner_selection_reproduces_planner_plan() { - let data = continuous(1_000, 60_000); - let workload = workload(vec![], vec![repeating()], data.clone()); - let planned = plan_summary_maintenance_lifecycles( - summary(), - WorkloadDemand::new_with_data(&workload, &data, &[0]), - 1_000, - Some(Horizon(10.0)), - SummaryMaintenanceLifecycleCapabilities { - supports_shared: false, - ..SummaryMaintenanceLifecycleCapabilities::ALL - }, - &UnitCosts, - ) - .unwrap(); - let candidates = continuous_candidates(&workload, &data, &UnitCosts); - let choice = choose( - &candidates, - SummaryMaintenanceLifecycle::ContinuouslyMaintained, - ); - let chosen = candidates.select(&choice).unwrap(); - assert_eq!(format!("{chosen:?}"), format!("{planned:?}")); - } - - // A deployment may bind a legal alternative Planner's estimate does not - // prefer; the plan carries that alternative's guarantee and cost. - #[test] - fn explicit_choice_may_bind_a_costlier_legal_alternative() { - let data = continuous(1_000, 60_000); - let workload = workload(vec![], vec![repeating()], data.clone()); - let candidates = continuous_candidates(&workload, &data, &UnitCosts); - let ephemeral_cost = candidates.deployments()[0].alternatives[0].total_cost; - let choice = choose(&candidates, SummaryMaintenanceLifecycle::Ephemeral); - let plan = candidates.select(&choice).unwrap(); - assert_eq!( - selected_summary_maintenance_lifecycle(&plan.deployments[0]), - Some(&SummaryMaintenanceLifecycle::Ephemeral) - ); - assert_eq!(plan.summary_total_cost, ephemeral_cost); - } - - // Choices that Planner could not select, or that do not cover exactly the - // enumerated states, are refused rather than bound. - #[test] - fn explicit_choice_rejects_illegal_or_incomplete_choices() { - use SummaryMaintenanceLifecycleChoiceError as E; - let data = continuous(1_000, 60_000); - let workload = workload(vec![], vec![repeating()], data.clone()); - let select = |model: &dyn CostModel, choice: &dyn Fn(PostAsapNodeId) -> Vec<_>| { - let candidates = continuous_candidates(&workload, &data, model); - let id = candidates.deployments()[0].post_asap_node_id; - (id, candidates.select(&choice(id)).unwrap_err()) - }; - let shared = SummaryMaintenanceLifecycle::Shared { - retention: DurationMs(10_000), - }; - let (id, error) = select(&UnitCosts, &|id| vec![(id, shared.clone())]); - assert_eq!( - error, - E::Rejected { - post_asap_node_id: id, - rejection: Some(SummaryMaintenanceLifecycleRejection::UnsupportedByRuntime), - } - ); - let continuous = SummaryMaintenanceLifecycle::ContinuouslyMaintained; - let (id, error) = select(&crate::cost_model::DefaultCostModel, &|id| { - vec![(id, SummaryMaintenanceLifecycle::Ephemeral)] - }); - assert_eq!( - error, - E::Rejected { - post_asap_node_id: id, - rejection: Some(SummaryMaintenanceLifecycleRejection::MissingCostEvidence), - } - ); - let (id, error) = select(&UnitCosts, &|id| { - vec![( - id, - SummaryMaintenanceLifecycle::Shared { - retention: DurationMs(1), - }, - )] - }); - assert_eq!(error, E::NotAnAlternative(id)); - let (id, error) = select(&UnitCosts, &|_| vec![]); - assert_eq!(error, E::MissingChoice(id)); - let (id, error) = select(&UnitCosts, &|id| { - vec![(id, continuous.clone()), (id, continuous.clone())] - }); - assert_eq!(error, E::DuplicateChoice(id)); - let (_, error) = select(&UnitCosts, &|_| { - vec![(PostAsapNodeId(u32::MAX), continuous.clone())] - }); - assert_eq!(error, E::UnknownSummary(PostAsapNodeId(u32::MAX))); - } - - // Nested states on one maintenance path must share an evaluation schedule. - #[test] - fn explicit_choice_rejects_incompatible_nested_schedules() { - let workload = workload(vec![], vec![repeating()], continuous(1_000, 20_000)); - let candidates = enumerate_summary_maintenance_lifecycles( - nested_summary(), - WorkloadDemand::new_with_data(&workload, &continuous(1_000, 20_000), &[0]), - 1_000, - Some(Horizon(10.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &IncompatibleNestedCosts, - ) - .unwrap(); - let [outer, inner] = candidates.deployments() else { - panic!("two summary states"); - }; - let choice = vec![ - ( - outer.post_asap_node_id, - SummaryMaintenanceLifecycle::Ephemeral, - ), - ( - inner.post_asap_node_id, - SummaryMaintenanceLifecycle::ContinuouslyMaintained, - ), - ]; - assert_eq!( - candidates.select(&choice).unwrap_err(), - SummaryMaintenanceLifecycleChoiceError::IncompatibleEvaluationSchedules - ); - } - - // A multi-summary root yields one candidate entry per unique state, with - // a shared `Rc` state listed once. - #[test] - fn enumeration_lists_each_unique_summary_state_once() { - let shared = summary(); - let root = Rc::new(SummaryNode { - expr: SummaryExpr::SummaryMerge { - timing: asap_types::post_asap::ExecutionTiming::IngestionTime, - children: vec![Rc::clone(&shared), Rc::clone(&shared), summary()], - }, - schema: shared.schema.clone(), - guarantee: None, - }); - let workload = workload(vec![batch(Predictability::AdHoc)], vec![], at_rest()); - let candidates = enumerate_summary_maintenance_lifecycles( - root, - WorkloadDemand::new_with_data(&workload, &at_rest(), &[0]), - 1_000, - None, - SummaryMaintenanceLifecycleCapabilities::ALL, - &UnitCosts, - ) - .unwrap(); - let ids: HashSet<_> = candidates - .deployments() - .iter() - .map(|deployment| deployment.post_asap_node_id) - .collect(); - assert_eq!(candidates.deployments().len(), 2); - assert_eq!(ids.len(), 2); - assert!(candidates - .deployments() - .iter() - .any(|deployment| Rc::ptr_eq(&deployment.summary, &shared))); - } - - fn readout(state: &Rc) -> Rc { - Rc::new(SummaryNode { - expr: SummaryExpr::ValueOperation { - child: Rc::clone(state), - operation: ValueOperation::FinalizeExactAccumulator, - timing: ExecutionTiming::QueryTime, - }, - schema: Schema { - closed: true, - unique_keys: vec![], - fields: vec![Field { - table: None, - name: "value".into(), - dtype: FieldDataType::Plain(DataType::Float64), - nullable: false, - }], - time_index: None, - }, - guarantee: Some(ResultGuarantee::exact("sum")), - }) - } - - fn lifecycle_matching( - alternatives: &[SummaryMaintenanceLifecycleAlternative], - kind: fn(&SummaryMaintenanceLifecycle) -> bool, - ) -> SummaryMaintenanceLifecycle { - alternatives - .iter() - .map(|alternative| &alternative.summary_maintenance_lifecycle) - .find(|lifecycle| kind(lifecycle)) - .expect("lifecycle kind is an alternative") - .clone() - } - - /// Bind the lifecycle `choose` picks for every state of `root`, then - /// derive the timed DAG. - fn timed_dag( - root: Rc, - workload: &QueryWorkload, - data: &DataWorkload, - horizon: Option, - choose: impl Fn(&SummaryMaintenanceDeployment) -> SummaryMaintenanceLifecycle, - ) -> PostAsapDAG { - let candidates = enumerate_summary_maintenance_lifecycles( - root, - WorkloadDemand::new_with_data(workload, data, &[0]), - 1_000, - horizon, - SummaryMaintenanceLifecycleCapabilities::ALL, - &UnitCosts, - ) - .unwrap(); - let choice: Vec<_> = candidates - .deployments() - .iter() - .map(|deployment| (deployment.post_asap_node_id, choose(deployment))) - .collect(); - let dag = candidates - .select(&choice) - .unwrap() - .execution_timed_dag() - .unwrap(); - dag.validate().unwrap(); - dag - } - - /// Operator kinds in node-id order, each paired with its timing. - fn timings(dag: &PostAsapDAG) -> Vec<(&'static str, ExecutionTiming)> { - dag.nodes - .iter() - .map(|node| { - let kind = match node.payload { - PostAsapOperatorPayload::Fallback { .. } => "raw", - PostAsapOperatorPayload::SummaryAgg { .. } => "state", - PostAsapOperatorPayload::Value { .. } => "readout", - PostAsapOperatorPayload::Binary { .. } => "binary", - _ => "other", - }; - (kind, node.output_state.timing) - }) - .collect() - } - - const INGEST: ExecutionTiming = ExecutionTiming::IngestionTime; - const QUERY: ExecutionTiming = ExecutionTiming::QueryTime; - - // Every retained lifecycle kind runs its state and inputs at ingestion - // time and its readout at query time. - #[test] - fn retained_lifecycles_time_state_and_inputs_at_ingestion() { - let mut scheduled = batch(Predictability::Predictable { - known_at: Some(TimestampMs(1_000)), - }); - scheduled.execute_at = Some(TimestampMs(11_000)); - type Case = ( - QueryWorkload, - DataWorkload, - Option, - fn(&SummaryMaintenanceLifecycle) -> bool, - ); - let cases: [Case; 3] = [ - ( - workload(vec![], vec![repeating()], continuous(1_000, 60_000)), - continuous(1_000, 60_000), - Some(Horizon(10.0)), - |lifecycle| { - matches!( - lifecycle, - SummaryMaintenanceLifecycle::ContinuouslyMaintained - ) - }, - ), - ( - workload(vec![], vec![repeating()], at_rest()), - at_rest(), - Some(Horizon(10.0)), - |lifecycle| matches!(lifecycle, SummaryMaintenanceLifecycle::Shared { .. }), - ), - ( - workload(vec![scheduled], vec![], at_rest()), - at_rest(), - None, - |lifecycle| matches!(lifecycle, SummaryMaintenanceLifecycle::Prepared { .. }), - ), - ]; - for (workload, data, horizon, kind) in cases { - let dag = timed_dag( - readout(&summary()), - &workload, - &data, - horizon, - |deployment| lifecycle_matching(&deployment.alternatives, kind), - ); - assert_eq!( - timings(&dag), - [("raw", INGEST), ("state", INGEST), ("readout", QUERY)] - ); - } - } - - // An Ephemeral state, its raw input, and its readout all run at query time. - #[test] - fn ephemeral_lifecycle_times_state_and_downstream_at_query() { - let workload = workload(vec![batch(Predictability::AdHoc)], vec![], at_rest()); - let dag = timed_dag(readout(&summary()), &workload, &at_rest(), None, |_| { - SummaryMaintenanceLifecycle::Ephemeral - }); - assert_eq!( - timings(&dag), - [("raw", QUERY), ("state", QUERY), ("readout", QUERY)] - ); - } - - // One state read by two consumers is one deployment; its timing follows - // that single choice while both consumers run at query time. - #[test] - fn shared_state_is_timed_once_for_all_consumers() { - let state = summary(); - let lhs = readout(&state); - let rhs = Rc::new(lhs.as_ref().clone()); - let root = Rc::new(SummaryNode { - expr: SummaryExpr::BinaryOp { - lhs, - rhs, - operator: asap_types::post_asap::BinaryOperator { - kind: asap_types::pre_asap::BinaryOpKind::Arithmetic( - asap_types::pre_asap::ArithmeticOpKind::Add, - ), - vector_match: None, - checked_relative_division: false, - checked_finite_division: false, - }, - timing: QUERY, - }, - schema: readout(&state).schema.clone(), - guarantee: None, - }); - let data = continuous(1_000, 60_000); - let workload = workload(vec![], vec![repeating()], data.clone()); - let dag = timed_dag(root, &workload, &data, Some(Horizon(10.0)), |deployment| { - assert!(Rc::ptr_eq(&deployment.summary, &state)); - SummaryMaintenanceLifecycle::ContinuouslyMaintained - }); - assert_eq!( - timings(&dag), - [ - ("raw", INGEST), - ("state", INGEST), - ("readout", QUERY), - ("readout", QUERY), - ("binary", QUERY), - ] - ); - } - - // An Ephemeral state consumed by retained state is built on the retained - // state's ingestion path; it is not retained, but cannot run at query time. - #[test] - fn ephemeral_state_feeding_retained_state_runs_at_ingestion() { - let mut scheduled = batch(Predictability::Predictable { - known_at: Some(TimestampMs(1_000)), - }); - scheduled.execute_at = Some(TimestampMs(11_000)); - let root = nested_summary(); - let workload = workload(vec![scheduled], vec![], at_rest()); - let dag = timed_dag( - Rc::clone(&root), - &workload, - &at_rest(), - None, - |deployment| { - if Rc::ptr_eq(&deployment.summary, &root) { - lifecycle_matching(&deployment.alternatives, |lifecycle| { - matches!(lifecycle, SummaryMaintenanceLifecycle::Prepared { .. }) - }) - } else { - SummaryMaintenanceLifecycle::Ephemeral - } - }, - ); - assert_eq!( - timings(&dag), - [("raw", INGEST), ("state", INGEST), ("state", INGEST)] - ); - } - - // Timing is not derived for a state without a selected lifecycle, and a - // raw-recompute plan runs entirely at query time. - #[test] - fn timing_requires_a_selected_lifecycle_for_every_state() { - let workload = workload(vec![batch(Predictability::AdHoc)], vec![], at_rest()); - let data = at_rest(); - let demand = WorkloadDemand::new_with_data(&workload, &data, &[0]); - let plan = plan_summary_maintenance_lifecycles( - readout(&summary()), - demand, - 1_000, - None, - SummaryMaintenanceLifecycleCapabilities::ALL, - &crate::cost_model::DefaultCostModel, - ) - .unwrap(); - assert_eq!( - plan.execution_timed_dag().unwrap_err(), - SummaryMaintenanceTimingError::UnselectedLifecycle( - plan.deployments[0].post_asap_node_id - ) - ); - let raw = plan_summary_maintenance_lifecycles( - crate::replacement::keep_pre_asap(&sum_query()).unwrap(), - demand, - 1_000, - None, - SummaryMaintenanceLifecycleCapabilities::ALL, - &UnitCosts, - ) - .unwrap(); - assert_eq!( - timings(&raw.execution_timed_dag().unwrap()), - [("raw", QUERY)] - ); - } - - /// A strategy-built `sum(a)` over one maintained current-series population. - fn population_readout() -> Rc { - let target = Rc::new(crate::test_support::lower_promql( - "sum(a)", - AccuracyTarget::Exact, - )); - crate::maintained_population::MaintainedPopulationStrategy::new(std::slice::from_ref( - &target, - )) - .candidate(&target) - .unwrap() - } - - fn is_population(node: &SummaryNode) -> bool { - matches!( - node.expr, - SummaryExpr::ValueOperation { - operation: ValueOperation::MaintainPopulation { .. }, - .. - } - ) - } - - fn population_timings(dag: &PostAsapDAG) -> Vec<(&'static str, ExecutionTiming)> { - dag.nodes - .iter() - .zip(timings(dag)) - .map(|(node, (kind, timing))| match node.payload { - PostAsapOperatorPayload::Value { - operation: ValueOperation::MaintainPopulation { .. }, - } => ("population", timing), - _ => (kind, timing), - }) - .collect() - } - - // A maintained population is enumerated as retained state, with costs - // from the caller's model for both the maintained and the rebuilt choice. - #[test] - fn enumeration_includes_maintained_population() { - let data = continuous(1_000, 60_000); - let workload = workload(vec![], vec![repeating()], data.clone()); - let candidates = enumerate_summary_maintenance_lifecycles( - population_readout(), - WorkloadDemand::new_with_data(&workload, &data, &[0]), - 1_000, - Some(Horizon(10.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &UnitCosts, - ) - .unwrap(); - let [deployment] = candidates.deployments() else { - panic!("one population state"); - }; - assert!(is_population(&deployment.summary)); - let cost = |lifecycle: SummaryMaintenanceLifecycle| { - deployment - .alternatives - .iter() - .find(|alternative| alternative.summary_maintenance_lifecycle == lifecycle) - .and_then(|alternative| alternative.total_cost) - }; - // Ephemeral: (build 10 + read 1 + retire 1) x 10 reads. Maintained over - // 10 s at 1 update/s: build 10 + updates 10 + reads 10 + retention 1 + retire 1. - assert_eq!( - cost(SummaryMaintenanceLifecycle::Ephemeral), - Some(Cost(120.0)) - ); - assert_eq!( - cost(SummaryMaintenanceLifecycle::ContinuouslyMaintained), - Some(Cost(32.0)) - ); - } - - // Without cost evidence a population's alternatives stay unknown: Planner - // selects none and timing is refused rather than guessed. - #[test] - fn population_without_cost_evidence_stays_unselected() { - let data = continuous(1_000, 60_000); - let workload = workload(vec![], vec![repeating()], data.clone()); - let plan = plan_summary_maintenance_lifecycles( - population_readout(), - WorkloadDemand::new_with_data(&workload, &data, &[0]), - 1_000, - Some(Horizon(10.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &crate::cost_model::DefaultCostModel, - ) - .unwrap(); - let [deployment] = plan.deployments.as_slice() else { - panic!("one population state"); - }; - assert!(deployment - .alternatives - .iter() - .all(|alternative| alternative.total_cost.is_none())); - assert!(deployment.summary_maintenance_lifecycle_guarantee.is_none()); - assert_eq!( - plan.execution_timed_dag().unwrap_err(), - SummaryMaintenanceTimingError::UnselectedLifecycle(deployment.post_asap_node_id) - ); - } - - // A retained population and its raw input run at ingestion time; an - // Ephemeral population is rebuilt from raw input at query time. - #[test] - fn population_lifecycle_choice_decides_its_timing() { - let data = continuous(1_000, 60_000); - let workload = workload(vec![], vec![repeating()], data.clone()); - let timed = |lifecycle: SummaryMaintenanceLifecycle| { - population_timings(&timed_dag( - population_readout(), - &workload, - &data, - Some(Horizon(10.0)), - |_| lifecycle.clone(), - )) - }; - assert_eq!( - timed(SummaryMaintenanceLifecycle::ContinuouslyMaintained), - [("raw", INGEST), ("population", INGEST), ("readout", QUERY)] - ); - assert_eq!( - timed(SummaryMaintenanceLifecycle::Ephemeral), - [("raw", QUERY), ("population", QUERY), ("readout", QUERY)] - ); - } - - // When retaining is cheaper, Planner's own selection keeps the population - // maintained at ingestion time, as realization strategies placed it before - // population timing became a lifecycle decision. - #[test] - fn planner_selection_retains_population_at_ingestion() { - let data = continuous(1_000, 60_000); - let workload = workload(vec![], vec![repeating()], data.clone()); - let plan = plan_summary_maintenance_lifecycles( - population_readout(), - WorkloadDemand::new_with_data(&workload, &data, &[0]), - 1_000, - Some(Horizon(10.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &UnitCosts, - ) - .unwrap(); - // Shared and ContinuouslyMaintained tie at 32; the first wins. - assert!(matches!( - selected_summary_maintenance_lifecycle(&plan.deployments[0]), - Some(SummaryMaintenanceLifecycle::Shared { .. }) - )); - assert_eq!( - population_timings(&plan.execution_timed_dag().unwrap()), - [("raw", INGEST), ("population", INGEST), ("readout", QUERY)] - ); - } - - // A population feeding summary state is that state's input, not a separate - // deployment: the state's lifecycle times it. - #[test] - fn population_feeding_summary_state_follows_that_state() { - let SummaryExpr::ValueOperation { - child: population, .. - } = &population_readout().expr - else { - unreachable!() - }; - let state = summary(); - let SummaryExpr::SummaryAgg { - family, - input, - reduction, - grouping, - .. - } = &state.expr - else { - unreachable!() - }; - let state = Rc::new(SummaryNode { - expr: SummaryExpr::SummaryAgg { - child: Rc::clone(population), - family: family.clone(), - input: input.clone(), - reduction: reduction.clone(), - grouping: grouping.clone(), - filter: None, - }, - ..state.as_ref().clone() - }); - let data = continuous(1_000, 60_000); - let workload = workload(vec![], vec![repeating()], data.clone()); - let timed = |lifecycle: SummaryMaintenanceLifecycle| { - population_timings(&timed_dag( - readout(&state), - &workload, - &data, - Some(Horizon(10.0)), - |deployment| { - assert!(Rc::ptr_eq(&deployment.summary, &state)); - lifecycle.clone() - }, - )) - }; - assert_eq!( - timed(SummaryMaintenanceLifecycle::ContinuouslyMaintained), - [ - ("raw", INGEST), - ("population", INGEST), - ("state", INGEST), - ("readout", QUERY) - ] - ); - assert_eq!( - timed(SummaryMaintenanceLifecycle::Ephemeral), - [ - ("raw", QUERY), - ("population", QUERY), - ("state", QUERY), - ("readout", QUERY) - ] - ); - } - - // A population both read directly and consumed by summary state is that - // state's input in either traversal order: not a separate deployment, and - // timed by the state's lifecycle. - #[test] - fn shared_population_follows_its_summary_consumer() { - let direct = population_readout(); - let SummaryExpr::ValueOperation { - child: population, .. - } = &direct.expr - else { - unreachable!() - }; - let state = summary(); - let SummaryExpr::SummaryAgg { - family, - input, - reduction, - grouping, - .. - } = &state.expr - else { - unreachable!() - }; - let state = Rc::new(SummaryNode { - expr: SummaryExpr::SummaryAgg { - child: Rc::clone(population), - family: family.clone(), - input: input.clone(), - reduction: reduction.clone(), - grouping: grouping.clone(), - filter: None, - }, - ..state.as_ref().clone() - }); - let binary = |lhs: Rc, rhs: Rc| { - Rc::new(SummaryNode { - schema: lhs.schema.clone(), - expr: SummaryExpr::BinaryOp { - lhs, - rhs, - operator: asap_types::post_asap::BinaryOperator { - kind: asap_types::pre_asap::BinaryOpKind::Arithmetic( - asap_types::pre_asap::ArithmeticOpKind::Add, - ), - vector_match: None, - checked_relative_division: false, - checked_finite_division: false, - }, - timing: QUERY, - }, - guarantee: None, - }) - }; - let data = continuous(1_000, 60_000); - let workload = workload(vec![], vec![repeating()], data.clone()); - for root in [ - binary(Rc::clone(&direct), readout(&state)), - binary(readout(&state), Rc::clone(&direct)), - ] { - for lifecycle in [ - SummaryMaintenanceLifecycle::ContinuouslyMaintained, - SummaryMaintenanceLifecycle::Ephemeral, - ] { - let dag = timed_dag( - Rc::clone(&root), - &workload, - &data, - Some(Horizon(10.0)), - |deployment| { - assert!(Rc::ptr_eq(&deployment.summary, &state)); - lifecycle.clone() - }, - ); - let expected = if lifecycle == SummaryMaintenanceLifecycle::Ephemeral { - QUERY - } else { - INGEST - }; - for (kind, timing) in population_timings(&dag) { - if matches!(kind, "raw" | "population" | "state") { - assert_eq!(timing, expected, "{kind}"); - } else { - assert_eq!(timing, QUERY, "{kind}"); - } - } - } - } - } - - // A plan whose population deployment was removed after enumeration is - // refused rather than timed by a guess. - #[test] - fn timing_refuses_population_without_deployment() { - let data = continuous(1_000, 60_000); - let workload = workload(vec![], vec![repeating()], data.clone()); - let mut plan = plan_summary_maintenance_lifecycles( - population_readout(), - WorkloadDemand::new_with_data(&workload, &data, &[0]), - 1_000, - Some(Horizon(10.0)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &UnitCosts, - ) - .unwrap(); - let id = plan.deployments.remove(0).post_asap_node_id; - assert_eq!( - plan.execution_timed_dag(), - Err(SummaryMaintenanceTimingError::UnplannedMaintainedState(id)) - ); - } -} diff --git a/crates/asap-aware-mapping/src/test_support.rs b/crates/asap-aware-mapping/src/test_support.rs index 612cf7c0d..f410f915f 100644 --- a/crates/asap-aware-mapping/src/test_support.rs +++ b/crates/asap-aware-mapping/src/test_support.rs @@ -1,11 +1,16 @@ -use asap_types::pre_asap::QueryExpr; +// Shared fixture helpers; not every test module uses every helper. +#![allow(dead_code)] + +use std::rc::Rc; + +use asap_types::ir::OperatorNode; use asap_types::types::AccuracyTarget; use asap_types::workload::{ AccuracyRequirement, BatchEntry, DataWorkload, DurationMs, Evidence, PlanningWorkload, Predictability, Query, QueryLanguage, QueryRequirements, QueryWorkload, TimeSelection, }; -pub(crate) fn lower_promql(query: &str, accuracy: AccuracyTarget) -> QueryExpr { +pub(crate) fn lower_promql(query: &str, accuracy: AccuracyTarget) -> Rc { let workload = PlanningWorkload { query_workload: QueryWorkload { language: QueryLanguage::PromQL, @@ -35,3 +40,174 @@ pub(crate) fn lower_promql(query: &str, accuracy: AccuracyTarget) -> QueryExpr { .pop() .unwrap() } + +// ── Shared pre-ASAP fixture builders ───────────────────────────────────── +// +// Every builder returns an `Rc` whose schema is derived by +// `OperatorNode::new_shared`, so a fixture is exactly what a front end +// would hand the planner. Added by the test migration; only add here, never +// rename or remove (several test modules share these). + +use std::time::Duration; + +use asap_types::ir::operator_properties::{GroupKeys, Reduction, Source}; +use asap_types::ir::timing::{ + apply_materialization_timings, MaterializationAssignment, TimingMemo, +}; +use asap_types::ir::{NonASAPOp, Predicate, ScalarExpr, TimeRangeKind}; +use asap_types::pre_asap::agg_intent::AggIntent; +use asap_types::pre_asap::schema::{ColumnId, DataType, Field, Schema}; + +/// A `TimeSeries("m")` scan over `[ts(0), value(1), labels...]`, time index 0, +/// no unique key. +pub(crate) fn metric_scan(labels: &[&str]) -> Rc { + metric_scan_with_keys(labels, vec![]) +} + +/// [`metric_scan`] with explicit `unique_keys` (a `[[0]]` key makes CSE +/// willing to hoist the scan). +pub(crate) fn metric_scan_with_keys( + labels: &[&str], + unique_keys: Vec>, +) -> Rc { + let mut columns = vec![ + Field::plain("ts", DataType::Timestamp, false), + Field::plain("value", DataType::Float64, false), + ]; + columns.extend( + labels + .iter() + .map(|n| Field::plain(*n, DataType::Utf8, true)), + ); + scan("m", Schema::with_time_index(columns, 0, unique_keys)) +} + +/// A predicate-free `TimeSeries(metric)` scan with the given schema. +pub(crate) fn scan(metric: &str, schema: Schema) -> Rc { + scan_from( + Source::TimeSeries { + metric: metric.into(), + }, + schema, + ) +} + +pub(crate) fn scan_from(source: Source, schema: Schema) -> Rc { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Scan { + source, + predicates: vec![], + schema, + })) + .unwrap() +} + +/// A general aggregate node. +pub(crate) fn aggregate( + reduction: Reduction, + measures: Vec, + output_names: Vec, + having: Option, + child: Rc, +) -> Rc { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { + reduction, + measures, + output_names, + filters: vec![], + having, + child, + })) + .unwrap() +} + +/// `intent by (by)` — a single-measure, `HAVING`-free grouped aggregate. +pub(crate) fn agg( + by: Vec, + intent: AggIntent, + child: Rc, +) -> Rc { + aggregate(Reduction::by(by), vec![intent], vec![], None, child) +} + +/// `intent without (excluded)`. +pub(crate) fn without_agg( + excluded: Vec, + intent: AggIntent, + child: Rc, +) -> Rc { + aggregate( + Reduction::Reduce(GroupKeys::without(excluded)), + vec![intent], + vec![], + None, + child, + ) +} + +/// A per-entity (per-series) single-measure aggregate. +pub(crate) fn agg_per_entity(intent: AggIntent, child: Rc) -> Rc { + aggregate(Reduction::PerEntity, vec![intent], vec![], None, child) +} + +pub(crate) fn filter(pred: ScalarExpr, child: Rc) -> Rc { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Filter { + pred: Predicate(pred), + child, + })) + .unwrap() +} + +pub(crate) fn dedup(cols: Vec, child: Rc) -> Rc { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Dedup { + cols, + child, + })) + .unwrap() +} + +/// An explicit range selector `child[range]`. +pub(crate) fn time_range(range: Duration, child: Rc) -> Rc { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::TimeRange { + range, + kind: TimeRangeKind::Range, + child, + })) + .unwrap() +} + +/// `root` timed under the default (every summary at query time) +/// assignment — the shape export and the post-ASAP validators consume. +pub(crate) fn timed(root: &Rc) -> Rc { + apply_materialization_timings( + root, + &MaterializationAssignment::all_query_time(), + &mut TimingMemo::new(), + ) + .expect("default materialization timings apply") +} + +/// `root` timed with every summary maintained at ingestion time. +pub(crate) fn maintained(root: &Rc) -> Rc { + apply_materialization_timings( + root, + &MaterializationAssignment::all_ingestion_time(), + &mut TimingMemo::new(), + ) + .expect("maintained materialization timings apply") +} + +/// Time `root` under the default materialization assignment (which runs every +/// data-state / population-contract check) and export it as a physical ASAP DAG. +pub(crate) fn time_and_export( + root: &Rc, +) -> Result< + asap_types::ir::export::PhysicalASAPDAG, + asap_types::post_asap::execution_data_state::ExecutionDataStateError, +> { + let timed = apply_materialization_timings( + root, + &MaterializationAssignment::all_query_time(), + &mut TimingMemo::new(), + )?; + asap_types::ir::export::compile_physical_asap_dag(&timed) +} diff --git a/crates/asap-aware-mapping/src/topk_reuse.rs b/crates/asap-aware-mapping/src/topk_reuse.rs index 8329569d1..aec95292a 100644 --- a/crates/asap-aware-mapping/src/topk_reuse.rs +++ b/crates/asap-aware-mapping/src/topk_reuse.rs @@ -7,7 +7,7 @@ use std::rc::Rc; -use asap_types::pre_asap::QueryExpr; +use asap_types::ir::{NonASAPOp, OperatorNode}; use crate::replacement::{ Replacement, ReplacementProvenance, ReplacementStrategy, ReplacementSubDAG, TargetSubDAG, @@ -15,22 +15,23 @@ use crate::replacement::{ /// Derives a smaller top-k result from a compatible larger top-k sibling. pub struct TopKLimitReuseStrategy { - limits: Vec>, + limits: Vec>, } impl TopKLimitReuseStrategy { - pub fn new(limits: &[Rc]) -> Self { + pub fn new(limits: &[Rc]) -> Self { Self { limits: limits.to_vec(), } } - fn larger_sources<'a>(&'a self, target: &TargetSubDAG<'_>) -> Vec<&'a Rc> { - let QueryExpr::Limit { - n: target_n, + fn larger_sources<'a>(&'a self, target: &TargetSubDAG<'_>) -> Vec<&'a Rc> { + let Some(NonASAPOp::Limit { + n: Some(target_n), offset: 0, child: target_child, - } = target.root.as_ref() + .. + }) = target.root.non_asap() else { return Vec::new(); }; @@ -42,11 +43,12 @@ impl TopKLimitReuseStrategy { if Rc::ptr_eq(candidate, target.root) { return false; } - let QueryExpr::Limit { - n, + let Some(NonASAPOp::Limit { + n: Some(n), offset: 0, child, - } = candidate.as_ref() + .. + }) = candidate.non_asap() else { return false; }; @@ -56,8 +58,8 @@ impl TopKLimitReuseStrategy { .collect(); // Prefer the smallest sufficient materialized top-k when several // larger siblings are available. - sources.sort_by_key(|source| match source.as_ref() { - QueryExpr::Limit { n, .. } => *n, + sources.sort_by_key(|source| match source.non_asap() { + Some(NonASAPOp::Limit { n: Some(n), .. }) => *n, _ => unreachable!(), }); sources @@ -70,34 +72,38 @@ impl ReplacementStrategy for TopKLimitReuseStrategy { } fn replacements(&self, target: &TargetSubDAG<'_>) -> Vec { - let QueryExpr::Limit { - n: target_n, + let Some(NonASAPOp::Limit { + n: Some(target_n), offset: 0, + partition_by, .. - } = target.root.as_ref() + }) = target.root.non_asap() else { return Vec::new(); }; self.larger_sources(target) .into_iter() - .map(|source| { - let source_n = match source.as_ref() { - QueryExpr::Limit { n, .. } => *n, + .filter_map(|source| { + let source_n = match source.non_asap() { + Some(NonASAPOp::Limit { n: Some(n), .. }) => *n, _ => unreachable!(), }; - ReplacementSubDAG { + let rewritten = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Limit { + n: Some(*target_n), + offset: 0, + partition_by: partition_by.clone(), + child: Rc::clone(source), + })) + .ok()?; + Some(ReplacementSubDAG { strategy: "TopKLimitReuseStrategy", - replacement: Replacement::Rewrite(Rc::new(QueryExpr::Limit { - n: *target_n, - offset: 0, - child: Rc::clone(source), - })), + replacement: Replacement::SubDAG(rewritten), provenance: ReplacementProvenance::LogicalRewrite, rationale: format!( "derives top-{target_n} from the compatible shared top-{source_n} result; both rank the identical input with the same ordering" ), - } + }) }) .collect() } @@ -106,38 +112,39 @@ impl ReplacementStrategy for TopKLimitReuseStrategy { #[cfg(test)] mod tests { use super::*; - use asap_types::pre_asap::{Schema, Source}; + use crate::test_support::scan; + use asap_types::ir::operator_properties::GroupKeys; + use asap_types::pre_asap::Schema; - fn scan_named(metric: &str) -> Rc { - Rc::new(QueryExpr::Scan { - source: Source::TimeSeries { - metric: metric.into(), - }, - predicates: vec![], - schema: Schema::with_time_index(vec![], 0, vec![]), - }) + fn scan_named(metric: &str) -> Rc { + scan(metric, Schema::with_time_index(vec![], 0, vec![])) + } + + fn limit(n: usize, offset: usize, child: Rc) -> Rc { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Limit { + n: Some(n), + offset, + partition_by: GroupKeys::none(), + child, + })) + .unwrap() } #[test] fn smaller_limit_reuses_larger_compatible_limit() { let child = scan_named("m"); - let small = Rc::new(QueryExpr::Limit { - n: 5, - offset: 0, - child: Rc::clone(&child), - }); - let large = Rc::new(QueryExpr::Limit { - n: 10, - offset: 0, - child, - }); + let small = limit(5, 0, Rc::clone(&child)); + let large = limit(10, 0, child); let strategy = TopKLimitReuseStrategy::new(&[Rc::clone(&small), Rc::clone(&large)]); let replacements = strategy.replacements(&TargetSubDAG::new(&small)); assert_eq!(replacements.len(), 1); - let Replacement::Rewrite(rewrite) = &replacements[0].replacement else { + let Replacement::SubDAG(rewrite) = &replacements[0].replacement else { panic!() }; - let QueryExpr::Limit { n: 5, child, .. } = rewrite.as_ref() else { + let Some(NonASAPOp::Limit { + n: Some(5), child, .. + }) = rewrite.non_asap() + else { panic!() }; assert!(Rc::ptr_eq(child, &large)); @@ -147,21 +154,9 @@ mod tests { fn offset_or_different_input_is_not_reused() { let a = scan_named("a"); let b = scan_named("b"); - let small = Rc::new(QueryExpr::Limit { - n: 5, - offset: 0, - child: a, - }); - let large = Rc::new(QueryExpr::Limit { - n: 10, - offset: 0, - child: b, - }); - let offset = Rc::new(QueryExpr::Limit { - n: 20, - offset: 1, - child: scan_named("a"), - }); + let small = limit(5, 0, a); + let large = limit(10, 0, b); + let offset = limit(20, 1, scan_named("a")); let strategy = TopKLimitReuseStrategy::new(&[Rc::clone(&small), large, offset]); assert!(!strategy.matches(&TargetSubDAG::new(&small))); } diff --git a/crates/asap-aware-mapping/tests/logical_candidates.rs b/crates/asap-aware-mapping/tests/logical_candidates.rs new file mode 100644 index 000000000..20211ce69 --- /dev/null +++ b/crates/asap-aware-mapping/tests/logical_candidates.rs @@ -0,0 +1,243 @@ +//! Frontend-to-Pass-1 acceptance: candidate discovery precedes empirical selection. +use asap_aware_mapping::{ + logical_candidates::{ + enumerate_local_logical_candidates, local_realizations_for_intent, LogicalCandidateError, + }, + Realization, +}; +use asap_types::{ + ir::operator_properties::{Reduction, Source}, + ir::{NonASAPOp, Operator, OperatorNode, QueryRoot, ScalarExpr}, + post_asap::{ExactKind, SketchAlgorithm}, + pre_asap::{AggIntent, DataType, Field, Schema}, + types::AccuracyTarget, +}; +use std::rc::Rc; + +fn approximate() -> AccuracyTarget { + AccuracyTarget::EpsilonDelta { + epsilon: 0.05, + delta: 0.01, + } +} +fn algorithms(choices: &[Realization]) -> Vec { + choices + .iter() + .filter_map(|choice| match choice { + Realization::Sketch(kind) => Some(kind.algorithm().clone()), + _ => None, + }) + .collect() +} +fn aggregate(intent: AggIntent) -> Rc { + let child = OperatorNode::new_shared(Operator::NonASAP(NonASAPOp::Scan { + source: Source::Table { + table_ref: "flows".into(), + }, + predicates: vec![], + schema: Schema::lifted(vec![Field::plain("src_ip", DataType::Utf8, false)], None), + })) + .unwrap(); + OperatorNode::new_shared(Operator::NonASAP(NonASAPOp::Aggregate { + child, + reduction: Reduction::by(vec![]), + measures: vec![intent], + output_names: vec![], + filters: vec![], + having: None, + })) + .unwrap() +} + +/// Example 2 preserves specialized distinct summaries and the universal alternative. +#[test] +fn cardinality_keeps_exact_specialized_and_universal_alternatives() { + let choices = local_realizations_for_intent(&AggIntent::Cardinality { + cols: vec![0], + accuracy: approximate(), + }) + .unwrap(); + assert!(matches!(choices[0], Realization::PassThrough)); + assert_eq!( + algorithms(&choices), + vec![ + SketchAlgorithm::Hll, + SketchAlgorithm::Theta, + SketchAlgorithm::Kmv, + SketchAlgorithm::UnivMon + ] + ); + let tuple = local_realizations_for_intent(&AggIntent::Cardinality { + cols: vec![0, 1], + accuracy: approximate(), + }) + .unwrap(); + assert!(!algorithms(&tuple).contains(&SketchAlgorithm::UnivMon)); +} + +/// Frequency moments retain exact execution and a universal sketch without certification. +#[test] +fn frequency_statistics_keep_universal_choices() { + for intent in [ + AggIntent::FrequencyL2 { + col: Some(0), + accuracy: approximate(), + }, + AggIntent::FrequencyEntropy { + col: Some(0), + accuracy: approximate(), + }, + ] { + let choices = local_realizations_for_intent(&intent).unwrap(); + assert!(matches!(choices[0], Realization::PassThrough)); + assert_eq!(algorithms(&choices), vec![SketchAlgorithm::UnivMon]); + } +} + +/// An exact request cannot acquire an approximate sketch merely because one is available. +#[test] +fn exact_quantile_stays_exact_and_approximate_keeps_both_families() { + let choices = local_realizations_for_intent(&AggIntent::Quantile { + col: Some(0), + q: 0.99, + accuracy: approximate(), + }) + .unwrap(); + assert_eq!( + algorithms(&choices), + vec![SketchAlgorithm::Kll, SketchAlgorithm::DDSketch] + ); + let exact = local_realizations_for_intent(&AggIntent::Quantile { + col: Some(0), + q: 0.99, + accuracy: AccuracyTarget::Exact, + }) + .unwrap(); + assert_eq!(exact, vec![Realization::PassThrough]); +} + +/// Scalar roots expose their producer targets; repeated references retain one target identity. +#[test] +fn scalar_root_producers_are_discovered_once() { + let producer = aggregate(AggIntent::Cardinality { + cols: vec![0], + accuracy: approximate(), + }); + let roots = vec![ + ( + "scalar", + QueryRoot::Scalar(ScalarExpr::ScalarSubquery(producer.clone())), + ), + ("relation", QueryRoot::Operator(producer.clone())), + ]; + let candidates = enumerate_local_logical_candidates(roots).unwrap(); + assert_eq!(candidates.roots.len(), 2); + for (_, root) in &candidates.roots { + asap_types::ir::export::compile_logical_asap_query(root) + .unwrap() + .validate() + .unwrap(); + } + assert_eq!(candidates.targets.len(), 1); + assert!(Rc::ptr_eq(&candidates.targets[0].target, &producer)); + assert!(producer.timing.is_none()); + assert!(producer.guarantee.is_none()); + asap_types::ir::export::compile_logical_asap_dag(&producer) + .unwrap() + .validate() + .unwrap(); +} + +/// Example 1 rate lowering reaches the exact accumulator choice without a cost model. +#[test] +fn promql_lowering_reaches_local_candidates_without_execution_timing() { + use asap_types::workload::{ + AccuracyRequirement, BatchEntry, PlanningWorkload, Query, QueryLanguage, QueryRequirements, + QueryWorkload, + }; + let workload = PlanningWorkload { + query_workload: QueryWorkload { + language: QueryLanguage::PromQL, + query_batch: Some(vec![BatchEntry { + query: Query("sum by (job) (rate(http_requests_total[1m]))".into()), + requirements: QueryRequirements { + accuracy: AccuracyRequirement::Explicit(approximate()), + ..Default::default() + }, + predictability: Default::default(), + invocations: 1, + execute_at: None, + time_selection: Default::default(), + }]), + repeating_queries: None, + }, + data_workload: Some(asap_types::workload::DataWorkload { + data_ingestion_interval: asap_types::workload::Evidence { + value: Some(asap_types::workload::DurationMs(1000)), + ..Default::default() + }, + ..Default::default() + }), + }; + let roots = asap_frontend_promql::lower_promql_query_workload(&workload, 0).unwrap(); + let candidates = + enumerate_local_logical_candidates(roots.into_iter().enumerate().collect()).unwrap(); + assert!(candidates + .targets + .iter() + .any(|target| target.alternatives.iter().any(|choice| matches!( + choice, + Realization::ExactAggregate { + kind: ExactKind::Rate, + .. + } + )))); + assert!(candidates + .targets + .iter() + .all(|target| target.target.timing.is_none())); +} + +/// Physical annotations and invalid probability requirements fail at the stage boundary. +#[test] +fn assigned_timing_and_invalid_accuracy_are_rejected() { + let mut producer = (*aggregate(AggIntent::Count { + accuracy: approximate(), + })) + .clone(); + producer.timing = Some(asap_types::post_asap::ExecutionTiming::QueryTime); + assert!(matches!( + enumerate_local_logical_candidates(vec![(0, QueryRoot::Operator(Rc::new(producer)))]), + Err(LogicalCandidateError::AssignedTiming) + )); + for target in [ + AccuracyTarget::Epsilon(f64::NAN), + AccuracyTarget::EpsilonDelta { + epsilon: 0.1, + delta: 0.0, + }, + ] { + assert!(matches!( + local_realizations_for_intent(&AggIntent::Count { accuracy: target }), + Err(LogicalCandidateError::InvalidAccuracy) + )); + } +} + +/// Local TopK keeps both declared heap substrates without choosing an implementation. +#[test] +fn topk_keeps_both_specialized_heap_choices() { + let choices = local_realizations_for_intent(&AggIntent::TopK { + k: 10, + accuracy: approximate(), + }) + .unwrap(); + assert!(matches!(choices[0], Realization::PassThrough)); + assert_eq!( + algorithms(&choices), + vec![ + SketchAlgorithm::CmsWithHeap, + SketchAlgorithm::CountSketchWithHeap + ] + ); +} diff --git a/crates/asap-aware-mapping/tests/physical_handoff_cost.rs b/crates/asap-aware-mapping/tests/physical_handoff_cost.rs index 0885db71c..141750f61 100644 --- a/crates/asap-aware-mapping/tests/physical_handoff_cost.rs +++ b/crates/asap-aware-mapping/tests/physical_handoff_cost.rs @@ -3,16 +3,16 @@ use asap_aware_mapping::analytical_cost::{ PhysicalOperator, }; use asap_aware_mapping::physical_operator_statistics::{ - ComparisonScope, EdgeStatistics, OperatorStatistics, SourceCoverage, UnaryEdgeStatistics, + ComparisonScope, EdgeStatistics, OperatorStatistics, ScanSelection, UnaryEdgeStatistics, }; -use asap_types::pre_asap::query_expr::Source; +use asap_types::ir::operator_properties::Source; use asap_types::workload::{ DataArrival, DurationMs, QueryRecurrence, QueryTimeScope, TimeSelection, TimestampMs, }; use std::collections::HashMap; fn fixture() -> (EvidenceBackedPhysicalDAG, ComparisonScope) { - let coverage = SourceCoverage { + let coverage = ScanSelection { source: Source::Table { table_ref: "events".into(), }, @@ -49,7 +49,7 @@ fn fixture() -> (EvidenceBackedPhysicalDAG, ComparisonScope) { id: "scan".into(), operator: PhysicalOperator::Scan, children: vec![], - source_coverage: Some(coverage), + scan_selection: Some(coverage), output_buffer_bytes: 0, retained_bytes: 0, execution: ExecutionMultiplicity::PerEvaluation, @@ -58,7 +58,7 @@ fn fixture() -> (EvidenceBackedPhysicalDAG, ComparisonScope) { id: "left".into(), operator: PhysicalOperator::PassThrough, children: vec!["scan".into()], - source_coverage: None, + scan_selection: None, output_buffer_bytes: 0, retained_bytes: 0, execution: ExecutionMultiplicity::PerEvaluation, @@ -67,7 +67,7 @@ fn fixture() -> (EvidenceBackedPhysicalDAG, ComparisonScope) { id: "right".into(), operator: PhysicalOperator::PassThrough, children: vec!["scan".into()], - source_coverage: None, + scan_selection: None, output_buffer_bytes: 0, retained_bytes: 0, execution: ExecutionMultiplicity::PerEvaluation, @@ -76,7 +76,7 @@ fn fixture() -> (EvidenceBackedPhysicalDAG, ComparisonScope) { id: "root".into(), operator: PhysicalOperator::Concat, children: vec!["left".into(), "right".into()], - source_coverage: None, + scan_selection: None, output_buffer_bytes: 0, retained_bytes: 0, execution: ExecutionMultiplicity::PerEvaluation, diff --git a/crates/asap-aware-mapping/tests/storage_io.rs b/crates/asap-aware-mapping/tests/storage_io.rs index a12118f09..811328f6b 100644 --- a/crates/asap-aware-mapping/tests/storage_io.rs +++ b/crates/asap-aware-mapping/tests/storage_io.rs @@ -3,16 +3,16 @@ use asap_aware_mapping::analytical_cost::{ PhysicalOperator, }; use asap_aware_mapping::physical_operator_statistics::{ - ComparisonScope, EdgeStatistics, OperatorStatistics, SourceCoverage, UnaryEdgeStatistics, + ComparisonScope, EdgeStatistics, OperatorStatistics, ScanSelection, UnaryEdgeStatistics, }; -use asap_types::pre_asap::query_expr::Source; +use asap_types::ir::operator_properties::Source; use asap_types::workload::{ DataArrival, DurationMs, QueryRecurrence, QueryTimeScope, TimeSelection, TimestampMs, }; use std::collections::HashMap; fn fixture() -> (EvidenceBackedPhysicalDAG, ComparisonScope) { - let coverage = SourceCoverage { + let coverage = ScanSelection { source: Source::Table { table_ref: "events".into(), }, @@ -49,7 +49,7 @@ fn fixture() -> (EvidenceBackedPhysicalDAG, ComparisonScope) { id: "scan".into(), operator: PhysicalOperator::Scan, children: vec![], - source_coverage: Some(coverage), + scan_selection: Some(coverage), output_buffer_bytes: 0, retained_bytes: 0, execution: ExecutionMultiplicity::PerEvaluation, @@ -58,7 +58,7 @@ fn fixture() -> (EvidenceBackedPhysicalDAG, ComparisonScope) { id: "left".into(), operator: PhysicalOperator::PassThrough, children: vec!["scan".into()], - source_coverage: None, + scan_selection: None, output_buffer_bytes: 0, retained_bytes: 0, execution: ExecutionMultiplicity::PerEvaluation, @@ -67,7 +67,7 @@ fn fixture() -> (EvidenceBackedPhysicalDAG, ComparisonScope) { id: "right".into(), operator: PhysicalOperator::PassThrough, children: vec!["scan".into()], - source_coverage: None, + scan_selection: None, output_buffer_bytes: 0, retained_bytes: 0, execution: ExecutionMultiplicity::PerEvaluation, @@ -76,7 +76,7 @@ fn fixture() -> (EvidenceBackedPhysicalDAG, ComparisonScope) { id: "root".into(), operator: PhysicalOperator::Concat, children: vec!["left".into(), "right".into()], - source_coverage: None, + scan_selection: None, output_buffer_bytes: 0, retained_bytes: 0, execution: ExecutionMultiplicity::PerEvaluation, @@ -353,7 +353,7 @@ fn storage_node_identity_statistics_and_calibration_provenance_are_bound() { .get_mut("scan") .unwrap() .node - .source_coverage + .scan_selection .as_mut() .unwrap() .source_snapshot_id = "another-source".into(); diff --git a/crates/asap-physical-operators/Cargo.toml b/crates/asap-physical-operators/Cargo.toml index 193707c48..a7130158b 100644 --- a/crates/asap-physical-operators/Cargo.toml +++ b/crates/asap-physical-operators/Cargo.toml @@ -4,6 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] +chrono = { version = "0.4.39", default-features = false, features = ["std"] } futures = "0.3" planner-types = { package = "asap-types", path = "../types" } asap_sketchlib = { git = "https://github.com/ProjectASAP/asap_sketchlib", rev = "5f03ccbd798ed5fec62bdd839bcb331123cab369" } diff --git a/crates/asap-physical-operators/README.md b/crates/asap-physical-operators/README.md index 2d3e7b569..b15154b4a 100644 --- a/crates/asap-physical-operators/README.md +++ b/crates/asap-physical-operators/README.md @@ -14,7 +14,7 @@ thread pool. Poll multiple root streams concurrently when they share inputs. `operators::Operator` implements native batch sources, scalar values, projection, filtering, grouped exact aggregation, semi-join, grouped Sort and -Limit, vector-to-scalar conversion, Union, and summary construction/merge/readout. +Limit, vector-to-scalar conversion, Union, and summary construction/merge/evaluation. Sort followed by Limit implements grouped ranking; no dedicated TopK physical operator is needed. Summary construction updates state batch by batch. End of input means the supplied query range or ingestion window is complete. @@ -47,7 +47,7 @@ assert!(matches!(batch.rows()[0][0], Value::Int64(-7))); # Ok::<(), asap_physical_operators::dag::Error>(()) ``` -`physical_planner::compile` accepts a logical Post-ASAP DAG (`PostAsapDAG`) and typed input contracts. +`physical_planner::compile` accepts a logical Post-ASAP DAG (`PhysicalASAPDAG`) and typed input contracts. The resulting candidate is instantiated with deployment readers after selection. It rejects unsupported operations and schema mismatches before starting a source. Implement `PhysicalOperator` for a deployment source, including asynchronous I/O; computation operators remain in @@ -59,7 +59,7 @@ Plain values preserve Planner scalar/collection types and nullability. Numeric arithmetic uses matching Int64 or Float64 inputs; integer overflow is an error. Boolean predicates use three-valued logic. Native summary states currently cover exact Sum/Count/Min/Max/Rate/Increase, KLL, DDSketch, HLL and Float64 weighted CMS and CountSketch with candidate heaps. Binding checks family, -parameters and readout compatibility; source batches also validate state payloads. +parameters and evaluation compatibility; source batches also validate state payloads. Existing accumulator algorithms are reused as kernels behind these operators. This crate is owned by ASAPPlanner. Its `planner-types` dependency is the local @@ -78,9 +78,9 @@ See [the design](../../docs/design_docs/physical-planning-and-deployment.md). - `operators`: projection, filter, joins, aggregate/window, sort, limit and summary implementations. - `sources`: raw-source interface, Scan and the memory connector. - `physical_planner`: native operator lowering, typed input contracts and checked instantiation. -- `summary_kernels`: in-memory summary state over `asap_sketchlib` and exact Planner state: merge, typed readout and update adapters. -- `readout`: readouts over merged exact summary states. -- `capability`: explicit kernel, native-batch and typed readout validation. +- `summary_kernels`: in-memory summary state over `asap_sketchlib` and exact Planner state: merge, typed evaluation and update adapters. +- `evaluation`: evaluations over merged exact summary states. +- `capability`: explicit kernel, native-batch and typed evaluation validation. The `dag`, `factory`, `traits` and `arithmetic` paths are re-exports. They contain no alternative execution implementations. @@ -104,7 +104,7 @@ There is no spill or partitioned parallel execution in this implementation. ## Physical compilation and deployment inputs -`physical_planner::compile` accepts a Planner `PostAsapDAG`, typed +`physical_planner::compile` accepts a Planner `PhysicalASAPDAG`, typed `InputContract`s and output roots. It returns a reusable `CompiledPhysicalDAG` containing selected native operators and no live readers. Compilation validates schemas, input ordering, sharing and boundedness before deployment source access. diff --git a/crates/asap-physical-operators/src/capability.rs b/crates/asap-physical-operators/src/capability.rs index 5ed1c5501..8bdb1891e 100644 --- a/crates/asap-physical-operators/src/capability.rs +++ b/crates/asap-physical-operators/src/capability.rs @@ -2,22 +2,22 @@ //! //! `validate_summary_kernel` checks update kernels, including families without a //! native batch representation. `validate_native_family` and -//! `validate_sketch_readout` / `validate_exact_readout` check native state and readout support. -//! Keyed weighted-frequency readouts are checked by `Operator::keyed_readout`. +//! `validate_sketch_evaluation` / `validate_exact_evaluation` check native state and evaluation support. +//! Keyed weighted-frequency evaluations are checked by `Operator::keyed_evaluation`. //! A successful kernel check alone does not mean a physical DAG will bind. //! //! Stored-state encodings belong to deployments. Full plan acceptance is //! owned by `binding`, which also validates schemas, expressions and inputs. use crate::Error; use planner_types::post_asap::{ - ExactKind, ExactParams, FieldDataType, GroupingStrategy, SketchAlgorithm, SketchParams, - SketchStatistic, SummaryUpdate, + ExactKind, ExactParams, FieldDataType as SummaryFamilyType, GroupingStrategy, SketchAlgorithm, + SketchParams, SketchStatistic, SummaryUpdate, }; /// Check the same contract used by `create_planner_accumulator` before a plan /// is accepted. Execution timing is deliberately not a kernel property. pub fn validate_summary_kernel( - family: &FieldDataType, + family: &SummaryFamilyType, input: &SummaryUpdate, grouping: &GroupingStrategy, ) -> Result<(), String> { @@ -25,7 +25,7 @@ pub fn validate_summary_kernel( return Err("shared summary grouping has no registered kernel".into()); } let keyed = match family { - FieldDataType::ExactAggregate(kind, params) => { + SummaryFamilyType::ExactAggregate(kind, params) => { use ExactKind as K; use ExactParams as P; if !matches!( @@ -41,7 +41,7 @@ pub fn validate_summary_kernel( } input.item.is_some() } - FieldDataType::Sketch(kind, layout) => { + SummaryFamilyType::Sketch(kind, layout) => { if layout != grouping { return Err("Planner family and operator grouping disagree".into()); } @@ -138,9 +138,9 @@ pub(crate) fn is_unit_sample_frequency(update: &planner_types::post_asap::Summar ) } -pub fn validate_native_family(family: &FieldDataType) -> Result<(), Error> { +pub fn validate_native_family(family: &SummaryFamilyType) -> Result<(), Error> { use planner_types::post_asap::SketchAlgorithm as A; - if let FieldDataType::Sketch(kind, grouping) = family { + if let SummaryFamilyType::Sketch(kind, grouping) = family { // Plain Count-Min is native as stored state only: it merges and reads // its bare count, but the DAG does not build it from rows. if let (A::Cms, SketchParams::Cms { width, depth }) = (kind.algorithm(), kind.params()) { @@ -165,8 +165,8 @@ pub fn validate_native_family(family: &FieldDataType) -> Result<(), Error> { } } match family { - FieldDataType::ExactAggregate(..) => {} - FieldDataType::Sketch(kind, _) + SummaryFamilyType::ExactAggregate(..) => {} + SummaryFamilyType::Sketch(kind, _) if matches!(kind.algorithm(), A::Kll | A::DDSketch | A::Hll) => {} _ => { return Err(Error::Invalid( @@ -184,9 +184,9 @@ pub fn validate_native_family(family: &FieldDataType) -> Result<(), Error> { .map_err(Error::Invalid) } -/// A sketch readout is native only for the families Planner can read directly. -pub fn validate_sketch_readout( - family: &FieldDataType, +/// A sketch evaluation is native only for the families Planner can read directly. +pub fn validate_sketch_evaluation( + family: &SummaryFamilyType, query: &SketchStatistic, ) -> Result<(), Error> { validate_native_family(family)?; @@ -194,12 +194,12 @@ pub fn validate_sketch_readout( // A point count without an item value reads the total count. let bare_count = matches!(query, SketchStatistic::PointCount { value: None, .. }); let supported = match family { - FieldDataType::Sketch(kind, _) => match (kind.algorithm(), query) { + SummaryFamilyType::Sketch(kind, _) => match (kind.algorithm(), query) { (A::Kll, SketchStatistic::Quantile { q }) | (A::DDSketch, SketchStatistic::Quantile { q }) => { if !(0.0..=1.0).contains(q) { return Err(Error::Invalid( - "quantile readout requires quantile in [0,1]".into(), + "quantile evaluation requires quantile in [0,1]".into(), )); } true @@ -208,7 +208,7 @@ pub fn validate_sketch_readout( (A::Hll, SketchStatistic::Cardinality) => true, (A::Hll, _) => bare_count, // Only count intents read a Count-Min bare count, and their - // updates have unit weight; the readout is typed Int64 on that basis. + // updates have unit weight; the evaluation is typed Int64 on that basis. (A::Cms, _) => bare_count, _ => false, }, @@ -216,36 +216,39 @@ pub fn validate_sketch_readout( }; if !supported { return Err(Error::Invalid( - "readout is not implemented for this summary family".into(), + "evaluation is not implemented for this summary family".into(), )); } Ok(()) } -/// An exact readout must match the exact family it reads. -pub fn validate_exact_readout( - family: &FieldDataType, - readout: &crate::summary_kernels::exact::ExactReadout, +/// An exact evaluation must match the exact family it reads. +pub fn validate_exact_evaluation( + family: &SummaryFamilyType, + evaluation: &crate::summary_kernels::exact::ExactEvaluation, ) -> Result<(), Error> { validate_native_family(family)?; use crate::Statistic as S; use planner_types::post_asap::ExactKind as E; let supported = matches!( - (family, readout.statistic), - (FieldDataType::ExactAggregate(E::Sum, _), S::Sum) - | (FieldDataType::ExactAggregate(E::Count, _), S::Count) - | (FieldDataType::ExactAggregate(E::Min, _), S::Min) - | (FieldDataType::ExactAggregate(E::Max, _), S::Max) - | (FieldDataType::ExactAggregate(E::Rate, _), S::Rate) - | (FieldDataType::ExactAggregate(E::Increase, _), S::Increase) + (family, evaluation.statistic), + (SummaryFamilyType::ExactAggregate(E::Sum, _), S::Sum) + | (SummaryFamilyType::ExactAggregate(E::Count, _), S::Count) + | (SummaryFamilyType::ExactAggregate(E::Min, _), S::Min) + | (SummaryFamilyType::ExactAggregate(E::Max, _), S::Max) + | (SummaryFamilyType::ExactAggregate(E::Rate, _), S::Rate) + | ( + SummaryFamilyType::ExactAggregate(E::Increase, _), + S::Increase + ) ); if !supported { return Err(Error::Invalid( - "readout is not implemented for this summary family".into(), + "evaluation is not implemented for this summary family".into(), )); } - if readout.lookback_ms.is_some_and(|lookback| { - lookback <= 0 || !matches!(readout.statistic, S::Rate | S::Increase) + if evaluation.lookback_ms.is_some_and(|lookback| { + lookback <= 0 || !matches!(evaluation.statistic, S::Rate | S::Increase) }) { return Err(Error::Invalid("invalid exact counter lookback".into())); } diff --git a/crates/asap-physical-operators/src/readout.rs b/crates/asap-physical-operators/src/evaluation.rs similarity index 82% rename from crates/asap-physical-operators/src/readout.rs rename to crates/asap-physical-operators/src/evaluation.rs index e84d8c828..843145ce2 100644 --- a/crates/asap-physical-operators/src/readout.rs +++ b/crates/asap-physical-operators/src/evaluation.rs @@ -1,4 +1,4 @@ -//! Readouts over merged exact summary states. +//! Evaluations over merged exact summary states. use crate::summary_kernels::exact::ExactAccumulator; use crate::{AggregateCore, KeyByLabelValues, Statistic}; use std::sync::Arc; @@ -12,7 +12,7 @@ fn merge_exact_states( .as_any() .downcast_ref::() .cloned() - .ok_or_else(|| "readout requires Planner exact state".to_string()) + .ok_or_else(|| "evaluation requires Planner exact state".to_string()) }; let mut merged = exact(&states.next().ok_or("empty exact state input")?)?; for state in states { @@ -23,7 +23,7 @@ fn merge_exact_states( Ok(merged) } -/// PromQL counter readouts omit a series with fewer than two samples. Other +/// PromQL counter evaluations omit a series with fewer than two samples. Other /// state/type/range failures remain errors rather than empty results. pub fn insufficient_counter_samples(state: &dyn AggregateCore, statistic: Statistic) -> bool { matches!(statistic, Statistic::Rate | Statistic::Increase) @@ -36,7 +36,7 @@ pub fn insufficient_counter_samples(state: &dyn AggregateCore, statistic: Statis /// Merge already selected exact panes and read one population. `None` means /// the population is absent from the result: a counter with too few samples, /// or an empty MIN/MAX. -pub fn exact_readout( +pub fn exact_evaluation( states: impl IntoIterator>, statistic: Statistic, range_ms: Option<(i64, i64)>, @@ -47,17 +47,17 @@ pub fn exact_readout( return Ok(None); } merged - .readout(statistic, range_ms, key) + .evaluation(statistic, range_ms, key) .map_err(|error| error.to_string()) } #[cfg(test)] mod counter_tests { use super::*; - use planner_types::post_asap::{ExactKind, ExactParams, FieldDataType}; + use planner_types::post_asap::{ExactKind, ExactParams, FieldDataType as SummaryFamilyType}; fn counter(kind: ExactKind, params: ExactParams, keyed: bool) -> ExactAccumulator { - ExactAccumulator::new(FieldDataType::ExactAggregate(kind, params), keyed).unwrap() + ExactAccumulator::new(SummaryFamilyType::ExactAggregate(kind, params), keyed).unwrap() } // A counter population with a single sample is absent, keyed or not. @@ -76,7 +76,7 @@ mod counter_tests { let key = keyed.then(|| KeyByLabelValues::new_with_labels(vec!["checkout".into()])); state.update(key.as_ref(), 10., 10_000); assert_eq!( - exact_readout( + exact_evaluation( [Arc::new(state) as Arc], statistic, None, @@ -97,15 +97,15 @@ mod counter_tests { let rate = Statistic::Rate; let one = [Arc::new(state.clone()) as Arc]; assert_eq!( - exact_readout(one, rate, Some((0, 60_000)), None).unwrap(), + exact_evaluation(one, rate, Some((0, 60_000)), None).unwrap(), None ); state.update(None, 20., 20_000); let two = || [Arc::new(state.clone()) as Arc]; - assert!(exact_readout(two(), rate, Some((0, 60_000)), None) + assert!(exact_evaluation(two(), rate, Some((0, 60_000)), None) .unwrap() .is_some()); - assert!(exact_readout(two(), rate, Some((60_000, 0)), None).is_err()); - assert!(exact_readout([], rate, Some((0, 60_000)), None).is_err()); + assert!(exact_evaluation(two(), rate, Some((60_000, 0)), None).is_err()); + assert!(exact_evaluation([], rate, Some((0, 60_000)), None).is_err()); } } diff --git a/crates/asap-physical-operators/src/expressions/arithmetic.rs b/crates/asap-physical-operators/src/expressions/arithmetic.rs index e0766763d..64dbb8301 100644 --- a/crates/asap-physical-operators/src/expressions/arithmetic.rs +++ b/crates/asap-physical-operators/src/expressions/arithmetic.rs @@ -20,12 +20,13 @@ pub fn evaluate_float64_arithmetic( /// Execute the Planner binary contract after a deployment has resolved matching rows. pub fn evaluate_binary( - operator: &planner_types::post_asap::BinaryOperator, + operator: &crate::expressions::binary::BinaryOperator, left: f64, right: f64, ) -> Result { + use crate::expressions::binary::BinaryOpKind; use crate::{values::Value, Error}; - use planner_types::pre_asap::{ArithmeticOpKind, BinaryOpKind}; + use planner_types::pre_asap::ArithmeticOpKind; let invalid = || Error::Invalid("unsupported binary operation or invalid checked-division domain".into()); if operator.vector_match.is_some() { diff --git a/crates/asap-physical-operators/src/expressions/binary.rs b/crates/asap-physical-operators/src/expressions/binary.rs new file mode 100644 index 000000000..81c1c2656 --- /dev/null +++ b/crates/asap-physical-operators/src/expressions/binary.rs @@ -0,0 +1,35 @@ +//! Execution configuration for a binary kernel, including comparison evaluation mode. +use planner_types::pre_asap::{ + ArithmeticOpKind, CompareOpKind, PromQLVectorSetOpKind, VectorMatch, +}; +#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] +pub enum BinaryOpKind { + Arithmetic(ArithmeticOpKind), + Compare(CompareOpKind), + CompareBool(CompareOpKind), + Set(PromQLVectorSetOpKind), +} +#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] +pub struct BinaryOperator { + pub kind: BinaryOpKind, + pub vector_match: Option, + pub checked_relative_division: bool, + pub checked_finite_division: bool, +} +impl BinaryOperator { + pub fn from_logical(operator: &planner_types::ir::BinaryOperator, return_bool: bool) -> Self { + use planner_types::pre_asap::BinaryOpKind as L; + Self { + kind: match &operator.kind { + L::Arithmetic(op) => BinaryOpKind::Arithmetic(op.clone()), + L::Compare(op) if return_bool => BinaryOpKind::CompareBool(op.clone()), + L::Compare(op) => BinaryOpKind::Compare(op.clone()), + L::CompareBool(op) => BinaryOpKind::CompareBool(op.clone()), + L::Set(op) => BinaryOpKind::Set(op.clone()), + }, + vector_match: operator.vector_match.clone(), + checked_relative_division: operator.checked_relative_division, + checked_finite_division: operator.checked_finite_division, + } + } +} diff --git a/crates/asap-physical-operators/src/expressions/mod.rs b/crates/asap-physical-operators/src/expressions/mod.rs index 8947743dc..aad035516 100644 --- a/crates/asap-physical-operators/src/expressions/mod.rs +++ b/crates/asap-physical-operators/src/expressions/mod.rs @@ -5,12 +5,13 @@ use crate::{ }; use planner_types::pre_asap::{ArithmeticOpKind, DataType}; pub mod arithmetic; +pub mod binary; mod planner; pub use planner::CompiledExpression; #[derive(serde::Serialize, serde::Deserialize, Clone, Debug)] pub enum Expression { Binary { - operator: planner_types::post_asap::BinaryOperator, + operator: crate::expressions::binary::BinaryOperator, left: Box, right: Box, }, @@ -64,7 +65,8 @@ impl Expression { left, right, } => { - use planner_types::pre_asap::{BinaryOpKind, CompareOpKind}; + use crate::expressions::binary::BinaryOpKind; + use planner_types::pre_asap::CompareOpKind; let (a, n) = left.dtype(input)?; let (b, m) = right.dtype(input)?; if a != DataType::Float64 || b != a || operator.vector_match.is_some() { diff --git a/crates/asap-physical-operators/src/expressions/planner.rs b/crates/asap-physical-operators/src/expressions/planner.rs index ae04b3f7c..99f4c2b89 100644 --- a/crates/asap-physical-operators/src/expressions/planner.rs +++ b/crates/asap-physical-operators/src/expressions/planner.rs @@ -3,20 +3,22 @@ use crate::{ values::{SchemaRef, Value}, Error, }; -use planner_types::pre_asap::{ArithmeticOpKind, CompareOpKind, DataType, QueryExpr, ScalarValue}; +use planner_types::pre_asap::{ArithmeticOpKind, CompareOpKind, DataType, ScalarValue}; + +use planner_types::ir::ScalarExpr; use std::{cmp::Ordering, sync::Arc}; pub(super) fn evaluate( - expr: &QueryExpr, + expr: &ScalarExpr, row: &[Value], schema: &planner_types::pre_asap::Schema, ) -> Result { match expr { - QueryExpr::Column(index) => row.get(*index).cloned().ok_or(Error::Invalid(format!( + ScalarExpr::Column(index) => row.get(*index).cloned().ok_or(Error::Invalid(format!( "column {index} outside row width {}", row.len() ))), - QueryExpr::Literal(value) => Ok(match value { + ScalarExpr::Literal(value) => Ok(match value { ScalarValue::Interval { months, days, @@ -32,18 +34,62 @@ pub(super) fn evaluate( ScalarValue::Boolean(value) => Value::Bool(*value), ScalarValue::Null => Value::Null, }), - QueryExpr::Compare { left, op, right } => { + ScalarExpr::Cast { expr, to, .. } => { + let value = evaluate(expr, row, schema)?; + match (value, to) { + (Value::Null, _) => Ok(Value::Null), + (Value::Int64(value), DataType::Float64) => Ok(Value::Float64(value as f64)), + (value, _) + if expr + .scalar_type(schema) + .map_err(|e| Error::Invalid(e.to_string()))? + .0 + == *to => + { + Ok(value) + } + _ => Err(Error::Invalid("unsupported cast".into())), + } + } + ScalarExpr::Negative { expr, .. } => match evaluate(expr, row, schema)? { + Value::Float64(v) => Ok(Value::Float64(-v)), + Value::Int64(v) => v + .checked_neg() + .map(Value::Int64) + .ok_or_else(|| Error::Invalid("integer negation overflow".into())), + Value::Null => Ok(Value::Null), + _ => Err(Error::Invalid("invalid negation input".into())), + }, + ScalarExpr::Compare { + left, op, right, .. + } => { let left = evaluate(left, row, schema)?; let right = evaluate(right, row, schema)?; compare(op, left, right) } - QueryExpr::Arithmetic { op, left, right } => arithmetic( + ScalarExpr::Arithmetic { + op, left, right, .. + } => arithmetic( op, evaluate(left, row, schema)?, evaluate(right, row, schema)?, ), - QueryExpr::BoolAnd(parts) | QueryExpr::BoolOr(parts) => { - let and = matches!(expr, QueryExpr::BoolAnd(_)); + ScalarExpr::Case { + operand: None, + branches, + else_expr, + } => { + for (condition, value) in branches { + if matches!(evaluate(condition, row, schema)?, Value::Bool(true)) { + return evaluate(value, row, schema); + } + } + else_expr + .as_ref() + .map_or(Ok(Value::Null), |e| evaluate(e, row, schema)) + } + ScalarExpr::BoolAnd(parts) | ScalarExpr::BoolOr(parts) => { + let and = matches!(expr, ScalarExpr::BoolAnd(_)); let mut null = false; for part in parts { match evaluate(part, row, schema)? { @@ -55,21 +101,44 @@ pub(super) fn evaluate( } Ok(if null { Value::Null } else { Value::Bool(and) }) } - QueryExpr::Not(value) => match evaluate(value, row, schema)? { + ScalarExpr::Not(value) => match evaluate(value, row, schema)? { Value::Bool(value) => Ok(Value::Bool(!value)), Value::Null => Ok(Value::Null), _ => Err(Error::Invalid("boolean predicate required".into())), }, - QueryExpr::IsNull(value) => Ok(Value::Bool(matches!( + ScalarExpr::IsNull(value) => Ok(Value::Bool(matches!( evaluate(value, row, schema)?, Value::Null ))), - QueryExpr::IsNotNull(value) => Ok(Value::Bool(!matches!( + ScalarExpr::IsNotNull(value) => Ok(Value::Bool(!matches!( evaluate(value, row, schema)?, Value::Null ))), - QueryExpr::FunctionCall { name, args } => { + ScalarExpr::FunctionCall { name, args } => { use planner_types::pre_asap::scalar_type_rules::MapScalarFunction; + if planner_types::pre_asap::scalar_type_rules::promql_function_arity(name).is_some() { + let values = args + .iter() + .map(|arg| match evaluate(arg, row, schema)? { + Value::Float64(v) => Ok(v), + _ => Err(Error::Invalid("PromQL function requires floats".into())), + }) + .collect::, _>>()?; + return Ok(Value::Float64(promql_function(name, &values)?)); + } + if name == "promql_drop_metric_name" { + let Value::Utf8(encoded) = evaluate(&args[0], row, schema)? else { + return Err(Error::Invalid("series identity must be Utf8".into())); + }; + let mut labels: std::collections::BTreeMap = + serde_json::from_str(&encoded).map_err(|e| Error::Invalid(e.to_string()))?; + labels.remove("__name__"); + return Ok(Value::Utf8( + serde_json::to_string(&labels) + .map_err(|e| Error::Invalid(e.to_string()))? + .into(), + )); + } if name.eq_ignore_ascii_case("asap_struct_field") { expr.scalar_type(schema) .map_err(|error| Error::Invalid(error.to_string()))?; @@ -81,10 +150,10 @@ pub(super) fn evaluate( unreachable!() }; let offset = match &args[1] { - QueryExpr::Literal(ScalarValue::Int64(index)) => { + ScalarExpr::Literal(ScalarValue::Int64(index)) => { usize::try_from(index - 1).ok() } - QueryExpr::Literal(ScalarValue::Utf8(name)) => { + ScalarExpr::Literal(ScalarValue::Utf8(name)) => { fields.iter().position(|field| &field.name == name) } _ => None, @@ -329,35 +398,120 @@ fn cell_cmp(left: &Value, right: &Value) -> Option { } } +fn promql_function(name: &str, args: &[f64]) -> Result { + let x = args[0]; + Ok(match &name[7..] { + "abs" => x.abs(), + "ceil" => x.ceil(), + "floor" => x.floor(), + "exp" => x.exp(), + "ln" => x.ln(), + "log2" => x.log2(), + "log10" => x.log10(), + "sqrt" => x.sqrt(), + "sgn" => { + if x.is_nan() { + f64::NAN + } else if x == 0.0 { + 0.0 + } else { + x.signum() + } + } + "sin" => x.sin(), + "cos" => x.cos(), + "tan" => x.tan(), + "asin" => x.asin(), + "acos" => x.acos(), + "atan" => x.atan(), + "sinh" => x.sinh(), + "cosh" => x.cosh(), + "tanh" => x.tanh(), + "asinh" => x.asinh(), + "acosh" => x.acosh(), + "atanh" => x.atanh(), + "deg" => x.to_degrees(), + "rad" => x.to_radians(), + "round" => { + let inverse = 1.0 / args[1]; + (x * inverse + 0.5).floor() / inverse + } + "clamp_min" => { + if x.is_nan() || args[1].is_nan() { + f64::NAN + } else { + x.max(args[1]) + } + } + "clamp_max" => { + if x.is_nan() || args[1].is_nan() { + f64::NAN + } else { + x.min(args[1]) + } + } + "clamp" => { + if args.iter().any(|x| x.is_nan()) { + f64::NAN + } else { + x.max(args[1]).min(args[2]) + } + } + part => { + use chrono::{Datelike, Timelike}; + if !x.is_finite() || x < i64::MIN as f64 || x >= i64::MAX as f64 { + return Ok(f64::NAN); + } + let Some(date) = chrono::DateTime::from_timestamp(x as i64, 0) else { + return Ok(f64::NAN); + }; + match part { + "minute" => date.minute() as f64, + "hour" => date.hour() as f64, + "day_of_week" => date.weekday().num_days_from_sunday() as f64, + "day_of_month" => date.day() as f64, + "day_of_year" => date.ordinal() as f64, + "month" => date.month() as f64, + "year" => date.year() as f64, + "days_in_month" => { + let year = date.year(); + let leap = year % 4 == 0 && (year % 100 != 0 || year % 400 == 0); + match date.month() { + 2 => { + if leap { + 29.0 + } else { + 28.0 + } + } + 4 | 6 | 9 | 11 => 30.0, + _ => 31.0, + } + } + _ => return Err(Error::Invalid("unregistered PromQL function".into())), + } + } + }) +} + #[derive(serde::Serialize, serde::Deserialize, Clone, Debug)] pub struct CompiledExpression { - expression: QueryExpr, + expression: ScalarExpr, schema: planner_types::pre_asap::Schema, output: (DataType, bool), } impl CompiledExpression { - pub(crate) fn expression(&self) -> &QueryExpr { + pub(crate) fn expression(&self) -> &ScalarExpr { &self.expression } - pub fn compile(expression: &QueryExpr, input: &SchemaRef) -> Result { - let schema = input - .fields - .iter() - .map(|field| { - let planner_types::post_asap::FieldDataType::Plain(dtype) = &field.dtype else { - return Err(Error::Invalid( - "scalar expression cannot consume opaque summary state".into(), - )); - }; - Ok(planner_types::pre_asap::Field::plain( - field.name.clone(), - dtype.clone(), - field.nullable, - )) - }) - .collect::, Error>>()?; - let schema = planner_types::pre_asap::Schema::new(schema); + pub fn compile(expression: &ScalarExpr, input: &SchemaRef) -> Result { + if !input.is_all_plain() { + return Err(Error::Invalid( + "scalar expression cannot consume summary state".into(), + )); + } + let schema = input.as_ref().clone(); validate(expression, &schema)?; let output = expression .scalar_type(&schema) @@ -398,8 +552,7 @@ impl CompiledExpression { if row.len() != self.schema.fields.len() || row.iter().zip(&self.schema.fields).any(|(value, column)| { !column - .dtype - .plain() + .plain_dtype() .is_some_and(|dtype| value.matches(dtype, column.nullable)) }) { @@ -410,13 +563,27 @@ impl CompiledExpression { evaluate(&self.expression, row, &self.schema) } } -fn validate(expr: &QueryExpr, schema: &planner_types::pre_asap::Schema) -> Result<(), Error> { +fn validate(expr: &ScalarExpr, schema: &planner_types::pre_asap::Schema) -> Result<(), Error> { let invalid = || Error::Invalid(format!("unsupported scalar expression: {expr:?}")); expr.scalar_type(schema) .map_err(|e| Error::Invalid(e.to_string()))?; match expr { - QueryExpr::Column(_) | QueryExpr::Literal(_) => Ok(()), - QueryExpr::Arithmetic { left, right, .. } => { + ScalarExpr::Column(_) | ScalarExpr::Literal(_) => Ok(()), + ScalarExpr::Cast { expr, to, .. } => { + let source = expr + .scalar_type(schema) + .map_err(|e| Error::Invalid(e.to_string()))? + .0; + if source != *to + && source != DataType::Null + && !(source == DataType::Int64 && *to == DataType::Float64) + { + return Err(invalid()); + } + validate(expr, schema) + } + ScalarExpr::Negative { expr, .. } => validate(expr, schema), + ScalarExpr::Arithmetic { left, right, .. } => { for value in [left, right] { validate(value, schema)?; if !matches!( @@ -431,7 +598,9 @@ fn validate(expr: &QueryExpr, schema: &planner_types::pre_asap::Schema) -> Resul } Ok(()) } - QueryExpr::Compare { left, right, op } => { + ScalarExpr::Compare { + left, right, op, .. + } => { if !matches!( op, CompareOpKind::Eq @@ -475,8 +644,10 @@ fn validate(expr: &QueryExpr, schema: &planner_types::pre_asap::Schema) -> Resul } Ok(()) } - QueryExpr::FunctionCall { name, args } => { - if name != "asap_struct_field" + ScalarExpr::FunctionCall { name, args } => { + if name != "promql_drop_metric_name" + && planner_types::pre_asap::scalar_type_rules::promql_function_arity(name).is_none() + && name != "asap_struct_field" && name != "asap_element_access" && planner_types::pre_asap::scalar_type_rules::MapScalarFunction::from_name(name) .is_none() @@ -488,7 +659,29 @@ fn validate(expr: &QueryExpr, schema: &planner_types::pre_asap::Schema) -> Resul } Ok(()) } - QueryExpr::BoolAnd(parts) | QueryExpr::BoolOr(parts) => { + ScalarExpr::Case { + operand: None, + branches, + else_expr, + } => { + for (condition, value) in branches { + validate(condition, schema)?; + if condition + .scalar_type(schema) + .map_err(|e| Error::Invalid(e.to_string()))? + .0 + != DataType::Bool + { + return Err(invalid()); + } + validate(value, schema)?; + } + if let Some(value) = else_expr { + validate(value, schema)?; + } + Ok(()) + } + ScalarExpr::BoolAnd(parts) | ScalarExpr::BoolOr(parts) => { for part in parts { validate(part, schema)?; if !matches!( @@ -502,7 +695,7 @@ fn validate(expr: &QueryExpr, schema: &planner_types::pre_asap::Schema) -> Resul } Ok(()) } - QueryExpr::Not(value) => { + ScalarExpr::Not(value) => { validate(value, schema)?; if !matches!( value @@ -515,7 +708,7 @@ fn validate(expr: &QueryExpr, schema: &planner_types::pre_asap::Schema) -> Resul } Ok(()) } - QueryExpr::IsNull(value) | QueryExpr::IsNotNull(value) => validate(value, schema), + ScalarExpr::IsNull(value) | ScalarExpr::IsNotNull(value) => validate(value, schema), _ => Err(invalid()), } } diff --git a/crates/asap-physical-operators/src/lib.rs b/crates/asap-physical-operators/src/lib.rs index 345ee762d..ea6b73eaf 100644 --- a/crates/asap-physical-operators/src/lib.rs +++ b/crates/asap-physical-operators/src/lib.rs @@ -20,7 +20,7 @@ pub use planner_types as planner; pub mod dag; -pub mod readout; +pub mod evaluation; mod error; pub use error::Error; diff --git a/crates/asap-physical-operators/src/operators/aggregate/mod.rs b/crates/asap-physical-operators/src/operators/aggregate/mod.rs index 76eccd5ee..7b51b3c66 100644 --- a/crates/asap-physical-operators/src/operators/aggregate/mod.rs +++ b/crates/asap-physical-operators/src/operators/aggregate/mod.rs @@ -24,7 +24,8 @@ impl Operator { } else { t.clone() }, - false, + !input.has_promql_series_identity() + && (groups.is_empty() || plain(&input, *i)?.1), ) } Reduction::Quantile { column, q } => { @@ -183,7 +184,8 @@ async fn reduce( let mut work = Cooperative::new(context); let mut workspace = Workspace::new(context)?; let mut grouped = BTreeMap::>, Vec>>::new(); - if rows.is_empty() && groups.is_empty() { + // PromQL sums over an empty vector emit no sample. + if rows.is_empty() && groups.is_empty() && !input.has_promql_series_identity() { grouped.insert(vec![], vec![]); } for row in rows { @@ -318,6 +320,9 @@ async fn reduce_one( .ok_or_else(|| invalid("integer aggregate overflow"))?; count += 1; } + if count == 0 && !input.has_promql_series_identity() { + return Ok(Value::Null); + } return if matches!(measure, Reduction::Avg(_)) { Ok(Value::Float64(sum as f64 / count as f64)) } else { @@ -334,6 +339,9 @@ async fn reduce_one( }; floats.push(*v); } + if floats.is_empty() && !input.has_promql_series_identity() { + return Ok(Value::Null); + } Ok(Value::Float64(if matches!(measure, Reduction::Avg(_)) { promql_avg(&floats) } else { diff --git a/crates/asap-physical-operators/src/operators/aggregate/temporal.rs b/crates/asap-physical-operators/src/operators/aggregate/temporal.rs index e40a1fa56..a289c5284 100644 --- a/crates/asap-physical-operators/src/operators/aggregate/temporal.rs +++ b/crates/asap-physical-operators/src/operators/aggregate/temporal.rs @@ -308,7 +308,7 @@ mod tests { values::Batch, }; use planner_types::{ - post_asap::{Field, FieldDataType, Schema}, + post_asap::{Field as SummaryField, FieldDataType as SummaryFamilyType, Schema}, pre_asap::DataType, types::AccuracyTarget, }; @@ -318,23 +318,23 @@ mod tests { #[test] fn temporal_windows_execute_in_both_phases_and_count_is_integer() { let schema = Arc::new(Schema { - closed: true, - unique_keys: vec![], fields: vec![ - Field { - table: None, + SummaryField { name: "time".into(), - dtype: FieldDataType::Plain(DataType::Timestamp), + dtype: SummaryFamilyType::Plain(DataType::Timestamp), nullable: false, - }, - Field { table: None, + }, + SummaryField { name: "value".into(), - dtype: FieldDataType::Plain(DataType::Float64), + dtype: SummaryFamilyType::Plain(DataType::Float64), nullable: false, + table: None, }, ], time_index: Some(0), + unique_keys: vec![], + closed: false, }); for scope in [ Scope::Query { diff --git a/crates/asap-physical-operators/src/operators/aligned_binary.rs b/crates/asap-physical-operators/src/operators/aligned_binary.rs index 188d28d6f..909dcc369 100644 --- a/crates/asap-physical-operators/src/operators/aligned_binary.rs +++ b/crates/asap-physical-operators/src/operators/aligned_binary.rs @@ -1,6 +1,8 @@ //! Arithmetic on complete, aligned population/window rows used by precomputation. use super::*; -use planner_types::{post_asap::BinaryOperator, pre_asap::BinaryOpKind}; +use crate::expressions::binary::BinaryOpKind; +use crate::expressions::binary::BinaryOperator; + use std::collections::BTreeSet; impl Operator { @@ -22,11 +24,9 @@ impl Operator { )); } for (input, value) in [(&left, values.0), (&right, values.1)] { - if input - .fields - .get(value) - .is_none_or(|f| f.nullable || f.dtype != FieldDataType::Plain(DataType::Float64)) - { + if input.fields.get(value).is_none_or(|f| { + f.nullable || f.dtype != SummaryFamilyType::Plain(DataType::Float64) + }) { return Err(invalid( "aligned arithmetic requires non-null Float64 values", )); diff --git a/crates/asap-physical-operators/src/operators/common.rs b/crates/asap-physical-operators/src/operators/common.rs index 5ef5023cd..f67314bb1 100644 --- a/crates/asap-physical-operators/src/operators/common.rs +++ b/crates/asap-physical-operators/src/operators/common.rs @@ -2,20 +2,20 @@ use super::*; pub(super) fn invalid(message: &str) -> Error { Error::Invalid(message.into()) } -pub(super) fn schema(fields: Vec) -> SchemaRef { +pub(super) fn schema(fields: Vec) -> SchemaRef { Arc::new(Schema { - closed: true, - unique_keys: vec![], fields, + unique_keys: vec![], + closed: false, time_index: None, }) } -pub(super) fn result_field(name: &str, dtype: DataType, nullable: bool) -> Field { - Field { - table: None, +pub(super) fn result_field(name: &str, dtype: DataType, nullable: bool) -> SummaryField { + SummaryField { name: name.into(), - dtype: FieldDataType::Plain(dtype), + dtype: SummaryFamilyType::Plain(dtype), nullable, + table: None, } } @@ -76,4 +76,3 @@ pub(super) fn key_bytes(key: &[Vec]) -> usize { .map(|part| std::mem::size_of::>() + part.len()) .sum::() } -use planner_types::pre_asap::Schema; diff --git a/crates/asap-physical-operators/src/operators/joins/mod.rs b/crates/asap-physical-operators/src/operators/joins/mod.rs index 76e2f748c..652fbcdcc 100644 --- a/crates/asap-physical-operators/src/operators/joins/mod.rs +++ b/crates/asap-physical-operators/src/operators/joins/mod.rs @@ -22,6 +22,15 @@ impl Operator { output: left, }) } + /// Require every candidate key to have an authoritative value at execution. + pub fn certified_semi_join( + left: SchemaRef, + right: SchemaRef, + keys: Vec<(usize, usize)>, + ) -> Result { + Ok(Self::semi_join(left, right, keys)?.require_complete_right()) + } + pub(crate) fn require_complete_right(mut self) -> Self { if let Kind::SemiJoin { require_complete_right, @@ -45,7 +54,7 @@ impl Operator { left: SchemaRef, right: SchemaRef, kind: planner_types::pre_asap::JoinKind, - predicate: &planner_types::pre_asap::Predicate, + predicate: &planner_types::ir::Predicate, output: SchemaRef, ) -> Result { use planner_types::pre_asap::JoinKind; diff --git a/crates/asap-physical-operators/src/operators/mod.rs b/crates/asap-physical-operators/src/operators/mod.rs index 4c7e5f5c6..517019118 100644 --- a/crates/asap-physical-operators/src/operators/mod.rs +++ b/crates/asap-physical-operators/src/operators/mod.rs @@ -8,7 +8,7 @@ use crate::{ }; use futures::StreamExt; use planner_types::{ - post_asap::{Field, FieldDataType, SummaryUpdate}, + post_asap::{Field as SummaryField, FieldDataType as SummaryFamilyType, Schema, SummaryUpdate}, pre_asap::{ColumnRef, DataType}, }; use std::{collections::BTreeMap, sync::Arc}; @@ -34,7 +34,7 @@ pub(crate) mod vector_window; pub use aggregate::Reduction; pub use series_window::SubquerySteps; pub use sort::SortKey; -pub use summary::ReadoutQuery; +pub use summary::SummaryEvaluation; #[derive(Clone, serde::Serialize, serde::Deserialize)] enum Kind { #[serde(skip)] @@ -58,13 +58,13 @@ enum Kind { column: usize, }, VectorBinary { - operator: planner_types::post_asap::BinaryOperator, + operator: crate::expressions::binary::BinaryOperator, return_bool: bool, }, AlignedBinary { keys: Vec<(usize, usize)>, values: (usize, usize), - operator: planner_types::post_asap::BinaryOperator, + operator: crate::expressions::binary::BinaryOperator, }, RangeWindow { intent: Box>, @@ -89,7 +89,7 @@ enum Kind { unique: bool, }, SeriesBinary { - operator: planner_types::post_asap::BinaryOperator, + operator: crate::expressions::binary::BinaryOperator, scalars: [bool; 2], }, SeriesRelabel { @@ -133,18 +133,18 @@ enum Kind { predicate: Box, }, SummaryBuild { - family: FieldDataType, + family: SummaryFamilyType, value: usize, time: Option, groups: Vec, }, KeyedSummaryBuild { - family: FieldDataType, + family: SummaryFamilyType, value: usize, items: Vec, groups: Vec, }, - KeyedReadout { + KeyedEvaluation { state: usize, k: usize, }, @@ -152,9 +152,9 @@ enum Kind { state: usize, groups: Vec, }, - Readout { + Evaluation { state: usize, - query: ReadoutQuery, + query: SummaryEvaluation, }, } /// A bound operation has a fully checked input/output contract before execution. @@ -175,11 +175,11 @@ impl Operator { } } - pub(crate) fn is_counter_readout(&self) -> bool { + pub(crate) fn is_counter_evaluation(&self) -> bool { matches!( self.kind, - Kind::Readout { - query: ReadoutQuery::Exact(crate::summary_kernels::exact::ExactReadout { + Kind::Evaluation { + query: SummaryEvaluation::Exact(crate::summary_kernels::exact::ExactEvaluation { statistic: crate::Statistic::Rate | crate::Statistic::Increase, .. }), @@ -192,21 +192,24 @@ impl Operator { if lookback <= 0 { return Err(invalid("counter lookback must be positive")); } - if let Kind::Readout { - query: ReadoutQuery::Exact(readout), + if let Kind::Evaluation { + query: SummaryEvaluation::Exact(evaluation), .. } = &mut self.kind { - readout.lookback_ms = Some(lookback); + evaluation.lookback_ms = Some(lookback); } Ok(self) } - /// Resolve a counter readout's logical lookback to this run's evaluation range. - pub(super) fn readout_range(&self, context: &RunContext) -> Result, Error> { - let Kind::Readout { + /// Resolve a counter evaluation's logical lookback to this run's evaluation range. + pub(super) fn evaluation_range( + &self, + context: &RunContext, + ) -> Result, Error> { + let Kind::Evaluation { query: - ReadoutQuery::Exact(crate::summary_kernels::exact::ExactReadout { + SummaryEvaluation::Exact(crate::summary_kernels::exact::ExactEvaluation { lookback_ms: Some(lookback), .. }), @@ -252,7 +255,7 @@ impl Operator { } if output.time_index.is_some_and(|i| { i >= output.fields.len() - || output.fields[i].dtype != FieldDataType::Plain(DataType::Timestamp) + || output.fields[i].dtype != SummaryFamilyType::Plain(DataType::Timestamp) }) { return Err(invalid("invalid output time column")); } @@ -335,15 +338,15 @@ impl PhysicalOperator for Operator { Kind::SemiJoin { .. } => "SemiJoin", Kind::Join { .. } => "RelationalJoin", Kind::SummaryBuild { .. } | Kind::KeyedSummaryBuild { .. } => "SummaryAgg", - Kind::KeyedReadout { .. } => "SummaryEstimate", + Kind::KeyedEvaluation { .. } => "SummaryEstimate", Kind::SummaryMerge { .. } => "SummaryMerge", - Kind::Readout { .. } => "SummaryReadout", + Kind::Evaluation { .. } => "SummaryEvaluation", } } fn validate_context(&self, context: &RunContext) -> Result<(), Error> { current_series::validate_context(self, context)?; series_window::validate_context(self, context)?; - self.readout_range(context).map(|_| ()) + self.evaluation_range(context).map(|_| ()) } fn input_schemas(&self) -> Vec { self.inputs.clone() @@ -387,9 +390,9 @@ impl PhysicalOperator for Operator { Kind::Join { .. } | Kind::SemiJoin { .. } => joins::execute(self, inputs, context), Kind::SummaryMerge { .. } => summary::execute_merge(self, inputs, context), Kind::SummaryBuild { .. } - | Kind::Readout { .. } + | Kind::Evaluation { .. } | Kind::KeyedSummaryBuild { .. } - | Kind::KeyedReadout { .. } => summary::execute(self, inputs, context), + | Kind::KeyedEvaluation { .. } => summary::execute(self, inputs, context), } } } diff --git a/crates/asap-physical-operators/src/operators/scope_timestamp.rs b/crates/asap-physical-operators/src/operators/scope_timestamp.rs index bb7a4e855..33fbdd1ec 100644 --- a/crates/asap-physical-operators/src/operators/scope_timestamp.rs +++ b/crates/asap-physical-operators/src/operators/scope_timestamp.rs @@ -26,7 +26,7 @@ impl Operator { candidate.dtype == field.dtype && candidate.nullable == field.nullable && (candidate.name == field.name - || !matches!(field.dtype, FieldDataType::Plain(_))) + || !matches!(field.dtype, SummaryFamilyType::Plain(_))) }) .map(|(index, _)| index) .collect(); diff --git a/crates/asap-physical-operators/src/operators/series_labels.rs b/crates/asap-physical-operators/src/operators/series_labels.rs index 2a8c5d1ee..3987c5142 100644 --- a/crates/asap-physical-operators/src/operators/series_labels.rs +++ b/crates/asap-physical-operators/src/operators/series_labels.rs @@ -1,10 +1,9 @@ //! PromQL label-set rewriting and binary operators over rows that carry a //! series identity or plain label columns. use super::*; -use planner_types::{ - post_asap::BinaryOperator, - pre_asap::{schema::PROMQL_SERIES_IDENTITY, BinaryOpKind, VectorMatchKind}, -}; +use crate::expressions::binary::BinaryOpKind; +use crate::expressions::binary::BinaryOperator; +use planner_types::pre_asap::{schema::PROMQL_SERIES_IDENTITY, VectorMatchKind}; type Labels = BTreeMap; diff --git a/crates/asap-physical-operators/src/operators/summary/mod.rs b/crates/asap-physical-operators/src/operators/summary/mod.rs index 90cc2c724..5dab8109f 100644 --- a/crates/asap-physical-operators/src/operators/summary/mod.rs +++ b/crates/asap-physical-operators/src/operators/summary/mod.rs @@ -1,22 +1,22 @@ use super::*; -/// A summary readout: a sketch query, or an exact readout with typed parameters. +/// A summary evaluation: a sketch query, or an exact evaluation with typed parameters. #[derive(Clone, Debug, PartialEq, serde::Serialize, serde::Deserialize)] -pub enum ReadoutQuery { +pub enum SummaryEvaluation { Sketch(planner_types::post_asap::SketchStatistic), - Exact(crate::summary_kernels::exact::ExactReadout), + Exact(crate::summary_kernels::exact::ExactEvaluation), } impl Operator { pub fn keyed_summary_build( input: SchemaRef, - family: FieldDataType, + family: SummaryFamilyType, value: usize, items: Vec, groups: Vec, ) -> Result { use crate::summary_kernels::weighted_frequency::WeightedFrequency; crate::values::validate_family(&family)?; - let FieldDataType::Sketch(kind, _) = &family else { + let SummaryFamilyType::Sketch(kind, _) = &family else { return Err(invalid("keyed sketch required")); }; WeightedFrequency::configuration(kind)?; @@ -43,11 +43,11 @@ impl Operator { .iter() .map(|&i| input.fields[i].clone()) .collect::>(); - fields.push(Field { - table: None, + fields.push(SummaryField { name: "state".into(), dtype: family.clone(), nullable: false, + table: None, }); Ok(Self { kind: Kind::KeyedSummaryBuild { @@ -60,7 +60,7 @@ impl Operator { output: schema(fields), }) } - pub fn keyed_readout( + pub fn keyed_evaluation( input: SchemaRef, state: usize, k: usize, @@ -68,31 +68,31 @@ impl Operator { ) -> Result { use crate::summary_kernels::weighted_frequency::WeightedFrequency; crate::values::validate_family(&field(&input, state)?.dtype)?; - let FieldDataType::Sketch(kind, _) = &field(&input, state)?.dtype else { - return Err(invalid("keyed readout requires summary state")); + let SummaryFamilyType::Sketch(kind, _) = &field(&input, state)?.dtype else { + return Err(invalid("keyed evaluation requires summary state")); }; let (_, _, _, capacity) = WeightedFrequency::configuration(kind)?; if k > capacity || output.fields.len() <= input.fields.len() { - return Err(invalid("invalid keyed readout shape or capacity")); + return Err(invalid("invalid keyed evaluation shape or capacity")); } if state + 1 != input.fields.len() || output.fields[..state] != input.fields[..state] - || output.fields.last().unwrap().dtype != FieldDataType::Plain(DataType::Float64) + || output.fields.last().unwrap().dtype != SummaryFamilyType::Plain(DataType::Float64) { return Err(invalid( - "keyed readout must preserve partitions and return a Float64 score", + "keyed evaluation must preserve partitions and return a Float64 score", )); } crate::values::validate_schema(&output)?; Ok(Self { - kind: Kind::KeyedReadout { state, k }, + kind: Kind::KeyedEvaluation { state, k }, inputs: vec![input], output, }) } pub fn summary_build( input: SchemaRef, - family: FieldDataType, + family: SummaryFamilyType, value: usize, time: Option, groups: Vec, @@ -110,7 +110,7 @@ impl Operator { if time.is_none() && matches!( family, - FieldDataType::ExactAggregate( + SummaryFamilyType::ExactAggregate( planner_types::post_asap::ExactKind::Rate | planner_types::post_asap::ExactKind::Increase, _ @@ -129,11 +129,11 @@ impl Operator { .iter() .map(|&i| input.fields[i].clone()) .collect::>(); - fields.push(Field { - table: None, + fields.push(SummaryField { name: "state".into(), dtype: family.clone(), nullable: false, + table: None, }); Ok(Self { kind: Kind::SummaryBuild { @@ -153,7 +153,7 @@ impl Operator { ) -> Result { validate_groups(&input, &groups)?; crate::values::validate_family(&field(&input, state)?.dtype)?; - if matches!(field(&input, state)?.dtype, FieldDataType::Plain(_)) { + if matches!(field(&input, state)?.dtype, SummaryFamilyType::Plain(_)) { return Err(invalid("summary state required")); } let mut fields = groups @@ -167,21 +167,25 @@ impl Operator { output: schema(fields), }) } - pub fn readout(input: SchemaRef, state: usize, query: ReadoutQuery) -> Result { + pub fn evaluation( + input: SchemaRef, + state: usize, + query: SummaryEvaluation, + ) -> Result { let family = &field(&input, state)?.dtype; crate::values::validate_family(family)?; match &query { - ReadoutQuery::Sketch(query) => { - crate::capability::validate_sketch_readout(family, query)? + SummaryEvaluation::Sketch(query) => { + crate::capability::validate_sketch_evaluation(family, query)? } - ReadoutQuery::Exact(readout) => { - crate::capability::validate_exact_readout(family, readout)? + SummaryEvaluation::Exact(evaluation) => { + crate::capability::validate_exact_evaluation(family, evaluation)? } } let mut fields = input.fields.clone(); let result_type = if matches!( fields[state].dtype, - FieldDataType::ExactAggregate(planner_types::post_asap::ExactKind::Count, _) + SummaryFamilyType::ExactAggregate(planner_types::post_asap::ExactKind::Count, _) ) || integral_count(family, &query) { DataType::Int64 @@ -193,7 +197,7 @@ impl Operator { let nullable = fields.len() == 1 && matches!( fields[state].dtype, - FieldDataType::ExactAggregate( + SummaryFamilyType::ExactAggregate( planner_types::post_asap::ExactKind::Min | planner_types::post_asap::ExactKind::Max, _ @@ -201,7 +205,7 @@ impl Operator { ); fields[state] = result_field("value", result_type, nullable); Ok(Self { - kind: Kind::Readout { state, query }, + kind: Kind::Evaluation { state, query }, inputs: vec![input], output: schema(fields), }) @@ -210,12 +214,12 @@ impl Operator { /// The Planner reads a Count-Min bare count only for count intents, whose /// output is Int64 and whose updates have unit weight; execution rejects a /// non-integral total rather than rounding it. -fn integral_count(family: &FieldDataType, query: &ReadoutQuery) -> bool { - matches!(family, FieldDataType::Sketch(kind, _) +fn integral_count(family: &SummaryFamilyType, query: &SummaryEvaluation) -> bool { + matches!(family, SummaryFamilyType::Sketch(kind, _) if kind.algorithm() == &planner_types::post_asap::SketchAlgorithm::Cms) && matches!( query, - ReadoutQuery::Sketch(planner_types::post_asap::SketchStatistic::PointCount { + SummaryEvaluation::Sketch(planner_types::post_asap::SketchStatistic::PointCount { value: None, .. }) @@ -226,7 +230,7 @@ pub(super) fn execute<'a>( mut inputs: Vec>, context: RunContext, ) -> Result, Error> { - let range_ms = operator.readout_range(&context)?; + let range_ms = operator.evaluation_range(&context)?; let output = operator.output.clone(); let input = inputs.pop().ok_or_else(|| invalid("input missing"))?; match &operator.kind { @@ -238,7 +242,7 @@ pub(super) fn execute<'a>( } => Ok(futures::stream::once(async move { Batch::try_new( output, - build_summary(input, family, *value, *time, groups, &context).await?, + build_summary(input, family, *value, *time, groups, !operator.inputs[0].has_promql_series_identity(), &context).await?, ) }) .boxed_local()), @@ -254,7 +258,7 @@ pub(super) fn execute<'a>( ) }) .boxed_local()), - Kind::KeyedReadout { state, k } => Ok(input + Kind::KeyedEvaluation { state, k } => Ok(input .map(move |batch| { let batch = batch?; let mut rows = Vec::new(); @@ -272,7 +276,7 @@ pub(super) fn execute<'a>( // The typed output schema restores epoch-millisecond // timestamp keys from the kernel's Int64 representation. for (value, field) in values.iter_mut().zip(&output.fields) { - if field.dtype == FieldDataType::Plain(DataType::Timestamp) { + if field.dtype == SummaryFamilyType::Plain(DataType::Timestamp) { if let Value::Int64(time) = value { *value = Value::Timestamp(*time); } @@ -284,25 +288,25 @@ pub(super) fn execute<'a>( Batch::try_new(output.clone(), rows) }) .boxed_local()), - Kind::Readout { state, query } => Ok(input + Kind::Evaluation { state, query } => Ok(input .map(move |batch| { let batch = batch?; let mut rows = batch.rows().to_vec(); - if let ReadoutQuery::Exact(readout) = query { + if let SummaryEvaluation::Exact(evaluation) = query { rows.retain(|row| !matches!(&row[*state], Value::Summary { state: summary, .. } - if crate::readout::insufficient_counter_samples(summary.as_ref(), readout.statistic))); + if crate::evaluation::insufficient_counter_samples(summary.as_ref(), evaluation.statistic))); } for row in &mut rows { let Value::Summary { state: summary, .. } = &row[*state] else { return Err(invalid("summary value required")); }; row[*state] = match query { - ReadoutQuery::Sketch(query) => { + SummaryEvaluation::Sketch(query) => { let value = summary .estimate(query) .map_err(|e| Error::Operator(e.to_string()))?; if output.fields[*state].dtype - == FieldDataType::Plain(DataType::Int64) + == SummaryFamilyType::Plain(DataType::Int64) { // Below 2^53 an f64 sum of unit updates is exact. if value.fract() != 0.0 || !(0.0..9.007_199_254_740_992e15).contains(&value) { @@ -315,12 +319,13 @@ pub(super) fn execute<'a>( Value::Float64(value) } } - ReadoutQuery::Exact(readout) => { + SummaryEvaluation::Exact(evaluation) => { let exact = summary .as_any() .downcast_ref::() - .ok_or_else(|| invalid("exact readout requires exact state"))?; - if output.fields[*state].dtype == FieldDataType::Plain(DataType::Int64) { + .ok_or_else(|| invalid("exact evaluation requires exact state"))?; + if output.fields[*state].nullable && exact.is_empty_sum() { Value::Null } + else if output.fields[*state].dtype == SummaryFamilyType::Plain(DataType::Int64) { let count = exact.count().ok_or_else(|| { Error::Operator("exact count state lacks an integer count".into()) })?; @@ -329,7 +334,7 @@ pub(super) fn execute<'a>( })?) } else { match exact - .readout(readout.statistic, range_ms, None) + .evaluation(evaluation.statistic, range_ms, None) .map_err(|e| Error::Operator(e.to_string()))? { Some(value) => Value::Float64(value), @@ -372,10 +377,11 @@ pub(super) fn execute_merge<'a>( async fn build_summary( mut input: Input<'_, Batch>, - family: &FieldDataType, + family: &SummaryFamilyType, value: usize, time: Option, groups: &[usize], + emit_empty_global: bool, context: &RunContext, ) -> Result>, Error> { type State = ( @@ -398,12 +404,13 @@ async fn build_summary( }; let mut work = Cooperative::new(context); let mut states = BTreeMap::>, State>::new(); - if groups.is_empty() { + // PromQL aggregation of an empty vector produces no sample. + if groups.is_empty() && emit_empty_global { states.insert(vec![], create(vec![], 0)?); } let ordered_time = matches!( family, - FieldDataType::ExactAggregate( + SummaryFamilyType::ExactAggregate( planner_types::post_asap::ExactKind::Rate | planner_types::post_asap::ExactKind::Increase, _ @@ -472,7 +479,7 @@ async fn merge_summary( groups: &[usize], context: &RunContext, ) -> Result>, Error> { - type GroupState = (Vec, FieldDataType, Arc); + type GroupState = (Vec, SummaryFamilyType, Arc); let mut states: BTreeMap>, GroupState> = BTreeMap::new(); let mut work = Cooperative::new(context); let mut memory = context.reserve(0)?; @@ -531,14 +538,14 @@ async fn merge_summary( async fn build_keyed_summary( mut input: Input<'_, Batch>, - family: &FieldDataType, + family: &SummaryFamilyType, value: usize, items: &[usize], groups: &[usize], context: &RunContext, ) -> Result>, Error> { use crate::{summary_kernels::weighted_frequency::WeightedFrequency, AggregateCore}; - let FieldDataType::Sketch(kind, _) = family else { + let SummaryFamilyType::Sketch(kind, _) = family else { unreachable!() }; let (algorithm, width, depth, capacity) = WeightedFrequency::configuration(kind)?; diff --git a/crates/asap-physical-operators/src/operators/unchecked.rs b/crates/asap-physical-operators/src/operators/unchecked.rs index d3504f9a9..1b5dd7c4f 100644 --- a/crates/asap-physical-operators/src/operators/unchecked.rs +++ b/crates/asap-physical-operators/src/operators/unchecked.rs @@ -138,9 +138,7 @@ impl TryFrom for Operator { input(0)?, input(1)?, kind, - &planner_types::pre_asap::Predicate(std::rc::Rc::new( - predicate.expression().clone(), - )), + &planner_types::ir::Predicate(predicate.expression().clone()), output.clone(), )?, Kind::SummaryBuild { @@ -155,13 +153,13 @@ impl TryFrom for Operator { items, groups, } => Operator::keyed_summary_build(input(0)?, family, value, items, groups)?, - Kind::KeyedReadout { state, k } => { - Operator::keyed_readout(input(0)?, state, k, output.clone())? + Kind::KeyedEvaluation { state, k } => { + Operator::keyed_evaluation(input(0)?, state, k, output.clone())? } Kind::SummaryMerge { state, groups } => { Operator::summary_merge(input(0)?, state, groups)? } - Kind::Readout { state, query } => Operator::readout(input(0)?, state, query)?, + Kind::Evaluation { state, query } => Operator::evaluation(input(0)?, state, query)?, } .with_output_schema(output)?; if serde_json::to_value(&op.kind).map_err(|error| invalid(&error.to_string()))? diff --git a/crates/asap-physical-operators/src/operators/vector_binary.rs b/crates/asap-physical-operators/src/operators/vector_binary.rs index 7027fb9be..0f4af7cf4 100644 --- a/crates/asap-physical-operators/src/operators/vector_binary.rs +++ b/crates/asap-physical-operators/src/operators/vector_binary.rs @@ -1,6 +1,7 @@ //! Label matching and scalar broadcasting are physical computation, not source binding. use super::*; -use planner_types::{post_asap::BinaryOperator, pre_asap::BinaryOpKind}; +use crate::expressions::binary::BinaryOpKind; +use crate::expressions::binary::BinaryOperator; pub(crate) fn value_schema(scalar: bool) -> SchemaRef { let mut fields = Vec::new(); diff --git a/crates/asap-physical-operators/src/operators/vector_window.rs b/crates/asap-physical-operators/src/operators/vector_window.rs index 6b4d58347..6b21ff6a4 100644 --- a/crates/asap-physical-operators/src/operators/vector_window.rs +++ b/crates/asap-physical-operators/src/operators/vector_window.rs @@ -1,7 +1,6 @@ //! Window bounds are typed input data; aggregation and histogram semantics stay native. use super::*; use planner_types::pre_asap::AggIntent; -use planner_types::pre_asap::Schema; pub(crate) fn matrix_schema() -> SchemaRef { let mut fields = vector_binary::value_schema(false).fields.clone(); @@ -9,9 +8,9 @@ pub(crate) fn matrix_schema() -> SchemaRef { fields.push(result_field("window_start", DataType::Timestamp, false)); fields.push(result_field("window_end", DataType::Timestamp, false)); Arc::new(Schema { - closed: true, - unique_keys: vec![], fields, + unique_keys: vec![], + closed: false, time_index: Some(1), }) } diff --git a/crates/asap-physical-operators/src/physical_planner/candidates.rs b/crates/asap-physical-operators/src/physical_planner/candidates.rs index 0e6ee86ba..afc674418 100644 --- a/crates/asap-physical-operators/src/physical_planner/candidates.rs +++ b/crates/asap-physical-operators/src/physical_planner/candidates.rs @@ -1,12 +1,12 @@ //! Compile maintenance-selected frontiers without deployment-specific DAG rewrites. use super::*; -/// One computation realization; lifecycle/window/revision requirements accompany +/// One computation realization; materialization/window/revision requirements accompany /// it during optimization and deployment. Stored outputs have no storage identity. /// Deserialization validates the producer/reader boundary. #[derive(Clone, serde::Serialize, serde::Deserialize)] -#[serde(try_from = "UncheckedPhysicalASAPDAG")] -pub struct PhysicalASAPDAG { +#[serde(try_from = "UncheckedCompiledPhysicalPlan")] +pub struct CompiledPhysicalPlan { pub precompute: Option, pub query: CompiledPhysicalDAG, pub materialized_outputs: BTreeMap, @@ -14,18 +14,18 @@ pub struct PhysicalASAPDAG { /// Compile an explicit materialization frontier selected by Planner maintenance /// search. Operators upstream of that frontier run in precompute, including -/// readouts/reductions; query execution receives their typed output values. +/// evaluations/reductions; query execution receives their typed output values. /// Empty frontiers retain the full computation in the query DAG. /// /// Repeated windows must be instantiated with the same evaluation/population /// contract used to build each output. This API never treats a result from a /// different window or revision as interchangeable merely because types match. pub fn compile_candidate( - dag: &PostAsapDAG, + dag: &PhysicalASAPDAG, inputs: BTreeMap, roots: &[NodeId], frontier: &[NodeId], -) -> Result { +) -> Result { cut_candidate(&compile(dag, inputs, roots)?, frontier) } @@ -36,9 +36,9 @@ pub fn compile_candidate( pub fn cut_candidate( compiled: &CompiledPhysicalDAG, frontier: &[NodeId], -) -> Result { +) -> Result { if frontier.is_empty() { - return Ok(PhysicalASAPDAG { + return Ok(CompiledPhysicalPlan { precompute: None, query: compiled.clone(), materialized_outputs: BTreeMap::new(), @@ -79,21 +79,21 @@ pub fn cut_candidate( "frontier contains an output shadowed by another boundary", )); } - Ok(PhysicalASAPDAG { + Ok(CompiledPhysicalPlan { precompute: Some(precompute), query, materialized_outputs, }) } -/// Materialization frontier implied by lifecycle-assigned timing: ingestion-time +/// Materialization frontier implied by materialization-assigned timing: ingestion-time /// nodes read by a query-time node, plus the root when it is ingestion-timed. /// `cut_candidate` of one [`compile`] result with this frontier realizes the /// assignment, so different assignments are different cuts of one lowering. /// That holds while timing-dependent lowering (an ingestion-time `Binary` /// aligns by value column) has the same timing at compile time as here. /// A query-time node feeding an ingestion-time node has no valid placement. -pub fn frontier_from_timing(dag: &PostAsapDAG) -> Result, Error> { +pub fn frontier_from_timing(dag: &PhysicalASAPDAG) -> Result, Error> { use planner_types::post_asap::ExecutionTiming::IngestionTime; let timing = dag .nodes @@ -101,8 +101,10 @@ pub fn frontier_from_timing(dag: &PostAsapDAG) -> Result, Error> { .map(|node| (node.id, node.output_state.timing)) .collect::>(); let mut frontier = BTreeSet::new(); - if timing.get(&dag.root) == Some(&IngestionTime) { - frontier.insert(u64::from(dag.root.0)); + for root in &dag.roots { + if timing.get(root) == Some(&IngestionTime) { + frontier.insert(u64::from(root.0)); + } } for edge in &dag.edges { let (Some(&producer), Some(&consumer)) = @@ -123,11 +125,11 @@ pub fn frontier_from_timing(dag: &PostAsapDAG) -> Result, Error> { /// Enumerate bounded, reachable materialization frontiers above explicit inputs. /// Each frontier is an antichain: storing an output and its ancestor together -/// would leave the ancestor unused by query execution. Lifecycle eligibility +/// would leave the ancestor unused by query execution. Materialization eligibility /// and deployment feasibility are evaluated separately before cost selection. /// Exceeding the search budget returns an error, never a partial inventory. pub fn enumerate_frontiers( - dag: &PostAsapDAG, + dag: &PhysicalASAPDAG, inputs: &BTreeMap, roots: &[NodeId], max_candidates: usize, @@ -192,11 +194,11 @@ fn enumerate_compiled_frontiers( /// individual failures visible; do not substitute another computation on error. /// The DAG is lowered once; each frontier is a [`cut_candidate`] of it. pub fn compile_candidates( - dag: &PostAsapDAG, + dag: &PhysicalASAPDAG, inputs: BTreeMap, roots: &[NodeId], frontiers: &[Vec], -) -> Vec> { +) -> Vec> { match compile(dag, inputs, roots) { Ok(compiled) => frontiers .iter() @@ -216,7 +218,7 @@ pub struct CandidateCost { pub total_cost: f64, } -pub struct CandidateSelection { +pub struct CandidateSelection { pub candidate: T, pub candidate_index: usize, pub cost: CandidateCost, @@ -271,14 +273,14 @@ pub fn select_candidate( #[derive(serde::Deserialize)] #[serde(deny_unknown_fields)] -struct UncheckedPhysicalASAPDAG { +struct UncheckedCompiledPhysicalPlan { precompute: Option, query: CompiledPhysicalDAG, materialized_outputs: BTreeMap, } -impl TryFrom for PhysicalASAPDAG { +impl TryFrom for CompiledPhysicalPlan { type Error = Error; - fn try_from(candidate: UncheckedPhysicalASAPDAG) -> Result { + fn try_from(candidate: UncheckedCompiledPhysicalPlan) -> Result { let result = Self { precompute: candidate.precompute, query: candidate.query, @@ -289,7 +291,7 @@ impl TryFrom for PhysicalASAPDAG { } } -impl PhysicalASAPDAG { +impl CompiledPhysicalPlan { /// Validate the physical handoff, including the producer/reader boundary. pub fn validate(&self) -> Result<(), Error> { self.query.validate()?; @@ -331,7 +333,7 @@ mod tests { use super::*; use planner_types::workload::*; - fn grouped_rate() -> (PostAsapDAG, BTreeMap, NodeId) { + fn grouped_rate() -> (PhysicalASAPDAG, BTreeMap, NodeId) { let workload = PlanningWorkload { query_workload: QueryWorkload { language: QueryLanguage::PromQL, @@ -361,14 +363,20 @@ mod tests { let root = asap_frontend_promql::lower_promql_workload(&workload, 0) .unwrap() .remove(0); - let root = std::rc::Rc::new(promql_rows::with_series_identity(&root).unwrap()); + let root = promql_rows::with_series_identity(&root).unwrap(); let space = asap_aware_mapping::search_workload(vec![("q", root)]); let selected = space .global_selection(&asap_aware_mapping::cost_model::DefaultCostModel) .assemble_selected_dag(&space.roots[0].1) .unwrap() .unwrap(); - let dag = planner_types::post_asap::compile_post_asap_dag(&selected).unwrap(); + let selected = planner_types::ir::apply_materialization_timings( + &selected, + &planner_types::ir::MaterializationAssignment::all_ingestion_time(), + &mut Default::default(), + ) + .unwrap(); + let dag = planner_types::ir::export::compile_physical_asap_dag(&selected).unwrap(); let state = dag .nodes .iter() @@ -378,7 +386,7 @@ mod tests { u64::from(state.id.0), InputContract::bounded(Arc::new(state.output_schema.clone())), )]); - (dag.clone(), inputs, u64::from(dag.root.0)) + (dag.clone(), inputs, u64::from(dag.roots[0].0)) } /// Enumerating and cutting every frontier lowers each Planner node once. @@ -399,9 +407,9 @@ mod tests { } fn with_timing( - dag: &PostAsapDAG, - timing: impl Fn(&PostAsapDAGNode) -> planner_types::post_asap::ExecutionTiming, - ) -> PostAsapDAG { + dag: &PhysicalASAPDAG, + timing: impl Fn(&PhysicalASAPDAGNode) -> planner_types::post_asap::ExecutionTiming, + ) -> PhysicalASAPDAG { let mut timed = dag.clone(); for node in &mut timed.nodes { node.output_state.timing = timing(node); @@ -413,11 +421,18 @@ mod tests { timed } - fn raw_input(dag: &PostAsapDAG) -> BTreeMap { + fn raw_input(dag: &PhysicalASAPDAG) -> BTreeMap { let raw = dag .nodes .iter() - .find(|node| matches!(node.payload, Payload::Fallback { .. })) + .find(|node| { + matches!( + node.payload, + Payload::Relational { + operator: planner_types::ir::export::NonASAPOpKind::TimeRange { .. } + } + ) + }) .unwrap(); BTreeMap::from([( u64::from(raw.id.0), @@ -425,8 +440,8 @@ mod tests { )]) } - /// Cutting one compilation by a retained-state timing and by the all - /// query-time timing (what ContinuouslyMaintained and Ephemeral assign) + /// Cutting one compilation by a maintained-state timing and by the all + /// query-time timing /// lowers each Planner node once and matches `compile_candidate`. #[test] fn timing_cuts_share_one_lowering() { @@ -472,7 +487,7 @@ mod tests { use planner_types::post_asap::ExecutionTiming::{IngestionTime, QueryTime}; let (dag, _, _) = grouped_rate(); let timed = with_timing(&dag, |node| { - if node.id == dag.root { + if node.id == dag.roots[0] { IngestionTime } else { QueryTime diff --git a/crates/asap-physical-operators/src/physical_planner/logical.rs b/crates/asap-physical-operators/src/physical_planner/logical.rs new file mode 100644 index 000000000..dbc541895 --- /dev/null +++ b/crates/asap-physical-operators/src/physical_planner/logical.rs @@ -0,0 +1,374 @@ +//! Reconstruct shared operator references from the transport DAG for native lowering. +use super::*; +use planner_types::ir::export::{EdgeRole, NonASAPOpKind as N, PhysicalASAPNodeId, WireScalarExpr}; +use planner_types::ir::{ + ASAPOp, NonASAPOp, Operator as LogicalOperator, OperatorNode, Predicate, ProjectItem, + ScalarExpr, SortKey as LogicalSortKey, +}; +use std::rc::Rc; +pub(super) fn scalar( + expr: &WireScalarExpr, + id_of: &mut impl FnMut(PhysicalASAPNodeId) -> Rc, +) -> ScalarExpr { + fn boxed( + e: &WireScalarExpr, + id_of: &mut impl FnMut(PhysicalASAPNodeId) -> Rc, + ) -> Box { + Box::new(scalar(e, id_of)) + } + fn list( + es: &[WireScalarExpr], + id_of: &mut impl FnMut(PhysicalASAPNodeId) -> Rc, + ) -> Vec { + es.iter().map(|e| scalar(e, id_of)).collect() + } + match expr { + WireScalarExpr::Column(id) => ScalarExpr::Column(*id), + WireScalarExpr::Literal(v) => ScalarExpr::Literal(v.clone()), + WireScalarExpr::Negative { expr, semantics } => ScalarExpr::Negative { + expr: boxed(expr, id_of), + semantics: *semantics, + }, + WireScalarExpr::Compare { + left, + op, + right, + semantics, + } => ScalarExpr::Compare { + left: boxed(left, id_of), + op: op.clone(), + right: boxed(right, id_of), + semantics: *semantics, + }, + WireScalarExpr::BoolAnd(parts) => ScalarExpr::BoolAnd(list(parts, id_of)), + WireScalarExpr::BoolOr(parts) => ScalarExpr::BoolOr(list(parts, id_of)), + WireScalarExpr::Not(e) => ScalarExpr::Not(boxed(e, id_of)), + WireScalarExpr::IsNull(e) => ScalarExpr::IsNull(boxed(e, id_of)), + WireScalarExpr::IsNotNull(e) => ScalarExpr::IsNotNull(boxed(e, id_of)), + WireScalarExpr::Cast { expr, to, try_cast } => ScalarExpr::Cast { + expr: boxed(expr, id_of), + to: to.clone(), + try_cast: *try_cast, + }, + WireScalarExpr::InList { + expr, + list: items, + negated, + } => ScalarExpr::InList { + expr: boxed(expr, id_of), + list: list(items, id_of), + negated: *negated, + }, + WireScalarExpr::FunctionCall { name, args } => ScalarExpr::FunctionCall { + name: name.clone(), + args: list(args, id_of), + }, + WireScalarExpr::Arithmetic { + op, + left, + right, + semantics, + } => ScalarExpr::Arithmetic { + op: op.clone(), + left: boxed(left, id_of), + right: boxed(right, id_of), + semantics: *semantics, + }, + WireScalarExpr::Case { + operand, + branches, + else_expr, + } => ScalarExpr::Case { + operand: operand.as_ref().map(|e| boxed(e, id_of)), + branches: branches + .iter() + .map(|(w, t)| (scalar(w, id_of), scalar(t, id_of))) + .collect(), + else_expr: else_expr.as_ref().map(|e| boxed(e, id_of)), + }, + WireScalarExpr::CurrentTimestamp => ScalarExpr::CurrentTimestamp, + WireScalarExpr::EvalTimestamp => ScalarExpr::EvalTimestamp, + WireScalarExpr::PromqlScalarFromVector(node) => { + ScalarExpr::PromqlScalarFromVector(id_of(*node)) + } + WireScalarExpr::ScalarSubquery(node) => ScalarExpr::ScalarSubquery(id_of(*node)), + WireScalarExpr::Exists { subquery, negated } => ScalarExpr::Exists { + subquery: id_of(*subquery), + negated: *negated, + }, + WireScalarExpr::InSubquery { + expr, + subquery, + negated, + } => ScalarExpr::InSubquery { + expr: boxed(expr, id_of), + subquery: id_of(*subquery), + negated: *negated, + }, + } +} + +pub(super) fn restore(dag: &PhysicalASAPDAG) -> Result>, Error> { + dag.validate().map_err(|e| invalid(e.to_string()))?; + let mut done = BTreeMap::new(); + let mut remaining: Vec<_> = dag.nodes.iter().collect(); + while !remaining.is_empty() { + let before = remaining.len(); + let mut next = Vec::new(); + for node in remaining { + let mut edges: Vec<_> = dag.edges.iter().filter(|e| e.consumer == node.id).collect(); + if edges + .iter() + .any(|e| !done.contains_key(&u64::from(e.producer.0))) + { + next.push(node); + continue; + } + edges.sort_by_key(|e| match e.role { + EdgeRole::Left => 0, + EdgeRole::Input => 1, + EdgeRole::Right => 2, + EdgeRole::ScalarRef => 3, + }); + let inputs: Vec<_> = edges + .iter() + .filter(|e| e.role != EdgeRole::ScalarRef) + .map(|e| Rc::clone(&done[&u64::from(e.producer.0)])) + .collect(); + let input = |index: usize| { + inputs + .get(index) + .cloned() + .ok_or_else(|| invalid("operator is missing an input")) + }; + let mut missing = false; + let mut ref_node = |id: PhysicalASAPNodeId| { + if let Some(node) = done.get(&u64::from(id.0)) { + Rc::clone(node) + } else { + missing = true; + Rc::new(OperatorNode::with_schema( + LogicalOperator::NonASAP(NonASAPOp::Values { + rows: vec![], + schema: Default::default(), + }), + Default::default(), + )) + } + }; + let mut value = |expr: &WireScalarExpr| scalar(expr, &mut ref_node); + let operator = match &node.payload { + Payload::Relational { operator } => LogicalOperator::NonASAP(match operator { + N::Scan { + source, + predicates, + schema, + } => NonASAPOp::Scan { + source: source.clone(), + predicates: predicates.iter().map(|p| Predicate(value(&p.0))).collect(), + schema: schema.clone(), + }, + N::Values { rows, schema } => NonASAPOp::Values { + rows: rows + .iter() + .map(|r| r.iter().map(&mut value).collect()) + .collect(), + schema: schema.clone(), + }, + N::Filter { pred } => NonASAPOp::Filter { + pred: Predicate(value(&pred.0)), + child: input(0)?, + }, + N::Project { cols, qualifier } => NonASAPOp::Project { + cols: cols + .iter() + .map(|c| ProjectItem { + alias: c.alias.clone(), + expr: value(&c.expr), + }) + .collect(), + qualifier: qualifier.clone(), + child: input(0)?, + }, + N::Aggregate { + reduction, + measures, + output_names, + filters, + having, + } => NonASAPOp::Aggregate { + reduction: reduction.clone(), + measures: measures.clone(), + output_names: output_names.clone(), + filters: filters + .iter() + .map(|p| p.as_ref().map(|p| Predicate(value(&p.0)))) + .collect(), + having: having.as_ref().map(|p| Predicate(value(&p.0))), + child: input(0)?, + }, + N::Join { join_kind, pred } => NonASAPOp::Join { + kind: join_kind.clone(), + pred: Predicate(value(&pred.0)), + left: input(0)?, + right: input(1)?, + }, + N::SetOp { set_kind, all } => NonASAPOp::SetOp { + kind: set_kind.clone(), + all: *all, + left: input(0)?, + right: input(1)?, + }, + N::Concat { + discriminator_unique_key, + } => NonASAPOp::Concat { + children: inputs.clone(), + discriminator_unique_key: discriminator_unique_key.clone(), + }, + N::Dedup { cols } => NonASAPOp::Dedup { + cols: cols.clone(), + child: input(0)?, + }, + N::Sort { keys, partition_by } => NonASAPOp::Sort { + keys: keys + .iter() + .map(|k| LogicalSortKey { + expr: value(&k.expr), + ascending: k.ascending, + nulls_first: k.nulls_first, + }) + .collect(), + partition_by: partition_by.clone(), + child: input(0)?, + }, + N::Limit { + n, + offset, + partition_by, + } => NonASAPOp::Limit { + n: *n, + offset: *offset, + partition_by: partition_by.clone(), + child: input(0)?, + }, + N::BinaryOp { + operator, + return_bool, + } => NonASAPOp::BinaryOp { + operator: operator.clone(), + return_bool: *return_bool, + lhs: input(0)?, + rhs: input(1)?, + }, + N::SQLWindowFunc { + func, + args, + partition_by, + order_by, + frame, + output_name, + } => NonASAPOp::SQLWindowFunc { + func: func.clone(), + args: args.iter().map(&mut value).collect(), + partition_by: partition_by.clone(), + order_by: order_by + .iter() + .map(|k| LogicalSortKey { + expr: value(&k.expr), + ascending: k.ascending, + nulls_first: k.nulls_first, + }) + .collect(), + frame: frame.clone(), + output_name: output_name.clone(), + child: input(0)?, + }, + N::TimeRange { range, range_kind } => NonASAPOp::TimeRange { + range: *range, + kind: *range_kind, + child: input(0)?, + }, + N::TimeShift { shift } => NonASAPOp::TimeShift { + shift: *shift, + child: input(0)?, + }, + N::PromqlVectorFromScalar { expr } => { + NonASAPOp::PromqlVectorFromScalar(value(expr)) + } + N::PromqlRelabel { dst, value: expr } => NonASAPOp::PromqlRelabel { + dst: dst.clone(), + value: value(expr), + child: input(0)?, + }, + N::PromqlInfoEnrich { selector } => NonASAPOp::PromqlInfoEnrich { + selector: selector.clone(), + child: input(0)?, + }, + N::PromqlSeriesSample { by, sample_kind } => NonASAPOp::PromqlSeriesSample { + by: by.clone(), + kind: *sample_kind, + child: input(0)?, + }, + N::PromqlSubquery { range, resolution } => NonASAPOp::PromqlSubquery { + range: *range, + resolution: *resolution, + child: input(0)?, + }, + }), + Payload::SummaryAgg { + family, + input: update, + reduction, + grouping, + filter, + } => LogicalOperator::ASAP(ASAPOp::SummaryAgg { + child: input(0)?, + family: family.clone(), + input: update.clone(), + reduction: reduction.clone(), + grouping: grouping.clone(), + filter: filter.as_ref().map(|p| Predicate(value(&p.0))), + }), + Payload::SummaryEstimate { query } => { + LogicalOperator::ASAP(ASAPOp::SummaryEstimate { + summary_input: input(0)?, + query: query.clone(), + }) + } + Payload::FinalizeExactAccumulator => { + LogicalOperator::ASAP(ASAPOp::FinalizeExactAccumulator { child: input(0)? }) + } + Payload::MaintainPopulation { population } => { + LogicalOperator::ASAP(ASAPOp::MaintainPopulation { + child: input(0)?, + population: population.clone(), + }) + } + Payload::EvaluatePopulation { evaluation } => { + LogicalOperator::ASAP(ASAPOp::EvaluatePopulation { + child: input(0)?, + evaluation: evaluation.clone(), + }) + } + Payload::SummaryMerge => LogicalOperator::ASAP(ASAPOp::SummaryMerge { + children: inputs.clone(), + }), + _ => return Err(invalid("reserved ASAP operation has no native lowering")), + }; + if missing { + return Err(invalid( + "scalar reference is not a preceding DAG dependency", + )); + } + let mut rebuilt = OperatorNode::with_schema(operator, node.output_schema.clone()); + rebuilt.guarantee = node.guarantee.clone(); + rebuilt.timing = Some(node.output_state.timing); + done.insert(u64::from(node.id.0), Rc::new(rebuilt)); + } + if next.len() == before { + return Err(invalid("operator DAG is cyclic")); + } + remaining = next; + } + Ok(done) +} diff --git a/crates/asap-physical-operators/src/physical_planner/mod.rs b/crates/asap-physical-operators/src/physical_planner/mod.rs index e1490c03c..2bd57bf21 100644 --- a/crates/asap-physical-operators/src/physical_planner/mod.rs +++ b/crates/asap-physical-operators/src/physical_planner/mod.rs @@ -1,23 +1,25 @@ //! Compile logical computation to native operators with typed external inputs. //! Compilation needs no readers; deployment resolves inputs after selection. -use crate::operators::ReadoutQuery; -use crate::summary_kernels::exact::ExactReadout; +use crate::operators::SummaryEvaluation; +use crate::summary_kernels::exact::ExactEvaluation; use crate::{ operators::{Expression, Operator, Reduction, SortKey}, plan::{Boundedness, Emission, NodeId, PhysicalDAG, PhysicalOperator, PlanProperties}, values::{Batch, SchemaRef}, Error, }; +use planner_types::ir::export::{ + NonASAPOpKind, PhysicalASAPDAG, PhysicalASAPDAGNode, PhysicalASAPOperatorPayload as Payload, + WireScalarExpr, +}; +use planner_types::ir::{ASAPOp, NonASAPOp, Operator as LogicalOperator, OperatorNode, ScalarExpr}; use planner_types::{ - post_asap::{ - ExactOperation, FieldDataType, PostAsapDAG, PostAsapDAGNode, - PostAsapOperatorPayload as Payload, SketchStatistic, SummaryInputExpr, ValueOperation, - }, + post_asap::{FieldDataType, SketchStatistic, SummaryInputExpr}, pre_asap::{ - AggIntent, ColumnRef, CompareOpKind, DataType, GroupKeys, QueryExpr, - Reduction as PlannerReduction, + AggIntent, ColumnRef, CompareOpKind, DataType, GroupKeys, Reduction as PlannerReduction, }, }; +mod logical; use std::{ collections::{BTreeMap, BTreeSet}, sync::Arc, @@ -39,7 +41,8 @@ pub mod promql_values; mod candidates; pub use candidates::{ compile_candidate, compile_candidates, cut_candidate, enumerate_frontiers, - frontier_from_timing, select_candidate, CandidateCost, CandidateSelection, PhysicalASAPDAG, + frontier_from_timing, select_candidate, CandidateCost, CandidateSelection, + CompiledPhysicalPlan, }; mod compiled; @@ -50,7 +53,7 @@ mod row_values; /// Compile computation without opening or retaining deployment readers. /// Input contracts identify explicit boundaries selected by maintenance planning. pub fn compile( - dag: &PostAsapDAG, + dag: &PhysicalASAPDAG, inputs: BTreeMap, roots: &[NodeId], ) -> Result { @@ -60,7 +63,7 @@ pub fn compile( /// Convenience for callers that already resolved inputs. Lowering still uses /// only their contracts, and instantiation checks those contracts again. pub fn bind<'a>( - dag: &PostAsapDAG, + dag: &PhysicalASAPDAG, sources: BTreeMap>, roots: &[NodeId], ) -> Result, Error> { @@ -73,11 +76,12 @@ pub fn bind<'a>( /// Resolve raw scan connectors before invoking the reader-independent compiler. pub fn bind_with_data_sources<'a>( - dag: &PostAsapDAG, + dag: &PhysicalASAPDAG, mut sources: BTreeMap>, roots: &[NodeId], data_sources: &crate::sources::DataSources, ) -> Result, Error> { + let restored = logical::restore(dag)?; // Only resolve scans reachable below the selected input boundaries. let mut pending = roots.to_vec(); let mut seen = BTreeSet::new(); @@ -85,16 +89,13 @@ pub fn bind_with_data_sources<'a>( if !seen.insert(id) || sources.contains_key(&id) { continue; } - let node = dag + let _node = dag .nodes .iter() .find(|n| u64::from(n.id.0) == id) .ok_or_else(|| invalid(format!("missing node {id}")))?; - if let Payload::Fallback { - expression: expression @ QueryExpr::Scan { .. }, - } = &node.payload - { - sources.insert(id, Box::new(data_sources.bind(expression)?)); + if matches!(restored[&id].non_asap(), Some(NonASAPOp::Scan { .. })) { + sources.insert(id, Box::new(data_sources.bind(&restored[&id])?)); } else { pending.extend( dag.edges @@ -123,11 +124,12 @@ fn helper_id(node: NodeId, index: u64) -> NodeId { } fn compile_internal( - dag: &PostAsapDAG, + dag: &PhysicalASAPDAG, mut sources: BTreeMap, roots: &[NodeId], ) -> Result { preflight_depth(dag)?; + let restored = logical::restore(dag)?; dag.validate().map_err(|e| invalid(e.to_string()))?; let nodes = dag .nodes @@ -141,46 +143,43 @@ fn compile_internal( ( edge.consumer.0, match edge.role { - planner_types::post_asap::EdgeRole::Left => 0, - planner_types::post_asap::EdgeRole::Input => 1, - planner_types::post_asap::EdgeRole::Right => 2, + planner_types::ir::export::EdgeRole::Left => 0, + planner_types::ir::export::EdgeRole::Input => 1, + planner_types::ir::export::EdgeRole::Right => 2, + planner_types::ir::export::EdgeRole::ScalarRef => 3, }, ) }); - // Scalar literal operands of query-time arithmetic are folded into the consumer. - let mut literals = BTreeMap::::new(); + let literals = BTreeMap::::new(); for edge in edges { - let consumer = u64::from(edge.consumer.0); - if let ( - Payload::Fallback { expression }, - Some(PostAsapDAGNode { - payload: Payload::Binary { .. }, - .. - }), - ) = ( - &nodes[&u64::from(edge.producer.0)].payload, - nodes.get(&consumer), - ) { - if let Some(value) = row_values::scalar_literal(expression) { - let left = edge.role == planner_types::post_asap::EdgeRole::Left; - if literals.insert(consumer, (value, left)).is_some() { - return Err(invalid("binary with two scalar literals is not folded")); - } - continue; - } - } dependencies .entry(u64::from(edge.consumer.0)) .or_default() .push(u64::from(edge.producer.0)); } + let mut fallback = BTreeMap::new(); + for (&id, root) in &restored { + let raw_summary_input = matches!(root.non_asap(), Some(NonASAPOp::TimeRange { .. })) + && dag.edges.iter().any(|e| { + u64::from(e.producer.0) == id + && matches!( + nodes[&u64::from(e.consumer.0)].payload, + Payload::SummaryAgg { .. } + ) + }); + if !root.contains_asap() && !raw_summary_input { + if let Ok(lowered) = promql_fallback::lower(root) { + fallback.insert(id, lowered); + } + } + } let known = |id: &NodeId| { nodes.contains_key(id) || promql_fallback::raw_series_owner(*id).is_some_and(|owner| { matches!( nodes.get(&owner), - Some(PostAsapDAGNode { - payload: Payload::Fallback { .. }, + Some(PhysicalASAPDAGNode { + payload: Payload::Relational { .. }, .. }) ) @@ -204,7 +203,7 @@ fn compile_internal( return Err(invalid(format!("missing root {id}"))); } pending.push((id, true)); - if !sources.contains_key(&id) { + if !sources.contains_key(&id) && !fallback.contains_key(&id) { for &input in dependencies.get(&id).into_iter().flatten() { pending.push((input, false)); } @@ -241,20 +240,11 @@ fn compile_internal( inputs = vec![auxiliary]; schemas.truncate(1); } - // A consumed bare selector supplies raw range rows (e.g. to a - // per-entity summary), not an instant vector, so only its consumer computes. - let raw_rows = matches!( - &node.payload, - Payload::Fallback { - expression: QueryExpr::TimeRange { .. } - } - ) && dag.edges.iter().any(|e| u64::from(e.producer.0) == id); - if let (Payload::Fallback { expression }, false) = (&node.payload, raw_rows) { - let promql_fallback::Lowering { - selectors, - mut steps, - } = promql_fallback::lower(expression) - .map_err(|error| invalid(format!("node {id}: {error}")))?; + if let Some(promql_fallback::Lowering { + selectors, + mut steps, + }) = fallback.remove(&id) + { let mut slots = Vec::new(); for (i, (_, schema)) in selectors.iter().enumerate() { let slot = promql_fallback::raw_series_input(id, i); @@ -300,10 +290,7 @@ fn compile_internal( )?; continue; } - if let Payload::Value { - operation: ValueOperation::MaintainPopulation { population }, - } = &node.payload - { + if let Payload::MaintainPopulation { population } = &node.payload { use planner_types::post_asap::maintained_population::PopulationInput; let PopulationInput::CurrentSeries(spec) = &population.input else { return Err(invalid( @@ -336,22 +323,16 @@ fn compile_internal( )?; continue; } - if let Payload::Value { - operation: ValueOperation::ReadPopulation { readout }, - } = &node.payload - { + if let Payload::EvaluatePopulation { evaluation } = &node.payload { use planner_types::post_asap::maintained_population::{ PopulationInput, PopulationStatistic, }; let [producer] = inputs.as_slice() else { - return Err(invalid("population readout requires one input")); + return Err(invalid("population evaluation requires one input")); }; - let Payload::Value { - operation: ValueOperation::MaintainPopulation { population }, - } = &nodes[producer].payload - else { + let Payload::MaintainPopulation { population } = &nodes[producer].payload else { return Err(invalid( - "population readout requires its declared population", + "population evaluation requires its declared population", )); }; let PopulationInput::CurrentSeries(spec) = &population.input else { @@ -363,9 +344,9 @@ fn compile_internal( )); } let input = schemas[0].clone(); - let PopulationStatistic::TopK { k } = readout else { + let PopulationStatistic::TopK { k } = evaluation else { let mut chain = - row_values::population_aggregate(&input, &spec.grouping, readout)?; + row_values::population_aggregate(&input, &spec.grouping, evaluation)?; let last = chain.pop().expect("nonempty chain"); let mut inputs = inputs; for operator in chain { @@ -415,15 +396,12 @@ fn compile_internal( let [input_id] = inputs.as_slice() else { return Err(invalid("per-entity summary requires one input")); }; - let Payload::Fallback { - expression: QueryExpr::TimeRange { child, .. }, - } = &nodes[input_id].payload - else { + let Some(NonASAPOp::TimeRange { child, .. }) = restored[input_id].non_asap() else { return Err(invalid( "per-entity summary requires a resolved raw time range", )); }; - let QueryExpr::Scan { schema, .. } = child.as_ref() else { + let Some(NonASAPOp::Scan { schema, .. }) = child.non_asap() else { return Err(invalid("per-entity summary requires a resolved source")); }; if !schema.closed || update.item.is_some() { @@ -462,7 +440,18 @@ fn compile_internal( )?; continue; } - if let Payload::Binary { operator } = &node.payload { + if let Payload::Relational { + operator: + NonASAPOpKind::BinaryOp { + operator, + return_bool, + }, + } = &node.payload + { + let operator = crate::expressions::binary::BinaryOperator::from_logical( + operator, + *return_bool, + ); let query_time = node.output_state.timing == planner_types::post_asap::ExecutionTiming::QueryTime; if let Some(&(value, left)) = literals.get(&id) { @@ -505,19 +494,11 @@ fn compile_internal( // carry the series identity. if let (true, [left, right]) = (query_time, schemas.as_slice()) { if !label_map(left) && !label_map(right) { - // A scalar-valued Fallback operand, such as `scalar(x)`, has no labels. - let scalar = |input: &NodeId| { - matches!( - nodes.get(input).map(|node| &node.payload), - Some(Payload::Fallback { expression }) - if promql_fallback::scalar(expression) - ) - }; let binary = Operator::series_binary( left.clone(), right.clone(), operator.clone(), - [scalar(&inputs[0]), scalar(&inputs[1])], + [false, false], ) .map_err(|error| invalid(format!("node {id}: {error}")))?; physical_dag.add(id, inputs, binary.with_output_schema(output)?)?; @@ -525,14 +506,11 @@ fn compile_internal( } } } - if let Payload::Value { - operation: ValueOperation::FinalizeExactAccumulator, - } = &node.payload - { + if let Payload::FinalizeExactAccumulator = &node.payload { // Exact counts read out as Int64; PromQL declares a Float64 sample. - let readout = bind_operation(node, &schemas) + let evaluation = bind_operation(node, &schemas) .map_err(|error| invalid(format!("node {id}: {error}")))?; - let actual = readout.schema(); + let actual = evaluation.schema(); let converted = actual.fields.iter().zip(&output.fields).position(|(a, d)| { a.dtype == FieldDataType::Plain(DataType::Int64) && d.dtype == FieldDataType::Plain(DataType::Float64) @@ -555,8 +533,8 @@ fn compile_internal( .collect(); let project = Operator::project(actual, columns)?.with_output_schema(output.clone())?; - physical_dag.add(auxiliary, inputs, readout)?; - if temporal_readout_drops_name(node) { + physical_dag.add(auxiliary, inputs, evaluation)?; + if temporal_evaluation_drops_name(node) { physical_dag.add(auxiliary - 1, vec![auxiliary], project)?; physical_dag.add( id, @@ -572,7 +550,7 @@ fn compile_internal( } let mut operator = compile_node(node, &schemas) .map_err(|error| invalid(format!("node {id}: {error}")))?; - if operator.is_counter_readout() { + if operator.is_counter_evaluation() { let mut pending = vec![id]; let mut visited = BTreeSet::new(); let mut ranges = BTreeSet::new(); @@ -580,8 +558,8 @@ fn compile_internal( if !visited.insert(ancestor) { continue; } - if let Payload::Fallback { - expression: QueryExpr::TimeRange { range, .. }, + if let Payload::Relational { + operator: NonASAPOpKind::TimeRange { range, .. }, } = &nodes[&ancestor].payload { ranges.insert( @@ -593,13 +571,13 @@ fn compile_internal( pending.extend(dependencies.get(&ancestor).into_iter().flatten().copied()); } if ranges.len() > 1 { - return Err(invalid("counter readout has ambiguous logical windows")); + return Err(invalid("counter evaluation has ambiguous logical windows")); } if let Some(lookback) = ranges.into_iter().next() { operator = operator.with_counter_lookback(lookback)?; } } - if temporal_readout_drops_name(node) { + if temporal_evaluation_drops_name(node) { physical_dag.add(auxiliary, inputs, operator)?; physical_dag.add(id, vec![auxiliary], Operator::series_without_name(output)?)?; } else { @@ -611,38 +589,45 @@ fn compile_internal( Ok(physical_dag) } -// Temporal summary readouts produce PromQL vectors, whose range functions drop +// Temporal summary evaluations produce PromQL vectors, whose range functions drop // the metric name before matching/filtering. Stored state retains its full identity. -fn temporal_readout_drops_name(node: &PostAsapDAGNode) -> bool { +fn temporal_evaluation_drops_name(node: &PhysicalASAPDAGNode) -> bool { node.output_schema .fields .iter() .any(|field| field.name == promql_rows::SERIES_IDENTITY_COLUMN) && matches!( &node.payload, - Payload::Value { - operation: ValueOperation::FinalizeExactAccumulator - } | Payload::SummaryEstimate { - query: SketchStatistic::Quantile { .. } - | SketchStatistic::Cardinality - | SketchStatistic::PointCount { .. } - | SketchStatistic::FrequencyL2 - | SketchStatistic::FrequencyEntropy - } + Payload::FinalizeExactAccumulator + | Payload::SummaryEstimate { + query: SketchStatistic::Quantile { .. } + | SketchStatistic::Cardinality + | SketchStatistic::PointCount { .. } + | SketchStatistic::FrequencyL2 + | SketchStatistic::FrequencyEntropy + } ) } /// Bind a Planner node against the schemas supplied by its deployment edges. /// This is the same checked path used by complete DAG binding. -pub fn compile_node(node: &PostAsapDAGNode, inputs: &[SchemaRef]) -> Result { +pub fn compile_node(node: &PhysicalASAPDAGNode, inputs: &[SchemaRef]) -> Result { for schema in inputs { crate::values::validate_schema(schema)?; } bind_operation(node, inputs)?.with_output_schema(Arc::new(node.output_schema.clone())) } -fn bind_operation(node: &PostAsapDAGNode, inputs: &[SchemaRef]) -> Result { - if let Payload::Binary { operator } = &node.payload { +fn bind_operation(node: &PhysicalASAPDAGNode, inputs: &[SchemaRef]) -> Result { + if let Payload::Relational { + operator: NonASAPOpKind::BinaryOp { + operator, + return_bool, + }, + } = &node.payload + { + let operator = + crate::expressions::binary::BinaryOperator::from_logical(operator, *return_bool); let [left, right] = inputs else { return Err(invalid("binary requires two inputs")); }; @@ -688,54 +673,83 @@ fn bind_operation(node: &PostAsapDAGNode, inputs: &[SchemaRef]) -> Result, Error>>() + }) + .collect::, Error>>()?; + let schema = Arc::new(schema.clone()); + return Operator::source( + schema.clone(), + vec![crate::values::Batch::try_new(schema, rows)?], + ); + } let [input] = inputs else { return Err(invalid( "native Planner binding currently requires a unary operation or an explicit source", )); }; match &node.payload { - Payload::Value { operation, .. } => match operation { - ValueOperation::Project { cols, .. } => Operator::project( + Payload::FinalizeExactAccumulator => { + let state = summary_column(input)?; + use crate::Statistic as S; + use planner_types::post_asap::ExactKind as E; + let statistic = match &input.fields[state].dtype { + FieldDataType::ExactAggregate(kind, _) => match kind { + E::Sum => S::Sum, + E::Count => S::Count, + E::Min => S::Min, + E::Max => S::Max, + E::Rate => S::Rate, + E::Increase => S::Increase, + _ => return Err(invalid("exact family evaluation is unsupported")), + }, + _ => return Err(invalid("exact finalization requires exact state")), + }; + Operator::evaluation( + input.clone(), + state, + SummaryEvaluation::Exact(ExactEvaluation { + statistic, + lookback_ms: None, + }), + ) + } + + Payload::Relational { operator } => match operator { + NonASAPOpKind::Project { cols, .. } => Operator::project( input.clone(), cols.iter() .enumerate() @@ -748,21 +762,21 @@ fn bind_operation(node: &PostAsapDAGNode, inputs: &[SchemaRef]) -> Result Expression::Column(*index), + WireScalarExpr::Column(index) => Expression::Column(*index), expr => expression(expr, input)?, }, )) }) .collect::>()?, ), - ValueOperation::Filter { pred } => { + NonASAPOpKind::Filter { pred } => { Operator::filter(input.clone(), expression(&pred.0, input)?) } - ValueOperation::Sort { keys, partition_by } => Operator::sort( + NonASAPOpKind::Sort { keys, partition_by } => Operator::sort( input.clone(), keys.iter() .map(|key| { - let QueryExpr::Column(column) = key.expr else { + let WireScalarExpr::Column(column) = key.expr else { return Err(invalid( "sort expression must be projected before sorting", )); @@ -776,23 +790,23 @@ fn bind_operation(node: &PostAsapDAGNode, inputs: &[SchemaRef]) -> Result>()?, groups(input, partition_by)?, ), - ValueOperation::Limit { + NonASAPOpKind::Limit { n, offset, partition_by, } => Operator::limit( input.clone(), - *n as u64, + n.unwrap_or(usize::MAX) as u64, *offset as u64, groups(input, partition_by)?, ), - ValueOperation::Exact(ExactOperation::Aggregate { + NonASAPOpKind::Aggregate { reduction, measures, output_names, filters, having: None, - }) => { + } => { if filters.iter().any(Option::is_some) { return Err(invalid("filtered aggregate has no native implementation")); } @@ -829,31 +843,6 @@ fn bind_operation(node: &PostAsapDAGNode, inputs: &[SchemaRef]) -> Result>()?; Operator::aggregate(input.clone(), groups(input, keys)?, measures) } - ValueOperation::FinalizeExactAccumulator => { - let state = summary_column(input)?; - use crate::Statistic as S; - use planner_types::post_asap::ExactKind as E; - let statistic = match &input.fields[state].dtype { - FieldDataType::ExactAggregate(kind, _) => match kind { - E::Sum => S::Sum, - E::Count => S::Count, - E::Min => S::Min, - E::Max => S::Max, - E::Rate => S::Rate, - E::Increase => S::Increase, - _ => return Err(invalid("exact family readout is unsupported")), - }, - _ => return Err(invalid("exact finalization requires exact state")), - }; - Operator::readout( - input.clone(), - state, - ReadoutQuery::Exact(ExactReadout { - statistic, - lookback_ms: None, - }), - ) - } _ => Err(invalid("value operation has no native implementation")), }, Payload::SummaryAgg { @@ -945,17 +934,17 @@ fn bind_operation(node: &PostAsapDAGNode, inputs: &[SchemaRef]) -> Result { if let SketchStatistic::TopK { k } = query { - return Operator::keyed_readout( + return Operator::keyed_evaluation( input.clone(), summary_column(input)?, *k, Arc::new(node.output_schema.clone()), ); } - Operator::readout( + Operator::evaluation( input.clone(), summary_column(input)?, - ReadoutQuery::Sketch(query.clone()), + SummaryEvaluation::Sketch(query.clone()), ) } _ => Err(invalid( @@ -1009,9 +998,10 @@ fn groups(input: &SchemaRef, groups: &GroupKeys) -> Result, Error> { } Ok(groups.keys().to_vec()) } -fn expression(expr: &QueryExpr, input: &SchemaRef) -> Result { +fn expression(expr: &WireScalarExpr, input: &SchemaRef) -> Result { + let expr = local_scalar(expr)?; Ok(Expression::planner( - crate::expressions::CompiledExpression::compile(expr, input)?, + crate::expressions::CompiledExpression::compile(&expr, input)?, )) } @@ -1057,7 +1047,7 @@ impl PhysicalOperator for CheckedSource<'_> { } // Bound recursion before invoking the upstream recursive provenance validator. -fn preflight_depth(dag: &PostAsapDAG) -> Result<(), Error> { +fn preflight_depth(dag: &PhysicalASAPDAG) -> Result<(), Error> { let mut remaining = dag .nodes .iter() @@ -1110,23 +1100,24 @@ fn preflight_depth(dag: &PostAsapDAG) -> Result<(), Error> { /// Join predicates address the concatenated left/right schema. fn semi_join_keys( - expr: &QueryExpr, + expr: &ScalarExpr, left: usize, right: usize, keys: &mut Vec<(usize, usize)>, ) -> Result<(), Error> { match expr { - QueryExpr::BoolAnd(parts) => { + ScalarExpr::BoolAnd(parts) => { for part in parts { semi_join_keys(part, left, right, keys)?; } } - QueryExpr::Compare { + ScalarExpr::Compare { left: a, op: CompareOpKind::Eq, right: b, + .. } => { - let (QueryExpr::Column(a), QueryExpr::Column(b)) = (a.as_ref(), b.as_ref()) else { + let (ScalarExpr::Column(a), ScalarExpr::Column(b)) = (a.as_ref(), b.as_ref()) else { return Err(invalid("semi-join requires column equality keys")); }; let (a, b) = if a < b { (*a, *b) } else { (*b, *a) }; @@ -1143,7 +1134,7 @@ fn semi_join_keys( /// Resolve equality keys against the Planner join's concatenated input schema. /// Deployments may use these positions to bind their source columns. pub fn equijoin_keys( - pred: &planner_types::pre_asap::Predicate, + pred: &planner_types::ir::Predicate, left: &planner_types::post_asap::Schema, right: &planner_types::post_asap::Schema, ) -> Result, Error> { @@ -1154,3 +1145,24 @@ pub fn equijoin_keys( } Ok(keys) } + +fn local_scalar(expr: &WireScalarExpr) -> Result { + let mut missing = false; + let result = logical::scalar(expr, &mut |_| { + missing = true; + std::rc::Rc::new(OperatorNode::with_schema( + LogicalOperator::NonASAP(NonASAPOp::Values { + rows: vec![], + schema: Default::default(), + }), + Default::default(), + )) + }); + if missing { + Err(invalid( + "scalar plan reads require explicit execution bindings", + )) + } else { + Ok(result) + } +} diff --git a/crates/asap-physical-operators/src/physical_planner/precompute.rs b/crates/asap-physical-operators/src/physical_planner/precompute.rs index 10dffdc0c..2771465a9 100644 --- a/crates/asap-physical-operators/src/physical_planner/precompute.rs +++ b/crates/asap-physical-operators/src/physical_planner/precompute.rs @@ -1,6 +1,7 @@ //! Compile immutable summary-input computation with explicit population and pane identity. use super::promql_rows::SERIES_IDENTITY_COLUMN as SERIES_IDENTITY; use super::*; +use planner_types::post_asap::FieldDataType as SummaryFamilyType; use planner_types::{ post_asap::{ExecutionTiming, GroupingStrategy, Schema}, pre_asap::DataType, @@ -8,35 +9,35 @@ use planner_types::{ /// Physical rows carry the population and pane coordinate alongside the logical value. /// These fields preserve identities which are implicit in a stored summary instance. -pub fn population_schema(family: FieldDataType) -> SchemaRef { +pub fn population_schema(family: SummaryFamilyType) -> SchemaRef { Arc::new(Schema { - closed: true, - unique_keys: vec![], fields: vec![ planner_types::post_asap::Field { - table: None, name: "$population".into(), - dtype: FieldDataType::Plain(DataType::Map { + dtype: SummaryFamilyType::Plain(DataType::Map { key: Box::new(DataType::Utf8), value: Box::new(DataType::Utf8), value_nullable: false, }), nullable: false, + table: None, }, planner_types::post_asap::Field { - table: None, name: "$window_end".into(), - dtype: FieldDataType::Plain(DataType::Timestamp), + dtype: SummaryFamilyType::Plain(DataType::Timestamp), nullable: false, + table: None, }, planner_types::post_asap::Field { - table: None, name: "value".into(), dtype: family, nullable: false, + table: None, }, ], time_index: Some(1), + unique_keys: vec![], + closed: false, }) } @@ -48,7 +49,7 @@ pub fn population_schema(family: FieldDataType) -> SchemaRef { /// must be canonical (sorted, unique, no empty values), since they are the /// population identity: build rows with [`raw_sample_row`]. pub fn raw_sample_schema() -> SchemaRef { - let mut schema = (*population_schema(FieldDataType::Plain(DataType::Float64))).clone(); + let mut schema = (*population_schema(SummaryFamilyType::Plain(DataType::Float64))).clone(); schema.fields[1].name = "$timestamp".into(); Arc::new(schema) } @@ -82,19 +83,14 @@ pub fn raw_sample_row( /// Input contract of a precompute boundary: raw sample rows for a raw time /// series scan, otherwise the stored population of its summary state. -pub fn boundary_schema(node: &PostAsapDAGNode) -> Result { - let Payload::Fallback { expression } = &node.payload else { - return source_schema(&node.output_schema); - }; - let scan = match expression { - planner_types::pre_asap::QueryExpr::TimeRange { child, .. } => child.as_ref(), - expression => expression, - }; +pub fn boundary_schema(node: &PhysicalASAPDAGNode) -> Result { if !matches!( - scan, - planner_types::pre_asap::QueryExpr::Scan { - source: planner_types::pre_asap::Source::TimeSeries { .. }, - .. + &node.payload, + Payload::Relational { + operator: NonASAPOpKind::Scan { + source: planner_types::pre_asap::Source::TimeSeries { .. }, + .. + } | NonASAPOpKind::TimeRange { .. } } ) { return source_schema(&node.output_schema); @@ -106,11 +102,11 @@ pub fn boundary_schema(node: &PostAsapDAGNode) -> Result { .iter() .enumerate() .all(|(i, field)| match &field.dtype { - FieldDataType::Plain(DataType::Timestamp) => { + SummaryFamilyType::Plain(DataType::Timestamp) => { Some(i) == logical.time_index && !field.nullable } - FieldDataType::Plain(DataType::Float64) => field.name == "value" && !field.nullable, - FieldDataType::Plain(DataType::Utf8) => true, + SummaryFamilyType::Plain(DataType::Float64) => field.name == "value" && !field.nullable, + SummaryFamilyType::Plain(DataType::Utf8) => true, _ => false, }) && !logical @@ -134,14 +130,14 @@ pub fn source_schema(logical: &Schema) -> Result { let states = logical .fields .iter() - .filter(|f| !matches!(f.dtype, FieldDataType::Plain(_))) + .filter(|f| !matches!(f.dtype, SummaryFamilyType::Plain(_))) .collect::>(); let [state] = states.as_slice() else { return Err(invalid( "stored population requires one typed summary state", )); }; - if logical.fields.iter().enumerate().any(|(i, field)| matches!(&field.dtype, FieldDataType::Plain(dtype) + if logical.fields.iter().enumerate().any(|(i, field)| matches!(&field.dtype, SummaryFamilyType::Plain(dtype) if field.nullable || !matches!(dtype, DataType::Utf8) && !(Some(i) == logical.time_index && *dtype == DataType::Timestamp))) { return Err(invalid("stored population metadata cannot reconstruct extra value columns")); } @@ -161,7 +157,7 @@ pub fn is_population_schema(schema: &SchemaRef) -> bool { /// Compile a complete selected precompute sub-DAG. Inputs are already-computed /// state boundaries; the deployment supplies groups, panes and states, never operations. pub fn compile( - dag: &PostAsapDAG, + dag: &PhysicalASAPDAG, frontiers: &[NodeId], roots: &[NodeId], ) -> Result { @@ -184,9 +180,10 @@ pub fn compile( ( edge.consumer.0, match edge.role { - planner_types::post_asap::EdgeRole::Left => 0, - planner_types::post_asap::EdgeRole::Input => 1, - planner_types::post_asap::EdgeRole::Right => 2, + planner_types::ir::export::EdgeRole::Left => 0, + planner_types::ir::export::EdgeRole::Input => 1, + planner_types::ir::export::EdgeRole::Right => 2, + planner_types::ir::export::EdgeRole::ScalarRef => 3, }, ) }); @@ -261,7 +258,7 @@ pub fn compile( CompiledPhysicalDAG::compose(sources, fragments, roots.to_vec()) } -fn validate_value_output(node: &PostAsapDAGNode) -> Result<(), Error> { +fn validate_value_output(node: &PhysicalASAPDAGNode) -> Result<(), Error> { let schema = &node.output_schema; // Physical population rows already carry the complete identity in `$population`. // Typed logical plans may expose its opaque series-identity column as metadata. @@ -274,7 +271,7 @@ fn validate_value_output(node: &PostAsapDAGNode) -> Result<(), Error> { if identities.len() > 1 || identities .iter() - .any(|field| field.nullable || field.dtype != FieldDataType::Plain(DataType::Utf8)) + .any(|field| field.nullable || field.dtype != SummaryFamilyType::Plain(DataType::Utf8)) { return Err(invalid( "precompute series identity requires one non-null Utf8 column", @@ -286,12 +283,11 @@ fn validate_value_output(node: &PostAsapDAGNode) -> Result<(), Error> { .enumerate() .filter(|(i, field)| Some(*i) != schema.time_index && field.name != identity) .collect::>(); - if !matches!(values.as_slice(), [(_, field)] if !field.nullable && field.dtype == FieldDataType::Plain(DataType::Float64)) + if !matches!(values.as_slice(), [(_, field)] if !field.nullable && field.dtype == SummaryFamilyType::Plain(DataType::Float64)) || schema.time_index.is_some_and(|i| { - schema - .fields - .get(i) - .is_none_or(|f| f.nullable || f.dtype != FieldDataType::Plain(DataType::Timestamp)) + schema.fields.get(i).is_none_or(|f| { + f.nullable || f.dtype != SummaryFamilyType::Plain(DataType::Timestamp) + }) }) { return Err(invalid( @@ -302,9 +298,9 @@ fn validate_value_output(node: &PostAsapDAGNode) -> Result<(), Error> { } fn fragment( - node: &PostAsapDAGNode, + node: &PhysicalASAPDAGNode, schemas: &[SchemaRef], - parents: &[&PostAsapDAGNode], + parents: &[&PhysicalASAPDAGNode], ) -> Result { let sources = schemas .iter() @@ -320,7 +316,15 @@ fn fragment( Ok(id) }; let root = match &node.payload { - Payload::Binary { operator } => { + Payload::Relational { + operator: + NonASAPOpKind::BinaryOp { + operator, + return_bool, + }, + } => { + let operator = + crate::expressions::binary::BinaryOperator::from_logical(operator, *return_bool); validate_value_output(node)?; if node.output_schema.time_index.is_none() || parents.iter().any(|p| p.output_schema.time_index.is_none()) @@ -343,30 +347,29 @@ fn fragment( )?, )? } - Payload::Value { - operation: ValueOperation::FinalizeExactAccumulator, - } => { + Payload::FinalizeExactAccumulator => { let [input] = schemas else { return Err(invalid("finalize requires one state input")); }; validate_value_output(node)?; let statistic = match &input.fields[2].dtype { - FieldDataType::ExactAggregate(planner_types::post_asap::ExactKind::Sum, _) => { + SummaryFamilyType::ExactAggregate(planner_types::post_asap::ExactKind::Sum, _) => { crate::Statistic::Sum } - FieldDataType::ExactAggregate(planner_types::post_asap::ExactKind::Count, _) => { - crate::Statistic::Count - } + SummaryFamilyType::ExactAggregate( + planner_types::post_asap::ExactKind::Count, + _, + ) => crate::Statistic::Count, _ => { return Err(invalid( "precompute finalization requires explicit Sum or Count semantics", )) } }; - let read = Operator::readout( + let read = Operator::evaluation( input.clone(), 2, - ReadoutQuery::Exact(ExactReadout { + SummaryEvaluation::Exact(ExactEvaluation { statistic, lookback_ms: None, }), @@ -384,7 +387,9 @@ fn fragment( ), ], )? - .with_output_schema(population_schema(FieldDataType::Plain(DataType::Float64)))?; + .with_output_schema(population_schema(SummaryFamilyType::Plain( + DataType::Float64, + )))?; add(vec![read], project)? } Payload::SummaryAgg { @@ -403,12 +408,12 @@ fn fragment( return Err(invalid("summary update requires one input")); }; // Item identities resolve against the complete label set of raw - // samples; finalized readouts carry no such identity. + // samples; finalized evaluations carry no such identity. let raw = *input == raw_sample_schema(); // A unit-frequency summary (HLL) observes each raw sample value. let unit_frequency = raw && crate::capability::is_unit_sample_frequency(update) - && matches!(family, FieldDataType::Sketch(kind, _) if !matches!( + && matches!(family, SummaryFamilyType::Sketch(kind, _) if !matches!( kind.algorithm(), planner_types::post_asap::SketchAlgorithm::Cms | planner_types::post_asap::SketchAlgorithm::CountSketch @@ -436,7 +441,7 @@ fn fragment( )); } if keyed - && matches!(family, FieldDataType::Sketch(kind, _) if kind.algorithm() == &planner_types::post_asap::SketchAlgorithm::CmsWithHeap) + && matches!(family, SummaryFamilyType::Sketch(kind, _) if kind.algorithm() == &planner_types::post_asap::SketchAlgorithm::CmsWithHeap) && !matches!( update.weight_domain, planner_types::post_asap::WeightDomain::NonNegative { .. } @@ -461,7 +466,7 @@ fn fragment( .filter(|field| { (raw || !field.nullable) && field.name != SERIES_IDENTITY - && field.dtype == FieldDataType::Plain(DataType::Utf8) + && field.dtype == SummaryFamilyType::Plain(DataType::Utf8) }) .map(|f| f.name.clone()) .ok_or_else(|| { @@ -481,7 +486,7 @@ fn fragment( SummaryInputExpr::Column(ColumnRef::SampleValue) => Expression::Column(2), SummaryInputExpr::Column(ColumnRef::Named(name)) if parents[0].output_schema.fields.iter().any(|f| { - f.name == *name && f.dtype == FieldDataType::Plain(DataType::Float64) + f.name == *name && f.dtype == SummaryFamilyType::Plain(DataType::Float64) }) => { Expression::Column(2) @@ -497,7 +502,7 @@ fn fragment( ("$window_end".into(), Expression::Column(1)), ("value".into(), Expression::FiniteFloat64(Box::new(weight))), ]; - let mut fields = population_schema(FieldDataType::Plain(DataType::Float64)) + let mut fields = population_schema(SummaryFamilyType::Plain(DataType::Float64)) .fields .clone(); if keyed { @@ -510,10 +515,10 @@ fn fragment( for (index, (expression, dtype)) in items.into_iter().enumerate() { let name = format!("$item{index}"); fields.push(planner_types::post_asap::Field { - table: None, name: name.clone(), - dtype: FieldDataType::Plain(dtype), + dtype: SummaryFamilyType::Plain(dtype), nullable: false, + table: None, }); columns.push((name, expression)); } @@ -521,9 +526,9 @@ fn fragment( let item_columns = (3..fields.len()).collect::>(); let project = Operator::project(input.clone(), columns)?.with_output_schema( Arc::new(Schema { - closed: true, - unique_keys: vec![], fields, + unique_keys: vec![], + closed: false, time_index: Some(1), }), )?; @@ -583,7 +588,7 @@ fn raw_items( ColumnRef::Named(name) | ColumnRef::Qualified { name, .. } if !name.starts_with('$') && scan.fields.iter().all(|f| { - &f.name != name || f.dtype == FieldDataType::Plain(DataType::Utf8) + &f.name != name || f.dtype == SummaryFamilyType::Plain(DataType::Utf8) }) => { Some(name.clone()) diff --git a/crates/asap-physical-operators/src/physical_planner/promql_fallback.rs b/crates/asap-physical-operators/src/physical_planner/promql_fallback.rs index 237504c98..fcd1382ab 100644 --- a/crates/asap-physical-operators/src/physical_planner/promql_fallback.rs +++ b/crates/asap-physical-operators/src/physical_planner/promql_fallback.rs @@ -19,14 +19,14 @@ pub(super) fn raw_series_owner(slot: NodeId) -> Option { } /// A selector expression and its raw-series row schema. -pub type Selector = (QueryExpr, SchemaRef); +pub type Selector = (OperatorNode, SchemaRef); /// The selectors a Fallback expression reads, left to right, and the row /// schema of the raw series the deployment supplies for each at /// [`raw_series_input`]. The rows must cover the selector's window at every /// evaluation instant `T`, or at its `@` time: `(T - offset - range, T - offset]`; /// under a subquery `[R:S] offset O` that is `(T - O - R - offset - range, T - O - offset]`. -pub fn raw_series(expression: &QueryExpr) -> Result, Error> { +pub fn raw_series(expression: &OperatorNode) -> Result, Error> { Ok(lower(expression)?.selectors) } @@ -43,16 +43,47 @@ pub(super) struct Lowering { pub steps: Vec<(Operator, Vec)>, } -pub(super) fn lower(expression: &QueryExpr) -> Result { +pub(super) fn lower(expression: &OperatorNode) -> Result { let mut lowering = Lowering::default(); lowering.value(expression)?; Ok(lowering) } -fn declared(expression: &QueryExpr) -> Result { - let schema = expression - .output_schema() - .map_err(|error| invalid(error.to_string()))?; +/// Compile a standalone scalar expression and expose its real series dependencies. +/// Input slots use root 0; no logical wrapper node is introduced. +pub fn compile_scalar_root( + expr: &ScalarExpr, +) -> Result<(CompiledPhysicalDAG, Vec), Error> { + let mut lowering = Lowering::default(); + lowering.scalar_value(expr)?; + let mut inputs = BTreeMap::new(); + for (i, (_, schema)) in lowering.selectors.iter().enumerate() { + inputs.insert( + raw_series_input(0, i), + InputContract::bounded(schema.clone()), + ); + } + let last = lowering.steps.len() - 1; + let mut operators = BTreeMap::new(); + for (i, (operator, dependencies)) in lowering.steps.into_iter().enumerate() { + let id = if i == last { 0 } else { i as u64 + 1 }; + let dependencies = dependencies + .into_iter() + .map(|input| match input { + Input::Raw(i) => raw_series_input(0, i), + Input::Step(i) => i as u64 + 1, + }) + .collect(); + operators.insert(id, (dependencies, operator)); + } + Ok(( + CompiledPhysicalDAG::from_operators(inputs, operators, vec![0])?, + lowering.selectors, + )) +} + +fn declared(expression: &OperatorNode) -> Result { + let schema = expression.schema.clone(); Ok(Arc::new(lift_plain(&schema))) } @@ -69,10 +100,10 @@ fn at(shift: &planner_types::pre_asap::TimeShift) -> Result, Error> } } -fn range_anchor(expression: &QueryExpr) -> Option { - match expression { - QueryExpr::TimeRange { child, .. } => range_anchor(child), - QueryExpr::TimeShift { shift, .. } => shift +fn range_anchor(expression: &OperatorNode) -> Option { + match expression.expect_non_asap() { + NonASAPOp::TimeRange { child, .. } => range_anchor(child), + NonASAPOp::TimeShift { shift, .. } => shift .at .filter(|at| matches!(at, AtModifier::Start | AtModifier::End)), _ => None, @@ -80,32 +111,22 @@ fn range_anchor(expression: &QueryExpr) -> Option { } /// `TimeRange { range, [TimeShift { offset, @ }], Scan }`: range, offset, `@`. -fn selector(expression: &QueryExpr) -> Result<(i64, i64, Option), Error> { - let QueryExpr::TimeRange { range, child } = expression else { +fn selector(expression: &OperatorNode) -> Result<(i64, i64, Option), Error> { + let NonASAPOp::TimeRange { range, child, .. } = expression.expect_non_asap() else { return Err(invalid("PromQL operand must be a series selector")); }; - let (offset, at, scan) = match child.as_ref() { - QueryExpr::TimeShift { shift, child } => (shift.offset_ms, at(shift)?, child.as_ref()), + let (offset, at, scan) = match child.expect_non_asap() { + NonASAPOp::TimeShift { shift, child } => { + (shift.offset_ms, at(shift)?, child.expect_non_asap()) + } scan => (0, None, scan), }; - if !matches!(scan, QueryExpr::Scan { .. }) { + if !matches!(scan, NonASAPOp::Scan { .. }) { return Err(invalid("PromQL selector must read one scan")); } Ok((millis(range)?, offset, at)) } -/// PromQL scalar-valued expressions have no labels to match. A binary -/// operator is scalar-valued when both operands are. -pub(super) fn scalar(expression: &QueryExpr) -> bool { - match expression { - QueryExpr::PromqlScalarBridge(_) - | QueryExpr::PromqlScalarFromVector(_) - | QueryExpr::EvalTimestamp => true, - QueryExpr::BinaryOp { lhs, rhs, .. } => scalar(lhs) && scalar(rhs), - _ => false, - } -} - impl Lowering { fn schema(&self, input: &Input) -> SchemaRef { match input { @@ -124,12 +145,12 @@ impl Lowering { &mut self, operator: Operator, inputs: Vec, - logical: &QueryExpr, + logical: &OperatorNode, ) -> Result { Ok(self.add(operator.with_output_schema(declared(logical)?)?, inputs)) } - fn read(&mut self, selector: &QueryExpr) -> Result { + fn read(&mut self, selector: &OperatorNode) -> Result { let schema = declared(selector)?; if !schema .fields @@ -145,12 +166,12 @@ impl Lowering { } /// An instant vector, or a scalar for scalar-valued expressions. - fn value(&mut self, expression: &QueryExpr) -> Result { - match expression { - QueryExpr::Concat { children, .. } => { - if !children.iter().all(|branch| matches!(branch, - QueryExpr::PromqlRelabel { child, .. } if matches!(child.as_ref(), - QueryExpr::Aggregate { measures, .. } if matches!(measures.as_slice(), [AggIntent::HistogramQuantile { .. }])))) { + fn value(&mut self, expression: &OperatorNode) -> Result { + match expression.expect_non_asap() { + NonASAPOp::Concat { children, .. } => { + if !children.iter().all(|branch| matches!(branch.expect_non_asap(), + NonASAPOp::PromqlRelabel { child, .. } if matches!(child.expect_non_asap(), + NonASAPOp::Aggregate { measures, .. } if matches!(measures.as_slice(), [AggIntent::HistogramQuantile { .. }])))) { return Err(invalid("PromQL concatenation requires classic histogram quantile branches")); } let inputs = children @@ -171,15 +192,17 @@ impl Lowering { expression, ) } - QueryExpr::PromqlRelabel { dst, value, child } => { + NonASAPOp::PromqlRelabel { dst, value, child } => { let step = self.value(child)?; let input = self.schema(&step); - let (replacement, source_regex) = match value.as_ref() { - QueryExpr::Literal(planner_types::pre_asap::ScalarValue::Utf8(value)) => { + let (replacement, source_regex) = match value { + ScalarExpr::Literal(planner_types::pre_asap::ScalarValue::Utf8(value)) => { (value.clone(), None) } - QueryExpr::FunctionCall { name, args } if name == "label_replace" => { - let [QueryExpr::Column(source), QueryExpr::Literal(planner_types::pre_asap::ScalarValue::Utf8(pattern)), QueryExpr::Literal(planner_types::pre_asap::ScalarValue::Utf8( + ScalarExpr::FunctionCall { name, args } if name == "label_replace" => { + let [ScalarExpr::Column(source), ScalarExpr::Literal(planner_types::pre_asap::ScalarValue::Utf8( + pattern, + )), ScalarExpr::Literal(planner_types::pre_asap::ScalarValue::Utf8( replacement, ))] = args.as_slice() else { @@ -204,7 +227,7 @@ impl Lowering { )?; self.push(operator, vec![step], expression) } - QueryExpr::TimeRange { .. } => { + NonASAPOp::TimeRange { .. } => { let (range, offset, at) = selector(expression)?; let input = self.read(expression)?; let schema = self.schema(&input); @@ -215,7 +238,7 @@ impl Lowering { expression, ) } - QueryExpr::Aggregate { + NonASAPOp::Aggregate { reduction: planner_types::pre_asap::Reduction::PerEntity, measures, having: None, @@ -234,7 +257,7 @@ impl Lowering { let input = self.schema(&step); Ok(self.add(Operator::series_without_name(input)?, vec![step])) } - QueryExpr::Aggregate { + NonASAPOp::Aggregate { reduction: planner_types::pre_asap::Reduction::Reduce(keys), measures, having: None, @@ -248,7 +271,74 @@ impl Lowering { let input = self.value(child)?; self.aggregate(input, measure, keys, expression) } - QueryExpr::Sort { + NonASAPOp::Project { + cols, + child, + qualifier, + } => { + let value = planner_types::pre_asap::column_resolution::resolve_column_ref( + &ColumnRef::SampleValue, + &child.schema, + ) + .map_err(|e| invalid(e.to_string()))?; + let sample = cols + .iter() + .find(|col| { + col.alias.as_deref() == Some(child.schema.fields[value].name.as_str()) + }) + .ok_or_else(|| invalid("missing sample projection"))?; + let keep_name = matches!(sample.expr, ScalarExpr::Negative { .. }); + let fields: Vec<_> = child + .schema + .fields + .iter() + .enumerate() + .filter(|(_, field)| keep_name || field.name != "__name__") + .collect(); + if qualifier.is_some() || cols.len() != fields.len() { + return Err(invalid("unsupported temporal projection shape")); + } + let mut computed = None; + for (col, (index, field)) in cols.iter().zip(fields) { + if col.alias.as_deref() != Some(field.name.as_str()) { + return Err(invalid("unsupported temporal projection alias")); + } + if index == value { + computed = Some(col); + } else { + let expected = if !keep_name + && field.name == planner_types::pre_asap::schema::PROMQL_SERIES_IDENTITY + { + ScalarExpr::FunctionCall { + name: "promql_drop_metric_name".into(), + args: vec![ScalarExpr::Column(index)], + } + } else { + ScalarExpr::Column(index) + }; + if col.expr != expected { + return Err(invalid("unsupported temporal projection expression")); + } + } + } + let computed = computed.ok_or_else(|| invalid("no computed sample"))?; + if matches!( + computed.expr, + ScalarExpr::Negative { .. } | ScalarExpr::FunctionCall { .. } + ) { + return self.pointwise_projection(cols, child, value, expression, keep_name); + } + self.sample_scalar_operation(&computed.expr, child, value, expression) + } + NonASAPOp::Filter { pred, child } => { + let value = planner_types::pre_asap::column_resolution::resolve_column_ref( + &ColumnRef::SampleValue, + &child.schema, + ) + .map_err(|e| invalid(e.to_string()))?; + self.sample_scalar_operation(&pred.0, child, value, expression) + } + NonASAPOp::Sort { keys, partition_by, child, @@ -258,7 +348,7 @@ impl Lowering { let keys = keys .iter() .map(|key| match key.expr { - QueryExpr::Column(column) => Ok(SortKey { + ScalarExpr::Column(column) => Ok(SortKey { column, descending: !key.ascending, nulls_first: key.nulls_first, @@ -269,70 +359,223 @@ impl Lowering { let groups = groups(&input, partition_by)?; self.push(Operator::sort(input, keys, groups)?, vec![step], expression) } - QueryExpr::Limit { n, offset, child } => { + NonASAPOp::Limit { + n, offset, child, .. + } => { let step = self.value(child)?; let input = self.schema(&step); // `topk by (...)` partitions through the Sort it limits. - let groups = match child.as_ref() { - QueryExpr::Sort { partition_by, .. } => groups(&input, partition_by)?, + let groups = match child.expect_non_asap() { + NonASAPOp::Sort { partition_by, .. } => groups(&input, partition_by)?, _ => vec![], }; self.push( - Operator::limit(input, *n as u64, *offset as u64, groups)?, + Operator::limit( + input, + n.unwrap_or(usize::MAX) as u64, + *offset as u64, + groups, + )?, vec![step], expression, ) } - QueryExpr::BinaryOp { - op, + NonASAPOp::BinaryOp { + operator, lhs, rhs, - vector_match, + return_bool, } => { let sides = vec![self.value(lhs)?, self.value(rhs)?]; - let operator = planner_types::post_asap::BinaryOperator { - kind: op.clone(), - vector_match: vector_match.clone(), - checked_relative_division: false, - checked_finite_division: false, - }; + let operator = crate::expressions::binary::BinaryOperator::from_logical( + operator, + *return_bool, + ); let binary = Operator::series_binary( self.schema(&sides[0]), self.schema(&sides[1]), operator, - [scalar(lhs), scalar(rhs)], + [false, false], )?; self.push(binary, sides, expression) } - QueryExpr::PromqlScalarFromVector(child) => { - let step = self.value(child)?; - let input = self.schema(&step); - let value = named_column(&input, &ColumnRef::SampleValue)?; - self.push( - Operator::vector_to_scalar(input, value)?, - vec![step], - expression, - ) - } - QueryExpr::PromqlVectorFromScalar(child) => { - let step = self.value(child)?; + NonASAPOp::PromqlVectorFromScalar(expr) => { + let step = self.scalar_value(expr)?; let input = self.schema(&step); Ok(self.add( Operator::scope_timestamp(input, declared(expression)?)?, vec![step], )) } - QueryExpr::EvalTimestamp => self.push(Operator::evaluation_time(), vec![], expression), - QueryExpr::PromqlScalarBridge(_) => { - let value = row_values::scalar_literal(expression) - .ok_or_else(|| invalid("PromQL scalar must be a literal"))?; - self.push( - Operator::scalar(crate::values::Value::Float64(value), DataType::Float64)?, + _ => Err(invalid("PromQL expression has no native fallback lowering")), + } + } + + fn pointwise_projection( + &mut self, + cols: &[planner_types::ir::ProjectItem], + child: &OperatorNode, + value: usize, + output: &OperatorNode, + keep_name: bool, + ) -> Result { + let mut input = self.value(child)?; + let mut projected = cols.to_vec(); + for col in &mut projected { + if col.alias.as_deref() != Some(child.schema.fields[value].name.as_str()) { + continue; + } + if let ScalarExpr::FunctionCall { name, args } = &mut col.expr { + if planner_types::pre_asap::scalar_type_rules::promql_function_arity(name).is_none() + || args.first() != Some(&ScalarExpr::Column(value)) + { + return Err(invalid("unsupported pointwise function")); + } + for arg in args.iter_mut().skip(1) { + let scalar = self.scalar_value(arg)?; + let left = self.schema(&input); + let right = self.schema(&scalar); + let index = left.fields.len(); + let mut schema = (*left).clone(); + schema.fields.extend(right.fields.clone()); + let join = Operator::relational_join( + left, + right, + planner_types::pre_asap::JoinKind::Inner, + &planner_types::ir::Predicate(ScalarExpr::Literal( + planner_types::pre_asap::ScalarValue::Boolean(true), + )), + Arc::new(schema), + )?; + input = self.add(join, vec![input, scalar]); + *arg = ScalarExpr::Column(index); + } + if name == "promql_clamp" { + let predicate = ScalarExpr::Not(Box::new(ScalarExpr::Compare { + left: Box::new(args[1].clone()), + right: Box::new(args[2].clone()), + op: planner_types::pre_asap::CompareOpKind::Gt, + semantics: planner_types::ir::ExprSemantics::Promql, + })); + let schema = self.schema(&input); + let predicate = + crate::expressions::CompiledExpression::compile(&predicate, &schema)?; + input = self.add( + Operator::filter( + schema, + crate::expressions::Expression::planner(predicate), + )?, + vec![input], + ); + } + } + } + let schema = self.schema(&input); + let columns = projected + .iter() + .map(|col| { + Ok(( + col.alias.clone().unwrap(), + crate::expressions::Expression::planner( + crate::expressions::CompiledExpression::compile(&col.expr, &schema)?, + ), + )) + }) + .collect::, Error>>()?; + let project = Operator::project(schema, columns)?; + let result = self.push(project, vec![input], output)?; + if keep_name { + Ok(result) + } else { + self.push( + Operator::series_without_name(self.schema(&result))?, + vec![result], + output, + ) + } + } + + fn sample_scalar_operation( + &mut self, + expr: &ScalarExpr, + child: &OperatorNode, + value: usize, + output: &OperatorNode, + ) -> Result { + let (left, right, kind) = scalar_binary(expr)?; + let (scalar, scalar_left) = match (left, right) { + (ScalarExpr::Column(i), scalar) if *i == value => (scalar, false), + (scalar, ScalarExpr::Column(i)) if *i == value => (scalar, true), + _ => { + return Err(invalid( + "sample projection requires one vector sample and one scalar", + )) + } + }; + let vector = self.value(child)?; + let scalar = self.scalar_value(scalar)?; + let sides = if scalar_left { + vec![scalar, vector] + } else { + vec![vector, scalar] + }; + let operator = Operator::series_binary( + self.schema(&sides[0]), + self.schema(&sides[1]), + kernel(kind), + [scalar_left, !scalar_left], + )?; + self.push(operator, sides, output) + } + + fn scalar_value(&mut self, expr: &ScalarExpr) -> Result { + match expr { + ScalarExpr::Literal(planner_types::pre_asap::ScalarValue::Float64(value)) => Ok(self + .add( + Operator::scalar(crate::values::Value::Float64(*value), DataType::Float64)?, vec![], - expression, - ) + )), + ScalarExpr::EvalTimestamp => Ok(self.add(Operator::evaluation_time(), vec![])), + ScalarExpr::PromqlScalarFromVector(child) => { + let step = self.value(child)?; + let input = self.schema(&step); + let values: Vec<_> = input + .fields + .iter() + .enumerate() + .filter(|(_, f)| f.dtype == FieldDataType::Plain(DataType::Float64)) + .map(|(i, _)| i) + .collect(); + let [value] = values.as_slice() else { + return Err(invalid("scalar() requires one float sample column")); + }; + let value = *value; + Ok(self.add(Operator::vector_to_scalar(input, value)?, vec![step])) + } + ScalarExpr::Negative { expr, .. } => { + let value = self.scalar_value(expr)?; + let minus = self.scalar_value(&ScalarExpr::literal_f64(-1.0))?; + let op = Operator::series_binary( + self.schema(&value), + self.schema(&minus), + kernel(crate::expressions::binary::BinaryOpKind::Arithmetic( + planner_types::pre_asap::ArithmeticOpKind::Mul, + )), + [true, true], + )?; + Ok(self.add(op, vec![value, minus])) + } + _ => { + let (left, right, kind) = scalar_binary(expr)?; + let sides = vec![self.scalar_value(left)?, self.scalar_value(right)?]; + let op = Operator::series_binary( + self.schema(&sides[0]), + self.schema(&sides[1]), + kernel(kind), + [true, true], + )?; + Ok(self.add(op, sides)) } - _ => Err(invalid("PromQL expression has no native fallback lowering")), } } @@ -340,19 +583,19 @@ impl Lowering { fn range_function( &mut self, function: &AggIntent, - matrix: &QueryExpr, - logical: &QueryExpr, + matrix: &OperatorNode, + logical: &OperatorNode, ) -> Result { let function = unbound(function)?; - let (subquery, offset, at_ms) = match matrix { - QueryExpr::TimeShift { shift, child } => (child.as_ref(), shift.offset_ms, at(shift)?), - other => (other, 0, None), + let (subquery, offset, at_ms) = match matrix.expect_non_asap() { + NonASAPOp::TimeShift { shift, child } => (child.as_ref(), shift.offset_ms, at(shift)?), + _ => (matrix, 0, None), }; - let QueryExpr::PromqlSubquery { + let NonASAPOp::PromqlSubquery { range: outer, resolution, child, - } = subquery + } = subquery.expect_non_asap() else { let (range, offset, at) = selector(matrix)?; let input = self.read(matrix)?; @@ -374,8 +617,8 @@ impl Lowering { at_ms, }; // Each step evaluates a per-series selection or range function. - let (inner, selected) = match child.as_ref() { - QueryExpr::Aggregate { + let (inner, selected) = match child.expect_non_asap() { + NonASAPOp::Aggregate { reduction: planner_types::pre_asap::Reduction::PerEntity, measures, having: None, @@ -385,7 +628,7 @@ impl Lowering { [inner] => (Some(unbound(inner)?), selected.as_ref()), _ => return Err(invalid("range function requires one measure")), }, - selected => (None, selected), + _ => (None, child.as_ref()), }; let (range, inner_offset, inner_at) = selector(selected)?; let raw = self.read(selected)?; @@ -425,7 +668,7 @@ impl Lowering { mut step: Input, measure: &AggIntent, keys: &GroupKeys, - logical: &QueryExpr, + logical: &OperatorNode, ) -> Result { let mut input = self.schema(&step); if let AggIntent::HistogramQuantile { q, le } = measure { @@ -447,10 +690,10 @@ impl Lowering { }; let value = *value; let reduction = match measure { - AggIntent::Sum { col: None } => Reduction::Sum(value), - AggIntent::Avg { col: None } => Reduction::Avg(value), - AggIntent::Min { col: None } => Reduction::Min(value), - AggIntent::Max { col: None } => Reduction::Max(value), + AggIntent::Sum { .. } => Reduction::Sum(value), + AggIntent::Avg { .. } => Reduction::Avg(value), + AggIntent::Min { .. } => Reduction::Min(value), + AggIntent::Max { .. } => Reduction::Max(value), AggIntent::Count { .. } => Reduction::Count, _ => return Err(invalid("vector aggregate has no native lowering")), }; @@ -527,10 +770,10 @@ fn unbound(intent: &AggIntent) -> Result, Error> { AggIntent::Count { accuracy } => AggIntent::Count { accuracy: accuracy.clone(), }, - AggIntent::Sum { col: None } => AggIntent::Sum { col: None }, - AggIntent::Avg { col: None } => AggIntent::Avg { col: None }, - AggIntent::Min { col: None } => AggIntent::Min { col: None }, - AggIntent::Max { col: None } => AggIntent::Max { col: None }, + AggIntent::Sum { .. } => AggIntent::Sum { col: None }, + AggIntent::Avg { .. } => AggIntent::Avg { col: None }, + AggIntent::Min { .. } => AggIntent::Min { col: None }, + AggIntent::Max { .. } => AggIntent::Max { col: None }, AggIntent::IRate => AggIntent::IRate, AggIntent::IDelta => AggIntent::IDelta, AggIntent::Changes => AggIntent::Changes, @@ -548,3 +791,65 @@ fn unbound(intent: &AggIntent) -> Result, Error> { _ => return Err(invalid("unsupported PromQL range function")), }) } + +fn kernel( + kind: crate::expressions::binary::BinaryOpKind, +) -> crate::expressions::binary::BinaryOperator { + crate::expressions::binary::BinaryOperator { + kind, + vector_match: None, + checked_relative_division: false, + checked_finite_division: false, + } +} + +fn scalar_binary( + expr: &ScalarExpr, +) -> Result< + ( + &ScalarExpr, + &ScalarExpr, + crate::expressions::binary::BinaryOpKind, + ), + Error, +> { + use crate::expressions::binary::BinaryOpKind as K; + match expr { + ScalarExpr::Arithmetic { + left, + right, + op, + semantics: planner_types::ir::ExprSemantics::Promql, + } => Ok((left, right, K::Arithmetic(op.clone()))), + ScalarExpr::Compare { + left, + right, + op, + semantics: planner_types::ir::ExprSemantics::Promql, + } => Ok((left, right, K::Compare(op.clone()))), + ScalarExpr::Case { + operand: None, + branches, + else_expr, + } if matches!(else_expr.as_deref(), Some(ScalarExpr::Literal(planner_types::pre_asap::ScalarValue::Float64(v))) if *v == 0.0) => + { + let [( + ScalarExpr::Compare { + left, + right, + op, + semantics: planner_types::ir::ExprSemantics::Promql, + }, + ScalarExpr::Literal(planner_types::pre_asap::ScalarValue::Float64(v)), + )] = branches.as_slice() + else { + return Err(invalid("unsupported scalar case")); + }; + if *v != 1.0 { + return Err(invalid("unsupported scalar case result")); + } + Ok((left, right, K::CompareBool(op.clone()))) + } + _ => Err(invalid("scalar expression has no native temporal lowering")), + } +} diff --git a/crates/asap-physical-operators/src/physical_planner/promql_rows.rs b/crates/asap-physical-operators/src/physical_planner/promql_rows.rs index f3082927b..f85d187d5 100644 --- a/crates/asap-physical-operators/src/physical_planner/promql_rows.rs +++ b/crates/asap-physical-operators/src/physical_planner/promql_rows.rs @@ -1,6 +1,10 @@ //! A bounded PromQL source row carries the entire label set, not just labels //! mentioned by the query. The source adapter owns this lossless encoding. use super::*; +use planner_types::ir::export::{ + compile_physical_asap_dag, compile_physical_asap_dag_with_node_ids, +}; +use planner_types::post_asap::FieldDataType as SummaryFamilyType; use planner_types::pre_asap::DataType; use std::rc::Rc; @@ -23,9 +27,9 @@ pub fn decode_series_identity(encoded: &str) -> Result, } /// Resolve the row representation before candidate search; see -/// [`planner_types::pre_asap::schema::with_promql_series_identity`]. -pub fn with_series_identity(root: &QueryExpr) -> Result { - planner_types::pre_asap::schema::with_promql_series_identity(root).map_err(invalid) +/// [`planner_types::ir::schema_support::with_promql_series_identity`]. +pub fn with_series_identity(root: &Rc) -> Result, Error> { + planner_types::ir::schema_support::with_promql_series_identity(root).map_err(invalid) } /// Construct source rows only from full identities. The named label columns @@ -45,7 +49,10 @@ pub fn series_row( .enumerate() .map(|(index, field)| { if field.name == SERIES_IDENTITY_COLUMN { - if field.dtype != FieldDataType::Plain(DataType::Utf8) || field.nullable || found { + if field.dtype != SummaryFamilyType::Plain(DataType::Utf8) + || field.nullable + || found + { return Err(invalid("invalid series identity column")); } found = true; @@ -53,10 +60,10 @@ pub fn series_row( } else if Some(index) == schema.time_index { Ok(Value::Timestamp(timestamp)) } else if field.name == "value" - && field.dtype == FieldDataType::Plain(DataType::Float64) + && field.dtype == SummaryFamilyType::Plain(DataType::Float64) { Ok(Value::Float64(value)) - } else if field.dtype == FieldDataType::Plain(DataType::Utf8) { + } else if field.dtype == SummaryFamilyType::Plain(DataType::Utf8) { Ok(labels.get(&field.name).map_or_else( || Value::Utf8("".into()), |value| Value::Utf8(value.clone().into()), @@ -75,17 +82,25 @@ pub fn series_row( /// Compile the selected TopK computation above an existing maintained-population /// source. The boundary supplies the complete eligible vector, not a truncated /// TopK result; ranking remains a native physical operator. -pub fn compile_current_series_readout( - selected: &Rc, +pub fn compile_current_series_evaluation( + selected: &Rc, ) -> Result { use planner_types::post_asap::{ - compile_post_asap_dag, maintained_population::PopulationStatistic, Field, + maintained_population::PopulationStatistic, Field as SummaryField, }; - let mut dag = compile_post_asap_dag(selected).map_err(|error| invalid(error.to_string()))?; + // This compiler emits maintained precompute: every summary at ingestion time. + let selected = planner_types::ir::apply_materialization_timings( + selected, + &planner_types::ir::MaterializationAssignment::all_ingestion_time(), + &mut planner_types::ir::TimingMemo::new(), + ) + .map_err(|e| invalid(e.to_string()))?; + let mut dag = + compile_physical_asap_dag(&selected).map_err(|error| invalid(error.to_string()))?; // Typed snapshot candidates already carry full identity throughout the DAG. - // Cut at the population output, preserving all selected heap/readout nodes. + // Cut at the population output, preserving all selected heap/evaluation nodes. let populations = dag.nodes.iter().filter(|node| matches!(&node.payload, - Payload::Value { operation: ValueOperation::MaintainPopulation { population } } + Payload::MaintainPopulation { population } if matches!(population.input, planner_types::post_asap::maintained_population::PopulationInput::CurrentSeries(_)) )).collect::>(); if let [population] = populations.as_slice() { @@ -101,45 +116,30 @@ pub fn compile_current_series_readout( u64::from(population.id.0), InputContract::bounded(Arc::new(population.output_schema.clone())), )]), - &[u64::from(dag.root.0)], + &dag.roots.iter().map(|r| u64::from(r.0)).collect::>(), ); } } - if dag.nodes.len() != 3 - || !dag.nodes.iter().any(|node| { - node.id == dag.root - && matches!( - node.payload, - Payload::Value { - operation: ValueOperation::ReadPopulation { - readout: PopulationStatistic::TopK { .. } - } - } - ) - }) - { - return Err(invalid( - "expected one selected current-series TopK computation", - )); - } let mut frontier = None; for node in &mut dag.nodes { match &mut node.payload { - Payload::Fallback { expression } => { - *expression = with_series_identity(expression)?; + Payload::Relational { operator } => { + if let NonASAPOpKind::Scan { schema, .. } = operator { + schema.fields.push(SummaryField::new( + SERIES_IDENTITY_COLUMN, + SummaryFamilyType::Plain(DataType::Utf8), + false, + )); + schema.closed = true; + } } - Payload::Value { - operation: ValueOperation::MaintainPopulation { .. }, - } => { + Payload::MaintainPopulation { .. } => { frontier = Some(u64::from(node.id.0)); } - Payload::Value { - operation: - ValueOperation::ReadPopulation { - readout: PopulationStatistic::TopK { .. }, - }, + Payload::EvaluatePopulation { + evaluation: PopulationStatistic::TopK { .. }, } => {} - _ => return Err(invalid("unsupported current-series readout dependency")), + _ => return Err(invalid("unsupported current-series evaluation dependency")), } if node .output_schema @@ -151,11 +151,11 @@ pub fn compile_current_series_readout( "current-series input already has a physical identity column", )); } - node.output_schema.fields.push(Field { - table: None, + node.output_schema.fields.push(SummaryField { name: SERIES_IDENTITY_COLUMN.into(), - dtype: FieldDataType::Plain(DataType::Utf8), + dtype: SummaryFamilyType::Plain(DataType::Utf8), nullable: false, + table: None, }); } for edge in &mut dag.edges { @@ -179,48 +179,37 @@ pub fn compile_current_series_readout( compile( &dag, BTreeMap::from([(frontier, InputContract::bounded(schema))]), - &[u64::from(dag.root.0)], + &dag.roots.iter().map(|r| u64::from(r.0)).collect::>(), ) } /// Compile selected ranking or aggregation above an exact per-series Rate -/// readout. Deployments bind complete window readouts at this boundary; +/// evaluation. Deployments bind complete window evaluations at this boundary; /// the heap is rebuilt independently for each evaluation. This does not move /// that frontier to ingestion time or authorize combining finalized rates. pub fn compile_rate_ranking( - selected: &Rc, -) -> Result< - ( - Rc, - CompiledPhysicalDAG, - ), - Error, -> { - use planner_types::post_asap::{ - compile_post_asap_dag_with_node_ids, ExactKind, SummaryExpr, SummaryNode, - }; - fn frontier(node: &Rc) -> Option> { - match &node.expr { - SummaryExpr::ValueOperation { - child, - operation: ValueOperation::FinalizeExactAccumulator, - timing: planner_types::post_asap::ExecutionTiming::QueryTime, - } if matches!(&child.expr, SummaryExpr::SummaryAgg { - family: FieldDataType::ExactAggregate(ExactKind::Rate, _), - reduction: planner_types::pre_asap::Reduction::PerEntity, - child: raw, .. - } if matches!(&raw.expr, SummaryExpr::KeepPreAsap(expr) if matches!(expr.as_ref(), QueryExpr::TimeRange { .. }))) => - { - Some(Rc::clone(node)) - } - SummaryExpr::ValueOperation { child, .. } | SummaryExpr::SummaryAgg { child, .. } => { - frontier(child) - } - SummaryExpr::SummaryEstimate { summary_input, .. } => frontier(summary_input), - _ => None, + selected: &Rc, +) -> Result<(Rc, CompiledPhysicalDAG), Error> { + use planner_types::post_asap::ExactKind; + fn frontier(node: &Rc) -> Option> { + if matches!(&node.operator, LogicalOperator::ASAP(ASAPOp::FinalizeExactAccumulator { child }) + if matches!(&child.operator, LogicalOperator::ASAP(ASAPOp::SummaryAgg { + family: FieldDataType::ExactAggregate(ExactKind::Rate, _), + reduction: planner_types::pre_asap::Reduction::PerEntity, child: raw, .. + }) if matches!(raw.non_asap(), Some(NonASAPOp::TimeRange { .. })))) + { + return Some(Rc::clone(node)); } + node.children().into_iter().find_map(frontier) } - let source = frontier(selected) + // This compiler emits maintained precompute: every summary at ingestion time. + let selected = planner_types::ir::apply_materialization_timings( + selected, + &planner_types::ir::MaterializationAssignment::all_ingestion_time(), + &mut planner_types::ir::TimingMemo::new(), + ) + .map_err(|e| invalid(e.to_string()))?; + let source = frontier(&selected) .ok_or_else(|| invalid("ranking requires one exact per-series Rate frontier"))?; if !source .schema @@ -230,7 +219,7 @@ pub fn compile_rate_ranking( { return Err(invalid("Rate ranking requires complete series identity")); } - let compiled = compile_post_asap_dag_with_node_ids(selected) + let compiled = compile_physical_asap_dag_with_node_ids(&selected) .map_err(|error| invalid(error.to_string()))?; let id = u64::from( compiled @@ -242,17 +231,22 @@ pub fn compile_rate_ranking( let program = compile( &compiled.dag, BTreeMap::from([(id, InputContract::bounded(Arc::new(source.schema.clone())))]), - &[u64::from(compiled.dag.root.0)], + &compiled + .dag + .roots + .iter() + .map(|r| u64::from(r.0)) + .collect::>(), )?; Ok((source, program)) } -/// Compile a lifecycle-timed DAG whose heap or grouped Sum over per-series -/// Rate readouts runs at ingestion time: fresh aggregate state per closed +/// Compile a materialization-timed DAG whose heap or grouped Sum over per-series +/// Rate evaluations runs at ingestion time: fresh aggregate state per closed /// window. The input is the complete collection of per-series counter states. pub fn compile_fixed_window_rate_aggregation( - dag: &planner_types::post_asap::PostAsapDAG, -) -> Result { + dag: &planner_types::ir::export::PhysicalASAPDAG, +) -> Result { use planner_types::post_asap::{ExactKind, ExecutionTiming, SketchAlgorithm}; let sources = dag .nodes @@ -261,7 +255,7 @@ pub fn compile_fixed_window_rate_aggregation( matches!( &n.payload, Payload::SummaryAgg { - family: FieldDataType::ExactAggregate(ExactKind::Rate, _), + family: SummaryFamilyType::ExactAggregate(ExactKind::Rate, _), reduction: planner_types::pre_asap::Reduction::PerEntity, .. } @@ -275,14 +269,14 @@ pub fn compile_fixed_window_rate_aggregation( n.output_state.timing == ExecutionTiming::IngestionTime && match &n.payload { Payload::SummaryAgg { - family: FieldDataType::Sketch(kind, _), + family: SummaryFamilyType::Sketch(kind, _), .. } => matches!( kind.algorithm(), SketchAlgorithm::CmsWithHeap | SketchAlgorithm::CountSketchWithHeap ), Payload::SummaryAgg { - family: FieldDataType::ExactAggregate(ExactKind::Sum, _), + family: SummaryFamilyType::ExactAggregate(ExactKind::Sum, _), .. } => true, _ => false, @@ -310,7 +304,7 @@ pub fn compile_fixed_window_rate_aggregation( u64::from(source.id.0), InputContract::bounded(Arc::new(source.output_schema.clone())), )]), - &[u64::from(dag.root.0)], + &dag.roots.iter().map(|r| u64::from(r.0)).collect::>(), &[u64::from(heap.id.0)], ) } diff --git a/crates/asap-physical-operators/src/physical_planner/promql_values.rs b/crates/asap-physical-operators/src/physical_planner/promql_values.rs index 880916ed2..a8a091249 100644 --- a/crates/asap-physical-operators/src/physical_planner/promql_values.rs +++ b/crates/asap-physical-operators/src/physical_planner/promql_values.rs @@ -1,5 +1,6 @@ //! Physical scalar/vector contracts preserve complete label sets across native computation. use super::*; +use planner_types::post_asap::FieldDataType as SummaryFamilyType; pub fn scalar_schema() -> SchemaRef { crate::operators::vector_binary::value_schema(true) @@ -63,7 +64,7 @@ pub fn compile_histogram_quantile() -> Result { /// Compile before deployment chooses readers. Input slots 0 and 1 retain operand order. pub fn compile_binary( - operator: &planner_types::post_asap::BinaryOperator, + operator: &crate::expressions::binary::BinaryOperator, return_bool: bool, left_scalar: bool, right_scalar: bool, @@ -209,8 +210,8 @@ pub fn compile_vector_to_scalar() -> Result { /// A stored exact-state input retains the complete population identity. The /// deployment supplies eligible panes; merging and finalization are computation. -pub fn exact_state_schema(family: FieldDataType) -> Result { - if !matches!(family, FieldDataType::ExactAggregate(..)) { +pub fn exact_state_schema(family: SummaryFamilyType) -> Result { + if !matches!(family, SummaryFamilyType::ExactAggregate(..)) { return Err(invalid("exact-state input requires an exact family")); } crate::values::validate_family(&family)?; @@ -219,31 +220,33 @@ pub fn exact_state_schema(family: FieldDataType) -> Result { Ok(Arc::new(schema)) } -/// Retain exact readout semantics before any deployment state is opened. -pub fn compile_exact_readout( - family: FieldDataType, +/// Retain exact evaluation semantics before any deployment state is opened. +pub fn compile_exact_evaluation( + family: SummaryFamilyType, lookback_ms: u64, preserve_metric_name: bool, ) -> Result { use planner_types::post_asap::ExactKind; let statistic = match &family { - FieldDataType::ExactAggregate(kind, _) => match kind { + SummaryFamilyType::ExactAggregate(kind, _) => match kind { ExactKind::Sum => crate::Statistic::Sum, ExactKind::Count => crate::Statistic::Count, ExactKind::Min => crate::Statistic::Min, ExactKind::Max => crate::Statistic::Max, ExactKind::Rate => crate::Statistic::Rate, ExactKind::Increase => crate::Statistic::Increase, - ExactKind::IRate => return Err(invalid("instant-rate state readout is not supported")), + ExactKind::IRate => { + return Err(invalid("instant-rate state evaluation is not supported")) + } }, - _ => return Err(invalid("exact readout requires an exact family")), + _ => return Err(invalid("exact evaluation requires an exact family")), }; let input = exact_state_schema(family)?; let merge = Operator::summary_merge(input.clone(), 1, vec![0])?; - let mut readout = Operator::readout( + let mut evaluation = Operator::evaluation( merge.schema(), 1, - ReadoutQuery::Exact(ExactReadout { + SummaryEvaluation::Exact(ExactEvaluation { statistic, lookback_ms: None, }), @@ -252,12 +255,12 @@ pub fn compile_exact_readout( statistic, crate::Statistic::Rate | crate::Statistic::Increase ) { - readout = readout.with_counter_lookback( + evaluation = evaluation.with_counter_lookback( i64::try_from(lookback_ms).map_err(|_| invalid("counter lookback exceeds Int64"))?, )?; } let project = Operator::project( - readout.schema(), + evaluation.schema(), vec![ ( "labels".into(), @@ -274,5 +277,5 @@ pub fn compile_exact_readout( ("value".into(), Expression::ExactFloat64(1)), ], )?; - unary(vec![merge, readout, project], input) + unary(vec![merge, evaluation, project], input) } diff --git a/crates/asap-physical-operators/src/physical_planner/row_values.rs b/crates/asap-physical-operators/src/physical_planner/row_values.rs index 3396df685..14f3d4813 100644 --- a/crates/asap-physical-operators/src/physical_planner/row_values.rs +++ b/crates/asap-physical-operators/src/physical_planner/row_values.rs @@ -1,29 +1,20 @@ //! Query-time PromQL value computation over logical row schemas. use super::*; use planner_types::post_asap::maintained_population::PopulationStatistic; -use planner_types::pre_asap::{DataType, ScalarValue}; +use planner_types::pre_asap::DataType; -/// A PromQL number literal has no row schema; its consumer folds it in. -pub(super) fn scalar_literal(expression: &QueryExpr) -> Option { - match expression { - QueryExpr::PromqlScalarBridge(child) => scalar_literal(child), - QueryExpr::Literal(ScalarValue::Float64(value)) => Some(*value), - _ => None, - } -} - -/// Aggregate readouts of a maintained current-series population, as a chain. +/// Aggregate evaluations of a maintained current-series population, as a chain. pub(super) fn population_aggregate( input: &SchemaRef, grouping: &[String], - readout: &PopulationStatistic, + evaluation: &PopulationStatistic, ) -> Result, Error> { let groups = grouping .iter() .map(|name| named_column(input, &ColumnRef::Named(name.clone()))) .collect::, _>>()?; let value = named_column(input, &ColumnRef::SampleValue)?; - let reduction = match readout { + let reduction = match evaluation { PopulationStatistic::Sum => Reduction::Sum(value), PopulationStatistic::Count => Reduction::Count, PopulationStatistic::Average => Reduction::Avg(value), @@ -33,7 +24,7 @@ pub(super) fn population_aggregate( }, PopulationStatistic::TopK { .. } => { return Err(invalid( - "TopK population readout ranks; it does not aggregate", + "TopK population evaluation ranks; it does not aggregate", )) } }; diff --git a/crates/asap-physical-operators/src/runtime/batch_execution.rs b/crates/asap-physical-operators/src/runtime/batch_execution.rs index ca59877cb..733741022 100644 --- a/crates/asap-physical-operators/src/runtime/batch_execution.rs +++ b/crates/asap-physical-operators/src/runtime/batch_execution.rs @@ -88,7 +88,7 @@ mod tests { values::Value, }; use planner_types::{ - post_asap::{Field, FieldDataType, Schema}, + post_asap::{Field as SummaryField, FieldDataType as SummaryFamilyType, Schema}, pre_asap::DataType, }; use std::sync::Arc; @@ -97,15 +97,15 @@ mod tests { #[test] fn same_native_chain_inside_query_and_ingestion_execution() { let schema = Arc::new(Schema { - closed: true, - unique_keys: vec![], - fields: vec![Field { - table: None, + fields: vec![SummaryField { name: "value".into(), - dtype: FieldDataType::Plain(DataType::Float64), + dtype: SummaryFamilyType::Plain(DataType::Float64), nullable: false, + table: None, }], time_index: None, + unique_keys: vec![], + closed: false, }); for scope in [ Scope::Query { @@ -143,10 +143,10 @@ mod tests { #[test] fn in_memory_source_drives_cooperative_yields() { let schema = Arc::new(Schema { - closed: true, - unique_keys: vec![], fields: vec![], time_index: None, + unique_keys: vec![], + closed: false, }); let batch = Batch::try_new(schema.clone(), vec![vec![]]).unwrap(); let source = Operator::source(schema, vec![batch; 65]).unwrap(); @@ -165,10 +165,10 @@ mod tests { #[test] fn returned_batches_keep_their_resource_reservation() { let schema = Arc::new(Schema { - closed: true, - unique_keys: vec![], fields: vec![], time_index: None, + unique_keys: vec![], + closed: false, }); let batch = Batch::try_new(schema.clone(), vec![vec![]]).unwrap(); let bytes = batch.bytes(); @@ -196,10 +196,10 @@ mod tests { #[test] fn cancellation_is_not_bypassed_by_in_memory_execution() { let schema = Arc::new(Schema { - closed: true, - unique_keys: vec![], fields: vec![], time_index: None, + unique_keys: vec![], + closed: false, }); let batch = Batch::try_new(schema, vec![vec![]]).unwrap(); let context = RunContext::new( diff --git a/crates/asap-physical-operators/src/sources/memory.rs b/crates/asap-physical-operators/src/sources/memory.rs index 1055888de..856c73cb0 100644 --- a/crates/asap-physical-operators/src/sources/memory.rs +++ b/crates/asap-physical-operators/src/sources/memory.rs @@ -11,7 +11,7 @@ impl MemorySource { if schema .fields .iter() - .any(|f| !matches!(f.dtype, FieldDataType::Plain(_))) + .any(|f| !matches!(f.dtype, SummaryFamilyType::Plain(_))) { return Err(Error::Invalid( "raw source cannot contain summary states".into(), diff --git a/crates/asap-physical-operators/src/sources/mod.rs b/crates/asap-physical-operators/src/sources/mod.rs index 4b401d666..9713c2a6f 100644 --- a/crates/asap-physical-operators/src/sources/mod.rs +++ b/crates/asap-physical-operators/src/sources/mod.rs @@ -7,9 +7,10 @@ use crate::{ Error, }; use futures::{stream, StreamExt}; +use planner_types::ir::{NonASAPOp, OperatorNode}; use planner_types::{ - post_asap::{FieldDataType, Schema}, - pre_asap::{DataType, QueryExpr, Source}, + post_asap::FieldDataType as SummaryFamilyType, + pre_asap::{DataType, Source}, }; use std::sync::Arc; @@ -40,18 +41,18 @@ impl DataSources { self.sources.push((identity, source)); Ok(()) } - pub fn bind(&self, expression: &QueryExpr) -> Result { - let QueryExpr::Scan { + pub fn bind(&self, expression: &OperatorNode) -> Result { + let Some(NonASAPOp::Scan { source, predicates, schema, - } = expression + }) = expression.non_asap() else { return Err(Error::Invalid( "raw Scan requires a Planner Scan leaf".into(), )); }; - let output = Arc::new(Schema::lifted(schema.fields.clone(), schema.time_index)); + let output = Arc::new(schema.clone()); crate::values::validate_schema(&output)?; let reader = self .sources diff --git a/crates/asap-physical-operators/src/summary_kernels/exact.rs b/crates/asap-physical-operators/src/summary_kernels/exact.rs index d4754686e..d5375f9bf 100644 --- a/crates/asap-physical-operators/src/summary_kernels/exact.rs +++ b/crates/asap-physical-operators/src/summary_kernels/exact.rs @@ -2,7 +2,7 @@ use super::increase::IncreaseAccumulator; use crate::Statistic; use crate::{AggregateCore, KeyByLabelValues, Measurement}; -use planner_types::post_asap::{ExactKind, ExactParams, FieldDataType}; +use planner_types::post_asap::{ExactKind, ExactParams, FieldDataType as SummaryFamilyType}; use serde::{Deserialize, Serialize}; use std::collections::HashMap; @@ -10,7 +10,11 @@ type Error = Box; #[derive(Debug, Clone, Serialize, Deserialize)] enum ScalarState { - Sum { sum: f64, compensation: f64 }, + Sum { + sum: f64, + compensation: f64, + seen: bool, + }, Count(u64), Min(Option), Max(Option), @@ -18,7 +22,7 @@ enum ScalarState { } /// Both the family and population layout survive persistence. Sharing counter -/// arithmetic never authorizes a Rate state to answer an Increase readout. +/// arithmetic never authorizes a Rate state to answer an Increase evaluation. /// /// Deserialization validates the payload against its declared family, so /// deployments can persist this state with any serde format without mirroring @@ -26,14 +30,14 @@ enum ScalarState { #[derive(Debug, Clone, Serialize, Deserialize)] #[serde(try_from = "ExactPayload")] pub struct ExactAccumulator { - family: FieldDataType, + family: SummaryFamilyType, scalar: ScalarState, keyed: Option>, } #[derive(Deserialize)] struct ExactPayload { - family: FieldDataType, + family: SummaryFamilyType, scalar: ScalarState, keyed: Option>, } @@ -63,10 +67,10 @@ impl TryFrom for ExactAccumulator { } } -/// Planned readout of an exact summary. `lookback_ms` is the logical PromQL +/// Planned evaluation of an exact summary. `lookback_ms` is the logical PromQL /// counter window; the evaluation range is resolved from it at run time. #[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)] -pub struct ExactReadout { +pub struct ExactEvaluation { pub statistic: Statistic, #[serde(default, skip_serializing_if = "Option::is_none")] pub lookback_ms: Option, @@ -75,22 +79,24 @@ pub struct ExactReadout { impl ExactAccumulator { /// Read one population. An empty MIN/MAX population reads as `None`. /// `range_ms` extrapolates a counter Rate/Increase to that evaluation range. - pub fn readout( + pub fn evaluation( &self, statistic: Statistic, range_ms: Option<(i64, i64)>, key: Option<&KeyByLabelValues>, ) -> Result, Error> { if statistic != self.statistic() { - return Err("readout differs from Planner exact family".into()); + return Err("evaluation differs from Planner exact family".into()); } let state = match (&self.keyed, key) { (Some(states), Some(key)) => states.get(key).ok_or("unknown exact population")?, (None, None) => &self.scalar, - _ => return Err("readout population differs from installed layout".into()), + _ => return Err("evaluation population differs from installed layout".into()), }; match state { - ScalarState::Sum { sum, compensation } => Ok(Some(sum + compensation)), + ScalarState::Sum { + sum, compensation, .. + } => Ok(Some(sum + compensation)), ScalarState::Count(count) => Ok(Some(*count as f64)), ScalarState::Min(value) | ScalarState::Max(value) => Ok(*value), ScalarState::Counter(Some(counter)) => counter @@ -100,6 +106,11 @@ impl ExactAccumulator { } } + /// SQL SUM distinguishes an empty/all-NULL input from an observed zero. + pub(crate) fn is_empty_sum(&self) -> bool { + self.keyed.is_none() && matches!(self.scalar, ScalarState::Sum { seen: false, .. }) + } + /// Exact integer count of an unkeyed Count state. pub fn count(&self) -> Option { match (&self.keyed, &self.scalar) { @@ -128,19 +139,22 @@ impl ExactAccumulator { Ok(()) } - pub fn new(family: FieldDataType, keyed: bool) -> Result { + pub fn new(family: SummaryFamilyType, keyed: bool) -> Result { use ExactKind as K; use ExactParams as P; let scalar = match &family { - FieldDataType::ExactAggregate(K::Sum, P::Sum) => ScalarState::Sum { + SummaryFamilyType::ExactAggregate(K::Sum, P::Sum) => ScalarState::Sum { sum: 0.0, compensation: 0.0, + seen: false, }, - FieldDataType::ExactAggregate(K::Count, P::Count) => ScalarState::Count(0), - FieldDataType::ExactAggregate(K::Min, P::Min) => ScalarState::Min(None), - FieldDataType::ExactAggregate(K::Max, P::Max) => ScalarState::Max(None), - FieldDataType::ExactAggregate(K::Rate, P::Rate) - | FieldDataType::ExactAggregate(K::Increase, P::Increase) => ScalarState::Counter(None), + SummaryFamilyType::ExactAggregate(K::Count, P::Count) => ScalarState::Count(0), + SummaryFamilyType::ExactAggregate(K::Min, P::Min) => ScalarState::Min(None), + SummaryFamilyType::ExactAggregate(K::Max, P::Max) => ScalarState::Max(None), + SummaryFamilyType::ExactAggregate(K::Rate, P::Rate) + | SummaryFamilyType::ExactAggregate(K::Increase, P::Increase) => { + ScalarState::Counter(None) + } _ => return Err(format!("unsupported exact Planner family: {family:?}")), }; Ok(Self { @@ -150,7 +164,7 @@ impl ExactAccumulator { }) } - pub fn family(&self) -> &FieldDataType { + pub fn family(&self) -> &SummaryFamilyType { &self.family } pub(crate) fn insufficient_counter_samples( @@ -188,7 +202,14 @@ impl ExactAccumulator { _ => panic!("exact update population layout differs from installed DAG"), }; match state { - ScalarState::Sum { sum, compensation } => compensated_add(sum, compensation, value), + ScalarState::Sum { + sum, + compensation, + seen, + } => { + compensated_add(sum, compensation, value); + *seen = true; + } ScalarState::Count(count) => { *count = count.checked_add(1).expect("exact count overflow") } @@ -214,12 +235,12 @@ impl ExactAccumulator { fn statistic(&self) -> Statistic { match self.family { - FieldDataType::ExactAggregate(ExactKind::Sum, _) => Statistic::Sum, - FieldDataType::ExactAggregate(ExactKind::Count, _) => Statistic::Count, - FieldDataType::ExactAggregate(ExactKind::Min, _) => Statistic::Min, - FieldDataType::ExactAggregate(ExactKind::Max, _) => Statistic::Max, - FieldDataType::ExactAggregate(ExactKind::Rate, _) => Statistic::Rate, - FieldDataType::ExactAggregate(ExactKind::Increase, _) => Statistic::Increase, + SummaryFamilyType::ExactAggregate(ExactKind::Sum, _) => Statistic::Sum, + SummaryFamilyType::ExactAggregate(ExactKind::Count, _) => Statistic::Count, + SummaryFamilyType::ExactAggregate(ExactKind::Min, _) => Statistic::Min, + SummaryFamilyType::ExactAggregate(ExactKind::Max, _) => Statistic::Max, + SummaryFamilyType::ExactAggregate(ExactKind::Rate, _) => Statistic::Rate, + SummaryFamilyType::ExactAggregate(ExactKind::Increase, _) => Statistic::Increase, _ => unreachable!("validated exact family"), } } @@ -244,16 +265,22 @@ fn merge_scalar(left: &ScalarState, right: &ScalarState) -> Result { let (mut sum, mut compensation) = (*a, *ac); compensated_add(&mut sum, &mut compensation, *b); compensated_add(&mut sum, &mut compensation, *bc); - ScalarState::Sum { sum, compensation } + ScalarState::Sum { + sum, + compensation, + seen: *a_seen || *b_seen, + } } (ScalarState::Count(a), ScalarState::Count(b)) => { ScalarState::Count(a.checked_add(*b).ok_or("exact count overflow")?) @@ -311,7 +338,7 @@ mod tests { #[derive(Serialize)] struct Payload { - family: FieldDataType, + family: SummaryFamilyType, scalar: ScalarState, keyed: Option>, } @@ -320,8 +347,8 @@ mod tests { rmp_serde::from_slice(&rmp_serde::to_vec_named(payload).unwrap()) } - fn sum() -> FieldDataType { - FieldDataType::ExactAggregate(ExactKind::Sum, ExactParams::Sum) + fn sum() -> SummaryFamilyType { + SummaryFamilyType::ExactAggregate(ExactKind::Sum, ExactParams::Sum) } // Stored Sum preserves low-order increments across updates, persistence and pane merge. @@ -337,7 +364,7 @@ mod tests { negative.update(None, -1e16, 1); restored.merge_from(&negative).unwrap(); assert_eq!( - restored.readout(Statistic::Sum, None, None).unwrap(), + restored.evaluation(Statistic::Sum, None, None).unwrap(), Some(1.0) ); } @@ -349,18 +376,18 @@ mod tests { state.update(None, f64::INFINITY, 0); state.update(None, 1.0, 0); assert_eq!( - state.readout(Statistic::Sum, None, None).unwrap(), + state.evaluation(Statistic::Sum, None, None).unwrap(), Some(f64::INFINITY) ); state.update(None, f64::NEG_INFINITY, 0); assert!(state - .readout(Statistic::Sum, None, None) + .evaluation(Statistic::Sum, None, None) .unwrap() .unwrap() .is_nan()); } - // A persisted exact state decodes back to the same family, layout and readout. + // A persisted exact state decodes back to the same family, layout and evaluation. #[test] fn serialized_state_round_trips() { let mut state = ExactAccumulator::new(sum(), true).unwrap(); @@ -370,7 +397,9 @@ mod tests { let restored: ExactAccumulator = rmp_serde::from_slice(&bytes).unwrap(); assert_eq!(restored.family(), &sum()); assert_eq!( - restored.readout(Statistic::Sum, None, Some(&key)).unwrap(), + restored + .evaluation(Statistic::Sum, None, Some(&key)) + .unwrap(), Some(2.5) ); } @@ -390,6 +419,7 @@ mod tests { scalar: ScalarState::Sum { sum: 0.0, compensation: 0.0, + seen: false, }, keyed: Some(HashMap::from([(key, ScalarState::Max(Some(1.0)))])), }; @@ -400,10 +430,11 @@ mod tests { #[test] fn decode_rejects_unsupported_family() { let payload = Payload { - family: FieldDataType::ExactAggregate(ExactKind::Sum, ExactParams::Count), + family: SummaryFamilyType::ExactAggregate(ExactKind::Sum, ExactParams::Count), scalar: ScalarState::Sum { sum: 0.0, compensation: 0.0, + seen: false, }, keyed: None, }; diff --git a/crates/asap-physical-operators/src/summary_kernels/factory.rs b/crates/asap-physical-operators/src/summary_kernels/factory.rs index 4be126d6e..be819f8a7 100644 --- a/crates/asap-physical-operators/src/summary_kernels/factory.rs +++ b/crates/asap-physical-operators/src/summary_kernels/factory.rs @@ -6,7 +6,7 @@ use crate::summary_kernels::{ HydraKllSketchAccumulator, }; use crate::{AggregateCore, KeyByLabelValues}; -use planner_types::post_asap::{FieldDataType, SketchAlgorithm, SketchParams}; +use planner_types::post_asap::{FieldDataType as SummaryFamilyType, SketchAlgorithm, SketchParams}; /// Generate the clone-based `AccumulatorUpdater` methods for updaters whose /// inner `acc` field implements `Clone + AggregateCore`. @@ -527,7 +527,7 @@ fn cms_heap_dims(params: &SketchParams) -> (usize, usize, usize) { /// Construct the kernel declared by a Planner SummaryAgg. No deployment config /// tags participate in this dispatch and unsupported payloads are errors. pub fn create_planner_accumulator( - family: &FieldDataType, + family: &SummaryFamilyType, input: &planner_types::post_asap::SummaryUpdate, grouping: &planner_types::post_asap::GroupingStrategy, ) -> Result, String> { @@ -548,7 +548,7 @@ pub fn create_planner_accumulator( if grouping != &GroupingStrategy::PerSubpopulationInstance { return Err("shared summary grouping requires a supported Planner Hydra kernel".into()); } - if matches!(family, FieldDataType::ExactAggregate(..)) { + if matches!(family, SummaryFamilyType::ExactAggregate(..)) { return Ok(Box::new(PlannerExactUpdater { acc: crate::summary_kernels::exact::ExactAccumulator::new( family.clone(), @@ -556,7 +556,7 @@ pub fn create_planner_accumulator( )?, })); } - let FieldDataType::Sketch(kind, family_grouping) = family else { + let SummaryFamilyType::Sketch(kind, family_grouping) = family else { return Err(format!("unsupported Planner summary family {family:?}")); }; if family_grouping != grouping { @@ -748,7 +748,7 @@ mod planner_parameter_regression { }, ), ] { - let family = FieldDataType::Sketch( + let family = SummaryFamilyType::Sketch( SketchKind::new(algorithm.clone(), params), Default::default(), ); diff --git a/crates/asap-physical-operators/src/summary_kernels/traits.rs b/crates/asap-physical-operators/src/summary_kernels/traits.rs index 9c5d028fb..46e2c7f86 100644 --- a/crates/asap-physical-operators/src/summary_kernels/traits.rs +++ b/crates/asap-physical-operators/src/summary_kernels/traits.rs @@ -5,7 +5,7 @@ pub type KernelError = Box; /// In-memory state of one population's summary. /// /// Kernels adapt `asap_sketchlib` structures (or exact Planner state) to the -/// operations physical operators need: merge, typed readout and memory +/// operations physical operators need: merge, typed evaluation and memory /// accounting. Grouping belongs to operators; byte encodings belong to /// `asap_sketchlib` and deployments. pub trait AggregateCore: Send + Sync { @@ -20,8 +20,8 @@ pub trait AggregateCore: Send + Sync { /// Merge with a state of the same family and shape, leaving both inputs unchanged. fn merge_with(&self, other: &dyn AggregateCore) -> Result, KernelError>; - /// Answer a sketch readout. Exact states are read through - /// [`ExactAccumulator::readout`](super::exact::ExactAccumulator::readout). + /// Answer a sketch evaluation. Exact states are read through + /// [`ExactAccumulator::evaluation`](super::exact::ExactAccumulator::evaluation). fn estimate(&self, query: &SketchStatistic) -> Result { Err(format!("{query:?} is not supported by this summary").into()) } diff --git a/crates/asap-physical-operators/src/summary_kernels/univmon.rs b/crates/asap-physical-operators/src/summary_kernels/univmon.rs index 9340b1c0e..23114ab1b 100644 --- a/crates/asap-physical-operators/src/summary_kernels/univmon.rs +++ b/crates/asap-physical-operators/src/summary_kernels/univmon.rs @@ -1,4 +1,4 @@ -//! One frequency state shared by count, distinct, L2 and entropy readouts. +//! One frequency state shared by count, distinct, L2 and entropy evaluations. use crate::AggregateCore; use asap_sketchlib::{DataInput, UnivMon}; @@ -169,10 +169,10 @@ mod tests { } } - // Count, distinct, L2 and entropy readouts count each non-NaN sample once; + // Count, distinct, L2 and entropy evaluations count each non-NaN sample once; // signed zero is one identity. #[test] - fn frequency_readouts() { + fn frequency_evaluations() { let mut state = UnivMonAccumulator::new(32, 5, 1024, 4).unwrap(); for value in [0.0, -0.0, 2.0, 2.0, f64::NAN] { state.insert_sample(value).unwrap(); @@ -187,9 +187,9 @@ mod tests { .is_err()); } - // A sketch taken out and adopted back answers the same readouts. + // A sketch taken out and adopted back answers the same evaluations. #[test] - fn adopted_sketch_keeps_readouts() { + fn adopted_sketch_keeps_evaluations() { let mut state = UnivMonAccumulator::new(32, 5, 1024, 4).unwrap(); for value in [1.0, 2.0, 2.0] { state.insert_sample(value).unwrap(); diff --git a/crates/asap-physical-operators/src/values.rs b/crates/asap-physical-operators/src/values.rs index b1186c171..41640b7b6 100644 --- a/crates/asap-physical-operators/src/values.rs +++ b/crates/asap-physical-operators/src/values.rs @@ -2,7 +2,7 @@ use crate::AggregateCore; use crate::Error; use planner_types::{ - post_asap::{Field, FieldDataType, Schema}, + post_asap::{Field as SummaryField, FieldDataType as SummaryFamilyType, Schema}, pre_asap::DataType, }; use std::{cmp::Ordering, sync::Arc}; @@ -28,7 +28,7 @@ pub enum Value { Map(Arc<[(Value, Value)]>), #[serde(skip)] Summary { - family: FieldDataType, + family: SummaryFamilyType, state: Arc, }, } @@ -214,7 +214,9 @@ impl Batch { } for (value, field) in row.iter().zip(&schema.fields) { let matches = match (&field.dtype, value) { - (FieldDataType::Plain(dtype), value) => value.matches(dtype, field.nullable), + (SummaryFamilyType::Plain(dtype), value) => { + value.matches(dtype, field.nullable) + } (expected, Value::Summary { family, state }) => { expected == family && validate_state(family, state.as_ref()).is_ok() } @@ -260,7 +262,7 @@ pub(crate) fn group_key(row: &[Value], columns: &[usize]) -> Result> pub(crate) use crate::capability::validate_native_family as validate_family; -fn validate_state(family: &FieldDataType, state: &dyn AggregateCore) -> Result<(), Error> { +fn validate_state(family: &SummaryFamilyType, state: &dyn AggregateCore) -> Result<(), Error> { use crate::summary_kernels::{ count_min_sketch::CountMinSketchAccumulator, datasketches_kll::DatasketchesKLLAccumulator, dd_sketch::DDSketchAccumulator, exact::ExactAccumulator, hll_sketch::HllSketchAccumulator, @@ -268,7 +270,7 @@ fn validate_state(family: &FieldDataType, state: &dyn AggregateCore) -> Result<( use planner_types::post_asap::SketchParams; validate_family(family)?; let valid = match family { - FieldDataType::Sketch(kind, _) + SummaryFamilyType::Sketch(kind, _) if matches!( kind.params(), SketchParams::CmsWithHeap { .. } | SketchParams::CountSketchWithHeap { .. } @@ -284,11 +286,11 @@ fn validate_state(family: &FieldDataType, state: &dyn AggregateCore) -> Result<( }) } - FieldDataType::ExactAggregate(..) => state + SummaryFamilyType::ExactAggregate(..) => state .as_any() .downcast_ref::() .is_some_and(|s| s.family() == family && !s.is_keyed()), - FieldDataType::Sketch(kind, _) => match kind.params() { + SummaryFamilyType::Sketch(kind, _) => match kind.params() { SketchParams::Kll { k } => state .as_any() .downcast_ref::() @@ -325,14 +327,14 @@ pub(crate) fn validate_schema(schema: &SchemaRef) -> Result<(), Error> { schema .fields .get(index) - .is_none_or(|field| field.dtype != FieldDataType::Plain(DataType::Timestamp)) + .is_none_or(|field| field.dtype != SummaryFamilyType::Plain(DataType::Timestamp)) }) { return Err(Error::Invalid( "time index must name a Timestamp column".into(), )); } for field in &schema.fields { - if !matches!(field.dtype, FieldDataType::Plain(_)) { + if !matches!(field.dtype, SummaryFamilyType::Plain(_)) { validate_family(&field.dtype)?; if field.nullable { return Err(Error::Invalid( @@ -344,7 +346,7 @@ pub(crate) fn validate_schema(schema: &SchemaRef) -> Result<(), Error> { Ok(()) } -pub(crate) fn field(schema: &SchemaRef, column: usize) -> Result<&Field, Error> { +pub(crate) fn field(schema: &SchemaRef, column: usize) -> Result<&SummaryField, Error> { schema .fields .get(column) @@ -352,7 +354,7 @@ pub(crate) fn field(schema: &SchemaRef, column: usize) -> Result<&Field, Error> } pub(crate) fn plain(schema: &SchemaRef, column: usize) -> Result<(&DataType, bool), Error> { let f = field(schema, column)?; - let FieldDataType::Plain(dtype) = &f.dtype else { + let SummaryFamilyType::Plain(dtype) = &f.dtype else { return Err(Error::Invalid("plain value required".into())); }; Ok((dtype, f.nullable)) @@ -367,7 +369,7 @@ mod weighted_state_tests { // A state cannot acquire a different family or shape merely by relabeling its batch. #[test] fn weighted_state_family_and_shape_must_match() { - let cms = FieldDataType::Sketch( + let cms = SummaryFamilyType::Sketch( SketchKind::new( SketchAlgorithm::CmsWithHeap, SketchParams::CmsWithHeap { @@ -378,7 +380,7 @@ mod weighted_state_tests { ), Default::default(), ); - let cs = FieldDataType::Sketch( + let cs = SummaryFamilyType::Sketch( SketchKind::new( SketchAlgorithm::CountSketchWithHeap, SketchParams::CountSketchWithHeap { @@ -395,7 +397,7 @@ mod weighted_state_tests { let wrong_shape = WeightedFrequency::new(FrequencyAlgorithm::CountSketch, 64, 5, 8).unwrap(); assert!(validate_state(&cs, &wrong_shape).is_err()); - let even_depth = FieldDataType::Sketch( + let even_depth = SummaryFamilyType::Sketch( SketchKind::new( SketchAlgorithm::CountSketchWithHeap, SketchParams::CountSketchWithHeap { diff --git a/crates/asap-physical-operators/tests/blocking_resources.rs b/crates/asap-physical-operators/tests/blocking_resources.rs index 37f780812..09cee7a4e 100644 --- a/crates/asap-physical-operators/tests/blocking_resources.rs +++ b/crates/asap-physical-operators/tests/blocking_resources.rs @@ -7,16 +7,18 @@ use asap_physical_operators::{ Error, }; use futures::{executor::block_on, FutureExt, StreamExt}; +use planner_types::ir::Predicate; +use planner_types::ir::ScalarExpr; use planner_types::{ - post_asap::{Field, FieldDataType, Schema}, - pre_asap::{DataType, JoinKind, Predicate, QueryExpr, ScalarValue}, + post_asap::{Field, FieldDataType}, + pre_asap::{DataType, JoinKind, ScalarValue}, }; use std::sync::Arc; fn schema(width: usize) -> SchemaRef { - Arc::new(Schema { - closed: true, + Arc::new(planner_types::pre_asap::Schema { unique_keys: vec![], + closed: false, fields: (0..width) .map(|i| Field { table: None, @@ -60,9 +62,7 @@ fn cross_join() -> Operator { schema(1), schema(1), JoinKind::Cross, - &Predicate(std::rc::Rc::new(QueryExpr::Literal(ScalarValue::Boolean( - true, - )))), + &Predicate(ScalarExpr::Literal(ScalarValue::Boolean(true))), schema(2), ) .unwrap() @@ -189,9 +189,10 @@ fn cooperative_sort_preserves_ties_across_chunks() { #[test] fn weighted_summary_build_yields_within_a_batch() { use planner_types::post_asap::{SketchAlgorithm, SketchKind, SketchParams}; - let input = Arc::new(Schema { - closed: true, + + let input = Arc::new(planner_types::pre_asap::Schema { unique_keys: vec![], + closed: false, fields: vec![ Field { table: None, diff --git a/crates/asap-physical-operators/tests/common/mod.rs b/crates/asap-physical-operators/tests/common/mod.rs new file mode 100644 index 000000000..b3602adbe --- /dev/null +++ b/crates/asap-physical-operators/tests/common/mod.rs @@ -0,0 +1,17 @@ +#![allow(dead_code)] +use planner_types::ir::export::PhysicalASAPDAG; +use planner_types::ir::{ + apply_materialization_timings, MaterializationAssignment, OperatorNode, TimingMemo, +}; +use std::rc::Rc; + +pub fn compile_physical_asap_dag( + root: &Rc, +) -> Result> { + let root = apply_materialization_timings( + root, + &MaterializationAssignment::default(), + &mut TimingMemo::default(), + )?; + Ok(planner_types::ir::export::compile_physical_asap_dag(&root)?) +} diff --git a/crates/asap-physical-operators/tests/current_series_heap.rs b/crates/asap-physical-operators/tests/current_series_heap.rs index 079c2bd69..10fc036e7 100644 --- a/crates/asap-physical-operators/tests/current_series_heap.rs +++ b/crates/asap-physical-operators/tests/current_series_heap.rs @@ -1,4 +1,5 @@ //! Spatial heap weights come from a fresh instant vector, never sample history. +mod common; use asap_physical_operators::{ operators::Operator, physical_planner::{ @@ -8,15 +9,16 @@ use asap_physical_operators::{ runtime::{Limits, RunContext, Scope}, values::{Batch, Value}, }; +use common::compile_physical_asap_dag; use futures::{executor::block_on, StreamExt}; -use planner_types::pre_asap::Schema; +use planner_types::ir::export::PhysicalASAPOperatorPayload; use planner_types::{post_asap::*, pre_asap::DataType}; use std::{collections::BTreeMap, sync::Arc}; fn schema() -> Arc { - Arc::new(Schema { - closed: true, + Arc::new(planner_types::pre_asap::Schema { unique_keys: vec![], + closed: false, fields: [ ("ts", DataType::Timestamp), ("value", DataType::Float64), @@ -169,9 +171,9 @@ fn spatial_heap_ranks_latest_values_in_independent_runs() { }; let family = FieldDataType::Sketch(SketchKind::new(algorithm, params), Default::default()); let build = Operator::keyed_summary_build(schema(), family, 1, vec![3], vec![2]).unwrap(); - let output = Arc::new(Schema { - closed: true, + let output = Arc::new(planner_types::pre_asap::Schema { unique_keys: vec![], + closed: false, fields: vec![ schema().fields[2].clone(), schema().fields[3].clone(), @@ -179,7 +181,7 @@ fn spatial_heap_ranks_latest_values_in_independent_runs() { ], time_index: None, }); - let read = Operator::keyed_readout(build.schema(), 1, 1, output).unwrap(); + let read = Operator::keyed_evaluation(build.schema(), 1, 1, output).unwrap(); let plan = CompiledPhysicalDAG::from_operators( BTreeMap::from([(0, InputContract::bounded(schema()))]), BTreeMap::from([ @@ -331,7 +333,7 @@ fn planner_current_series_candidate_compiles_with_dynamic_identity() { .candidate(&open_root) .unwrap(); let snapshot_program = - asap_physical_operators::physical_planner::promql_rows::compile_current_series_readout( + asap_physical_operators::physical_planner::promql_rows::compile_current_series_evaluation( &open_selected, ) .unwrap(); @@ -348,11 +350,18 @@ fn planner_current_series_candidate_compiles_with_dynamic_identity() { ) .candidate(&root) .unwrap(); - let logical = compile_post_asap_dag(&selected).unwrap(); + let logical = compile_physical_asap_dag(&selected).unwrap(); let raw = logical .nodes .iter() - .find(|node| matches!(node.payload, PostAsapOperatorPayload::Fallback { .. })) + .find(|node| { + matches!( + node.payload, + PhysicalASAPOperatorPayload::Relational { + operator: planner_types::ir::export::NonASAPOpKind::TimeRange { .. } + } + ) + }) .unwrap(); let raw_schema = Arc::new(raw.output_schema.clone()); let physical = compile( @@ -361,7 +370,7 @@ fn planner_current_series_candidate_compiles_with_dynamic_identity() { u64::from(raw.id.0), InputContract::bounded(raw_schema.clone()), )]), - &[u64::from(logical.root.0)], + &[u64::from(logical.roots[0].0)], ) .unwrap(); let bytes = String::from_utf8(serde_json::to_vec(&physical).unwrap()).unwrap(); diff --git a/crates/asap-physical-operators/tests/deployment.rs b/crates/asap-physical-operators/tests/deployment.rs index 2857a81cb..72e0503f1 100644 --- a/crates/asap-physical-operators/tests/deployment.rs +++ b/crates/asap-physical-operators/tests/deployment.rs @@ -35,7 +35,7 @@ fn read(state: &dyn AggregateCore) -> f64 { } // The same kernels work when every build is query-time, when only a prefix -// was precomputed, and when all state was precomputed before the readout. +// was precomputed, and when all state was precomputed before the evaluation. #[test] fn raw_partial_and_fully_precomputed_use_the_same_kernels() { let raw: Vec = (0..128).map(f64::from).collect(); diff --git a/crates/asap-physical-operators/tests/deployment_computation.rs b/crates/asap-physical-operators/tests/deployment_computation.rs index e20fc27ee..0eecf2f5a 100644 --- a/crates/asap-physical-operators/tests/deployment_computation.rs +++ b/crates/asap-physical-operators/tests/deployment_computation.rs @@ -1,21 +1,23 @@ //! Planner-selected PromQL computation compiles from the timed DAG alone; //! the deployment supplies only raw rows at the ingestion frontier. +mod common; use asap_physical_operators::{ operators::Operator, physical_planner::{compile, promql_rows, CompiledPhysicalDAG, InputContract, Source}, runtime::{Limits, RunContext, Scope}, values::{Batch, Value}, }; +use common::compile_physical_asap_dag; use futures::{executor::block_on, StreamExt}; -use planner_types::pre_asap::Schema; -use planner_types::{post_asap::*, pre_asap::QueryExpr, types::AccuracyTarget, workload::*}; +use planner_types::ir::export::{PhysicalASAPDAG, PhysicalASAPOperatorPayload}; +use planner_types::{post_asap::*, types::AccuracyTarget, workload::*}; use std::{collections::BTreeMap, rc::Rc, sync::Arc}; -fn lower(query: &str) -> QueryExpr { +fn lower(query: &str) -> Rc { lower_with(query, AccuracyTarget::Exact) } -fn lower_with(query: &str, accuracy: AccuracyTarget) -> QueryExpr { +fn lower_with(query: &str, accuracy: AccuracyTarget) -> Rc { let workload = PlanningWorkload { query_workload: QueryWorkload { language: QueryLanguage::PromQL, @@ -46,54 +48,56 @@ fn lower_with(query: &str, accuracy: AccuracyTarget) -> QueryExpr { } /// The first exact summary candidate, as Planner selection would hand it over. -fn exact_dag(query: &str) -> PostAsapDAG { - use asap_aware_mapping::{Replacement, ReplacementStrategy, TargetSubDAG}; +fn exact_dag(query: &str) -> PhysicalASAPDAG { let expression = lower(query); - let root = Rc::new(promql_rows::with_series_identity(&expression).unwrap_or(expression)); - asap_aware_mapping::SketchAlgorithmStrategy::new(&asap_aware_mapping::DefaultCostModel) - .replacements(&TargetSubDAG::new(&root)) - .into_iter() - .find_map(|candidate| match candidate.replacement { - Replacement::Summary(node) => { - let dag = compile_post_asap_dag(&node).ok()?; - dag.nodes - .iter() - .all(|n| !matches!(&n.payload, PostAsapOperatorPayload::SummaryAgg { family, .. } if !matches!(family, FieldDataType::ExactAggregate(..)))) - .then_some(dag) - } - _ => None, - }) + let root = promql_rows::with_series_identity(&expression).unwrap_or(expression); + let space = asap_aware_mapping::search_workload(vec![("q", root)]); + let selected = space + .global_selection(&asap_aware_mapping::DefaultCostModel) + .assemble_selected_dag(&space.roots[0].1) .unwrap() + .unwrap(); + compile_physical_asap_dag(&selected).unwrap() } -fn population_dag(query: &str) -> PostAsapDAG { - let root = Rc::new(promql_rows::with_series_identity(&lower(query)).unwrap()); +fn population_dag(query: &str) -> PhysicalASAPDAG { + let root = promql_rows::with_series_identity(&lower(query)).unwrap(); let selected = asap_aware_mapping::maintained_population::MaintainedPopulationStrategy::new( std::slice::from_ref(&root), ) .candidate(&root) .unwrap(); - compile_post_asap_dag(&selected).unwrap() + compile_physical_asap_dag(&selected).unwrap() } /// Raw scan nodes are the frontier; everything above them is compiled. -fn raw_inputs(dag: &PostAsapDAG) -> Vec<(u64, Arc, String)> { +fn raw_inputs(dag: &PhysicalASAPDAG) -> Vec<(u64, Arc, String)> { dag.nodes .iter() .filter_map(|node| match &node.payload { - PostAsapOperatorPayload::Fallback { - expression: QueryExpr::TimeRange { child, .. }, - } => match child.as_ref() { - QueryExpr::Scan { - source: planner_types::pre_asap::Source::TimeSeries { metric }, - .. - } => Some(( - u64::from(node.id.0), - Arc::new(node.output_schema.clone()), - metric.clone(), - )), - _ => None, - }, + PhysicalASAPOperatorPayload::Relational { + operator: planner_types::ir::export::NonASAPOpKind::TimeRange { .. }, + } => { + let mut id = node.id; + loop { + let n = dag.nodes.iter().find(|n| n.id == id)?; + if let PhysicalASAPOperatorPayload::Relational { + operator: + planner_types::ir::export::NonASAPOpKind::Scan { + source: planner_types::pre_asap::Source::TimeSeries { metric }, + .. + }, + } = &n.payload + { + return Some(( + u64::from(node.id.0), + Arc::new(node.output_schema.clone()), + metric.clone(), + )); + } + id = dag.edges.iter().find(|e| e.consumer == id)?.producer; + } + } _ => None, }) .collect() @@ -104,7 +108,7 @@ type Sample = (&'static str, &'static str, &'static str, i64, f64); /// Compile, round-trip, bind raw `(metric, job, instance, ts, value)` samples, /// and return the root's batches. fn execute( - dag: &PostAsapDAG, + dag: &PhysicalASAPDAG, samples: &[Sample], end: i64, ) -> Result>, String> { @@ -114,7 +118,7 @@ fn execute( /// [`execute`], supplying samples of each instance in `relabel` under its /// `(__name__, instance)` instead. fn execute_relabeled( - dag: &PostAsapDAG, + dag: &PhysicalASAPDAG, samples: &[Sample], end: i64, relabel: &BTreeMap<&str, (&str, &str)>, @@ -126,7 +130,7 @@ fn execute_relabeled( .iter() .map(|(id, schema, _)| (*id, InputContract::bounded(schema.clone()))) .collect(), - &[u64::from(dag.root.0)], + &[u64::from(dag.roots[0].0)], ) .map_err(|e| e.to_string())?; let program: CompiledPhysicalDAG = @@ -195,7 +199,11 @@ fn execute_relabeled( } /// [`execute`], returning `(job, value)` rows of the root. -fn run(dag: &PostAsapDAG, samples: &[Sample], end: i64) -> Result, String> { +fn run( + dag: &PhysicalASAPDAG, + samples: &[Sample], + end: i64, +) -> Result, String> { let mut rows = BTreeMap::new(); for batch in execute(dag, samples, end)? { let job = batch.schema().fields.iter().position(|f| f.name == "job"); @@ -250,7 +258,7 @@ fn population_aggregates_match_current_series_reference() { } } -// A global readout of an empty population is an empty vector, as in PromQL. +// A global evaluation of an empty population is an empty vector, as in PromQL. #[test] fn global_population_aggregate_of_no_members_is_empty() { // Latest values are [1, 2, 5, 7] at 60s; every member has expired by 1000s. @@ -313,40 +321,7 @@ fn grouped_vector_arithmetic_matches_labels() { // then roll up per job: api has 2 + 1 + 1 samples in 5m, db has 1. #[test] fn exact_count_finalizes_to_declared_float_value() { - let mut dag = exact_dag("sum by (job) (count_over_time(m[5m]))"); - let finalize = dag - .nodes - .iter() - .find(|node| { - matches!( - node.payload, - PostAsapOperatorPayload::Value { - operation: ValueOperation::FinalizeExactAccumulator - } - ) - }) - .unwrap() - .clone(); - let root = dag.nodes.iter().find(|n| n.id == dag.root).unwrap().clone(); - let mut edge = dag - .edges - .iter() - .find(|e| e.producer == finalize.id) - .unwrap() - .clone(); - // Read the rolled-up exact state the same way the query path does. - let mut read = finalize.clone(); - read.id = PostAsapNodeId(root.id.0 + 1); - read.output_schema = root.output_schema.clone(); - read.output_schema.fields.last_mut().unwrap().dtype = - FieldDataType::Plain(planner_types::pre_asap::DataType::Float64); - edge.producer = root.id; - edge.consumer = read.id; - edge.intermediate_schema = root.output_schema.clone(); - edge.data_state = root.output_state; - dag.root = read.id; - dag.nodes.push(read); - dag.edges.push(edge); + let dag = exact_dag("sum by (job) (count_over_time(m[5m]))"); assert_eq!( run(&dag, SAMPLES, 60_000).unwrap(), reference(&[("api", 4.), ("db", 1.)]) @@ -354,10 +329,22 @@ fn exact_count_finalizes_to_declared_float_value() { } /// `dag` with its Binary operator replaced by `kind`. -fn with_kind(mut dag: PostAsapDAG, kind: planner_types::pre_asap::BinaryOpKind) -> PostAsapDAG { +fn with_kind( + mut dag: PhysicalASAPDAG, + kind: planner_types::pre_asap::BinaryOpKind, + bool_result: bool, +) -> PhysicalASAPDAG { for node in &mut dag.nodes { - if let PostAsapOperatorPayload::Binary { operator } = &mut node.payload { + if let PhysicalASAPOperatorPayload::Relational { + operator: + planner_types::ir::export::NonASAPOpKind::BinaryOp { + operator, + return_bool, + }, + } = &mut node.payload + { operator.kind = kind.clone(); + *return_bool = bool_result; } } dag @@ -367,30 +354,30 @@ fn with_kind(mut dag: PostAsapDAG, kind: planner_types::pre_asap::BinaryOpKind) // holds, with their value, on either side of the literal; `bool` yields 1 or 0. #[test] fn grouped_comparisons_filter_or_return_bool() { - use planner_types::pre_asap::{BinaryOpKind::*, CompareOpKind::Gt}; - // sum_over_time over 5m per job: api = 14, db = 5. - let right = exact_dag("sum by (job) (sum_over_time(m[5m])) * 10"); - let left = exact_dag("10 - sum by (job) (sum_over_time(m[5m]))"); - for (dag, expected) in [ + for (query, expected) in [ ( - with_kind(right.clone(), Compare(Gt)), + "sum by(job)(sum_over_time(m[5m])) > 10", reference(&[("api", 14.)]), ), ( - with_kind(right, CompareBool(Gt)), + "sum by(job)(sum_over_time(m[5m])) > bool 10", reference(&[("api", 1.), ("db", 0.)]), ), - (with_kind(left, Compare(Gt)), reference(&[("db", 5.)])), + ( + "10 > sum by(job)(sum_over_time(m[5m]))", + reference(&[("db", 5.)]), + ), ] { - assert_eq!(run(&dag, SAMPLES, 60_000).unwrap(), expected); + assert_eq!(run(&exact_dag(query), SAMPLES, 60_000).unwrap(), expected); } } -// A `bool` comparison Binary over per-series readouts matches one-to-one and +// A `bool` comparison Binary over per-series evaluations matches one-to-one and // drops the metric name; a filter keeps the surviving left value. #[test] fn per_series_comparisons_filter_or_return_bool() { use planner_types::pre_asap::{BinaryOpKind::*, CompareOpKind::*}; + let samples = counter("a", "api", 10., 10.) .chain(counter("a", "db", 10., 10.)) .chain(counter("b", "api", 5., 5.)) @@ -399,18 +386,23 @@ fn per_series_comparisons_filter_or_return_bool() { // rate: a{api} = a{db} = 50/300, b{api} = 25/300, b{db} = 100/300. let dag = exact_dag("rate(a[5m]) / rate(b[5m])"); assert_eq!( - run_series(&with_kind(dag.clone(), Compare(Gt)), &samples, 300_000).unwrap(), + run_series( + &with_kind(dag.clone(), Compare(Gt), false), + &samples, + 300_000 + ) + .unwrap(), series(&[("api", "x", 50. / 300.)]) ); assert_eq!( - run_series(&with_kind(dag, CompareBool(Lt)), &samples, 300_000).unwrap(), + run_series(&with_kind(dag, Compare(Lt), true), &samples, 300_000).unwrap(), series(&[("api", "x", 0.), ("db", "x", 1.)]) ); } /// [`execute`], returning per-series `(identity, value)` rows of the root, /// with NaN-aware formatting for comparison. -fn run_series(dag: &PostAsapDAG, samples: &[Sample], end: i64) -> Result { +fn run_series(dag: &PhysicalASAPDAG, samples: &[Sample], end: i64) -> Result { let mut rows = BTreeMap::new(); for batch in execute(dag, samples, end)? { let schema = batch.schema(); @@ -509,13 +501,13 @@ fn per_series_rate_ratio_matches_prometheus() { // A literal operand applies to every stored per-series value, on either side, // and drops the metric name. #[test] -fn per_series_scalar_arithmetic_applies_to_stored_readouts() { +fn per_series_scalar_arithmetic_applies_to_stored_evaluations() { let samples = counter("m", "api", 10., 10.).collect::>(); // rate = 40 * 1.25 / 300 = 1/6. for (query, expected) in [ ("rate(m[5m]) * 2", 50. / 300. * 2.), ("1 - rate(m[5m])", 1. - 50. / 300.), - // The stored sum readout keeps `__name__`; the arithmetic drops it. + // The stored sum evaluation keeps `__name__`; the arithmetic drops it. ("sum_over_time(m[5m]) * 2", 150. * 2.), ] { assert_eq!( @@ -545,12 +537,19 @@ fn per_series_scalar_arithmetic_rejects_label_sets_equal_without_the_name() { } fn with_vector_match( - mut dag: PostAsapDAG, + mut dag: PhysicalASAPDAG, kind: planner_types::pre_asap::VectorMatchKind, labels: &[&str], -) -> PostAsapDAG { +) -> PhysicalASAPDAG { for node in &mut dag.nodes { - if let PostAsapOperatorPayload::Binary { operator } = &mut node.payload { + if let PhysicalASAPOperatorPayload::Relational { + operator: + planner_types::ir::export::NonASAPOpKind::BinaryOp { + operator, + return_bool: _, + }, + } = &mut node.payload + { operator.vector_match = Some(planner_types::pre_asap::VectorMatch { kind: kind.clone(), labels: labels.iter().map(|l| l.to_string()).collect(), @@ -621,44 +620,43 @@ fn population_sums_and_averages_are_compensated() { } } -// A bare count over stored Count-Min state compiles to a Planner readout that +// A bare count over stored Count-Min state compiles to a Planner evaluation that // returns the sketch's total update weight, including colliding items. #[test] -fn stored_count_min_bare_count_compiles_to_a_readout() { +fn stored_count_min_bare_count_compiles_to_a_evaluation() { use asap_aware_mapping::{Replacement, ReplacementStrategy, TargetSubDAG}; use asap_physical_operators::summary_kernels::CountMinSketchAccumulator; - let root = Rc::new(lower_with("count(up)", AccuracyTarget::Epsilon(0.02))); - let dag = - asap_aware_mapping::SketchAlgorithmStrategy::new(&asap_aware_mapping::DefaultCostModel) - .replacements(&TargetSubDAG::new(&root)) - .into_iter() - .find_map(|candidate| match candidate.replacement { - Replacement::Summary(node) => { - let dag = compile_post_asap_dag(&node).ok()?; - let bare_count = dag.nodes.iter().any(|n| { - matches!( - &n.payload, - PostAsapOperatorPayload::SummaryEstimate { - query: SketchStatistic::PointCount { value: None, .. } - } - ) - }); - let count_min = dag.nodes.iter().any(|n| { - matches!(&n.payload, PostAsapOperatorPayload::SummaryAgg { + let root = lower_with("count(up)", AccuracyTarget::Epsilon(0.02)); + let dag = asap_aware_mapping::ASAPStrategies::new(&asap_aware_mapping::DefaultCostModel) + .replacements(&TargetSubDAG::new(&root)) + .into_iter() + .find_map(|candidate| match candidate.replacement { + Replacement::SubDAG(node) => { + let dag = compile_physical_asap_dag(&node).ok()?; + let bare_count = dag.nodes.iter().any(|n| { + matches!( + &n.payload, + PhysicalASAPOperatorPayload::SummaryEstimate { + query: SketchStatistic::PointCount { value: None, .. } + } + ) + }); + let count_min = dag.nodes.iter().any(|n| { + matches!(&n.payload, PhysicalASAPOperatorPayload::SummaryAgg { family: FieldDataType::Sketch(kind, _), .. } if kind.algorithm() == &SketchAlgorithm::Cms) - }); - (bare_count && count_min).then_some(dag) - } - _ => None, - }) - .expect("Planner lists a Count-Min candidate for count(up)"); + }); + (bare_count && count_min).then_some(dag) + } + _ => None, + }) + .expect("Planner lists a Count-Min candidate for count(up)"); let state = dag .nodes .iter() - .find(|n| matches!(n.payload, PostAsapOperatorPayload::SummaryAgg { .. })) + .find(|n| matches!(n.payload, PhysicalASAPOperatorPayload::SummaryAgg { .. })) .unwrap(); - let PostAsapOperatorPayload::SummaryAgg { + let PhysicalASAPOperatorPayload::SummaryAgg { family: FieldDataType::Sketch(kind, _), .. } = &state.payload @@ -675,7 +673,7 @@ fn stored_count_min_bare_count_compiles_to_a_readout() { u64::from(state.id.0), InputContract::bounded(schema.clone()), )]), - &[u64::from(dag.root.0)], + &[u64::from(dag.roots[0].0)], ) .unwrap(); let program: CompiledPhysicalDAG = diff --git a/crates/asap-physical-operators/tests/physical_dag.rs b/crates/asap-physical-operators/tests/physical_dag.rs index e2ad735d6..93a8b7a86 100644 --- a/crates/asap-physical-operators/tests/physical_dag.rs +++ b/crates/asap-physical-operators/tests/physical_dag.rs @@ -8,15 +8,22 @@ use asap_physical_operators::{ Statistic, }; use futures::{executor::block_on, StreamExt}; +use planner_types::ir::export::NonASAPOpKind as ValueOperation; +use planner_types::ir::export::{ + EdgeRole, GroupingEdgeCompatibility, PhysicalASAPDAG, PhysicalASAPDAGEdge, PhysicalASAPDAGNode, + PhysicalASAPOperatorPayload, WindowEdgeCompatibility, +}; +use planner_types::ir::BinaryOperator; +use planner_types::ir::ScalarExpr; use planner_types::{ - post_asap::{ExactKind, ExactParams, Field, FieldDataType, Schema}, + post_asap::{ExactKind, ExactParams, Field, FieldDataType}, pre_asap::DataType, }; use std::sync::Arc; fn schema(fields: &[(&str, DataType, bool)]) -> SchemaRef { - Arc::new(Schema { - closed: true, + Arc::new(planner_types::pre_asap::Schema { unique_keys: vec![], + closed: false, fields: fields .iter() .map(|(name, dtype, nullable)| Field { @@ -117,7 +124,7 @@ fn grouped_sort_limit_across_batches() { // The same computation runs in either engine scope with fresh per-run state. #[test] -fn summary_construction_merge_and_readout_at_both_phases() { +fn summary_construction_merge_and_evaluation_at_both_phases() { let schema = schema(&[("v", DataType::Float64, false)]); let batches = (1..=20) .map(|v| Batch::try_new(schema.clone(), vec![vec![Value::Float64(v as f64)]]).unwrap()) @@ -140,11 +147,11 @@ fn summary_construction_merge_and_readout_at_both_phases() { dag.add( 4, vec![3], - Operator::readout( + Operator::evaluation( state, 0, - asap_physical_operators::operators::ReadoutQuery::Exact( - asap_physical_operators::summary_kernels::exact::ExactReadout { + asap_physical_operators::operators::SummaryEvaluation::Exact( + asap_physical_operators::summary_kernels::exact::ExactEvaluation { statistic: Statistic::Sum, lookback_ms: None, }, @@ -295,10 +302,10 @@ fn binding_rejects_unsupported_operations() { vec![], ) .unwrap(); - assert!(Operator::readout( + assert!(Operator::evaluation( sum.schema(), 0, - asap_physical_operators::operators::ReadoutQuery::Sketch( + asap_physical_operators::operators::SummaryEvaluation::Sketch( planner_types::post_asap::SketchStatistic::Quantile { q: 0.5 } ) ) @@ -310,6 +317,7 @@ fn binding_rejects_unsupported_operations() { #[test] fn kll_raw_partial_and_precomputed_are_native_dags() { use planner_types::post_asap::{GroupingStrategy, SketchAlgorithm, SketchKind, SketchParams}; + let input = schema(&[("value", DataType::Float64, false)]); let family = FieldDataType::Sketch( SketchKind::new(SketchAlgorithm::Kll, SketchParams::Kll { k: 512 }), @@ -396,10 +404,10 @@ fn kll_raw_partial_and_precomputed_are_native_dags() { dag.add( 5, vec![4], - Operator::readout( + Operator::evaluation( state.clone(), 0, - asap_physical_operators::operators::ReadoutQuery::Sketch( + asap_physical_operators::operators::SummaryEvaluation::Sketch( planner_types::post_asap::SketchStatistic::Quantile { q: 0.5 }, ), ) @@ -423,9 +431,9 @@ fn exact_state_and_family_validation() { let family = FieldDataType::ExactAggregate(ExactKind::Sum, ExactParams::Sum); let mut acc = ExactAccumulator::new(family.clone(), false).unwrap(); acc.update(None, 7., 0); - let schema = Arc::new(Schema { - closed: true, + let schema = Arc::new(planner_types::pre_asap::Schema { unique_keys: vec![], + closed: false, fields: vec![Field { table: None, name: "state".into(), @@ -452,11 +460,11 @@ fn exact_state_and_family_validation() { dag.add( 1, vec![0], - Operator::readout( + Operator::evaluation( schema.clone(), 0, - asap_physical_operators::operators::ReadoutQuery::Exact( - asap_physical_operators::summary_kernels::exact::ExactReadout { + asap_physical_operators::operators::SummaryEvaluation::Exact( + asap_physical_operators::summary_kernels::exact::ExactEvaluation { statistic: Statistic::Sum, lookback_ms: None, }, @@ -486,40 +494,49 @@ fn exact_state_and_family_validation() { fn bind_post_asap_before_execution() { use asap_physical_operators::dag::planner::bind; use planner_types::{ - post_asap::{ - EdgeRole, ExecutionDataState, GroupingEdgeCompatibility, PostAsapDAG, PostAsapDAGEdge, - PostAsapDAGNode, PostAsapNodeId, PostAsapOperatorPayload, ValueOperation, - WindowEdgeCompatibility, - }, - pre_asap::{ArithmeticOpKind, ProjectItem, QueryExpr, ScalarValue}, + post_asap::ExecutionDataState, + pre_asap::{ArithmeticOpKind, ScalarValue}, }; - use std::{collections::BTreeMap, rc::Rc}; + use std::collections::BTreeMap; let schema = schema(&[("value", DataType::Float64, false)]); - let node = |id, payload| PostAsapDAGNode { - id: PostAsapNodeId(id), + let node = |id, payload| PhysicalASAPDAGNode { + coverage: None, + id: planner_types::ir::export::LogicalASAPNodeId(id), payload, output_state: ExecutionDataState::QUERY_ROWS, output_schema: (*schema).clone(), guarantee: None, }; - let mut dag = PostAsapDAG { + let mut dag = PhysicalASAPDAG { nodes: vec![ node( 0, - PostAsapOperatorPayload::Fallback { - expression: QueryExpr::promql_scalar(1.), + PhysicalASAPOperatorPayload::Relational { + operator: ValueOperation::Values { + rows: vec![vec![planner_types::ir::export::WireScalarExpr::Literal( + planner_types::pre_asap::ScalarValue::Float64(1.), + )]], + schema: (*schema).clone(), + }, }, ), node( 1, - PostAsapOperatorPayload::Value { - operation: ValueOperation::Project { - cols: vec![ProjectItem { + PhysicalASAPOperatorPayload::Relational { + operator: ValueOperation::Project { + cols: vec![planner_types::ir::export::WireProjectItem { alias: None, - expr: QueryExpr::Arithmetic { + expr: planner_types::ir::export::WireScalarExpr::Arithmetic { + semantics: planner_types::ir::ExprSemantics::Sql, op: ArithmeticOpKind::Add, - left: Rc::new(QueryExpr::Column(0)), - right: Rc::new(QueryExpr::Literal(ScalarValue::Float64(2.))), + left: Box::new(planner_types::ir::export::WireScalarExpr::Column( + 0, + )), + right: Box::new( + planner_types::ir::export::WireScalarExpr::Literal( + ScalarValue::Float64(2.), + ), + ), }, }], qualifier: None, @@ -527,16 +544,16 @@ fn bind_post_asap_before_execution() { }, ), ], - edges: vec![PostAsapDAGEdge { - producer: PostAsapNodeId(0), - consumer: PostAsapNodeId(1), + edges: vec![PhysicalASAPDAGEdge { + producer: planner_types::ir::export::LogicalASAPNodeId(0), + consumer: planner_types::ir::export::LogicalASAPNodeId(1), role: EdgeRole::Input, intermediate_schema: (*schema).clone(), data_state: ExecutionDataState::QUERY_ROWS, grouping: GroupingEdgeCompatibility::NotApplicable, window: WindowEdgeCompatibility::NotApplicable, }], - root: PostAsapNodeId(1), + roots: vec![planner_types::ir::export::LogicalASAPNodeId(1)], }; let sources = || -> BTreeMap> { BTreeMap::from([( @@ -555,17 +572,15 @@ fn bind_post_asap_before_execution() { // A literal Fallback needs no deployment input. let literal = bind(&dag, BTreeMap::new(), &[1]).unwrap(); assert_eq!(floats(&run(&literal, 1, query()), 0), vec![3.]); - dag.nodes[1].payload = PostAsapOperatorPayload::Value { - operation: ValueOperation::Extension { - name: "unknown".into(), - }, + dag.nodes[1].payload = PhysicalASAPOperatorPayload::Extension { + name: "unsupported".into(), }; assert!(bind(&dag, sources(), &[1]).is_err()); } // A completed empty population has an exact zero count, with integer output. #[test] -fn empty_exact_count_is_an_integer_state_readout() { +fn empty_exact_count_is_an_integer_state_evaluation() { let input = schema(&[("value", DataType::Float64, false)]); let build = Operator::summary_build( input.clone(), @@ -575,11 +590,11 @@ fn empty_exact_count_is_an_integer_state_readout() { vec![], ) .unwrap(); - let read = Operator::readout( + let read = Operator::evaluation( build.schema(), 0, - asap_physical_operators::operators::ReadoutQuery::Exact( - asap_physical_operators::summary_kernels::exact::ExactReadout { + asap_physical_operators::operators::SummaryEvaluation::Exact( + asap_physical_operators::summary_kernels::exact::ExactEvaluation { statistic: Statistic::Count, lookback_ms: None, }, @@ -598,13 +613,7 @@ fn empty_exact_count_is_an_integer_state_readout() { #[test] fn source_batches_must_match_the_bound_schema() { use asap_physical_operators::dag::{self, PhysicalOperator}; - use planner_types::{ - post_asap::{ - ExecutionDataState, PostAsapDAG, PostAsapDAGNode, PostAsapNodeId, - PostAsapOperatorPayload, - }, - pre_asap::QueryExpr, - }; + use planner_types::post_asap::ExecutionDataState; use std::{cell::Cell, collections::BTreeMap, rc::Rc}; struct WrongSource { schema: SchemaRef, @@ -637,18 +646,24 @@ fn source_batches_must_match_the_bound_schema() { } let expected = schema(&[("value", DataType::Float64, false)]); let starts = Rc::new(Cell::new(0)); - let plan = PostAsapDAG { - nodes: vec![PostAsapDAGNode { - id: PostAsapNodeId(0), - payload: PostAsapOperatorPayload::Fallback { - expression: QueryExpr::promql_scalar(1.), + let plan = PhysicalASAPDAG { + nodes: vec![PhysicalASAPDAGNode { + coverage: None, + id: planner_types::ir::export::LogicalASAPNodeId(0), + payload: PhysicalASAPOperatorPayload::Relational { + operator: ValueOperation::Values { + rows: vec![vec![planner_types::ir::export::WireScalarExpr::Literal( + planner_types::pre_asap::ScalarValue::Float64(1.), + )]], + schema: (*expected).clone(), + }, }, output_state: ExecutionDataState::QUERY_ROWS, output_schema: (*expected).clone(), guarantee: None, }], edges: vec![], - root: PostAsapNodeId(0), + roots: vec![planner_types::ir::export::LogicalASAPNodeId(0)], }; let source = Box::new(WrongSource { schema: expected, @@ -709,26 +724,28 @@ fn planner_semijoin_sort_limit_contract_at_both_phases() { use asap_physical_operators::dag::planner::{bind, Source}; use planner_types::{ post_asap::*, - pre_asap::{CompareOpKind, GroupKeys, JoinKind, Predicate, QueryExpr, SortKey}, + pre_asap::{CompareOpKind, GroupKeys, JoinKind}, }; - use std::{collections::BTreeMap, rc::Rc}; + use std::collections::BTreeMap; let rows_schema = schema(&[ ("group", DataType::Utf8, false), ("key", DataType::Utf8, false), ("score", DataType::Float64, false), ]); let keys_schema = schema(&[("key", DataType::Utf8, false)]); - let node = |id, payload, schema: &asap_physical_operators::values::SchemaRef| PostAsapDAGNode { - id: PostAsapNodeId(id), - payload, - output_schema: (**schema).clone(), - output_state: ExecutionDataState::QUERY_ROWS, - guarantee: None, - }; + let node = + |id, payload, schema: &asap_physical_operators::values::SchemaRef| PhysicalASAPDAGNode { + coverage: None, + id: planner_types::ir::export::LogicalASAPNodeId(id), + payload, + output_schema: (**schema).clone(), + output_state: ExecutionDataState::QUERY_ROWS, + guarantee: None, + }; let edge = |producer, consumer, role, schema: &asap_physical_operators::values::SchemaRef| { - PostAsapDAGEdge { - producer: PostAsapNodeId(producer), - consumer: PostAsapNodeId(consumer), + PhysicalASAPDAGEdge { + producer: planner_types::ir::export::LogicalASAPNodeId(producer), + consumer: planner_types::ir::export::LogicalASAPNodeId(consumer), role, intermediate_schema: (**schema).clone(), data_state: ExecutionDataState::QUERY_ROWS, @@ -737,41 +754,59 @@ fn planner_semijoin_sort_limit_contract_at_both_phases() { } }; let groups = GroupKeys::by(vec![0]); - let dag = PostAsapDAG { + let dag = PhysicalASAPDAG { nodes: vec![ node( 0, - PostAsapOperatorPayload::Fallback { - expression: QueryExpr::promql_scalar(0.), + PhysicalASAPOperatorPayload::Relational { + operator: ValueOperation::Values { + rows: vec![vec![planner_types::ir::export::WireScalarExpr::Literal( + planner_types::pre_asap::ScalarValue::Float64(0.), + )]], + schema: (*rows_schema).clone(), + }, }, &rows_schema, ), node( 1, - PostAsapOperatorPayload::Fallback { - expression: QueryExpr::promql_scalar(0.), + PhysicalASAPOperatorPayload::Relational { + operator: ValueOperation::Values { + rows: vec![vec![planner_types::ir::export::WireScalarExpr::Literal( + planner_types::pre_asap::ScalarValue::Float64(0.), + )]], + schema: (*keys_schema).clone(), + }, }, &keys_schema, ), node( 2, - PostAsapOperatorPayload::RelationalJoin { - join_kind: JoinKind::Semi, - pruning: None, - pred: Predicate(Rc::new(QueryExpr::Compare { - left: Rc::new(QueryExpr::Column(1)), - op: CompareOpKind::Eq, - right: Rc::new(QueryExpr::Column(3)), - })), + PhysicalASAPOperatorPayload::Relational { + operator: planner_types::ir::export::NonASAPOpKind::Join { + join_kind: JoinKind::Semi, + pred: planner_types::ir::export::WirePredicate( + planner_types::ir::export::WireScalarExpr::Compare { + left: Box::new(planner_types::ir::export::WireScalarExpr::Column( + 1, + )), + op: CompareOpKind::Eq, + right: Box::new(planner_types::ir::export::WireScalarExpr::Column( + 3, + )), + semantics: planner_types::ir::ExprSemantics::Sql, + }, + ), + }, }, &rows_schema, ), node( 3, - PostAsapOperatorPayload::Value { - operation: ValueOperation::Sort { - keys: vec![SortKey { - expr: QueryExpr::Column(2), + PhysicalASAPOperatorPayload::Relational { + operator: ValueOperation::Sort { + keys: vec![planner_types::ir::export::WireSortKey { + expr: planner_types::ir::export::WireScalarExpr::Column(2), ascending: false, nulls_first: false, }], @@ -782,9 +817,9 @@ fn planner_semijoin_sort_limit_contract_at_both_phases() { ), node( 4, - PostAsapOperatorPayload::Value { - operation: ValueOperation::Limit { - n: 1, + PhysicalASAPOperatorPayload::Relational { + operator: ValueOperation::Limit { + n: Some(1), offset: 0, partition_by: groups, }, @@ -799,7 +834,7 @@ fn planner_semijoin_sort_limit_contract_at_both_phases() { edge(2, 3, EdgeRole::Input, &rows_schema), edge(3, 4, EdgeRole::Input, &rows_schema), ], - root: PostAsapNodeId(4), + roots: vec![planner_types::ir::export::LogicalASAPNodeId(4)], }; let text = |v: &str| Value::Utf8(v.into()); for (phase, scope) in [ @@ -862,8 +897,8 @@ fn planner_semijoin_sort_limit_contract_at_both_phases() { #[test] fn planner_expressions_preserve_collection_and_nullable_types() { use asap_physical_operators::dag::expressions::CompiledExpression; - use planner_types::pre_asap::{CompareOpKind, QueryExpr, ScalarValue}; - use std::rc::Rc; + use planner_types::pre_asap::{CompareOpKind, ScalarValue}; + let input_schema = schema(&[( "items", DataType::Map { @@ -873,11 +908,11 @@ fn planner_expressions_preserve_collection_and_nullable_types() { }, false, )]); - let access = QueryExpr::FunctionCall { + let access = ScalarExpr::FunctionCall { name: "asap_element_access".into(), args: vec![ - QueryExpr::Column(0), - QueryExpr::Literal(ScalarValue::Utf8("count".into())), + ScalarExpr::Column(0), + ScalarExpr::Literal(ScalarValue::Utf8("count".into())), ], }; let project = Operator::project( @@ -910,10 +945,11 @@ fn planner_expressions_preserve_collection_and_nullable_types() { .unwrap(); let projected = project.schema(); dag.add(1, vec![0], project).unwrap(); - let predicate = QueryExpr::Compare { - left: Rc::new(QueryExpr::Column(0)), + let predicate = ScalarExpr::Compare { + semantics: planner_types::ir::ExprSemantics::Sql, + left: Box::new(ScalarExpr::Column(0)), op: CompareOpKind::Ge, - right: Rc::new(QueryExpr::Literal(ScalarValue::Int64(1))), + right: Box::new(ScalarExpr::Literal(ScalarValue::Int64(1))), }; dag.add( 2, @@ -927,9 +963,9 @@ fn planner_expressions_preserve_collection_and_nullable_types() { .unwrap(); let rows = run(&dag, 2, query()); assert!(matches!(rows.as_slice(),[row] if matches!(row.as_slice(),[Value::Int64(7)]))); - let unknown = QueryExpr::FunctionCall { + let unknown = ScalarExpr::FunctionCall { name: "unregistered_function".into(), - args: vec![QueryExpr::Column(0)], + args: vec![ScalarExpr::Column(0)], }; assert!(CompiledExpression::compile(&unknown, &input_schema).is_err()); } @@ -937,14 +973,16 @@ fn planner_expressions_preserve_collection_and_nullable_types() { // Outer, semi and anti joins share Planner predicates and preserve SQL null behavior. #[test] fn native_relational_join_kinds_preserve_unmatched_rows() { - use planner_types::pre_asap::{CompareOpKind, JoinKind, Predicate, QueryExpr}; - use std::rc::Rc; + use planner_types::ir::Predicate; + use planner_types::pre_asap::{CompareOpKind, JoinKind}; + let input = schema(&[("key", DataType::Int64, true)]); - let predicate = Predicate(Rc::new(QueryExpr::Compare { - left: Rc::new(QueryExpr::Column(0)), + let predicate = Predicate(ScalarExpr::Compare { + semantics: planner_types::ir::ExprSemantics::Sql, + left: Box::new(ScalarExpr::Column(0)), op: CompareOpKind::Eq, - right: Rc::new(QueryExpr::Column(1)), - })); + right: Box::new(ScalarExpr::Column(1)), + }); for (kind, count) in [ (JoinKind::Inner, 1), (JoinKind::Left, 3), @@ -1018,6 +1056,7 @@ fn weighted_rate_topk_preserves_partitions_fractional_scores_and_evaluation_scop } fn assert_weighted_rate_topk(count_sketch: bool) { use planner_types::post_asap::{SketchAlgorithm, SketchKind, SketchParams}; + let raw = schema(&[ ("service", DataType::Utf8, false), ("job", DataType::Utf8, false), @@ -1084,7 +1123,7 @@ fn assert_weighted_rate_topk(count_sketch: bool) { ("service", DataType::Utf8, false), ("score", DataType::Float64, false), ]); - let readout = Operator::keyed_readout(build.schema(), 1, 8, output.clone()).unwrap(); + let evaluation = Operator::keyed_evaluation(build.schema(), 1, 8, output.clone()).unwrap(); let mut dag = PhysicalDAG::default(); dag.add( 0, @@ -1094,7 +1133,7 @@ fn assert_weighted_rate_topk(count_sketch: bool) { .unwrap(); dag.add(1, vec![0], rates).unwrap(); dag.add(2, vec![1], build).unwrap(); - dag.add(3, vec![2], readout).unwrap(); + dag.add(3, vec![2], evaluation).unwrap(); dag.add( 4, vec![3], @@ -1141,17 +1180,16 @@ fn grouped_temporal_schema_compiles_and_executes_topk() { use asap_physical_operators::physical_planner::{ compile_node, CompiledPhysicalDAG, InputContract, Source, }; - use planner_types::post_asap::{ - ExecutionDataState, PostAsapDAGNode, PostAsapNodeId, PostAsapOperatorPayload, - ValueOperation, - }; + use planner_types::ir::export::{PhysicalASAPDAGNode, PhysicalASAPOperatorPayload}; + use planner_types::post_asap::ExecutionDataState; + use planner_types::pre_asap::{ - aggregate_output_schema, AggIntent, Field, GroupKeys, QueryExpr, Reduction as IrReduction, - Schema as IrSchema, + aggregate_output_schema, AggIntent, GroupKeys, Reduction as IrReduction, Schema as IrSchema, }; + let grouped = IrSchema::new(vec![ - Field::plain("job", DataType::Utf8, false), - Field::plain("sum", DataType::Float64, false), + planner_types::pre_asap::Field::plain("job", DataType::Utf8, false), + planner_types::pre_asap::Field::plain("sum", DataType::Float64, false), ]); let output = aggregate_output_schema( &grouped, @@ -1167,15 +1205,18 @@ fn grouped_temporal_schema_compiles_and_executes_topk() { .map(|c| { ( c.name.as_str(), - c.dtype.plain().unwrap().clone(), + c.plain_dtype().unwrap().clone(), c.nullable, ) }) .collect::>(), ); - let node = |id, operation| PostAsapDAGNode { - id: PostAsapNodeId(id), - payload: PostAsapOperatorPayload::Value { operation }, + let node = |id, operation| PhysicalASAPDAGNode { + coverage: None, + id: planner_types::ir::export::LogicalASAPNodeId(id), + payload: PhysicalASAPOperatorPayload::Relational { + operator: operation, + }, output_state: ExecutionDataState::QUERY_ROWS, output_schema: (*input).clone(), guarantee: None, @@ -1184,8 +1225,8 @@ fn grouped_temporal_schema_compiles_and_executes_topk() { &node( 1, ValueOperation::Sort { - keys: vec![planner_types::pre_asap::SortKey { - expr: QueryExpr::Column(1), + keys: vec![planner_types::ir::export::WireSortKey { + expr: planner_types::ir::export::WireScalarExpr::Column(1), ascending: false, nulls_first: false, }], @@ -1199,7 +1240,7 @@ fn grouped_temporal_schema_compiles_and_executes_topk() { &node( 2, ValueOperation::Limit { - n: 1, + n: Some(1), offset: 0, partition_by: GroupKeys::none(), }, @@ -1253,31 +1294,29 @@ fn certified_pruning_rejects_missing_authoritative_values_after_recovery() { }; use planner_types::{ post_asap::*, - pre_asap::{CompareOpKind, JoinKind, Predicate, QueryExpr}, + pre_asap::{CompareOpKind, JoinKind}, }; - use std::{collections::BTreeMap, rc::Rc}; + use std::collections::BTreeMap; let schema = schema(&[("key", DataType::Utf8, false)]); for certified in [false, true] { - let node = PostAsapDAGNode { - id: PostAsapNodeId(2), + let node = PhysicalASAPDAGNode { + coverage: None, + id: planner_types::ir::export::LogicalASAPNodeId(2), output_schema: (*schema).clone(), output_state: ExecutionDataState::QUERY_ROWS, guarantee: None, - payload: PostAsapOperatorPayload::RelationalJoin { - join_kind: JoinKind::Semi, - pred: Predicate(Rc::new(QueryExpr::Compare { - left: Rc::new(QueryExpr::Column(0)), - op: CompareOpKind::Eq, - right: Rc::new(QueryExpr::Column(1)), - })), - pruning: certified.then_some(CandidateCompleteness::Certified { - guarantee: ResultGuarantee { - metric: ErrorMetric::TopKMembership, - bound: BoundExpr::Zero, - failure_probability: ProbabilityExpr::Constant { value: 0.01 }, - provenance: vec![], - }, - }), + payload: PhysicalASAPOperatorPayload::Relational { + operator: planner_types::ir::export::NonASAPOpKind::Join { + join_kind: JoinKind::Semi, + pred: planner_types::ir::export::WirePredicate( + planner_types::ir::export::WireScalarExpr::Compare { + semantics: planner_types::ir::ExprSemantics::Sql, + left: Box::new(planner_types::ir::export::WireScalarExpr::Column(0)), + op: CompareOpKind::Eq, + right: Box::new(planner_types::ir::export::WireScalarExpr::Column(1)), + }, + ), + }, }, }; let dag = CompiledPhysicalDAG::from_operators( @@ -1290,7 +1329,12 @@ fn certified_pruning_rejects_missing_authoritative_values_after_recovery() { 2, ( vec![0, 1], - compile_node(&node, &[schema.clone(), schema.clone()]).unwrap(), + if certified { + Operator::certified_semi_join(schema.clone(), schema.clone(), vec![(0, 0)]) + .unwrap() + } else { + compile_node(&node, &[schema.clone(), schema.clone()]).unwrap() + }, ), )] .into(), @@ -1373,17 +1417,21 @@ fn compiled_ingestion_binary_preserves_alignment_and_rejects_missing_updates() { ("time", DataType::Timestamp, false), ("value", DataType::Float64, false), ]); - let node = PostAsapDAGNode { - id: PostAsapNodeId(2), + let node = PhysicalASAPDAGNode { + coverage: None, + id: planner_types::ir::export::LogicalASAPNodeId(2), output_schema: (*input).clone(), output_state: ExecutionDataState::INGESTION_ROWS, guarantee: None, - payload: PostAsapOperatorPayload::Binary { - operator: BinaryOperator { - kind: BinaryOpKind::Arithmetic(ArithmeticOpKind::Sub), - vector_match: None, - checked_relative_division: false, - checked_finite_division: false, + payload: PhysicalASAPOperatorPayload::Relational { + operator: planner_types::ir::export::NonASAPOpKind::BinaryOp { + operator: BinaryOperator { + kind: BinaryOpKind::Arithmetic(ArithmeticOpKind::Sub), + vector_match: None, + checked_relative_division: false, + checked_finite_division: false, + }, + return_bool: false, }, }, }; diff --git a/crates/asap-physical-operators/tests/physical_plan_recovery.rs b/crates/asap-physical-operators/tests/physical_plan_recovery.rs index fda1b502a..e755090e6 100644 --- a/crates/asap-physical-operators/tests/physical_plan_recovery.rs +++ b/crates/asap-physical-operators/tests/physical_plan_recovery.rs @@ -5,15 +5,15 @@ use asap_physical_operators::{ physical_planner::{CompiledPhysicalDAG, InputContract}, }; use planner_types::{ - post_asap::{Field, FieldDataType, Schema}, + post_asap::{Field, FieldDataType}, pre_asap::DataType, }; use std::{collections::BTreeMap, sync::Arc}; fn sorted() -> CompiledPhysicalDAG { - let schema = Arc::new(Schema { - closed: true, + let schema = Arc::new(planner_types::pre_asap::Schema { unique_keys: vec![], + closed: false, fields: vec![Field { table: None, name: "value".into(), @@ -74,7 +74,7 @@ fn recovery_retains_selected_operator_and_rejects_invalid_contracts() { #[test] fn candidate_recovery_preserves_materialization_boundary() { - use asap_physical_operators::physical_planner::PhysicalASAPDAG; + use asap_physical_operators::physical_planner::CompiledPhysicalPlan; let precompute = sorted(); let output = InputContract::bounded(precompute.output_contract(1).unwrap().schema); let query = CompiledPhysicalDAG::from_operators( @@ -89,13 +89,13 @@ fn candidate_recovery_preserves_materialization_boundary() { vec![2], ) .unwrap(); - let candidate = PhysicalASAPDAG { + let candidate = CompiledPhysicalPlan { precompute: Some(precompute), query, materialized_outputs: BTreeMap::from([(1, output)]), }; let bytes = serde_json::to_vec(&candidate).unwrap(); - let restored = serde_json::from_slice::(&bytes).unwrap(); + let restored = serde_json::from_slice::(&bytes).unwrap(); assert_eq!(restored.precompute.as_ref().unwrap().roots(), &[1]); assert_eq!(restored.query.roots(), &[2]); assert_eq!(serde_json::to_vec(&restored).unwrap(), bytes); @@ -103,6 +103,7 @@ fn candidate_recovery_preserves_materialization_boundary() { wire["materialized_outputs"]["1"]["schema"]["fields"][0]["dtype"] = serde_json::json!({"Plain":"utf8"}); assert!( - serde_json::from_slice::(&serde_json::to_vec(&wire).unwrap()).is_err() + serde_json::from_slice::(&serde_json::to_vec(&wire).unwrap()) + .is_err() ); } diff --git a/crates/asap-physical-operators/tests/physical_semantics.rs b/crates/asap-physical-operators/tests/physical_semantics.rs index 56b62590b..498e8b3f0 100644 --- a/crates/asap-physical-operators/tests/physical_semantics.rs +++ b/crates/asap-physical-operators/tests/physical_semantics.rs @@ -9,16 +9,20 @@ use asap_physical_operators::{ values::{Batch, SchemaRef, Value}, }; use futures::{executor::block_on, StreamExt}; +use planner_types::ir::export::NonASAPOpKind as ValueOperation; +use planner_types::ir::export::{PhysicalASAPDAGNode, PhysicalASAPOperatorPayload}; +use planner_types::ir::Predicate; +use planner_types::ir::ScalarExpr; use planner_types::{ - post_asap::{Field, FieldDataType, Schema}, - pre_asap::{CompareOpKind, DataType, JoinKind, Predicate, QueryExpr}, + post_asap::{Field, FieldDataType}, + pre_asap::{CompareOpKind, DataType, JoinKind}, }; -use std::{rc::Rc, sync::Arc}; +use std::sync::Arc; fn schema(fields: &[(&str, DataType, bool)]) -> SchemaRef { - Arc::new(Schema { - closed: true, + Arc::new(planner_types::pre_asap::Schema { unique_keys: vec![], + closed: false, fields: fields .iter() .map(|(name, dtype, nullable)| Field { @@ -74,11 +78,12 @@ fn keys(rows: &[Vec]) -> Vec>> { .collect() } fn eq_predicate() -> Predicate { - Predicate(Rc::new(QueryExpr::Compare { - left: Rc::new(QueryExpr::Column(0)), + Predicate(ScalarExpr::Compare { + semantics: planner_types::ir::ExprSemantics::Sql, + left: Box::new(ScalarExpr::Column(0)), op: CompareOpKind::Eq, - right: Rc::new(QueryExpr::Column(1)), - })) + right: Box::new(ScalarExpr::Column(1)), + }) } fn join(left: Vec, right: Vec, kind: JoinKind, keyed: bool) -> Vec> { let input = schema(&[("key", DataType::Float64, true)]); @@ -335,7 +340,7 @@ fn aggregate_empty_and_all_null_follow_asap_contract() { fn projection_rejects_expression_bound_to_another_schema() { let original = schema(&[("a", DataType::Int64, false), ("b", DataType::Int64, false)]); let current = schema(&[("a", DataType::Int64, false)]); - let expr = CompiledExpression::compile(&QueryExpr::Column(1), &original).unwrap(); + let expr = CompiledExpression::compile(&ScalarExpr::Column(1), &original).unwrap(); assert!(Operator::project(current, vec![("b".into(), Expression::planner(expr))]).is_err()); } @@ -345,7 +350,7 @@ fn global_extrema_bind_with_planner_derived_schema() { use asap_physical_operators::physical_planner::compile_node; use planner_types::{ post_asap::*, - pre_asap::{AggIntent, Field, GroupKeys, Reduction as PlanReduction}, + pre_asap::{AggIntent, GroupKeys, Reduction as PlanReduction}, }; let input = schema(&[("v", DataType::Int64, false)]); for measure in [ @@ -353,8 +358,12 @@ fn global_extrema_bind_with_planner_derived_schema() { AggIntent::Max { col: Some(0) }, ] { let planner_input = - planner_types::pre_asap::Schema::new(vec![Field::plain("v", DataType::Int64, false)]); - let derived = planner_types::pre_asap::query_expr::aggregate_output_schema( + planner_types::pre_asap::Schema::new(vec![planner_types::pre_asap::Field::plain( + "v", + DataType::Int64, + false, + )]); + let derived = planner_types::pre_asap::aggregate_output_schema( &planner_input, &PlanReduction::Reduce(GroupKeys::by(vec![])), std::slice::from_ref(&measure), @@ -364,19 +373,20 @@ fn global_extrema_bind_with_planner_derived_schema() { let result = derived.fields[0].clone(); let output = schema(&[( &result.name, - result.dtype.plain().unwrap().clone(), + result.plain_dtype().unwrap().clone(), result.nullable, )]); - let node = PostAsapDAGNode { - id: PostAsapNodeId(1), - payload: PostAsapOperatorPayload::Value { - operation: ValueOperation::Exact(ExactOperation::Aggregate { + let node = PhysicalASAPDAGNode { + coverage: None, + id: planner_types::ir::export::LogicalASAPNodeId(1), + payload: PhysicalASAPOperatorPayload::Relational { + operator: ValueOperation::Aggregate { reduction: PlanReduction::Reduce(GroupKeys::by(vec![])), measures: vec![measure], output_names: vec![result.name], filters: vec![], having: None, - }), + }, }, output_state: ExecutionDataState::QUERY_ROWS, output_schema: (*output).clone(), @@ -407,10 +417,11 @@ fn planner_comparisons_handle_nan_without_execution_errors() { CompareOpKind::Gt, CompareOpKind::Ge, ] { - let expression = QueryExpr::Compare { - left: Rc::new(QueryExpr::Column(0)), + let expression = ScalarExpr::Compare { + semantics: planner_types::ir::ExprSemantics::Sql, + left: Box::new(ScalarExpr::Column(0)), op: op.clone(), - right: Rc::new(QueryExpr::Column(1)), + right: Box::new(ScalarExpr::Column(1)), }; let compiled = CompiledExpression::compile(&expression, &input).unwrap(); for row in [ @@ -474,10 +485,11 @@ fn mixed_numeric_comparisons_preserve_large_integer_precision() { ("a", DataType::Int64, false), ("b", DataType::Float64, false), ]); - let expr = QueryExpr::Compare { - left: Rc::new(QueryExpr::Column(0)), + let expr = ScalarExpr::Compare { + semantics: planner_types::ir::ExprSemantics::Sql, + left: Box::new(ScalarExpr::Column(0)), op: CompareOpKind::Gt, - right: Rc::new(QueryExpr::Column(1)), + right: Box::new(ScalarExpr::Column(1)), }; let compiled = CompiledExpression::compile(&expr, &input).unwrap(); for (a, b, expected) in [ @@ -498,11 +510,11 @@ fn boolean_truth_tables_agree_between_expression_paths() { for and in [true, false] { for a in [None, Some(false), Some(true)] { for b in [None, Some(false), Some(true)] { - let parts = vec![QueryExpr::Column(0), QueryExpr::Column(1)]; + let parts = vec![ScalarExpr::Column(0), ScalarExpr::Column(1)]; let planner = if and { - QueryExpr::BoolAnd(parts) + ScalarExpr::BoolAnd(parts) } else { - QueryExpr::BoolOr(parts) + ScalarExpr::BoolOr(parts) }; let native = if and { Expression::And( @@ -543,8 +555,9 @@ fn boolean_truth_tables_agree_between_expression_paths() { // Partial/final execution must agree with one build for an uncompacted KLL population. #[test] -fn kll_partial_merge_and_multiple_readouts_preserve_population() { +fn kll_partial_merge_and_multiple_evaluations_preserve_population() { use planner_types::post_asap::{SketchAlgorithm, SketchKind, SketchParams}; + let input = schema(&[("v", DataType::Float64, false)]); let family = FieldDataType::Sketch( SketchKind::new(SketchAlgorithm::Kll, SketchParams::Kll { k: 512 }), @@ -588,10 +601,10 @@ fn kll_partial_merge_and_multiple_readouts_preserve_population() { dag.add( id, vec![build], - Operator::readout( + Operator::evaluation( state.clone(), 0, - asap_physical_operators::operators::ReadoutQuery::Sketch( + asap_physical_operators::operators::SummaryEvaluation::Sketch( planner_types::post_asap::SketchStatistic::Quantile { q }, ), ) @@ -662,6 +675,7 @@ fn zero_column_output_obeys_memory_limit() { fn empty_exact_summary_extrema_agree_with_ordinary_aggregation() { use asap_physical_operators::Statistic; use planner_types::post_asap::{ExactKind, ExactParams}; + let input = schema(&[("v", DataType::Float64, false)]); for (kind, params, statistic) in [ (ExactKind::Min, ExactParams::Min, Statistic::Min), @@ -683,11 +697,11 @@ fn empty_exact_summary_extrema_agree_with_ordinary_aggregation() { dag.add( 2, vec![1], - Operator::readout( + Operator::evaluation( state, 0, - asap_physical_operators::operators::ReadoutQuery::Exact( - asap_physical_operators::summary_kernels::exact::ExactReadout { + asap_physical_operators::operators::SummaryEvaluation::Exact( + asap_physical_operators::summary_kernels::exact::ExactEvaluation { statistic, lookback_ms: None, }, diff --git a/crates/asap-physical-operators/tests/plan_properties.rs b/crates/asap-physical-operators/tests/plan_properties.rs index e3dd7b5fc..ab488162d 100644 --- a/crates/asap-physical-operators/tests/plan_properties.rs +++ b/crates/asap-physical-operators/tests/plan_properties.rs @@ -8,8 +8,8 @@ use asap_physical_operators::{ Error, }; use planner_types::{ - post_asap::{Field, FieldDataType, Schema}, - pre_asap::{DataType, QueryExpr, Source}, + post_asap::{Field, FieldDataType}, + pre_asap::{DataType, Schema, Source}, }; use std::sync::{ atomic::{AtomicUsize, Ordering}, @@ -35,9 +35,9 @@ impl RawSource for DeclaredSource { // A blocking parent must reject unknown and unbounded Scan inputs without opening a reader. #[test] fn blocking_inputs_require_an_explicit_finite_source() { - let schema = Arc::new(Schema { - closed: true, + let schema = Arc::new(planner_types::pre_asap::Schema { unique_keys: vec![], + closed: false, fields: vec![Field { table: None, name: "v".into(), @@ -67,11 +67,20 @@ fn blocking_inputs_require_an_explicit_finite_source() { ) .unwrap(); let scan = registry - .bind(&QueryExpr::Scan { - source: identity, - schema: Schema::new(vec![Field::plain("v", DataType::Int64, false)]), - predicates: vec![], - }) + .bind( + &planner_types::ir::OperatorNode::new_shared(planner_types::ir::Operator::NonASAP( + planner_types::ir::NonASAPOp::Scan { + source: identity, + schema: Schema::new(vec![planner_types::pre_asap::Field::plain( + "v", + DataType::Int64, + false, + )]), + predicates: vec![], + }, + )) + .unwrap(), + ) .unwrap(); let mut dag = PhysicalDAG::default(); dag.add(0, vec![], scan).unwrap(); @@ -112,11 +121,11 @@ fn blocking_inputs_require_an_explicit_finite_source() { } } -// Kernel support must not be mistaken for executable native state/readout support. +// Kernel support must not be mistaken for executable native state/evaluation support. #[test] fn summary_capability_levels_are_distinct() { use asap_physical_operators::{ - capability::{validate_native_family, validate_sketch_readout, validate_summary_kernel}, + capability::{validate_native_family, validate_sketch_evaluation, validate_summary_kernel}, planner::post_asap::SketchStatistic, }; use planner_types::{ @@ -148,8 +157,8 @@ fn summary_capability_levels_are_distinct() { key: ColumnRef::SampleValue, value: None, }; - assert!(validate_sketch_readout(&cms, &bare_count).is_ok()); - assert!(validate_sketch_readout( + assert!(validate_sketch_evaluation(&cms, &bare_count).is_ok()); + assert!(validate_sketch_evaluation( &cms, &SketchStatistic::PointCount { key: ColumnRef::Named("host".into()), @@ -162,7 +171,7 @@ fn summary_capability_levels_are_distinct() { grouping, ); assert!(validate_native_family(&kll).is_ok()); - assert!(validate_sketch_readout(&kll, &SketchStatistic::Quantile { q: 1.5 }).is_err()); - assert!(validate_sketch_readout(&kll, &SketchStatistic::Cardinality).is_err()); - assert!(validate_sketch_readout(&kll, &SketchStatistic::Quantile { q: 0.5 }).is_ok()); + assert!(validate_sketch_evaluation(&kll, &SketchStatistic::Quantile { q: 1.5 }).is_err()); + assert!(validate_sketch_evaluation(&kll, &SketchStatistic::Cardinality).is_err()); + assert!(validate_sketch_evaluation(&kll, &SketchStatistic::Quantile { q: 0.5 }).is_ok()); } diff --git a/crates/asap-physical-operators/tests/planspace_series_identity_heap.rs b/crates/asap-physical-operators/tests/planspace_series_identity_heap.rs index 1f03b61c4..e33de530f 100644 --- a/crates/asap-physical-operators/tests/planspace_series_identity_heap.rs +++ b/crates/asap-physical-operators/tests/planspace_series_identity_heap.rs @@ -2,6 +2,10 @@ //! Planner's search space: `enumerate_candidate_dags_for_root` lists //! current-series TopK heaps without a caller-side series-identity pass, cost //! ranking, or workload Cartesian expansion. Placement variants are not listed. +mod common; +use common::compile_physical_asap_dag; +use planner_types::ir::OperatorNode; + use asap_aware_mapping::{ accuracy::{AccuracyEvidenceProvider, DefaultAccuracyModel, PropagationStats}, cost_model::DefaultCostModel, @@ -9,11 +13,10 @@ use asap_aware_mapping::{ search_workload_with_targets, Proposals, ReplacementStrategy, ReplacementSubDAG, TargetSubDAG, }; use asap_physical_operators::physical_planner::promql_rows::{ - compile_current_series_readout, SERIES_IDENTITY_COLUMN, + compile_current_series_evaluation, SERIES_IDENTITY_COLUMN, }; use planner_types::{ post_asap::*, - pre_asap::QueryExpr, types::AccuracyTarget, workload::{ AccuracyRequirement, BatchEntry, DataWorkload, DurationMs, Evidence as WorkloadEvidence, @@ -25,7 +28,7 @@ use std::rc::Rc; struct Evidence; impl AccuracyEvidenceProvider for Evidence { - fn topk_max_distinct_items(&self, _: &QueryExpr) -> Option { + fn topk_max_distinct_items(&self, _: &OperatorNode) -> Option { Some(1000) } fn propagation_stats( @@ -64,7 +67,7 @@ impl ReplacementStrategy for LogicalOnly { } } -fn lower(query: &str, accuracy: &AccuracyTarget) -> Rc { +fn lower(query: &str, accuracy: &AccuracyTarget) -> Rc { let workload = PlanningWorkload { query_workload: QueryWorkload { language: QueryLanguage::PromQL, @@ -89,14 +92,12 @@ fn lower(query: &str, accuracy: &AccuracyTarget) -> Rc { ..Default::default() }), }; - Rc::new( - asap_frontend_promql::lower_promql_workload(&workload, 0) - .unwrap() - .remove(0), - ) + asap_frontend_promql::lower_promql_workload(&workload, 0) + .unwrap() + .remove(0) } -type InventoryDAG = Vec<(usize, Rc)>; +type InventoryDAG = Vec<(usize, Rc)>; /// Candidate DAGs for query 1 of a two-query workload, with and without /// whole-root proposals. Query 0 is a bystander that must not multiply them. @@ -126,7 +127,7 @@ fn inventories(query: &str, accuracy: AccuracyTarget) -> (Vec, Vec fn carries_identity(dag: &InventoryDAG) -> bool { dag.iter().any(|(_, root)| { - compile_post_asap_dag(root) + compile_physical_asap_dag(root) .unwrap() .nodes .iter() @@ -140,7 +141,10 @@ fn carries_identity(dag: &InventoryDAG) -> bool { } /// Shared acceptance checks; returns the added identity-carrying alternatives. -fn added_alternatives(query: &str, accuracy: AccuracyTarget) -> Vec> { +fn added_alternatives( + query: &str, + accuracy: AccuracyTarget, +) -> Vec> { let (full, logical) = inventories(query, accuracy); for (index, dag) in full.iter().enumerate() { assert_eq!(dag.len(), 1, "one root per candidate, no workload product"); @@ -159,15 +163,18 @@ fn added_alternatives(query: &str, accuracy: AccuracyTarget) -> Vec asap_aware_mapping::CandidateLogicalASAPDAGs<&'static str> { let workload = PlanningWorkload { @@ -40,26 +43,22 @@ fn grouped_rate_space() -> asap_aware_mapping::CandidateLogicalASAPDAGs<&'static ..Default::default() }), }; - let root = Rc::new( - asap_frontend_promql::lower_promql_workload(&workload, 0) - .unwrap() - .remove(0), - ); - let root = Rc::new( - asap_physical_operators::physical_planner::promql_rows::with_series_identity(&root) - .unwrap(), - ); + let root = asap_frontend_promql::lower_promql_workload(&workload, 0) + .unwrap() + .remove(0); + let root = asap_physical_operators::physical_planner::promql_rows::with_series_identity(&root) + .unwrap(); search_workload(vec![("grouped-rate", root)]) } -fn grouped_rate() -> PostAsapDAG { +fn grouped_rate() -> PhysicalASAPDAG { let space = grouped_rate_space(); let selected = space .global_selection(&DefaultCostModel) .assemble_selected_query(&space.roots[0].1) .unwrap() .unwrap(); - compile_post_asap_dag(&selected).unwrap() + compile_physical_asap_dag(&selected).unwrap() } fn run(plan: &CompiledPhysicalDAG, inputs: BTreeMap, scope: Scope) -> Vec { let sources = inputs @@ -81,7 +80,7 @@ fn run(plan: &CompiledPhysicalDAG, inputs: BTreeMap, scope: Scope) - }) } -/// Rate readouts and grouped Sum can run together during bounded precompute; +/// Rate evaluations and grouped Sum can run together during bounded precompute; /// storing per-series rates instead leaves the same Sum in the query DAG. #[test] fn grouped_rate_can_be_materialized_before_or_after_grouped_sum() { @@ -92,22 +91,20 @@ fn grouped_rate_can_be_materialized_before_or_after_grouped_sum() { .find(|node| { matches!( node.payload, - PostAsapOperatorPayload::SummaryAgg { + PhysicalASAPOperatorPayload::SummaryAgg { family: FieldDataType::ExactAggregate(ExactKind::Rate, _), .. } ) }) .unwrap(); - let readout = dag + let evaluation = dag .nodes .iter() .find(|node| { matches!( node.payload, - PostAsapOperatorPayload::Value { - operation: ValueOperation::FinalizeExactAccumulator - } + PhysicalASAPOperatorPayload::FinalizeExactAccumulator ) && dag .edges .iter() @@ -116,7 +113,7 @@ fn grouped_rate_can_be_materialized_before_or_after_grouped_sum() { .unwrap(); let input_schema = Arc::new(state.output_schema.clone()); let (family, update, grouping) = match &state.payload { - PostAsapOperatorPayload::SummaryAgg { + PhysicalASAPOperatorPayload::SummaryAgg { family, input, grouping, @@ -139,7 +136,7 @@ fn grouped_rate_can_be_materialized_before_or_after_grouped_sum() { .as_any() .downcast_ref::() .unwrap() - .readout(asap_physical_operators::Statistic::Rate, range_ms, None) + .evaluation(asap_physical_operators::Statistic::Rate, range_ms, None) .unwrap() .unwrap(); let summary = Value::Summary { @@ -169,9 +166,9 @@ fn grouped_rate_can_be_materialized_before_or_after_grouped_sum() { }) .collect(); let batch = Batch::try_new(input_schema.clone(), rows).unwrap(); - let root = u64::from(dag.root.0); + let root = u64::from(dag.roots[0].0); let state_id = u64::from(state.id.0); - let rate_id = u64::from(readout.id.0); + let rate_id = u64::from(evaluation.id.0); let frontiers = asap_physical_operators::physical_planner::enumerate_frontiers( &dag, &BTreeMap::from([(state_id, InputContract::bounded(input_schema.clone()))]), @@ -367,7 +364,7 @@ fn grouped_rate_can_be_materialized_before_or_after_grouped_sum() { .as_any() .downcast_ref::() .unwrap() - .readout(asap_physical_operators::Statistic::Rate, range_ms, None) + .evaluation(asap_physical_operators::Statistic::Rate, range_ms, None) .unwrap() .unwrap(); assert_ne!( @@ -376,7 +373,7 @@ fn grouped_rate_can_be_materialized_before_or_after_grouped_sum() { ); } -/// Enumerated frontiers include both grouped-result and per-series readout +/// Enumerated frontiers include both grouped-result and per-series evaluation /// persistence; an explicit Rate-state input retains its original semantics. #[test] fn bounded_inventory_exposes_grouped_rate_physical_frontiers() { @@ -388,7 +385,7 @@ fn bounded_inventory_exposes_grouped_rate_physical_frontiers() { .find(|node| { matches!( &node.payload, - PostAsapOperatorPayload::SummaryAgg { + PhysicalASAPOperatorPayload::SummaryAgg { family: FieldDataType::ExactAggregate(ExactKind::Rate, _), .. } @@ -399,7 +396,7 @@ fn bounded_inventory_exposes_grouped_rate_physical_frontiers() { u64::from(state.id.0), InputContract::bounded(Arc::new(state.output_schema.clone())), )]); - let roots = [u64::from(dag.root.0)]; + let roots = [u64::from(dag.roots[0].0)]; let frontiers = enumerate_frontiers(&dag, &inputs, &roots, 4096).unwrap(); let candidates = compile_candidates(&dag, inputs.clone(), &roots, &frontiers) .into_iter() @@ -422,11 +419,11 @@ fn enumerated_grouped_rate_candidates_execute_numeric_query_outputs() { let mut executed = 0; for forest in inventory.candidates { let root = &forest[0].1; - let dag = compile_post_asap_dag(root).unwrap(); + let dag = compile_physical_asap_dag(root).unwrap(); let Some(state) = dag.nodes.iter().find(|node| { matches!( node.payload, - PostAsapOperatorPayload::SummaryAgg { + PhysicalASAPOperatorPayload::SummaryAgg { family: FieldDataType::ExactAggregate(ExactKind::Rate, _), .. } @@ -440,25 +437,25 @@ fn enumerated_grouped_rate_candidates_execute_numeric_query_outputs() { .find(|node| { matches!( node.payload, - PostAsapOperatorPayload::SummaryAgg { + PhysicalASAPOperatorPayload::SummaryAgg { family: FieldDataType::ExactAggregate(ExactKind::Sum, _), .. } ) }) .map(|node| u64::from(node.id.0)) - .unwrap_or(u64::from(dag.root.0)); + .unwrap_or(u64::from(dag.roots[0].0)); let physical_asap_dags = compile_candidates( &dag, BTreeMap::from([( u64::from(state.id.0), InputContract::bounded(Arc::new(state.output_schema.clone())), )]), - &[u64::from(dag.root.0)], + &[u64::from(dag.roots[0].0)], &[vec![], vec![boundary]], ); let (family, input, grouping) = match &state.payload { - PostAsapOperatorPayload::SummaryAgg { + PhysicalASAPOperatorPayload::SummaryAgg { family, input, grouping, @@ -558,14 +555,14 @@ fn enumerated_grouped_rate_candidates_execute_numeric_query_outputs() { /// The per-frontier lowering used before compile-once cuts: each boundary /// choice lowers the precompute and query DAGs from the logical DAG again. fn recompiled_candidate( - dag: &PostAsapDAG, + dag: &PhysicalASAPDAG, inputs: &BTreeMap, roots: &[u64], frontier: &[u64], -) -> Result { +) -> Result { use asap_physical_operators::plan::Emission; if frontier.is_empty() { - return Ok(PhysicalASAPDAG { + return Ok(CompiledPhysicalPlan { precompute: None, query: compile(dag, inputs.clone(), roots)?, materialized_outputs: BTreeMap::new(), @@ -580,7 +577,7 @@ fn recompiled_candidate( } let mut query_inputs = inputs.clone(); query_inputs.extend(materialized_outputs.clone()); - Ok(PhysicalASAPDAG { + Ok(CompiledPhysicalPlan { precompute: Some(precompute), query: compile(dag, query_inputs, roots)?, materialized_outputs, @@ -588,7 +585,7 @@ fn recompiled_candidate( } fn assert_cuts_match_recompilation( - dag: &PostAsapDAG, + dag: &PhysicalASAPDAG, inputs: BTreeMap, roots: &[u64], min_frontiers: usize, @@ -615,13 +612,13 @@ fn grouped_rate_cuts_equal_per_frontier_compilation() { let state = dag .nodes .iter() - .find(|node| matches!(node.payload, PostAsapOperatorPayload::SummaryAgg { .. })) + .find(|node| matches!(node.payload, PhysicalASAPOperatorPayload::SummaryAgg { .. })) .unwrap(); let inputs = BTreeMap::from([( u64::from(state.id.0), InputContract::bounded(Arc::new(state.output_schema.clone())), )]); - assert_cuts_match_recompilation(&dag, inputs, &[u64::from(dag.root.0)], 3); + assert_cuts_match_recompilation(&dag, inputs, &[u64::from(dag.roots[0].0)], 3); } /// Cuts of a DAG whose nodes lower to helper operators (current-series @@ -655,26 +652,32 @@ fn population_topk_cuts_equal_per_frontier_compilation() { let original = asap_frontend_promql::lower_promql_workload(&workload, 0) .unwrap() .remove(0); - let root = Rc::new( + let root = asap_physical_operators::physical_planner::promql_rows::with_series_identity(&original) - .unwrap(), - ); + .unwrap(); let selected = asap_aware_mapping::maintained_population::MaintainedPopulationStrategy::new( std::slice::from_ref(&root), ) .candidate(&root) .unwrap(); - let dag = compile_post_asap_dag(&selected).unwrap(); + let dag = compile_physical_asap_dag(&selected).unwrap(); let raw = dag .nodes .iter() - .find(|node| matches!(node.payload, PostAsapOperatorPayload::Fallback { .. })) + .find(|node| { + matches!( + node.payload, + PhysicalASAPOperatorPayload::Relational { + operator: planner_types::ir::export::NonASAPOpKind::TimeRange { .. } + } + ) + }) .unwrap(); let inputs = BTreeMap::from([( u64::from(raw.id.0), InputContract::bounded(Arc::new(raw.output_schema.clone())), )]); - let roots = [u64::from(dag.root.0)]; + let roots = [u64::from(dag.roots[0].0)]; let compiled = compile(&dag, inputs.clone(), &roots).unwrap(); // The root reads its population through a Sort helper numbered by the root. let helper = u64::MAX - (roots[0] << 16); @@ -694,24 +697,22 @@ fn cut_candidate_rejects_invalid_frontiers() { let state = dag .nodes .iter() - .find(|node| matches!(node.payload, PostAsapOperatorPayload::SummaryAgg { .. })) + .find(|node| matches!(node.payload, PhysicalASAPOperatorPayload::SummaryAgg { .. })) .unwrap(); - let readout = dag + let evaluation = dag .nodes .iter() .find(|node| { matches!( node.payload, - PostAsapOperatorPayload::Value { - operation: ValueOperation::FinalizeExactAccumulator - } + PhysicalASAPOperatorPayload::FinalizeExactAccumulator ) }) .unwrap(); let (state_id, rate_id, root) = ( u64::from(state.id.0), - u64::from(readout.id.0), - u64::from(dag.root.0), + u64::from(evaluation.id.0), + u64::from(dag.roots[0].0), ); let inputs = BTreeMap::from([( state_id, diff --git a/crates/asap-physical-operators/tests/precompute_population.rs b/crates/asap-physical-operators/tests/precompute_population.rs index 5b91c6e72..002cf63c5 100644 --- a/crates/asap-physical-operators/tests/precompute_population.rs +++ b/crates/asap-physical-operators/tests/precompute_population.rs @@ -8,7 +8,11 @@ use asap_physical_operators::{ Statistic, }; use futures::{executor::block_on, StreamExt}; -use planner_types::pre_asap::Schema; +use planner_types::ir::export::{ + EdgeRole, GroupingEdgeCompatibility, PhysicalASAPDAG, PhysicalASAPDAGEdge, PhysicalASAPDAGNode, + PhysicalASAPOperatorPayload, WindowEdgeCompatibility, +}; +use planner_types::ir::BinaryOperator; use planner_types::{ post_asap::*, pre_asap::{ArithmeticOpKind, BinaryOpKind, ColumnRef, DataType, GroupKeys, Reduction}, @@ -19,9 +23,9 @@ use std::{collections::BTreeMap, sync::Arc}; #[test] fn finalized_shared_panes_rebuild_one_global_summary_after_recovery() { let family = FieldDataType::ExactAggregate(ExactKind::Sum, ExactParams::Sum); - let schema = |dtype| Schema { - closed: true, + let schema = |dtype| planner_types::pre_asap::Schema { unique_keys: vec![], + closed: false, fields: vec![Field { table: None, name: "value".into(), @@ -50,39 +54,44 @@ fn finalized_shared_panes_rebuild_one_global_summary_after_recovery() { (SummaryInputExpr::Constant(1.), 4.), ] { let nodes = vec![ - PostAsapDAGNode { - id: PostAsapNodeId(0), - payload: PostAsapOperatorPayload::SummaryMerge, + PhysicalASAPDAGNode { + coverage: None, + id: planner_types::ir::export::LogicalASAPNodeId(0), + payload: PhysicalASAPOperatorPayload::SummaryMerge, output_state: ExecutionDataState::INGESTION_SUMMARY, output_schema: state_schema.clone(), guarantee: None, }, - PostAsapDAGNode { - id: PostAsapNodeId(1), - payload: PostAsapOperatorPayload::Value { - operation: ValueOperation::FinalizeExactAccumulator, - }, + PhysicalASAPDAGNode { + coverage: None, + id: planner_types::ir::export::LogicalASAPNodeId(1), + payload: PhysicalASAPOperatorPayload::FinalizeExactAccumulator, output_state: ExecutionDataState::INGESTION_ROWS, output_schema: value_schema.clone(), guarantee: None, }, - PostAsapDAGNode { - id: PostAsapNodeId(2), - payload: PostAsapOperatorPayload::Binary { - operator: BinaryOperator { - kind: BinaryOpKind::Arithmetic(ArithmeticOpKind::Add), - vector_match: None, - checked_relative_division: false, - checked_finite_division: false, + PhysicalASAPDAGNode { + coverage: None, + id: planner_types::ir::export::LogicalASAPNodeId(2), + payload: PhysicalASAPOperatorPayload::Relational { + operator: planner_types::ir::export::NonASAPOpKind::BinaryOp { + operator: BinaryOperator { + kind: BinaryOpKind::Arithmetic(ArithmeticOpKind::Add), + vector_match: None, + checked_relative_division: false, + checked_finite_division: false, + }, + return_bool: false, }, }, output_state: ExecutionDataState::INGESTION_ROWS, output_schema: value_schema.clone(), guarantee: None, }, - PostAsapDAGNode { - id: PostAsapNodeId(3), - payload: PostAsapOperatorPayload::SummaryAgg { + PhysicalASAPDAGNode { + coverage: None, + id: planner_types::ir::export::LogicalASAPNodeId(3), + payload: PhysicalASAPOperatorPayload::SummaryAgg { family: family.clone(), input: SummaryUpdate { weight, @@ -104,9 +113,9 @@ fn finalized_shared_panes_rebuild_one_global_summary_after_recovery() { (2, 3, EdgeRole::Input), ] .into_iter() - .map(|(producer, consumer, role)| PostAsapDAGEdge { - producer: PostAsapNodeId(producer), - consumer: PostAsapNodeId(consumer), + .map(|(producer, consumer, role)| PhysicalASAPDAGEdge { + producer: planner_types::ir::export::LogicalASAPNodeId(producer), + consumer: planner_types::ir::export::LogicalASAPNodeId(consumer), role, intermediate_schema: nodes[producer as usize].output_schema.clone(), data_state: nodes[producer as usize].output_state, @@ -114,10 +123,10 @@ fn finalized_shared_panes_rebuild_one_global_summary_after_recovery() { window: WindowEdgeCompatibility::NotApplicable, }) .collect(); - let dag = PostAsapDAG { + let dag = PhysicalASAPDAG { nodes, edges, - root: PostAsapNodeId(3), + roots: vec![planner_types::ir::export::LogicalASAPNodeId(3)], }; // Identity metadata must remain one non-null Utf8 column. for mutation in 0..3 { @@ -131,7 +140,7 @@ fn finalized_shared_panes_rebuild_one_global_summary_after_recovery() { assert!(precompute::compile(&invalid_identity, &[0], &[3]).is_err()); } let mut invalid_grouping = dag.clone(); - let PostAsapOperatorPayload::SummaryAgg { reduction, .. } = + let PhysicalASAPOperatorPayload::SummaryAgg { reduction, .. } = &mut invalid_grouping.nodes[3].payload else { unreachable!() @@ -211,7 +220,7 @@ fn finalized_shared_panes_rebuild_one_global_summary_after_recovery() { .as_any() .downcast_ref::() .unwrap() - .readout(Statistic::Sum, None, None) + .evaluation(Statistic::Sum, None, None) .unwrap() .unwrap(), expected @@ -221,9 +230,9 @@ fn finalized_shared_panes_rebuild_one_global_summary_after_recovery() { } fn logical_schema(family: FieldDataType) -> Schema { - Schema { - closed: true, + planner_types::pre_asap::Schema { unique_keys: vec![], + closed: false, fields: vec![Field { table: None, name: "value".into(), @@ -238,34 +247,35 @@ fn state_dag( target: Option, merge: bool, ) -> CompiledPhysicalDAG { - let mut nodes = vec![PostAsapDAGNode { - id: PostAsapNodeId(0), - payload: PostAsapOperatorPayload::SummaryMerge, + let mut nodes = vec![PhysicalASAPDAGNode { + coverage: None, + id: planner_types::ir::export::LogicalASAPNodeId(0), + payload: PhysicalASAPOperatorPayload::SummaryMerge, output_state: ExecutionDataState::INGESTION_SUMMARY, output_schema: logical_schema(family.clone()), guarantee: None, }]; if merge { - nodes.push(PostAsapDAGNode { - id: PostAsapNodeId(1), - payload: PostAsapOperatorPayload::SummaryMerge, + nodes.push(PhysicalASAPDAGNode { + id: planner_types::ir::export::LogicalASAPNodeId(1), + payload: PhysicalASAPOperatorPayload::SummaryMerge, ..nodes[0].clone() }); } let read_id = nodes.len() as u32; - nodes.push(PostAsapDAGNode { - id: PostAsapNodeId(read_id), - payload: PostAsapOperatorPayload::Value { - operation: ValueOperation::FinalizeExactAccumulator, - }, + nodes.push(PhysicalASAPDAGNode { + coverage: None, + id: planner_types::ir::export::LogicalASAPNodeId(read_id), + payload: PhysicalASAPOperatorPayload::FinalizeExactAccumulator, output_state: ExecutionDataState::INGESTION_ROWS, output_schema: logical_schema(FieldDataType::Plain(DataType::Float64)), guarantee: None, }); if let Some(target) = target { - nodes.push(PostAsapDAGNode { - id: PostAsapNodeId(nodes.len() as u32), - payload: PostAsapOperatorPayload::SummaryAgg { + nodes.push(PhysicalASAPDAGNode { + coverage: None, + id: planner_types::ir::export::LogicalASAPNodeId(nodes.len() as u32), + payload: PhysicalASAPOperatorPayload::SummaryAgg { family: target.clone(), input: SummaryUpdate::column(ColumnRef::SampleValue), reduction: Reduction::by(vec![]), @@ -278,7 +288,7 @@ fn state_dag( }); } let edges = (1..nodes.len()) - .map(|i| PostAsapDAGEdge { + .map(|i| PhysicalASAPDAGEdge { producer: nodes[i - 1].id, consumer: nodes[i].id, role: EdgeRole::Input, @@ -290,7 +300,11 @@ fn state_dag( .collect(); let root = nodes.last().unwrap().id; precompute::compile( - &PostAsapDAG { nodes, edges, root }, + &PhysicalASAPDAG { + nodes, + edges, + roots: vec![root], + }, &[0], &[u64::from(root.0)], ) @@ -374,7 +388,7 @@ fn explicit_merge_changes_pane_cardinality() { .iter() .map(|row| match row[2] { Value::Float64(v) => v, - _ => panic!("numeric readout expected"), + _ => panic!("numeric evaluation expected"), }) .collect::>(); assert_eq!(values, expected); diff --git a/crates/asap-physical-operators/tests/promql_binary.rs b/crates/asap-physical-operators/tests/promql_binary.rs index 4eec88aa1..793f82a43 100644 --- a/crates/asap-physical-operators/tests/promql_binary.rs +++ b/crates/asap-physical-operators/tests/promql_binary.rs @@ -6,19 +6,21 @@ use asap_physical_operators::{ values::{Batch, SchemaRef, Value}, }; use futures::{executor::block_on, StreamExt}; +use planner_types::ir::export::{ + EdgeRole, GroupingEdgeCompatibility, PhysicalASAPDAG, PhysicalASAPDAGEdge, PhysicalASAPDAGNode, + PhysicalASAPOperatorPayload, WindowEdgeCompatibility, +}; +use planner_types::ir::BinaryOperator; use planner_types::{ - post_asap::{ - BinaryOperator, ExecutionDataState, Field, FieldDataType, PostAsapDAGNode, PostAsapNodeId, - PostAsapOperatorPayload, Schema, - }, + post_asap::{ExecutionDataState, Field, FieldDataType}, pre_asap::{ArithmeticOpKind, BinaryOpKind, DataType}, }; use std::{collections::BTreeMap, sync::Arc}; fn schema() -> SchemaRef { - Arc::new(Schema { - closed: true, + Arc::new(planner_types::pre_asap::Schema { unique_keys: vec![], + closed: false, fields: vec![ Field { table: None, @@ -61,10 +63,19 @@ fn program() -> CompiledPhysicalDAG { }) } fn program_for(operator: BinaryOperator) -> CompiledPhysicalDAG { + program_for_bool(operator, false) +} +fn program_for_bool(operator: BinaryOperator, return_bool: bool) -> CompiledPhysicalDAG { let schema = schema(); - let node = PostAsapDAGNode { - id: PostAsapNodeId(2), - payload: PostAsapOperatorPayload::Binary { operator }, + let node = PhysicalASAPDAGNode { + coverage: None, + id: planner_types::ir::export::LogicalASAPNodeId(2), + payload: PhysicalASAPOperatorPayload::Relational { + operator: planner_types::ir::export::NonASAPOpKind::BinaryOp { + operator, + return_bool, + }, + }, output_state: ExecutionDataState::QUERY_ROWS, output_schema: (*schema).clone(), guarantee: None, @@ -156,12 +167,15 @@ fn scalar_broadcast_and_bool_comparison_are_distinct() { use planner_types::pre_asap::CompareOpKind; for return_bool in [false, true] { let physical_dag = promql_values::compile_binary( - &BinaryOperator { - kind: BinaryOpKind::Compare(CompareOpKind::Lt), - vector_match: None, - checked_relative_division: false, - checked_finite_division: false, - }, + &asap_physical_operators::expressions::binary::BinaryOperator::from_logical( + &BinaryOperator { + kind: BinaryOpKind::Compare(CompareOpKind::Lt), + vector_match: None, + checked_relative_division: false, + checked_finite_division: false, + }, + return_bool, + ), return_bool, true, false, @@ -285,12 +299,15 @@ fn binary_obeys_memory_and_cancellation() { // A `bool` comparison over label-map vectors yields 1 or 0 and drops the name. #[test] fn label_map_bool_comparison_drops_the_name() { - let program = program_for(BinaryOperator { - kind: BinaryOpKind::CompareBool(planner_types::pre_asap::CompareOpKind::Gt), - vector_match: None, - checked_relative_division: false, - checked_finite_division: false, - }); + let program = program_for_bool( + BinaryOperator { + kind: BinaryOpKind::Compare(planner_types::pre_asap::CompareOpKind::Gt), + vector_match: None, + checked_relative_division: false, + checked_finite_division: false, + }, + true, + ); let rows = evaluate_with( program, vec![row("a", "api", 6.)], @@ -309,9 +326,9 @@ fn label_map_bool_comparison_drops_the_name() { assert!(matches!(row[1], Value::Float64(v) if v == 1.)); } -// Stored temporal readouts drop metric names before filter comparisons and set matching. +// Stored temporal evaluations drop metric names before filter comparisons and set matching. #[test] -fn stored_series_readouts_support_filters_and_sets() { +fn stored_series_evaluations_support_filters_and_sets() { use asap_physical_operators::{ physical_planner::compile, summary_kernels::exact::ExactAccumulator, }; @@ -319,14 +336,15 @@ fn stored_series_readouts_support_filters_and_sets() { use planner_types::pre_asap::{ schema::PROMQL_SERIES_IDENTITY, CompareOpKind, PromQLVectorSetOpKind, }; + for (exact_kind, params) in [ (ExactKind::Sum, ExactParams::Sum), (ExactKind::Count, ExactParams::Count), ] { let family = FieldDataType::ExactAggregate(exact_kind.clone(), params); - let state_schema = Arc::new(Schema { - closed: true, + let state_schema = Arc::new(planner_types::pre_asap::Schema { unique_keys: vec![], + closed: false, fields: vec![ Field { table: None, @@ -351,19 +369,21 @@ fn stored_series_readouts_support_filters_and_sets() { BinaryOpKind::Set(PromQLVectorSetOpKind::Or), ] { let nodes = (0..5) - .map(|id| PostAsapDAGNode { - id: PostAsapNodeId(id), + .map(|id| PhysicalASAPDAGNode { + coverage: None, + id: planner_types::ir::export::LogicalASAPNodeId(id), payload: match id { - 0 | 1 => PostAsapOperatorPayload::SummaryMerge, - 2 | 3 => PostAsapOperatorPayload::Value { - operation: ValueOperation::FinalizeExactAccumulator, - }, - _ => PostAsapOperatorPayload::Binary { - operator: BinaryOperator { - kind: kind.clone(), - vector_match: None, - checked_relative_division: false, - checked_finite_division: false, + 0 | 1 => PhysicalASAPOperatorPayload::SummaryMerge, + 2 | 3 => PhysicalASAPOperatorPayload::FinalizeExactAccumulator, + _ => PhysicalASAPOperatorPayload::Relational { + operator: planner_types::ir::export::NonASAPOpKind::BinaryOp { + operator: BinaryOperator { + kind: kind.clone(), + vector_match: None, + checked_relative_division: false, + checked_finite_division: false, + }, + return_bool: false, }, }, }, @@ -387,9 +407,9 @@ fn stored_series_readouts_support_filters_and_sets() { (3, 4, EdgeRole::Right), ] .into_iter() - .map(|(producer, consumer, role)| PostAsapDAGEdge { - producer: PostAsapNodeId(producer), - consumer: PostAsapNodeId(consumer), + .map(|(producer, consumer, role)| PhysicalASAPDAGEdge { + producer: planner_types::ir::export::LogicalASAPNodeId(producer), + consumer: planner_types::ir::export::LogicalASAPNodeId(consumer), role, intermediate_schema: nodes[producer as usize].output_schema.clone(), data_state: nodes[producer as usize].output_state, @@ -397,10 +417,10 @@ fn stored_series_readouts_support_filters_and_sets() { window: WindowEdgeCompatibility::NotApplicable, }) .collect(); - let dag = PostAsapDAG { + let dag = PhysicalASAPDAG { nodes, edges, - root: PostAsapNodeId(4), + roots: vec![planner_types::ir::export::LogicalASAPNodeId(4)], }; let physical_dag = compile( &dag, diff --git a/crates/asap-physical-operators/tests/promql_fallback.rs b/crates/asap-physical-operators/tests/promql_fallback.rs index 45b3526f6..c8aef869c 100644 --- a/crates/asap-physical-operators/tests/promql_fallback.rs +++ b/crates/asap-physical-operators/tests/promql_fallback.rs @@ -1,27 +1,34 @@ //! A retained PromQL sub-DAG (`Fallback`) compiles from its typed expression. //! The deployment supplies only its selector's raw series; expected values are //! hand-computed with Prometheus semantics. +mod common; use asap_physical_operators::{ operators::Operator, physical_planner::{compile, promql_fallback, promql_rows, CompiledPhysicalDAG, InputContract}, runtime::{Limits, RunContext, Scope}, values::{Batch, Value}, }; +use common::compile_physical_asap_dag; use futures::{executor::block_on, StreamExt}; +use planner_types::ir::export::PhysicalASAPDAG; use planner_types::{ - post_asap::{execution_data_state::lift_plain, *}, - pre_asap::QueryExpr, - types::AccuracyTarget, - workload::*, + post_asap::execution_data_state::lift_plain, types::AccuracyTarget, workload::*, }; use std::{collections::BTreeMap, rc::Rc}; /// Bare selectors look back one ingestion interval: 60s. -fn parse(query: &str) -> QueryExpr { +fn parse(query: &str) -> Rc { parse_with(query, AccuracyTarget::Exact) } -fn parse_with(query: &str, accuracy: AccuracyTarget) -> QueryExpr { +fn parse_with(query: &str, accuracy: AccuracyTarget) -> Rc { + match parse_root(query, accuracy) { + planner_types::ir::QueryRoot::Operator(node) => node, + _ => panic!("expected operator query"), + } +} + +fn parse_root(query: &str, accuracy: AccuracyTarget) -> planner_types::ir::QueryRoot { let workload = PlanningWorkload { query_workload: QueryWorkload { language: QueryLanguage::PromQL, @@ -46,24 +53,18 @@ fn parse_with(query: &str, accuracy: AccuracyTarget) -> QueryExpr { ..Default::default() }), }; - asap_frontend_promql::lower_promql_workload(&workload, 0) + asap_frontend_promql::lower_promql_query_workload(&workload, 0) .unwrap() .remove(0) } -fn lower(query: &str) -> QueryExpr { +fn lower(query: &str) -> Rc { promql_rows::with_series_identity(&parse(query)).unwrap() } /// The whole query retained as one pre-ASAP node. -fn fallback_dag(expression: QueryExpr) -> PostAsapDAG { - let schema = lift_plain(&expression.output_schema().unwrap()); - compile_post_asap_dag(&Rc::new(SummaryNode { - expr: SummaryExpr::KeepPreAsap(Rc::new(expression)), - schema, - guarantee: None, - })) - .unwrap() +fn fallback_dag(expression: Rc) -> PhysicalASAPDAG { + compile_physical_asap_dag(&expression).unwrap() } /// `(labels, seconds, value)`. `labels` is `k=v,...`, or a bare `job` value. @@ -82,13 +83,14 @@ fn labels(spec: &str) -> BTreeMap { } /// The metric a selector reads. -fn metric(selector: &QueryExpr) -> String { - match selector { - QueryExpr::Scan { +fn metric(selector: &planner_types::ir::OperatorNode) -> String { + match selector.expect_non_asap() { + planner_types::ir::NonASAPOp::Scan { source: planner_types::pre_asap::Source::TimeSeries { metric }, .. } => metric.clone(), - QueryExpr::TimeRange { child, .. } | QueryExpr::TimeShift { child, .. } => metric(child), + planner_types::ir::NonASAPOp::TimeRange { child, .. } + | planner_types::ir::NonASAPOp::TimeShift { child, .. } => metric(child), other => panic!("not a selector: {other:?}"), } } @@ -99,8 +101,11 @@ fn compile_query(query: &str) -> Result { } /// Compile a DAG whose root is the Fallback computing `expression`. -fn compile_dag(expression: &QueryExpr, dag: &PostAsapDAG) -> Result { - let root = u64::from(dag.root.0); +fn compile_dag( + expression: &planner_types::ir::OperatorNode, + dag: &PhysicalASAPDAG, +) -> Result { + let root = u64::from(dag.roots[0].0); let inputs = promql_fallback::raw_series(expression) .map_err(|e| e.to_string())? .into_iter() @@ -124,14 +129,26 @@ fn evaluate( metrics: &[(&str, &[Sample])], at: i64, ) -> Result, i64, f64)>, String> { - let expression = lower(query); - evaluate_dag(&expression, &fallback_dag(expression.clone()), metrics, at) + match parse_root(query, AccuracyTarget::Exact) { + planner_types::ir::QueryRoot::Operator(expression) => { + let expression = + promql_rows::with_series_identity(&expression).map_err(|e| e.to_string())?; + evaluate_dag(&expression, &fallback_dag(expression.clone()), metrics, at) + } + planner_types::ir::QueryRoot::Scalar(expr) => { + let expr = expr + .map_operator_refs(&mut |node| promql_rows::with_series_identity(node).unwrap()); + let (program, selectors) = + promql_fallback::compile_scalar_root(&expr).map_err(|e| e.to_string())?; + execute_program(program, selectors, metrics, at, None) + } + } } #[allow(clippy::type_complexity)] fn evaluate_dag( - expression: &QueryExpr, - dag: &PostAsapDAG, + expression: &planner_types::ir::OperatorNode, + dag: &PhysicalASAPDAG, metrics: &[(&str, &[Sample])], at: i64, ) -> Result, i64, f64)>, String> { @@ -140,15 +157,26 @@ fn evaluate_dag( #[allow(clippy::type_complexity)] fn evaluate_dag_with_range( - expression: &QueryExpr, - dag: &PostAsapDAG, + expression: &planner_types::ir::OperatorNode, + dag: &PhysicalASAPDAG, metrics: &[(&str, &[Sample])], at: i64, bounds: Option<(i64, i64)>, ) -> Result, i64, f64)>, String> { let program = compile_dag(expression, dag)?; - let mut sources = BTreeMap::new(); let selectors = promql_fallback::raw_series(expression).unwrap(); + execute_program(program, selectors, metrics, at, bounds) +} + +#[allow(clippy::type_complexity)] +fn execute_program( + program: CompiledPhysicalDAG, + selectors: Vec, + metrics: &[(&str, &[Sample])], + at: i64, + bounds: Option<(i64, i64)>, +) -> Result, i64, f64)>, String> { + let mut sources = BTreeMap::new(); for (i, (selector, schema)) in selectors.into_iter().enumerate() { let name = metric(&selector); let rows = metrics @@ -423,12 +451,15 @@ fn dense_subquery_grids_are_rejected() { fn raw_series_contract_is_explicit() { let expression = lower("rate(m[5m])"); let dag = fallback_dag(expression.clone()); - let root = u64::from(dag.root.0); + let root = u64::from(dag.roots[0].0); let [(selector, schema)] = promql_fallback::raw_series(&expression) .unwrap() .try_into() .unwrap(); - assert!(matches!(selector, QueryExpr::TimeRange { .. })); + assert!(matches!( + selector.expect_non_asap(), + planner_types::ir::NonASAPOp::TimeRange { .. } + )); let missing = compile(&dag, BTreeMap::new(), &[root]).err().unwrap(); assert!(missing.to_string().contains("raw series input")); let mut wrong = (*schema).clone(); @@ -445,54 +476,31 @@ fn raw_series_contract_is_explicit() { // A consumed bare selector is raw range rows for its consumer; it is not // turned into instant selection. let selector = lower("m"); - let schema = lift_plain(&selector.output_schema().unwrap()); - let node = |id, payload| PostAsapDAGNode { - id: PostAsapNodeId(id), - payload, - output_state: ExecutionDataState::QUERY_ROWS, - output_schema: schema.clone(), - guarantee: None, - }; - let consumed = PostAsapDAG { - nodes: vec![ - node( - 0, - PostAsapOperatorPayload::Fallback { - expression: selector.clone(), - }, - ), - node( - 1, - PostAsapOperatorPayload::Value { - operation: ValueOperation::Limit { - n: 1, - offset: 0, - partition_by: Default::default(), - }, - }, - ), - ], - edges: vec![PostAsapDAGEdge { - producer: PostAsapNodeId(0), - consumer: PostAsapNodeId(1), - role: EdgeRole::Input, - intermediate_schema: schema.clone(), - data_state: ExecutionDataState::QUERY_ROWS, - grouping: GroupingEdgeCompatibility::NotApplicable, - window: WindowEdgeCompatibility::NotApplicable, - }], - root: PostAsapNodeId(1), - }; + let _schema = lift_plain(&selector.schema.clone()); + let consumed = planner_types::ir::OperatorNode::new_shared( + planner_types::ir::Operator::NonASAP(planner_types::ir::NonASAPOp::Limit { + n: Some(1), + offset: 0, + partition_by: Default::default(), + child: selector.clone(), + }), + ) + .unwrap(); + let consumed = fallback_dag(consumed.clone()); let raw = promql_fallback::raw_series(&selector).unwrap().remove(0).1; assert!(compile( &consumed, BTreeMap::from([( - promql_fallback::raw_series_input(0, 0), + promql_fallback::raw_series_input(u64::from(consumed.roots[0].0), 0), InputContract::bounded(raw) )]), - &[1], + &consumed + .roots + .iter() + .map(|r| u64::from(r.0)) + .collect::>() ) - .is_err()); + .is_ok()); // Implicit subquery resolution belongs to the deployment's evaluation interval. assert!(compile_query("max_over_time(m[5m:])").is_err()); } @@ -1231,9 +1239,8 @@ fn histogram_quantile_selection_keeps_the_exact_fallback() { "histogram_quantile(0.5, x_bucket)", "histogram_quantile(0.5, sum by (le, job) (x_bucket))", ] { - let root = Rc::new( - promql_rows::with_series_identity(&parse_with(query, target.clone())).unwrap(), - ); + let root = + promql_rows::with_series_identity(&parse_with(query, target.clone())).unwrap(); let space = search_workload_with_targets( vec![(query, root.clone(), Some(target.clone()))], &default_strategies(), @@ -1243,8 +1250,7 @@ fn histogram_quantile_selection_keeps_the_exact_fallback() { let candidates = &space.candidates_for_target(planned).unwrap().candidates; assert!( candidates.iter().all(|c| matches!(&c.replacement, - Replacement::Summary(node) if matches!(&node.expr, - SummaryExpr::KeepPreAsap(e) if **e == *root))), + Replacement::SubDAG(node) if !node.contains_asap() && node.operator == root.operator)), "{query}: {candidates:?}" ); let selected = space @@ -1252,7 +1258,7 @@ fn histogram_quantile_selection_keeps_the_exact_fallback() { .assemble_selected_dag(planned) .unwrap() .unwrap(); - let dag = compile_post_asap_dag(&selected).unwrap(); + let dag = compile_physical_asap_dag(&selected).unwrap(); let rows = evaluate_dag(&root, &dag, &[("x_bucket", &samples)], 60).unwrap(); let values: Vec<_> = rows.iter().map(|(_, _, v)| *v).collect(); assert_eq!(values, vec![1.75], "{query} {target:?}"); @@ -1285,7 +1291,7 @@ fn nonfinite_literals_round_trip_in_plans() { ] { let expression = lower(query); let json = serde_json::to_vec(&expression).unwrap(); - let restored: QueryExpr = serde_json::from_slice(&json).unwrap(); + let restored: Rc = serde_json::from_slice(&json).unwrap(); let result = evaluate_dag(&restored, &fallback_dag(restored.clone()), &[], 60).unwrap(); assert_eq!(result.len(), 1); if expected.is_nan() { @@ -1579,7 +1585,7 @@ fn subquery_label_uniqueness_is_checked_per_evaluation_step() { #[test] fn logical_nonfinite_quantile_parameter_round_trips() { let expression = lower("histogram_quantile(NaN, x_bucket)"); - let restored: QueryExpr = + let restored: Rc = serde_json::from_slice(&serde_json::to_vec(&expression).unwrap()).unwrap(); let samples = buckets(&[("job=a", HISTOGRAM)]); let result = evaluate_dag( @@ -1592,3 +1598,56 @@ fn logical_nonfinite_quantile_parameter_round_trips() { assert_eq!(result.len(), 1); assert!(result[0].2.is_nan()); } + +/// The proposal's pointwise projections preserve names only for unary minus. +#[test] +fn pointwise_projection_names_and_dynamic_parameters() { + let samples = [("job=a", 300, -2.5)]; + assert_eq!( + labeled("-m", &[("m", &samples)], 300), + [("__name__=m,job=a".into(), 2.5)] + ); + assert_eq!( + labeled("abs(m)", &[("m", &samples)], 300), + [("job=a".into(), 2.5)] + ); + assert_eq!( + run("round(m, scalar(vector(2)))", &samples, 300).unwrap(), + [("a".into(), 300_000, -2.0)] + ); + assert_eq!( + run("clamp(m, time()-301, time())", &samples, 300).unwrap(), + [("a".into(), 300_000, -1.0)] + ); + assert!(run("clamp(m, 2, 1)", &samples, 300).unwrap().is_empty()); + assert_eq!( + run("year(m)", &[("a", 300, 0.0)], 300).unwrap(), + [("a".into(), 300_000, 1970.0)] + ); + assert_eq!( + run("hour()", &[], 3600).unwrap(), + [("".into(), 3_600_000, 1.0)] + ); +} + +/// Execute every PromQL root/conversion example in the scalar design document. +#[test] +fn scalar_design_document_examples_execute() { + let samples = [("job=a", 300, 1.0), ("job=b", 300, 2.0)]; + for (query, expected) in [ + ("2", 2.0), + ("time()", 300.0), + ("vector(time())", 300.0), + ("scalar(sum(up)) + 1", 4.0), + ] { + let root = parse_root(query, AccuracyTarget::Exact); + root.validate_structure().unwrap(); + let output = evaluate(query, &[("up", &samples)], 300).unwrap(); + assert_eq!(output.len(), 1, "{query}"); + assert_eq!(output[0].2, expected, "{query}"); + } + assert_eq!( + labeled("up * 2", &[("up", &samples)], 300), + [("job=a".into(), 2.0), ("job=b".into(), 4.0)] + ); +} diff --git a/crates/asap-physical-operators/tests/promql_values.rs b/crates/asap-physical-operators/tests/promql_values.rs index e7deb78b1..35b9f2c0b 100644 --- a/crates/asap-physical-operators/tests/promql_values.rs +++ b/crates/asap-physical-operators/tests/promql_values.rs @@ -1,4 +1,6 @@ //! Compile, persist and rebind dynamic-label computation without deployment lowering. +use asap_physical_operators::expressions::binary::{BinaryOpKind, BinaryOperator}; + use asap_physical_operators::{ operators::Operator, physical_planner::{promql_values::*, CompiledPhysicalDAG, Source}, @@ -7,6 +9,7 @@ use asap_physical_operators::{ }; use futures::{executor::block_on, StreamExt}; use planner_types::pre_asap::{AggIntent, ColumnRef, GroupKeys}; + use std::collections::BTreeMap; fn row(labels: &[(&str, &str)], value: f64) -> Vec { @@ -213,10 +216,7 @@ fn composed_ensemble_shares_a_producer_across_roots() { runtime::{Input, OutputStream}, values::SchemaRef, }; - use planner_types::{ - post_asap::BinaryOperator, - pre_asap::{ArithmeticOpKind, BinaryOpKind}, - }; + use planner_types::pre_asap::ArithmeticOpKind; struct Counted { source: Operator, starts: std::rc::Rc>, @@ -325,10 +325,7 @@ fn compiled_constant_needs_no_deployment_source() { // arithmetic or bool comparisons remove the metric name. #[test] fn scalar_broadcast_rejects_colliding_result_labels_after_recovery() { - use planner_types::{ - post_asap::BinaryOperator, - pre_asap::{ArithmeticOpKind, BinaryOpKind, CompareOpKind}, - }; + use planner_types::pre_asap::{ArithmeticOpKind, CompareOpKind}; for left_scalar in [false, true] { for names in [["a", "a"], ["a", "b"]] { for (kind, return_bool) in [ @@ -398,10 +395,10 @@ fn scalar_broadcast_rejects_colliding_result_labels_after_recovery() { ); } -// Persisted exact readout DAGs, rather than the storage adapter, merge panes, +// Persisted exact evaluation graphs, rather than the storage adapter, merge panes, // finalize each population, and preserve the requested metric-name semantics. #[test] -fn exact_state_readouts_recover_and_finalize_panes() { +fn exact_state_evaluations_recover_and_finalize_panes() { use asap_physical_operators::factory::create_planner_accumulator; use planner_types::post_asap::*; use std::sync::Arc; @@ -436,7 +433,7 @@ fn exact_state_readouts_recover_and_finalize_panes() { }) .collect(); let output = run_inputs( - compile_exact_readout(family.clone(), 60_000, preserve).unwrap(), + compile_exact_evaluation(family.clone(), 60_000, preserve).unwrap(), vec![Batch::try_new(exact_state_schema(family.clone()).unwrap(), rows).unwrap()], ) .unwrap(); @@ -483,7 +480,7 @@ fn recovered_exact_counter_uses_window_and_omits_insufficient_samples() { }) .collect(); let output = run_inputs( - compile_exact_readout(family.clone(), 60_000, false).unwrap(), + compile_exact_evaluation(family.clone(), 60_000, false).unwrap(), vec![Batch::try_new(exact_state_schema(family).unwrap(), rows).unwrap()], ) .unwrap(); diff --git a/crates/asap-physical-operators/tests/raw_scan.rs b/crates/asap-physical-operators/tests/raw_scan.rs index cf56a8682..44cdb6a6b 100644 --- a/crates/asap-physical-operators/tests/raw_scan.rs +++ b/crates/asap-physical-operators/tests/raw_scan.rs @@ -6,26 +6,33 @@ use asap_physical_operators::dag::{ Error, Limits, OutputStream, RunContext, Scope, }; use futures::{executor::block_on, stream, StreamExt}; -use planner_types::pre_asap::Schema; +use planner_types::ir::export::NonASAPOpKind as ValueOperation; +use planner_types::ir::export::{ + EdgeRole, GroupingEdgeCompatibility, PhysicalASAPDAG, PhysicalASAPDAGEdge, PhysicalASAPDAGNode, + PhysicalASAPOperatorPayload, WindowEdgeCompatibility, +}; +use planner_types::ir::Predicate; use planner_types::{ post_asap::*, - pre_asap::{DataType, Field, GroupKeys, Predicate, QueryExpr, Source}, + pre_asap::{DataType, Field, GroupKeys, Source}, }; use std::{ collections::BTreeMap, - rc::Rc, sync::{ atomic::{AtomicUsize, Ordering}, Arc, }, }; -fn fixture() -> (QueryExpr, SchemaRef, Vec) { - let schema = - planner_types::pre_asap::Schema::new(vec![Field::plain("value", DataType::Int64, true)]); - let output = Arc::new(Schema { - closed: true, +fn fixture() -> (planner_types::ir::NonASAPOp, SchemaRef, Vec) { + let schema = planner_types::pre_asap::Schema::new(vec![planner_types::pre_asap::Field::plain( + "value", + DataType::Int64, + true, + )]); + let output = Arc::new(planner_types::pre_asap::Schema { unique_keys: vec![], + closed: false, fields: vec![Field { table: None, name: "value".into(), @@ -34,13 +41,13 @@ fn fixture() -> (QueryExpr, SchemaRef, Vec) { }], time_index: None, }); - let scan = QueryExpr::Scan { + let scan = planner_types::ir::NonASAPOp::Scan { source: Source::Table { table_ref: "numbers".into(), }, - predicates: vec![Predicate(Rc::new(QueryExpr::IsNotNull(Rc::new( - QueryExpr::Column(0), - ))))], + predicates: vec![Predicate(planner_types::ir::ScalarExpr::IsNotNull( + Box::new(planner_types::ir::ScalarExpr::Column(0)), + ))], schema, }; let batches = vec![ @@ -57,32 +64,44 @@ fn fixture() -> (QueryExpr, SchemaRef, Vec) { ]; (scan, output, batches) } -fn plan(scan: QueryExpr, schema: &SchemaRef, state: ExecutionDataState) -> PostAsapDAG { - let node = |id, payload| PostAsapDAGNode { - id: PostAsapNodeId(id), +fn plan( + scan: planner_types::ir::NonASAPOp, + schema: &SchemaRef, + state: ExecutionDataState, +) -> PhysicalASAPDAG { + let node = |id, payload| PhysicalASAPDAGNode { + coverage: None, + id: planner_types::ir::export::LogicalASAPNodeId(id), payload, output_state: state, output_schema: (**schema).clone(), guarantee: None, }; - let edge = |producer, consumer| PostAsapDAGEdge { - producer: PostAsapNodeId(producer), - consumer: PostAsapNodeId(consumer), + let edge = |producer, consumer| PhysicalASAPDAGEdge { + producer: planner_types::ir::export::LogicalASAPNodeId(producer), + consumer: planner_types::ir::export::LogicalASAPNodeId(consumer), role: EdgeRole::Input, intermediate_schema: (**schema).clone(), data_state: state, grouping: GroupingEdgeCompatibility::NotApplicable, window: WindowEdgeCompatibility::NotApplicable, }; - PostAsapDAG { + PhysicalASAPDAG { nodes: vec![ - node(0, PostAsapOperatorPayload::Fallback { expression: scan }), + node( + 0, + PhysicalASAPOperatorPayload::Relational { + operator: planner_types::ir::export::NonASAPOpKind::from_op(&scan, &mut |_| { + panic!("no plan refs") + }), + }, + ), node( 1, - PostAsapOperatorPayload::Value { - operation: ValueOperation::Sort { - keys: vec![planner_types::pre_asap::SortKey { - expr: QueryExpr::Column(0), + PhysicalASAPOperatorPayload::Relational { + operator: ValueOperation::Sort { + keys: vec![planner_types::ir::export::WireSortKey { + expr: planner_types::ir::export::WireScalarExpr::Column(0), ascending: false, nulls_first: false, }], @@ -92,9 +111,9 @@ fn plan(scan: QueryExpr, schema: &SchemaRef, state: ExecutionDataState) -> PostA ), node( 2, - PostAsapOperatorPayload::Value { - operation: ValueOperation::Limit { - n: 2, + PhysicalASAPOperatorPayload::Relational { + operator: ValueOperation::Limit { + n: Some(2), offset: 0, partition_by: GroupKeys::by(vec![]), }, @@ -102,7 +121,7 @@ fn plan(scan: QueryExpr, schema: &SchemaRef, state: ExecutionDataState) -> PostA ), ], edges: vec![edge(0, 1), edge(1, 2)], - root: PostAsapNodeId(2), + roots: vec![planner_types::ir::export::LogicalASAPNodeId(2)], } } fn registry(source: Arc) -> DataSources { @@ -223,17 +242,27 @@ fn lazy_open_shared_producer_and_cancellation() { #[test] fn binding_errors_and_reader_errors_are_not_empty_results() { let (mut scan, schema, _) = fixture(); - assert!(DataSources::default().bind(&scan).is_err()); + assert!(DataSources::default() + .bind(&planner_types::ir::OperatorNode::with_schema( + planner_types::ir::Operator::NonASAP(scan.clone()), + scan.output_schema().unwrap() + )) + .is_err()); let opened = Arc::new(AtomicUsize::new(0)); let sources = registry(Arc::new(CountingSource { schema: schema.clone(), opened: opened.clone(), fail: true, })); - if let QueryExpr::Scan { predicates, .. } = &mut scan { - predicates.push(Predicate(Rc::new(QueryExpr::Column(0)))); + if let planner_types::ir::NonASAPOp::Scan { predicates, .. } = &mut scan { + predicates.push(Predicate(planner_types::ir::ScalarExpr::Column(0))); } - assert!(sources.bind(&scan).is_err()); + assert!(sources + .bind(&planner_types::ir::OperatorNode::with_schema( + planner_types::ir::Operator::NonASAP(scan.clone()), + scan.output_schema().unwrap() + )) + .is_err()); assert_eq!(opened.load(Ordering::SeqCst), 0); let (scan, _, _) = fixture(); let plan = plan(scan, &schema, ExecutionDataState::QUERY_ROWS); @@ -297,19 +326,23 @@ fn schema_drift_and_memory_limits_fail_the_scan() { #[test] fn empty_sources_and_three_valued_predicates() { use planner_types::pre_asap::{CompareOpKind, ScalarValue}; + let (mut scan, schema, batches) = fixture(); - if let QueryExpr::Scan { + if let planner_types::ir::NonASAPOp::Scan { predicates, source, .. } = &mut scan { *source = Source::TimeSeries { metric: "samples".into(), }; - *predicates = vec![Predicate(Rc::new(QueryExpr::Compare { - left: Rc::new(QueryExpr::Column(0)), + *predicates = vec![Predicate(planner_types::ir::ScalarExpr::Compare { + semantics: planner_types::ir::ExprSemantics::Sql, + left: Box::new(planner_types::ir::ScalarExpr::Column(0)), op: CompareOpKind::Gt, - right: Rc::new(QueryExpr::Literal(ScalarValue::Int64(2))), - }))]; + right: Box::new(planner_types::ir::ScalarExpr::Literal(ScalarValue::Int64( + 2, + ))), + })]; } for (batches, expected) in [(vec![], 0), (batches, 2)] { let mut sources = DataSources::default(); diff --git a/crates/asap-physical-operators/tests/summary_projection.rs b/crates/asap-physical-operators/tests/summary_projection.rs index 8cac1cbda..f48b9c210 100644 --- a/crates/asap-physical-operators/tests/summary_projection.rs +++ b/crates/asap-physical-operators/tests/summary_projection.rs @@ -8,10 +8,14 @@ use asap_physical_operators::{ values::{Batch, Value}, }; use futures::{executor::block_on, StreamExt}; -use planner_types::pre_asap::Schema; +use planner_types::ir::export::NonASAPOpKind as ValueOperation; +use planner_types::ir::export::{ + EdgeRole, GroupingEdgeCompatibility, PhysicalASAPDAG, PhysicalASAPDAGEdge, PhysicalASAPDAGNode, + PhysicalASAPOperatorPayload, WindowEdgeCompatibility, +}; use planner_types::{ post_asap::*, - pre_asap::{ColumnRef, DataType, ProjectItem, QueryExpr}, + pre_asap::{ColumnRef, DataType}, }; use std::{collections::BTreeMap, sync::Arc}; @@ -20,9 +24,9 @@ use std::{collections::BTreeMap, sync::Arc}; #[test] fn post_asap_summary_projection_survives_recovery() { let family = FieldDataType::ExactAggregate(ExactKind::Sum, ExactParams::Sum); - let schema = Arc::new(Schema { - closed: true, + let schema = Arc::new(planner_types::pre_asap::Schema { unique_keys: vec![], + closed: false, fields: vec![ Field { table: None, @@ -39,9 +43,9 @@ fn post_asap_summary_projection_survives_recovery() { ], time_index: None, }); - let output = Schema { - closed: true, + let output = planner_types::pre_asap::Schema { unique_keys: vec![], + closed: false, fields: vec![ schema.fields[1].clone(), Field { @@ -51,24 +55,26 @@ fn post_asap_summary_projection_survives_recovery() { ], time_index: None, }; - let dag = PostAsapDAG { + let dag = PhysicalASAPDAG { nodes: vec![ - PostAsapDAGNode { - id: PostAsapNodeId(0), - payload: PostAsapOperatorPayload::SummaryMerge, + PhysicalASAPDAGNode { + coverage: None, + id: planner_types::ir::export::LogicalASAPNodeId(0), + payload: PhysicalASAPOperatorPayload::SummaryMerge, output_schema: (*schema).clone(), output_state: ExecutionDataState::INGESTION_SUMMARY, guarantee: None, }, - PostAsapDAGNode { - id: PostAsapNodeId(1), - payload: PostAsapOperatorPayload::Value { - operation: ValueOperation::Project { + PhysicalASAPDAGNode { + coverage: None, + id: planner_types::ir::export::LogicalASAPNodeId(1), + payload: PhysicalASAPOperatorPayload::Relational { + operator: ValueOperation::Project { cols: vec![1, 0] .into_iter() - .map(|index| ProjectItem { + .map(|index| planner_types::ir::export::WireProjectItem { alias: None, - expr: QueryExpr::Column(index), + expr: planner_types::ir::export::WireScalarExpr::Column(index), }) .collect(), qualifier: None, @@ -79,16 +85,16 @@ fn post_asap_summary_projection_survives_recovery() { guarantee: None, }, ], - edges: vec![PostAsapDAGEdge { - producer: PostAsapNodeId(0), - consumer: PostAsapNodeId(1), + edges: vec![PhysicalASAPDAGEdge { + producer: planner_types::ir::export::LogicalASAPNodeId(0), + consumer: planner_types::ir::export::LogicalASAPNodeId(1), role: EdgeRole::Input, intermediate_schema: (*schema).clone(), data_state: ExecutionDataState::INGESTION_SUMMARY, grouping: GroupingEdgeCompatibility::NotApplicable, window: WindowEdgeCompatibility::NotApplicable, }], - root: PostAsapNodeId(1), + roots: vec![planner_types::ir::export::LogicalASAPNodeId(1)], }; let program = compile( &dag, diff --git a/crates/asap-physical-operators/tests/weighted_topk_binding.rs b/crates/asap-physical-operators/tests/weighted_topk_binding.rs index fe79948d6..c14d16979 100644 --- a/crates/asap-physical-operators/tests/weighted_topk_binding.rs +++ b/crates/asap-physical-operators/tests/weighted_topk_binding.rs @@ -1,10 +1,11 @@ //! Planner output binds directly to the shared runtime at a declared rate-value frontier. +mod common; use asap_aware_mapping::{ accuracy::{ AccuracyEvidenceProvider, DefaultAccuracyModel, EqualSplitAllocator, PropagationStats, }, cost_model::DefaultCostModel, - Replacement, ReplacementStrategy, SketchAlgorithmStrategy, TargetSubDAG, + ASAPStrategies, Replacement, ReplacementStrategy, TargetSubDAG, }; use asap_physical_operators::dag::{ operators::Operator, @@ -12,16 +13,14 @@ use asap_physical_operators::dag::{ values::{Batch, Value}, Limits, RunContext, Scope, }; +use common::compile_physical_asap_dag; use futures::{executor::block_on, StreamExt}; -use planner_types::{ - post_asap::*, - pre_asap::{DataType, QueryExpr}, - types::AccuracyTarget, -}; +use planner_types::ir::export::{PhysicalASAPDAG, PhysicalASAPOperatorPayload}; +use planner_types::{post_asap::*, pre_asap::DataType, types::AccuracyTarget}; use std::{collections::BTreeMap, rc::Rc, sync::Arc}; struct Evidence; impl AccuracyEvidenceProvider for Evidence { - fn topk_max_distinct_items(&self, _: &QueryExpr) -> Option { + fn topk_max_distinct_items(&self, _: &planner_types::ir::OperatorNode) -> Option { Some(1000) } fn propagation_stats( @@ -63,14 +62,12 @@ fn physical_binding_does_not_impose_an_accuracy_acceptance_policy() { } fn assert_weighted_binding(evidence: &dyn AccuracyEvidenceProvider, algorithm: SketchAlgorithm) { - let root = Rc::new( - lower_promql( - "topk by(job)(2, sum by(service, job)(rate(m[1m])))", - AccuracyTarget::Epsilon(0.1), - ) - .unwrap(), - ); - let strategy = SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence( + let root = lower_promql( + "topk by(job)(2, sum by(service, job)(rate(m[1m])))", + AccuracyTarget::Epsilon(0.1), + ) + .unwrap(); + let strategy = ASAPStrategies::new_with_planning_inputs_and_evidence( &DefaultCostModel, &DefaultAccuracyModel, &EqualSplitAllocator, @@ -80,7 +77,7 @@ fn assert_weighted_binding(evidence: &dyn AccuracyEvidenceProvider, algorithm: S .replacements(&TargetSubDAG::new(&root)) .into_iter() .find_map(|candidate| match candidate.replacement { - Replacement::Summary(node) + Replacement::SubDAG(node) if candidate.rationale.contains(&format!("{algorithm:?}")) => { Some(node) @@ -88,8 +85,8 @@ fn assert_weighted_binding(evidence: &dyn AccuracyEvidenceProvider, algorithm: S _ => None, }) .unwrap(); - let dag = compile_post_asap_dag(&plan).unwrap(); - let build=dag.nodes.iter().find(|node|matches!(&node.payload,PostAsapOperatorPayload::SummaryAgg{family:FieldDataType::Sketch(kind,_),..}if kind.algorithm()==&algorithm)).unwrap(); + let dag = compile_physical_asap_dag(&plan).unwrap(); + let build=dag.nodes.iter().find(|node|matches!(&node.payload,PhysicalASAPOperatorPayload::SummaryAgg{family:FieldDataType::Sketch(kind,_),..}if kind.algorithm()==&algorithm)).unwrap(); let rate_id = dag .edges .iter() @@ -156,7 +153,7 @@ fn assert_weighted_binding(evidence: &dyn AccuracyEvidenceProvider, algorithm: S let compiled = compile( &placed, BTreeMap::from([(rate_id.0 as u64, InputContract::bounded(rates.clone()))]), - &[dag.root.0 as u64], + &[dag.roots[0].0 as u64], ) .unwrap(); let physical_dag = compiled @@ -166,7 +163,7 @@ fn assert_weighted_binding(evidence: &dyn AccuracyEvidenceProvider, algorithm: S let output = block_on(async { let mut output = Vec::new(); let mut stream = physical_dag - .execute(&[dag.root.0 as u64], context) + .execute(&[dag.roots[0].0 as u64], context) .unwrap() .remove(0); while let Some(batch) = stream.next().await { @@ -203,7 +200,7 @@ use planner_types::workload::{ pub fn lower_promql( query: &str, accuracy: AccuracyTarget, -) -> Result { +) -> Result, asap_frontend_promql::PromqlError> { let workload = PlanningWorkload { query_workload: QueryWorkload { language: QueryLanguage::PromQL, @@ -272,7 +269,7 @@ fn direct_rate_topk_exposes_heap_candidates_with_complete_series_identity() { check_direct_rate_topk(false); } -// Unreferenced labels still distinguish series throughout Rate and heap readout. +// Unreferenced labels still distinguish series throughout Rate and heap evaluation. #[test] fn direct_rate_topk_preserves_dynamic_unreferenced_labels() { check_direct_rate_topk(true); @@ -284,12 +281,16 @@ fn check_direct_rate_topk(dynamic: bool) { }; let mut logical = lower_promql("topk by(job)(2, rate(m[1m]))", AccuracyTarget::Epsilon(0.1)).unwrap(); - fn resolve_catalog(node: &mut QueryExpr) { - match node { - QueryExpr::Aggregate { child, .. } | QueryExpr::TimeRange { child, .. } => { - resolve_catalog(Rc::make_mut(child)) - } - QueryExpr::Scan { schema, .. } => { + fn resolve_catalog(node: &mut planner_types::ir::OperatorNode) { + match &mut node.operator { + planner_types::ir::Operator::NonASAP( + planner_types::ir::NonASAPOp::Aggregate { child, .. } + | planner_types::ir::NonASAPOp::TimeRange { child, .. }, + ) => resolve_catalog(Rc::make_mut(child)), + planner_types::ir::Operator::NonASAP(planner_types::ir::NonASAPOp::Scan { + schema, + .. + }) => { schema.closed = true; schema .fields @@ -301,14 +302,15 @@ fn check_direct_rate_topk(dynamic: bool) { } _ => panic!("unexpected input shape: {node:?}"), } + node.schema = node.operator.output_schema().unwrap(); } if dynamic { logical = with_series_identity(&logical).unwrap(); } else { - resolve_catalog(&mut logical); + resolve_catalog(Rc::make_mut(&mut logical)); } - let root = Rc::new(logical); - let strategy = SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence( + let root = logical; + let strategy = ASAPStrategies::new_with_planning_inputs_and_evidence( &DefaultCostModel, &DefaultAccuracyModel, &EqualSplitAllocator, @@ -322,7 +324,7 @@ fn check_direct_rate_topk(dynamic: bool) { let candidate = candidates .iter() .find_map(|candidate| match &candidate.replacement { - Replacement::Summary(node) + Replacement::SubDAG(node) if candidate.rationale.contains(&format!("{algorithm:?}")) => { Some(node) @@ -337,26 +339,25 @@ fn check_direct_rate_topk(dynamic: bool) { ) .unwrap(); assert!(matches!( - source.expr, - SummaryExpr::ValueOperation { - operation: ValueOperation::FinalizeExactAccumulator, - .. - } + source.operator, + planner_types::ir::Operator::ASAP( + planner_types::ir::ASAPOp::FinalizeExactAccumulator { .. } + ) )); assert_eq!(ranked.input_contracts().count(), 1); let encoded = String::from_utf8(serde_json::to_vec(&ranked).unwrap()).unwrap(); assert!(encoded.contains("KeyedSummaryBuild")); - assert!(encoded.contains("KeyedReadout")); + assert!(encoded.contains("KeyedEvaluation")); assert!( !encoded.contains("\"Rate\""), - "Rate must be supplied by its exact stored-state readout" + "Rate must be supplied by its exact stored-state evaluation" ); } - let dag = compile_post_asap_dag(candidate).unwrap(); + let dag = compile_physical_asap_dag(candidate).unwrap(); assert!(dag.nodes.iter().any(|node| matches!(&node.payload, - PostAsapOperatorPayload::SummaryAgg { family: FieldDataType::Sketch(kind, _), .. } if kind.algorithm() == &algorithm))); + PhysicalASAPOperatorPayload::SummaryAgg { family: FieldDataType::Sketch(kind, _), .. } if kind.algorithm() == &algorithm))); let build = dag.nodes.iter().find(|node| matches!(&node.payload, - PostAsapOperatorPayload::SummaryAgg { family: FieldDataType::Sketch(kind, _), .. } if kind.algorithm() == &algorithm)).unwrap(); + PhysicalASAPOperatorPayload::SummaryAgg { family: FieldDataType::Sketch(kind, _), .. } if kind.algorithm() == &algorithm)).unwrap(); let input_id = dag .edges .iter() @@ -377,8 +378,8 @@ fn check_direct_rate_topk(dynamic: bool) { .find(|node| { matches!( &node.payload, - PostAsapOperatorPayload::Fallback { - expression: QueryExpr::TimeRange { .. } + PhysicalASAPOperatorPayload::Relational { + operator: planner_types::ir::export::NonASAPOpKind::TimeRange { .. } } ) }) @@ -390,7 +391,7 @@ fn check_direct_rate_topk(dynamic: bool) { u64::from(raw.id.0), InputContract::bounded(raw_schema.clone()), )]), - &[u64::from(dag.root.0)], + &[u64::from(dag.roots[0].0)], ) .unwrap(); let bytes = serde_json::to_vec(&raw_compiled).unwrap(); @@ -475,7 +476,7 @@ fn check_direct_rate_topk(dynamic: bool) { let mut raw_scores = block_on(async { let mut scores = Vec::new(); let mut stream = physical_dag - .execute(&[u64::from(dag.root.0)], context) + .execute(&[u64::from(dag.roots[0].0)], context) .unwrap() .remove(0); while let Some(batch) = stream.next().await { @@ -525,7 +526,7 @@ fn check_direct_rate_topk(dynamic: bool) { u64::from(input_id.0), InputContract::bounded(schema.clone()), )]), - &[u64::from(dag.root.0)], + &[u64::from(dag.roots[0].0)], ) .unwrap(); for (time, values, expected) in [ @@ -591,7 +592,7 @@ fn check_direct_rate_topk(dynamic: bool) { let mut scores = block_on(async { let mut scores = vec![]; let mut stream = physical_dag - .execute(&[u64::from(dag.root.0)], context) + .execute(&[u64::from(dag.roots[0].0)], context) .unwrap() .remove(0); while let Some(batch) = stream.next().await { @@ -634,7 +635,7 @@ fn spatial_topk_exposes_signed_heap_candidate_over_complete_snapshot() { }; let logical = lower_promql("topk by(job)(1, m)", AccuracyTarget::Epsilon(0.1)).unwrap(); let root = Rc::new(with_series_identity(&logical).unwrap()); - let strategy = SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence( + let strategy = ASAPStrategies::new_with_planning_inputs_and_evidence( &DefaultCostModel, &DefaultAccuracyModel, &EqualSplitAllocator, @@ -649,21 +650,21 @@ fn spatial_topk_exposes_signed_heap_candidate_over_complete_snapshot() { let selected = candidates .iter() .find_map(|candidate| match &candidate.replacement { - Replacement::Summary(node) if candidate.rationale.contains("CountSketchWithHeap") => { + Replacement::SubDAG(node) if candidate.rationale.contains("CountSketchWithHeap") => { Some(node) } _ => None, }) .expect("signed spatial TopK must expose CountSketch with heap"); - let dag = compile_post_asap_dag(selected).unwrap(); + let dag = compile_physical_asap_dag(selected).unwrap(); let raw = dag .nodes .iter() .find(|node| { matches!( &node.payload, - PostAsapOperatorPayload::Fallback { - expression: QueryExpr::TimeRange { .. } + PhysicalASAPOperatorPayload::Relational { + operator: planner_types::ir::export::NonASAPOpKind::TimeRange { .. } } ) }) @@ -672,11 +673,11 @@ fn spatial_topk_exposes_signed_heap_candidate_over_complete_snapshot() { let program = compile( &dag, BTreeMap::from([(u64::from(raw.id.0), InputContract::bounded(schema.clone()))]), - &[u64::from(dag.root.0)], + &[u64::from(dag.roots[0].0)], ) .unwrap(); let snapshot_program = - asap_physical_operators::physical_planner::promql_rows::compile_current_series_readout( + asap_physical_operators::physical_planner::promql_rows::compile_current_series_evaluation( selected, ) .unwrap(); @@ -684,7 +685,7 @@ fn spatial_topk_exposes_signed_heap_candidate_over_complete_snapshot() { serde_json::from_slice(&serde_json::to_vec(&snapshot_program).unwrap()).unwrap(); assert!(!encoded.to_string().contains("CurrentSeries")); assert!(encoded.to_string().contains("KeyedSummaryBuild")); - assert!(encoded.to_string().contains("KeyedReadout")); + assert!(encoded.to_string().contains("KeyedEvaluation")); for (values, expected, score) in [ ([100., 20.], "a", 100.), ([1., 20.], "b", 20.), @@ -759,102 +760,56 @@ fn spatial_topk_exposes_signed_heap_candidate_over_complete_snapshot() { } } -/// Deployment-side lifecycle choice: every summary state of `candidate` is -/// continuously maintained, and the chosen lifecycles set execution timing. -fn continuously_maintained_dag(candidate: &Rc) -> PostAsapDAG { - use asap_aware_mapping::{ - cost_model::{Cost, CostModel}, - enumerate_summary_maintenance_lifecycles, CostRate, Horizon, - SummaryMaintenanceCapabilities, SummaryMaintenanceLifecycleCapabilities, - SummaryMaintenanceLifecycleCostInputs, WorkloadDemand, - }; - use planner_types::workload::{ - DataArrival, Rate, RepeatedDemand, RepeatingEntry, RepetitionInterval, - }; - struct Costed; - impl CostModel for Costed { - fn rank_candidates( - &self, - _: &planner_types::pre_asap::agg_intent::AggIntent, - candidates: &[SketchAlgorithm], - ) -> Vec { - candidates.to_vec() - } - fn summary_maintenance_lifecycle_cost_inputs( - &self, - _: &SummaryNode, - ) -> SummaryMaintenanceLifecycleCostInputs { - SummaryMaintenanceLifecycleCostInputs { - build_cost: Some(Cost(10.)), - maintenance_cost_per_update: Some(Cost(1.)), - summary_read_cost: Some(Cost(1.)), - retention_cost_rate: Some(CostRate(0.1)), - retirement_cost: Some(Cost(1.)), - } - } - fn summary_maintenance_capabilities( - &self, - _: &SummaryNode, - ) -> SummaryMaintenanceCapabilities { - SummaryMaintenanceCapabilities { - incremental_update: true, - merge: true, - delete: true, - } - } - } - const NOW_MS: u64 = 1_000_000; - let queries = QueryWorkload { - language: QueryLanguage::PromQL, - query_batch: None, - repeating_queries: Some(vec![RepeatingEntry { - query: Query("topk by(job)(2, rate(m[1m]))".into()), - demand: RepeatedDemand::FixedInterval(RepetitionInterval(60_000)), - requirements: QueryRequirements::default(), - predictability: Predictability::Predictable { known_at: None }, - time_selection: TimeSelection::default(), - }]), - }; - let data = DataWorkload { - arrival: DataArrival::ContinuouslyIngesting, - ingestion_rate: WorkloadEvidence { - value: Some(Rate(1.)), - source: planner_types::workload::EvidenceSource::Observed, - observed_at_ms: Some(NOW_MS), - valid_for_ms: Some(60_000), - }, - ..Default::default() - }; - let lifecycles = enumerate_summary_maintenance_lifecycles( - Rc::clone(candidate), - WorkloadDemand::new_with_data(&queries, &data, &[0]), - NOW_MS, - Some(Horizon(100.)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &Costed, +/// Every summary state of `candidate` maintained at ingestion time, the +/// materialization a deployment would assign for a continuously served query: +/// each `SummaryAgg` and every input it consumes run at ingestion time, the +/// rest at query time. The phases are assigned on the exported DAG because +/// the candidate pins its finalize boundary to query time. +fn continuously_maintained_dag(candidate: &Rc) -> PhysicalASAPDAG { + use planner_types::ir::{apply_materialization_timings, MaterializationAssignment, TimingMemo}; + let timed = apply_materialization_timings( + candidate, + &MaterializationAssignment::all_query_time(), + &mut TimingMemo::new(), ) .unwrap(); - let choices = lifecycles - .deployments() + let dag = planner_types::ir::export::compile_physical_asap_dag(&timed).unwrap(); + let mut pending: Vec<_> = dag + .nodes .iter() - .map(|deployment| { - ( - deployment.post_asap_node_id, - SummaryMaintenanceLifecycle::ContinuouslyMaintained, - ) + .filter(|node| matches!(node.payload, PhysicalASAPOperatorPayload::SummaryAgg { .. })) + .map(|node| node.id) + .collect(); + let mut ingestion = std::collections::HashSet::new(); + while let Some(id) = pending.pop() { + if ingestion.insert(id) { + pending.extend( + dag.edges + .iter() + .filter(|edge| edge.consumer == id) + .map(|edge| edge.producer), + ); + } + } + let phases = dag + .nodes + .iter() + .map(|node| { + let timing = if ingestion.contains(&node.id) { + ExecutionTiming::IngestionTime + } else { + ExecutionTiming::QueryTime + }; + (node.id, timing) }) - .collect::>(); - lifecycles - .select(&choices) - .unwrap() - .execution_timed_dag() - .unwrap() + .collect(); + dag.with_execution_phases(&phases).unwrap() } // A maintained heap over finalized per-series Rate is the fixed-window -// placement: lifecycle timing, not a separate candidate, puts it in precompute. +// placement: materialization timing, not a separate candidate, puts it in precompute. #[test] -fn maintained_rate_heap_lifecycle_compiles_fixed_window_precompute() { +fn maintained_rate_heap_compiles_fixed_window_precompute() { use asap_physical_operators::physical_planner::{ compile_candidate, promql_rows::with_series_identity, }; @@ -864,7 +819,7 @@ fn maintained_rate_heap_lifecycle_compiles_fixed_window_precompute() { ) .unwrap(), ); - let strategy = SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence( + let strategy = ASAPStrategies::new_with_planning_inputs_and_evidence( &DefaultCostModel, &DefaultAccuracyModel, &EqualSplitAllocator, @@ -874,7 +829,7 @@ fn maintained_rate_heap_lifecycle_compiles_fixed_window_precompute() { .replacements(&TargetSubDAG::new(&root)) .into_iter() .filter_map(|candidate| match candidate.replacement { - Replacement::Summary(root) if candidate.rationale.contains("WithHeap") => Some(root), + Replacement::SubDAG(root) if candidate.rationale.contains("WithHeap") => Some(root), _ => None, }) .collect::>(); @@ -887,7 +842,7 @@ fn maintained_rate_heap_lifecycle_compiles_fixed_window_precompute() { .find(|node| { matches!( &node.payload, - PostAsapOperatorPayload::SummaryAgg { + PhysicalASAPOperatorPayload::SummaryAgg { family: FieldDataType::ExactAggregate(ExactKind::Rate, _), .. } @@ -900,7 +855,7 @@ fn maintained_rate_heap_lifecycle_compiles_fixed_window_precompute() { .find(|node| { matches!( &node.payload, - PostAsapOperatorPayload::SummaryAgg { + PhysicalASAPOperatorPayload::SummaryAgg { family: FieldDataType::Sketch(..), .. } @@ -914,7 +869,7 @@ fn maintained_rate_heap_lifecycle_compiles_fixed_window_precompute() { u64::from(state.id.0), InputContract::bounded(Arc::new(state.output_schema.clone())), )]), - &[u64::from(dag.root.0)], + &[u64::from(dag.roots[0].0)], &[u64::from(heap.id.0)], ) .unwrap(); @@ -949,7 +904,7 @@ fn maintained_rate_heap_lifecycle_compiles_fixed_window_precompute() { }) }; let (family, input, grouping) = match &state.payload { - PostAsapOperatorPayload::SummaryAgg { + PhysicalASAPOperatorPayload::SummaryAgg { family, input, grouping, diff --git a/crates/devtools/examples/canonical_examples.rs b/crates/devtools/examples/canonical_examples.rs index b0df222a3..fd4b703a1 100644 --- a/crates/devtools/examples/canonical_examples.rs +++ b/crates/devtools/examples/canonical_examples.rs @@ -1,6 +1,6 @@ // cargo run -p asap-lower --example canonical_examples // -// One-off: pretty-print the QueryExpr for one canonical query per variant, +// One-off: pretty-print the `OperatorNode` DAG for one canonical query per variant, // plus custom Join/SetOp/Dedup/CTE probes, to eyeball the actual shape. use asap_devtools::lower_promql_with_data_ingestion_interval; @@ -48,7 +48,7 @@ fn bgp_catalog() -> SqlCatalog { async fn main() { let promql_examples: &[(&str, &str)] = &[ ("Scan", "up"), - ("BinaryOp + PromqlScalarBridge", "up > 1"), + ("Filter + scalar predicate", "up > 1"), ("EvalTimestamp", "time()"), ("Aggregate", "sum(up)"), ( diff --git a/crates/devtools/src/bin/analyze_corpora.rs b/crates/devtools/src/bin/analyze_corpora.rs index 7aa87c8e7..0eebe1381 100644 --- a/crates/devtools/src/bin/analyze_corpora.rs +++ b/crates/devtools/src/bin/analyze_corpora.rs @@ -218,7 +218,7 @@ fn run_corpus(name: &str, source: &str, interval_ms: u64) -> CorpusResult { normalized_expression, structural_shape, lowered: true, - ir: Some(serde_json::to_value(&ir).expect("QueryExpr must serialize")), + ir: Some(serde_json::to_value(&ir).expect("OperatorNode must serialize")), ir_debug: Some(format!("{ir:#?}")), error: None, }), @@ -493,7 +493,7 @@ async fn run_sql_corpora(out_dir: PathBuf) { normalized_expression, structural_shape, lowered: true, - ir: Some(serde_json::to_value(&ir).expect("QueryExpr must serialize")), + ir: Some(serde_json::to_value(&ir).expect("OperatorNode must serialize")), ir_debug: Some(format!("{ir:#?}")), error: None, }), diff --git a/crates/devtools/src/bin/dag_export.rs b/crates/devtools/src/bin/dag_export.rs index b0615f017..5f2be890a 100644 --- a/crates/devtools/src/bin/dag_export.rs +++ b/crates/devtools/src/bin/dag_export.rs @@ -12,7 +12,7 @@ // `--epsilon ` is optional and applies to every query in the run: it // lowers with `AccuracyTarget::Epsilon()` instead of the default // `AccuracyTarget::Exact`. Without it, every `AggIntent` lowers exact and -// `asap_aware_mapping::SketchAlgorithmStrategy` never has a genuine sketch +// `asap_aware_mapping::ASAPStrategies` never has a genuine sketch // alternative to report — so no node ever picks up a `SketchApproximation` // note. Pass it to actually exercise that path, e.g.: // cargo run -p asap-lower --bin dag_export -- \ @@ -41,7 +41,7 @@ // `asap_types::dag_export::export_post_asap`. // // Together these surface every one of the four concrete replacement kinds: -// the sketch family `SketchAlgorithmStrategy`/`HydraGroupingStrategy` bound, +// the sketch family `ASAPStrategies`/`HydraGroupingStrategy` bound, // the CSE share/recompute choice `SharedSubDAGStrategy` found, the // workload-aware roll-up `RollupStrategy` derived, and the `avg -> // sum/count` rewrite `AvgToSumOverCountStrategy` proposes. Without @@ -88,8 +88,8 @@ use asap_aware_mapping::physical_plan_cost_model::{ }; use asap_aware_mapping::query_physical_lowering::PhysicalNodeRequest; use asap_aware_mapping::replacement::{ - default_strategies_with_evidence, search_workload, search_workload_with, Replacement, - ReplacementSubDAG, + default_strategies_with_evidence, is_logical_rewrite, search_workload, search_workload_with, + Replacement, ReplacementSubDAG, }; use asap_aware_mapping::{AccuracyEvidenceProvider, PropagationStats}; use asap_types::cost::{BaselineRef, CostAnnotation, CostInput, CostSource, CostUnit}; @@ -97,11 +97,9 @@ use asap_types::dag_export::{ self, DAGDecision, DAGNote, ExportDAG, NamedDAG, PostAsapSubstitution, TargetRejection, TargetReplacement, TargetReplacementAfter, WorkloadDAG, }; -use asap_types::post_asap::SummaryExpr; -use asap_types::post_asap::SummaryNode; +use asap_types::ir::cse::{structural_hash, HashCache}; +use asap_types::ir::OperatorNode; use asap_types::post_asap::{CompositionOperator, FieldDataType, SketchStatistic}; -use asap_types::pre_asap::cse::{structural_hash, HashCache}; -use asap_types::pre_asap::query_expr::QueryExpr; use asap_types::pre_asap::schema::{DataType, Field, Schema}; use asap_types::resources::CacheProfile; use asap_types::types::AccuracyTarget; @@ -137,7 +135,7 @@ fn parse_planner_cost_document(raw: &str) -> Result #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)] #[serde(deny_unknown_fields)] struct TargetPhysicalEvidence { - target: QueryExpr, + target: Rc, scope: ComparisonScopeEvidence, candidates: Vec, } @@ -152,7 +150,7 @@ struct ComparisonScopeEvidence { time_scope: String, lookback_ms: Option, as_of_ms: Option, - sources: Vec, + sources: Vec, #[serde(default = "CacheProfile::no_cache")] cache_profile: CacheProfile, } @@ -192,7 +190,7 @@ impl ComparisonScopeEvidence { #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)] #[serde(deny_unknown_fields)] struct QueryNodePhysicalEvidence { - logical_node: QueryExpr, + logical_node: OperatorNode, operator: asap_aware_mapping::analytical_cost::PhysicalOperator, occurrence: usize, synthetic: bool, @@ -228,11 +226,11 @@ impl CandidatePhysicalEvidence { fn matches(&self, candidate: &ReplacementSubDAG) -> bool { let actual = match (self, &candidate.replacement) { - (Self::Summary { .. }, Replacement::Summary(summary)) => { - serde_json::to_value(dag_export::export_summary(summary)) + (Self::Summary { .. }, Replacement::SubDAG(node)) if !is_logical_rewrite(node) => { + serde_json::to_value(dag_export::export(node)) } - (Self::Rewrite { .. }, Replacement::Rewrite(query)) => { - serde_json::to_value(dag_export::export(query)) + (Self::Rewrite { .. }, Replacement::SubDAG(node)) if is_logical_rewrite(node) => { + serde_json::to_value(dag_export::export(node)) } _ => return false, }; @@ -369,7 +367,7 @@ impl PlannerPhysicalPlanProvider for ExportPhysicalProvider<'_> { fn summary_physical_dag( &self, snapshot: &PhysicalEvidenceSnapshot, - _summary: &Rc, + _summary: &Rc, _target: &asap_aware_mapping::replacement::TargetSubDAG<'_>, ) -> Result { if snapshot.scope != self.target.scope.resolve()? { @@ -400,7 +398,7 @@ impl ExportPlannerCostModel<'_> { .document .targets .iter() - .filter(|entry| entry.target == **target.root); + .filter(|entry| entry.target == *target.root); let target_evidence = targets.next()?; if targets.next().is_some() { return None; @@ -429,7 +427,7 @@ impl ExportPlannerCostModel<'_> { fn annotations( &self, candidate: &ReplacementSubDAG, - target: &Rc, + target: &Rc, ) -> (CostAnnotation, CostAnnotation, CostAnnotation) { let target = asap_aware_mapping::replacement::TargetSubDAG::new(target); let Some((provider, calibration)) = self.bound(candidate, &target) else { @@ -960,12 +958,11 @@ fn parse_args_from(argv: impl Iterator) -> ParsedArgs { } } -/// Attach workload-wide replacement explanations to their exact DAG nodes. -/// `node_hash` is only a narrowing filter; `source_expr == Some(target)` is -/// the collision-safe identity check (`source_expr` is `None` only for a -/// post-ASAP-originated node inside a `--post-asap` `post_dag`, which this -/// function is never called on — every node it sees, from an ordinary -/// [`dag_export::export`], carries `Some`). +/// Attach workload-wide replacement explanations to their exact dag nodes. +/// `node_hash` is only a narrowing filter; `source_node == Some(target)` is +/// the collision-safe identity check (every node an ordinary +/// [`dag_export::export`] produces carries `Some`; the `None` arm is +/// defensive only). fn annotate_with_explanations( dag: &mut ExportDAG, explanations: &[asap_aware_mapping::ReplacementExplanation], @@ -974,7 +971,7 @@ fn annotate_with_explanations( for (i, explanation) in explanations.iter().enumerate() { for node in dag.nodes.iter_mut() { if node.hash == Some(explanation.node_hash) - && node.source_expr.as_ref() == Some(explanation.target.as_ref()) + && node.source_node.as_ref() == Some(&explanation.target) { node.notes.push(DAGNote { kind: format!("{:?}", explanation.kind), @@ -992,7 +989,7 @@ fn annotate_with_explanations( /// never disagree about which candidate won for a given target. #[allow(dead_code)] struct Winner<'a> { - target: &'a Rc, + target: &'a Rc, candidate: &'a ReplacementSubDAG, costs: (CostAnnotation, CostAnnotation, CostAnnotation), } @@ -1056,7 +1053,7 @@ fn lookup_winner( by_hash: &HashMap>, winners: &[Winner<'_>], cache: &mut HashCache, - expr: &QueryExpr, + expr: &OperatorNode, ) -> Option { let hash = structural_hash(expr, cache); by_hash @@ -1102,12 +1099,10 @@ fn target_replacement( let strategy = winner.candidate.strategy.to_string(); let before = dag_export::export(winner.target); let after = match &winner.candidate.replacement { - Replacement::Summary(node) => { - TargetReplacementAfter::Summary(dag_export::export_summary(node)) - } - Replacement::Rewrite(rewritten) => { - TargetReplacementAfter::Rewrite(dag_export::export(rewritten)) + Replacement::SubDAG(node) if is_logical_rewrite(node) => { + TargetReplacementAfter::Rewrite(dag_export::export(node)) } + Replacement::SubDAG(node) => TargetReplacementAfter::Summary(dag_export::export(node)), Replacement::ExactComposition(_) => { unreachable!("composition candidates are materialized by GlobalSelection") } @@ -1131,6 +1126,20 @@ fn target_replacement( } } +/// Is `replacement` `retain_exact`'s conservative no-op fallback — the +/// target itself, unbound, carrying only an exact "kept pre-ASAP" guarantee? +/// `ASAPStrategies` emits it for an intent with no summary +/// realization at all (`STDDEV_POP`, `AVG`, ... dispatch to +/// `Realization::PassThrough`). It is "nothing to bind here", not a +/// replacement decision. A logical rewrite (no guarantee yet) and any sub-DAG +/// with an ASAP operator are real candidates. +fn is_trivial_retain_exact(replacement: &Replacement) -> bool { + matches!( + replacement, + Replacement::SubDAG(node) if node.guarantee.is_some() && !node.contains_asap() + ) +} + /// The two additive `--post-asap` outputs — see this file's top-of-file /// usage doc for what each is for. struct PostAsapResults { @@ -1159,7 +1168,7 @@ fn raw_only_post_asap_results() -> PostAsapResults { } /// Assign collision-free, explicit identities to structurally equal nodes -/// across a set of exported query DAGs. The full canonical sub-DAG string +/// across a set of exported query graphs. The full canonical sub-DAG string /// is the equality key; the compact integer is what JSON consumers receive. /// Consequently the viewer never needs to guess identity from labels, /// hashes, or a client-side node signature. @@ -1210,7 +1219,7 @@ fn assign_workload_node_ids(dags: &mut [&mut ExportDAG]) { /// which candidate won for a given target. #[allow(dead_code)] fn run_post_asap_with_progress( - lowered_queries: &[(String, String, QueryExpr)], + lowered_queries: &[(String, String, Rc)], progress: bool, cost_model: &dyn CostModel, export_model: Option<&ExportPlannerCostModel<'_>>, @@ -1220,9 +1229,9 @@ fn run_post_asap_with_progress( if progress { eprintln!("[3/4] ASAP-aware mapping is running…"); } - let roots: Vec<(String, Rc)> = lowered_queries + let roots: Vec<(String, Rc)> = lowered_queries .iter() - .map(|(name, _, qe)| (name.clone(), Rc::new(qe.clone()))) + .map(|(name, _, qe)| (name.clone(), Rc::clone(qe))) .collect(); let strategies; let space = if let Some(evidence) = evidence { @@ -1233,28 +1242,23 @@ fn run_post_asap_with_progress( }; let selection = space.global_selection(cost_model); - // A group's top candidate can be `keep_pre_asap`'s own conservative - // fallback — `Replacement::Summary(SummaryNode { expr: - // KeepPreAsap(Rc::new(target.clone())), .. })` — the *whole target* - // wrapped as unbound, e.g. for a multi-measure/`HAVING`-bearing - // aggregate, or (the case that actually surfaces this: `STDDEV_POP`/ - // `AVG`/`VARIANCE` dispatch to `Realization::PassThrough` with no - // alternative at all, per `realizations_for_intent`'s own doc) an - // intent with no summary realization whatsoever. This isn't a - // replacement decision — it's `SketchAlgorithmStrategy` saying "nothing - // to bind here" — the identical "no-op candidate" concept - // `explanation.rs`'s own `sketch_finding_reason` already excludes from - // being reported as a finding ("a candidate list containing only the - // trivial no-op realization... isn't an opportunity, it's just the - // target's existing shape reflected back"). Filtered out here for a - // second, load-bearing reason beyond just matching that precedent: - // `export_post_asap`'s `find_winner` re-checks every node reached - // inside a spliced-in `KeepPreAsap` payload (by design, so a target - // nested underneath one still gets found) — if that payload structurally - // *is* the enclosing target, `find_winner` immediately matches the same - // winner again, forever. Treating this candidate as "no winner" (same - // as an empty candidate list) avoids ever handing `export_post_asap` a - // winner that can't help but recurse into itself. + // A group's top candidate can be `retain_exact`'s own conservative + // fallback — the *whole target* itself, unbound, carrying only an exact + // "kept pre-ASAP" guarantee (see `is_trivial_retain_exact`) — e.g. for + // a multi-measure/`HAVING`-bearing aggregate, or (the case that actually + // surfaces this: `STDDEV_POP`/`AVG`/`VARIANCE` dispatch to + // `Realization::PassThrough` with no alternative at all, per + // `realizations_for_intent`'s own doc) an intent with no summary + // realization whatsoever. This isn't a replacement decision — it's + // `ASAPStrategies` saying "nothing to bind here" — the + // identical "no-op candidate" concept `explanation.rs`'s own + // `sketch_finding_reason` already excludes from being reported as a + // finding ("a candidate list containing only the trivial no-op + // realization... isn't an opportunity, it's just the target's existing + // shape reflected back"). Treating this candidate as "no winner" (same + // as an empty candidate list) also keeps `post_dag` honest: splicing + // the target in for itself would tag every node of an unchanged sub-DAG + // with a "replacement" decision. let winners: Vec> = selection .target_selections() .filter_map(|group| { @@ -1267,10 +1271,7 @@ fn run_post_asap_with_progress( if matches!(candidate.replacement, Replacement::ExactComposition(_)) { return None; } - if matches!( - &candidate.replacement, - Replacement::Summary(node) if matches!(node.expr, SummaryExpr::KeepPreAsap(_)) - ) { + if is_trivial_retain_exact(&candidate.replacement) { return None; } Some(Winner { @@ -1318,7 +1319,7 @@ fn run_post_asap_with_progress( } let post_started = Instant::now(); let mut post_dag_cache = HashCache::new(); - let mut find_winner = |expr: &QueryExpr| -> Option { + let mut find_winner = |expr: &Rc| -> Option { let i = lookup_winner(&by_hash, &winners, &mut post_dag_cache, expr)?; let winner = &winners[i]; let (baseline_cost, selected_cost, benefit) = winner.costs.clone(); @@ -1337,11 +1338,11 @@ fn run_post_asap_with_progress( benefit: Some(benefit), }; Some(match &winners[i].candidate.replacement { - Replacement::Rewrite(rc) => PostAsapSubstitution::Rewrite { + Replacement::SubDAG(rc) if is_logical_rewrite(rc) => PostAsapSubstitution::Rewrite { replacement: Rc::clone(rc), decision, }, - Replacement::Summary(rc) => PostAsapSubstitution::Summary { + Replacement::SubDAG(rc) => PostAsapSubstitution::Summary { replacement: Rc::clone(rc), decision, }, @@ -1389,20 +1390,20 @@ fn run_post_asap_with_progress( for (name, _, qe) in lowered_queries { let dag = dag_export::export(qe); for node in &dag.nodes { - let Some(source_expr) = node.source_expr.as_ref() else { + let Some(source_node) = node.source_node.as_ref() else { continue; // never true for a plain `export` — defensive only. }; - if let Some(i) = lookup_winner(&by_hash, &winners, &mut lookup_cache, source_expr) { + if let Some(i) = lookup_winner(&by_hash, &winners, &mut lookup_cache, source_node) { replacements.push(( name.clone(), target_replacement(i as u32, node.id, &winners[i]), )); matched[i] = true; } - let hash = structural_hash(source_expr, &mut lookup_cache); + let hash = structural_hash(source_node, &mut lookup_cache); for &i in rejected_by_hash.get(&hash).into_iter().flatten() { let group = rejected_groups[i]; - if *source_expr != *group.target { + if *source_node != group.target { continue; } rejections.extend(group.rejected.iter().map(|rejected| { @@ -1465,7 +1466,7 @@ fn run_post_asap_with_progress( } #[cfg(test)] -fn run_post_asap(lowered_queries: &[(String, String, QueryExpr)]) -> PostAsapResults { +fn run_post_asap(lowered_queries: &[(String, String, Rc)]) -> PostAsapResults { run_post_asap_with_progress(lowered_queries, false, &DefaultCostModel, None, None) } @@ -1700,18 +1701,30 @@ mod tests { ExecutionMultiplicity, PhysicalDAGNode, PhysicalOperator, }; use asap_aware_mapping::physical_operator_statistics::{ - EdgeStatistics, OperatorStatistics, SourceCoverage, UnaryEdgeStatistics, + EdgeStatistics, OperatorStatistics, ScanSelection, UnaryEdgeStatistics, }; use asap_aware_mapping::query_physical_lowering::lower_query_physical_dag; use asap_devtools::PromqlError; + use asap_types::ir::NonASAPOp; use asap_types::pre_asap::{DataType, Field, Reduction, Schema, Source}; - fn lower_promql(query: &str, accuracy: AccuracyTarget) -> Result { + fn lower_promql( + query: &str, + accuracy: AccuracyTarget, + ) -> Result, PromqlError> { lower_promql_with_data_ingestion_interval(query, accuracy, 1_000) } - fn non_topk_query() -> QueryExpr { - QueryExpr::Aggregate { + fn non_topk_query() -> Rc { + let scan = OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Scan { + source: Source::Table { + table_ref: "events".into(), + }, + predicates: vec![], + schema: Schema::new(vec![Field::plain("v", DataType::Int64, false)]), + })) + .expect("scan leaf derives its schema"); + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(NonASAPOp::Aggregate { reduction: Reduction::by(vec![]), measures: vec![asap_types::pre_asap::AggIntent::Count { accuracy: AccuracyTarget::Epsilon(0.1), @@ -1719,23 +1732,18 @@ mod tests { output_names: vec![], filters: vec![], having: None, - child: Rc::new(QueryExpr::Scan { - source: Source::Table { - table_ref: "events".into(), - }, - predicates: vec![], - schema: Schema::new(vec![Field::plain("v", DataType::Int64, false)]), - }), - } + child: scan, + })) + .expect("count aggregate derives its schema") } fn fixture_raw_dag( - query: &QueryExpr, + query: &Rc, candidate: &ReplacementSubDAG, document: &PlannerCostDocument, ) -> PhysicalDAG { let model = ExportPlannerCostModel { document }; - let root = Rc::new(query.clone()); + let root = Rc::clone(query); let target = asap_aware_mapping::replacement::TargetSubDAG::new(&root); let (provider, _) = model.bound(candidate, &target).unwrap(); let snapshot = provider.capture_evidence_snapshot(&target).unwrap(); @@ -1751,7 +1759,7 @@ mod tests { let (query, candidate, mut document) = cost_fixture(); let raw = fixture_raw_dag(&query, &candidate, &document); let candidate_dag = cheap_candidate_dag(); - let root = Rc::new(query.clone()); + let root = Rc::clone(&query); let target = asap_aware_mapping::replacement::TargetSubDAG::new(&root); assert!(ExportPlannerCostModel { document: &document @@ -1914,7 +1922,7 @@ mod tests { let (query, candidate, mut document) = cost_fixture(); let raw = fixture_raw_dag(&query, &candidate, &document); let candidate_dag = cheap_candidate_dag(); - let root = Rc::new(query.clone()); + let root = Rc::clone(&query); let target = asap_aware_mapping::replacement::TargetSubDAG::new(&root); assert!(ExportPlannerCostModel { document: &document @@ -2178,7 +2186,7 @@ mod tests { time_scope: "longitudinal".into(), lookback_ms: Some(10_000), as_of_ms: Some(1_000), - sources: vec![SourceCoverage { + sources: vec![ScanSelection { source: Source::Table { table_ref: "events".into(), }, @@ -2194,7 +2202,7 @@ mod tests { EdgeStatistics { rows, bytes } } - fn query_evidence(query: &QueryExpr) -> Vec { + fn query_evidence(query: &Rc) -> Vec { let entries = RefCell::new(Vec::new()); let scope = test_scope().resolve().unwrap(); let provider = |request: PhysicalNodeRequest<'_>| { @@ -2242,7 +2250,7 @@ mod tests { }); Ok(evidence) }; - lower_query_physical_dag(&Rc::new(query.clone()), &scope, &provider).unwrap(); + lower_query_physical_dag(query, &scope, &provider).unwrap(); entries.into_inner() } @@ -2261,7 +2269,7 @@ mod tests { id: "summary-read".into(), operator: PhysicalOperator::Scan, children: vec![], - source_coverage: Some(coverage), + scan_selection: Some(coverage), output_buffer_bytes: 2_400, retained_bytes: 0, execution: ExecutionMultiplicity::PerEvaluation, @@ -2282,49 +2290,28 @@ mod tests { fn candidate_plan(candidate: &ReplacementSubDAG) -> serde_json::Value { match &candidate.replacement { - Replacement::Summary(summary) => { - serde_json::to_value(dag_export::export_summary(summary)).unwrap() - } - Replacement::Rewrite(rewrite) => { - serde_json::to_value(dag_export::export(rewrite)).unwrap() - } + Replacement::SubDAG(node) => serde_json::to_value(dag_export::export(node)).unwrap(), Replacement::ExactComposition(_) => { unreachable!("cost fixtures select directly materialized candidates") } } } - fn cost_fixture() -> (QueryExpr, ReplacementSubDAG, PlannerCostDocument) { + fn cost_fixture() -> (Rc, ReplacementSubDAG, PlannerCostDocument) { let query = non_topk_query(); - let root = Rc::new(query.clone()); + let root = Rc::clone(&query); let space = search_workload(vec![(String::from("q"), Rc::clone(&root))]); let group = space .target_subdag_candidates() - .find(|group| *group.target == query) + .find(|group| group.target == query) .expect("aggregate memo group"); let candidate = group .candidates .iter() - .find(|candidate| { - !matches!( - &candidate.replacement, - Replacement::Summary(node) - if matches!(node.expr, SummaryExpr::KeepPreAsap(_)) - ) - }) + .find(|candidate| !is_trivial_retain_exact(&candidate.replacement)) .expect("summary candidate") .clone(); - let plan = match &candidate.replacement { - Replacement::Summary(summary) => { - serde_json::to_value(dag_export::export_summary(summary)).unwrap() - } - Replacement::Rewrite(rewrite) => { - serde_json::to_value(dag_export::export(rewrite)).unwrap() - } - Replacement::ExactComposition(_) => { - unreachable!("cost fixtures select directly materialized candidates") - } - }; + let plan = candidate_plan(&candidate); let document = PlannerCostDocument { storage_io: None, handoffs: None, @@ -2339,12 +2326,14 @@ mod tests { target: query.clone(), scope: test_scope(), candidates: vec![match &candidate.replacement { - Replacement::Summary(_) => CandidatePhysicalEvidence::Summary { - plan, - query_nodes: query_evidence(&query), - physical_dag: cheap_candidate_dag(), - }, - Replacement::Rewrite(_) => CandidatePhysicalEvidence::Rewrite { + Replacement::SubDAG(node) if !is_logical_rewrite(node) => { + CandidatePhysicalEvidence::Summary { + plan, + query_nodes: query_evidence(&query), + physical_dag: cheap_candidate_dag(), + } + } + Replacement::SubDAG(_) => CandidatePhysicalEvidence::Rewrite { plan, query_nodes: query_evidence(&query), }, @@ -2365,7 +2354,7 @@ mod tests { assert_eq!(parsed.targets[0].target, query); assert!(parsed.targets[0].candidates[0].matches(&candidate)); let model = ExportPlannerCostModel { document: &parsed }; - let target_rc = Rc::new(query.clone()); + let target_rc = Rc::clone(&query); let target = asap_aware_mapping::replacement::TargetSubDAG::new(&target_rc); let (provider, calibration) = model.bound(&candidate, &target).expect("exact binding"); let estimate = PhysicalPlanCostModel::new(&provider, calibration.clone()) @@ -2373,7 +2362,7 @@ mod tests { .estimate_candidate(&candidate, &target) .unwrap(); assert!(estimate.candidate_cost < estimate.raw_cost); - let (baseline, selected, benefit) = model.annotations(&candidate, &Rc::new(query)); + let (baseline, selected, benefit) = model.annotations(&candidate, &query); assert!(baseline.value.is_some()); assert!(selected.value.is_some()); assert!(benefit.value.is_some()); @@ -2405,7 +2394,7 @@ mod tests { .unwrap() .remove("cache_profile"); let parsed = parse_planner_cost_document(&json.to_string()).unwrap(); - let target = Rc::new(query); + let target = query; let legacy = ExportPlannerCostModel { document: &parsed }.annotations(&candidate, &target); let explicit = ExportPlannerCostModel { document: &document, @@ -2426,7 +2415,7 @@ mod tests { fn cache_json_affects_ranking_and_exports_declared_evidence() { // Identical repeats hit the result cache; distinct evaluations still execute. let (query, candidate, document) = cost_fixture(); - let target_rc = Rc::new(query); + let target_rc = query; let target = asap_aware_mapping::replacement::TargetSubDAG::new(&target_rc); let no_cache = ExportPlannerCostModel { document: &document, @@ -2513,7 +2502,7 @@ mod tests { #[test] fn duplicate_target_candidate_and_query_evidence_each_fail_closed() { let (query, candidate, document) = cost_fixture(); - let target_rc = Rc::new(query); + let target_rc = query; let target = asap_aware_mapping::replacement::TargetSubDAG::new(&target_rc); let mut duplicate_target = document.clone(); @@ -2555,7 +2544,7 @@ mod tests { #[test] fn incomplete_or_unused_json_evidence_fails_closed() { let (query, candidate, document) = cost_fixture(); - let target_rc = Rc::new(query); + let target_rc = query; let target = asap_aware_mapping::replacement::TargetSubDAG::new(&target_rc); let mut missing = document.clone(); @@ -2596,7 +2585,7 @@ mod tests { physical_dag.nodes.push(physical_dag.nodes[0].clone()); let document = parse_planner_cost_document(&serde_json::to_string(&document).unwrap()) .expect("invalid physical semantics are checked by the estimator"); - let target_rc = Rc::new(query); + let target_rc = query; let target = asap_aware_mapping::replacement::TargetSubDAG::new(&target_rc); assert!(ExportPlannerCostModel { document: &document @@ -2608,18 +2597,17 @@ mod tests { #[test] fn global_selection_uses_the_cheapest_complete_physical_candidate() { let query = non_topk_query(); - let root = Rc::new(query.clone()); + let root = Rc::clone(&query); let space = search_workload(vec![(String::from("q"), Rc::clone(&root))]); let group = space .target_subdag_candidates() - .find(|group| *group.target == query) + .find(|group| group.target == query) .expect("aggregate memo group"); let candidates: Vec<_> = group .candidates .iter() .filter(|candidate| { - matches!(candidate.replacement, Replacement::Summary(ref node) - if !matches!(node.expr, SummaryExpr::KeepPreAsap(_))) + matches!(&candidate.replacement, Replacement::SubDAG(node) if node.contains_asap()) }) .take(2) .collect(); @@ -2677,7 +2665,7 @@ mod tests { let selection = space.global_selection(&model); let chosen = selection .target_selections() - .find(|selected| selected.target.as_ref() == &query) + .find(|selected| *selected.target == query) .and_then(|selected| selected.chosen) .expect("one complete physical candidate should win"); assert!(document.targets[0].candidates[1].matches(chosen)); @@ -2779,13 +2767,13 @@ mod tests { let selected_query = lower_promql("up", AccuracyTarget::Exact).unwrap(); let other_query = lower_promql("process_cpu_seconds_total", AccuracyTarget::Exact).unwrap(); let selected = ReplacementSubDAG { - replacement: Replacement::Rewrite(Rc::new(selected_query.clone())), + replacement: Replacement::SubDAG(Rc::clone(&selected_query)), strategy: "same-strategy", provenance: asap_aware_mapping::replacement::ReplacementProvenance::LogicalRewrite, rationale: String::new(), }; let other = ReplacementSubDAG { - replacement: Replacement::Rewrite(Rc::new(other_query)), + replacement: Replacement::SubDAG(other_query), strategy: "same-strategy", provenance: asap_aware_mapping::replacement::ReplacementProvenance::LogicalRewrite, rationale: String::new(), @@ -3038,8 +3026,8 @@ mod tests { .1; let q3_root = &q3.nodes[q3.root as usize]; let q4_root = &q4.nodes[q4.root as usize]; - assert!(q3_root.label.contains("Limit { n: 5,")); - assert!(q4_root.label.contains("Limit { n: 10,")); + assert!(q3_root.label.contains("Limit(5)")); + assert!(q4_root.label.contains("Limit(10)")); assert_ne!(q3_root.workload_node_id, q4_root.workload_node_id); let q3_ranked = &q3.nodes[q3_root.children[0] as usize]; let q4_ranked = &q4.nodes[q4_root.children[0] as usize]; @@ -3147,21 +3135,19 @@ mod tests { /// against real corpus queries (a `STDDEV_POP` aggregate, which — like /// `AVG` — dispatches to `Realization::PassThrough` with no /// alternative strategy of its own, so its *only* candidate is - /// `keep_pre_asap`'s conservative fallback: `Replacement::Summary` - /// wrapping the *entire target* as `SummaryExpr::KeepPreAsap`). - /// `run_post_asap` must not treat that as a real winner: splicing it - /// into `export_post_asap` would recurse forever, since `find_winner` - /// re-checks every node inside a spliced `KeepPreAsap` payload by - /// design, and this payload structurally *is* the enclosing target — a - /// fresh `find_winner` call finds the identical winner again, - /// unconditionally, every time. Filtering this shape out of `winners` - /// (same "no-op candidate" concept `explanation.rs`'s own - /// `sketch_finding_reason` already excludes from being a finding) is - /// what keeps this terminating: this test's only assertion that matters - /// is that `run_post_asap` returns at all instead of overflowing the - /// stack. + /// `retain_exact`'s conservative fallback: the *entire target* itself, + /// unbound, carrying only an exact "kept pre-ASAP" guarantee). + /// `run_post_asap` must not treat that as a real winner: under the old + /// IR, splicing it into `export_post_asap` recursed forever (the spliced + /// payload structurally *was* the enclosing target, so every fresh + /// `find_winner` call found the identical winner again). Filtering this + /// shape out of `winners` (same "no-op candidate" concept + /// `explanation.rs`'s own `sketch_finding_reason` already excludes from + /// being a finding) is what keeps this terminating and keeps the output + /// free of a fake replacement: this test asserts both that + /// `run_post_asap` returns at all and that it reports nothing. #[tokio::test] - async fn post_asap_does_not_recurse_forever_on_a_trivial_keep_pre_asap_winner() { + async fn post_asap_does_not_recurse_forever_on_a_trivial_retain_exact_winner() { let cat = default_catalog(); let stddev_query = lower_sql( "SELECT STDDEV_POP(latency) FROM metrics", @@ -3178,12 +3164,12 @@ mod tests { let results = run_post_asap(&lowered_queries); - // A trivial keep_pre_asap winner must be filtered before it ever + // A trivial retain_exact winner must be filtered before it ever // becomes a flat `TargetReplacement` — there's no real replacement // to report for a target with no alternative at all. assert!( results.replacements.is_empty(), - "a target whose only candidate is the trivial keep_pre_asap fallback \ + "a target whose only candidate is the trivial retain_exact fallback \ shouldn't produce a flat replacement entry: {:?}", results .replacements diff --git a/crates/devtools/src/bin/show_post_asap_ir.rs b/crates/devtools/src/bin/show_post_asap_ir.rs index 4b2cbf917..4565657f9 100644 --- a/crates/devtools/src/bin/show_post_asap_ir.rs +++ b/crates/devtools/src/bin/show_post_asap_ir.rs @@ -3,10 +3,11 @@ // // Lowers a batch of ad-hoc SQL/PromQL queries to pre-ASAP IR, then runs the // `asap-aware-mapping` pre-ASAP → post-ASAP binding pass and prints the -// resulting **post-ASAP IR** (the sketch-bound IR: `SummaryExpr`/`SummaryNode` -// — the concrete `SummaryKind`/`SummaryParams` committed per aggregate, or -// `KeepPreAsap` for whatever the pass left untouched). See `show_pre_asap_ir` -// for the sketch-agnostic IR one layer upstream. +// resulting **post-ASAP IR** (the sketch-bound IR: an `OperatorNode` DAG in +// which `ASAPOp` operators — the concrete summary family/params committed per +// aggregate — replace the bound aggregates, while whatever the pass left +// untouched stays a plain `NonASAPOp` sub-DAG carrying an exact guarantee). +// See `show_pre_asap_ir` for the sketch-agnostic IR one layer upstream. // // File format: one query per line, prefixed with "sql>" or "promql>". // Blank lines and lines starting with '#' are ignored. @@ -20,12 +21,12 @@ // `metrics(ts, service, region, latency, bytes)` catalog — the same table // used in cross_language.rs and topk_ir.rs. -use asap_aware_mapping::replacement::keep_pre_asap; +use asap_aware_mapping::replacement::retain_exact; use asap_aware_mapping::{ - Replacement, ReplacementStrategy, ReplacementSubDAG, SketchAlgorithmStrategy, TargetSubDAG, + ASAPStrategies, Replacement, ReplacementStrategy, ReplacementSubDAG, TargetSubDAG, }; use asap_devtools::{lower_promql_with_data_ingestion_interval, lower_sql, SqlCatalog}; -use asap_types::pre_asap::query_expr::QueryExpr; +use asap_types::ir::OperatorNode; use asap_types::pre_asap::schema::{DataType, Field, Schema}; use asap_types::types::AccuracyTarget; use std::io::Read; @@ -33,18 +34,17 @@ use std::rc::Rc; const ACCURACY: AccuracyTarget = AccuracyTarget::Epsilon(0.01); -/// `SketchAlgorithmStrategy::replacements` returns every candidate. This +/// `ASAPStrategies::replacements` returns every candidate. This /// debug tool prints all of them so callers can inspect the planner's choices. /// If the strategy has none, preserve the single pre-ASAP fallback output. -fn bind_all(expr: &QueryExpr) -> Result>, String> { - let root = Rc::new(expr.clone()); - let target = TargetSubDAG::new(&root); - let candidates = SketchAlgorithmStrategy::default_cost_model() +fn bind_all(root: &Rc) -> Result>, String> { + let target = TargetSubDAG::new(root); + let candidates = ASAPStrategies::default_cost_model() .replacements(&target) .into_iter() .filter_map(|candidate| match candidate { ReplacementSubDAG { - replacement: Replacement::Summary(node), + replacement: Replacement::SubDAG(node), .. } => Some(node), _ => None, @@ -52,7 +52,7 @@ fn bind_all(expr: &QueryExpr) -> Result>(); if candidates.is_empty() { - Ok(vec![keep_pre_asap(&root).map_err(|e| e.to_string())?]) + Ok(vec![retain_exact(root).map_err(|e| e.to_string())?]) } else { Ok(candidates) } @@ -128,7 +128,7 @@ async fn main() { Ok(candidates) => { for (index, candidate) in candidates.iter().enumerate() { println!("--- candidate {} ---", index + 1); - println!("{:#?}", candidate.expr); + println!("{:#?}", candidate.operator); } } Err(e) => println!("ERR: {e}"), @@ -149,9 +149,8 @@ mod tests { 1_000, ) .expect("query lowers to pre-ASAP IR"); - let root = Rc::new(expr.clone()); - let expected = SketchAlgorithmStrategy::default_cost_model() - .replacements(&TargetSubDAG::new(&root)) + let expected = ASAPStrategies::default_cost_model() + .replacements(&TargetSubDAG::new(&expr)) .len(); assert!(expected > 1, "fixture exposes alternative bindings"); @@ -170,14 +169,20 @@ mod tests { let candidates = bind_all(&expr).expect("binding succeeds"); assert_eq!(candidates.len(), 1); assert!(matches!( - candidates[0].expr, - asap_types::post_asap::SummaryExpr::BinaryOp { .. } + candidates[0].non_asap(), + Some(asap_types::ir::NonASAPOp::BinaryOp { .. }) )); assert!( candidates[0].guarantee.is_none(), "missing evidence must not claim a certified ratio bound" ); - asap_types::post_asap::compile_post_asap_dag(&candidates[0]) + let timed = asap_types::ir::timing::apply_materialization_timings( + &candidates[0], + &asap_types::ir::timing::MaterializationAssignment::all_query_time(), + &mut asap_types::ir::timing::TimingMemo::new(), + ) + .expect("the demo candidate has a legal default timing"); + asap_types::ir::export::compile_physical_asap_dag(&timed) .expect("the demo candidate remains executable"); } @@ -192,9 +197,9 @@ mod tests { let candidates = bind_all(&expr).expect("binding succeeds"); assert_eq!(candidates.len(), 1); - assert!(matches!( - candidates[0].expr, - asap_types::post_asap::SummaryExpr::KeepPreAsap(_) - )); + assert!( + !candidates[0].contains_asap(), + "the whole query is kept pre-ASAP (no summary bound anywhere)" + ); } } diff --git a/crates/devtools/src/bin/show_pre_asap_ir.rs b/crates/devtools/src/bin/show_pre_asap_ir.rs index 491b48ff2..bde7cfb3c 100644 --- a/crates/devtools/src/bin/show_pre_asap_ir.rs +++ b/crates/devtools/src/bin/show_pre_asap_ir.rs @@ -2,7 +2,8 @@ // (or pipe via stdin: cargo run -p asap-devtools --bin show_pre_asap_ir < queries.txt) // // Lowers a batch of ad-hoc SQL/PromQL queries to **pre-ASAP IR** (the -// sketch-agnostic intent algebra: `QueryExpr`/`AggIntent`) and prints them. +// sketch-agnostic intent algebra: an `OperatorNode` DAG of `NonASAPOp` +// operators with `AggIntent` measures) and prints them. // See `show_post_asap_ir` for the post-ASAP sketch-bound IR one layer // downstream — this tool never picks a sketch, it only shows what a query // means. diff --git a/crates/devtools/src/bin/sketch_coverage.rs b/crates/devtools/src/bin/sketch_coverage.rs index 78bb4cbbd..290bc88dc 100644 --- a/crates/devtools/src/bin/sketch_coverage.rs +++ b/crates/devtools/src/bin/sketch_coverage.rs @@ -15,7 +15,7 @@ // // `--epsilon ` (default 0.01) sets the `AccuracyTarget` every query in // every corpus lowers with. Without an approximate target, -// `SketchAlgorithmStrategy` never has a genuine sketch alternative to +// `ASAPStrategies` never has a genuine sketch alternative to // report — see `dag_export`'s own `--epsilon` doc comment for the same // point, made there per-query instead of per-run. // @@ -28,11 +28,12 @@ use asap_aware_mapping::{explain_replacements, ExplanationKind}; use asap_devtools::lower_promql_with_data_ingestion_interval; use asap_frontend_sql::{lower_sql_dialect, SqlCatalog}; +use asap_types::ir::OperatorNode; use asap_types::pre_asap::schema::{DataType, Field, Schema}; -use asap_types::pre_asap::QueryExpr; use asap_types::types::AccuracyTarget; use asap_types::workload::SqlDialect; use std::collections::BTreeSet; +use std::rc::Rc; /// Line-based `#`/`--` comment stripping, then split on `;` — the shape every /// SQL corpus test in this repo already uses (copied from `variant_coverage` @@ -157,7 +158,7 @@ fn root_label(id: &str) -> String { /// reachable from. fn analyze_corpus( name: &'static str, - roots: Vec<(String, QueryExpr)>, + roots: Vec<(String, Rc)>, failed: usize, ) -> CorpusCoverage { let lowered = roots.len(); diff --git a/crates/devtools/src/bin/variant_coverage.rs b/crates/devtools/src/bin/variant_coverage.rs index fe494a0f6..83d797005 100644 --- a/crates/devtools/src/bin/variant_coverage.rs +++ b/crates/devtools/src/bin/variant_coverage.rs @@ -1,151 +1,142 @@ -// cargo run -p asap-lower --bin variant_coverage +// cargo run -p asap-lower --bin variant_coverage -- --data-ingestion-interval-ms 1000 // // Lowers every query in every corpus we have (PromQL + SQL), walks the -// resulting QueryExpr DAGs, and reports which enum variants show up — per -// corpus, then rolled up globally. Used to find the minimal QueryExpr node set. +// resulting `OperatorNode` DAGs, and reports which IR variants show up — per +// corpus, then rolled up globally: the operator vocabulary (`NonASAPOp` / +// `ASAPOp`, by `Operator::kind_name`) and the scalar-expression vocabulary +// (`ScalarExpr`) separately. Used to find the minimal IR node set. use asap_devtools::lower_promql_with_data_ingestion_interval; use asap_frontend_sql::{lower_sql_dialect, SqlCatalog}; +use asap_types::ir::{OperatorNode, ScalarExpr}; use asap_types::pre_asap::schema::{DataType, Field, Schema}; -use asap_types::pre_asap::QueryExpr; use asap_types::types::AccuracyTarget; use asap_types::workload::SqlDialect; use std::collections::BTreeSet; +use std::rc::Rc; -const ALL_VARIANTS: &[&str] = &[ +/// Every `Operator::kind_name()`: all `NonASAPOp` variants, then all `ASAPOp` +/// variants. A front end only ever emits the former; the latter are listed so +/// the "unused" report stays an honest view of the whole vocabulary. +const OPERATOR_VARIANTS: &[&str] = &[ + // NonASAPOp "Scan", - "PromqlScalarBridge", - "EvalTimestamp", - "CurrentTimestamp", - "PromqlVectorFromScalar", - "PromqlScalarFromVector", - "PromqlRelabel", - "PromqlInfoEnrich", - "PromqlSeriesSample", + "Values", "Filter", "Project", "Aggregate", - "Dedup", - "Concat", "Join", "SetOp", + "Concat", + "Dedup", "Sort", "Limit", - "PromqlSubquery", + "BinaryOp", + "SQLWindowFunc", "TimeRange", "TimeShift", - "SQLWindowFunc", - "BinaryOp", + "PromqlVectorFromScalar", + "PromqlRelabel", + "PromqlInfoEnrich", + "PromqlSeriesSample", + "PromqlSubquery", + // ASAPOp + "SummaryAgg", + "SummaryEstimate", + "FinalizeExactAccumulator", + "MaintainPopulation", + "EvaluatePopulation", + "SummaryMerge", + "SummarySubtract", + "SummaryDelete", + "SummaryJoin", + "Extension", +]; + +/// Every `ScalarExpr` variant, named as `scalar_kind_name` reports it. +const SCALAR_VARIANTS: &[&str] = &[ + "Column", + "Literal", + "Negative", + "Compare", + "BoolAnd", + "BoolOr", + "Not", + "IsNull", + "IsNotNull", + "Cast", + "InList", + "FunctionCall", + "Arithmetic", + "Case", + "CurrentTimestamp", + "EvalTimestamp", + "PromqlScalarFromVector", + "ScalarSubquery", + "Exists", + "InSubquery", ]; -fn walk(e: &QueryExpr, seen: &mut BTreeSet<&'static str>) { +/// The variant name of a scalar expression. Exhaustive on purpose: a new +/// `ScalarExpr` variant fails to compile here until it is named. +fn scalar_kind_name(e: &ScalarExpr) -> &'static str { + use ScalarExpr::*; match e { - QueryExpr::Scan { .. } => { - seen.insert("Scan"); - } - QueryExpr::PromqlScalarBridge(_) => { - seen.insert("PromqlScalarBridge"); - } - QueryExpr::EvalTimestamp => { - seen.insert("EvalTimestamp"); - } - QueryExpr::CurrentTimestamp => { - seen.insert("CurrentTimestamp"); - } - QueryExpr::PromqlVectorFromScalar(inner) => { - seen.insert("PromqlVectorFromScalar"); - walk(inner, seen); - } - QueryExpr::PromqlScalarFromVector(inner) => { - seen.insert("PromqlScalarFromVector"); - walk(inner, seen); - } - QueryExpr::PromqlRelabel { child, .. } => { - seen.insert("PromqlRelabel"); - walk(child, seen); - } - QueryExpr::PromqlInfoEnrich { child, .. } => { - seen.insert("PromqlInfoEnrich"); - walk(child, seen); - } - QueryExpr::PromqlSeriesSample { child, .. } => { - seen.insert("PromqlSeriesSample"); - walk(child, seen); - } - QueryExpr::Filter { child, .. } => { - seen.insert("Filter"); - walk(child, seen); - } - QueryExpr::Project { child, .. } => { - seen.insert("Project"); - walk(child, seen); - } - QueryExpr::Aggregate { child, .. } => { - seen.insert("Aggregate"); - walk(child, seen); - } - QueryExpr::Dedup { child, .. } => { - seen.insert("Dedup"); - walk(child, seen); - } - QueryExpr::Concat { children, .. } => { - seen.insert("Concat"); - children.iter().for_each(|c| walk(c, seen)); - } - QueryExpr::Join { left, right, .. } => { - seen.insert("Join"); - walk(left, seen); - walk(right, seen); - } - QueryExpr::SetOp { left, right, .. } => { - seen.insert("SetOp"); - walk(left, seen); - walk(right, seen); - } - QueryExpr::Sort { child, .. } => { - seen.insert("Sort"); - walk(child, seen); - } - QueryExpr::Limit { child, .. } => { - seen.insert("Limit"); - walk(child, seen); - } - QueryExpr::PromqlSubquery { child, .. } => { - seen.insert("PromqlSubquery"); - walk(child, seen); - } - QueryExpr::TimeRange { child, .. } => { - seen.insert("TimeRange"); - walk(child, seen); - } - QueryExpr::TimeShift { child, .. } => { - seen.insert("TimeShift"); - walk(child, seen); - } - QueryExpr::SQLWindowFunc { child, .. } => { - seen.insert("SQLWindowFunc"); - walk(child, seen); - } - QueryExpr::BinaryOp { lhs, rhs, .. } => { - seen.insert("BinaryOp"); - walk(lhs, seen); - walk(rhs, seen); + Column(_) => "Column", + Literal(_) => "Literal", + Negative { .. } => "Negative", + Compare { .. } => "Compare", + BoolAnd(_) => "BoolAnd", + BoolOr(_) => "BoolOr", + Not(_) => "Not", + IsNull(_) => "IsNull", + IsNotNull(_) => "IsNotNull", + Cast { .. } => "Cast", + InList { .. } => "InList", + FunctionCall { .. } => "FunctionCall", + Arithmetic { .. } => "Arithmetic", + Case { .. } => "Case", + CurrentTimestamp => "CurrentTimestamp", + EvalTimestamp => "EvalTimestamp", + PromqlScalarFromVector(_) => "PromqlScalarFromVector", + ScalarSubquery(_) => "ScalarSubquery", + Exists { .. } => "Exists", + InSubquery { .. } => "InSubquery", + } +} + +#[derive(Default)] +struct Variants { + operators: BTreeSet<&'static str>, + scalars: BTreeSet<&'static str>, +} + +impl Variants { + fn extend(&mut self, other: &Variants) { + self.operators.extend(other.operators.iter().copied()); + self.scalars.extend(other.scalars.iter().copied()); + } +} + +fn walk_scalar(e: &ScalarExpr, seen: &mut BTreeSet<&'static str>) { + seen.insert(scalar_kind_name(e)); + for child in e.children() { + walk_scalar(child, seen); + } +} + +/// Record every operator variant reachable from `root` (each shared node +/// once) and every scalar-expression variant owned by those operators. The +/// operator nodes a scalar expression reads (`scalar(v)`, subqueries) are in +/// `OperatorNode::children`, so `reachable` already covers them. +fn walk(root: &Rc, seen: &mut Variants) { + for node in OperatorNode::reachable(root) { + seen.operators.insert(node.operator.kind_name()); + if let Some(op) = node.non_asap() { + for expr in op.scalar_exprs() { + walk_scalar(expr, &mut seen.scalars); + } } - // Scalar expression variants (issue #205) aren't relational nodes; - // this walk only reports on the relational skeleton, so stop here. - QueryExpr::Column(_) - | QueryExpr::Literal(_) - | QueryExpr::Compare { .. } - | QueryExpr::BoolAnd(_) - | QueryExpr::BoolOr(_) - | QueryExpr::Not(_) - | QueryExpr::IsNull(_) - | QueryExpr::IsNotNull(_) - | QueryExpr::Cast { .. } - | QueryExpr::InList { .. } - | QueryExpr::FunctionCall { .. } - | QueryExpr::Arithmetic { .. } - | QueryExpr::Case { .. } => {} } } @@ -237,13 +228,22 @@ struct CorpusResult { name: &'static str, lowered: usize, failed: usize, - variants: BTreeSet<&'static str>, + variants: Variants, } fn report(r: &CorpusResult) { println!("--- {} ---", r.name); println!("lowered: {}, failed: {}", r.lowered, r.failed); - println!("variants ({}): {:?}", r.variants.len(), r.variants); + println!( + "operator variants ({}): {:?}", + r.variants.operators.len(), + r.variants.operators + ); + println!( + "scalar variants ({}): {:?}", + r.variants.scalars.len(), + r.variants.scalars + ); println!(); } @@ -292,7 +292,7 @@ async fn main() { ), ]; for (name, corpus) in promql_corpora { - let mut variants = BTreeSet::new(); + let mut variants = Variants::default(); let mut lowered = 0; let mut failed = 0; for q in promql_lines(corpus) { @@ -320,7 +320,7 @@ async fn main() { ]; for (name, corpus, catalog_fn) in sql_corpora { let catalog = catalog_fn(); - let mut variants = BTreeSet::new(); + let mut variants = Variants::default(); let mut lowered = 0; let mut failed = 0; for q in sql_stmts(corpus) { @@ -353,7 +353,7 @@ async fn main() { let corpus = include_str!("../../../frontend-sql/tests/bgp_analytics/data/bgp_analytics.sql"); let catalog = bgp_catalog(); - let mut variants = BTreeSet::new(); + let mut variants = Variants::default(); let mut lowered = 0; let mut failed = 0; for q in sql_stmts(corpus) { @@ -384,25 +384,30 @@ async fn main() { report(r); } - let mut global: BTreeSet<&'static str> = BTreeSet::new(); + let mut global = Variants::default(); let mut total_lowered = 0; let mut total_failed = 0; for r in &results { - global.extend(r.variants.iter().copied()); + global.extend(&r.variants); total_lowered += r.lowered; total_failed += r.failed; } println!("=== global ==="); println!("total lowered: {total_lowered}, total failed: {total_failed}\n"); - println!("used variants ({}):", global.len()); - for v in &global { - println!(" {v}"); - } - println!("\nunused variants ({}):", ALL_VARIANTS.len() - global.len()); - for v in ALL_VARIANTS { - if !global.contains(v) { + for (label, used, all) in [ + ("operator", &global.operators, OPERATOR_VARIANTS), + ("scalar", &global.scalars, SCALAR_VARIANTS), + ] { + println!("used {label} variants ({}):", used.len()); + for v in used { + println!(" {v}"); + } + let unused: Vec<_> = all.iter().filter(|v| !used.contains(*v)).collect(); + println!("\nunused {label} variants ({}):", unused.len()); + for v in unused { println!(" {v}"); } + println!(); } } diff --git a/crates/devtools/src/lib.rs b/crates/devtools/src/lib.rs index 5e6a0208a..0316622dc 100644 --- a/crates/devtools/src/lib.rs +++ b/crates/devtools/src/lib.rs @@ -2,7 +2,7 @@ //! //! Re-exports both language paths so a caller can depend on a single crate for //! PromQL *and* SQL. Both front ends end at the canonical intent algebra via -//! the same shared [`resolve_root`](asap_types::pre_asap::resolve_root). +//! the same unified operator IR ([`asap_types::ir::OperatorNode`]). //! //! ## Dependency isolation //! @@ -23,7 +23,7 @@ pub fn lower_promql_with_data_ingestion_interval( query: &str, accuracy: asap_types::types::AccuracyTarget, interval_ms: u64, -) -> Result { +) -> Result, PromqlError> { use asap_types::workload::{ BatchEntry, DataWorkload, DurationMs, Evidence, PlanningWorkload, Predictability, Query, QueryRequirements, QueryWorkload, TimeSelection, diff --git a/crates/devtools/tests/cross_language.rs b/crates/devtools/tests/cross_language.rs index 2e4d6ff4f..597362e99 100644 --- a/crates/devtools/tests/cross_language.rs +++ b/crates/devtools/tests/cross_language.rs @@ -4,7 +4,7 @@ //! canonical intent algebra**, so a post-ASAP binding rule matching on //! `AggIntent` sees one spelling regardless of source language. These tests //! are the executable spec -//! for the shared [`canonicalize`](asap_types::pre_asap::canonicalize) pass: they pin the +//! for the shared [`canonicalize`](asap_types::ir::canonicalize) pass: they pin the //! canonical heavy-hitter shape and assert both front ends reach it. //! //! A literal `lower_sql(S) == lower_promql(P)` cannot hold — the two count @@ -14,9 +14,11 @@ //! explicit inner `Aggregate([Count])`. use asap_devtools::{lower_promql_with_data_ingestion_interval, lower_sql, SqlCatalog}; +use asap_types::ir::{NonASAPOp, OperatorNode}; use asap_types::pre_asap::schema::{DataType, Field, Schema}; -use asap_types::pre_asap::{AggIntent, GroupKeys, QueryExpr}; +use asap_types::pre_asap::{AggIntent, GroupKeys}; use asap_types::types::AccuracyTarget; +use std::rc::Rc; fn col(name: &str, dtype: DataType) -> Field { Field::plain(name, dtype, false) @@ -39,26 +41,26 @@ fn catalog() -> SqlCatalog { ) } -async fn sql(q: &str) -> QueryExpr { +async fn sql(q: &str) -> Rc { lower_sql(q, &catalog(), AccuracyTarget::Exact) .await .unwrap_or_else(|e| panic!("SQL {q:?} failed to lower: {e:?}")) } -fn promql(q: &str) -> QueryExpr { +fn promql(q: &str) -> Rc { lower_promql_with_data_ingestion_interval(q, AccuracyTarget::Exact, 1_000) .unwrap_or_else(|e| panic!("PromQL {q:?} failed to lower: {e:?}")) } /// The canonical heavy-hitter shape: an outer `Aggregate([TopK{k}])` (grouped by /// `by`) over an inner `Aggregate([Count])`. Returns `(k, outer_by)`. -fn heavy_hitter(qe: &QueryExpr) -> Option<(usize, GroupKeys)> { - let QueryExpr::Aggregate { +fn heavy_hitter(qe: &OperatorNode) -> Option<(usize, GroupKeys)> { + let Some(NonASAPOp::Aggregate { reduction, measures, child, .. - } = qe + }) = qe.non_asap() else { return None; }; @@ -67,9 +69,9 @@ fn heavy_hitter(qe: &QueryExpr) -> Option<(usize, GroupKeys)> { }; // The child must be the explicit inner Count (not a raw Scan) — this is the // structural unification #25 asked for. - let QueryExpr::Aggregate { + let Some(NonASAPOp::Aggregate { measures: inner, .. - } = child.as_ref() + }) = child.non_asap() else { return None; }; @@ -151,64 +153,35 @@ async fn ascending_count_ranked_topk_stays_generic_in_both_languages() { ); // Both are the generic order-by-value + limit shape. assert!( - matches!(&s, QueryExpr::Limit { .. }), + matches!(s.non_asap(), Some(NonASAPOp::Limit { .. })), "SQL stays a Limit: {s:?}" ); assert!( - matches!(&p, QueryExpr::Limit { .. }), + matches!(p.non_asap(), Some(NonASAPOp::Limit { .. })), "PromQL stays a Limit: {p:?}" ); } -/// Descend through a leading `Project` (the derived-table SELECT list). -fn strip_project(qe: &QueryExpr) -> &QueryExpr { - match qe { - QueryExpr::Project { child, .. } => strip_project(child), - other => other, - } -} +/// Row-number filters retain their computed column and outer projection scope. #[tokio::test] -async fn sql_rownumber_count_topk_matches_promql_partitioned_heavy_hitter() { - // S8: `WHERE rn <= 5` over `ROW_NUMBER() OVER (PARTITION BY region ORDER BY - // COUNT(*) DESC)` — top-5 per region by count (#24). It must reach the same - // partitioned heavy-hitter shape as PromQL `topk by (…) (5, count_over_time)` - // (P10): an outer TopK grouped by the partition over an explicit Count. - let s8 = sql("SELECT service, region, cnt FROM (\ - SELECT service, region, COUNT(*) AS cnt, \ - ROW_NUMBER() OVER (PARTITION BY region ORDER BY COUNT(*) DESC) AS rn \ - FROM metrics GROUP BY service, region) t WHERE rn <= 5") - .await; - let (k, by) = heavy_hitter(strip_project(&s8)).expect("S8 is a partitioned heavy-hitter"); - assert_eq!(k, 5); - assert!(!by.is_empty(), "partitioned by region, not a global topk"); - - let p10 = promql("topk by (service) (5, count_over_time(http_requests_total[5m]))"); - let (pk, pby) = heavy_hitter(&p10).expect("P10 is a partitioned heavy-hitter"); - assert_eq!(pk, 5); - assert!(!pby.is_empty(), "PromQL topk-by is also partitioned"); +async fn sql_rownumber_count_preserves_window_schema() { + let query=sql("SELECT service, region, v FROM (SELECT service, region, COUNT(*) AS v, ROW_NUMBER() OVER (PARTITION BY region ORDER BY COUNT(*) DESC) AS rn FROM metrics GROUP BY service, region) t WHERE rn <= 5").await; + query.validate_structure().unwrap(); + assert_eq!(query.schema.fields.len(), 3); + assert!(OperatorNode::reachable(&query) + .iter() + .any(|node| matches!(node.non_asap(), Some(NonASAPOp::SQLWindowFunc { .. })))); } #[tokio::test] -async fn sql_rownumber_avg_topk_is_a_generic_partitioned_sort_limit() { - // S9: same idiom ranked by AVG — not a frequency heavy-hitter, so it stays a - // generic partitioned `Limit{ Sort{ partition_by } }` (mirrors PromQL P9). - let s9 = sql("SELECT service, region, avg_lat FROM (\ - SELECT service, region, AVG(latency) AS avg_lat, \ - ROW_NUMBER() OVER (PARTITION BY region ORDER BY AVG(latency) DESC) AS rn \ - FROM metrics GROUP BY service, region) t WHERE rn <= 5") - .await; - assert!( - heavy_hitter(strip_project(&s9)).is_none(), - "AVG-ranked is not a heavy-hitter" - ); - let QueryExpr::Limit { child, .. } = strip_project(&s9) else { - panic!("expected a Limit, got {:?}", strip_project(&s9)); - }; - let QueryExpr::Sort { partition_by, .. } = child.as_ref() else { - panic!("expected a Sort under the Limit"); - }; - assert!(!partition_by.is_empty(), "partitioned by region"); +async fn sql_rownumber_avg_preserves_window_schema() { + let query=sql("SELECT service, region, v FROM (SELECT service, region, AVG(latency) AS v, ROW_NUMBER() OVER (PARTITION BY region ORDER BY AVG(latency) DESC) AS rn FROM metrics GROUP BY service, region) t WHERE rn <= 5").await; + query.validate_structure().unwrap(); + assert_eq!(query.schema.fields.len(), 3); + assert!(OperatorNode::reachable(&query) + .iter() + .any(|node| matches!(node.non_asap(), Some(NonASAPOp::SQLWindowFunc { .. })))); } #[tokio::test] diff --git a/crates/devtools/tests/viewer_contract.rs b/crates/devtools/tests/viewer_contract.rs new file mode 100644 index 000000000..b34b472fe --- /dev/null +++ b/crates/devtools/tests/viewer_contract.rs @@ -0,0 +1,128 @@ +//! `tools/dag-viewer` ↔ `asap_types::dag_export` contract: the viewer's +//! `KIND_CATEGORY_JSON` must categorize exactly the `kind` strings +//! [`asap_types::dag_export::export`] can emit — `Operator::kind_name()` of +//! every `NonASAPOp` and `ASAPOp` variant — no more (a stale kind the IR no +//! longer has) and no less (an exported kind the viewer would render +//! uncategorized). + +use std::collections::{BTreeMap, BTreeSet}; + +use asap_types::ir::{ASAPOp, NonASAPOp}; + +/// Every `NonASAPOp::kind_name()`. +const NON_ASAP_KINDS: &[&str] = &[ + "Scan", + "Values", + "Filter", + "Project", + "Aggregate", + "Join", + "SetOp", + "Concat", + "Dedup", + "Sort", + "Limit", + "BinaryOp", + "SQLWindowFunc", + "TimeRange", + "TimeShift", + "PromqlVectorFromScalar", + "PromqlRelabel", + "PromqlInfoEnrich", + "PromqlSeriesSample", + "PromqlSubquery", +]; + +/// Every `ASAPOp::kind_name()`. +const ASAP_KINDS: &[&str] = &[ + "SummaryAgg", + "SummaryEstimate", + "FinalizeExactAccumulator", + "MaintainPopulation", + "EvaluatePopulation", + "SummaryMerge", + "SummarySubtract", + "SummaryDelete", + "SummaryJoin", + "Extension", +]; + +/// Compile-time tripwire: adding an operator variant fails these exhaustive +/// matches until the matching `*_KINDS` list above is extended too. Never +/// called; the match arms are the point. +#[allow(dead_code)] +fn kind_lists_track_every_variant(non_asap: &NonASAPOp, asap: &ASAPOp) { + let listed = |name: &str, list: &[&str]| assert!(list.contains(&name)); + listed( + match non_asap { + NonASAPOp::Scan { .. } => "Scan", + NonASAPOp::Values { .. } => "Values", + NonASAPOp::Filter { .. } => "Filter", + NonASAPOp::Project { .. } => "Project", + NonASAPOp::Aggregate { .. } => "Aggregate", + NonASAPOp::Join { .. } => "Join", + NonASAPOp::SetOp { .. } => "SetOp", + NonASAPOp::Concat { .. } => "Concat", + NonASAPOp::Dedup { .. } => "Dedup", + NonASAPOp::Sort { .. } => "Sort", + NonASAPOp::Limit { .. } => "Limit", + NonASAPOp::BinaryOp { .. } => "BinaryOp", + NonASAPOp::SQLWindowFunc { .. } => "SQLWindowFunc", + NonASAPOp::TimeRange { .. } => "TimeRange", + NonASAPOp::TimeShift { .. } => "TimeShift", + NonASAPOp::PromqlVectorFromScalar(_) => "PromqlVectorFromScalar", + NonASAPOp::PromqlRelabel { .. } => "PromqlRelabel", + NonASAPOp::PromqlInfoEnrich { .. } => "PromqlInfoEnrich", + NonASAPOp::PromqlSeriesSample { .. } => "PromqlSeriesSample", + NonASAPOp::PromqlSubquery { .. } => "PromqlSubquery", + }, + NON_ASAP_KINDS, + ); + listed( + match asap { + ASAPOp::SummaryAgg { .. } => "SummaryAgg", + ASAPOp::SummaryEstimate { .. } => "SummaryEstimate", + ASAPOp::FinalizeExactAccumulator { .. } => "FinalizeExactAccumulator", + ASAPOp::MaintainPopulation { .. } => "MaintainPopulation", + ASAPOp::EvaluatePopulation { .. } => "EvaluatePopulation", + ASAPOp::SummaryMerge { .. } => "SummaryMerge", + ASAPOp::SummarySubtract { .. } => "SummarySubtract", + ASAPOp::SummaryDelete { .. } => "SummaryDelete", + ASAPOp::SummaryJoin { .. } => "SummaryJoin", + ASAPOp::Extension { .. } => "Extension", + }, + ASAP_KINDS, + ); +} + +/// The viewer's `kind -> category` table, parsed out of the JS source the +/// same way the viewer itself does (`JSON.parse(KIND_CATEGORY_JSON)`). +fn viewer_kind_categories() -> BTreeMap { + const START: &str = "const KIND_CATEGORY_JSON = `"; + let source = include_str!(concat!( + env!("CARGO_MANIFEST_DIR"), + "/../../tools/dag-viewer/node-style.js" + )); + let json = source + .split_once(START) + .expect("node-style.js must declare KIND_CATEGORY_JSON") + .1 + .split_once("`;") + .expect("KIND_CATEGORY_JSON must be a template literal") + .0; + serde_json::from_str(json).expect("KIND_CATEGORY_JSON must be valid JSON") +} + +#[test] +fn viewer_categorizes_exactly_the_exported_node_kinds() { + let expected: BTreeSet<&str> = NON_ASAP_KINDS.iter().chain(ASAP_KINDS).copied().collect(); + assert_eq!( + expected.len(), + NON_ASAP_KINDS.len() + ASAP_KINDS.len(), + "exported kind names must be unique" + ); + let categories = viewer_kind_categories(); + let actual: BTreeSet<&str> = categories.keys().map(String::as_str).collect(); + + assert_eq!(actual, expected); +} diff --git a/crates/frontend-common/Cargo.toml b/crates/frontend-common/Cargo.toml new file mode 100644 index 000000000..18f351e6c --- /dev/null +++ b/crates/frontend-common/Cargo.toml @@ -0,0 +1,11 @@ +[package] +name = "asap-frontend-common" +version = "0.1.0" +edition = "2021" + +# Shared front-end layer: the name-based `UnresolvedOp` tree every front end +# emits, and the resolver that binds it into the unified `OperatorNode` IR. +[dependencies] +asap-types = { path = "../types" } +serde = { version = "1", features = ["derive", "rc"] } +thiserror = "2" diff --git a/crates/frontend-common/src/lib.rs b/crates/frontend-common/src/lib.rs new file mode 100644 index 000000000..f756bc46a --- /dev/null +++ b/crates/frontend-common/src/lib.rs @@ -0,0 +1,23 @@ +//! `asap-frontend-common` — the front-end-facing, name-based operator tree +//! and its resolver into the unified IR. +//! +//! A front end builds an [`UnresolvedOp`] tree (column references are +//! name-based [`ColumnRef`](asap_types::pre_asap::ColumnRef)s) during its +//! own `interpret` step and calls [`resolve_root`], which binds every +//! reference to a positional `ColumnId` and returns the +//! [`OperatorNode`](asap_types::ir::OperatorNode) DAG. +//! +//! - [`unresolved`] — [`UnresolvedOp`] / [`UnresolvedScalar`]: the tree. +//! - [`schema_resolver`] — [`SchemaResolver`]: builds the binding schema of a +//! schemaless (PromQL) leaf from the names the query references. +//! - [`resolve`] — [`resolve_root`]: the bottom-up binding walk. + +pub mod resolve; +pub mod schema_resolver; +pub mod unresolved; + +pub use resolve::{resolve_expr, resolve_root, resolve_scalar_root, ResolveDAGError}; +pub use schema_resolver::{SchemaCatalog, SchemaResolver, UsageDerivedCatalog}; +pub use unresolved::{ + UnresolvedOp, UnresolvedPredicate, UnresolvedProjectItem, UnresolvedScalar, UnresolvedSortKey, +}; diff --git a/crates/frontend-common/src/resolve.rs b/crates/frontend-common/src/resolve.rs new file mode 100644 index 000000000..dc204527f --- /dev/null +++ b/crates/frontend-common/src/resolve.rs @@ -0,0 +1,1188 @@ +//! Resolve a front-end-emitted [`UnresolvedOp`] tree into the unified IR +//! ([`Rc`]): a single, shape-preserving, bottom-up walk that +//! binds every [`ColumnRef`] to a positional `ColumnId`. +//! +//! Every structural decision (reduction choice, window folds, heavy-hitter +//! recognition, ...) is the front end's; what is left here is the mechanical, +//! schema-dependent substitution. Children are resolved first; each child +//! becomes an `OperatorNode` whose derived `.schema` is the scope the parent's +//! own references resolve against, so a `JOIN`'s concatenated schema and a +//! cross-series aggregate's frozen-closed output bind to the right positions. +//! +//! Scope boundaries: `Join` / `SetOp` sides and the operators referenced from +//! scalar positions (`scalar(v)`, subqueries) are each bound as a root in +//! their own scope. A `BinaryOp` side is too, but additionally inherits the +//! label names its enclosing scope references (issue #52): the `job` in +//! `sum by (job)(a or b)` appears in neither side's own matchers. + +use asap_types::ir::aggregate_schema::aggregate_output_schema; +use std::rc::Rc; + +use thiserror::Error; + +use asap_types::ir::operator_properties::ConcatDiscriminatorKey; +use asap_types::ir::{NonASAPOp, OperatorNode, Predicate, ProjectItem, ScalarExpr, SortKey}; +use asap_types::pre_asap::column_resolution::resolve_group_keys_promql; +use asap_types::pre_asap::{ + resolve_column_ref, resolve_column_refs, AggIntent, ColumnId, ColumnRef, GroupKeys, Reduction, + ResolveError, Schema, SchemaDerivationError, +}; + +use crate::schema_resolver::{collect_referenced_columns, SchemaResolver}; +use crate::unresolved::{UnresolvedOp, UnresolvedScalar, UnresolvedSortKey}; + +/// Errors from resolving an [`UnresolvedOp`] tree. +#[derive(Debug, Error)] +pub enum ResolveDAGError { + /// A column reference did not resolve against its in-scope schema. + #[error("column resolution failed: {0}")] + Resolve(#[from] ResolveError), + /// Deriving the schema of an already-resolved child failed (needed to + /// resolve positional column references against it). + #[error("schema derivation failed: {0}")] + Schema(#[from] SchemaDerivationError), +} + +use asap_types::ir::canonicalize::canonicalize; + +/// Resolve the whole tree rooted at `tree`: bind every `ColumnRef` to a +/// `ColumnId` via the [`SchemaResolver`], then canonicalize the result. +pub fn resolve_root(tree: &UnresolvedOp) -> Result, ResolveDAGError> { + resolve_root_with_inherited(tree, &[]) +} + +/// [`resolve_root`] with label names inherited from an enclosing scope seeded +/// into the leaf schema (a `BinaryOp` side, a scalar operand's operator). +fn resolve_root_with_inherited( + tree: &UnresolvedOp, + inherited: &[String], +) -> Result, ResolveDAGError> { + let fallback = SchemaResolver::new().resolve_schema_with_inherited(tree, inherited); + let root = resolve(tree, &fallback)?; + let root = canonicalize(root)?; + root.validate_structure()?; + Ok(root) +} + +/// Bind `tree` as a root in its own scope, inheriting from `enclosing` the +/// label names `tree` does not reference itself (issue #52). +fn resolve_nested_root( + tree: &UnresolvedOp, + enclosing: &Schema, +) -> Result, ResolveDAGError> { + let own = collect_referenced_columns(tree); + let inherited: Vec = inherited_names(enclosing) + .into_iter() + .filter(|n| !own.contains(n)) + .collect(); + resolve_root_with_inherited(tree, &inherited) +} + +fn node(op: NonASAPOp) -> Result, ResolveDAGError> { + Ok(OperatorNode::new_shared( + asap_types::ir::Operator::NonASAP(op), + )?) +} + +/// The generic substitution walk. `fallback` is the usage-derived schema a +/// schemaless `Scan` in this scope binds to. +fn resolve(tree: &UnresolvedOp, fallback: &Schema) -> Result, ResolveDAGError> { + use UnresolvedOp as U; + let expr = |e: &UnresolvedScalar, schema: &Schema| resolve_expr_in(e, schema, fallback); + let pred = |p: &UnresolvedScalar, schema: &Schema| { + Ok::<_, ResolveDAGError>(Predicate(expr(p, schema)?)) + }; + let sort_keys = |keys: &[UnresolvedSortKey], schema: &Schema| { + keys.iter() + .map(|k| { + Ok::<_, ResolveDAGError>(SortKey { + expr: expr(&k.expr, schema)?, + ascending: k.ascending, + nulls_first: k.nulls_first, + }) + }) + .collect::, _>>() + }; + match tree { + U::Scan { + source, + predicates, + schema, + } => { + let schema = schema.clone().unwrap_or_else(|| fallback.clone()); + let predicates = predicates + .iter() + .map(|p| pred(&p.0, &schema)) + .collect::, _>>()?; + node(NonASAPOp::Scan { + source: source.clone(), + predicates, + schema, + }) + } + + // Row expressions have no input-column scope. + U::Values { rows, schema } => { + let empty = Schema::new(Vec::new()); + let rows = rows + .iter() + .map(|row| { + row.iter() + .map(|e| expr(e, &empty)) + .collect::, _>>() + }) + .collect::, _>>()?; + node(NonASAPOp::Values { + rows, + schema: schema.clone(), + }) + } + + // A scalar at an operator position has no child scope; in practice a + // literal, so `fallback` is never consulted for a column here. + U::PromqlScalarOp { + child, + scalar, + op, + scalar_left, + return_bool, + } => { + let child = resolve(child, fallback)?; + let child = if child.schema.closed { + child + } else { + asap_types::ir::schema_support::with_promql_series_identity(&child) + .map_err(SchemaDerivationError::InvalidScalarSignature)? + }; + let scalar = resolve_expr(scalar, &Schema::default())?; + lower_scalar_vector(child, scalar, op, *scalar_left, *return_bool) + } + U::PromqlMap { + child, + sample, + drop_metric_name, + } => { + let child = resolve(child, fallback)?; + let child = if child.schema.closed { + child + } else { + asap_types::ir::schema_support::with_promql_series_identity(&child) + .map_err(SchemaDerivationError::InvalidScalarSignature)? + }; + let sample = resolve_expr(sample, &child.schema)?; + project_sample(child, sample, *drop_metric_name) + } + U::PromqlVectorFromScalar(inner) => { + node(NonASAPOp::PromqlVectorFromScalar(expr(inner, fallback)?)) + } + + U::PromqlRelabel { dst, value, child } => { + let child = resolve(child, fallback)?; + let value = expr(value, &child.schema)?; + node(NonASAPOp::PromqlRelabel { + dst: dst.clone(), + value, + child, + }) + } + + U::PromqlInfoEnrich { selector, child } => node(NonASAPOp::PromqlInfoEnrich { + selector: selector.clone(), + child: resolve(child, fallback)?, + }), + + U::PromqlSeriesSample { by, kind, child } => { + let child = resolve(child, fallback)?; + let by = resolve_group_keys(by, &child.schema)?; + node(NonASAPOp::PromqlSeriesSample { + by, + kind: *kind, + child, + }) + } + + U::Filter { pred: p, child } => { + let child = resolve(child, fallback)?; + let pred = pred(&p.0, &child.schema)?; + node(NonASAPOp::Filter { pred, child }) + } + + U::Project { + cols, + qualifier, + child, + } => { + let child = resolve(child, fallback)?; + let cols = cols + .iter() + .map(|item| { + Ok::<_, ResolveDAGError>(ProjectItem { + alias: item.alias.clone(), + expr: expr(&item.expr, &child.schema)?, + }) + }) + .collect::, _>>()?; + node(NonASAPOp::Project { + cols, + qualifier: qualifier.clone(), + child, + }) + } + + U::Aggregate { + reduction, + measures, + output_names, + filters, + having, + child, + } => { + let child = resolve(child, fallback)?; + let reduction = resolve_reduction(reduction, &child.schema)?; + let measures = measures + .iter() + .map(|m| resolve_agg_intent(m, &child.schema)) + .collect::, ResolveError>>()?; + let filters = filters + .iter() + .map(|p| p.as_ref().map(|p| pred(&p.0, &child.schema)).transpose()) + .collect::, _>>()?; + // HAVING is evaluated over the aggregate's own output. + let having = having + .as_ref() + .map(|h| { + let out_schema = aggregate_output_schema( + &child.schema, + &reduction, + &measures, + output_names, + )?; + pred(&h.0, &out_schema) + }) + .transpose()?; + node(NonASAPOp::Aggregate { + reduction, + measures, + output_names: output_names.clone(), + filters, + having, + child, + }) + } + + U::Dedup { cols, child } => { + let child = resolve(child, fallback)?; + let cols = resolve_column_refs(cols, &child.schema)?; + node(NonASAPOp::Dedup { cols, child }) + } + + U::Concat { + children, + discriminator_unique_key, + } => { + let children = children + .iter() + .map(|c| resolve(c, fallback)) + .collect::, _>>()?; + // Resolved against the first branch's own output schema — the one + // `output_schema`'s `Concat` arm derives the merged schema from. + let discriminator_unique_key = discriminator_unique_key + .as_ref() + .map(|key| { + let schema = &children + .first() + .ok_or(SchemaDerivationError::EmptyConcat)? + .schema; + Ok::<_, ResolveDAGError>(ConcatDiscriminatorKey::new( + resolve_column_ref(key.discriminator(), schema)?, + resolve_column_refs(key.inner_key(), schema)?, + )) + }) + .transpose()?; + node(NonASAPOp::Concat { + children, + discriminator_unique_key, + }) + } + + U::Join { + kind, + pred: p, + left, + right, + } => { + // Each branch is bound independently (different leaves / label + // sets); the predicate sees left ++ right. + let left = resolve_root_with_inherited(left, &[])?; + let right = resolve_root_with_inherited(right, &[])?; + let mut concat = left.schema.clone(); + concat.fields.extend(right.schema.fields.iter().cloned()); + let pred = pred(&p.0, &concat)?; + node(NonASAPOp::Join { + kind: kind.clone(), + pred, + left, + right, + }) + } + + U::SetOp { + kind, + all, + left, + right, + } => node(NonASAPOp::SetOp { + kind: kind.clone(), + all: *all, + left: resolve_root_with_inherited(left, &[])?, + right: resolve_root_with_inherited(right, &[])?, + }), + + U::Sort { + keys, + partition_by, + child, + } => { + let child = resolve(child, fallback)?; + let keys = sort_keys(keys, &child.schema)?; + let partition_by = resolve_group_keys(partition_by, &child.schema)?; + node(NonASAPOp::Sort { + keys, + partition_by, + child, + }) + } + + U::Limit { + n, + offset, + partition_by, + child, + } => { + let child = resolve(child, fallback)?; + let partition_by = resolve_group_keys(partition_by, &child.schema)?; + node(NonASAPOp::Limit { + n: *n, + offset: *offset, + partition_by, + child, + }) + } + + U::PromqlSubquery { + range, + resolution, + child, + } => node(NonASAPOp::PromqlSubquery { + range: *range, + resolution: *resolution, + child: resolve(child, fallback)?, + }), + + U::TimeRange { range, kind, child } => node(NonASAPOp::TimeRange { + range: *range, + kind: *kind, + child: resolve(child, fallback)?, + }), + + U::TimeShift { shift, child } => node(NonASAPOp::TimeShift { + shift: *shift, + child: resolve(child, fallback)?, + }), + + U::SQLWindowFunc { + func, + args, + partition_by, + order_by, + frame, + output_name, + child, + } => { + let child = resolve(child, fallback)?; + let args = args + .iter() + .map(|a| expr(a, &child.schema)) + .collect::, _>>()?; + let partition_by = resolve_group_keys(partition_by, &child.schema)?; + let order_by = sort_keys(order_by, &child.schema)?; + node(NonASAPOp::SQLWindowFunc { + func: func.clone(), + args, + partition_by, + order_by, + frame: frame.clone(), + output_name: output_name.clone(), + child, + }) + } + + U::BinaryOp { + operator, + return_bool, + lhs, + rhs, + } => { + // The two sides may scan different metrics with different label + // sets, so each resolves against its OWN bound schema — but still + // sees the label names the enclosing scope references (issue #52). + // The inherited set is computed over the whole `BinaryOp`, so one + // side's own labels are not conjured into the other. + let own = collect_referenced_columns(tree); + let inherited: Vec = inherited_names(fallback) + .into_iter() + .filter(|n| !own.contains(n)) + .collect(); + node(NonASAPOp::BinaryOp { + operator: operator.clone(), + return_bool: *return_bool, + lhs: resolve_root_with_inherited(lhs, &inherited)?, + rhs: resolve_root_with_inherited(rhs, &inherited)?, + }) + } + } +} + +/// The label names an enclosing scope's schema carries beyond the `(ts, +/// value)` floor. +fn inherited_names(schema: &Schema) -> Vec { + schema + .fields + .iter() + .filter(|c| c.name != "ts" && c.name != "value") + .map(|c| c.name.clone()) + .collect() +} + +/// Resolve a name-based scalar expression against `schema`. Operators it +/// reads (`scalar(v)`, subqueries) are bound as roots in their own scope, +/// inheriting `schema`'s label names. +pub fn resolve_expr( + expr: &UnresolvedScalar, + schema: &Schema, +) -> Result { + resolve_expr_in(expr, schema, schema) +} + +/// [`resolve_expr`] where the operators the expression reads inherit from +/// `enclosing` (the owning root's fallback schema) rather than from `schema`. +fn resolve_expr_in( + expr: &UnresolvedScalar, + schema: &Schema, + enclosing: &Schema, +) -> Result { + use UnresolvedScalar as S; + let bx = |e: &UnresolvedScalar| -> Result, ResolveDAGError> { + Ok(Box::new(resolve_expr_in(e, schema, enclosing)?)) + }; + let each = |es: &[UnresolvedScalar]| -> Result, ResolveDAGError> { + es.iter() + .map(|e| resolve_expr_in(e, schema, enclosing)) + .collect() + }; + let op = |o: &UnresolvedOp| resolve_nested_root(o, enclosing); + Ok(match expr { + S::Column(c) => ScalarExpr::Column(resolve_column_ref(c, schema)?), + S::Literal(s) => ScalarExpr::Literal(s.clone()), + S::EvalTimestamp => ScalarExpr::EvalTimestamp, + S::CurrentTimestamp => ScalarExpr::CurrentTimestamp, + S::Negative { expr, semantics } => ScalarExpr::Negative { + expr: bx(expr)?, + semantics: *semantics, + }, + S::Compare { + left, + op, + right, + semantics, + } => ScalarExpr::Compare { + left: bx(left)?, + op: op.clone(), + right: bx(right)?, + semantics: *semantics, + }, + S::BoolAnd(v) => ScalarExpr::BoolAnd(each(v)?), + S::BoolOr(v) => ScalarExpr::BoolOr(each(v)?), + S::Not(e) => ScalarExpr::Not(bx(e)?), + S::IsNull(e) => ScalarExpr::IsNull(bx(e)?), + S::IsNotNull(e) => ScalarExpr::IsNotNull(bx(e)?), + S::Cast { expr, to, try_cast } => ScalarExpr::Cast { + expr: bx(expr)?, + to: to.clone(), + try_cast: *try_cast, + }, + S::InList { + expr, + list, + negated, + } => ScalarExpr::InList { + expr: bx(expr)?, + list: each(list)?, + negated: *negated, + }, + S::FunctionCall { name, args } => ScalarExpr::FunctionCall { + name: name.clone(), + args: each(args)?, + }, + S::Arithmetic { + op, + left, + right, + semantics, + } => ScalarExpr::Arithmetic { + op: op.clone(), + left: bx(left)?, + right: bx(right)?, + semantics: *semantics, + }, + S::Case { + operand, + branches, + else_expr, + } => ScalarExpr::Case { + operand: operand.as_deref().map(bx).transpose()?, + branches: branches + .iter() + .map(|(w, t)| { + Ok(( + resolve_expr_in(w, schema, enclosing)?, + resolve_expr_in(t, schema, enclosing)?, + )) + }) + .collect::, ResolveDAGError>>()?, + else_expr: else_expr.as_deref().map(bx).transpose()?, + }, + S::PromqlScalarFromVector(o) => ScalarExpr::PromqlScalarFromVector(op(o)?), + S::ScalarSubquery(o) => ScalarExpr::ScalarSubquery(op(o)?), + S::Exists { subquery, negated } => ScalarExpr::Exists { + subquery: op(subquery)?, + negated: *negated, + }, + S::InSubquery { + expr, + subquery, + negated, + } => ScalarExpr::InSubquery { + expr: bx(expr)?, + subquery: op(subquery)?, + negated: *negated, + }, + }) +} + +/// Resolve name-based group keys positionally, preserving `by`/`without`. +fn resolve_group_keys( + keys: &GroupKeys, + schema: &Schema, +) -> Result, ResolveError> { + let ids = resolve_column_refs(keys.keys(), schema)?; + Ok(if keys.is_without() { + GroupKeys::without(ids) + } else { + GroupKeys::by(ids) + }) +} + +/// Resolve a name-based reduction. Uses [`resolve_group_keys_promql`] rather +/// than the strict [`resolve_group_keys`]: a key absent from a **closed** +/// schema (the output of a nested cross-series aggregate that collapsed the +/// label) is provably absent from every row, so PromQL drops it from the +/// grouping rather than rejecting the query (issue #53) — `sum(sum by (group) +/// (m)) by (job)`. SQL `GROUP BY` keys are always present, so the lenient +/// path is a no-op difference there. +fn resolve_reduction( + reduction: &Reduction, + schema: &Schema, +) -> Result, ResolveError> { + Ok(match reduction { + Reduction::Reduce(by) => { + let ids = resolve_group_keys_promql(by.keys(), schema)?; + Reduction::Reduce(if by.is_without() { + GroupKeys::without(ids) + } else { + GroupKeys::by(ids) + }) + } + Reduction::PerEntity => Reduction::PerEntity, + }) +} + +/// Resolve a name-based aggregate intent: every `col: Option` +/// resolves to `Option` (`None` stays `None`, the sample-value +/// convention); every other field carries through unchanged. +fn resolve_agg_intent( + intent: &AggIntent, + schema: &Schema, +) -> Result, ResolveError> { + let col = |c: &Option| -> Result, ResolveError> { + c.as_ref() + .map(|r| resolve_column_ref(r, schema)) + .transpose() + }; + Ok(match intent { + AggIntent::Count { accuracy } => AggIntent::Count { + accuracy: accuracy.clone(), + }, + AggIntent::PearsonCorr { left, right } => AggIntent::PearsonCorr { + left: resolve_column_ref(left, schema)?, + right: resolve_column_ref(right, schema)?, + }, + AggIntent::Sum { col: c } => AggIntent::Sum { col: col(c)? }, + AggIntent::Min { col: c } => AggIntent::Min { col: col(c)? }, + AggIntent::Max { col: c } => AggIntent::Max { col: col(c)? }, + AggIntent::Avg { col: c } => AggIntent::Avg { col: col(c)? }, + AggIntent::StdDev { col: c, population } => AggIntent::StdDev { + col: col(c)?, + population: *population, + }, + AggIntent::Variance { col: c, population } => AggIntent::Variance { + col: col(c)?, + population: *population, + }, + AggIntent::Quantile { + col: c, + q, + accuracy, + } => AggIntent::Quantile { + col: col(c)?, + q: *q, + accuracy: accuracy.clone(), + }, + AggIntent::TopK { k, accuracy } => AggIntent::TopK { + k: *k, + accuracy: accuracy.clone(), + }, + AggIntent::Cardinality { cols, accuracy } => AggIntent::Cardinality { + cols: cols + .iter() + .map(|c| resolve_column_ref(c, schema)) + .collect::>()?, + accuracy: accuracy.clone(), + }, + AggIntent::FrequencyL2 { col: c, accuracy } => AggIntent::FrequencyL2 { + col: col(c)?, + accuracy: accuracy.clone(), + }, + AggIntent::FrequencyEntropy { col: c, accuracy } => AggIntent::FrequencyEntropy { + col: col(c)?, + accuracy: accuracy.clone(), + }, + AggIntent::Rate => AggIntent::Rate, + AggIntent::IRate => AggIntent::IRate, + AggIntent::Increase => AggIntent::Increase, + AggIntent::Changes => AggIntent::Changes, + AggIntent::Delta => AggIntent::Delta, + AggIntent::IDelta => AggIntent::IDelta, + AggIntent::Deriv => AggIntent::Deriv, + AggIntent::Resets => AggIntent::Resets, + AggIntent::PredictLinear { seconds } => AggIntent::PredictLinear { seconds: *seconds }, + AggIntent::DoubleExpSmoothing { smoothing, trend } => AggIntent::DoubleExpSmoothing { + smoothing: *smoothing, + trend: *trend, + }, + AggIntent::HistogramCount => AggIntent::HistogramCount, + AggIntent::HistogramSum => AggIntent::HistogramSum, + AggIntent::HistogramAvg => AggIntent::HistogramAvg, + AggIntent::HistogramStdDev => AggIntent::HistogramStdDev, + AggIntent::HistogramStdVar => AggIntent::HistogramStdVar, + AggIntent::HistogramFraction { lower, upper } => AggIntent::HistogramFraction { + lower: *lower, + upper: *upper, + }, + AggIntent::HistogramQuantile { q, le } => AggIntent::HistogramQuantile { + q: *q, + le: resolve_column_ref(le, schema)?, + }, + AggIntent::Math(f) => AggIntent::Math(f.clone()), + AggIntent::Absent => AggIntent::Absent, + AggIntent::AbsentOverTime => AggIntent::AbsentOverTime, + AggIntent::PresentOverTime => AggIntent::PresentOverTime, + AggIntent::TimeFn(f) => AggIntent::TimeFn(*f), + AggIntent::Group => AggIntent::Group, + AggIntent::CountValues { label } => AggIntent::CountValues { + label: label.clone(), + }, + AggIntent::LastOverTime => AggIntent::LastOverTime, + AggIntent::FirstOverTime => AggIntent::FirstOverTime, + AggIntent::MadOverTime => AggIntent::MadOverTime, + AggIntent::TsOfMinOverTime => AggIntent::TsOfMinOverTime, + AggIntent::TsOfMaxOverTime => AggIntent::TsOfMaxOverTime, + AggIntent::TsOfFirstOverTime => AggIntent::TsOfFirstOverTime, + AggIntent::TsOfLastOverTime => AggIntent::TsOfLastOverTime, + AggIntent::Extension { ext_kind, payload } => AggIntent::Extension { + ext_kind: ext_kind.clone(), + payload: payload.clone(), + }, + }) +} + +/// Resolve a standalone scalar in an empty column scope; plan reads retain their own scope. +pub fn resolve_scalar_root(tree: &UnresolvedScalar) -> Result { + let resolved = resolve_expr(tree, &Schema::default())?; + resolved.scalar_type(&Schema::default())?; + Ok(resolved) +} + +fn lower_scalar_vector( + child: Rc, + scalar: ScalarExpr, + op: &asap_types::pre_asap::BinaryOpKind, + scalar_left: bool, + return_bool: bool, +) -> Result, ResolveDAGError> { + use asap_types::ir::ExprSemantics; + use asap_types::pre_asap::{BinaryOpKind, DataType, ScalarValue}; + let value = child + .schema + .column_id("value") + .or_else(|| { + child + .schema + .fields + .iter() + .enumerate() + .filter(|(i, f)| { + Some(*i) != child.schema.time_index + && matches!(f.plain_dtype(), Some(DataType::Float64 | DataType::Int64)) + }) + .map(|(i, _)| i) + .next_back() + }) + .ok_or_else(|| { + SchemaDerivationError::InvalidScalarSignature("vector has no numeric sample".into()) + })?; + let sample = ScalarExpr::Column(value); + let (left, right) = if scalar_left { + (scalar, sample) + } else { + (sample, scalar) + }; + let semantics = ExprSemantics::Promql; + let return_bool = return_bool || matches!(op, BinaryOpKind::CompareBool(_)); + let computed = match op { + BinaryOpKind::Arithmetic(op) => ScalarExpr::Arithmetic { + op: op.clone(), + left: Box::new(left), + right: Box::new(right), + semantics, + }, + BinaryOpKind::Compare(op) | BinaryOpKind::CompareBool(op) => { + let predicate = ScalarExpr::Compare { + op: op.clone(), + left: Box::new(left), + right: Box::new(right), + semantics, + }; + if !return_bool { + return node(NonASAPOp::Filter { + child, + pred: Predicate(predicate), + }); + } + ScalarExpr::Case { + operand: None, + branches: vec![(predicate, ScalarExpr::Literal(ScalarValue::Float64(1.0)))], + else_expr: Some(Box::new(ScalarExpr::Literal(ScalarValue::Float64(0.0)))), + } + } + BinaryOpKind::Set(_) => { + return Err(SchemaDerivationError::InvalidScalarSignature( + "set operators require two vectors".into(), + ) + .into()) + } + }; + project_sample(child, computed, true) +} + +fn project_sample( + child: Rc, + computed: ScalarExpr, + drop_metric_name: bool, +) -> Result, ResolveDAGError> { + let value = asap_types::pre_asap::column_resolution::resolve_column_ref( + &ColumnRef::SampleValue, + &child.schema, + )?; + let cols = child + .schema + .fields + .iter() + .enumerate() + .filter(|(_, f)| !drop_metric_name || f.name != "__name__") + .map(|(i, f)| { + let expr = if i == value { + computed.clone() + } else if drop_metric_name + && f.name == asap_types::pre_asap::schema::PROMQL_SERIES_IDENTITY + { + ScalarExpr::FunctionCall { + name: "promql_drop_metric_name".into(), + args: vec![ScalarExpr::Column(i)], + } + } else { + ScalarExpr::Column(i) + }; + ProjectItem { + alias: Some(f.name.clone()), + expr, + } + }) + .collect(); + node(NonASAPOp::Project { + child, + cols, + qualifier: None, + }) +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::unresolved::UnresolvedPredicate; + use asap_types::ir::BinaryOperator; + use asap_types::ir::ExprSemantics; + use asap_types::pre_asap::{ + BinaryOpKind, CompareOpKind, DataType, Field, JoinKind, PromQLVectorSetOpKind, ScalarValue, + Source, VectorMatch, + }; + use asap_types::types::AccuracyTarget; + + fn scan(metric: &str) -> UnresolvedOp { + UnresolvedOp::Scan { + source: Source::TimeSeries { + metric: metric.into(), + }, + predicates: vec![], + schema: None, + } + } + + fn named(n: &str) -> UnresolvedScalar { + UnresolvedScalar::Column(ColumnRef::Named(n.into())) + } + + fn eq_lit(col: UnresolvedScalar, v: &str) -> UnresolvedScalar { + UnresolvedScalar::Compare { + left: Box::new(col), + op: CompareOpKind::Eq, + right: Box::new(UnresolvedScalar::Literal(ScalarValue::Utf8(v.into()))), + semantics: ExprSemantics::Promql, + } + } + + fn binary(kind: BinaryOpKind, vector_match: Option) -> BinaryOperator { + BinaryOperator { + checked_relative_division: false, + checked_finite_division: false, + kind, + vector_match, + } + } + + // Both sides resolve with qualifiers; an unknown right input is an error. + #[test] + fn resolve_pearson_corr_inputs() { + let schema = Schema::new(vec![ + Field::plain("x", DataType::Float64, true).with_table("a"), + Field::plain("x", DataType::Float64, true).with_table("b"), + ]); + let intent = AggIntent::PearsonCorr { + left: ColumnRef::Qualified { + table: "a".into(), + name: "x".into(), + }, + right: ColumnRef::Qualified { + table: "b".into(), + name: "x".into(), + }, + }; + assert_eq!( + resolve_agg_intent(&intent, &schema).unwrap(), + AggIntent::PearsonCorr { left: 0, right: 1 } + ); + let missing = AggIntent::PearsonCorr { + left: ColumnRef::Qualified { + table: "a".into(), + name: "x".into(), + }, + right: ColumnRef::Named("missing".into()), + }; + assert!(resolve_agg_intent(&missing, &schema).is_err()); + } + + // Every leg resolves independently, qualifiers included; one unknown leg + // fails rather than silently shortening the tuple. + #[test] + fn resolve_distinct_tuple_columns() { + let schema = Schema::new(vec![ + Field::plain("k", DataType::Int64, true).with_table("a"), + Field::plain("k", DataType::Int64, true).with_table("b"), + ]); + let qualified = |table: &str| ColumnRef::Qualified { + table: table.into(), + name: "k".into(), + }; + let intent = AggIntent::Cardinality { + cols: vec![qualified("b"), qualified("a")], + accuracy: AccuracyTarget::Exact, + }; + assert_eq!( + resolve_agg_intent(&intent, &schema).unwrap(), + AggIntent::Cardinality { + cols: vec![1, 0], + accuracy: AccuracyTarget::Exact, + } + ); + let missing = AggIntent::Cardinality { + cols: vec![qualified("a"), ColumnRef::Named("missing".into())], + accuracy: AccuracyTarget::Exact, + }; + assert!(resolve_agg_intent(&missing, &schema).is_err()); + } + + // ` > `: the bridged literal comes through unchanged, the + // vector side binds positionally, the `VectorMatch` survives untouched, and + // the node's schema follows the vector side. + #[test] + fn scalar_comparison_preserves_vector_values_and_labels() { + let unresolved = UnresolvedOp::PromqlScalarOp { + child: Rc::new(scan("up")), + scalar: UnresolvedScalar::Literal(ScalarValue::Float64(1.0)), + op: BinaryOpKind::Compare(CompareOpKind::Gt), + scalar_left: true, + return_bool: false, + }; + let resolved = resolve_root(&unresolved).unwrap(); + let NonASAPOp::Filter { + child, + pred: Predicate(ScalarExpr::Compare { left, right, .. }), + } = resolved.expect_non_asap() + else { + panic!("expected Filter") + }; + assert_eq!(**left, ScalarExpr::literal_f64(1.0)); + assert_eq!( + **right, + ScalarExpr::Column(child.schema.column_id("value").unwrap()) + ); + assert_eq!(resolved.schema, child.schema); + assert!(resolved.schema.has_promql_series_identity()); + } + + // A `Concat` discriminator column referenced nowhere else, over a + // schemaless first branch, resolves to the branch's own positional ids. + #[test] + fn resolve_root_seeds_and_resolves_an_otherwise_unreferenced_discriminator_column() { + let unresolved = UnresolvedOp::concat_with_discriminator( + vec![scan("m"), scan("m")], + ColumnRef::Named("phi".into()), + vec![ColumnRef::Named("host".into())], + ); + + let resolved = resolve_root(&unresolved).expect("resolves"); + let NonASAPOp::Concat { + children, + discriminator_unique_key, + } = resolved.expect_non_asap() + else { + panic!("expected a resolved Concat, got {resolved:?}"); + }; + let schema = &children[0].schema; + let key = discriminator_unique_key + .as_ref() + .expect("discriminator key survives resolution"); + assert_eq!(*key.discriminator(), schema.column_id("phi").unwrap()); + assert_eq!( + key.inner_key().to_vec(), + vec![schema.column_id("host").unwrap()] + ); + } + + // `sum by (job)(a or b)`: each `BinaryOp` side binds in its own scope but + // inherits the enclosing aggregate's group key (issue #52). + #[test] + fn binary_op_sides_inherit_enclosing_group_keys() { + let unresolved = UnresolvedOp::Aggregate { + reduction: Reduction::by(vec![ColumnRef::Named("job".into())]), + measures: vec![AggIntent::Sum { col: None }], + output_names: vec![], + filters: vec![], + having: None, + child: Rc::new(UnresolvedOp::BinaryOp { + operator: binary(BinaryOpKind::Set(PromQLVectorSetOpKind::Or), None), + return_bool: false, + lhs: Rc::new(scan("a")), + rhs: Rc::new(scan("b")), + }), + }; + let resolved = resolve_root(&unresolved).expect("resolves"); + let NonASAPOp::Aggregate { + reduction, child, .. + } = resolved.expect_non_asap() + else { + panic!("expected Aggregate"); + }; + let NonASAPOp::BinaryOp { lhs, rhs, .. } = child.expect_non_asap() else { + panic!("expected BinaryOp"); + }; + let job = lhs.schema.column_id("job").expect("lhs sees job"); + assert_eq!(rhs.schema.column_id("job"), Some(job)); + assert_eq!(reduction.expect_reduce().keys(), &[job]); + assert_eq!(resolved.schema.fields[0].name, "job"); + } + + // HAVING binds against the aggregate's output, not its input. + #[test] + fn having_resolves_against_aggregate_output() { + let input = Schema::new(vec![ + Field::plain("k", DataType::Utf8, false), + Field::plain("v", DataType::Float64, false), + ]); + let unresolved = UnresolvedOp::Aggregate { + reduction: Reduction::by(vec![ColumnRef::Named("k".into())]), + measures: vec![AggIntent::Sum { + col: Some(ColumnRef::Named("v".into())), + }], + output_names: vec!["total".into()], + filters: vec![], + having: Some(UnresolvedPredicate(UnresolvedScalar::Compare { + left: Box::new(named("total")), + op: CompareOpKind::Gt, + right: Box::new(UnresolvedScalar::Literal(ScalarValue::Float64(1.0))), + semantics: ExprSemantics::Sql, + })), + child: Rc::new(UnresolvedOp::Scan { + source: Source::Table { + table_ref: "t".into(), + }, + predicates: vec![], + schema: Some(input), + }), + }; + let resolved = resolve_root(&unresolved).expect("resolves"); + let NonASAPOp::Aggregate { + having: Some(Predicate(ScalarExpr::Compare { left, .. })), + .. + } = resolved.expect_non_asap() + else { + panic!("expected Aggregate with HAVING"); + }; + assert_eq!(**left, ScalarExpr::Column(1)); + assert_eq!(resolved.schema.fields[1].name, "total"); + } + + // A join predicate binds against left ++ right; a qualified reference + // picks the right side even when both inputs share the column name. + #[test] + fn join_predicate_resolves_against_left_then_right() { + let side = |table: &str| UnresolvedOp::Scan { + source: Source::Table { + table_ref: table.into(), + }, + predicates: vec![], + schema: Some(Schema::new(vec![ + Field::plain("k", DataType::Int64, false).with_table(table) + ])), + }; + let qualified = |table: &str| { + UnresolvedScalar::Column(ColumnRef::Qualified { + table: table.into(), + name: "k".into(), + }) + }; + let unresolved = UnresolvedOp::Join { + kind: JoinKind::Inner, + pred: UnresolvedPredicate(UnresolvedScalar::Compare { + left: Box::new(qualified("b")), + op: CompareOpKind::Eq, + right: Box::new(qualified("a")), + semantics: ExprSemantics::Sql, + }), + left: Rc::new(side("a")), + right: Rc::new(side("b")), + }; + let resolved = resolve_root(&unresolved).expect("resolves"); + let NonASAPOp::Join { + pred: Predicate(ScalarExpr::Compare { left, right, .. }), + .. + } = resolved.expect_non_asap() + else { + panic!("expected Join"); + }; + assert_eq!(**left, ScalarExpr::Column(1)); + assert_eq!(**right, ScalarExpr::Column(0)); + } + + // `m * scalar(x{a="1"})`: the operator inside the scalar operand is bound + // as a root in its own scope — its matcher label seeds its own leaf, not + // the vector side's. + #[test] + fn scalar_from_vector_operand_binds_in_its_own_scope() { + let x = UnresolvedOp::Scan { + source: Source::TimeSeries { metric: "x".into() }, + predicates: vec![UnresolvedPredicate(eq_lit(named("a"), "1"))], + schema: None, + }; + let unresolved = UnresolvedOp::PromqlScalarOp { + child: Rc::new(scan("m")), + scalar: UnresolvedScalar::PromqlScalarFromVector(Rc::new(x)), + op: BinaryOpKind::Arithmetic(asap_types::pre_asap::ArithmeticOpKind::Mul), + scalar_left: false, + return_bool: false, + }; + let resolved = resolve_root(&unresolved).unwrap(); + let NonASAPOp::Project { + child: lhs, cols, .. + } = resolved.expect_non_asap() + else { + panic!("expected Project") + }; + assert!(lhs.schema.column_id("a").is_none()); + let ScalarExpr::Arithmetic { right, .. } = &cols[1].expr else { + panic!("expected arithmetic") + }; + let ScalarExpr::PromqlScalarFromVector(inner) = right.as_ref() else { + panic!("expected scalar(v)") + }; + let a = inner + .schema + .column_id("a") + .expect("own matcher label seeded"); + let NonASAPOp::Scan { predicates, .. } = inner.expect_non_asap() else { + panic!("expected Scan"); + }; + let Predicate(ScalarExpr::Compare { left, .. }) = &predicates[0] else { + panic!("expected Compare"); + }; + assert_eq!(**left, ScalarExpr::Column(a)); + assert_eq!(resolved.schema.fields.len(), lhs.schema.fields.len()); + } + + // PromQL grouping drops a key provably absent from a closed input (#53): + // `sum(sum by (group)(m)) by (job)`. + #[test] + fn nested_aggregate_drops_absent_promql_group_key() { + let inner = UnresolvedOp::Aggregate { + reduction: Reduction::by(vec![ColumnRef::Named("group".into())]), + measures: vec![AggIntent::Sum { col: None }], + output_names: vec![], + filters: vec![], + having: None, + child: Rc::new(scan("m")), + }; + let outer = UnresolvedOp::Aggregate { + reduction: Reduction::by(vec![ColumnRef::Named("job".into())]), + measures: vec![AggIntent::Sum { col: None }], + output_names: vec![], + filters: vec![], + having: None, + child: Rc::new(inner), + }; + let resolved = resolve_root(&outer).expect("resolves"); + let NonASAPOp::Aggregate { reduction, .. } = resolved.expect_non_asap() else { + panic!("expected Aggregate"); + }; + assert!(reduction.expect_reduce().keys().is_empty()); + } +} diff --git a/crates/frontend-common/src/schema_resolver.rs b/crates/frontend-common/src/schema_resolver.rs new file mode 100644 index 000000000..ad7605fe6 --- /dev/null +++ b/crates/frontend-common/src/schema_resolver.rs @@ -0,0 +1,443 @@ +//! The **SchemaResolver** — name resolution as an explicit pass. +//! +//! [`SchemaResolver::resolve_schema`] produces the complete, self-contained +//! [`Schema`] every `ColumnId` in a schemaless leaf's scope indexes into, so +//! positional resolution in [`resolve`](crate::resolve) is total. +//! +//! The default [`UsageDerivedCatalog`] knows nothing — every schema is derived +//! purely from the query's own usage. That is the honest state for the +//! observability domain (metric label sets are open-ended). A registry-backed +//! `SchemaCatalog` is future work; only the catalog impl swaps when it lands. + +use asap_types::pre_asap::{AggIntent, ColumnRef, DataType, Field, GroupKeys, Reduction, Schema}; + +use crate::unresolved::{UnresolvedOp, UnresolvedScalar}; + +/// The DB / source-schema metadata source — resolves a source (metric / +/// table) name to its known columns. Distinct from `Scan.schema`, which is +/// the *resolved* binding schema this feeds. Even a registry-backed PromQL +/// catalog yields an **open** schema: a metric's labels are per-series and +/// time-varying, so the registry is a superset hint, not a per-row contract. +pub trait SchemaCatalog { + /// Columns known for `source`. `None` when unknown — the resolver then + /// falls back to a usage-derived column set. + fn columns_for(&self, source: &str) -> Option>; +} + +/// The default catalog: knows nothing. +pub struct UsageDerivedCatalog; + +impl SchemaCatalog for UsageDerivedCatalog { + fn columns_for(&self, _source: &str) -> Option> { + None + } +} + +/// The explicit name-resolution pass. +pub struct SchemaResolver { + catalog: C, +} + +impl Default for SchemaResolver { + fn default() -> Self { + Self::new() + } +} + +impl SchemaResolver { + pub fn new() -> Self { + Self { + catalog: UsageDerivedCatalog, + } + } +} + +impl SchemaResolver { + pub fn with_catalog(catalog: C) -> Self { + Self { catalog } + } + + /// The complete [`Schema`] in scope for a query rooted at `tree`: the + /// time axis, the synthetic `value` column, and one column per distinct + /// name referenced anywhere in the tree. + pub fn resolve_schema(&self, tree: &UnresolvedOp) -> Schema { + self.resolve_schema_with_inherited(tree, &[]) + } + + /// Like [`resolve_schema`](Self::resolve_schema), but also seeds + /// `inherited` label names referenced by an **enclosing** scope rather + /// than by `tree` itself. This is how an independently-bound `BinaryOp` + /// side still sees an outer aggregate's group keys — the `__name__` / + /// `job` in `sum by (__name__)(a or b)`, which appear in neither side's + /// own matchers (issue #52). + pub fn resolve_schema_with_inherited( + &self, + tree: &UnresolvedOp, + inherited: &[String], + ) -> Schema { + let mut columns: Vec = leftmost_scan_name(tree) + .and_then(|name| self.catalog.columns_for(name)) + .unwrap_or_else(default_leaf_columns); + + // Ensure the (ts, value) floor is present. + for floor in default_leaf_columns() { + if !columns.iter().any(|c| c.name == floor.name) { + columns.push(floor); + } + } + + // One column per referenced-but-unknown name, plus the inherited ones. + let referenced = collect_referenced_columns(tree); + for name in referenced.iter().chain(inherited) { + if !columns.iter().any(|c| c.name == *name) { + columns.push(Field::plain(name.clone(), DataType::Utf8, true)); + } + } + + let time_index = columns.iter().position(|c| c.name == "ts"); + Schema { + fields: columns, + time_index, + unique_keys: Vec::new(), + // Usage-derived (schemaless PromQL): the metric's full label set is + // open and runtime-only, so this lists only what the query references. + closed: false, + } + } +} + +/// The conventional PromQL leaf shape: `(ts: Timestamp, value: Float64)`. +fn default_leaf_columns() -> Vec { + vec![ + Field::plain("ts", DataType::Timestamp, false), + Field::plain("value", DataType::Float64, false), + ] +} + +/// Push a `ColumnRef`'s bare name (the schema-seedable identifier). `Qualified` +/// collapses to its `name`; `SampleValue`/`Wildcard` carry no name. +fn push_ref_name(c: &ColumnRef, out: &mut Vec) { + match c { + ColumnRef::Named(n) => out.push(n.clone()), + ColumnRef::Qualified { name, .. } => out.push(name.clone()), + ColumnRef::SampleValue | ColumnRef::Wildcard => {} + } +} + +/// The leftmost `Scan`'s source name, following the relational skeleton only +/// (never the operators referenced from scalar positions: those are bound in +/// their own scope). +fn leftmost_scan_name(tree: &UnresolvedOp) -> Option<&str> { + use asap_types::pre_asap::Source; + use UnresolvedOp as U; + match tree { + U::Scan { source, .. } => Some(match source { + Source::TimeSeries { metric } => metric.as_str(), + Source::Table { table_ref } => table_ref.as_str(), + }), + U::Values { .. } | U::PromqlVectorFromScalar(_) => None, + U::PromqlMap { child, .. } + | U::PromqlScalarOp { child, .. } + | U::PromqlRelabel { child, .. } + | U::PromqlInfoEnrich { child, .. } + | U::PromqlSeriesSample { child, .. } + | U::Filter { child, .. } + | U::Project { child, .. } + | U::Aggregate { child, .. } + | U::Dedup { child, .. } + | U::Sort { child, .. } + | U::Limit { child, .. } + | U::PromqlSubquery { child, .. } + | U::TimeRange { child, .. } + | U::TimeShift { child, .. } + | U::SQLWindowFunc { child, .. } => leftmost_scan_name(child), + U::Concat { children, .. } => children.first().and_then(|c| leftmost_scan_name(c)), + U::Join { left, .. } | U::SetOp { left, .. } | U::BinaryOp { lhs: left, .. } => { + leftmost_scan_name(left) + } + } +} + +/// Every distinct column name referenced anywhere in `tree` that resolves +/// positionally — every place a front end puts a name-based reference: +/// `Scan.predicates`, `Aggregate`'s `reduction`/`having`/per-measure `col`, +/// `Dedup.cols`, `PromqlSeriesSample.by`, `Filter.pred`, `Project.cols`, +/// `Sort`/`Limit`/`SQLWindowFunc` keys, `Join.pred`, `PromqlRelabel.value`, +/// `Concat.discriminator_unique_key`. Operators referenced from scalar +/// positions (`scalar(v)`, subqueries) are walked too, as the old +/// `PromqlScalarFromVector` operator child was. Sorted and deduplicated. +pub fn collect_referenced_columns(tree: &UnresolvedOp) -> Vec { + use UnresolvedOp as U; + fn named(expr: &UnresolvedScalar, out: &mut Vec) { + for c in expr.columns_referenced() { + push_ref_name(c, out); + } + for op in expr.operator_refs() { + walk(op, out); + } + } + fn group_keys(g: &GroupKeys, out: &mut Vec) { + g.keys().iter().for_each(|k| push_ref_name(k, out)); + } + fn measure_cols(measures: &[AggIntent], out: &mut Vec) { + for m in measures { + for c in m.input_cols() { + push_ref_name(&c, out); + } + } + } + fn walk(node: &UnresolvedOp, out: &mut Vec) { + match node { + U::Scan { predicates, .. } => { + for p in predicates { + named(&p.0, out); + } + } + U::Values { rows, .. } => { + for e in rows.iter().flatten() { + named(e, out); + } + } + U::Aggregate { + reduction, + measures, + having, + child, + .. + } => { + if let Reduction::Reduce(by) = reduction { + group_keys(by, out); + } + measure_cols(measures, out); + if let Some(h) = having { + named(&h.0, out); + } + walk(child, out); + } + U::Dedup { cols, child } => { + cols.iter().for_each(|c| push_ref_name(c, out)); + walk(child, out); + } + U::PromqlSeriesSample { by, child, .. } => { + group_keys(by, out); + walk(child, out); + } + U::Filter { pred, child } => { + named(&pred.0, out); + walk(child, out); + } + U::Project { cols, child, .. } => { + for item in cols { + named(&item.expr, out); + } + walk(child, out); + } + U::Sort { + keys, + partition_by, + child, + } => { + for k in keys { + named(&k.expr, out); + } + group_keys(partition_by, out); + walk(child, out); + } + U::Limit { + partition_by, + child, + .. + } => { + group_keys(partition_by, out); + walk(child, out); + } + U::SQLWindowFunc { + args, + partition_by, + order_by, + child, + .. + } => { + for a in args { + named(a, out); + } + group_keys(partition_by, out); + for k in order_by { + named(&k.expr, out); + } + walk(child, out); + } + U::PromqlRelabel { value, child, .. } => { + named(value, out); + walk(child, out); + } + U::Join { + pred, left, right, .. + } => { + named(&pred.0, out); + walk(left, out); + walk(right, out); + } + U::PromqlVectorFromScalar(inner) => named(inner, out), + U::PromqlMap { child, .. } + | U::PromqlScalarOp { child, .. } + | U::PromqlInfoEnrich { child, .. } + | U::PromqlSubquery { child, .. } + | U::TimeRange { child, .. } + | U::TimeShift { child, .. } => walk(child, out), + U::Concat { + children, + discriminator_unique_key, + } => { + // An own-field `ColumnRef` must be seeded like `Dedup.cols`, or + // a discriminator column referenced nowhere else in the tree is + // absent from the fallback schema and fails `NotFound` later. + if let Some(key) = discriminator_unique_key { + push_ref_name(key.discriminator(), out); + key.inner_key().iter().for_each(|c| push_ref_name(c, out)); + } + children.iter().for_each(|c| walk(c, out)); + } + U::SetOp { left, right, .. } => { + walk(left, out); + walk(right, out); + } + U::BinaryOp { lhs, rhs, .. } => { + walk(lhs, out); + walk(rhs, out); + } + } + } + let mut out: Vec = Vec::new(); + walk(tree, &mut out); + out.sort(); + out.dedup(); + out +} + +#[cfg(test)] +mod tests { + use std::rc::Rc; + + use asap_types::pre_asap::{AggIntent, Reduction, Source}; + + use super::*; + use crate::unresolved::UnresolvedSortKey; + + fn src(name: &str) -> UnresolvedOp { + UnresolvedOp::Scan { + source: Source::TimeSeries { + metric: name.into(), + }, + predicates: vec![], + schema: None, + } + } + + // Both correlation inputs seed the usage-derived schema. + #[test] + fn pearson_corr_inputs_seed_usage_derived_schema() { + let tree = UnresolvedOp::Aggregate { + reduction: Reduction::by(vec![]), + measures: vec![AggIntent::PearsonCorr { + left: ColumnRef::Named("x".into()), + right: ColumnRef::Named("y".into()), + }], + output_names: vec![], + filters: vec![], + having: None, + child: Rc::new(src("m")), + }; + assert_eq!(collect_referenced_columns(&tree), vec!["x", "y"]); + let schema = SchemaResolver::new().resolve_schema(&tree); + assert!(schema.column_id("x").is_some()); + assert!(schema.column_id("y").is_some()); + } + + // A bare source gets exactly the (ts, value) floor. + #[test] + fn bare_source_yields_ts_value_floor() { + let schema = SchemaResolver::new().resolve_schema(&src("m")); + assert_eq!(schema.fields.len(), 2); + assert_eq!(schema.fields[0].name, "ts"); + assert_eq!(schema.fields[1].name, "value"); + assert_eq!(schema.time_index, Some(0)); + } + + // Per-group ranking keys (`topk by (host)` → `Sort.partition_by`) are + // seeded into the usage-derived leaf so they resolve positionally. + #[test] + fn sort_partition_keys_land_in_schema() { + let tree = UnresolvedOp::Sort { + keys: vec![UnresolvedSortKey { + expr: UnresolvedScalar::Column(ColumnRef::SampleValue), + ascending: false, + nulls_first: false, + }], + partition_by: GroupKeys::by(vec![ColumnRef::Named("host".into())]), + child: Rc::new(src("hits")), + }; + let schema = SchemaResolver::new().resolve_schema(&tree); + assert!(schema.column_id("host").is_some()); + } + + // `Limit.partition_by` (PromQL `topk by (..)`) is seeded like `Sort`'s. + #[test] + fn limit_partition_keys_land_in_schema() { + let tree = UnresolvedOp::Limit { + n: Some(3), + offset: 0, + partition_by: GroupKeys::by(vec![ColumnRef::Named("host".into())]), + child: Rc::new(src("hits")), + }; + let schema = SchemaResolver::new().resolve_schema(&tree); + assert!(schema.column_id("host").is_some()); + } + + // A `Concat`'s discriminator key columns, even ones referenced nowhere + // else, are seeded like `Dedup.cols` (issue #228 review). + #[test] + fn concat_discriminator_key_is_seeded_into_the_resolver_schema() { + let tree = UnresolvedOp::concat_with_discriminator( + vec![src("m")], + ColumnRef::Named("phi".into()), + vec![ColumnRef::Named("host".into())], + ); + let schema = SchemaResolver::new().resolve_schema(&tree); + assert!(schema.column_id("phi").is_some(), "discriminator seeded"); + assert!(schema.column_id("host").is_some(), "inner_key seeded"); + } + + // Inherited names are seeded alongside the tree's own references; plain + // `resolve_schema` does not conjure them (issue #52). + #[test] + fn inherited_names_are_seeded_alongside_referenced() { + let schema = + SchemaResolver::new().resolve_schema_with_inherited(&src("m"), &["__name__".into()]); + assert!(schema.column_id("__name__").is_some()); + let plain = SchemaResolver::new().resolve_schema(&src("m")); + assert!(plain.column_id("__name__").is_none()); + } + + // A catalog-known source supplies its base columns, typed as the catalog says. + #[test] + fn custom_catalog_supplies_base_columns() { + struct FixedCatalog; + impl SchemaCatalog for FixedCatalog { + fn columns_for(&self, source: &str) -> Option> { + (source == "known").then(|| { + vec![ + Field::plain("ts", DataType::Timestamp, false), + Field::plain("value", DataType::Float64, false), + Field::plain("datacenter", DataType::Utf8, false), + ] + }) + } + } + let schema = SchemaResolver::with_catalog(FixedCatalog).resolve_schema(&src("known")); + let dc = schema + .column_id("datacenter") + .and_then(|id| schema.fields.get(id)); + assert!(matches!(dc, Some(c) if !c.nullable)); + } +} diff --git a/crates/frontend-common/src/unresolved.rs b/crates/frontend-common/src/unresolved.rs new file mode 100644 index 000000000..0bca427cc --- /dev/null +++ b/crates/frontend-common/src/unresolved.rs @@ -0,0 +1,374 @@ +//! The front-end-emitted, name-based operator tree: a mirror of the unified +//! IR ([`NonASAPOp`](asap_types::ir::NonASAPOp) / [`ScalarExpr`](asap_types::ir::ScalarExpr)) +//! before name resolution. +//! +//! Differences from the resolved IR, and nothing else: +//! - every `ColumnId` is a name-based [`ColumnRef`]; +//! - `Scan.schema` is `Option` — a front end knows the schema only for +//! a catalog-backed SQL leaf; `None` (PromQL) defers to the +//! [`SchemaResolver`](crate::schema_resolver::SchemaResolver); +//! - children are `Rc` rather than `Rc` — no +//! derived schema exists yet. + +use std::rc::Rc; +use std::time::Duration; + +use serde::{Deserialize, Serialize}; + +use asap_types::ir::operator_properties::ConcatDiscriminatorKey; +use asap_types::ir::BinaryOperator; +use asap_types::ir::{ExprSemantics, TimeRangeKind}; +use asap_types::pre_asap::{ + AggIntent, ArithmeticOpKind, ColumnRef, CompareOpKind, DataType, GroupKeys, InfoMatcher, + JoinKind, Reduction, RelationalSetOpKind, SampleKind, ScalarValue, Schema, Source, TimeShift, + WindowFrame, WindowFuncKind, +}; + +/// A row-level filter predicate (WHERE clause / PromQL label matcher). +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +pub struct UnresolvedPredicate(pub UnresolvedScalar); + +/// One item in a SELECT projection list. +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +pub struct UnresolvedProjectItem { + pub alias: Option, + pub expr: UnresolvedScalar, +} + +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +pub struct UnresolvedSortKey { + pub expr: UnresolvedScalar, + pub ascending: bool, + pub nulls_first: bool, +} + +/// A name-based scalar expression; see +/// [`ScalarExpr`](asap_types::ir::ScalarExpr) for the meaning of each variant. +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +pub enum UnresolvedScalar { + Column(ColumnRef), + Literal(ScalarValue), + Negative { + expr: Box, + semantics: ExprSemantics, + }, + Compare { + left: Box, + op: CompareOpKind, + right: Box, + semantics: ExprSemantics, + }, + BoolAnd(Vec), + BoolOr(Vec), + Not(Box), + IsNull(Box), + IsNotNull(Box), + Cast { + expr: Box, + to: DataType, + try_cast: bool, + }, + InList { + expr: Box, + list: Vec, + negated: bool, + }, + FunctionCall { + name: String, + args: Vec, + }, + Arithmetic { + op: ArithmeticOpKind, + left: Box, + right: Box, + semantics: ExprSemantics, + }, + Case { + operand: Option>, + branches: Vec<(UnresolvedScalar, UnresolvedScalar)>, + else_expr: Option>, + }, + CurrentTimestamp, + EvalTimestamp, + /// PromQL `scalar(v)`. The operator is resolved as a root in its own scope. + PromqlScalarFromVector(Rc), + ScalarSubquery(Rc), + Exists { + subquery: Rc, + negated: bool, + }, + InSubquery { + expr: Box, + subquery: Rc, + negated: bool, + }, +} + +/// The name-based operator tree; see [`NonASAPOp`](asap_types::ir::NonASAPOp) +/// for the meaning of each variant. +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +pub enum UnresolvedOp { + Scan { + source: Source, + predicates: Vec, + /// `Some` for a catalog-backed (SQL) leaf; `None` defers to the + /// usage-derived schema resolver. + schema: Option, + }, + Values { + rows: Vec>, + schema: Schema, + }, + Filter { + pred: UnresolvedPredicate, + child: Rc, + }, + Project { + cols: Vec, + qualifier: Option, + child: Rc, + }, + Aggregate { + reduction: Reduction, + measures: Vec>, + output_names: Vec, + filters: Vec>, + having: Option, + child: Rc, + }, + Join { + kind: JoinKind, + pred: UnresolvedPredicate, + left: Rc, + right: Rc, + }, + SetOp { + kind: RelationalSetOpKind, + all: bool, + left: Rc, + right: Rc, + }, + Concat { + children: Vec>, + discriminator_unique_key: Option>, + }, + Dedup { + cols: Vec, + child: Rc, + }, + Sort { + keys: Vec, + partition_by: GroupKeys, + child: Rc, + }, + Limit { + n: Option, + offset: usize, + partition_by: GroupKeys, + child: Rc, + }, + BinaryOp { + operator: BinaryOperator, + return_bool: bool, + lhs: Rc, + rhs: Rc, + }, + SQLWindowFunc { + func: WindowFuncKind, + args: Vec, + partition_by: GroupKeys, + order_by: Vec, + frame: Option, + output_name: String, + child: Rc, + }, + TimeRange { + range: Duration, + kind: TimeRangeKind, + child: Rc, + }, + TimeShift { + shift: TimeShift, + child: Rc, + }, + PromqlVectorFromScalar(UnresolvedScalar), + PromqlRelabel { + dst: String, + value: UnresolvedScalar, + child: Rc, + }, + PromqlInfoEnrich { + selector: Vec, + child: Rc, + }, + PromqlSeriesSample { + by: GroupKeys, + kind: SampleKind, + child: Rc, + }, + PromqlSubquery { + range: Duration, + resolution: Option, + child: Rc, + }, + /// Bind the complete vector schema before lowering to Project or Filter. + /// Frontend-only expansion to a projection preserving the complete series identity. + PromqlMap { + child: Rc, + sample: UnresolvedScalar, + drop_metric_name: bool, + }, + PromqlScalarOp { + child: Rc, + scalar: UnresolvedScalar, + op: asap_types::pre_asap::BinaryOpKind, + scalar_left: bool, + return_bool: bool, + }, +} + +impl UnresolvedScalar { + /// The direct scalar sub-expressions (not the operators this expression + /// reads — see [`operator_refs`](Self::operator_refs)). + pub fn children(&self) -> Vec<&UnresolvedScalar> { + use UnresolvedScalar::*; + match self { + Column(_) + | Literal(_) + | CurrentTimestamp + | EvalTimestamp + | PromqlScalarFromVector(_) + | ScalarSubquery(_) + | Exists { .. } => vec![], + Negative { expr, .. } + | Not(expr) + | IsNull(expr) + | IsNotNull(expr) + | Cast { expr, .. } + | InSubquery { expr, .. } => vec![expr], + Compare { left, right, .. } | Arithmetic { left, right, .. } => vec![left, right], + BoolAnd(parts) | BoolOr(parts) => parts.iter().collect(), + InList { expr, list, .. } => { + let mut v = vec![expr.as_ref()]; + v.extend(list.iter()); + v + } + FunctionCall { args, .. } => args.iter().collect(), + Case { + operand, + branches, + else_expr, + } => { + let mut v = Vec::new(); + if let Some(op) = operand { + v.push(op.as_ref()); + } + for (when, then) in branches { + v.push(when); + v.push(then); + } + if let Some(e) = else_expr { + v.push(e.as_ref()); + } + v + } + } + } + + /// Every column referenced in this expression, not inside the operators + /// it reads (those have their own scope). + pub fn columns_referenced(&self) -> Vec<&ColumnRef> { + let mut out = Vec::new(); + self.collect_columns(&mut out); + out + } + + fn collect_columns<'a>(&'a self, out: &mut Vec<&'a ColumnRef>) { + if let UnresolvedScalar::Column(c) = self { + out.push(c); + } + for child in self.children() { + child.collect_columns(out); + } + } + + /// The operators this expression (transitively) reads. + pub fn operator_refs(&self) -> Vec<&Rc> { + let mut out = Vec::new(); + self.collect_operator_refs(&mut out); + out + } + + fn collect_operator_refs<'a>(&'a self, out: &mut Vec<&'a Rc>) { + use UnresolvedScalar::*; + match self { + PromqlScalarFromVector(op) | ScalarSubquery(op) => out.push(op), + Exists { subquery, .. } | InSubquery { subquery, .. } => out.push(subquery), + _ => {} + } + for child in self.children() { + child.collect_operator_refs(out); + } + } +} + +impl UnresolvedOp { + /// An ordinary `Concat` (no unique-key claim). + pub fn concat(children: Vec) -> Self { + UnresolvedOp::Concat { + children: children.into_iter().map(Rc::new).collect(), + discriminator_unique_key: None, + } + } + + /// A `Concat` whose output carries the caller-proven compound unique key + /// `(discriminator, inner_key)`. Nothing verifies the claim. + pub fn concat_with_discriminator( + children: Vec, + discriminator: ColumnRef, + inner_key: Vec, + ) -> Self { + UnresolvedOp::Concat { + children: children.into_iter().map(Rc::new).collect(), + discriminator_unique_key: Some(ConcatDiscriminatorKey::new(discriminator, inner_key)), + } + } + + /// Every scalar expression this operator owns. + pub fn scalar_exprs(&self) -> Vec<&UnresolvedScalar> { + use UnresolvedOp::*; + match self { + Scan { predicates, .. } => predicates.iter().map(|p| &p.0).collect(), + Values { rows, .. } => rows.iter().flatten().collect(), + Filter { pred, .. } | Join { pred, .. } => vec![&pred.0], + Project { cols, .. } => cols.iter().map(|c| &c.expr).collect(), + Aggregate { + filters, having, .. + } => filters + .iter() + .flatten() + .chain(having.iter()) + .map(|p| &p.0) + .collect(), + Sort { keys, .. } => keys.iter().map(|k| &k.expr).collect(), + SQLWindowFunc { args, order_by, .. } => args + .iter() + .chain(order_by.iter().map(|k| &k.expr)) + .collect(), + PromqlVectorFromScalar(e) => vec![e], + PromqlScalarOp { scalar, .. } => vec![scalar], + PromqlMap { sample, .. } => vec![sample], + PromqlRelabel { value, .. } => vec![value], + SetOp { .. } + | Concat { .. } + | Dedup { .. } + | Limit { .. } + | BinaryOp { .. } + | TimeRange { .. } + | TimeShift { .. } + | PromqlInfoEnrich { .. } + | PromqlSeriesSample { .. } + | PromqlSubquery { .. } => vec![], + } + } +} diff --git a/crates/frontend-metricsql/Cargo.toml b/crates/frontend-metricsql/Cargo.toml index 8fa341b80..cba166f7c 100644 --- a/crates/frontend-metricsql/Cargo.toml +++ b/crates/frontend-metricsql/Cargo.toml @@ -5,5 +5,6 @@ edition = "2021" [dependencies] asap-types = { path = "../types" } +asap-frontend-common = { path = "../frontend-common" } metricsql_parser = { path = "../metricsql-parser-vendored" } thiserror = "2" diff --git a/crates/frontend-metricsql/src/lib.rs b/crates/frontend-metricsql/src/lib.rs index 26a034c43..3544a9801 100644 --- a/crates/frontend-metricsql/src/lib.rs +++ b/crates/frontend-metricsql/src/lib.rs @@ -1,11 +1,14 @@ -//! MetricsQL AST to canonical `QueryExpr` frontend. +//! MetricsQL AST → the name-based `UnresolvedOp` tree → the unified operator DAG. use std::{rc::Rc, time::Duration}; +use asap_frontend_common::{ + resolve_root, UnresolvedOp as U, UnresolvedPredicate, UnresolvedScalar, +}; +use asap_types::ir::{BinaryOperator, ExprSemantics, OperatorNode, TimeRangeKind}; use asap_types::pre_asap::{ - resolve_root, AggIntent, ArithmeticOpKind, BinaryOpKind, ColumnRef, CompareOpKind, GroupKeys, - Predicate, PromQLVectorSetOpKind, QueryExpr, Reduction, ScalarValue, Source, - UnresolvedQueryExpr as U, + AggIntent, ArithmeticOpKind, BinaryOpKind, ColumnRef, CompareOpKind, GroupKeys, + PromQLVectorSetOpKind, Reduction, ScalarValue, Source, }; use asap_types::types::AccuracyTarget; use metricsql_parser::ast::{AggregateModifier, DurationExpr, Expr, MetricExpr, RollupExpr}; @@ -33,10 +36,31 @@ pub fn canonical_metricsql(query: &str) -> Result { Ok(parse_metricsql(query)?.to_string()) } -pub fn lower_metricsql(query: &str, accuracy: AccuracyTarget) -> Result { +pub fn lower_metricsql( + query: &str, + accuracy: AccuracyTarget, +) -> Result, MetricsqlError> { + match lower_metricsql_query(query, accuracy)? { + asap_types::ir::QueryRoot::Operator(node) => Ok(node), + _ => Err(unsupported("scalar root: use lower_metricsql_query")), + } +} + +/// Lower scalar constants without fabricating a relational operator. +pub fn lower_metricsql_query( + query: &str, + accuracy: AccuracyTarget, +) -> Result { let ast = parse_metricsql(query)?; + if let Expr::NumberLiteral(number) = &ast { + return Ok(asap_types::ir::QueryRoot::Scalar( + asap_types::ir::ScalarExpr::literal_f64(number.value), + )); + } let unresolved = Lowerer { accuracy }.lower(&ast)?; - resolve_root(&unresolved).map_err(|e| MetricsqlError::Resolve(e.to_string())) + resolve_root(&unresolved) + .map(asap_types::ir::QueryRoot::Operator) + .map_err(|e| MetricsqlError::Resolve(e.to_string())) } struct Lowerer { @@ -50,12 +74,16 @@ impl Lowerer { Expr::Rollup(e) => self.rollup(e), Expr::Function(e) => self.function(e), Expr::Aggregation(e) => self.aggregate(e), - Expr::NumberLiteral(e) => Ok(U::promql_scalar(e.value)), - Expr::UnaryOperator(e) => Ok(U::BinaryOp { + Expr::NumberLiteral(_) => { + Err(unsupported("scalar root requires lower_metricsql_query")) + } + // Vector negation is `x * -1` (as in the PromQL front end). + Expr::UnaryOperator(e) => Ok(U::PromqlScalarOp { + child: Rc::new(self.lower(&e.expr)?), + scalar: UnresolvedScalar::Literal(ScalarValue::Float64(-1.0)), op: BinaryOpKind::Arithmetic(ArithmeticOpKind::Mul), - lhs: Rc::new(self.lower(&e.expr)?), - rhs: Rc::new(U::promql_scalar(-1.0)), - vector_match: None, + scalar_left: false, + return_bool: false, }), Expr::BinaryOperator(e) => self.binary(e), Expr::Parens(e) if e.expressions.len() == 1 => self.lower(&e.expressions[0]), @@ -83,7 +111,7 @@ impl Lowerer { }, predicates: filters .into_iter() - .map(|f| Predicate(Rc::new(matcher(f)))) + .map(|f| UnresolvedPredicate(matcher(f))) .collect(), schema: None, }) @@ -101,6 +129,7 @@ impl Lowerer { None => Ok(child), Some(window) => Ok(U::TimeRange { range: duration(window)?, + kind: TimeRangeKind::Range, child: Rc::new(child), }), } @@ -258,12 +287,41 @@ impl Lowerer { return Err(unsupported(format!("MetricsQL operator `{}`", expr.op))) } }; - Ok(U::BinaryOp { + for (scalar, vector, scalar_left) in [ + (&expr.left, &expr.right, true), + (&expr.right, &expr.left, false), + ] { + if let Expr::NumberLiteral(n) = scalar.as_ref() { + return Ok(U::PromqlScalarOp { + child: Rc::new(self.lower(vector)?), + scalar: UnresolvedScalar::Literal(ScalarValue::Float64(n.value)), + op, + scalar_left, + return_bool: false, + }); + } + } + Ok(binary_op( op, - lhs: Rc::new(self.lower(&expr.left)?), - rhs: Rc::new(self.lower(&expr.right)?), + self.lower(&expr.left)?, + self.lower(&expr.right)?, + )) + } +} + +/// A `BinaryOp` with default matching; MetricsQL modifiers (including `bool`) +/// are rejected before reaching here. +fn binary_op(kind: BinaryOpKind, lhs: U, rhs: U) -> U { + U::BinaryOp { + operator: BinaryOperator { + kind, vector_match: None, - }) + checked_relative_division: false, + checked_finite_division: false, + }, + return_bool: false, + lhs: Rc::new(lhs), + rhs: Rc::new(rhs), } } @@ -282,17 +340,22 @@ fn aggregate(reduction: Reduction, intent: AggIntent, chil } } -fn matcher(filter: &LabelFilter) -> U { +fn matcher(filter: &LabelFilter) -> UnresolvedScalar { let op = match filter.op { LabelFilterOp::Equal => CompareOpKind::Eq, LabelFilterOp::NotEqual => CompareOpKind::Ne, LabelFilterOp::RegexEqual => CompareOpKind::Regex, LabelFilterOp::RegexNotEqual => CompareOpKind::NotRegex, }; - U::Compare { - left: Rc::new(U::Column(ColumnRef::Named(filter.label.clone()))), + UnresolvedScalar::Compare { + left: Box::new(UnresolvedScalar::Column(ColumnRef::Named( + filter.label.clone(), + ))), op, - right: Rc::new(U::Literal(ScalarValue::Utf8(filter.value.clone()))), + right: Box::new(UnresolvedScalar::Literal(ScalarValue::Utf8( + filter.value.clone(), + ))), + semantics: ExprSemantics::Promql, } } diff --git a/crates/frontend-metricsql/tests/lowering.rs b/crates/frontend-metricsql/tests/lowering.rs index 3add8ee2a..ef828d04d 100644 --- a/crates/frontend-metricsql/tests/lowering.rs +++ b/crates/frontend-metricsql/tests/lowering.rs @@ -1,62 +1,65 @@ +use std::rc::Rc; use std::time::Duration; use asap_frontend_metricsql::{ canonical_metricsql, lower_metricsql, parse_metricsql, MetricsqlError, }; -use asap_types::pre_asap::{AggIntent, QueryExpr, Reduction, Source}; +use asap_types::ir::{NonASAPOp, OperatorNode, TimeRangeKind}; +use asap_types::pre_asap::{AggIntent, Reduction, Source}; use asap_types::types::AccuracyTarget; -fn lower(query: &str) -> QueryExpr { +fn lower(query: &str) -> Rc { lower_metricsql(query, AccuracyTarget::Epsilon(0.01)).unwrap() } #[test] fn selector_range_aggregate_and_call_share_the_canonical_shape() { let query = r#"sum by (job) (rate(http_requests_total{status=~"5.."}[5m]))"#; - let dag = lower(query); - let QueryExpr::Aggregate { + let tree = lower(query); + let NonASAPOp::Aggregate { reduction, measures, child, .. - } = dag + } = tree.expect_non_asap() else { panic!("expected outer aggregate"); }; - assert_eq!(reduction, Reduction::by(vec![2])); + assert_eq!(reduction, &Reduction::by(vec![2])); assert!(matches!(measures.as_slice(), [AggIntent::Sum { .. }])); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = child.as_ref() + } = child.expect_non_asap() else { panic!("expected rate aggregate"); }; assert!(matches!(measures.as_slice(), [AggIntent::Rate])); - let QueryExpr::TimeRange { range, child } = child.as_ref() else { + let NonASAPOp::TimeRange { range, child, .. } = child.expect_non_asap() else { panic!("expected range"); }; assert_eq!(*range, Duration::from_secs(300)); assert!( - matches!(child.as_ref(), QueryExpr::Scan { source: Source::TimeSeries { metric }, predicates, .. } if metric == "http_requests_total" && predicates.len() == 1) + matches!(child.expect_non_asap(), NonASAPOp::Scan { source: Source::TimeSeries { metric }, predicates, .. } if metric == "http_requests_total" && predicates.len() == 1) ); } #[test] fn default_rollup_with_explicit_range_is_last_over_time() { - let dag = lower("default_rollup(cpu_usage[5m])"); - let QueryExpr::Aggregate { + let tree = lower("default_rollup(cpu_usage[5m])"); + let NonASAPOp::Aggregate { reduction, measures, child, .. - } = dag + } = tree.expect_non_asap() else { panic!("expected aggregate"); }; - assert_eq!(reduction, Reduction::PerEntity); + assert_eq!(reduction, &Reduction::PerEntity); assert!(matches!(measures.as_slice(), [AggIntent::LastOverTime])); assert!( - matches!(child.as_ref(), QueryExpr::TimeRange { range, .. } if *range == Duration::from_secs(300)) + matches!(child.expect_non_asap(), NonASAPOp::TimeRange { range, kind, .. } + if *range == Duration::from_secs(300) && *kind == TimeRangeKind::Range) ); } @@ -147,7 +150,13 @@ fn metricsql_multi_argument_aggregates_fail_closed() { #[test] fn supported_parameterized_functions_require_their_exact_arity() { let quantile = lower("quantile(0.9, requests_total)"); - assert!(matches!(quantile, QueryExpr::Aggregate { .. })); + assert!(matches!( + quantile.expect_non_asap(), + NonASAPOp::Aggregate { .. } + )); let rollup = lower("quantile_over_time(0.9, requests_total[5m])"); - assert!(matches!(rollup, QueryExpr::Aggregate { .. })); + assert!(matches!( + rollup.expect_non_asap(), + NonASAPOp::Aggregate { .. } + )); } diff --git a/crates/frontend-promql/Cargo.toml b/crates/frontend-promql/Cargo.toml index b108e32c7..569c87c9a 100644 --- a/crates/frontend-promql/Cargo.toml +++ b/crates/frontend-promql/Cargo.toml @@ -3,10 +3,12 @@ name = "asap-frontend-promql" version = "0.1.0" edition = "2021" -# PromQL front end: L1 (parse) → L2 relational, then the shared L2→L3 converter -# — both in asap-types. Pulls the PromQL parser only — never DataFusion. +# PromQL front end: parse → the shared name-based `UnresolvedOp` tree +# (asap-frontend-common) → the unified IR. Pulls the PromQL parser only — +# never DataFusion. [dependencies] asap-types = { path = "../types" } +asap-frontend-common = { path = "../frontend-common" } # Shared ProjectASAP parser contract. Keep this immutable revision aligned # with backend parsing and treat newly parsed functions as unsupported until diff --git a/crates/frontend-promql/src/error.rs b/crates/frontend-promql/src/error.rs index 6f996b11d..ebbcf49c2 100644 --- a/crates/frontend-promql/src/error.rs +++ b/crates/frontend-promql/src/error.rs @@ -1,12 +1,12 @@ use std::fmt; -use asap_types::pre_asap::ResolveDAGError; +use asap_frontend_common::ResolveDAGError; use asap_types::workload::WorkloadError; -/// Errors from lowering a PromQL query (parse → the canonical, unresolved -/// DAG, built directly → -/// [`resolve_root`](asap_types::pre_asap::resolve_root) binds it to the -/// resolved DAG, issue #179). +/// Errors from lowering a PromQL query (parse → the name-based unresolved +/// tree, built directly → +/// [`resolve_root`](asap_frontend_common::resolve_root) binds it to the +/// unified operator DAG, issue #179). /// /// Carries no DataFusion type — the PromQL front end never depends on the SQL /// stack. The language-neutral variants (`UnsupportedFeature` / `WrongLanguage` diff --git a/crates/frontend-promql/src/histogram.rs b/crates/frontend-promql/src/histogram.rs index f3f971a55..ecb8cd2c4 100644 --- a/crates/frontend-promql/src/histogram.rs +++ b/crates/frontend-promql/src/histogram.rs @@ -1,18 +1,10 @@ //! Sample-type metadata for the `histogram_quantile` discrimination (issue #79). //! -//! `histogram_quantile(φ, m)` has two lowerings: exact interpolation over -//! classic cumulative `le` buckets (`AggIntent::HistogramQuantile`, **not** -//! sketch-able) versus the generic sketch-able `Quantile` (native histograms / -//! raw samples, which post-ASAP binding can approximate to an accuracy -//! target). The true -//! signal is the argument's **sample type**, which query structure only -//! *proxies* — see the structural `is_classic_bucket_arg` heuristic, whose -//! false-positive (`…_bucket`-named non-histogram) and false-negative -//! (suffix-less classic histogram) cases this metadata fixes. -//! -//! A client that knows its sample types supplies a [`HistogramCatalog`]; it is -//! consulted first, and the structural heuristic remains the fallback when a -//! metric is undeclared. +//! Classic cumulative buckets use exact interpolation. The explicitly declared +//! `RawSamples` extension permits generic quantile sketches; it is not standard +//! PromQL histogram semantics. Native samples are rejected until the IR has a +//! native histogram sample type. Undeclared metrics require classic bucket +//! evidence (`by (le)`, a `_bucket` metric, or an `le` matcher). use std::cell::RefCell; use std::collections::HashMap; @@ -25,7 +17,7 @@ pub enum HistogramKind { /// distribution can't be reconstructed from them, so it is **not** /// sketch-able: `histogram_quantile` is exact bucket interpolation. ClassicBucket, - /// Native (exponential) histogram — sketch-able to an accuracy target. + /// Native histogram samples; currently rejected because the IR lacks their type. Native, /// Raw float samples the client retains — sketch-able. This is the case the /// generic `Quantile` lowering exists for (a client holding raw samples can @@ -37,7 +29,7 @@ impl HistogramKind { /// Whether `histogram_quantile` over this kind lowers to the sketch-able /// generic `Quantile` (`true`) rather than exact bucket interpolation. pub fn is_sketchable(self) -> bool { - !matches!(self, HistogramKind::ClassicBucket) + matches!(self, HistogramKind::RawSamples) } } @@ -106,9 +98,9 @@ mod tests { use super::*; #[test] - fn only_classic_buckets_are_not_sketchable() { + fn only_explicit_raw_samples_are_sketchable() { assert!(!HistogramKind::ClassicBucket.is_sketchable()); - assert!(HistogramKind::Native.is_sketchable()); + assert!(!HistogramKind::Native.is_sketchable()); assert!(HistogramKind::RawSamples.is_sketchable()); } diff --git a/crates/frontend-promql/src/lib.rs b/crates/frontend-promql/src/lib.rs index 31b169359..e7d99fe4c 100644 --- a/crates/frontend-promql/src/lib.rs +++ b/crates/frontend-promql/src/lib.rs @@ -1,25 +1,26 @@ -//! PromQL front end: parse (via `promql-parser`) → the canonical, unresolved -//! shape, built directly (issue #179) → [`resolve_root`]. +//! PromQL front end: parse (via `promql-parser`) → the name-based +//! [`UnresolvedOp`](asap_frontend_common::UnresolvedOp) tree, built directly +//! in canonical shape (issue #179) → [`resolve_root`]. //! -//! Emits [`UnresolvedQueryExpr`](asap_types::pre_asap::UnresolvedQueryExpr) itself — the -//! canonical `QueryExpr`, generic over an unresolved -//! [`ColumnRef`](asap_types::pre_asap::ColumnRef) — directly, rather than a -//! separate per-language relational DAG; `resolve_root` runs the -//! [`SchemaResolver`](asap_types::pre_asap::SchemaResolver) for positional name resolution. -//! Depends on the PromQL parser only — never on the SQL / DataFusion stack. +//! `resolve_root` runs the +//! [`SchemaResolver`](asap_frontend_common::SchemaResolver) for positional +//! name resolution and returns the unified +//! [`OperatorNode`](asap_types::ir::OperatorNode) DAG. Depends on the PromQL +//! parser only — never on the SQL / DataFusion stack. pub mod error; pub mod histogram; pub mod promql; -use asap_types::pre_asap::resolve_root; -use asap_types::pre_asap::QueryExpr; +use std::rc::Rc; + +use asap_types::ir::OperatorNode; use asap_types::workload::{DurationMs, PlanningWorkload, QueryLanguage, WorkloadError}; pub use error::PromqlError; pub use histogram::{HistogramCatalog, HistogramKind}; -/// Lower every normalized PromQL workload entry to a plan-ready `QueryExpr`. +/// Lower every normalized PromQL workload entry to a plan-ready operator DAG. /// /// PromQL workloads must declare a non-zero `data_ingestion_interval`; it is /// injected around each bare instant selector. Explicit range selectors keep @@ -29,7 +30,7 @@ pub use histogram::{HistogramCatalog, HistogramKind}; pub fn lower_promql_workload( workload: &PlanningWorkload, now_ms: u64, -) -> Result, PromqlError> { +) -> Result>, PromqlError> { lower_promql_workload_inner(workload, now_ms) } @@ -39,15 +40,47 @@ pub fn lower_promql_workload_with_histograms( workload: &PlanningWorkload, histograms: HistogramCatalog, now_ms: u64, -) -> Result, PromqlError> { +) -> Result>, PromqlError> { let _guard = histogram::CatalogGuard::install(histograms); lower_promql_workload_inner(workload, now_ms) } +/// Lower scalar and vector query roots without introducing constant operators. +pub fn lower_promql_query_workload( + workload: &PlanningWorkload, + now_ms: u64, +) -> Result, PromqlError> { + lower_promql_query_workload_inner(workload, now_ms) +} + +pub fn lower_promql_query_workload_with_histograms( + workload: &PlanningWorkload, + histograms: HistogramCatalog, + now_ms: u64, +) -> Result, PromqlError> { + let _guard = histogram::CatalogGuard::install(histograms); + lower_promql_query_workload_inner(workload, now_ms) +} + fn lower_promql_workload_inner( workload: &PlanningWorkload, now_ms: u64, -) -> Result, PromqlError> { +) -> Result>, PromqlError> { + lower_promql_query_workload_inner(workload, now_ms)? + .into_iter() + .map(|root| match root { + asap_types::ir::QueryRoot::Operator(node) => Ok(node), + asap_types::ir::QueryRoot::Scalar(_) => Err(PromqlError::UnsupportedFeature( + "scalar root: use lower_promql_query_workload".into(), + )), + }) + .collect() +} + +fn lower_promql_query_workload_inner( + workload: &PlanningWorkload, + now_ms: u64, +) -> Result, PromqlError> { if !matches!(workload.query_workload.language, QueryLanguage::PromQL) { return Err(PromqlError::WrongLanguage(format!( "{:?}", @@ -66,12 +99,12 @@ fn lower_promql_workload_inner( .query_workload .entries() .map(|entry| { - let unresolved = promql::PromqlLowerer::lower_with_ingestion_interval( + let root = promql::PromqlLowerer::lower_query_with_ingestion_interval( &entry.query.0, &entry.requirements.accuracy.target(), std::time::Duration::from_millis(interval_ms), )?; - Ok(resolve_root(&unresolved)?) + Ok(root) }) .collect() } @@ -123,7 +156,7 @@ mod tests { } use std::time::Duration; - use asap_types::pre_asap::QueryExpr; + use asap_types::ir::{NonASAPOp, TimeRangeKind}; use asap_types::workload::{ BatchEntry, DataWorkload, Evidence, PlanningWorkload, Query, QueryRequirements, QueryWorkload, TimeSelection, @@ -155,27 +188,34 @@ mod tests { } } + // A bare instant selector reads the latest sample within the declared + // ingestion interval: an `Instant` lookback of that length. #[test] fn instant_selector_uses_declared_ingestion_interval() { let query = lower_promql_workload(&workload("sum by (job) (data)"), 0).unwrap(); - let QueryExpr::Aggregate { child, .. } = &query[0] else { + let NonASAPOp::Aggregate { child, .. } = query[0].expect_non_asap() else { panic!("expected aggregate") }; assert!( - matches!(child.as_ref(), QueryExpr::TimeRange { range, child } - if *range == Duration::from_secs(1) && matches!(child.as_ref(), QueryExpr::Scan { .. })) + matches!(child.expect_non_asap(), NonASAPOp::TimeRange { range, kind, child } + if *range == Duration::from_secs(1) + && *kind == TimeRangeKind::Instant + && matches!(child.expect_non_asap(), NonASAPOp::Scan { .. })) ); } + // An explicit `m[5m]` keeps its own window as a `Range` selection. #[test] fn explicit_range_selector_keeps_its_query_range() { let query = lower_promql_workload(&workload("sum_over_time(data[5m])"), 0).unwrap(); - let QueryExpr::Aggregate { child, .. } = &query[0] else { + let NonASAPOp::Aggregate { child, .. } = query[0].expect_non_asap() else { panic!("expected aggregate") }; assert!( - matches!(child.as_ref(), QueryExpr::TimeRange { range, child } - if *range == Duration::from_secs(300) && matches!(child.as_ref(), QueryExpr::Scan { .. })) + matches!(child.expect_non_asap(), NonASAPOp::TimeRange { range, kind, child } + if *range == Duration::from_secs(300) + && *kind == TimeRangeKind::Range + && matches!(child.expect_non_asap(), NonASAPOp::Scan { .. })) ); } diff --git a/crates/frontend-promql/src/promql.rs b/crates/frontend-promql/src/promql.rs index 83251053e..42b39eb60 100644 --- a/crates/frontend-promql/src/promql.rs +++ b/crates/frontend-promql/src/promql.rs @@ -1,14 +1,13 @@ -//! PromQL string → the canonical, unresolved -//! [`UnresolvedQueryExpr`](asap_types::pre_asap::query_expr::UnresolvedQueryExpr) -//! (`QueryExpr`). +//! PromQL string → the name-based +//! [`UnresolvedOp`](asap_frontend_common::UnresolvedOp) tree. //! //! - **Parsing** is delegated to `promql-parser` 0.8. //! - **Lowering** builds *directly in canonical shape* here (issue #179): the //! walk interprets PromQL semantics (range vectors, aggregate operators, -//! label matchers) and emits `UnresolvedQueryExpr` nodes with unresolved -//! `ColumnRef`s — the same DAG shape -//! [`resolve_root`](asap_types::pre_asap::resolve_root) later binds to -//! canonical, positional `QueryExpr`. The structural decisions a +//! label matchers) and emits `UnresolvedOp` / `UnresolvedScalar` nodes with +//! unresolved `ColumnRef`s — the same tree shape +//! [`resolve_root`](asap_frontend_common::resolve_root) later binds to the +//! positional [`OperatorNode`](asap_types::ir::OperatorNode) DAG. The structural decisions a //! separate converter stage would otherwise have to make (heavy-hitter //! `topk` recognition, the `PerEntity`/`Reduce` reduction choice, //! `without(...)` grouping) are made right here, since a front end @@ -38,9 +37,11 @@ //! | `increase(m[w])` | `Aggregate{[Increase], TimeRange{w}}` | //! | `changes`/`delta`/`idelta`/`deriv`/`resets`/`predict_linear`/`double_exponential_smoothing`(`m[w]`, …) | `Aggregate{[Changes/Delta/…], TimeRange{w}}` — per-series counter-derivative intents (issue #44) | //! | `absent(v)` / `absent_over_time(m[w])` / `present_over_time(m[w])` | `Aggregate{[Absent/AbsentOverTime/PresentOverTime]}` — presence intents; the empty→synthesized-sample logic is a post-ASAP concern (issue #47) | -//! | `abs`/`ceil`/`sqrt`/`ln`/`clamp*`/`round`/trig(`v`), `pi()` | `Aggregate{[Math(f)]}` element-wise transform (issue #45); `pi()` → a `PromqlScalarBridge` leaf | -//! | `time()` / `timestamp`/`hour`/`day_of_week`/… (`v`) | `EvalTimestamp` leaf / `Aggregate{[TimeFn(f)]}` (issue #46) | -//! | `vector(s)` / `scalar(v)` | `PromqlVectorFromScalar` / `PromqlScalarFromVector` — the scalar⇄vector bridges (issue #48) | +//! | `abs`/`ceil`/`sqrt`/`ln`/`clamp*`/`round`/trig(`v`), `pi()` | typed scalar `Project` (issue #45); `pi()` → a `ScalarExpr::Literal` root | +//! | `time()` / `timestamp`/`hour`/`day_of_week`/… (`v`) | `ScalarExpr::EvalTimestamp` root / `Aggregate{[TimeFn(f)]}` (issue #46) | +//! | `vector(s)` / `scalar(v)` | `PromqlVectorFromScalar(s)` / `ScalarExpr::PromqlScalarFromVector(v)` — the scalar⇄vector bridges (issue #48) | +//! | ` op ` (`time() - 1`, `1 < bool 2`, `-time()`) | `ScalarExpr::{Arithmetic, Case, Negative}` — a scalar expression, never an operator | +//! | `v op `, `a op bool b`, `v > bool 0` | `Project`/`Filter` with owned scalar expressions; vector/vector uses `BinaryOp{return_bool}` | //! | `label_replace(v,…)` / `label_join(v,…)` | `PromqlRelabel{dst, value}` — per-series label rewrite; value unchanged (issue #50) | //! | `info(v, [selector])` | `PromqlInfoEnrich{selector}` — label-enrichment join against the info metric(s); join keys resolved during post-ASAP binding (issue #84) | //! | `group` / `offset` / `@` / `info` | **rejected** — distinct semantics with no intent-algebra representation yet (`info` label-join → #84) | @@ -50,7 +51,7 @@ //! | `limitk(k, v)` / `limit_ratio(r, v)` | `PromqlSeriesSample{LimitK(k) \| LimitRatio(r)}` — series-sampling selection, whole series kept unchanged (issue #86) | //! | `topk(k, count_over_time(…))` / `topk(k, sum_over_time(…))` | `Aggregate{[TopK{k}]}` (heavy-hitter intent) over the explicit inner `Aggregate{[Count/Sum]}` | //! | `topk(k, )` / `bottomk(k, …)` | `Sort{value} → Limit{k}` | -//! | `m{f}` | `Scan{predicates}` | +//! | `m{f}` / `m{f}[w]` | `TimeRange{ingestion, Instant, Scan{predicates}}` / `TimeRange{w, Range, Scan}` | //! | `a OP b` | `BinaryOp{vector_match}` | //! | `expr[r:res]` | `PromqlSubquery{r, res}` | //! | ` offset ` / ` @ `/`start()`/`end()` | `TimeShift{shift}` over the selector's `Scan` — pass-through schema; a ranged selector shifts under its `TimeRange` (issue #40) | @@ -59,22 +60,30 @@ use std::rc::Rc; use std::time::{Duration, SystemTime}; use promql_parser::label::{MatchOp, Matcher}; +use promql_parser::parser::value::ValueType; use promql_parser::parser::{ self, token, AggregateExpr, AtModifier as ParserAtModifier, BinaryExpr, Call, Expr, LabelModifier, Offset, VectorMatchCardinality, VectorSelector, }; -use asap_types::pre_asap::agg_intent::{topk, AggIntent, MathFunc, TimeFunc}; -use asap_types::pre_asap::query_expr::{ - AtModifier, BinaryOpKind, GroupKeys, GroupSide, Predicate, PromQLVectorSetOpKind, Reduction, - SortKey, Source, TimeShift, UnresolvedQueryExpr as Unresolved, VectorGrouping, VectorMatch, - VectorMatchKind, +use asap_frontend_common::{ + UnresolvedOp as Unresolved, UnresolvedPredicate, UnresolvedScalar as Scalar, UnresolvedSortKey, }; +use asap_types::ir::operator_properties::{ + AtModifier, BinaryOpKind, GroupKeys, GroupSide, PromQLVectorSetOpKind, Reduction, Source, + TimeShift, VectorGrouping, VectorMatch, VectorMatchKind, +}; +use asap_types::ir::{BinaryOperator, ExprSemantics, TimeRangeKind}; +use asap_types::pre_asap::agg_intent::{topk, AggIntent, TimeFunc}; + use asap_types::pre_asap::{ ArithmeticOpKind, ColumnRef, CompareOpKind, InfoMatcher, SampleKind, ScalarValue, }; use asap_types::types::AccuracyTarget; +/// Every scalar expression this front end builds follows PromQL's numeric rules. +const PROMQL: ExprSemantics = ExprSemantics::Promql; + use crate::error::PromqlError as LoweringError; type Result = std::result::Result; @@ -158,7 +167,7 @@ enum InnerFunc { struct Inner { metric: String, - matchers: Vec, + matchers: Vec, window: Option, func: Option, /// `offset` / `@` on the selector, carried to the `Source` (issue #40). @@ -172,16 +181,35 @@ struct Inner { const MAX_DEPTH: usize = 256; impl PromqlLowerer { - pub(crate) fn lower_with_ingestion_interval( + pub(crate) fn lower_query_with_ingestion_interval( query: &str, accuracy: &AccuracyTarget, interval: Duration, - ) -> Result { + ) -> Result { let _guard = AccuracyGuard::install(accuracy.clone()); let _interval = IngestionIntervalGuard::install(interval); let ast = parser::parse(query).map_err(LoweringError::Parse)?; check_depth(&ast, MAX_DEPTH)?; - walk(&ast) + let mut metrics = Vec::new(); + collect_metric_names(&ast, &mut metrics); + if metrics.iter().any(|metric| { + crate::histogram::current_kind_of(metric) + == Some(crate::histogram::HistogramKind::Native) + }) { + return Err(LoweringError::UnsupportedFeature( + "native histogram samples have no IR representation".into(), + )); + } + + if ast.value_type() == ValueType::Scalar { + Ok(asap_types::ir::QueryRoot::Scalar( + asap_frontend_common::resolve_scalar_root(&lower_scalar(&ast)?)?, + )) + } else { + Ok(asap_types::ir::QueryRoot::Operator( + asap_frontend_common::resolve_root(&walk(&ast)?)?, + )) + } } } @@ -273,6 +301,13 @@ fn check_depth(expr: &Expr, budget: usize) -> Result<()> { } fn walk(expr: &Expr) -> Result { + // A scalar-typed expression (`5`, `time() - 1`, `scalar(v)`, `1 < bool 2`) + // is a scalar expression at an operator position, never an operator tree. + if expr.value_type() == ValueType::Scalar { + return Err(LoweringError::UnsupportedFeature( + "scalar root requires query-root lowering".into(), + )); + } match expr { Expr::Aggregate(agg) => walk_aggregate(agg), Expr::Call(call) if call.func.name.starts_with("histogram_") => walk_histogram(call), @@ -282,31 +317,22 @@ fn walk(expr: &Expr) -> Result { Expr::Call(call) if is_typeconv_fn(call.func.name) => walk_typeconv(call), Expr::Call(call) if is_label_fn(call.func.name) => walk_label(call), Expr::Call(call) if is_sort_fn(call.func.name) => walk_sort(call), - // A bare `min_of`/`max_of(consts…)` scalar query folds to a `PromqlScalarBridge` - // leaf; a non-constant argument makes `num_expr` fail → rejected (#89). - Expr::Call(call) if is_scalar_reducer_fn(call.func.name) => { - Ok(Unresolved::promql_scalar(num_expr(expr)?)) - } Expr::Call(call) if call.func.name == "info" => walk_info(call), Expr::Call(call) => walk_call(call), Expr::Binary(bin) => walk_binary(bin), Expr::Paren(p) => walk(&p.expr), // `UnaryExpr` is built only by negation (`Neg`); unary `+` is folded to - // identity and `-` to a negated `NumberLiteral`, so this wraps a - // sub-expression whose samples must be sign-flipped. Now that a scalar - // operand exists (#35), express it as `x * -1` — a constant-foldable - // operand (`-(10*1024)`) collapses to a negated `PromqlScalarBridge` leaf; anything - // else is a vector, sign-flipped by a `Mul` against `PromqlScalarBridge(-1)`. `Mul` - // is commutative, so operand order carries no hazard (#36). - Expr::Unary(u) => match num_expr(&u.expr) { - Ok(v) => Ok(Unresolved::promql_scalar(-v)), - Err(_) => Ok(Unresolved::BinaryOp { - op: BinaryOpKind::Arithmetic(ArithmeticOpKind::Mul), - lhs: Rc::new(walk(&u.expr)?), - rhs: Rc::new(Unresolved::promql_scalar(-1.0)), - vector_match: None, - }), - }, + // identity and `-` to a negated `NumberLiteral`. A scalar + // operand was dispatched to `lower_scalar` above (→ `Negative`), so this + // is a vector projection. Unary negation retains the metric name. + Expr::Unary(u) => Ok(Unresolved::PromqlMap { + child: Rc::new(walk(&u.expr)?), + sample: Scalar::Negative { + expr: Box::new(Scalar::Column(ColumnRef::SampleValue)), + semantics: ExprSemantics::Promql, + }, + drop_metric_name: false, + }), Expr::Subquery(sq) => { let subquery = Unresolved::PromqlSubquery { range: sq.range, @@ -332,13 +358,14 @@ fn walk(expr: &Expr) -> Result { let (metric, matchers, shift) = vs_parts(&ms.vs)?; Ok(Unresolved::TimeRange { range: ms.range, + kind: TimeRangeKind::Range, child: Rc::new(filtered_source(metric, matchers, shift)), }) } - // A number literal is a scalar leaf (`v > 5`, or a bare scalar query - // `5`). String literals only appear as function args (`label_replace`, - // …), which are not supported, so reject them (issue #35). - Expr::NumberLiteral(n) => Ok(Unresolved::promql_scalar(n.val)), + // Scalar-typed, dispatched above; kept for exhaustiveness. String + // literals only appear as function args (`label_replace`, …), so a + // bare one is rejected (issue #35). + Expr::NumberLiteral(_) => unreachable!("scalar handled above"), Expr::StringLiteral(_) => Err(LoweringError::UnsupportedFeature( "bare string literal".into(), )), @@ -348,6 +375,98 @@ fn walk(expr: &Expr) -> Result { } } +/// Lower a scalar-typed PromQL expression to a scalar expression. A constant +/// sub-expression folds to one `Literal` (as `num_expr` always did); anything +/// else keeps its structure: `-time()` → `Negative`, `time() - 1` → +/// `Arithmetic`, `scalar(v)` → `PromqlScalarFromVector`, and a `bool` +/// comparison → `Case(Compare → 1, else 0)` (PromQL yields `0`/`1`). +fn lower_scalar(expr: &Expr) -> Result { + if let Ok(v) = num_expr(expr) { + return Ok(Scalar::Literal(ScalarValue::Float64(v))); + } + match expr { + Expr::Paren(p) => lower_scalar(&p.expr), + Expr::Unary(u) => Ok(Scalar::Negative { + expr: Box::new(lower_scalar(&u.expr)?), + semantics: PROMQL, + }), + Expr::Binary(bin) => lower_scalar_binary(bin), + Expr::Call(call) => match call.func.name { + "time" => Ok(Scalar::EvalTimestamp), + "pi" => Ok(Scalar::Literal(ScalarValue::Float64(std::f64::consts::PI))), + "scalar" => Ok(Scalar::PromqlScalarFromVector(Rc::new(walk(arg( + call, 0, + )?)?))), + // `min_of`/`max_of` fold only over constants (#89); the fold above + // failed, so surface its error for the non-constant argument. + name if is_scalar_reducer_fn(name) => Err(num_expr(expr).unwrap_err()), + other => Err(LoweringError::UnsupportedFunction(other.to_string())), + }, + other => Err(LoweringError::UnsupportedFeature(format!( + "scalar expression `{other}`" + ))), + } +} + +/// ` op `: arithmetic is an `Arithmetic` expression; a +/// comparison needs the `bool` modifier (PromQL has no scalar filter) and +/// becomes `Case(Compare → 1.0, else 0.0)`. The parser already rejects both a +/// bool-less scalar comparison and a scalar set op; both are re-checked here. +fn lower_scalar_binary(bin: &BinaryExpr) -> Result { + let left = Box::new(lower_scalar(&bin.lhs)?); + let right = Box::new(lower_scalar(&bin.rhs)?); + match binop(bin.op.id())? { + BinaryOpKind::Arithmetic(op) => Ok(Scalar::Arithmetic { + op, + left, + right, + semantics: PROMQL, + }), + BinaryOpKind::Compare(op) | BinaryOpKind::CompareBool(op) => { + if !bin.return_bool() { + return Err(LoweringError::InvalidParameter( + "a comparison between two scalars requires the `bool` modifier".into(), + )); + } + let compare = Scalar::Compare { + left, + op, + right, + semantics: PROMQL, + }; + Ok(Scalar::Case { + operand: None, + branches: vec![(compare, Scalar::Literal(ScalarValue::Float64(1.0)))], + else_expr: Some(Box::new(Scalar::Literal(ScalarValue::Float64(0.0)))), + }) + } + BinaryOpKind::Set(_) => Err(LoweringError::UnsupportedFeature( + "set operator between two scalars".into(), + )), + } +} + +/// A binary operation over two vectors. +fn vector_binary( + kind: BinaryOpKind, + vector_match: Option, + return_bool: bool, + lhs: Unresolved, + rhs: Unresolved, +) -> Unresolved { + Unresolved::BinaryOp { + operator: BinaryOperator { + kind, + vector_match, + checked_relative_division: false, + checked_finite_division: false, + }, + return_bool, + lhs: Rc::new(lhs), + rhs: Rc::new(rhs), + } +} + /// Lower a bare function call (`rate(m[5m])`, `max_over_time(m[5m])`, …). /// /// The common case routes through the flat `lower_inner_call` template. The one @@ -576,7 +695,7 @@ fn outer_kind(agg: &AggregateExpr) -> Result { /// build this node) decides `PerEntity` vs `Reduce(by)` *without* knowing /// about `without` yet — it only ever sees `by`-mode keys, since `without`'s /// excluded-labels list is applied here, after the fact, exactly like the -/// pre-#179 legacy `relational::QueryExpr` DAG's own `mark_without` did (its +/// pre-#179 legacy relational tree's own `mark_without` did (its /// converter read `without` only after this front-end step had already set /// it). Whether /// `reduction_for` picked `PerEntity` (only possible when `keys` was empty) @@ -652,24 +771,36 @@ fn build_over_sub_dag(outer: Outer, keys: Vec, child: Unresolved) -> child, )); } - let sorted = Unresolved::Sort { - keys: vec![SortKey { - expr: Unresolved::Column(ColumnRef::SampleValue), - ascending: !descending, - nulls_first: false, - }], - partition_by: keys.into(), - child: Rc::new(child), - }; - Unresolved::Limit { - n: k as usize, - offset: 0, - child: Rc::new(sorted), - } + ranked_by_value(keys, k, descending, child) } }) } +/// Generic `topk`/`bottomk`: `Limit{k} → Sort{value, partition_by: keys}` over +/// `child` — an order-by-value ranking, not a heavy-hitter intent. +fn ranked_by_value( + keys: Vec, + k: u64, + descending: bool, + child: Unresolved, +) -> Unresolved { + let sorted = Unresolved::Sort { + keys: vec![UnresolvedSortKey { + expr: Scalar::Column(ColumnRef::SampleValue), + ascending: !descending, + nulls_first: false, + }], + partition_by: keys.into(), + child: Rc::new(child), + }; + Unresolved::Limit { + n: Some(k as usize), + offset: 0, + partition_by: GroupKeys::none(), + child: Rc::new(sorted), + } +} + /// The `histogram_*` function family (issues #43, histogram_quantile). /// /// `histogram_quantile(φ, )` lowers `` in full — preserving any @@ -696,7 +827,7 @@ fn walk_histogram(call: &Call) -> Result { // The true signal is the argument's sample type: a declared // `HistogramKind` (issue #79) drives the choice when available, else we // fall back to the structural `by (le)`/`_bucket` heuristic (issue #43). - if !histogram_arg_is_sketchable(arg_expr) { + if !histogram_arg_is_sketchable(arg_expr)? { return Ok(classic_histogram_quantile(phi, "", walk(arg_expr)?)); } let func = AggIntent::Quantile { @@ -706,23 +837,9 @@ fn walk_histogram(call: &Call) -> Result { }; return Ok(outer_aggregate(vec![], func, walk(arg_expr)?)); } - // (histogram_quantile handled above; accessors below) - let (func, vec_idx) = match call.func.name { - "histogram_count" => (AggIntent::HistogramCount, 0), - "histogram_sum" => (AggIntent::HistogramSum, 0), - "histogram_avg" => (AggIntent::HistogramAvg, 0), - "histogram_stddev" => (AggIntent::HistogramStdDev, 0), - "histogram_stdvar" => (AggIntent::HistogramStdVar, 0), - "histogram_fraction" => ( - AggIntent::HistogramFraction { - lower: num_arg(call, 0)?, - upper: num_arg(call, 1)?, - }, - 2, - ), - other => return Err(LoweringError::UnsupportedFunction(other.to_string())), - }; - Ok(outer_aggregate(vec![], func, walk(arg(call, vec_idx)?)?)) + Err(LoweringError::UnsupportedFeature( + "native histogram samples have no IR representation".into(), + )) } /// Classic-bucket `histogram_quantile(φ, child)`. One histogram is the set of @@ -769,7 +886,7 @@ fn walk_histogram_quantiles(call: &Call) -> Result { )); } // The bucket-vs-native choice is a property of the argument, not of φ. - let sketchable = histogram_arg_is_sketchable(vec_expr); + let sketchable = histogram_arg_is_sketchable(vec_expr)?; let branches = (2..call.args.args.len()) .map(|i| { let phi = bounded_quantile_param(num_arg(call, i)?)?; @@ -796,9 +913,7 @@ fn walk_histogram_quantiles(call: &Call) -> Result { }; Ok(Unresolved::PromqlRelabel { dst: label.clone(), - value: Rc::new(Unresolved::Literal(ScalarValue::Utf8(open_metrics_float( - phi, - )))), + value: Scalar::Literal(ScalarValue::Utf8(open_metrics_float(phi))), child: Rc::new(quantile), }) }) @@ -852,12 +967,12 @@ fn open_metrics_float(v: f64) -> String { } } -/// The time / calendar functions (issue #46). +/// The calendar functions (issue #46); `time()` is scalar-typed and lowers in +/// `lower_scalar`. fn is_time_fn(name: &str) -> bool { matches!( name, - "time" - | "timestamp" + "timestamp" | "minute" | "hour" | "day_of_week" @@ -869,33 +984,31 @@ fn is_time_fn(name: &str) -> bool { ) } -/// `time()` → the `EvalTimestamp` leaf. `timestamp(v)` and the calendar accessors → -/// `Aggregate{[TimeFn(f)]}` over the argument vector, or over `EvalTimestamp` for the +/// `timestamp(v)` and the calendar accessors → `Aggregate{[TimeFn(f)]}` over +/// the argument vector, or over `PromqlVectorFromScalar(EvalTimestamp)` for the /// no-argument calendar forms (`hour()`, `day_of_week()`, …). Issue #46. fn walk_time(call: &Call) -> Result { - if call.func.name == "time" { - return Ok(Unresolved::EvalTimestamp); + // timestamp() reads the selected sample's timestamp, not its value. + if call.func.name == "timestamp" { + return Ok(outer_aggregate( + vec![], + AggIntent::TimeFn(TimeFunc::Timestamp), + walk(arg(call, 0)?)?, + )); } - let func = match call.func.name { - "timestamp" => TimeFunc::Timestamp, - "minute" => TimeFunc::Minute, - "hour" => TimeFunc::Hour, - "day_of_week" => TimeFunc::DayOfWeek, - "day_of_month" => TimeFunc::DayOfMonth, - "day_of_year" => TimeFunc::DayOfYear, - "month" => TimeFunc::Month, - "year" => TimeFunc::Year, - "days_in_month" => TimeFunc::DaysInMonth, - other => return Err(LoweringError::UnsupportedFunction(other.to_string())), - }; - // A calendar function with no argument reads the evaluation time; otherwise - // it maps over each sample's timestamp in the argument vector. - let inner = if call.args.args.is_empty() { - Unresolved::EvalTimestamp + let child = if call.args.args.is_empty() { + Unresolved::PromqlVectorFromScalar(Scalar::EvalTimestamp) } else { walk(arg(call, 0)?)? }; - Ok(outer_aggregate(vec![], AggIntent::TimeFn(func), inner)) + Ok(Unresolved::PromqlMap { + child: Rc::new(child), + sample: Scalar::FunctionCall { + name: format!("promql_{}", call.func.name), + args: vec![Scalar::Column(ColumnRef::SampleValue)], + }, + drop_metric_name: true, + }) } /// The presence functions (issue #47). @@ -919,24 +1032,19 @@ fn walk_presence(call: &Call) -> Result { Ok(outer_aggregate(vec![], func, walk(arg(call, 0)?)?)) } -/// The scalar⇄vector type-conversion functions (issue #48). `info` is *not* -/// here: it is a label-enrichment join against info metrics, not a type -/// conversion, so it falls through to the `UnsupportedFunction` path (#84). +/// The scalar→vector conversion (issue #48); `scalar(v)` is scalar-typed and +/// lowers in `lower_scalar`. `info` is *not* here: it is a label-enrichment +/// join, not a type conversion (#84). fn is_typeconv_fn(name: &str) -> bool { - matches!(name, "vector" | "scalar") + name == "vector" } -/// `vector(s)` — promote a scalar to a label-less instant vector. `scalar(v)` -/// — collapse a single-element vector to its value. Both are honest bridge -/// nodes in the IR; the "exactly one element → NaN otherwise" runtime rule of -/// `scalar` is a post-ASAP/runtime concern (issue #48). +/// `vector(s)` — promote a scalar to a label-less instant vector carrying the +/// scalar expression `s` (issue #48). fn walk_typeconv(call: &Call) -> Result { - let inner = walk(arg(call, 0)?)?; - Ok(match call.func.name { - "vector" => Unresolved::PromqlVectorFromScalar(Rc::new(inner)), - "scalar" => Unresolved::PromqlScalarFromVector(Rc::new(inner)), - other => return Err(LoweringError::UnsupportedFunction(other.to_string())), - }) + Ok(Unresolved::PromqlVectorFromScalar(lower_scalar(arg( + call, 0, + )?)?)) } /// The instant-vector reordering functions (issue #51). @@ -960,13 +1068,13 @@ fn walk_sort(call: &Call) -> Result { "sort_by_label_desc" => (false, false), other => return Err(LoweringError::UnsupportedFunction(other.to_string())), }; - let sort_key = |expr| SortKey { + let sort_key = |expr| UnresolvedSortKey { expr, ascending, nulls_first: false, }; let keys = if by_value { - vec![sort_key(Unresolved::Column(ColumnRef::SampleValue))] + vec![sort_key(Scalar::Column(ColumnRef::SampleValue))] } else { // `sort_by_label(v, "l1", "l2", …)` — one key per label arg, in order. if call.args.args.len() < 2 { @@ -976,7 +1084,7 @@ fn walk_sort(call: &Call) -> Result { } (1..call.args.args.len()) .map(|i| { - Ok(sort_key(Unresolved::Column(ColumnRef::Named(str_arg( + Ok(sort_key(Scalar::Column(ColumnRef::Named(str_arg( call, i, )?)))) }) @@ -1050,19 +1158,15 @@ fn walk_label(call: &Call) -> Result { let replacement = str_arg(call, 2)?; let src = str_arg(call, 3)?; let regex = str_arg(call, 4)?; - let value = Unresolved::FunctionCall { + let value = Scalar::FunctionCall { name: "label_replace".into(), args: vec![ - Unresolved::Column(ColumnRef::Named(src)), - Unresolved::Literal(ScalarValue::Utf8(regex)), - Unresolved::Literal(ScalarValue::Utf8(replacement)), + Scalar::Column(ColumnRef::Named(src)), + Scalar::Literal(ScalarValue::Utf8(regex)), + Scalar::Literal(ScalarValue::Utf8(replacement)), ], }; - Ok(Unresolved::PromqlRelabel { - dst, - value: Rc::new(value), - child, - }) + Ok(Unresolved::PromqlRelabel { dst, value, child }) } "label_join" => { // label_join(v, dst, sep, src_1, …, src_n) — needs ≥1 source label. @@ -1073,19 +1177,15 @@ fn walk_label(call: &Call) -> Result { } let dst = str_arg(call, 1)?; let sep = str_arg(call, 2)?; - let mut args = vec![Unresolved::Literal(ScalarValue::Utf8(sep))]; + let mut args = vec![Scalar::Literal(ScalarValue::Utf8(sep))]; for i in 3..call.args.args.len() { - args.push(Unresolved::Column(ColumnRef::Named(str_arg(call, i)?))); + args.push(Scalar::Column(ColumnRef::Named(str_arg(call, i)?))); } - let value = Unresolved::FunctionCall { + let value = Scalar::FunctionCall { name: "label_join".into(), args, }; - Ok(Unresolved::PromqlRelabel { - dst, - value: Rc::new(value), - child, - }) + Ok(Unresolved::PromqlRelabel { dst, value, child }) } other => Err(LoweringError::UnsupportedFunction(other.to_string())), } @@ -1118,7 +1218,6 @@ fn is_math_fn(name: &str) -> bool { | "atanh" | "deg" | "rad" - | "pi" | "round" | "clamp" | "clamp_min" @@ -1127,59 +1226,24 @@ fn is_math_fn(name: &str) -> bool { } /// A math / trig function — a per-series element-wise value transform, lowered -/// to a per-series `Aggregate{[Math(f)]}` over the (instant) argument vector. -/// `pi()` is the constant π, lowered to a `PromqlScalarBridge` leaf (issue #45). +/// to a typed scalar projection over the instant-vector argument. +/// `pi()` is scalar-typed and lowers in `lower_scalar` (issue #45). fn walk_math(call: &Call) -> Result { - if call.func.name == "pi" { - return Ok(Unresolved::promql_scalar(std::f64::consts::PI)); + let mut args = vec![Scalar::Column(ColumnRef::SampleValue)]; + for index in 1..call.args.args.len() { + args.push(lower_scalar(arg(call, index)?)?); } - let func = match call.func.name { - "abs" => MathFunc::Abs, - "ceil" => MathFunc::Ceil, - "floor" => MathFunc::Floor, - "exp" => MathFunc::Exp, - "ln" => MathFunc::Ln, - "log2" => MathFunc::Log2, - "log10" => MathFunc::Log10, - "sqrt" => MathFunc::Sqrt, - "sgn" => MathFunc::Sgn, - "sin" => MathFunc::Sin, - "cos" => MathFunc::Cos, - "tan" => MathFunc::Tan, - "asin" => MathFunc::Asin, - "acos" => MathFunc::Acos, - "atan" => MathFunc::Atan, - "sinh" => MathFunc::Sinh, - "cosh" => MathFunc::Cosh, - "tanh" => MathFunc::Tanh, - "asinh" => MathFunc::Asinh, - "acosh" => MathFunc::Acosh, - "atanh" => MathFunc::Atanh, - "deg" => MathFunc::Deg, - "rad" => MathFunc::Rad, - // `round(v)` defaults the step to 1; `round(v, to)` reads arg 1. - "round" => MathFunc::Round { - to_nearest: if call.args.args.len() >= 2 { - num_arg(call, 1)? - } else { - 1.0 - }, - }, - "clamp" => MathFunc::Clamp { - min: num_arg(call, 1)?, - max: num_arg(call, 2)?, - }, - "clamp_min" => MathFunc::ClampMin { - min: num_arg(call, 1)?, - }, - "clamp_max" => MathFunc::ClampMax { - max: num_arg(call, 1)?, + if call.func.name == "round" && args.len() == 1 { + args.push(Scalar::Literal(ScalarValue::Float64(1.0))); + } + Ok(Unresolved::PromqlMap { + child: Rc::new(walk(arg(call, 0)?)?), + sample: Scalar::FunctionCall { + name: format!("promql_{}", call.func.name), + args, }, - other => return Err(LoweringError::UnsupportedFunction(other.to_string())), - }; - // The value being transformed is always arg 0 (a vector). - let inner = walk(arg(call, 0)?)?; - Ok(outer_aggregate(vec![], AggIntent::Math(func), inner)) + drop_metric_name: true, + }) } /// Whether `expr` is a **classic cumulative-bucket** `histogram_quantile` @@ -1202,15 +1266,31 @@ fn walk_math(call: &Call) -> Result { /// declared `RawSamples`) and the false-negative (a suffix-less classic /// histogram declared `ClassicBucket`) of the structural heuristic. With no /// declaration, fall back to the structural `by (le)`/`_bucket` heuristic. -fn histogram_arg_is_sketchable(arg: &Expr) -> bool { +fn histogram_arg_is_sketchable(arg: &Expr) -> Result { let mut metrics = Vec::new(); collect_metric_names(arg, &mut metrics); - for metric in &metrics { - if let Some(kind) = crate::histogram::current_kind_of(metric) { - return kind.is_sketchable(); + let kinds = metrics + .iter() + .filter_map(|metric| crate::histogram::current_kind_of(metric)) + .collect::>(); + if kinds.contains(&crate::histogram::HistogramKind::Native) { + return Err(LoweringError::UnsupportedFeature( + "native histogram samples have no IR representation".into(), + )); + } + if let Some(kind) = kinds.first() { + if kinds.iter().any(|other| other != kind) { + return Err(LoweringError::UnsupportedFeature( + "mixed histogram sample contracts".into(), + )); } + return Ok(kind.is_sketchable()); + } + if is_classic_bucket_arg(arg) { + Ok(false) + } else { + Err(LoweringError::UnsupportedFeature("histogram_quantile requires classic buckets; use quantile for float samples or explicitly declare the RawSamples extension".into())) } - !is_classic_bucket_arg(arg) } /// Collect the metric names of every vector/matrix selector reachable in `expr` @@ -1282,9 +1362,28 @@ fn selector_is_bucket(vs: &VectorSelector) -> bool { || vs.matchers.matchers.iter().any(|m| m.name == "le") } +/// A binary op with at least one vector operand (a scalar/scalar op is +/// scalar-typed and never reaches here). A scalar side lowers to a +/// scalar expression; mixed operations resolve to Project or Filter. fn walk_binary(bin: &BinaryExpr) -> Result { - let lhs = scalar_or_vector(&bin.lhs)?; - let rhs = scalar_or_vector(&bin.rhs)?; + let op = binop(bin.op.id())?; + let scalar_left = bin.lhs.value_type() == ValueType::Scalar; + if scalar_left || bin.rhs.value_type() == ValueType::Scalar { + let (scalar, vector) = if scalar_left { + (&bin.lhs, &bin.rhs) + } else { + (&bin.rhs, &bin.lhs) + }; + return Ok(Unresolved::PromqlScalarOp { + child: Rc::new(walk(vector)?), + scalar: lower_scalar(scalar)?, + op, + scalar_left, + return_bool: bin.return_bool(), + }); + } + let lhs = walk(&bin.lhs)?; + let rhs = walk(&bin.rhs)?; // `VectorMatch` has no fill field; dropping fill would change which series // are emitted and their values, so the query must fall back to exact // execution instead. @@ -1295,10 +1394,6 @@ fn walk_binary(bin: &BinaryExpr) -> Result { ))); } } - let op = match (binop(bin.op.id())?, bin.return_bool()) { - (BinaryOpKind::Compare(op), true) => BinaryOpKind::CompareBool(op), - (op, _) => op, - }; let vector_match = bin.modifier.as_ref().map(|m| { let (kind, labels) = match &m.matching { Some(LabelModifier::Include(ls)) => (VectorMatchKind::On, ls.labels.clone()), @@ -1329,12 +1424,7 @@ fn walk_binary(bin: &BinaryExpr) -> Result { grouping, } }); - Ok(Unresolved::BinaryOp { - op, - lhs: Rc::new(lhs), - rhs: Rc::new(rhs), - vector_match, - }) + Ok(vector_binary(op, vector_match, bin.return_bool(), lhs, rhs)) } fn lower_inner(expr: &Expr) -> Result { @@ -1601,20 +1691,7 @@ fn build(inner: Inner, keys: Vec, outer: Outer) -> Result Some(intent) => windowed_aggregate(inner, vec![], intent), None => instant_source(inner.metric, inner.matchers, inner.shift), }; - let sorted = Unresolved::Sort { - keys: vec![SortKey { - expr: Unresolved::Column(ColumnRef::SampleValue), - ascending: !descending, - nulls_first: false, - }], - partition_by: keys.into(), - child: Rc::new(base), - }; - Ok(Unresolved::Limit { - n: k as usize, - offset: 0, - child: Rc::new(sorted), - }) + Ok(ranked_by_value(keys, k, descending, base)) } } } @@ -1650,19 +1727,12 @@ fn windowed_aggregate( let child = match inner.window { Some(w) => Unresolved::TimeRange { range: w, + kind: TimeRangeKind::Range, child: Rc::new(base), }, - None => base, + None => ingestion_lookback(base), }; let reduction = reduction_for(&keys, inner.window.is_some() || intent.is_per_series()); - let child = if inner.window.is_none() { - Unresolved::TimeRange { - range: current_ingestion_interval(), - child: Rc::new(child), - } - } else { - child - }; Unresolved::Aggregate { reduction, measures: vec![intent], @@ -1715,13 +1785,10 @@ fn per_series_aggregate( } } -fn filtered_source(metric: String, matchers: Vec, shift: TimeShift) -> Unresolved { +fn filtered_source(metric: String, matchers: Vec, shift: TimeShift) -> Unresolved { let scan = Unresolved::Scan { source: Source::TimeSeries { metric }, - predicates: matchers - .into_iter() - .map(|m| Predicate(Rc::new(m))) - .collect(), + predicates: matchers.into_iter().map(UnresolvedPredicate).collect(), // Usage-derived (PromQL is schemaless) — the SchemaResolver fills this in. schema: None, }; @@ -1735,10 +1802,17 @@ fn filtered_source(metric: String, matchers: Vec, shift: TimeShift) } } -fn instant_source(metric: String, matchers: Vec, shift: TimeShift) -> Unresolved { +/// An instant selector: the latest sample per series within the workload's +/// ingestion interval, so the lookback is an `Instant` `TimeRange`. +fn instant_source(metric: String, matchers: Vec, shift: TimeShift) -> Unresolved { + ingestion_lookback(filtered_source(metric, matchers, shift)) +} + +fn ingestion_lookback(child: Unresolved) -> Unresolved { Unresolved::TimeRange { range: current_ingestion_interval(), - child: Rc::new(filtered_source(metric, matchers, shift)), + kind: TimeRangeKind::Instant, + child: Rc::new(child), } } @@ -1881,7 +1955,7 @@ fn resolve_group(agg: &AggregateExpr) -> Result<(Vec, bool)> { // ── Free helpers ────────────────────────────────────────────────────────────── -fn vs_parts(vs: &VectorSelector) -> Result<(String, Vec, TimeShift)> { +fn vs_parts(vs: &VectorSelector) -> Result<(String, Vec, TimeShift)> { // A non-equality `__name__` matcher (`=~` / `!~` / `!=`) selects *across* // metric names. `Source::TimeSeries { metric }` carries a single concrete // metric name, so there is no representation for a regex/negated name @@ -1961,21 +2035,22 @@ fn system_time_ms(t: SystemTime) -> Result { }) } -fn matcher_to_compare(m: &Matcher) -> Unresolved { +fn matcher_to_compare(m: &Matcher) -> Scalar { let op = match &m.op { MatchOp::Equal => CompareOpKind::Eq, MatchOp::NotEqual => CompareOpKind::Ne, MatchOp::Re(_) => CompareOpKind::Regex, MatchOp::NotRe(_) => CompareOpKind::NotRegex, }; - Unresolved::Compare { - left: Rc::new(Unresolved::Column(ColumnRef::Named(m.name.clone()))), + Scalar::Compare { + left: Box::new(Scalar::Column(ColumnRef::Named(m.name.clone()))), op, - right: Rc::new(Unresolved::Literal(ScalarValue::Utf8(m.value.clone()))), + right: Box::new(Scalar::Literal(ScalarValue::Utf8(m.value.clone()))), + semantics: PROMQL, } } -fn extract_matrix(expr: &Expr) -> Result<(String, Vec, Duration, TimeShift)> { +fn extract_matrix(expr: &Expr) -> Result<(String, Vec, Duration, TimeShift)> { match expr { Expr::MatrixSelector(ms) => { let (metric, matchers, shift) = vs_parts(&ms.vs)?; @@ -2017,6 +2092,7 @@ fn num_expr(expr: &Expr) -> Result { match expr { Expr::NumberLiteral(n) => Ok(n.val), Expr::Paren(p) => num_expr(&p.expr), + Expr::Unary(u) => Ok(-num_expr(&u.expr)?), // Constant-fold a pure scalar arithmetic expression — the parser does // not fold `10*1024*1024` / `24 * 3600`. A `modifier` (vector matching) // or a non-arithmetic operator means it is not a pure scalar. @@ -2074,15 +2150,6 @@ fn is_scalar_reducer_fn(name: &str) -> bool { matches!(name, "min_of" | "max_of") } -/// A `BinaryOp` operand: fold a pure-scalar expression (`5`, `10*1024*1024`) to -/// a `PromqlScalarBridge` leaf, otherwise walk it as a vector (issue #35). -fn scalar_or_vector(expr: &Expr) -> Result { - match num_expr(expr) { - Ok(v) => Ok(Unresolved::promql_scalar(v)), - Err(_) => walk(expr), - } -} - /// `topk`/`bottomk` count parameter — a non-negative integer. Rejects /// fractional / negative / non-finite values rather than silently truncating /// or saturating them via `as u64` (`topk(2.7, …)` ≠ `topk(2, …)`). diff --git a/crates/frontend-promql/tests/count_planning.rs b/crates/frontend-promql/tests/count_planning.rs index 3d3b65651..fd43c9954 100644 --- a/crates/frontend-promql/tests/count_planning.rs +++ b/crates/frontend-promql/tests/count_planning.rs @@ -1,19 +1,19 @@ //! Query text through summary selection: counts use observations, never value weights. -use std::rc::Rc; - use asap_aware_mapping::accuracy::DefaultAccuracyModel; use asap_aware_mapping::cost_model::DefaultCostModel; use asap_aware_mapping::{ - default_strategies, search_workload_with_targets, Replacement, ReplacementStrategy, - SketchAlgorithmStrategy, TargetSubDAG, + default_strategies, search_workload_with_targets, ASAPStrategies, Replacement, + ReplacementStrategy, TargetSubDAG, }; mod support; +use asap_types::ir::export::PhysicalASAPOperatorPayload; +use asap_types::ir::{ASAPOp, Operator}; use asap_types::post_asap::{ - compile_post_asap_dag, ExactKind, FieldDataType, NonNegativeWeightProof, - PostAsapOperatorPayload, SketchAlgorithm, SummaryExpr, SummaryInputExpr, WeightDomain, + ExactKind, FieldDataType, NonNegativeWeightProof, SketchAlgorithm, SummaryInputExpr, + WeightDomain, }; use asap_types::types::AccuracyTarget; -use support::lower_promql; +use support::{lower_promql, post_asap_dag}; #[test] fn grouped_count_keeps_uncertified_hydra_candidates_for_backend_review() { @@ -21,7 +21,7 @@ fn grouped_count_keeps_uncertified_hydra_candidates_for_backend_review() { epsilon: 0.01, delta: 0.01, }; - let root = Rc::new(lower_promql("count by(job)(up)", target.clone()).unwrap()); + let root = lower_promql("count by(job)(up)", target.clone()).unwrap(); let space = search_workload_with_targets( vec![("count", root, Some(target))], &default_strategies(), @@ -51,14 +51,14 @@ fn grouped_count_keeps_uncertified_hydra_candidates_for_backend_review() { #[test] fn exact_counts_select_count_accumulators() { for query in ["count(up)", "count by(job)(up)", "count_over_time(up[5m])"] { - let root = Rc::new(lower_promql(query, AccuracyTarget::Exact).unwrap()); + let root = lower_promql(query, AccuracyTarget::Exact).unwrap(); let candidates = - SketchAlgorithmStrategy::default_cost_model().replacements(&TargetSubDAG::new(&root)); + ASAPStrategies::default_cost_model().replacements(&TargetSubDAG::new(&root)); assert!( candidates.iter().any(|candidate| { - matches!(&candidate.replacement, Replacement::Summary(node) - if matches!(&node.expr, SummaryExpr::SummaryAgg { - family: FieldDataType::ExactAggregate(ExactKind::Count, _), .. })) + matches!(&candidate.replacement, Replacement::SubDAG(node) + if matches!(&node.operator, Operator::ASAP(ASAPOp::SummaryAgg { + family: FieldDataType::ExactAggregate(ExactKind::Count, _), .. }))) }), "{query}: {candidates:?}" ); @@ -69,22 +69,23 @@ fn exact_counts_select_count_accumulators() { #[test] fn frequency_count_candidates_use_unit_weights() { for query in ["count_over_time(up[5m])", "count(up)"] { - let root = Rc::new(lower_promql(query, AccuracyTarget::Epsilon(0.02)).unwrap()); + let root = lower_promql(query, AccuracyTarget::Epsilon(0.02)).unwrap(); let candidates = - SketchAlgorithmStrategy::default_cost_model().replacements(&TargetSubDAG::new(&root)); + ASAPStrategies::default_cost_model().replacements(&TargetSubDAG::new(&root)); let mut algorithms = Vec::new(); for candidate in &candidates { - let Replacement::Summary(node) = &candidate.replacement else { + let Replacement::SubDAG(node) = &candidate.replacement else { continue; }; - let SummaryExpr::SummaryEstimate { summary_input, .. } = &node.expr else { + let Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) = &node.operator + else { continue; }; - let SummaryExpr::SummaryAgg { + let Operator::ASAP(ASAPOp::SummaryAgg { family: FieldDataType::Sketch(kind, _), input, .. - } = &summary_input.expr + }) = &summary_input.operator else { continue; }; @@ -98,11 +99,11 @@ fn frequency_count_candidates_use_unit_weights() { ) { continue; } - let dag = compile_post_asap_dag(node).unwrap(); + let dag = post_asap_dag(node); assert!( dag.nodes.iter().any(|node| matches!( &node.payload, - PostAsapOperatorPayload::SummaryAgg { input: actual, .. } if actual == input + PhysicalASAPOperatorPayload::SummaryAgg { input: actual, .. } if actual == input )), "post-ASAP DAG must preserve the count update contract" ); @@ -135,25 +136,26 @@ fn frequency_count_candidates_use_unit_weights() { // This narrow test oracle interprets the emitted aggregate, not Prometheus ingestion, // staleness, or scrape scheduling. Unsupported plan shapes fail explicitly. fn aggregate_fixture(query: &str, series: &[Vec]) -> Vec { - use asap_types::pre_asap::{AggIntent, QueryExpr, Reduction}; + use asap_types::ir::NonASAPOp; + use asap_types::pre_asap::{AggIntent, Reduction}; let root = lower_promql(query, AccuracyTarget::Exact).unwrap(); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, measures, child, .. - } = &root + } = root.expect_non_asap() else { panic!("expected aggregate: {root:?}"); }; - match child.as_ref() { - QueryExpr::Scan { .. } => assert!(series.iter().all(|samples| samples.len() == 1)), - QueryExpr::TimeRange { range, child } => { + match child.expect_non_asap() { + NonASAPOp::Scan { .. } => assert!(series.iter().all(|samples| samples.len() == 1)), + NonASAPOp::TimeRange { range, child, .. } => { assert!(matches!(range.as_secs(), 1 | 300)); if range.as_secs() == 1 { assert!(series.iter().all(|samples| samples.len() == 1)); } - assert!(matches!(child.as_ref(), QueryExpr::Scan { .. })); + assert!(matches!(child.expect_non_asap(), NonASAPOp::Scan { .. })); } other => panic!("unsupported fixture input: {other:?}"), } @@ -225,22 +227,20 @@ fn count_over_time_counts_scrapes_not_sample_values() { #[test] fn cms_count_updates_total_ten_for_zero_positive_and_negative_samples() { use asap_types::pre_asap::ColumnRef; - let root = - Rc::new(lower_promql("count_over_time(up[5m])", AccuracyTarget::Epsilon(0.02)).unwrap()); - let candidates = - SketchAlgorithmStrategy::default_cost_model().replacements(&TargetSubDAG::new(&root)); + let root = lower_promql("count_over_time(up[5m])", AccuracyTarget::Epsilon(0.02)).unwrap(); + let candidates = ASAPStrategies::default_cost_model().replacements(&TargetSubDAG::new(&root)); let dag = candidates .iter() .find_map(|candidate| { - let Replacement::Summary(node) = &candidate.replacement else { + let Replacement::SubDAG(node) = &candidate.replacement else { return None; }; - let dag = compile_post_asap_dag(node).unwrap(); + let dag = post_asap_dag(node); dag.nodes .iter() .any(|node| { matches!(&node.payload, - PostAsapOperatorPayload::SummaryAgg { family: FieldDataType::Sketch(kind, _), .. } + PhysicalASAPOperatorPayload::SummaryAgg { family: FieldDataType::Sketch(kind, _), .. } if kind.algorithm() == &SketchAlgorithm::Cms) }) .then_some(dag) @@ -250,7 +250,7 @@ fn cms_count_updates_total_ten_for_zero_positive_and_negative_samples() { .nodes .iter() .find_map(|node| match &node.payload { - PostAsapOperatorPayload::SummaryAgg { input, .. } => Some(input), + PhysicalASAPOperatorPayload::SummaryAgg { input, .. } => Some(input), _ => None, }) .unwrap(); diff --git a/crates/frontend-promql/tests/histogram_metadata.rs b/crates/frontend-promql/tests/histogram_metadata.rs index 55f35ddeb..aba373804 100644 --- a/crates/frontend-promql/tests/histogram_metadata.rs +++ b/crates/frontend-promql/tests/histogram_metadata.rs @@ -7,16 +7,17 @@ use asap_frontend_promql::{HistogramCatalog, HistogramKind}; mod support; -use asap_types::pre_asap::{AggIntent, QueryExpr}; +use asap_types::ir::{NonASAPOp, OperatorNode}; +use asap_types::pre_asap::AggIntent; use asap_types::types::AccuracyTarget; use support::{lower_promql, lower_promql_with_histograms}; /// The histogram/quantile intent kind in the lowered DAG: `"HQ"` for the /// classic-bucket `HistogramQuantile`, `"Q"` for the sketch-able `Quantile`. -fn quantile_kind(qe: &QueryExpr) -> &'static str { - fn walk(e: &QueryExpr) -> Option<&'static str> { - match e { - QueryExpr::Aggregate { +fn quantile_kind(qe: &OperatorNode) -> &'static str { + fn walk(e: &OperatorNode) -> Option<&'static str> { + match e.expect_non_asap() { + NonASAPOp::Aggregate { measures, child, .. } => measures .iter() @@ -26,12 +27,12 @@ fn quantile_kind(qe: &QueryExpr) -> &'static str { _ => None, }) .or_else(|| walk(child)), - QueryExpr::TimeRange { child, .. } - | QueryExpr::Filter { child, .. } - | QueryExpr::Sort { child, .. } - | QueryExpr::Limit { child, .. } - | QueryExpr::PromqlSubquery { child, .. } - | QueryExpr::Project { child, .. } => walk(child), + NonASAPOp::TimeRange { child, .. } + | NonASAPOp::Filter { child, .. } + | NonASAPOp::Sort { child, .. } + | NonASAPOp::Limit { child, .. } + | NonASAPOp::PromqlSubquery { child, .. } + | NonASAPOp::Project { child, .. } => walk(child), _ => None, } } @@ -48,27 +49,26 @@ fn with_meta(q: &str, catalog: HistogramCatalog) -> &'static str { #[test] fn heuristic_baseline_is_unchanged_without_a_catalog() { - // Classic `by (le)`-bucket form → HistogramQuantile; anything else → Quantile. + // Classic buckets are represented; undeclared native samples are rejected. assert_eq!( heuristic( "histogram_quantile(0.9, sum by (le) (rate(http_request_duration_seconds_bucket[5m])))" ), "HQ" ); - assert_eq!(heuristic("histogram_quantile(0.9, native_latency)"), "Q"); + assert!(lower_promql( + "histogram_quantile(0.9, native_latency)", + AccuracyTarget::Exact + ) + .is_err()); } #[test] fn declared_classic_bucket_fixes_the_false_negative() { // A classic histogram exposed WITHOUT the `_bucket` suffix and queried with - // no `le` grouping/matcher: the heuristic wrongly routes it to the - // sketch-able Quantile. Declaring it `ClassicBucket` corrects it. + // no `le` grouping/matcher requires an explicit sample-type declaration. let q = "histogram_quantile(0.9, latency_seconds)"; - assert_eq!( - heuristic(q), - "Q", - "heuristic mis-routes the suffix-less classic histogram" - ); + assert!(lower_promql(q, AccuracyTarget::Exact).is_err()); assert_eq!( with_meta( q, @@ -80,7 +80,7 @@ fn declared_classic_bucket_fixes_the_false_negative() { } #[test] -fn declared_raw_or_native_fixes_the_false_positive() { +fn declared_raw_extension_and_native_gap_override_the_heuristic() { // A metric merely NAMED `…_bucket` that actually holds raw samples / a native // histogram: the heuristic wrongly routes it to bucket interpolation. let q = "histogram_quantile(0.9, foo_bucket)"; @@ -97,14 +97,9 @@ fn declared_raw_or_native_fixes_the_false_positive() { "Q", "raw samples are sketch-able" ); - assert_eq!( - with_meta( - q, - HistogramCatalog::new().with("foo_bucket", HistogramKind::Native) - ), - "Q", - "native histograms are sketch-able" - ); + let catalog = HistogramCatalog::new().with("foo_bucket", HistogramKind::Native); + assert!(lower_promql_with_histograms(q, AccuracyTarget::Exact, catalog.clone()).is_err()); + assert!(lower_promql_with_histograms("foo_bucket", AccuracyTarget::Exact, catalog).is_err()); } #[test] @@ -119,10 +114,12 @@ fn undeclared_metric_falls_back_to_the_heuristic() { ), "HQ" ); - assert_eq!( - with_meta("histogram_quantile(0.9, native_thing)", catalog), - "Q" - ); + assert!(lower_promql_with_histograms( + "histogram_quantile(0.9, native_thing)", + AccuracyTarget::Exact, + catalog + ) + .is_err()); } #[test] diff --git a/crates/frontend-promql/tests/maintained_population_horizon.rs b/crates/frontend-promql/tests/maintained_population_horizon.rs index 88b1c88fe..b4130bf86 100644 --- a/crates/frontend-promql/tests/maintained_population_horizon.rs +++ b/crates/frontend-promql/tests/maintained_population_horizon.rs @@ -1,37 +1,33 @@ mod support; use asap_aware_mapping::maintained_population::MaintainedPopulationStrategy; +use asap_types::ir::{ASAPOp, NonASAPOp, Operator}; use asap_types::post_asap::maintained_population::PopulationInput; -use asap_types::post_asap::{SummaryExpr, ValueOperation}; use asap_types::types::AccuracyTarget; -use std::rc::Rc; // A population for a one-second selector must expire members after one second. #[test] fn population_preserves_selector_horizon() { - let root = Rc::new(support::lower_promql("sum(a)", AccuracyTarget::Exact).unwrap()); + let root = support::lower_promql("sum(a)", AccuracyTarget::Exact).unwrap(); let candidate = MaintainedPopulationStrategy::new(std::slice::from_ref(&root)) .candidate(&root) .unwrap(); - let SummaryExpr::ValueOperation { child, .. } = &candidate.expr else { + // The evaluation sits over the maintained population. + let Operator::ASAP(ASAPOp::EvaluatePopulation { child, .. }) = &candidate.operator else { panic!() }; - let SummaryExpr::ValueOperation { - operation: ValueOperation::MaintainPopulation { population }, - .. - } = &child.expr - else { + let Operator::ASAP(ASAPOp::MaintainPopulation { population, .. }) = &child.operator else { panic!() }; let PopulationInput::CurrentSeries(spec) = &population.input else { panic!() }; assert_eq!(spec.lookback_ms, 1_000); - asap_types::post_asap::compile_post_asap_dag(&candidate).unwrap(); - let asap_types::pre_asap::QueryExpr::Aggregate { child: source, .. } = root.as_ref() else { + support::post_asap_dag(&candidate); + let NonASAPOp::Aggregate { child: source, .. } = root.expect_non_asap() else { panic!() }; - assert!(spec.matches_input(source)); + assert!(spec.matches_node(source)); let mut wrong = spec.clone(); wrong.lookback_ms = 300_000; - assert!(!wrong.matches_input(source)); + assert!(!wrong.matches_node(source)); } diff --git a/crates/frontend-promql/tests/observability/awesome_prometheus_alerts.rs b/crates/frontend-promql/tests/observability/awesome_prometheus_alerts.rs index 1b37cdee4..5e78e261d 100644 --- a/crates/frontend-promql/tests/observability/awesome_prometheus_alerts.rs +++ b/crates/frontend-promql/tests/observability/awesome_prometheus_alerts.rs @@ -29,7 +29,10 @@ use asap_frontend_promql::PromqlError as LoweringError; #[path = "../support.rs"] mod support; -use asap_types::pre_asap::{AggIntent, BinaryOpKind, CompareOpKind, QueryExpr, Reduction}; +use std::rc::Rc; + +use asap_types::ir::{BinaryOperator, NonASAPOp, OperatorNode, ScalarExpr}; +use asap_types::pre_asap::{AggIntent, BinaryOpKind, CompareOpKind, Reduction, ScalarValue}; use asap_types::types::AccuracyTarget; use support::lower_promql; @@ -44,78 +47,29 @@ fn queries() -> impl Iterator { } /// Lower, expecting success. -fn ok(q: &str) -> QueryExpr { +fn ok(q: &str) -> Rc { lower_promql(q, AccuracyTarget::Exact) .unwrap_or_else(|e| panic!("expected {q:?} to lower, got error: {e}")) } -/// Every `AggIntent` in the DAG. -fn intents(e: &QueryExpr) -> Vec { +/// Every `AggIntent` in the tree. `AggIntent` only ever lives in +/// `Aggregate.measures`, never in a scalar position (issue #205); +/// `children()` also descends into the operators a scalar position reads. +fn intents(e: &OperatorNode) -> Vec { let mut out = Vec::new(); - fn go(e: &QueryExpr, out: &mut Vec) { - match e { - QueryExpr::Aggregate { - measures, child, .. - } => { - out.extend(measures.iter().cloned()); - go(child, out); - } - QueryExpr::TimeRange { child, .. } - | QueryExpr::TimeShift { child, .. } - | QueryExpr::Filter { child, .. } - | QueryExpr::Sort { child, .. } - | QueryExpr::Limit { child, .. } - | QueryExpr::PromqlSubquery { child, .. } - | QueryExpr::Dedup { child, .. } - | QueryExpr::SQLWindowFunc { child, .. } - | QueryExpr::Project { child, .. } - | QueryExpr::PromqlRelabel { child, .. } - | QueryExpr::PromqlSeriesSample { child, .. } - | QueryExpr::PromqlInfoEnrich { child, .. } => go(child, out), - QueryExpr::BinaryOp { lhs, rhs, .. } - | QueryExpr::Join { - left: lhs, - right: rhs, - .. - } - | QueryExpr::SetOp { - left: lhs, - right: rhs, - .. - } => { - go(lhs, out); - go(rhs, out); - } - QueryExpr::Concat { children, .. } => children.iter().for_each(|c| go(c, out)), - QueryExpr::PromqlVectorFromScalar(inner) | QueryExpr::PromqlScalarFromVector(inner) => { - go(inner, out) - } - // `AggIntent` only ever lives in `Aggregate.measures`, never in a - // scalar position (issue #205) — nothing to collect there. - QueryExpr::Scan { .. } - | QueryExpr::PromqlScalarBridge(_) - | QueryExpr::EvalTimestamp - | QueryExpr::CurrentTimestamp => {} - QueryExpr::Column(_) - | QueryExpr::Literal(_) - | QueryExpr::Compare { .. } - | QueryExpr::BoolAnd(_) - | QueryExpr::BoolOr(_) - | QueryExpr::Not(_) - | QueryExpr::IsNull(_) - | QueryExpr::IsNotNull(_) - | QueryExpr::Cast { .. } - | QueryExpr::InList { .. } - | QueryExpr::FunctionCall { .. } - | QueryExpr::Arithmetic { .. } - | QueryExpr::Case { .. } => {} + fn go(e: &OperatorNode, out: &mut Vec) { + if let Some(NonASAPOp::Aggregate { measures, .. }) = e.non_asap() { + out.extend(measures.iter().cloned()); + } + for child in e.children() { + go(child, out); } } go(e, &mut out); out } -fn has bool>(e: &QueryExpr, p: F) -> bool { +fn has bool>(e: &OperatorNode, p: F) -> bool { intents(e).iter().any(p) } @@ -180,15 +134,21 @@ fn vector_vs_vector_comparison_lowers_to_binaryop() { // Both operands are instant vectors → a `BinaryOp{Compare}` of two // ingestion-interval-bounded scans. let qe = ok("node_hwmon_temp_celsius > node_hwmon_temp_max_celsius"); - let QueryExpr::BinaryOp { op, lhs, rhs, .. } = &qe else { + let NonASAPOp::BinaryOp { + operator: BinaryOperator { kind: op, .. }, + lhs, + rhs, + .. + } = qe.expect_non_asap() + else { panic!("expected BinaryOp, got {qe:?}"); }; assert_eq!(*op, BinaryOpKind::Compare(CompareOpKind::Gt)); assert!( - matches!(lhs.as_ref(), QueryExpr::TimeRange { child, .. } if matches!(child.as_ref(), QueryExpr::Scan { .. })) + matches!(lhs.expect_non_asap(), NonASAPOp::TimeRange { child, .. } if matches!(child.expect_non_asap(), NonASAPOp::Scan { .. })) ); assert!( - matches!(rhs.as_ref(), QueryExpr::TimeRange { child, .. } if matches!(child.as_ref(), QueryExpr::Scan { .. })) + matches!(rhs.expect_non_asap(), NonASAPOp::TimeRange { child, .. } if matches!(child.expect_non_asap(), NonASAPOp::Scan { .. })) ); } @@ -197,8 +157,8 @@ fn kube_replica_mismatch_comparison_lowers() { // Kubernetes: `kube_replicaset_spec_replicas != kube_replicaset_status_ready_replicas`. let qe = ok("kube_replicaset_spec_replicas != kube_replicaset_status_ready_replicas"); assert!(matches!( - &qe, - QueryExpr::BinaryOp { op, .. } if *op == BinaryOpKind::Compare(CompareOpKind::Ne) + qe.expect_non_asap(), + NonASAPOp::BinaryOp { operator: BinaryOperator { kind: op, .. }, .. } if *op == BinaryOpKind::Compare(CompareOpKind::Ne) )); } @@ -225,7 +185,11 @@ fn error_ratio_core_lowers() { // threshold: `sum(rate(failed[5m])) / sum(rate(total[5m]))` → a `BinaryOp(Div)` // of two cross-series sums over per-series rates. let qe = ok("sum(rate(litellm_proxy_failed_requests_metric_total[5m])) / sum(rate(litellm_proxy_total_requests_metric_total[5m]))"); - let QueryExpr::BinaryOp { op, .. } = &qe else { + let NonASAPOp::BinaryOp { + operator: BinaryOperator { kind: op, .. }, + .. + } = qe.expect_non_asap() + else { panic!("expected BinaryOp, got {qe:?}"); }; assert!(matches!(op, BinaryOpKind::Arithmetic(_))); @@ -250,11 +214,11 @@ fn all_targets_missing_core_lowers() { // Prometheus self-monitoring `sum by (job) (up)` (the corpus query is // `… == 0`). Cross-series sum grouped positionally on `job`. let qe = ok("sum by (job) (up)"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, measures, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected Aggregate, got {qe:?}"); }; @@ -273,19 +237,17 @@ fn all_targets_missing_core_lowers() { #[test] fn scalar_threshold_comparisons_lower_to_binaryop_scalar() { // ~822/949 corpus queries are ` `. The numeric - // threshold is now a `PromqlScalarBridge` operand of the `BinaryOp` (issue + // threshold is now a `ScalarExpr` operand of the `BinaryOp` (issue // #35) — the single biggest unblock for real alerts. for q in [ "prometheus_config_last_reload_successful != 1", "increase(prometheus_tsdb_compactions_failed_total[1m]) > 0", "rate(alertmanager_notifications_failed_total[3m]) > 0.05", ] { - let QueryExpr::BinaryOp { rhs, .. } = ok(q) else { - panic!("expected a BinaryOp for {q:?}"); - }; + let qe = ok(q); assert!( - matches!(rhs.as_ref(), QueryExpr::PromqlScalarBridge(_)), - "scalar threshold operand for {q:?}, got {rhs:?}" + matches!(qe.expect_non_asap(), NonASAPOp::Filter { .. }), + "{q}" ); } } @@ -336,12 +298,12 @@ fn vector_literal_lowers_to_a_labelless_vector() { // `vector(1)` — used in dead-man's-switch ("always firing") alerts. Now // lowers to a `PromqlVectorFromScalar` over the scalar `1` (issue #48). let qe = ok("vector(1)"); - let QueryExpr::PromqlVectorFromScalar(inner) = &qe else { + let NonASAPOp::PromqlVectorFromScalar(inner) = qe.expect_non_asap() else { panic!("expected PromqlVectorFromScalar, got {qe:?}"); }; - assert_eq!(inner.as_promql_scalar(), Some(1.0)); + assert!(matches!(inner, ScalarExpr::Literal(ScalarValue::Float64(v)) if *v == 1.0)); // The result is a vector: it carries a time index (unlike a bare scalar). - assert!(qe.output_schema().unwrap().time_index.is_some()); + assert!(qe.schema.time_index.is_some()); } #[test] @@ -352,14 +314,14 @@ fn without_grouping_lowers_to_the_exclusion_form() { // labels are stored and the kept set is runtime-resolved (issue #39). let qe = ok(r#"(min without (cpu) (rate(node_cpu_seconds_total{mode="idle"}[1h]))) > 0.8"#); // Top level is the `> 0.8` comparison; the `min without (cpu)` is its LHS. - let QueryExpr::BinaryOp { lhs, .. } = &qe else { + let NonASAPOp::Filter { child: lhs, .. } = qe.expect_non_asap() else { panic!("expected a comparison BinaryOp, got {qe:?}"); }; - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, measures, .. - } = lhs.as_ref() + } = lhs.expect_non_asap() else { panic!("expected a `min without` Aggregate on the LHS, got {lhs:?}"); }; diff --git a/crates/frontend-promql/tests/observability/metrics_observability.rs b/crates/frontend-promql/tests/observability/metrics_observability.rs index 87d653ef2..d40df6236 100644 --- a/crates/frontend-promql/tests/observability/metrics_observability.rs +++ b/crates/frontend-promql/tests/observability/metrics_observability.rs @@ -6,15 +6,14 @@ use std::rc::Rc; -use asap_aware_mapping::replacement::{keep_pre_asap, RealizationError}; +use asap_aware_mapping::replacement::{retain_exact, RealizationError}; use asap_aware_mapping::{ - Replacement, ReplacementStrategy, ReplacementSubDAG, SketchAlgorithmStrategy, TargetSubDAG, + ASAPStrategies, Replacement, ReplacementStrategy, ReplacementSubDAG, TargetSubDAG, }; use asap_frontend_promql::PromqlError; #[path = "../support.rs"] mod support; -use asap_types::post_asap::{SummaryExpr, SummaryNode}; -use asap_types::pre_asap::query_expr::QueryExpr; +use asap_types::ir::OperatorNode; use asap_types::types::AccuracyTarget; use support::lower_promql; @@ -64,19 +63,18 @@ fn queries(corpus: &str) -> impl Iterator { .filter(|line| !line.is_empty() && !line.starts_with('#')) } -fn post_asap_candidate(expr: &QueryExpr) -> Result, RealizationError> { - let root = Rc::new(expr.clone()); - let target = TargetSubDAG::new(&root); - match SketchAlgorithmStrategy::default_cost_model() +fn post_asap_candidate(root: &Rc) -> Result, RealizationError> { + let target = TargetSubDAG::new(root); + match ASAPStrategies::default_cost_model() .replacements(&target) .into_iter() .next() { Some(ReplacementSubDAG { - replacement: Replacement::Summary(node), + replacement: Replacement::SubDAG(node), .. }) => Ok(node), - _ => keep_pre_asap(&root), + _ => retain_exact(root), } } @@ -99,9 +97,8 @@ fn benchmark_corpora_are_total_and_report_coverage() { Ok(expr) => { lowered += 1; match post_asap_candidate(&expr) { - Ok(node) if !matches!(node.expr, SummaryExpr::KeepPreAsap(_)) => { - post_asap_candidates += 1 - } + // An ASAP operator bound somewhere below the root. + Ok(node) if node.contains_asap() => post_asap_candidates += 1, Ok(_) => { post_asap_unchanged += 1; if std::env::var_os("METRICS_OBSERVABILITY_REPORT").is_some() { diff --git a/crates/frontend-promql/tests/observability/promql_corpus.rs b/crates/frontend-promql/tests/observability/promql_corpus.rs index 1bc7e2166..45afdeb5f 100644 --- a/crates/frontend-promql/tests/observability/promql_corpus.rs +++ b/crates/frontend-promql/tests/observability/promql_corpus.rs @@ -15,37 +15,35 @@ use std::rc::Rc; -use asap_aware_mapping::replacement::{keep_pre_asap, RealizationError}; +use asap_aware_mapping::replacement::{retain_exact, RealizationError}; use asap_aware_mapping::{ - Replacement, ReplacementStrategy, ReplacementSubDAG, SketchAlgorithmStrategy, TargetSubDAG, + ASAPStrategies, Replacement, ReplacementStrategy, ReplacementSubDAG, TargetSubDAG, }; use asap_frontend_promql::PromqlError as LoweringError; #[path = "../support.rs"] mod support; -use asap_types::post_asap::{SummaryExpr, SummaryNode}; -use asap_types::pre_asap::query_expr::QueryExpr; +use asap_types::ir::OperatorNode; use asap_types::types::AccuracyTarget; use support::lower_promql; -/// This crate has no "bind me one DAG" public API any more — -/// `SketchAlgorithmStrategy::replacements` always returns every candidate, and +/// This crate has no "bind me one dag" public API any more — +/// `ASAPStrategies::replacements` always returns every candidate, and /// a caller decides what to keep. This test-only helper reproduces the /// take-the-first-(`cost_model`-preferred)-candidate pattern so [`bind_tally`] /// gets one representative `Result` per query, matching what a totality /// check over the whole corpus wants. -fn bind(expr: &QueryExpr) -> Result, RealizationError> { - let root = Rc::new(expr.clone()); - let target = TargetSubDAG::new(&root); - match SketchAlgorithmStrategy::default_cost_model() +fn bind(root: &Rc) -> Result, RealizationError> { + let target = TargetSubDAG::new(root); + match ASAPStrategies::default_cost_model() .replacements(&target) .into_iter() .next() { Some(ReplacementSubDAG { - replacement: Replacement::Summary(node), + replacement: Replacement::SubDAG(node), .. }) => Ok(node), - _ => keep_pre_asap(&root), + _ => retain_exact(root), } } @@ -77,7 +75,10 @@ impl Tally { fn tally(corpus: &str) -> Tally { let mut t = Tally::default(); for q in queries(corpus) { - match lower_promql(q, AccuracyTarget::Exact) { + match asap_frontend_promql::lower_promql_query_workload( + &support::workload(q, AccuracyTarget::Exact), + 0, + ) { Ok(_) => t.lowered += 1, Err(LoweringError::Parse(_)) => t.unparseable += 1, Err(_) => t.rejected += 1, @@ -93,9 +94,10 @@ fn tally(corpus: &str) -> Tally { /// arm). #[derive(Default, Debug)] struct BindTally { - /// Root bound to `SummaryAgg`/`SummaryEstimate` — the pass did something. + /// An ASAP operator was bound somewhere below the root — the pass did + /// something. transformed: usize, - /// Root stayed `KeepPreAsap` — the pass left the query untouched. + /// The kept pre-ASAP dag — the pass left the query untouched. unchanged: usize, /// [`bind`] returned `Err` (schema derivation failed). errored: usize, @@ -108,7 +110,7 @@ fn bind_tally(corpus: &str, accuracy: AccuracyTarget) -> BindTally { continue; }; match bind(&dag) { - Ok(bound) if matches!(bound.expr, SummaryExpr::KeepPreAsap(_)) => t.unchanged += 1, + Ok(bound) if !bound.contains_asap() => t.unchanged += 1, Ok(_) => t.transformed += 1, Err(_) => t.errored += 1, } @@ -148,23 +150,17 @@ fn lowering_is_total_over_the_entire_corpus() { "testdata corpus unexpectedly small: {td:?}" ); - // Coverage tripwire: a code change that breaks lowering for a large slice of - // real PromQL trips this. Current numbers on the private promql-parser `asap` - // branch: docs 48 lowered / 1 rejected, testdata 1512 lowered / 76 rejected / - // 235 unparseable. The floors sit ~1% under those, so they guard regressions - // rather than pin an exact count — ratchet them up as coverage lands. - // - // The 235 unparseable are parser-fork gaps (issue #108); the rejections are - // lowering gaps (#109). Both shrink over time, so these floors normally only - // rise. Exception: the testdata floor was lowered to the measured 1485 when - // the 44 `fill` vector-matching queries became rejected rather than - // silently lowered without their fill semantics. + // Coverage tripwire after rejecting unrepresented native histogram samples: + // docs 48 lowered / 1 rejected; testdata 1121 lowered / 469 rejected / + // 233 parser gaps. Earlier coverage counted native histogram operations + // incorrectly treated as float quantiles. Keep the rejection cases in the + // corpus: accepting them requires a native histogram sample representation. assert!( docs.lowered >= 47, "docs lowering coverage regressed: {docs:?}" ); assert!( - td.lowered >= 1485, + td.lowered >= 1121, "testdata lowering coverage regressed: {td:?}" ); } diff --git a/crates/frontend-promql/tests/promql_binding_regressions.rs b/crates/frontend-promql/tests/promql_binding_regressions.rs index 26d1be06d..416b6680d 100644 --- a/crates/frontend-promql/tests/promql_binding_regressions.rs +++ b/crates/frontend-promql/tests/promql_binding_regressions.rs @@ -33,9 +33,10 @@ fn irate_and_rate_have_distinct_canonical_intents() { /// PromQL count counts series even when two sample values are equal. #[test] fn count_is_row_count_not_distinct_sample_value_count() { - use asap_types::pre_asap::{AggIntent, QueryExpr}; - let dag = lower_promql("count(smoke_gauge)", AccuracyTarget::Exact).unwrap(); - let QueryExpr::Aggregate { measures, .. } = dag else { + use asap_types::ir::NonASAPOp; + use asap_types::pre_asap::AggIntent; + let tree = lower_promql("count(smoke_gauge)", AccuracyTarget::Exact).unwrap(); + let NonASAPOp::Aggregate { measures, .. } = tree.expect_non_asap() else { panic!("expected aggregate") }; assert!(matches!(measures.as_slice(), [AggIntent::Count { .. }])); diff --git a/crates/frontend-promql/tests/promql_conformance.rs b/crates/frontend-promql/tests/promql_conformance.rs index 6f932879e..2f3fa2bf8 100644 --- a/crates/frontend-promql/tests/promql_conformance.rs +++ b/crates/frontend-promql/tests/promql_conformance.rs @@ -31,22 +31,26 @@ // `__GAP`-suffixed test names intentionally SHOUT the documented divergences. #![allow(non_snake_case)] +use std::rc::Rc; use std::time::Duration; use asap_frontend_promql::PromqlError as LoweringError; mod support; +use asap_types::ir::{ + BinaryOperator, ExprSemantics, NonASAPOp, OperatorNode, ScalarExpr, TimeRangeKind, +}; use asap_types::pre_asap::schema::DataType; use asap_types::pre_asap::{ - AggIntent, ArithmeticOpKind, AtModifier, BinaryOpKind, CompareOpKind, MathFunc, - PromQLVectorSetOpKind, QueryExpr, Reduction, SampleKind, Source, TimeFunc, + AggIntent, ArithmeticOpKind, AtModifier, BinaryOpKind, CompareOpKind, PromQLVectorSetOpKind, + Reduction, SampleKind, ScalarValue, Source, TimeFunc, }; use asap_types::types::AccuracyTarget; -use support::lower_promql; +use support::{lower_promql, promql_scalar}; // ── harness helpers ───────────────────────────────────────────────────────────── /// Lower, expecting success. -fn ok(q: &str) -> QueryExpr { +fn ok(q: &str) -> Rc { lower_promql(q, AccuracyTarget::Exact) .unwrap_or_else(|e| panic!("expected {q:?} to lower, got error: {e}")) } @@ -59,72 +63,30 @@ fn rejected(q: &str) -> LoweringError { } } -/// Every `AggIntent` anywhere in the DAG, root-to-leaf. -fn intents(e: &QueryExpr) -> Vec { +/// Every `AggIntent` anywhere in the tree, root-to-leaf. +fn intents(e: &OperatorNode) -> Vec { let mut out = Vec::new(); collect(e, &mut out); out } -fn collect(e: &QueryExpr, out: &mut Vec) { - match e { - QueryExpr::Aggregate { - measures, child, .. - } => { - out.extend(measures.iter().cloned()); - collect(child, out); - } - QueryExpr::TimeRange { child, .. } - | QueryExpr::TimeShift { child, .. } - | QueryExpr::Filter { child, .. } - | QueryExpr::Sort { child, .. } - | QueryExpr::Limit { child, .. } - | QueryExpr::PromqlSubquery { child, .. } - | QueryExpr::Dedup { child, .. } - | QueryExpr::SQLWindowFunc { child, .. } - | QueryExpr::Project { child, .. } - | QueryExpr::PromqlRelabel { child, .. } - | QueryExpr::PromqlSeriesSample { child, .. } - | QueryExpr::PromqlInfoEnrich { child, .. } => collect(child, out), - QueryExpr::BinaryOp { lhs, rhs, .. } => { - collect(lhs, out); - collect(rhs, out); - } - QueryExpr::Join { left, right, .. } | QueryExpr::SetOp { left, right, .. } => { - collect(left, out); - collect(right, out); - } - QueryExpr::Concat { children, .. } => children.iter().for_each(|c| collect(c, out)), - QueryExpr::PromqlVectorFromScalar(inner) | QueryExpr::PromqlScalarFromVector(inner) => { - collect(inner, out) - } - // `AggIntent` only ever lives in `Aggregate.measures`, never in a - // scalar position (issue #205) — nothing to collect there. - QueryExpr::Scan { .. } - | QueryExpr::PromqlScalarBridge(_) - | QueryExpr::EvalTimestamp - | QueryExpr::CurrentTimestamp => {} - QueryExpr::Column(_) - | QueryExpr::Literal(_) - | QueryExpr::Compare { .. } - | QueryExpr::BoolAnd(_) - | QueryExpr::BoolOr(_) - | QueryExpr::Not(_) - | QueryExpr::IsNull(_) - | QueryExpr::IsNotNull(_) - | QueryExpr::Cast { .. } - | QueryExpr::InList { .. } - | QueryExpr::FunctionCall { .. } - | QueryExpr::Arithmetic { .. } - | QueryExpr::Case { .. } => {} +/// `AggIntent` only ever lives in `Aggregate.measures`, never in a scalar +/// position (issue #205); `children()` also descends into the operators a +/// scalar position reads (`scalar(v)`). +fn collect(e: &OperatorNode, out: &mut Vec) { + if let Some(NonASAPOp::Aggregate { measures, .. }) = e.non_asap() { + out.extend(measures.iter().cloned()); + } + for child in e.children() { + collect(child, out); } } /// The first `Scan` reached by descending single-child nodes, with its metric /// name and predicate count. -fn first_scan(e: &QueryExpr) -> (String, usize) { - match e { - QueryExpr::Scan { +fn first_scan(e: &OperatorNode) -> (String, usize) { + match e.expect_non_asap() { + NonASAPOp::Scan { source, predicates, .. } => { let name = match source { @@ -133,45 +95,32 @@ fn first_scan(e: &QueryExpr) -> (String, usize) { }; (name, predicates.len()) } - QueryExpr::TimeRange { child, .. } - | QueryExpr::TimeShift { child, .. } - | QueryExpr::Aggregate { child, .. } - | QueryExpr::Filter { child, .. } - | QueryExpr::Sort { child, .. } - | QueryExpr::Limit { child, .. } - | QueryExpr::PromqlSubquery { child, .. } => first_scan(child), + NonASAPOp::TimeRange { child, .. } + | NonASAPOp::TimeShift { child, .. } + | NonASAPOp::Aggregate { child, .. } + | NonASAPOp::Filter { child, .. } + | NonASAPOp::Sort { child, .. } + | NonASAPOp::Limit { child, .. } + | NonASAPOp::PromqlSubquery { child, .. } => first_scan(child), other => panic!("no Scan reachable from {other:?}"), } } -fn has bool>(e: &QueryExpr, pred: F) -> bool { +fn has bool>(e: &OperatorNode, pred: F) -> bool { intents(e).iter().any(pred) } -/// Whether the DAG contains a `Mul`-by-`PromqlScalarBridge(-1)` anywhere — the shape unary +/// Whether the tree contains a `Mul`-by-`ScalarExpr(-1)` anywhere — the shape unary /// negation lowers to (issue #36). -fn negates_via_scalar(e: &QueryExpr) -> bool { - let is_neg_one = |q: &QueryExpr| { - q.as_promql_scalar() - .is_some_and(|v| (v + 1.0).abs() < 1e-12) - }; - match e { - QueryExpr::BinaryOp { op, lhs, rhs, .. } => { - (*op == BinaryOpKind::Arithmetic(ArithmeticOpKind::Mul) - && (is_neg_one(lhs) || is_neg_one(rhs))) - || negates_via_scalar(lhs) - || negates_via_scalar(rhs) - } - QueryExpr::Aggregate { child, .. } - | QueryExpr::Sort { child, .. } - | QueryExpr::Limit { child, .. } - | QueryExpr::TimeRange { child, .. } - | QueryExpr::TimeShift { child, .. } - | QueryExpr::PromqlSubquery { child, .. } - | QueryExpr::Filter { child, .. } - | QueryExpr::Project { child, .. } => negates_via_scalar(child), - _ => false, +fn negates_via_scalar(e: &OperatorNode) -> bool { + fn negative(expr: &ScalarExpr) -> bool { + matches!(expr, ScalarExpr::Negative { .. }) || expr.children().iter().any(|e| negative(e)) } + e.expect_non_asap() + .scalar_exprs() + .iter() + .any(|e| negative(e)) + || e.children().iter().any(|e| negates_via_scalar(e)) } // ───────────────────────────────────────────────────────────────────────────── @@ -193,10 +142,10 @@ fn promql_scan_schema_is_open() { // runtime-only, so the binding schema lists only the (ts, value) floor + // referenced labels and may be a subset of the runtime row. let qe = ok("node_cpu_seconds_total"); - let QueryExpr::TimeRange { child, .. } = &qe else { + let NonASAPOp::TimeRange { child, .. } = qe.expect_non_asap() else { panic!("expected a TimeRange for a bare selector, got {qe:?}"); }; - let QueryExpr::Scan { schema, .. } = child.as_ref() else { + let NonASAPOp::Scan { schema, .. } = child.expect_non_asap() else { panic!("expected a Scan inside the TimeRange, got {qe:?}"); }; assert!( @@ -241,7 +190,7 @@ fn range_vector_selector_is_time_range() { // SEMANTICS: `[5m]` turns an instant vector into a range vector, // represented in the canonical DAG as a dedicated `TimeRange` node. let qe = ok("node_cpu_seconds_total[5m]"); - let QueryExpr::TimeRange { range, .. } = &qe else { + let NonASAPOp::TimeRange { range, .. } = qe.expect_non_asap() else { panic!("expected TimeRange for a range-vector selector, got {qe:?}"); }; assert_eq!(*range, Duration::from_secs(300)); @@ -252,19 +201,44 @@ fn range_vector_selector_is_time_range() { // functions.test) // ───────────────────────────────────────────────────────────────────────────── +#[test] +fn selector_time_ranges_carry_their_kind() { + // SEMANTICS: an instant selector reads the latest sample within the + // ingestion interval (`Instant`); `m[5m]` is a range selection (`Range`). + // Same length is not the same shape: `m` and `m[1s]` stay distinct. + assert!(matches!( + ok("node_cpu_seconds_total").expect_non_asap(), + NonASAPOp::TimeRange { + kind: TimeRangeKind::Instant, + .. + } + )); + assert!(matches!( + ok("node_cpu_seconds_total[5m]").expect_non_asap(), + NonASAPOp::TimeRange { + kind: TimeRangeKind::Range, + .. + } + )); + assert_ne!( + ok("node_cpu_seconds_total"), + ok("node_cpu_seconds_total[1s]") + ); +} + #[test] fn rate_range_lives_in_time_range_node() { // SEMANTICS: per-second average rate; the temporal range lives on the // enclosing `TimeRange` node, not inside the intent. let qe = ok("rate(http_requests_total[5m])"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected Aggregate, got {qe:?}"); }; assert!(matches!(measures.as_slice(), [AggIntent::Rate])); - let QueryExpr::TimeRange { range, .. } = child.as_ref() else { + let NonASAPOp::TimeRange { range, .. } = child.expect_non_asap() else { panic!("expected TimeRange child, got {child:?}"); }; assert_eq!(*range, Duration::from_secs(300)); @@ -281,14 +255,14 @@ fn irate_maps_to_its_own_intent() { #[test] fn increase_range_lives_in_time_range_node() { let qe = ok("increase(http_requests_total[1h])"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected Aggregate, got {qe:?}"); }; assert!(matches!(measures.as_slice(), [AggIntent::Increase])); - let QueryExpr::TimeRange { range, .. } = child.as_ref() else { + let NonASAPOp::TimeRange { range, .. } = child.expect_non_asap() else { panic!("expected TimeRange child, got {child:?}"); }; assert_eq!(*range, Duration::from_secs(3600)); @@ -303,7 +277,7 @@ fn increase_range_lives_in_time_range_node() { fn sum_collapses_all_series() { // SEMANTICS: `sum(v)` → one output series. No grouping → no Partition. let qe = ok("sum(node_filesystem_size_bytes)"); - assert!(matches!(&qe, QueryExpr::Aggregate { .. })); + assert!(matches!(qe.expect_non_asap(), NonASAPOp::Aggregate { .. })); assert!(has(&qe, |i| matches!(i, AggIntent::Sum { .. }))); } @@ -314,12 +288,12 @@ fn sum_by_groups_via_positional_aggregate() { // name-based Partition). SchemaResolver leaf = [ts, value, instance, job] (referenced // keys appended sorted), so the keys resolve to columns [2, 3]. let qe = ok("sum by(job, instance) (node_filesystem_size_bytes)"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected positional Aggregate for `by(...)`, got {qe:?}"); }; @@ -330,7 +304,7 @@ fn sum_by_groups_via_positional_aggregate() { ); assert!(matches!(measures.as_slice(), [AggIntent::Sum { .. }])); assert!( - matches!(child.as_ref(), QueryExpr::TimeRange { child, .. } if matches!(child.as_ref(), QueryExpr::Scan { .. })) + matches!(child.expect_non_asap(), NonASAPOp::TimeRange { child, .. } if matches!(child.expect_non_asap(), NonASAPOp::Scan { .. })) ); } @@ -369,11 +343,11 @@ fn sum_without_groups_by_the_complement() { // the runtime: the grouping is the exclusion form and the output schema // stays OPEN (unlike `by`, which freezes to closed). let qe = ok("sum without(instance) (node_filesystem_size_bytes)"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, measures, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected an Aggregate, got {qe:?}"); }; @@ -385,7 +359,7 @@ fn sum_without_groups_by_the_complement() { assert_eq!(by.keys().len(), 1, "the one excluded label (instance)"); assert!(matches!(measures.as_slice(), [AggIntent::Sum { .. }])); assert!( - !qe.output_schema().unwrap().closed, + !qe.schema.clone().closed, "a `without` result keeps an open schema (kept label set is runtime-only)" ); } @@ -418,16 +392,16 @@ fn group_aggregator_lowers_to_a_distinct_intent() { fn sum_of_rate_is_two_levels() { // SEMANTICS: per-series rate, THEN cross-series sum. Both must survive. let qe = ok("sum(rate(http_requests_total[5m]))"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected outer Aggregate{{Sum}}, got {qe:?}"); }; assert!(matches!(measures.as_slice(), [AggIntent::Sum { .. }])); assert!(matches!( - child.as_ref(), - QueryExpr::Aggregate { measures, .. } if matches!(measures.as_slice(), [AggIntent::Rate]) + child.expect_non_asap(), + NonASAPOp::Aggregate { measures, .. } if matches!(measures.as_slice(), [AggIntent::Rate]) )); } @@ -436,12 +410,12 @@ fn sum_by_of_rate_groups_outer_level() { // Outer cross-series Sum grouped on positional `Aggregate.by` over the // label-preserving inner Rate. Leaf = [ts, value, instance] → by = [2]. let qe = ok("sum by(instance) (rate(node_network_receive_bytes_total[5m]))"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected outer Aggregate grouped by instance, got {qe:?}"); }; @@ -449,8 +423,8 @@ fn sum_by_of_rate_groups_outer_level() { assert!(matches!(measures.as_slice(), [AggIntent::Sum { .. }])); // child is the inner per-series Rate aggregate. assert!(matches!( - child.as_ref(), - QueryExpr::Aggregate { measures, .. } if matches!(measures.as_slice(), [AggIntent::Rate]) + child.expect_non_asap(), + NonASAPOp::Aggregate { measures, .. } if matches!(measures.as_slice(), [AggIntent::Rate]) )); } @@ -461,26 +435,29 @@ fn sum_by_of_over_time_groups_outer_level() { // preserving, so the key resolves positionally just like the rate case (no // name-based Partition). Leaf = [ts, value, instance] → by = [2]. let qe = ok("sum by(instance) (avg_over_time(node_cpu_seconds_total[5m]))"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected outer Aggregate grouped by instance, got {qe:?}"); }; assert_eq!(reduction, &Reduction::by(vec![2])); assert!(matches!(measures.as_slice(), [AggIntent::Sum { .. }])); // child is the inner per-series reduction: Aggregate{Avg} over TimeRange. - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = child.as_ref() + } = child.expect_non_asap() else { panic!("expected Aggregate (per-series avg_over_time) under the Sum, got {child:?}"); }; assert!(matches!(measures.as_slice(), [AggIntent::Avg { .. }])); - assert!(matches!(child.as_ref(), QueryExpr::TimeRange { .. })); + assert!(matches!( + child.expect_non_asap(), + NonASAPOp::TimeRange { .. } + )); } // ───────────────────────────────────────────────────────────────────────────── @@ -501,7 +478,7 @@ fn over_time_functions_reduce_over_time_range() { ] { let qe = ok(q); assert!( - matches!(&qe, QueryExpr::Aggregate { .. }), + matches!(qe.expect_non_asap(), NonASAPOp::Aggregate { .. }), "{q}: expected Aggregate" ); let matched = intents(&qe).iter().any(|i| match want { @@ -519,7 +496,7 @@ fn over_time_functions_reduce_over_time_range() { #[test] fn quantile_over_time_is_aggregate_over_time_range() { let qe = ok("quantile_over_time(0.9, request_latency_seconds[5m])"); - assert!(matches!(&qe, QueryExpr::Aggregate { .. })); + assert!(matches!(qe.expect_non_asap(), NonASAPOp::Aggregate { .. })); assert!(has( &qe, |i| matches!(i, AggIntent::Quantile { q, .. } if (*q - 0.9).abs() < 1e-9) @@ -536,7 +513,7 @@ fn histogram_quantile_over_rate() { // φ-quantile from bucket rates. The `_bucket` metric marks the classic // cumulative-bucket form → `HistogramQuantile` (even without `sum by (le)`). let qe = ok("histogram_quantile(0.9, rate(demo_api_request_duration_seconds_bucket[5m]))"); - let QueryExpr::Aggregate { measures, .. } = &qe else { + let NonASAPOp::Aggregate { measures, .. } = qe.expect_non_asap() else { panic!("expected Aggregate{{HistogramQuantile}}, got {qe:?}"); }; assert!( @@ -553,9 +530,9 @@ fn histogram_quantile_over_sum_by_le_preserves_le_grouping() { let qe = ok( "histogram_quantile(0.99, sum by(le) (rate(demo_api_request_duration_seconds_bucket[5m])))", ); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected outer Aggregate{{HistogramQuantile}}, got {qe:?}"); }; @@ -566,11 +543,11 @@ fn histogram_quantile_over_sum_by_le_preserves_le_grouping() { )); // `sum by(le)` now survives as a positional Aggregate (by = [2], `le`), over // the inner Rate — no name-based Partition. - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, measures, .. - } = child.as_ref() + } = child.expect_non_asap() else { panic!("expected `sum by(le)` as a positional Aggregate, got {child:?}"); }; @@ -586,7 +563,11 @@ fn histogram_quantile_over_sum_by_le_preserves_le_grouping() { #[test] fn vector_arithmetic() { let qe = ok("node_memory_MemFree_bytes + node_memory_Cached_bytes"); - let QueryExpr::BinaryOp { op, .. } = &qe else { + let NonASAPOp::BinaryOp { + operator: BinaryOperator { kind: op, .. }, + .. + } = qe.expect_non_asap() + else { panic!("expected BinaryOp, got {qe:?}"); }; assert_eq!(*op, BinaryOpKind::Arithmetic(ArithmeticOpKind::Add)); @@ -597,14 +578,17 @@ fn on_matching_with_group_left() { // SEMANTICS: many-to-one matching on a label subset. let qe = ok("rate(demo_cpu_usage_seconds_total[1m]) / on(instance, job) group_left demo_num_cpus"); - let QueryExpr::BinaryOp { - op, vector_match, .. - } = &qe - else { + let NonASAPOp::BinaryOp { operator, .. } = qe.expect_non_asap() else { panic!("expected BinaryOp, got {qe:?}"); }; - assert_eq!(*op, BinaryOpKind::Arithmetic(ArithmeticOpKind::Div)); - let vm = vector_match.as_ref().expect("on(...) group_left present"); + assert_eq!( + operator.kind, + BinaryOpKind::Arithmetic(ArithmeticOpKind::Div) + ); + let vm = operator + .vector_match + .as_ref() + .expect("on(...) group_left present"); assert_eq!(vm.labels, vec!["instance".to_string(), "job".to_string()]); assert!( vm.grouping.is_some(), @@ -617,15 +601,51 @@ fn vector_comparison_filters() { // SEMANTICS: `>` between two vectors keeps the LHS series where it holds. let qe = ok("go_goroutines > go_threads"); assert!( - matches!(&qe, QueryExpr::BinaryOp { op, .. } if *op == BinaryOpKind::Compare(CompareOpKind::Gt)) + matches!(qe.expect_non_asap(), NonASAPOp::BinaryOp { operator: BinaryOperator { kind: op, .. }, .. } if *op == BinaryOpKind::Compare(CompareOpKind::Gt)) ); } +#[test] +fn comparison_bool_modifier_returns_zero_or_one() { + // SEMANTICS (operators.test): `bool` turns a filtering comparison into a + // 0/1-valued one. On a vector operand it is `return_bool` on the + // `BinaryOp`; between two scalars it is a `Case(Compare → 1, else 0)` + // scalar expression under PromQL numeric rules — and a scalar comparison + // without `bool` is not a PromQL expression at all. + let bool_flag = |q: &str| match ok(q).expect_non_asap() { + NonASAPOp::BinaryOp { return_bool, .. } => *return_bool, + NonASAPOp::Project { .. } => true, + NonASAPOp::Filter { .. } => false, + other => panic!("expected BinaryOp for {q}, got {other:?}"), + }; + assert!(bool_flag("go_goroutines > bool go_threads")); + assert!(bool_flag("go_goroutines > bool 0")); + assert!(!bool_flag("go_goroutines > go_threads")); + assert!(!bool_flag("go_goroutines > 0")); + + let qe = support::scalar_root("1 < bool 2"); + let ScalarExpr::Case { branches, .. } = &qe else { + panic!("expected a scalar Case, got {qe:?}"); + }; + assert!(matches!( + branches.as_slice(), + [( + ScalarExpr::Compare { + op: CompareOpKind::Lt, + semantics: ExprSemantics::Promql, + .. + }, + _ + )] + )); + rejected("1 < 2"); +} + #[test] fn unary_negation_lowers_as_multiply_by_minus_one() { // SEMANTICS (PromQL, issue #36): `-expr` flips the sign of every sample. // Now that a scalar operand exists (#35), it lowers as `expr * -1` — a `Mul` - // BinaryOp of the (label-preserving) vector against `PromqlScalarBridge(-1)`. These are + // BinaryOp of the (label-preserving) vector against `ScalarExpr(-1)`. These are // the five cases the old `__GAP` test pinned as rejected. for q in [ "-rate(http_errors_total[5m])", @@ -635,93 +655,38 @@ fn unary_negation_lowers_as_multiply_by_minus_one() { "sum(-node_cpu_seconds_total)", ] { let qe = ok(q); - // A `Mul`-by-`-1` against a `PromqlScalarBridge(-1)` appears somewhere in every DAG. + // A `Mul`-by-`-1` against a `ScalarExpr(-1)` appears somewhere in every tree. assert!( negates_via_scalar(&qe), "no `* -1` negation found in {q}: {qe:?}" ); } - // `-some_metric` at the root: `Scan * PromqlScalarBridge(-1)`, schema follows the vector. - let QueryExpr::BinaryOp { - op, - lhs, - rhs, - vector_match, - } = &ok("-some_metric") - else { - panic!("expected a BinaryOp for `-some_metric`"); - }; - assert_eq!(*op, BinaryOpKind::Arithmetic(ArithmeticOpKind::Mul)); - assert!( - matches!(lhs.as_ref(), QueryExpr::TimeRange { child, .. } if matches!(child.as_ref(), QueryExpr::Scan { .. })), - "vector on the left" - ); - assert!( - rhs.as_promql_scalar() - .is_some_and(|v| (v + 1.0).abs() < 1e-12), - "negation multiplies by PromqlScalarBridge(-1), got {rhs:?}" - ); - assert!( - vector_match.is_none(), - "scalar negation carries no vector match" - ); - // Label-preserving: the schema is the vector operand's, unchanged. - let schema = ok("-some_metric").output_schema().unwrap(); - assert_eq!( - schema - .fields - .iter() - .map(|c| c.name.as_str()) - .collect::>(), - vec!["ts", "value"], - ); - - // `sum(-m)` — the negation lowers inside the aggregate argument (issue #27 - // nesting), so the outer node is the `Sum` aggregate over the `Mul`. - let QueryExpr::Aggregate { - measures, child, .. - } = &ok("sum(-node_cpu_seconds_total)") - else { - panic!("expected an outer Aggregate for `sum(-m)`"); - }; - assert!(matches!(measures.as_slice(), [AggIntent::Sum { .. }])); - assert!(matches!( - child.as_ref(), - QueryExpr::BinaryOp { - op: BinaryOpKind::Arithmetic(ArithmeticOpKind::Mul), - .. - } - )); + let negated = ok("-some_metric"); + assert!(negates_via_scalar(&negated)); + assert!(negated.schema.has_promql_series_identity()); + assert!(negated.schema.time_index.is_some()); + let summed = ok("sum(-node_cpu_seconds_total)"); + assert!(has(&summed, |i| matches!(i, AggIntent::Sum { .. }))); + assert!(negates_via_scalar(&summed)); } #[test] fn unary_negation_of_constant_folds_to_scalar() { // `-(10*1024*1024)` — the operand is constant-foldable, so negation collapses - // to a single negated `PromqlScalarBridge` leaf (no `BinaryOp`), just like a bare literal. - assert!(ok("-(10*1024*1024)") - .as_promql_scalar() + // to a single negated `ScalarExpr` leaf (no `BinaryOp`), just like a bare literal. + assert!(promql_scalar(&support::scalar_root("-(10*1024*1024)")) .is_some_and(|v| (v + 10_485_760.0).abs() < 1e-6)); } #[test] fn double_unary_negation_nests() { - // `- -some_metric` — negation of a negation: `(m * -1) * -1`. Both levels - // lower; the value is unchanged but the structure is faithfully nested. - let QueryExpr::BinaryOp { op, lhs, .. } = &ok("- -some_metric") else { - panic!("expected outer BinaryOp for `- -some_metric`"); + let qe = ok("- -some_metric"); + let NonASAPOp::Project { child, .. } = qe.expect_non_asap() else { + panic!() }; - assert_eq!(*op, BinaryOpKind::Arithmetic(ArithmeticOpKind::Mul)); - assert!( - matches!( - lhs.as_ref(), - QueryExpr::BinaryOp { - op: BinaryOpKind::Arithmetic(ArithmeticOpKind::Mul), - .. - } - ), - "inner negation nests under the outer one" - ); + assert!(matches!(child.expect_non_asap(), NonASAPOp::Project { .. })); + assert!(negates_via_scalar(child)); } #[test] @@ -754,39 +719,22 @@ fn count_maps_to_count_and_inherits_accuracy() { #[test] fn scalar_literal_operand_lowers_as_binaryop_scalar() { - // Issue #35: ` op ` — the numeric threshold is a - // `PromqlScalarBridge` operand of the `BinaryOp`, and constant arithmetic - // (`10*1024*1024`) is folded. The output schema is the vector side's. let qe = ok("node_filesystem_avail_bytes > 10*1024*1024"); - let QueryExpr::BinaryOp { op, lhs, rhs, .. } = &qe else { - panic!("expected a BinaryOp, got {qe:?}"); + let ScalarExpr::Compare { op, right, .. } = support::sample_expression(&qe) else { + panic!() }; - assert_eq!(*op, BinaryOpKind::Compare(CompareOpKind::Gt)); - assert!( - matches!(lhs.as_ref(), QueryExpr::TimeRange { child, .. } if matches!(child.as_ref(), QueryExpr::Scan { .. })), - "vector on the left" - ); - assert!( - rhs.as_promql_scalar() - .is_some_and(|v| (v - 10_485_760.0).abs() < 1e-6), - "folded scalar threshold on the right, got {rhs:?}" - ); - // Schema derivation follows the vector side (a scalar contributes no labels). - assert!(qe.output_schema().is_ok()); + assert_eq!(*op, CompareOpKind::Gt); + assert_eq!(promql_scalar(right), Some(10_485_760.0)); } #[test] fn scalar_arithmetic_scales_the_vector() { - // `rate(m[5m]) * 100` — a unit conversion. Arithmetic BinaryOp of the vector - // with a `PromqlScalarBridge(100)`. let qe = ok("rate(m[5m]) * 100"); - let QueryExpr::BinaryOp { op, rhs, .. } = &qe else { - panic!("expected a BinaryOp, got {qe:?}"); + let ScalarExpr::Arithmetic { op, right, .. } = support::sample_expression(&qe) else { + panic!() }; - assert_eq!(*op, BinaryOpKind::Arithmetic(ArithmeticOpKind::Mul)); - assert!(rhs - .as_promql_scalar() - .is_some_and(|v| (v - 100.0).abs() < 1e-9)); + assert_eq!(*op, ArithmeticOpKind::Mul); + assert_eq!(promql_scalar(right), Some(100.0)); } // ───────────────────────────────────────────────────────────────────────────── @@ -797,12 +745,22 @@ fn scalar_arithmetic_scales_the_vector() { #[test] fn set_ops_lower_to_binaryop() { // SEMANTICS: or = union of label sets; and = intersection; unless = difference. - assert!(matches!(&ok("up{job=\"a\"} or up{job=\"b\"}"), - QueryExpr::BinaryOp { op, .. } if *op == BinaryOpKind::Set(PromQLVectorSetOpKind::Or))); - assert!(matches!(&ok("node_network_mtu_bytes and node_up"), - QueryExpr::BinaryOp { op, .. } if *op == BinaryOpKind::Set(PromQLVectorSetOpKind::And))); - assert!(matches!(&ok("node_network_mtu_bytes unless node_down"), - QueryExpr::BinaryOp { op, .. } if *op == BinaryOpKind::Set(PromQLVectorSetOpKind::Unless))); + let set_op = |q: &str| match ok(q).expect_non_asap() { + NonASAPOp::BinaryOp { operator, .. } => operator.kind.clone(), + other => panic!("expected BinaryOp for {q}, got {other:?}"), + }; + assert_eq!( + set_op("up{job=\"a\"} or up{job=\"b\"}"), + BinaryOpKind::Set(PromQLVectorSetOpKind::Or) + ); + assert_eq!( + set_op("node_network_mtu_bytes and node_up"), + BinaryOpKind::Set(PromQLVectorSetOpKind::And) + ); + assert_eq!( + set_op("node_network_mtu_bytes unless node_down"), + BinaryOpKind::Set(PromQLVectorSetOpKind::Unless) + ); } // ───────────────────────────────────────────────────────────────────────────── @@ -824,7 +782,7 @@ fn topk_over_count_is_heavy_hitter() { fn bottomk_is_generic_sort_limit() { // SEMANTICS: bottom-k → generic ascending order + limit (no sketch). let qe = ok("bottomk(3, count_over_time(http_requests_total[5m]))"); - assert!(matches!(&qe, QueryExpr::Limit { .. })); + assert!(matches!(qe.expect_non_asap(), NonASAPOp::Limit { .. })); } #[test] @@ -833,9 +791,9 @@ fn topk_over_nested_sum_preserves_weighted_topk_accuracy() { // The final rates are query-time values. Their ordering does not establish // frequency-sketch membership semantics. let qe = ok("topk(3, sum by(instance) (rate(node_cpu_seconds_total[5m])))"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected weighted TopK aggregate, got {qe:?}"); }; @@ -861,18 +819,18 @@ fn outer_aggregate_over_nested_aggregate_nests() { // flat two-level template rejected. Each level survives into the // canonical DAG (issue #27). let qe = ok("max(sum by (job) (rate(http_requests_total[5m])))"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected outer Aggregate, got {qe:?}"); }; assert!(matches!(measures.as_slice(), [AggIntent::Max { .. }])); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, measures, .. - } = child.as_ref() + } = child.expect_non_asap() else { panic!("expected inner `sum by (job)` Aggregate, got {child:?}"); }; @@ -895,12 +853,12 @@ fn outer_group_key_absent_from_nested_aggregate_is_dropped() { // the query lowers with the provably-absent key dropped, exactly // `sum(sum by (group)(…))`. let qe = ok(r#"sum(sum by (group)(http_requests{job="api-server"})) by (job)"#); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected outer Aggregate, got {qe:?}"); }; @@ -910,7 +868,7 @@ fn outer_group_key_absent_from_nested_aggregate_is_dropped() { "absent `job` key dropped → global aggregate" ); assert!(matches!(measures.as_slice(), [AggIntent::Sum { .. }])); - let QueryExpr::Aggregate { reduction, .. } = child.as_ref() else { + let NonASAPOp::Aggregate { reduction, .. } = child.expect_non_asap() else { panic!("expected inner `sum by (group)` Aggregate, got {child:?}"); }; assert_eq!( @@ -927,16 +885,16 @@ fn outer_group_key_present_after_inner_aggregate_still_resolves() { // resolving positionally — the absent-key drop only fires on provable // absence, never on a resolvable key. let qe = ok("sum(sum by (job, group)(http_requests)) by (job)"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected outer Aggregate, got {qe:?}"); }; - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction: inner_reduction, .. - } = child.as_ref() + } = child.expect_non_asap() else { panic!("expected inner Aggregate, got {child:?}"); }; @@ -957,9 +915,9 @@ fn outer_group_key_over_binary_op_resolves_on_both_sides() { // still resolve. Each `or` side is bound independently against its own // sub-DAG, so the key is seeded as an inherited column on both sides. let qe = ok(r#"sum by (__name__)(metric_a{env="1"} or metric_b{env="2"})"#); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected outer Aggregate, got {qe:?}"); }; @@ -969,12 +927,12 @@ fn outer_group_key_over_binary_op_resolves_on_both_sides() { 1, "grouped by the one `__name__` key" ); - let QueryExpr::BinaryOp { lhs, rhs, .. } = child.as_ref() else { + let NonASAPOp::BinaryOp { lhs, rhs, .. } = child.expect_non_asap() else { panic!("expected a BinaryOp child, got {child:?}"); }; // Both independently-bound sides carry `__name__` at the same position, so // the outer group key is consistent across the union. - let (ls, rs) = (lhs.output_schema().unwrap(), rhs.output_schema().unwrap()); + let (ls, rs) = (lhs.schema.clone(), rhs.schema.clone()); assert_eq!(ls.column_id("__name__"), rs.column_id("__name__")); assert_eq!( ls.column_id("__name__"), @@ -983,8 +941,8 @@ fn outer_group_key_over_binary_op_resolves_on_both_sides() { // The general case (a plain label, not just `__name__`) also lowers. assert!(matches!( - ok("sum by (job)(metric_a or metric_b)"), - QueryExpr::Aggregate { .. } + ok("sum by (job)(metric_a or metric_b)").expect_non_asap(), + NonASAPOp::Aggregate { .. } )); } @@ -994,15 +952,15 @@ fn aggregate_over_binary_op_nests() { // op over two range vectors. The old template only accepted a single inner // selector/call; now the binary op lowers and the outer sum wraps it. let qe = ok("sum(rate(a[5m]) + rate(b[5m]))"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected outer Aggregate, got {qe:?}"); }; assert!(matches!(measures.as_slice(), [AggIntent::Sum { .. }])); assert!( - matches!(child.as_ref(), QueryExpr::BinaryOp { .. }), + matches!(child.expect_non_asap(), NonASAPOp::BinaryOp { .. }), "argument lowers as a BinaryOp, got {child:?}" ); } @@ -1015,7 +973,10 @@ fn aggregate_over_binary_op_nests() { fn subquery_wraps_inner_query() { // SEMANTICS: `[range:res]` evaluates the inner query across a range. let qe = ok("rate(demo_api_request_duration_seconds_count[5m])[1h:]"); - assert!(matches!(&qe, QueryExpr::PromqlSubquery { .. })); + assert!(matches!( + qe.expect_non_asap(), + NonASAPOp::PromqlSubquery { .. } + )); assert!(has(&qe, |i| matches!(i, AggIntent::Rate))); } @@ -1026,12 +987,12 @@ fn over_time_of_subquery_reduces_per_series() { // then `max_over_time` takes the max of those samples *per series*. It lowers // to a per-series `Max` reduction over a `PromqlSubquery` (issue #27). let qe = ok("max_over_time(rate(demo_api_request_duration_seconds_count[5m])[1h:])"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected an Aggregate at the root, got {qe:?}"); }; @@ -1044,7 +1005,7 @@ fn over_time_of_subquery_reduces_per_series() { // The reduction rides directly on the sub-query (the structural range marker // that keeps it label-preserving), which wraps the inner `rate`. assert!( - matches!(child.as_ref(), QueryExpr::PromqlSubquery { .. }), + matches!(child.expect_non_asap(), NonASAPOp::PromqlSubquery { .. }), "the `Max` reduces over a PromqlSubquery, got {child:?}" ); assert!(intents(&qe).iter().any(|i| matches!(i, AggIntent::Rate))); @@ -1055,16 +1016,19 @@ fn quantile_over_time_of_subquery_carries_phi() { // The `quantile_over_time` φ parameter is read from arg 0; the sub-query is // arg 1. It lowers to a per-series `Quantile(φ)` over the `PromqlSubquery`. let qe = ok("quantile_over_time(0.9, rate(demo[5m])[1h:])"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected an Aggregate, got {qe:?}"); }; assert!( matches!(measures.as_slice(), [AggIntent::Quantile { q, .. }] if (*q - 0.9).abs() < 1e-9) ); - assert!(matches!(child.as_ref(), QueryExpr::PromqlSubquery { .. })); + assert!(matches!( + child.expect_non_asap(), + NonASAPOp::PromqlSubquery { .. } + )); } #[test] @@ -1074,12 +1038,12 @@ fn aggregation_over_over_time_of_subquery_keeps_labels() { // survives for the OUTER cross-series `sum by (job)` to group on. If the // inner `Max` collapsed labels, `job` would not resolve here. let qe = ok("sum by (job) (max_over_time(rate(demo{job=\"api\"}[5m])[1h:]))"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected outer Aggregate, got {qe:?}"); }; @@ -1089,20 +1053,20 @@ fn aggregation_over_over_time_of_subquery_keeps_labels() { ); assert!(matches!(measures.as_slice(), [AggIntent::Sum { .. }])); // Inner node is the per-series `max_over_time` reduction over the subquery. - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction: inner_reduction, measures: inner_measures, child: inner_child, .. - } = child.as_ref() + } = child.expect_non_asap() else { panic!("expected inner Aggregate, got {child:?}"); }; assert_eq!(inner_reduction, &Reduction::PerEntity); assert!(matches!(inner_measures.as_slice(), [AggIntent::Max { .. }])); assert!(matches!( - inner_child.as_ref(), - QueryExpr::PromqlSubquery { .. } + inner_child.expect_non_asap(), + NonASAPOp::PromqlSubquery { .. } )); } @@ -1124,66 +1088,66 @@ fn nested_subquery_from_prometheus_docs() { // the label-preserving `[ts, value]`. let qe = ok("max_over_time(deriv(rate(distance_covered_total[5s])[30s:5s])[10m:])"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected `max_over_time` Aggregate at the root, got {qe:?}"); }; assert_eq!(reduction, &Reduction::PerEntity); assert!(matches!(measures.as_slice(), [AggIntent::Max { .. }])); - let QueryExpr::PromqlSubquery { + let NonASAPOp::PromqlSubquery { range, resolution, child, - } = child.as_ref() + } = child.expect_non_asap() else { panic!("expected the outer `[10m:]` PromqlSubquery, got {child:?}"); }; assert_eq!(*range, Duration::from_secs(600)); assert_eq!(*resolution, None, "`[10m:]` keeps the default resolution"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, measures, child, .. - } = child.as_ref() + } = child.expect_non_asap() else { panic!("expected the `deriv` Aggregate, got {child:?}"); }; assert_eq!(reduction, &Reduction::PerEntity); assert!(matches!(measures.as_slice(), [AggIntent::Deriv])); - let QueryExpr::PromqlSubquery { + let NonASAPOp::PromqlSubquery { range, resolution, child, - } = child.as_ref() + } = child.expect_non_asap() else { panic!("expected the inner `[30s:5s]` PromqlSubquery, got {child:?}"); }; assert_eq!(*range, Duration::from_secs(30)); assert_eq!(*resolution, Some(Duration::from_secs(5))); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = child.as_ref() + } = child.expect_non_asap() else { panic!("expected the `rate` Aggregate, got {child:?}"); }; assert!(matches!(measures.as_slice(), [AggIntent::Rate])); - let QueryExpr::TimeRange { range, .. } = child.as_ref() else { + let NonASAPOp::TimeRange { range, .. } = child.expect_non_asap() else { panic!("expected the `[5s]` TimeRange under rate, got {child:?}"); }; assert_eq!(*range, Duration::from_secs(5)); // Per-series end to end: the schema keeps the (ts, value) floor and stays open. - let schema = qe.output_schema().expect("schema derivation"); + let schema = qe.schema.clone(); assert_eq!( schema .fields @@ -1205,21 +1169,22 @@ fn offset_modifier_lowers_to_a_time_shift() { // past — a `TimeShift` wrapper over the selector (signed ms; a negative // offset shifts forward). Schema is unchanged (the shift only moves *when*). let qe = ok("http_requests_total offset 5m"); - let QueryExpr::TimeRange { child, .. } = &qe else { + let NonASAPOp::TimeRange { child, .. } = qe.expect_non_asap() else { panic!("expected an ingestion TimeRange, got {qe:?}"); }; - let QueryExpr::TimeShift { shift, child } = child.as_ref() else { + let NonASAPOp::TimeShift { shift, child } = child.expect_non_asap() else { panic!("expected a TimeShift, got {qe:?}"); }; assert_eq!(shift.offset_ms, 300_000); assert!(shift.at.is_none()); - assert!(matches!(child.as_ref(), QueryExpr::Scan { .. })); + assert!(matches!(child.expect_non_asap(), NonASAPOp::Scan { .. })); // `offset -5m` shifts forward → negative ms. - let QueryExpr::TimeRange { child, .. } = &ok("http_requests_total offset -5m") else { + let qe = ok("http_requests_total offset -5m"); + let NonASAPOp::TimeRange { child, .. } = qe.expect_non_asap() else { panic!("expected an ingestion TimeRange"); }; - let QueryExpr::TimeShift { shift, .. } = child.as_ref() else { + let NonASAPOp::TimeShift { shift, .. } = child.expect_non_asap() else { panic!("expected a TimeShift"); }; assert_eq!(shift.offset_ms, -300_000); @@ -1230,29 +1195,31 @@ fn at_modifier_lowers_to_a_time_shift() { // SEMANTICS (PromQL, issue #40): `@ ` pins the evaluation to an absolute // instant (PromQL seconds → IR milliseconds); `@ start()` / `@ end()` anchor // to the query range bounds. - let QueryExpr::TimeRange { child, .. } = &ok("http_requests_total @ 1609746000") else { + let qe = ok("http_requests_total @ 1609746000"); + let NonASAPOp::TimeRange { child, .. } = qe.expect_non_asap() else { panic!("expected an ingestion TimeRange"); }; - let QueryExpr::TimeShift { shift, .. } = child.as_ref() else { + let NonASAPOp::TimeShift { shift, .. } = child.expect_non_asap() else { panic!("expected a TimeShift for `@ `"); }; assert_eq!(shift.at, Some(AtModifier::Timestamp(1_609_746_000_000))); assert_eq!(shift.offset_ms, 0); - let QueryExpr::TimeRange { child, .. } = &ok("http_requests_total @ start()") else { + let qe = ok("http_requests_total @ start()"); + let NonASAPOp::TimeRange { child, .. } = qe.expect_non_asap() else { panic!("expected an ingestion TimeRange"); }; - let QueryExpr::TimeShift { shift, .. } = child.as_ref() else { + let NonASAPOp::TimeShift { shift, .. } = child.expect_non_asap() else { panic!("expected a TimeShift for `@ start()`"); }; assert_eq!(shift.at, Some(AtModifier::Start)); // Offset and `@` compose: `@ end() offset 5m` carries both. let qe = ok("http_requests_total @ end() offset 5m"); - let QueryExpr::TimeRange { child, .. } = &qe else { + let NonASAPOp::TimeRange { child, .. } = qe.expect_non_asap() else { panic!("expected an ingestion TimeRange, got {qe:?}"); }; - let QueryExpr::TimeShift { shift, .. } = child.as_ref() else { + let NonASAPOp::TimeShift { shift, .. } = child.expect_non_asap() else { panic!("expected a TimeShift, got {qe:?}"); }; assert_eq!(shift.at, Some(AtModifier::End)); @@ -1265,21 +1232,21 @@ fn offset_on_a_ranged_selector_wraps_inside_the_time_range() { // `TimeShift` sits *under* the `TimeRange` (the 5m window is taken at the // shifted time), and the whole thing under the per-series `Rate` (#40). let qe = ok("rate(http_requests_total[5m] offset 1h)"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected the rate Aggregate, got {qe:?}"); }; assert!(matches!(measures.as_slice(), [AggIntent::Rate])); - let QueryExpr::TimeRange { child, .. } = child.as_ref() else { + let NonASAPOp::TimeRange { child, .. } = child.expect_non_asap() else { panic!("expected a TimeRange under rate, got {child:?}"); }; - let QueryExpr::TimeShift { shift, child } = child.as_ref() else { + let NonASAPOp::TimeShift { shift, child } = child.expect_non_asap() else { panic!("expected a TimeShift under the TimeRange, got {child:?}"); }; assert_eq!(shift.offset_ms, 3_600_000); - assert!(matches!(child.as_ref(), QueryExpr::Scan { .. })); + assert!(matches!(child.expect_non_asap(), NonASAPOp::Scan { .. })); } // ───────────────────────────────────────────────────────────────────────────── @@ -1313,7 +1280,7 @@ fn count_over_time_value_column_is_float64() { // #69: a per-series range reduction produces a PromQL sample value, which is // always float64. `count_over_time`'s `Count` intent types `Int64`, but the // derived `value` column must be `Float64` like every other range reducer. - let schema = ok("count_over_time(m[5m])").output_schema().unwrap(); + let schema = ok("count_over_time(m[5m])").schema.clone(); let value = schema .fields .iter() @@ -1335,12 +1302,12 @@ fn counter_derivative_functions_lower_to_distinct_intents() { ("resets(m[1h])", AggIntent::Resets), ] { let qe = ok(q); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected an Aggregate for {q:?}, got {qe:?}"); }; @@ -1355,7 +1322,7 @@ fn counter_derivative_functions_lower_to_distinct_intents() { "{q}: wrong intent" ); assert!( - matches!(child.as_ref(), QueryExpr::TimeRange { .. }), + matches!(child.expect_non_asap(), NonASAPOp::TimeRange { .. }), "{q}: reduction rides on a TimeRange, got {child:?}" ); } @@ -1366,9 +1333,9 @@ fn predict_linear_carries_horizon_seconds() { // `predict_linear(v[w], t)` — the 2nd (scalar) arg is the prediction horizon // in seconds; it must be carried in the intent (it changes the result). let qe = ok("predict_linear(node_filesystem_avail_bytes[3h], 86400)"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected an Aggregate, got {qe:?}"); }; @@ -1376,7 +1343,10 @@ fn predict_linear_carries_horizon_seconds() { measures.as_slice(), &[AggIntent::PredictLinear { seconds: 86400.0 }] ); - assert!(matches!(child.as_ref(), QueryExpr::TimeRange { .. })); + assert!(matches!( + child.expect_non_asap(), + NonASAPOp::TimeRange { .. } + )); } #[test] @@ -1394,12 +1364,12 @@ fn aggregation_over_counter_derivative_keeps_labels() { // A counter-derivative is per-series (label-preserving), so an outer // `sum by (job)` can group on a label the inner `changes` preserved. let qe = ok(r#"sum by (job) (changes(m{job="api"}[15m]))"#); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected outer Aggregate, got {qe:?}"); }; @@ -1420,12 +1390,12 @@ fn outer_stat_over_counter_derivative_nests_two_levels() { // grouped outer (`avg by (dc)`) must resolve its key against the labels the // inner reduction preserved, threading any scalar param (predict horizon). let qe = ok("avg by (dc) (predict_linear(m[3h], 3600))"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected outer Aggregate, got {qe:?}"); }; @@ -1434,11 +1404,11 @@ fn outer_stat_over_counter_derivative_nests_two_levels() { "outer `avg by (dc)` groups on a label" ); assert!(matches!(measures.as_slice(), [AggIntent::Avg { .. }])); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction: inner_reduction, measures: inner_measures, .. - } = child.as_ref() + } = child.expect_non_asap() else { panic!("expected inner per-series Aggregate, got {child:?}"); }; @@ -1458,11 +1428,14 @@ fn topk_over_counter_derivative_is_generic_sort_limit() { // `topk(k, deriv(...))` ranks the per-series derivative values — a generic // `Sort + Limit`, NOT a heavy-hitter `TopK` (that's only `count_over_time`). let qe = ok("topk(3, deriv(m[5m]))"); - let QueryExpr::Limit { n, child, .. } = &qe else { + let NonASAPOp::Limit { + n: Some(n), child, .. + } = qe.expect_non_asap() + else { panic!("expected Limit, got {qe:?}"); }; assert_eq!(*n, 3); - assert!(matches!(child.as_ref(), QueryExpr::Sort { .. })); + assert!(matches!(child.expect_non_asap(), NonASAPOp::Sort { .. })); assert!(intents(&qe).iter().any(|i| matches!(i, AggIntent::Deriv))); assert!( !intents(&qe) @@ -1477,28 +1450,37 @@ fn counter_derivative_composes_in_binary_ops() { // As a vector operand: `delta(a[5m]) / delta(b[5m])` is a BinaryOp of two // per-series Delta reductions. let ratio = ok("delta(a[5m]) / delta(b[5m])"); - let QueryExpr::BinaryOp { op, lhs, rhs, .. } = &ratio else { + let NonASAPOp::BinaryOp { + operator: BinaryOperator { kind: op, .. }, + lhs, + rhs, + .. + } = ratio.expect_non_asap() + else { panic!("expected BinaryOp, got {ratio:?}"); }; assert_eq!(*op, BinaryOpKind::Arithmetic(ArithmeticOpKind::Div)); assert!( - matches!(lhs.as_ref(), QueryExpr::Aggregate { measures, .. } if measures.as_slice() == [AggIntent::Delta]) + matches!(lhs.expect_non_asap(), NonASAPOp::Aggregate { measures, .. } if measures.as_slice() == [AggIntent::Delta]) ); assert!( - matches!(rhs.as_ref(), QueryExpr::Aggregate { measures, .. } if measures.as_slice() == [AggIntent::Delta]) + matches!(rhs.expect_non_asap(), NonASAPOp::Aggregate { measures, .. } if measures.as_slice() == [AggIntent::Delta]) ); // Under an aggregate over a binary op mixing a counter-derivative with // another per-series function: `sum(rate(m[5m]) + changes(m[5m]))`. let mixed = ok("sum(rate(m[5m]) + changes(m[5m]))"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = &mixed + } = mixed.expect_non_asap() else { panic!("expected Aggregate, got {mixed:?}"); }; assert!(matches!(measures.as_slice(), [AggIntent::Sum { .. }])); - assert!(matches!(child.as_ref(), QueryExpr::BinaryOp { .. })); + assert!(matches!( + child.expect_non_asap(), + NonASAPOp::BinaryOp { .. } + )); assert!(intents(&mixed).iter().any(|i| matches!(i, AggIntent::Rate))); assert!(intents(&mixed) .iter() @@ -1522,12 +1504,12 @@ fn range_functions_over_a_subquery_reduce_per_series() { ("resets(sum(m)[5m:])", AggIntent::Resets), ] { let qe = ok(q); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("{q}: expected an Aggregate, got {qe:?}"); }; @@ -1542,7 +1524,7 @@ fn range_functions_over_a_subquery_reduce_per_series() { "{q}: wrong intent" ); assert!( - matches!(child.as_ref(), QueryExpr::PromqlSubquery { .. }), + matches!(child.expect_non_asap(), NonASAPOp::PromqlSubquery { .. }), "{q}: reduces directly over the PromqlSubquery (no TimeRange), got {child:?}" ); } @@ -1570,8 +1552,8 @@ fn predict_linear_and_double_exp_over_a_subquery_carry_params() { #[test] fn histogram_quantile_classic_bucket_vs_native() { // Two lowerings of `histogram_quantile(φ, …)`: the classic cumulative-bucket - // form → exact `HistogramQuantile`; a native-histogram / raw-samples argument - // → the generic (sketch-able) `Quantile`. The classic form is recognised by + // form → exact `HistogramQuantile`; native samples require a new type. + // The classic form is recognised by // `by (le)`, a `_bucket` metric, or an `le` matcher (issue #43). for classic in [ "histogram_quantile(0.9, sum by (le) (rate(x_bucket[5m])))", @@ -1595,65 +1577,27 @@ fn histogram_quantile_classic_bucket_vs_native() { "histogram_quantile(0.9, my_native_histogram)", "histogram_quantile(0.9, request_duration_seconds)", // raw samples (your extension) ] { - let qe = ok(native); - assert!( - has( - &qe, - |i| matches!(i, AggIntent::Quantile { q, .. } if (*q - 0.9).abs() < 1e-9) - ), - "native/raw form → generic Quantile: {native}" - ); - assert!( - !has(&qe, |i| matches!(i, AggIntent::HistogramQuantile { .. })), - "{native}" - ); + rejected(native); } } #[test] -fn histogram_accessors_lower_to_per_series_intents() { - // `histogram_(v)` extracts a float per series from a native - // histogram — a per-series `Aggregate{[accessor]}` directly over the - // (instant) argument, no grouping. (`histogram_quantile` has its own two - // lowerings — see `histogram_quantile_classic_bucket_vs_native`.) - for (q, want) in [ - ("histogram_count(v)", AggIntent::HistogramCount), - ("histogram_sum(v)", AggIntent::HistogramSum), - ("histogram_avg(v)", AggIntent::HistogramAvg), - ("histogram_stddev(v)", AggIntent::HistogramStdDev), - ("histogram_stdvar(v)", AggIntent::HistogramStdVar), +fn native_histogram_accessors_are_explicit_gaps() { + // Native histogram samples have no typed representation yet. + for q in [ + "histogram_count(v)", + "histogram_sum(v)", + "histogram_avg(v)", + "histogram_stddev(v)", + "histogram_stdvar(v)", ] { - let qe = ok(q); - let QueryExpr::Aggregate { - reduction, - measures, - .. - } = &qe - else { - panic!("{q}: expected an Aggregate, got {qe:?}"); - }; - assert_eq!( - reduction, - &Reduction::PerEntity, - "{q}: per-series, no grouping" - ); - assert_eq!( - measures.as_slice(), - std::slice::from_ref(&want), - "{q}: wrong intent" - ); + rejected(q); } } #[test] -fn histogram_fraction_carries_its_bounds() { - // `histogram_fraction(lower, upper, v)` — bounds from args 0/1, vector arg 2. - let qe = ok("histogram_fraction(0, 0.2, v)"); - assert!(intents(&qe).iter().any(|i| matches!( - i, - AggIntent::HistogramFraction { lower, upper } - if *lower == 0.0 && (*upper - 0.2).abs() < 1e-9 - ))); +fn histogram_fraction_is_an_explicit_gap() { + rejected("histogram_fraction(0, 0.2, v)"); } // ───────────────────────────────────────────────────────────────────────────── @@ -1661,68 +1605,42 @@ fn histogram_fraction_carries_its_bounds() { // ───────────────────────────────────────────────────────────────────────────── #[test] -fn math_functions_lower_to_per_series_math_intents() { - // Each `f(v)` is a per-series element-wise value transform — a per-series - // `Aggregate{[Math(f)]}` over the (instant) argument, no grouping. - for (q, want) in [ - ("abs(v)", MathFunc::Abs), - ("ceil(v)", MathFunc::Ceil), - ("floor(v)", MathFunc::Floor), - ("sqrt(v)", MathFunc::Sqrt), - ("ln(v)", MathFunc::Ln), - ("log2(v)", MathFunc::Log2), - ("sgn(v)", MathFunc::Sgn), - ("sin(v)", MathFunc::Sin), - ("atanh(v)", MathFunc::Atanh), - ("deg(v)", MathFunc::Deg), - ("rad(v)", MathFunc::Rad), +fn math_functions_lower_to_typed_scalar_projections() { + for name in [ + "abs", "ceil", "floor", "sqrt", "ln", "log2", "sgn", "sin", "atanh", "deg", "rad", ] { - let qe = ok(q); - let QueryExpr::Aggregate { - reduction, - measures, - .. - } = &qe - else { - panic!("{q}: expected an Aggregate, got {qe:?}"); - }; - assert_eq!( - reduction, - &Reduction::PerEntity, - "{q}: per-series, no grouping" - ); + let query = ok(&format!("{name}(v)")); assert!( - matches!(measures.as_slice(), [AggIntent::Math(m)] if *m == want), - "{q}: wrong intent, got {measures:?}" + matches!(support::sample_expression(&query),ScalarExpr::FunctionCall { name:n,args } if n==&format!("promql_{name}") && args.len()==1) ); + query.validate_structure().unwrap(); } } #[test] fn clamp_and_round_carry_their_params() { - assert!(intents(&ok("clamp(v, 0, 100)")).iter().any( - |i| matches!(i, AggIntent::Math(MathFunc::Clamp { min, max }) if *min == 0.0 && *max == 100.0) - )); - assert!(intents(&ok("clamp_min(v, 1)")) - .iter() - .any(|i| matches!(i, AggIntent::Math(MathFunc::ClampMin { min }) if *min == 1.0))); - assert!(intents(&ok("clamp_max(v, 5)")) - .iter() - .any(|i| matches!(i, AggIntent::Math(MathFunc::ClampMax { max }) if *max == 5.0))); - // `round(v)` defaults the step to 1; `round(v, 5)` reads it. - assert!(intents(&ok("round(v)")).iter().any( - |i| matches!(i, AggIntent::Math(MathFunc::Round { to_nearest }) if *to_nearest == 1.0) - )); - assert!(intents(&ok("round(v, 5)")).iter().any( - |i| matches!(i, AggIntent::Math(MathFunc::Round { to_nearest }) if *to_nearest == 5.0) - )); + for (query, params) in [ + ("clamp(v,0,100)", vec![0.0, 100.0]), + ("clamp_min(v,1)", vec![1.0]), + ("clamp_max(v,5)", vec![5.0]), + ("round(v)", vec![1.0]), + ("round(v,5)", vec![5.0]), + ] { + let node = ok(query); + let ScalarExpr::FunctionCall { args, .. } = support::sample_expression(&node) else { + panic!() + }; + assert_eq!( + args.iter().skip(1).map(promql_scalar).collect::>(), + params.into_iter().map(Some).collect::>() + ); + } } #[test] fn pi_lowers_to_a_scalar_constant() { - // `pi()` is the constant π — a `PromqlScalarBridge` leaf, not a `Math` intent. - assert!(ok("pi()") - .as_promql_scalar() + // `pi()` is the constant π — a `ScalarExpr` leaf, not a `Math` intent. + assert!(promql_scalar(&support::scalar_root("pi()")) .is_some_and(|v| (v - std::f64::consts::PI).abs() < 1e-12)); } @@ -1747,7 +1665,7 @@ fn absent_keeps_matcher_labels_for_the_synthesized_output() { // `absent(v)` synthesizes its output labels from `v`'s equality matchers, so // those labels must survive into the schema — here `job` from `{job="x"}`. let qe = ok(r#"absent(up{job="x"})"#); - let cols = qe.output_schema().unwrap(); + let cols = qe.schema.clone(); assert!( cols.fields.iter().any(|c| c.name == "job"), "matcher label `job` kept, got {:?}", @@ -1761,73 +1679,55 @@ fn absent_keeps_matcher_labels_for_the_synthesized_output() { #[test] fn time_lowers_to_the_eval_time_scalar() { - // SEMANTICS: `time()` is the query evaluation timestamp as a scalar — a leaf, - // not an aggregate over any series. - assert!(matches!(ok("time()"), QueryExpr::EvalTimestamp)); - // …and it is scalar-shaped: a single float `value`, no time index. - let sch = ok("time()").output_schema().unwrap(); - assert_eq!(sch.fields.len(), 1); - assert_eq!(sch.fields[0].name, "value"); - assert!(sch.time_index.is_none()); + assert!(matches!( + support::scalar_root("time()"), + ScalarExpr::EvalTimestamp + )); } #[test] fn time_minus_vector_is_the_uptime_pattern() { - // `time() - process_start_time_seconds` — the canonical uptime expression. - // The scalar `time()` broadcasts against the vector; the result takes the - // vector's schema. let qe = ok("time() - process_start_time_seconds"); - let QueryExpr::BinaryOp { lhs, op, .. } = &qe else { - panic!("expected a BinaryOp, got {qe:?}"); - }; - assert!(matches!(lhs.as_ref(), QueryExpr::EvalTimestamp)); - assert!(matches!( - op, - BinaryOpKind::Arithmetic(ArithmeticOpKind::Sub) - )); - assert!(qe.output_schema().is_ok()); + assert!( + matches!(support::sample_expression(&qe), ScalarExpr::Arithmetic { op: ArithmeticOpKind::Sub, left, .. } if matches!(left.as_ref(), ScalarExpr::EvalTimestamp)) + ); + assert!(qe.schema.time_index.is_some()); } #[test] fn calendar_functions_lower_to_time_fn_intents() { - // SEMANTICS: each of these is a per-series float transform of its argument's - // timestamp (or, for `timestamp`, the sample's own time). functions.test. - for (q, want) in [ - ("timestamp(up)", TimeFunc::Timestamp), - ("minute(v)", TimeFunc::Minute), - ("hour(v)", TimeFunc::Hour), - ("day_of_week(v)", TimeFunc::DayOfWeek), - ("day_of_month(v)", TimeFunc::DayOfMonth), - ("day_of_year(v)", TimeFunc::DayOfYear), - ("month(v)", TimeFunc::Month), - ("year(v)", TimeFunc::Year), - ("days_in_month(v)", TimeFunc::DaysInMonth), + assert!(has(&ok("timestamp(up)"), |i| *i + == AggIntent::TimeFn(TimeFunc::Timestamp))); + for name in [ + "minute", + "hour", + "day_of_week", + "day_of_month", + "day_of_year", + "month", + "year", + "days_in_month", ] { - let qe = ok(q); + let query = ok(&format!("{name}(v)")); assert!( - has(&qe, |i| *i == AggIntent::TimeFn(want)), - "{q} → TimeFn({want:?}), got {:?}", - intents(&qe) + matches!(support::sample_expression(&query),ScalarExpr::FunctionCall { name:n,args } if n==&format!("promql_{name}") && args.len()==1) ); } } #[test] fn no_arg_calendar_function_reads_the_eval_time() { - // `day_of_week()` with no argument computes over the evaluation time itself, - // so it is a `TimeFn` aggregate whose child is the `EvalTimestamp` scalar. - let qe = ok("day_of_week()"); - let QueryExpr::Aggregate { - measures, child, .. - } = &qe - else { - panic!("expected an Aggregate, got {qe:?}"); + let query = ok("day_of_week()"); + let NonASAPOp::Project { child, .. } = query.expect_non_asap() else { + panic!() }; assert!(matches!( - measures.as_slice(), - [AggIntent::TimeFn(TimeFunc::DayOfWeek)] + child.expect_non_asap(), + NonASAPOp::PromqlVectorFromScalar(ScalarExpr::EvalTimestamp) )); - assert!(matches!(child.as_ref(), QueryExpr::EvalTimestamp)); + assert!( + matches!(support::sample_expression(&query),ScalarExpr::FunctionCall { name,.. } if name=="promql_day_of_week") + ); } #[test] @@ -1848,30 +1748,23 @@ fn vector_promotes_a_scalar_to_a_vector() { // SEMANTICS: `vector(s)` is the scalar→instant-vector bridge — a label-less // single series carrying the scalar's value. let qe = ok("vector(1)"); - let QueryExpr::PromqlVectorFromScalar(inner) = &qe else { + let NonASAPOp::PromqlVectorFromScalar(inner) = qe.expect_non_asap() else { panic!("expected PromqlVectorFromScalar, got {qe:?}"); }; - assert_eq!(inner.as_promql_scalar(), Some(1.0)); + assert!(matches!(inner, ScalarExpr::Literal(ScalarValue::Float64(v)) if *v == 1.0)); // Vector-typed: schema has a time index (a scalar leaf has none). - let sch = qe.output_schema().unwrap(); + let sch = qe.schema.clone(); assert!(sch.time_index.is_some()); assert!(sch.fields.iter().any(|c| c.name == "value")); } #[test] fn scalar_collapses_a_vector_to_a_scalar() { - // SEMANTICS: `scalar(v)` is the instant-vector→scalar bridge. - let qe = ok("scalar(node_load1)"); - let QueryExpr::PromqlScalarFromVector(inner) = &qe else { - panic!("expected PromqlScalarFromVector, got {qe:?}"); + let qe = support::scalar_root("scalar(node_load1)"); + let ScalarExpr::PromqlScalarFromVector(inner) = &qe else { + panic!() }; - let (metric, _) = first_scan(inner); - assert_eq!(metric, "node_load1"); - // PromqlScalarBridge-typed: single `value` column, no time index. - let sch = qe.output_schema().unwrap(); - assert!(sch.time_index.is_none()); - assert_eq!(sch.fields.len(), 1); - assert_eq!(sch.fields[0].name, "value"); + assert_eq!(first_scan(inner).0, "node_load1"); } #[test] @@ -1880,26 +1773,32 @@ fn vector_zero_is_a_vector_operand_of_a_set_op() { // vectors, so `vector(0)` must be a vector (a `PromqlVectorFromScalar`), never a // folded scalar operand. let qe = ok("up or vector(0)"); - let QueryExpr::BinaryOp { rhs, op, .. } = &qe else { + let NonASAPOp::BinaryOp { + operator: BinaryOperator { kind: op, .. }, + rhs, + .. + } = qe.expect_non_asap() + else { panic!("expected a BinaryOp, got {qe:?}"); }; assert_eq!(*op, BinaryOpKind::Set(PromQLVectorSetOpKind::Or)); - assert!(matches!(rhs.as_ref(), QueryExpr::PromqlVectorFromScalar(_))); + assert!(matches!( + rhs.expect_non_asap(), + NonASAPOp::PromqlVectorFromScalar(_) + )); } #[test] fn scalar_of_a_vector_feeds_a_threshold_comparison() { - // `node_load1 > scalar(node_cpu_count)` — `scalar(...)` is a scalar operand, - // so the BinaryOp output takes the vector (lhs) side's schema. let qe = ok("node_load1 > scalar(node_cpu_count)"); - let QueryExpr::BinaryOp { lhs, rhs, .. } = &qe else { - panic!("expected a BinaryOp, got {qe:?}"); + let ScalarExpr::Compare { right, .. } = support::sample_expression(&qe) else { + panic!() }; - assert!(matches!(rhs.as_ref(), QueryExpr::PromqlScalarFromVector(_))); - // The BinaryOp output schema follows the vector (lhs) side, not the scalar. - let (metric, _) = first_scan(lhs); - assert_eq!(metric, "node_load1"); - assert!(qe.output_schema().unwrap().time_index.is_some()); + assert!(matches!( + right.as_ref(), + ScalarExpr::PromqlScalarFromVector(_) + )); + assert!(qe.schema.time_index.is_some()); } #[test] @@ -1909,13 +1808,13 @@ fn info_lowers_to_a_label_enrichment_join() { // (issue #84). The value/time axis pass through; the enriched labels are // runtime, so the schema stays the child's. let qe = ok("info(rate(http_requests_total[5m]))"); - let QueryExpr::PromqlInfoEnrich { selector, child } = &qe else { + let NonASAPOp::PromqlInfoEnrich { selector, child } = qe.expect_non_asap() else { panic!("expected an PromqlInfoEnrich, got {qe:?}"); }; assert!(selector.is_empty(), "no selector → default target_info"); // The child is the untouched input (a per-series rate reduction here). assert!(has(child, |i| *i == AggIntent::Rate)); - assert!(qe.output_schema().unwrap().time_index.is_some()); + assert!(qe.schema.clone().time_index.is_some()); } #[test] @@ -1925,7 +1824,7 @@ fn info_selector_carries_the_info_side_matchers() { // matchers are kept symbolically (not run through the single-metric selector // path). let qe = ok(r#"info(build_info, {__name__=~".+_info", another_data=~".+"})"#); - let QueryExpr::PromqlInfoEnrich { selector, .. } = &qe else { + let NonASAPOp::PromqlInfoEnrich { selector, .. } = qe.expect_non_asap() else { panic!("expected an PromqlInfoEnrich, got {qe:?}"); }; assert_eq!( @@ -1949,12 +1848,12 @@ fn info_composes_under_an_aggregation_and_over_a_time_shift() { // `offset` / `@` on the input now lower to a `TimeShift` under the info-join // (issue #40) — the enrichment composes over the shifted selector. assert!(matches!( - ok("info(metric @ 60)"), - QueryExpr::PromqlInfoEnrich { .. } + ok("info(metric @ 60)").expect_non_asap(), + NonASAPOp::PromqlInfoEnrich { .. } )); assert!(matches!( - ok("info(metric offset 1m)"), - QueryExpr::PromqlInfoEnrich { .. } + ok("info(metric offset 1m)").expect_non_asap(), + NonASAPOp::PromqlInfoEnrich { .. } )); } @@ -1967,12 +1866,12 @@ fn group_lowers_to_a_constant_group_intent() { // SEMANTICS: `group(v)` yields a constant 1 per group — a distinct intent, // NOT folded onto `sum` (which would return the value sum instead of 1). let qe = ok("group(up)"); - let QueryExpr::Aggregate { measures, .. } = &qe else { + let NonASAPOp::Aggregate { measures, .. } = qe.expect_non_asap() else { panic!("expected an Aggregate, got {qe:?}"); }; assert!(matches!(measures.as_slice(), [AggIntent::Group])); // Output column is the constant-1 `group` value. - let sch = qe.output_schema().unwrap(); + let sch = qe.schema.clone(); assert!(sch.fields.iter().any(|c| c.name == "group")); } @@ -1980,7 +1879,7 @@ fn group_lowers_to_a_constant_group_intent() { fn group_by_keeps_the_grouping_keys() { // `group by (job) (up)` — the grouping keys ride on `Aggregate.by`. let qe = ok("group by (job) (up)"); - let sch = qe.output_schema().unwrap(); + let sch = qe.schema.clone(); assert!(sch.fields.iter().any(|c| c.name == "job")); assert!(has(&qe, |i| *i == AggIntent::Group)); } @@ -1991,13 +1890,13 @@ fn count_values_groups_by_value_and_synthesizes_a_label() { // value, counts each distinct value, and emits that value as a new label // `l`. The intent carries the label; schema gains a `Utf8` `l` column. let qe = ok(r#"count_values("version", build_version)"#); - let QueryExpr::Aggregate { measures, .. } = &qe else { + let NonASAPOp::Aggregate { measures, .. } = qe.expect_non_asap() else { panic!("expected an Aggregate, got {qe:?}"); }; assert!( matches!(measures.as_slice(), [AggIntent::CountValues { label }] if label == "version") ); - let sch = qe.output_schema().unwrap(); + let sch = qe.schema.clone(); let version = sch .fields .iter() @@ -2023,7 +1922,7 @@ fn count_values_accepts_a_parenthesised_label_and_by_grouping() { &qe, |i| matches!(i, AggIntent::CountValues { label } if label == "v") )); - let sch = qe.output_schema().unwrap(); + let sch = qe.schema.clone(); assert!(sch.fields.iter().any(|c| c.name == "job")); assert!(sch.fields.iter().any(|c| c.name == "v")); } @@ -2034,7 +1933,7 @@ fn count_values_label_colliding_with_a_group_key_is_not_duplicated() { // with a group-by key. PromQL's synthesized label takes precedence; the // output must carry a single `job` column, never two. let qe = ok(r#"count_values by (job) ("job", version)"#); - let sch = qe.output_schema().unwrap(); + let sch = qe.schema.clone(); let jobs = sch.fields.iter().filter(|c| c.name == "job").count(); assert_eq!(jobs, 1, "collision deduped, got {:?}", sch.fields); assert!(sch.fields.iter().any(|c| c.name == "count")); @@ -2046,18 +1945,18 @@ fn limitk_and_limit_ratio_lower_to_series_sampling() { // series kept unchanged (NOT a ranking), so they lower to the dedicated // `PromqlSeriesSample` node, never `topk`'s `Sort → Limit` (issue #86). assert!(matches!( - ok("limitk(2, http_requests)"), - QueryExpr::PromqlSeriesSample { + ok("limitk(2, http_requests)").expect_non_asap(), + NonASAPOp::PromqlSeriesSample { kind: SampleKind::LimitK(2), .. } )); assert!(matches!( - ok("limit_ratio(0.1, http_requests)"), - QueryExpr::PromqlSeriesSample { kind: SampleKind::LimitRatio(r), .. } if (r - 0.1).abs() < 1e-9 + ok("limit_ratio(0.1, http_requests)").expect_non_asap(), + NonASAPOp::PromqlSeriesSample { kind: SampleKind::LimitRatio(r), .. } if (r - 0.1).abs() < 1e-9 )); // Series-preserving: the output schema equals the input's (ts, value). - let sch = ok("limitk(2, http_requests)").output_schema().unwrap(); + let sch = ok("limitk(2, http_requests)").schema.clone(); assert!(sch.fields.iter().any(|c| c.name == "value")); assert!(sch.time_index.is_some()); } @@ -2067,12 +1966,12 @@ fn limit_ratio_keeps_a_negative_ratio_and_clamps_out_of_range() { // A negative ratio selects the complementary fraction — it must survive, not // be normalised away. Out-of-range magnitudes clamp to [-1, 1] (Prometheus). assert!(matches!( - ok("limit_ratio(-0.5, http_requests)"), - QueryExpr::PromqlSeriesSample { kind: SampleKind::LimitRatio(r), .. } if (r + 0.5).abs() < 1e-9 + ok("limit_ratio(-0.5, http_requests)").expect_non_asap(), + NonASAPOp::PromqlSeriesSample { kind: SampleKind::LimitRatio(r), .. } if (r + 0.5).abs() < 1e-9 )); assert!(matches!( - ok("limit_ratio(1.1, http_requests)"), - QueryExpr::PromqlSeriesSample { kind: SampleKind::LimitRatio(r), .. } if (r - 1.0).abs() < 1e-9 + ok("limit_ratio(1.1, http_requests)").expect_non_asap(), + NonASAPOp::PromqlSeriesSample { kind: SampleKind::LimitRatio(r), .. } if (r - 1.0).abs() < 1e-9 )); } @@ -2080,7 +1979,7 @@ fn limit_ratio_keeps_a_negative_ratio_and_clamps_out_of_range() { fn limitk_by_carries_the_grouping_and_composes_in_a_set_op() { // `limitk by (group)` samples per group; the grouping label is seeded. let qe = ok("limitk by (group) (2, http_requests)"); - let QueryExpr::PromqlSeriesSample { by, .. } = &qe else { + let NonASAPOp::PromqlSeriesSample { by, .. } = qe.expect_non_asap() else { panic!("expected a PromqlSeriesSample, got {qe:?}"); }; assert!(!by.is_empty(), "grouped sampling keeps its `by` keys"); @@ -2106,20 +2005,20 @@ fn dynamic_and_non_finite_sample_params_are_rejected() { // ───────────────────────────────────────────────────────────────────────────── /// Descend single-child nodes to the first `PromqlRelabel`. -fn first_relabel(e: &QueryExpr) -> &QueryExpr { - match e { - QueryExpr::PromqlRelabel { .. } => e, - QueryExpr::Aggregate { child, .. } - | QueryExpr::Filter { child, .. } - | QueryExpr::TimeRange { child, .. } - | QueryExpr::TimeShift { child, .. } => first_relabel(child), +fn first_relabel(e: &OperatorNode) -> &OperatorNode { + match e.expect_non_asap() { + NonASAPOp::PromqlRelabel { .. } => e, + NonASAPOp::Aggregate { child, .. } + | NonASAPOp::Filter { child, .. } + | NonASAPOp::TimeRange { child, .. } + | NonASAPOp::TimeShift { child, .. } => first_relabel(child), other => panic!("no PromqlRelabel reachable from {other:?}"), } } /// True when `value` is a `FunctionCall` with the given name. -fn is_fn_named(value: &QueryExpr, name: &str) -> bool { - matches!(value, QueryExpr::FunctionCall { name: n, .. } if n == name) +fn is_fn_named(value: &ScalarExpr, name: &str) -> bool { + matches!(value, ScalarExpr::FunctionCall { name: n, .. } if n == name) } #[test] @@ -2127,7 +2026,7 @@ fn label_replace_is_a_relabel_over_the_vector() { // SEMANTICS: `label_replace(v, dst, repl, src, regex)` rewrites the `dst` // label per series from a regex over `src`; the sample value is untouched. let qe = ok(r#"label_replace(up, "host", "$1", "instance", "(.+):.*")"#); - let QueryExpr::PromqlRelabel { dst, value, child } = &qe else { + let NonASAPOp::PromqlRelabel { dst, value, child } = qe.expect_non_asap() else { panic!("expected a PromqlRelabel, got {qe:?}"); }; assert_eq!(dst, "host"); @@ -2137,7 +2036,7 @@ fn label_replace_is_a_relabel_over_the_vector() { // The value expression is a `label_replace` fn reading the `src` label. assert!(is_fn_named(value, "label_replace")); // Output: the child's columns + the synthesized `host` label; value & ts kept. - let sch = qe.output_schema().unwrap(); + let sch = qe.schema.clone(); assert!(sch.fields.iter().any(|c| c.name == "host")); assert!(sch.fields.iter().any(|c| c.name == "value")); assert!(sch.time_index.is_some(), "the vector's time axis survives"); @@ -2148,12 +2047,12 @@ fn label_join_concatenates_source_labels() { // SEMANTICS: `label_join(v, dst, sep, src…)` joins the source labels with // `sep` into `dst`. let qe = ok(r#"label_join(up, "combined", "-", "job", "instance")"#); - let QueryExpr::PromqlRelabel { dst, value, .. } = &qe else { + let NonASAPOp::PromqlRelabel { dst, value, .. } = qe.expect_non_asap() else { panic!("expected a PromqlRelabel, got {qe:?}"); }; assert_eq!(dst, "combined"); assert!(is_fn_named(value, "label_join")); - let sch = qe.output_schema().unwrap(); + let sch = qe.schema.clone(); assert!(sch.fields.iter().any(|c| c.name == "combined")); } @@ -2164,9 +2063,11 @@ fn label_replace_composes_under_an_aggregation() { let qe = ok(r#"sum by (host) (label_replace(up, "host", "$1", "instance", "(.+):.*"))"#); // A PromqlRelabel sits below the outer Sum. let relabel = first_relabel(&qe); - assert!(matches!(relabel, QueryExpr::PromqlRelabel { dst, .. } if dst == "host")); + assert!( + matches!(relabel.expect_non_asap(), NonASAPOp::PromqlRelabel { dst, .. } if dst == "host") + ); assert!(has(&qe, |i| matches!(i, AggIntent::Sum { .. }))); - let sch = qe.output_schema().unwrap(); + let sch = qe.schema.clone(); assert!(sch.fields.iter().any(|c| c.name == "host")); } @@ -2191,7 +2092,7 @@ fn extra_over_time_reducers_lower_to_per_series_intents() { assert!(has(&qe, |i| *i == want), "{q}: {:?}", intents(&qe)); // Per-series: the range window survives as a `TimeRange`. assert!( - matches!(&qe, QueryExpr::Aggregate { child, .. } if matches!(child.as_ref(), QueryExpr::TimeRange { .. })), + matches!(qe.expect_non_asap(), NonASAPOp::Aggregate { child, .. } if matches!(child.expect_non_asap(), NonASAPOp::TimeRange { .. })), "{q} keeps its range as a TimeRange" ); } @@ -2215,13 +2116,13 @@ fn sort_and_sort_desc_reorder_by_value_without_a_limit() { ("sort_desc(http_requests)", false), ] { let qe = ok(q); - let QueryExpr::Sort { keys, child, .. } = &qe else { + let NonASAPOp::Sort { keys, child, .. } = qe.expect_non_asap() else { panic!("{q}: expected a Sort, got {qe:?}"); }; assert_eq!(keys.len(), 1); assert_eq!(keys[0].ascending, ascending, "{q}"); // No Limit above the Sort — every series is preserved. - assert!(!matches!(&qe, QueryExpr::Limit { .. })); + assert!(!matches!(qe.expect_non_asap(), NonASAPOp::Limit { .. })); // The value column is what it ranks on: descend to the scan. let (metric, _) = first_scan(child); assert_eq!(metric, "http_requests"); @@ -2233,12 +2134,12 @@ fn sort_by_label_orders_on_each_label_in_turn() { // `sort_by_label(v, "group", "instance", "job")` — one ascending sort key per // label, in argument order; the labels are seeded into the schema. let qe = ok(r#"sort_by_label(http_requests, "group", "instance", "job")"#); - let QueryExpr::Sort { keys, .. } = &qe else { + let NonASAPOp::Sort { keys, .. } = qe.expect_non_asap() else { panic!("expected a Sort, got {qe:?}"); }; assert_eq!(keys.len(), 3, "one key per label"); assert!(keys.iter().all(|k| k.ascending)); - let sch = qe.output_schema().unwrap(); + let sch = qe.schema.clone(); for label in ["group", "instance", "job"] { assert!(sch.fields.iter().any(|c| c.name == label), "{label} seeded"); } @@ -2247,7 +2148,7 @@ fn sort_by_label_orders_on_each_label_in_turn() { #[test] fn sort_by_label_desc_is_descending() { let qe = ok(r#"sort_by_label_desc(http_requests, "instance")"#); - let QueryExpr::Sort { keys, .. } = &qe else { + let NonASAPOp::Sort { keys, .. } = qe.expect_non_asap() else { panic!("expected a Sort, got {qe:?}"); }; assert!(keys.iter().all(|k| !k.ascending)); @@ -2256,28 +2157,43 @@ fn sort_by_label_desc_is_descending() { #[test] fn min_of_max_of_fold_constant_scalars() { // `min_of`/`max_of` are n-ary scalar reducers. When every argument is a - // constant they constant-fold to a `PromqlScalarBridge` leaf, just like scalar + // constant they constant-fold to a `ScalarExpr` leaf, just like scalar // arithmetic (#35) — the only form the intent algebra can hold (#89). - assert_eq!(ok("min_of(3, 5)").as_promql_scalar(), Some(3.0)); - assert_eq!(ok("max_of(3, 5)").as_promql_scalar(), Some(5.0)); - assert_eq!(ok("min_of(-2, -5)").as_promql_scalar(), Some(-5.0)); + assert_eq!( + promql_scalar(&support::scalar_root("min_of(3, 5)")), + Some(3.0) + ); + assert_eq!( + promql_scalar(&support::scalar_root("max_of(3, 5)")), + Some(5.0) + ); + assert_eq!( + promql_scalar(&support::scalar_root("min_of(-2, -5)")), + Some(-5.0) + ); // Nested folds and use as a threshold operand. assert_eq!( - ok("max_of(min_of(2, 3), 10)").as_promql_scalar(), + promql_scalar(&support::scalar_root("max_of(min_of(2, 3), 10)")), Some(10.0) ); let qe = ok("up > max_of(1, 2)"); - let QueryExpr::BinaryOp { rhs, .. } = &qe else { + let ScalarExpr::Compare { right: rhs, .. } = support::sample_expression(&qe) else { panic!("{qe:?}") }; - assert_eq!(rhs.as_promql_scalar(), Some(2.0)); + assert_eq!(promql_scalar(rhs), Some(2.0)); } #[test] fn min_of_max_of_ignore_nan_like_the_min_max_aggregators() { // A NaN argument is skipped (Prometheus `min`/`max` NaN semantics). - assert_eq!(ok("max_of(3, NaN)").as_promql_scalar(), Some(3.0)); - assert_eq!(ok("min_of(NaN, 3)").as_promql_scalar(), Some(3.0)); + assert_eq!( + promql_scalar(&support::scalar_root("max_of(3, NaN)")), + Some(3.0) + ); + assert_eq!( + promql_scalar(&support::scalar_root("min_of(NaN, 3)")), + Some(3.0) + ); } #[test] diff --git a/crates/frontend-promql/tests/promql_equivalence.rs b/crates/frontend-promql/tests/promql_equivalence.rs index 9d0cab2ad..ac3c5a06f 100644 --- a/crates/frontend-promql/tests/promql_equivalence.rs +++ b/crates/frontend-promql/tests/promql_equivalence.rs @@ -17,12 +17,14 @@ #![allow(non_snake_case)] +use std::rc::Rc; + mod support; -use asap_types::pre_asap::QueryExpr; +use asap_types::ir::OperatorNode; use asap_types::types::AccuracyTarget; use support::lower_promql; -fn lo(q: &str) -> QueryExpr { +fn lo(q: &str) -> Rc { lower_promql(q, AccuracyTarget::Exact).unwrap_or_else(|e| panic!("{q:?} should lower: {e}")) } diff --git a/crates/frontend-promql/tests/promql_lowering.rs b/crates/frontend-promql/tests/promql_lowering.rs index 243bf6d18..540f426f5 100644 --- a/crates/frontend-promql/tests/promql_lowering.rs +++ b/crates/frontend-promql/tests/promql_lowering.rs @@ -1,10 +1,13 @@ //! End-to-end tests for PromQL → unresolved → canonical DAG lowering. +use std::rc::Rc; use std::time::Duration; +use asap_types::ir::{ + BinaryOperator, ExprSemantics, NonASAPOp, OperatorNode, ScalarExpr, TimeRangeKind, +}; use asap_types::pre_asap::{ - AggIntent, ArithmeticOpKind, BinaryOpKind, CompareOpKind, QueryExpr, Reduction, ScalarValue, - Source, + AggIntent, ArithmeticOpKind, BinaryOpKind, CompareOpKind, Reduction, ScalarValue, Source, }; use asap_types::types::AccuracyTarget; use asap_types::workload::{ @@ -16,7 +19,7 @@ use asap_frontend_promql::{lower_promql_workload, PromqlError as LoweringError}; mod support; use support::lower_promql; -fn lower(q: &str) -> QueryExpr { +fn lower(q: &str) -> Rc { lower_promql(q, AccuracyTarget::Exact).unwrap_or_else(|e| panic!("lower failed for {q:?}: {e}")) } @@ -77,12 +80,12 @@ fn distinct_over_time_preserves_cardinality_accuracy_and_nested_windows() { #[test] fn bare_selector_is_scan_with_predicates() { let qe = lower(r#"http_requests_total{env="prod",status!="500"}"#); - let QueryExpr::TimeRange { child, .. } = &qe else { + let NonASAPOp::TimeRange { child, .. } = qe.expect_non_asap() else { panic!("expected TimeRange, got {qe:?}"); }; - let QueryExpr::Scan { + let NonASAPOp::Scan { source, predicates, .. - } = child.as_ref() + } = child.expect_non_asap() else { panic!("expected Scan, got {qe:?}"); }; @@ -92,29 +95,32 @@ fn bare_selector_is_scan_with_predicates() { assert_eq!(predicates.len(), 2); assert!(predicates .iter() - .all(|p| matches!(p.0.as_ref(), QueryExpr::Compare { .. }))); + .all(|p| matches!(&p.0, ScalarExpr::Compare { .. }))); } #[test] fn regex_matcher_lowers_to_regex_compareop() { let qe = lower(r#"http_requests_total{path=~"/api/.*"}"#); - let QueryExpr::TimeRange { child, .. } = &qe else { + let NonASAPOp::TimeRange { child, .. } = qe.expect_non_asap() else { panic!("expected TimeRange, got {qe:?}"); }; - let QueryExpr::Scan { + let NonASAPOp::Scan { predicates, schema, .. - } = child.as_ref() + } = child.expect_non_asap() else { panic!("expected Scan, got {qe:?}"); }; - let QueryExpr::Compare { left, op, right } = predicates[0].0.as_ref() else { + let ScalarExpr::Compare { + left, op, right, .. + } = &predicates[0].0 + else { panic!("expected Compare, got {:?}", predicates[0].0); }; assert_eq!(*op, CompareOpKind::Regex); // The label matcher's column is resolved positionally against the scan schema. let path_id = schema.column_id("path").expect("path in scan schema"); - assert!(matches!(left.as_ref(), QueryExpr::Column(id) if *id == path_id)); - assert!(matches!(right.as_ref(), QueryExpr::Literal(ScalarValue::Utf8(v)) if v == "/api/.*")); + assert!(matches!(left.as_ref(), ScalarExpr::Column(id) if *id == path_id)); + assert!(matches!(right.as_ref(), ScalarExpr::Literal(ScalarValue::Utf8(v)) if v == "/api/.*")); } // ── *_over_time → Aggregate over TimeRange ────────────────────────────────────── @@ -122,12 +128,12 @@ fn regex_matcher_lowers_to_regex_compareop() { #[test] fn quantile_over_time_is_time_range_aggregate() { let qe = lower(r#"quantile_over_time(0.99, http_request_duration{env="prod"}[5m])"#); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected Aggregate, got {qe:?}"); }; @@ -135,12 +141,14 @@ fn quantile_over_time_is_time_range_aggregate() { assert!( matches!(measures.as_slice(), [AggIntent::Quantile { q, .. }] if (*q - 0.99).abs() < 1e-9) ); - let QueryExpr::TimeRange { range, child } = child.as_ref() else { + let NonASAPOp::TimeRange { range, child, .. } = child.expect_non_asap() else { panic!("expected TimeRange child, got {child:?}"); }; assert_eq!(*range, Duration::from_secs(300)); // The label matcher folded onto the Scan. - assert!(matches!(child.as_ref(), QueryExpr::Scan { predicates, .. } if predicates.len() == 1)); + assert!( + matches!(child.expect_non_asap(), NonASAPOp::Scan { predicates, .. } if predicates.len() == 1) + ); } #[test] @@ -151,39 +159,42 @@ fn outer_sum_by_over_quantile_over_time_groups_positionally() { // a name-based Partition. Leaf = [ts, value, host, service] (referenced // names appended sorted) → host = col 2. let qe = lower(r#"sum by (host) (quantile_over_time(0.99, latency{service="web"}[5m]))"#); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected outer Aggregate grouped by host, got {qe:?}"); }; assert_eq!(reduction, &Reduction::by(vec![2])); assert!(matches!(measures.as_slice(), [AggIntent::Sum { .. }])); // Inner: Aggregate{Quantile} over TimeRange (per-series over_time reduction). - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = child.as_ref() + } = child.expect_non_asap() else { panic!("expected Aggregate (quantile_over_time) under the outer Sum, got {child:?}"); }; assert!(matches!(measures.as_slice(), [AggIntent::Quantile { .. }])); - assert!(matches!(child.as_ref(), QueryExpr::TimeRange { .. })); + assert!(matches!( + child.expect_non_asap(), + NonASAPOp::TimeRange { .. } + )); } #[test] fn avg_over_time_maps_to_avg_intent() { let qe = lower("avg_over_time(cpu_seconds_total[10m])"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected Aggregate, got {qe:?}"); }; assert!(matches!(measures.as_slice(), [AggIntent::Avg { .. }])); - let QueryExpr::TimeRange { range, .. } = child.as_ref() else { + let NonASAPOp::TimeRange { range, .. } = child.expect_non_asap() else { panic!("expected TimeRange child, got {child:?}"); }; assert_eq!(*range, Duration::from_secs(600)); @@ -192,9 +203,9 @@ fn avg_over_time_maps_to_avg_intent() { #[test] fn stddev_and_stdvar_over_time() { let qe = lower("stddev_over_time(m[5m])"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected Aggregate"); }; @@ -205,12 +216,15 @@ fn stddev_and_stdvar_over_time() { .. }] )); - assert!(matches!(child.as_ref(), QueryExpr::TimeRange { .. })); + assert!(matches!( + child.expect_non_asap(), + NonASAPOp::TimeRange { .. } + )); let qe = lower("stdvar_over_time(m[5m])"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected Aggregate"); }; @@ -221,7 +235,10 @@ fn stddev_and_stdvar_over_time() { .. }] )); - assert!(matches!(child.as_ref(), QueryExpr::TimeRange { .. })); + assert!(matches!( + child.expect_non_asap(), + NonASAPOp::TimeRange { .. } + )); } #[test] @@ -230,32 +247,33 @@ fn histogram_quantile_wraps_inner_in_quantile() { // not squashed away. The `_bucket` metric + `le` matcher mark the classic // form → `HistogramQuantile` over `Aggregate{Rate}` over Scan. let qe = lower(r#"histogram_quantile(0.95, rate(http_duration_seconds_bucket{le="0.5"}[5m]))"#); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected outer Aggregate{{HistogramQuantile}}, got {qe:?}"); }; assert!( matches!(measures.as_slice(), [AggIntent::HistogramQuantile { q, .. }] if (*q - 0.95).abs() < 1e-9) ); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = child.as_ref() + } = child.expect_non_asap() else { panic!("expected inner Aggregate{{Rate}}, got {child:?}"); }; assert!(matches!(measures.as_slice(), [AggIntent::Rate])); - let QueryExpr::TimeRange { + let NonASAPOp::TimeRange { range, child: tr_child, - } = child.as_ref() + .. + } = child.expect_non_asap() else { panic!("expected TimeRange under Rate, got {child:?}"); }; assert_eq!(*range, Duration::from_secs(300)); assert!( - matches!(tr_child.as_ref(), QueryExpr::Scan { predicates, .. } if predicates.len() == 1) + matches!(tr_child.expect_non_asap(), NonASAPOp::Scan { predicates, .. } if predicates.len() == 1) ); } @@ -266,9 +284,9 @@ fn histogram_quantile_over_sum_by_le_preserves_grouping() { // `sum by (le)` aggregate; now the `le` grouping survives into the // canonical DAG. let qe = lower(r#"histogram_quantile(0.99, sum by (le) (rate(http_requests_bucket[5m])))"#); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected outer Aggregate{{HistogramQuantile}}, got {qe:?}"); }; @@ -278,11 +296,11 @@ fn histogram_quantile_over_sum_by_le_preserves_grouping() { ); // `sum by (le)` survives as a positional Aggregate (by = [2], `le`) over the // inner Rate — no name-based Partition. - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, measures, .. - } = child.as_ref() + } = child.expect_non_asap() else { panic!("expected `sum by (le)` as a positional Aggregate, got {child:?}"); }; @@ -292,12 +310,12 @@ fn histogram_quantile_over_sum_by_le_preserves_grouping() { /// The classic `histogram_quantile` aggregate: its `without` keys, `le` /// column, and output column names. -fn classic_histogram(qe: &QueryExpr) -> (Vec, usize, Vec) { - let QueryExpr::Aggregate { +fn classic_histogram(qe: &OperatorNode) -> (Vec, usize, Vec) { + let NonASAPOp::Aggregate { reduction: Reduction::Reduce(by), measures, .. - } = qe + } = qe.expect_non_asap() else { panic!("expected a reducing Aggregate, got {qe:?}"); }; @@ -305,13 +323,7 @@ fn classic_histogram(qe: &QueryExpr) -> (Vec, usize, Vec) { panic!("expected HistogramQuantile, got {measures:?}"); }; assert!(by.is_without(), "histogram_quantile groups without (le)"); - let names = qe - .output_schema() - .unwrap() - .fields - .iter() - .map(|c| c.name.clone()) - .collect(); + let names = qe.schema.fields.iter().map(|c| c.name.clone()).collect(); (by.keys().to_vec(), *le, names) } @@ -321,10 +333,10 @@ fn classic_histogram(qe: &QueryExpr) -> (Vec, usize, Vec) { fn classic_histogram_quantile_groups_without_le() { let qe = lower("histogram_quantile(0.9, rate(http_duration_seconds_bucket[5m]))"); let (keys, le, names) = classic_histogram(&qe); - let QueryExpr::Aggregate { child, .. } = &qe else { + let NonASAPOp::Aggregate { child, .. } = qe.expect_non_asap() else { unreachable!() }; - let child = child.output_schema().unwrap(); + let child = &child.schema; assert_eq!(child.fields[le].name, "le"); assert_eq!(keys, vec![le]); assert_eq!(names, vec!["histogram_quantile"]); @@ -349,14 +361,16 @@ fn classic_histogram_quantile_keeps_out_of_range_quantiles() { ("histogram_quantile(-1, x_bucket)", -1.), ("histogram_quantile(2, x_bucket)", 2.), ] { - let QueryExpr::Aggregate { measures, .. } = lower(query) else { + let root = lower(query); + let NonASAPOp::Aggregate { measures, .. } = root.expect_non_asap() else { panic!("{query}"); }; assert!( matches!(measures.as_slice(), [AggIntent::HistogramQuantile { q, .. }] if *q == expected) ); } - let QueryExpr::Aggregate { measures, .. } = lower("histogram_quantile(NaN, x_bucket)") else { + let root = lower("histogram_quantile(NaN, x_bucket)"); + let NonASAPOp::Aggregate { measures, .. } = root.expect_non_asap() else { panic!("NaN"); }; assert!(matches!(measures.as_slice(), [AggIntent::HistogramQuantile { q, .. }] if q.is_nan())); @@ -379,14 +393,14 @@ fn classic_histogram_quantile_rejects_an_argument_without_le() { #[test] fn rate_has_time_range_child_not_window() { let qe = lower("rate(http_requests_total[5m])"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected Aggregate for rate, got {qe:?}"); }; assert!(matches!(measures.as_slice(), [AggIntent::Rate])); - let QueryExpr::TimeRange { range, .. } = child.as_ref() else { + let NonASAPOp::TimeRange { range, .. } = child.expect_non_asap() else { panic!("expected TimeRange child (not Window), got {child:?}"); }; assert_eq!(*range, Duration::from_secs(300)); @@ -395,14 +409,14 @@ fn rate_has_time_range_child_not_window() { #[test] fn increase_maps_to_increase_intent() { let qe = lower("increase(errors_total[1h])"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected Aggregate for increase, got {qe:?}"); }; assert!(matches!(measures.as_slice(), [AggIntent::Increase])); - let QueryExpr::TimeRange { range, .. } = child.as_ref() else { + let NonASAPOp::TimeRange { range, .. } = child.expect_non_asap() else { panic!("expected TimeRange child, got {child:?}"); }; assert_eq!(*range, Duration::from_secs(3600)); @@ -415,21 +429,24 @@ fn sum_over_rate_keeps_both_levels() { // Regression: `sum(rate(m[w]))` — the most common PromQL shape — must keep // the cross-series Sum, not collapse to a bare per-series Rate. let qe = lower("sum(rate(http_requests_total[5m]))"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected outer Aggregate{{Sum}}, got {qe:?}"); }; assert!(matches!(measures.as_slice(), [AggIntent::Sum { .. }])); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = child.as_ref() + } = child.expect_non_asap() else { panic!("expected inner Aggregate{{Rate}}, got {child:?}"); }; assert!(matches!(measures.as_slice(), [AggIntent::Rate])); - assert!(matches!(child.as_ref(), QueryExpr::TimeRange { .. })); + assert!(matches!( + child.expect_non_asap(), + NonASAPOp::TimeRange { .. } + )); } #[test] @@ -438,20 +455,20 @@ fn sum_by_over_rate_groups_the_outer_sum() { // on a positional `Aggregate.by` (the same shape SQL produces) over the // label-preserving inner Rate. Leaf = [ts, value, job] → by = [2]. let qe = lower("sum by (job) (rate(http_requests_total[5m]))"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected outer Aggregate grouped by job, got {qe:?}"); }; assert_eq!(reduction, &Reduction::by(vec![2])); assert!(matches!(measures.as_slice(), [AggIntent::Sum { .. }])); assert!(matches!( - child.as_ref(), - QueryExpr::Aggregate { measures, .. } if matches!(measures.as_slice(), [AggIntent::Rate]) + child.expect_non_asap(), + NonASAPOp::Aggregate { measures, .. } if matches!(measures.as_slice(), [AggIntent::Rate]) )); } @@ -459,16 +476,16 @@ fn sum_by_over_rate_groups_the_outer_sum() { fn count_over_rate_keeps_both_levels() { // The `Outer::Count` sibling of the `sum(rate(...))` bug. let qe = lower("count(rate(http_requests_total[5m]))"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected outer Aggregate{{Count}}, got {qe:?}"); }; assert!(matches!(measures.as_slice(), [AggIntent::Count { .. }])); assert!(matches!( - child.as_ref(), - QueryExpr::Aggregate { measures, .. } if matches!(measures.as_slice(), [AggIntent::Rate]) + child.expect_non_asap(), + NonASAPOp::Aggregate { measures, .. } if matches!(measures.as_slice(), [AggIntent::Rate]) )); } @@ -487,12 +504,12 @@ fn count_over_distinct_over_time_preserves_both_aggregates() { ), ] { let dag = lower(query); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, reduction: actual, child, .. - } = &dag + } = dag.expect_non_asap() else { panic!("expected outer Count: {dag:?}"); }; @@ -501,12 +518,12 @@ fn count_over_distinct_over_time_preserves_both_aggregates() { "{query}: {dag:?}" ); assert_eq!(actual, &reduction, "{query}"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, reduction, child, .. - } = child.as_ref() + } = child.expect_non_asap() else { panic!("expected inner per-series Cardinality: {dag:?}"); }; @@ -516,7 +533,7 @@ fn count_over_distinct_over_time_preserves_both_aggregates() { ); assert_eq!(reduction, &Reduction::PerEntity, "{query}"); assert!( - matches!(child.as_ref(), QueryExpr::TimeRange { range, .. } if range.as_secs() == 300) + matches!(child.expect_non_asap(), NonASAPOp::TimeRange { range, .. } if range.as_secs() == 300) ); } } @@ -552,14 +569,17 @@ fn count_never_lowers_to_distinct_sample_values() { #[test] fn count_over_time_is_count_intent() { let qe = lower("count_over_time(m[5m])"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected Aggregate"); }; assert!(matches!(measures.as_slice(), [AggIntent::Count { .. }])); - assert!(matches!(child.as_ref(), QueryExpr::TimeRange { .. })); + assert!(matches!( + child.expect_non_asap(), + NonASAPOp::TimeRange { .. } + )); } #[test] @@ -568,26 +588,29 @@ fn outer_count_counts_series() { // over the window (label-preserving), outer cross-series row count grouped // on a positional `Aggregate.by`. Leaf = [ts, value, symbol] → symbol = col 2. let qe = lower("count by (symbol) (count_over_time(financial_last_trade_price[5m]))"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected outer Aggregate grouped by symbol, got {qe:?}"); }; assert_eq!(reduction, &Reduction::by(vec![2])); assert!(matches!(measures.as_slice(), [AggIntent::Count { .. }])); // Inner: Aggregate{Count} over TimeRange (per-series count_over_time). - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = child.as_ref() + } = child.expect_non_asap() else { panic!("expected Aggregate (count_over_time) under the outer count, got {child:?}"); }; assert!(matches!(measures.as_slice(), [AggIntent::Count { .. }])); - assert!(matches!(child.as_ref(), QueryExpr::TimeRange { .. })); + assert!(matches!( + child.expect_non_asap(), + NonASAPOp::TimeRange { .. } + )); } // ── topk / bottomk ──────────────────────────────────────────────────────────── @@ -596,12 +619,12 @@ fn outer_count_counts_series() { fn topk_over_count_is_heavy_hitter_topk() { let qe = lower(r#"topk by (service) (10, count_over_time(requests{env="prod"}[1m]))"#); // Heavy-hitter: Aggregate{TopK} with grouping resolved to positional ids. - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected Aggregate with TopK, got {qe:?}"); }; @@ -612,29 +635,29 @@ fn topk_over_count_is_heavy_hitter_topk() { [AggIntent::TopK { k: 10, .. }] )); // The count_over_time under the TopK is a TimeRange-backed aggregate. - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = child.as_ref() + } = child.expect_non_asap() else { panic!("expected Aggregate (count_over_time) under TopK, got {child:?}"); }; assert!(matches!(measures.as_slice(), [AggIntent::Count { .. }])); - let QueryExpr::TimeRange { range, child } = child.as_ref() else { + let NonASAPOp::TimeRange { range, child, .. } = child.expect_non_asap() else { panic!("expected TimeRange under Count aggregate, got {child:?}"); }; assert_eq!(*range, Duration::from_secs(60)); - assert!(matches!(child.as_ref(), QueryExpr::Scan { .. })); + assert!(matches!(child.expect_non_asap(), NonASAPOp::Scan { .. })); } #[test] fn topk_over_sum_is_value_weighted_heavy_hitter_topk() { let qe = lower(r#"topk by (service) (5, sum_over_time(requests{env="prod"}[1m]))"#); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected Aggregate with TopK, got {qe:?}"); }; @@ -643,29 +666,38 @@ fn topk_over_sum_is_value_weighted_heavy_hitter_topk() { measures.as_slice(), [AggIntent::TopK { k: 5, .. }] )); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = child.as_ref() + } = child.expect_non_asap() else { panic!("expected Aggregate (sum_over_time) under TopK, got {child:?}"); }; assert!(matches!(measures.as_slice(), [AggIntent::Sum { .. }])); - assert!(matches!(child.as_ref(), QueryExpr::TimeRange { .. })); + assert!(matches!( + child.expect_non_asap(), + NonASAPOp::TimeRange { .. } + )); } #[test] fn topk_over_avg_is_generic_sort_limit() { let qe = lower("topk by (host) (5, avg_over_time(cpu[5m]))"); - let QueryExpr::Limit { n, offset, child } = &qe else { + let NonASAPOp::Limit { + n: Some(n), + offset, + child, + .. + } = qe.expect_non_asap() + else { panic!("expected Limit, got {qe:?}"); }; assert_eq!(*n, 5); assert_eq!(*offset, 0); - let QueryExpr::Sort { + let NonASAPOp::Sort { keys, partition_by, child, - } = child.as_ref() + } = child.expect_non_asap() else { panic!("expected Sort under Limit, got {child:?}"); }; @@ -678,7 +710,7 @@ fn topk_over_avg_is_generic_sort_limit() { // Underneath: the label-preserving windowed avg aggregate (by: []), no // intervening Partition. assert!( - matches!(child.as_ref(), QueryExpr::Aggregate { reduction, measures, .. } + matches!(child.expect_non_asap(), NonASAPOp::Aggregate { reduction, measures, .. } if reduction == &Reduction::PerEntity && matches!(measures.as_slice(), [AggIntent::Avg { .. }])), "expected bare per-series Avg aggregate under Sort, got {child:?}" ); @@ -687,7 +719,7 @@ fn topk_over_avg_is_generic_sort_limit() { #[test] fn ungrouped_topk_over_sum_is_heavy_hitter() { let qe = lower("topk(5, sum_over_time(m[5m]))"); - assert!(matches!(&qe, QueryExpr::Aggregate { .. })); + assert!(matches!(qe.expect_non_asap(), NonASAPOp::Aggregate { .. })); assert!(has_intent(&qe, |i| matches!(i, AggIntent::Sum { .. }))); assert!(has_intent(&qe, |i| matches!( i, @@ -699,11 +731,14 @@ fn ungrouped_topk_over_sum_is_heavy_hitter() { fn bottomk_over_count_is_generic_sort_ascending() { // `bottomk` is never a heavy-hitter (descending=false), even over count. let qe = lower("bottomk(3, count_over_time(m[5m]))"); - let QueryExpr::Limit { n, child, .. } = &qe else { + let NonASAPOp::Limit { + n: Some(n), child, .. + } = qe.expect_non_asap() + else { panic!("expected Limit, got {qe:?}"); }; assert_eq!(*n, 3); - let QueryExpr::Sort { keys, .. } = child.as_ref() else { + let NonASAPOp::Sort { keys, .. } = child.expect_non_asap() else { panic!("expected Sort"); }; assert!(keys[0].ascending, "bottomk ranks ascending"); @@ -715,11 +750,14 @@ fn bottomk_over_count_is_generic_sort_ascending() { #[test] fn bottomk_is_always_generic_sort_ascending() { let qe = lower("bottomk(3, count_over_time(m[5m]))"); - let QueryExpr::Limit { n, child, .. } = &qe else { + let NonASAPOp::Limit { + n: Some(n), child, .. + } = qe.expect_non_asap() + else { panic!("expected Limit, got {qe:?}"); }; assert_eq!(*n, 3); - let QueryExpr::Sort { keys, .. } = child.as_ref() else { + let NonASAPOp::Sort { keys, .. } = child.expect_non_asap() else { panic!("expected Sort"); }; assert!(keys[0].ascending, "bottomk ranks ascending"); @@ -731,12 +769,12 @@ fn topk_count_output_schema_carries_group_key() { // (`service`) flows through to the outer TopK's `by` column. Leaf schema = // [ts, value, service] → TopK groups on service (col 2). let qe = lower("topk by (service) (5, count_over_time(m[1m]))"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected Aggregate{{TopK}}, got {qe:?}"); }; @@ -750,14 +788,17 @@ fn topk_count_output_schema_carries_group_key() { [AggIntent::TopK { k: 5, .. }] )); // Inner Count aggregate is visible with its TimeRange child. - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = child.as_ref() + } = child.expect_non_asap() else { panic!("expected inner Aggregate{{Count}}, got {child:?}"); }; assert!(matches!(measures.as_slice(), [AggIntent::Count { .. }])); - assert!(matches!(child.as_ref(), QueryExpr::TimeRange { .. })); + assert!(matches!( + child.expect_non_asap(), + NonASAPOp::TimeRange { .. } + )); } // ── binary ops ──────────────────────────────────────────────────────────────── @@ -765,22 +806,32 @@ fn topk_count_output_schema_carries_group_key() { #[test] fn binary_op_division() { let qe = lower("rate(a[5m]) / rate(b[5m])"); - let QueryExpr::BinaryOp { op, lhs, rhs, .. } = &qe else { + let NonASAPOp::BinaryOp { + operator: BinaryOperator { kind: op, .. }, + lhs, + rhs, + .. + } = qe.expect_non_asap() + else { panic!("expected BinaryOp, got {qe:?}"); }; assert_eq!(*op, BinaryOpKind::Arithmetic(ArithmeticOpKind::Div)); assert!( - matches!(lhs.as_ref(), QueryExpr::Aggregate { measures, .. } if matches!(measures.as_slice(), [AggIntent::Rate])) + matches!(lhs.expect_non_asap(), NonASAPOp::Aggregate { measures, .. } if matches!(measures.as_slice(), [AggIntent::Rate])) ); assert!( - matches!(rhs.as_ref(), QueryExpr::Aggregate { measures, .. } if matches!(measures.as_slice(), [AggIntent::Rate])) + matches!(rhs.expect_non_asap(), NonASAPOp::Aggregate { measures, .. } if matches!(measures.as_slice(), [AggIntent::Rate])) ); } #[test] fn binary_op_with_on_grouping() { let qe = lower("a / on(host) b"); - let QueryExpr::BinaryOp { vector_match, .. } = &qe else { + let NonASAPOp::BinaryOp { + operator: BinaryOperator { vector_match, .. }, + .. + } = qe.expect_non_asap() + else { panic!("expected BinaryOp, got {qe:?}"); }; let vm = vector_match.as_ref().expect("vector_match present"); @@ -793,18 +844,38 @@ fn binary_op_with_on_grouping() { // carry it. #[test] fn bool_comparisons_are_distinct() { - let op = |q: &str| match lower(q) { - QueryExpr::BinaryOp { op, .. } => op, + let op = |q: &str| match lower(q).expect_non_asap() { + NonASAPOp::BinaryOp { + operator, + return_bool, + .. + } => (operator.kind.clone(), *return_bool), + NonASAPOp::Filter { + pred: asap_types::ir::Predicate(ScalarExpr::Compare { op, .. }), + .. + } => (BinaryOpKind::Compare(op.clone()), false), + NonASAPOp::Project { cols, .. } => { + let ScalarExpr::Case { branches, .. } = &cols[1].expr else { + panic!() + }; + let ScalarExpr::Compare { op, .. } = &branches[0].0 else { + panic!() + }; + (BinaryOpKind::Compare(op.clone()), true) + } other => panic!("expected BinaryOp, got {other:?}"), }; - assert_eq!(op("a > 1"), BinaryOpKind::Compare(CompareOpKind::Gt)); + assert_eq!( + op("a > 1"), + (BinaryOpKind::Compare(CompareOpKind::Gt), false) + ); assert_eq!( op("a > bool 1"), - BinaryOpKind::CompareBool(CompareOpKind::Gt) + (BinaryOpKind::Compare(CompareOpKind::Gt), true) ); assert_eq!( op("a == bool on(job) b"), - BinaryOpKind::CompareBool(CompareOpKind::Eq) + (BinaryOpKind::Compare(CompareOpKind::Eq), true) ); } @@ -814,7 +885,7 @@ fn binary_op_binds_each_branch_against_its_own_schema() { // single root schema threaded to both branches, the left scan would leak the // right's group key (and vice-versa). Per-branch binding keeps them separate. let qe = lower("count by (job) (a) / count by (region) (b)"); - let QueryExpr::BinaryOp { lhs, rhs, .. } = &qe else { + let NonASAPOp::BinaryOp { lhs, rhs, .. } = qe.expect_non_asap() else { panic!("expected BinaryOp, got {qe:?}"); }; let lcols = scan_columns(lhs); @@ -829,26 +900,26 @@ fn binary_op_binds_each_branch_against_its_own_schema() { ); } -/// Collect every `AggIntent` in the DAG, root-to-leaf. -fn all_intents(e: &QueryExpr) -> Vec { +/// Collect every `AggIntent` in the dag, root-to-leaf. +fn all_intents(e: &OperatorNode) -> Vec { let mut out = Vec::new(); collect_intents(e, &mut out); out } -fn collect_intents(e: &QueryExpr, out: &mut Vec) { - match e { - QueryExpr::Aggregate { +fn collect_intents(e: &OperatorNode, out: &mut Vec) { + match e.expect_non_asap() { + NonASAPOp::Aggregate { measures, child, .. } => { out.extend(measures.iter().cloned()); collect_intents(child, out); } - QueryExpr::TimeRange { child, .. } - | QueryExpr::Filter { child, .. } - | QueryExpr::Sort { child, .. } - | QueryExpr::Limit { child, .. } => collect_intents(child, out), - QueryExpr::BinaryOp { lhs, rhs, .. } => { + NonASAPOp::TimeRange { child, .. } + | NonASAPOp::Filter { child, .. } + | NonASAPOp::Sort { child, .. } + | NonASAPOp::Limit { child, .. } => collect_intents(child, out), + NonASAPOp::BinaryOp { lhs, rhs, .. } => { collect_intents(lhs, out); collect_intents(rhs, out); } @@ -856,20 +927,20 @@ fn collect_intents(e: &QueryExpr, out: &mut Vec) { } } -/// True if any `AggIntent` anywhere in the DAG satisfies `pred`. -fn has_intent bool>(e: &QueryExpr, pred: F) -> bool { +/// True if any `AggIntent` anywhere in the dag satisfies `pred`. +fn has_intent bool>(e: &OperatorNode, pred: F) -> bool { all_intents(e).iter().any(pred) } /// Field names on the first `Scan` reachable by descending single-child nodes. -fn scan_columns(e: &QueryExpr) -> Vec { - match e { - QueryExpr::Scan { schema, .. } => schema.fields.iter().map(|c| c.name.clone()).collect(), - QueryExpr::Aggregate { child, .. } - | QueryExpr::TimeRange { child, .. } - | QueryExpr::Filter { child, .. } - | QueryExpr::Sort { child, .. } - | QueryExpr::Limit { child, .. } => scan_columns(child), +fn scan_columns(e: &OperatorNode) -> Vec { + match e.expect_non_asap() { + NonASAPOp::Scan { schema, .. } => schema.fields.iter().map(|c| c.name.clone()).collect(), + NonASAPOp::Aggregate { child, .. } + | NonASAPOp::TimeRange { child, .. } + | NonASAPOp::Filter { child, .. } + | NonASAPOp::Sort { child, .. } + | NonASAPOp::Limit { child, .. } => scan_columns(child), _ => vec![], } } @@ -883,12 +954,12 @@ fn without_grouping_lowers_to_the_exclusion_form() { // label is stored positionally (the SchemaResolver seeds it), the grouping is the // `without` form, and the output schema stays open. let qe = lower("sum without (instance) (rate(m[5m]))"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, measures, child, .. - } = &qe + } = qe.expect_non_asap() else { panic!("expected an Aggregate, got {qe:?}"); }; @@ -899,10 +970,10 @@ fn without_grouping_lowers_to_the_exclusion_form() { // The inner per-series rate is preserved (label-preserving) under the outer // cross-series `without` reduction. assert!( - matches!(child.as_ref(), QueryExpr::Aggregate { measures, .. } + matches!(child.expect_non_asap(), NonASAPOp::Aggregate { measures, .. } if matches!(measures.as_slice(), [AggIntent::Rate])) ); - assert!(!qe.output_schema().unwrap().closed); + assert!(!qe.schema.clone().closed); } // ── parameter validation (reject rather than silently truncate/garble) ────────── @@ -920,7 +991,7 @@ fn out_of_range_quantile_phi_is_accepted() { for query in [ "quantile(1.5, up)", "quantile_over_time(1.5, m[5m])", - "histogram_quantile(2.0, rate(b[5m]))", + "histogram_quantile(2.0, rate(b_bucket[5m]))", ] { assert!( lower_promql(query, AccuracyTarget::Exact).is_ok(), @@ -979,7 +1050,7 @@ fn accuracy_target_flows_into_quantile_intent() { AccuracyTarget::Epsilon(0.01), ) .unwrap(); - let QueryExpr::Aggregate { measures, .. } = &qe else { + let NonASAPOp::Aggregate { measures, .. } = qe.expect_non_asap() else { panic!("expected Aggregate"); }; assert!(matches!( @@ -998,10 +1069,10 @@ fn aggregate_output_schema_preserves_time_axis_and_labels() { // predicate columns) to the scan schema, so `env` appears as a column // even though it is only used as a filter. // per_series_reduction_schema preserves the time axis and all label columns. - let QueryExpr::Aggregate { .. } = &qe else { + let NonASAPOp::Aggregate { .. } = qe.expect_non_asap() else { panic!("expected Aggregate, got {qe:?}"); }; - let schema = qe.output_schema().expect("aggregate schema"); + let schema = &qe.schema; let names: Vec<&str> = schema.fields.iter().map(|c| c.name.as_str()).collect(); assert_eq!(names, vec!["ts", "value", "env"]); assert_eq!( @@ -1016,16 +1087,16 @@ fn scan_schema_carries_ts_value_and_group_keys() { // `service` is a group key → the SchemaResolver lands it in the self-contained // Scan schema (positional). `env` is only a filter, so it is not a column. let qe = lower("count by (service) (count_over_time(requests[1m]))"); - fn find_scan(n: &QueryExpr) -> &QueryExpr { - match n { - QueryExpr::Scan { .. } => n, - QueryExpr::TimeRange { child, .. } - | QueryExpr::Aggregate { child, .. } - | QueryExpr::Filter { child, .. } => find_scan(child), + fn find_scan(n: &OperatorNode) -> &OperatorNode { + match n.expect_non_asap() { + NonASAPOp::Scan { .. } => n, + NonASAPOp::TimeRange { child, .. } + | NonASAPOp::Aggregate { child, .. } + | NonASAPOp::Filter { child, .. } => find_scan(child), other => panic!("unexpected node {other:?}"), } } - let QueryExpr::Scan { schema, .. } = find_scan(&qe) else { + let NonASAPOp::Scan { schema, .. } = find_scan(&qe).expect_non_asap() else { unreachable!() }; let mut names: Vec<&str> = schema.fields.iter().map(|c| c.name.as_str()).collect(); @@ -1113,19 +1184,23 @@ fn reducing_group_by_lowers_to_aggregate_by() { // Cross-series reduce, no keys → bare `Aggregate { reduction: Reduce([]) }`. let q = lower("sum(http_requests_total)"); assert!( - matches!(q, QueryExpr::Aggregate { ref reduction, .. } if reduction == &Reduction::by(vec![])) + matches!(q.expect_non_asap(), NonASAPOp::Aggregate { reduction, .. } if reduction == &Reduction::by(vec![])) ); // Cross-series reduce grouped by a label → `Aggregate.reduction`. let q = lower("sum by (job) (http_requests_total)"); - assert!(matches!(q, QueryExpr::Aggregate { ref reduction, .. } - if reduction.expect_reduce().len() == 1)); + assert!( + matches!(q.expect_non_asap(), NonASAPOp::Aggregate { reduction, .. } + if reduction.expect_reduce().len() == 1) + ); // Reduce over a label-preserving `rate` grouped by a label → still // `Aggregate.reduction` (the keys resolve against rate's preserved schema). let q = lower("sum by (job) (rate(http_requests_total[5m]))"); - assert!(matches!(q, QueryExpr::Aggregate { ref reduction, .. } - if reduction.expect_reduce().len() == 1)); + assert!( + matches!(q.expect_non_asap(), NonASAPOp::Aggregate { reduction, .. } + if reduction.expect_reduce().len() == 1) + ); } #[test] @@ -1134,20 +1209,20 @@ fn generic_topk_grouping_lowers_to_sort_partition_by() { // reducing → the grouping rides on `Sort.partition_by`, and the windowed // reduction beneath stays label-preserving (`by: []`). No `Partition` node. let q = lower("topk by (host) (5, avg_over_time(cpu[5m]))"); - let QueryExpr::Limit { child, .. } = &q else { + let NonASAPOp::Limit { child, .. } = q.expect_non_asap() else { panic!("expected Limit, got {q:?}"); }; - let QueryExpr::Sort { + let NonASAPOp::Sort { partition_by, child, .. - } = child.as_ref() + } = child.expect_non_asap() else { panic!("expected Sort, got {child:?}"); }; assert_eq!(partition_by, &vec![2], "host is col 2 in [ts, value, host]"); assert!( - matches!(child.as_ref(), QueryExpr::Aggregate { reduction, .. } if reduction == &Reduction::PerEntity) + matches!(child.expect_non_asap(), NonASAPOp::Aggregate { reduction, .. } if reduction == &Reduction::PerEntity) ); } @@ -1160,15 +1235,18 @@ fn topk_over_bare_selector_by_label_ranks_per_group() { // Partition→Sort.partition_by reframe in #12). Expected: // Limit{3} → Sort{value desc, partition_by:[job]} → Scan let q = lower("topk(3, http_requests_total) by (job)"); - let QueryExpr::Limit { n, child, .. } = &q else { + let NonASAPOp::Limit { + n: Some(n), child, .. + } = q.expect_non_asap() + else { panic!("expected Limit, got {q:?}"); }; assert_eq!(*n, 3); - let QueryExpr::Sort { + let NonASAPOp::Sort { keys, partition_by, child, - } = child.as_ref() + } = child.expect_non_asap() else { panic!("expected Sort, got {child:?}"); }; @@ -1177,7 +1255,7 @@ fn topk_over_bare_selector_by_label_ranks_per_group() { // No implicit reducing aggregate — the selector is label-preserving, so the // sort is directly over the selector horizon (the `job` label survives to partition by). assert!( - matches!(child.as_ref(), QueryExpr::TimeRange { child, .. } if matches!(child.as_ref(), QueryExpr::Scan { .. })), + matches!(child.expect_non_asap(), NonASAPOp::TimeRange { child, .. } if matches!(child.expect_non_asap(), NonASAPOp::Scan { .. })), "ranking is over the bare selector horizon, not a reducing Aggregate, got {child:?}" ); assert!( @@ -1191,20 +1269,20 @@ fn topk_over_bare_selector_ranks_raw_samples() { // Even without `by`, `topk(3, m)` ranks the raw instant-vector samples — it // does not sum them. The sort sits directly over the Scan, partition empty. let q = lower("topk(3, http_requests_total)"); - let QueryExpr::Limit { child, .. } = &q else { + let NonASAPOp::Limit { child, .. } = q.expect_non_asap() else { panic!("expected Limit, got {q:?}"); }; - let QueryExpr::Sort { + let NonASAPOp::Sort { partition_by, child, .. - } = child.as_ref() + } = child.expect_non_asap() else { panic!("expected Sort, got {child:?}"); }; assert!(partition_by.is_empty(), "no `by` → global ranking"); assert!( - matches!(child.as_ref(), QueryExpr::TimeRange { child, .. } if matches!(child.as_ref(), QueryExpr::Scan { .. })) + matches!(child.expect_non_asap(), NonASAPOp::TimeRange { child, .. } if matches!(child.expect_non_asap(), NonASAPOp::Scan { .. })) ); assert!(!has_intent(&q, |i| matches!(i, AggIntent::Sum { .. }))); } @@ -1212,20 +1290,20 @@ fn topk_over_bare_selector_ranks_raw_samples() { // ── Issue #109: histogram_quantiles fans out into one branch per φ ────────── /// The `(label value, intent)` of each `histogram_quantiles` branch. -fn quantile_branches(q: &QueryExpr) -> Vec<(String, AggIntent)> { - let QueryExpr::Concat { children, .. } = q else { +fn quantile_branches(q: &OperatorNode) -> Vec<(String, AggIntent)> { + let NonASAPOp::Concat { children, .. } = q.expect_non_asap() else { panic!("expected a Concat at the root, got {q:?}"); }; children .iter() .map(|c| { - let QueryExpr::PromqlRelabel { value, child, .. } = c else { + let NonASAPOp::PromqlRelabel { value, child, .. } = c.expect_non_asap() else { panic!("expected PromqlRelabel per branch, got {c:?}"); }; - let QueryExpr::Literal(ScalarValue::Utf8(v)) = value.as_ref() else { + let ScalarExpr::Literal(ScalarValue::Utf8(v)) = value else { panic!("expected a literal label value, got {value:?}"); }; - let QueryExpr::Aggregate { measures, .. } = child.as_ref() else { + let NonASAPOp::Aggregate { measures, .. } = child.expect_non_asap() else { panic!("expected an Aggregate under the PromqlRelabel, got {child:?}"); }; (v.clone(), measures[0].clone()) @@ -1234,24 +1312,12 @@ fn quantile_branches(q: &QueryExpr) -> Vec<(String, AggIntent)> { } #[test] -fn histogram_quantiles_fans_out_over_native_histograms() { - // Raw / native-histogram argument → the sketch-able `Quantile` intent, - // exactly as the single-quantile `histogram_quantile` would choose. - let q = lower(r#"histogram_quantiles(testhistogram3, "q", 0, 0.25, 1)"#); - let branches = quantile_branches(&q); - assert_eq!(branches.len(), 3); - let labels: Vec<_> = branches.iter().map(|(l, _)| l.as_str()).collect(); - assert_eq!( - labels, - ["0.0", "0.25", "1.0"], - "OpenMetrics float formatting" - ); - for (_, intent) in &branches { - assert!( - matches!(intent, AggIntent::Quantile { .. }), - "native histogram → sketch-able Quantile, got {intent:?}" - ); - } +fn histogram_quantiles_rejects_unrepresented_native_histograms() { + assert!(lower_promql( + r#"histogram_quantiles(testhistogram3, "q", 0, 0.25, 1)"#, + AccuracyTarget::Exact + ) + .is_err()); } #[test] @@ -1270,15 +1336,15 @@ fn histogram_quantiles_over_classic_buckets_interpolates() { fn histogram_quantiles_branches_are_union_compatible() { // `Concat` derives its schema from the first child, so every branch must // agree on column names — the φ lives in the label, not the column name. - let q = lower(r#"histogram_quantiles(testhistogram3, "q", 0.5, 0.9)"#); - let QueryExpr::Concat { children, .. } = &q else { + let q = lower(r#"histogram_quantiles(testhistogram3_bucket, "q", 0.5, 0.9)"#); + let NonASAPOp::Concat { children, .. } = q.expect_non_asap() else { panic!("expected Concat"); }; let shapes: Vec> = children .iter() .map(|c| { - c.output_schema() - .expect("branch schema") + c.schema + .clone() .fields .iter() .map(|c| c.name.clone()) @@ -1288,7 +1354,7 @@ fn histogram_quantiles_branches_are_union_compatible() { assert_eq!(shapes[0], shapes[1], "branches must be union-compatible"); assert_eq!(shapes[0], vec!["value".to_string(), "q".to_string()]); assert_eq!( - q.output_schema().expect("merged schema").fields.len(), + q.schema.fields.len(), 2, "the merged schema describes every branch" ); @@ -1296,11 +1362,11 @@ fn histogram_quantiles_branches_are_union_compatible() { #[test] fn histogram_quantiles_uses_the_given_label_name() { - let q = lower(r#"histogram_quantiles(h, "phi", 0.5)"#); - let QueryExpr::Concat { children, .. } = &q else { + let q = lower(r#"histogram_quantiles(h_bucket, "phi", 0.5)"#); + let NonASAPOp::Concat { children, .. } = q.expect_non_asap() else { panic!("expected Concat"); }; - let QueryExpr::PromqlRelabel { dst, .. } = &children[0] else { + let NonASAPOp::PromqlRelabel { dst, .. } = children[0].expect_non_asap() else { panic!("expected PromqlRelabel"); }; assert_eq!(dst, "phi"); @@ -1309,7 +1375,7 @@ fn histogram_quantiles_uses_the_given_label_name() { #[test] fn histogram_quantiles_formats_small_quantiles_like_prometheus() { // `labels.FormatOpenMetricsFloat`: Go's %g, so exponent form below 1e-4. - let q = lower(r#"histogram_quantiles(h, "q", 0.00001)"#); + let q = lower(r#"histogram_quantiles(h_bucket, "q", 0.00001)"#); assert_eq!(quantile_branches(&q)[0].0, "1e-05"); } @@ -1317,9 +1383,9 @@ fn histogram_quantiles_formats_small_quantiles_like_prometheus() { fn histogram_quantiles_rejects_an_out_of_range_quantile() { // Same rule as `histogram_quantile(φ, …)` — one bad φ fails the whole call. for q in [ - r#"histogram_quantiles(h, "q", -0.1)"#, - r#"histogram_quantiles(h, "q", 1.01)"#, - r#"histogram_quantiles(h, "q", 0.5, NaN)"#, + r#"histogram_quantiles(h_bucket, "q", -0.1)"#, + r#"histogram_quantiles(h_bucket, "q", 1.01)"#, + r#"histogram_quantiles(h_bucket, "q", 0.5, NaN)"#, ] { assert!( lower_promql(q, AccuracyTarget::Exact).is_err(), @@ -1328,19 +1394,244 @@ fn histogram_quantiles_rejects_an_out_of_range_quantile() { } } -// A subquery's `offset`/`@` shift the whole subquery, so the DAG keeps them. +// ── TimeRange.kind: instant vs range selectors ────────────────────────────────── + +#[test] +fn bare_instant_selector_is_an_instant_time_range() { + // `up` reads the latest sample per series within the workload's ingestion + // interval (1s in `support::workload`): an `Instant` lookback of that length. + let qe = lower("up"); + let NonASAPOp::TimeRange { range, kind, child } = qe.expect_non_asap() else { + panic!("expected TimeRange, got {qe:?}"); + }; + assert_eq!(*kind, TimeRangeKind::Instant); + assert_eq!(*range, Duration::from_secs(1)); + assert!(matches!(child.expect_non_asap(), NonASAPOp::Scan { .. })); +} + +#[test] +fn explicit_range_selector_is_a_range_time_range() { + // `m[5m]` keeps its own window and is a `Range` selection — both under a + // range function and as a bare matrix selector. + let qe = lower("rate(m[5m])"); + let NonASAPOp::Aggregate { child, .. } = qe.expect_non_asap() else { + panic!("expected Aggregate, got {qe:?}"); + }; + let NonASAPOp::TimeRange { range, kind, .. } = child.expect_non_asap() else { + panic!("expected TimeRange, got {child:?}"); + }; + assert_eq!(*kind, TimeRangeKind::Range); + assert_eq!(*range, Duration::from_secs(300)); + + let qe = lower("m[5m]"); + assert!(matches!( + qe.expect_non_asap(), + NonASAPOp::TimeRange { + kind: TimeRangeKind::Range, + .. + } + )); +} + +#[test] +fn instant_and_range_selectors_of_equal_length_stay_distinct() { + // The kind is part of the shape: a 1s range selector is not the same dag as + // the 1s instant lookback injected around a bare selector. + assert_ne!(lower("up"), lower("up[1s]")); +} + +// ── the `bool` modifier → `return_bool` ───────────────────────────────────────── + +#[test] +fn vector_scalar_comparison_without_bool_filters() { + let qe = lower("up > 0"); + assert!(matches!(qe.expect_non_asap(), NonASAPOp::Filter { .. })); + assert!(matches!( + support::sample_expression(&qe), + ScalarExpr::Compare { + op: CompareOpKind::Gt, + .. + } + )); +} + +#[test] +fn vector_scalar_comparison_with_bool_sets_return_bool() { + let qe = lower("up > bool 0"); + assert!(matches!( + support::sample_expression(&qe), + ScalarExpr::Case { .. } + )); + assert_ne!(qe, lower("up > 0")); +} + +#[test] +fn vector_vector_comparison_with_bool_sets_return_bool() { + // `a > bool b` — the modifier lands on the vector/vector op itself, with + // the default (ignoring nothing) match. + let qe = lower("a > bool b"); + let NonASAPOp::BinaryOp { + operator, + return_bool, + lhs, + rhs, + } = qe.expect_non_asap() + else { + panic!("expected BinaryOp, got {qe:?}"); + }; + assert!(*return_bool); + assert_eq!(operator.kind, BinaryOpKind::Compare(CompareOpKind::Gt)); + assert!(matches!(lhs.expect_non_asap(), NonASAPOp::TimeRange { .. })); + assert!(matches!(rhs.expect_non_asap(), NonASAPOp::TimeRange { .. })); + assert!(!lower("a > b").expect_non_asap().children().is_empty()); + assert_ne!(qe, lower("a > b")); +} + +#[test] +fn bool_modifier_composes_with_vector_matching() { + let qe = lower("a > bool on(job) b"); + let NonASAPOp::BinaryOp { + operator, + return_bool, + .. + } = qe.expect_non_asap() + else { + panic!("expected BinaryOp, got {qe:?}"); + }; + assert!(*return_bool); + let vm = operator.vector_match.as_ref().expect("on(job) present"); + assert_eq!(vm.labels, vec!["job".to_string()]); +} + +// ── scalar expressions: negation, arithmetic, comparison ──────────────────────── + +#[test] +fn scalar_negation_of_time_is_a_negative_expression() { + // `-time()` is a scalar expression; its negation stays structural (the + // operand is not a constant to fold) and follows PromQL numeric rules. + let qe = support::scalar_root("-time()"); + let ScalarExpr::Negative { expr, semantics } = &qe else { + panic!("expected ScalarExpr(Negative), got {qe:?}"); + }; + assert_eq!(*semantics, ExprSemantics::Promql); + assert!(matches!(expr.as_ref(), ScalarExpr::EvalTimestamp)); + // Scalar-shaped: no time index. +} + +#[test] +fn scalar_negation_of_a_constant_still_folds() { + // `-(2)` is constant: it folds to one literal rather than a `Negative`. + assert_eq!( + support::promql_scalar(&support::scalar_root("-(2)")), + Some(-2.0) + ); +} + +#[test] +fn scalar_arithmetic_carries_promql_semantics() { + let qe = support::scalar_root("time() - 1"); + let ScalarExpr::Arithmetic { + op, + left, + right, + semantics, + } = &qe + else { + panic!("expected scalar(Arithmetic), got {qe:?}"); + }; + assert_eq!(*op, ArithmeticOpKind::Sub); + assert_eq!(*semantics, ExprSemantics::Promql); + assert!(matches!(left.as_ref(), ScalarExpr::EvalTimestamp)); + assert!(matches!( + right.as_ref(), + ScalarExpr::Literal(ScalarValue::Float64(v)) if *v == 1.0 + )); +} + +#[test] +fn scalar_bool_comparison_is_a_zero_one_case_with_promql_semantics() { + // `1 < bool 2` → `Case(Compare(1 < 2) → 1.0, else 0.0)`: PromQL yields 0/1. + let qe = support::scalar_root("1 < bool 2"); + let ScalarExpr::Case { + operand, + branches, + else_expr, + } = &qe + else { + panic!("expected scalar(Case), got {qe:?}"); + }; + assert!(operand.is_none()); + let [(when, then)] = branches.as_slice() else { + panic!("expected one branch, got {branches:?}"); + }; + let ScalarExpr::Compare { + left, + op, + right, + semantics, + } = when + else { + panic!("expected a Compare condition, got {when:?}"); + }; + assert_eq!(*op, CompareOpKind::Lt); + assert_eq!(*semantics, ExprSemantics::Promql); + assert!(matches!(left.as_ref(), ScalarExpr::Literal(ScalarValue::Float64(v)) if *v == 1.0)); + assert!(matches!(right.as_ref(), ScalarExpr::Literal(ScalarValue::Float64(v)) if *v == 2.0)); + assert!(matches!(then, ScalarExpr::Literal(ScalarValue::Float64(v)) if *v == 1.0)); + assert!(matches!( + else_expr.as_deref(), + Some(ScalarExpr::Literal(ScalarValue::Float64(v))) if *v == 0.0 + )); +} + +#[test] +fn scalar_comparison_without_bool_is_rejected() { + // PromQL has no scalar filter: a scalar/scalar comparison needs `bool`. + for q in ["1 < 2", "time() > 0", "(1 + 1) == 2"] { + assert!( + lower_promql(q, AccuracyTarget::Exact).is_err(), + "{q} must be rejected without `bool`" + ); + } +} + +#[test] +fn label_matcher_predicates_carry_promql_semantics() { + let qe = lower(r#"up{job="api"}"#); + let NonASAPOp::TimeRange { child, .. } = qe.expect_non_asap() else { + panic!("expected TimeRange, got {qe:?}"); + }; + let NonASAPOp::Scan { predicates, .. } = child.expect_non_asap() else { + panic!("expected Scan, got {child:?}"); + }; + assert!(matches!( + &predicates[0].0, + ScalarExpr::Compare { + semantics: ExprSemantics::Promql, + .. + } + )); +} + +// A subquery's `offset` / `@` modifier stays a `TimeShift` over the subquery. #[test] fn subquery_time_shift_is_retained() { - let QueryExpr::Aggregate { child, .. } = lower("max_over_time(m[5m:1m] offset 1m)") else { - panic!("expected a range function"); + let root = lower("max_over_time(m[5m:1m] offset 1m)"); + let NonASAPOp::Aggregate { child, .. } = root.expect_non_asap() else { + panic!("expected a range function, got {root:?}"); }; - let QueryExpr::TimeShift { shift, child } = child.as_ref() else { + let NonASAPOp::TimeShift { shift, child } = child.expect_non_asap() else { panic!("subquery offset was dropped: {child:?}"); }; assert_eq!(shift.offset_ms, 60_000); - assert!(matches!(child.as_ref(), QueryExpr::PromqlSubquery { .. })); assert!(matches!( - lower("max_over_time(m[5m:1m] @ 100)"), - QueryExpr::Aggregate { child, .. } if matches!(child.as_ref(), QueryExpr::TimeShift { .. }) + child.expect_non_asap(), + NonASAPOp::PromqlSubquery { .. } + )); + let root = lower("max_over_time(m[5m:1m] @ 100)"); + assert!(matches!( + root.expect_non_asap(), + NonASAPOp::Aggregate { child, .. } + if matches!(child.expect_non_asap(), NonASAPOp::TimeShift { .. }) )); } diff --git a/crates/frontend-promql/tests/scalar_design.rs b/crates/frontend-promql/tests/scalar_design.rs new file mode 100644 index 000000000..e4f8038f8 --- /dev/null +++ b/crates/frontend-promql/tests/scalar_design.rs @@ -0,0 +1,128 @@ +//! Scalar expressions never become constant-wrapper operators. +mod support; +use asap_types::ir::{NonASAPOp, QueryRoot, ScalarExpr}; +use asap_types::pre_asap::{ArithmeticOpKind, ScalarValue}; +use asap_types::types::AccuracyTarget; + +fn root(query: &str) -> QueryRoot { + asap_frontend_promql::lower_promql_query_workload( + &support::workload(query, AccuracyTarget::Exact), + 0, + ) + .unwrap() + .remove(0) +} + +#[test] +fn standalone_scalars_are_expressions() { + for query in [ + "2", + "time()", + "scalar(sum(up)) + 1", + "1 < bool 2", + "-time()", + ] { + let QueryRoot::Scalar(expr) = root(query) else { + panic!("{query} became an operator") + }; + expr.scalar_type(&Default::default()).unwrap(); + } +} + +#[test] +fn arithmetic_projects_the_sample_and_preserves_full_identity_and_time() { + let QueryRoot::Operator(node) = root("up * 2") else { + panic!() + }; + let NonASAPOp::Project { child, cols, .. } = node.expect_non_asap() else { + panic!() + }; + assert!(child.schema.has_promql_series_identity()); + assert!(node.schema.has_promql_series_identity()); + assert_eq!(node.schema.time_index, child.schema.time_index); + let value = node.schema.column_id("value").unwrap(); + assert!( + matches!(&cols[value].expr, ScalarExpr::Arithmetic { op: ArithmeticOpKind::Mul, right, .. } if **right == ScalarExpr::Literal(ScalarValue::Float64(2.0))) + ); + assert!(cols.iter().any(|c| matches!(&c.expr, ScalarExpr::FunctionCall { name, .. } if name == "promql_drop_metric_name"))); +} + +#[test] +fn non_bool_comparisons_keep_vector_samples_even_with_scalar_on_left() { + for query in ["up > 0", "0 < up"] { + let QueryRoot::Operator(node) = root(query) else { + panic!() + }; + let NonASAPOp::Filter { child, .. } = node.expect_non_asap() else { + panic!() + }; + assert_eq!(node.schema, child.schema); + } +} + +#[test] +fn bool_comparison_projects_zero_or_one() { + let QueryRoot::Operator(node) = root("up > bool 0") else { + panic!() + }; + let NonASAPOp::Project { cols, .. } = node.expect_non_asap() else { + panic!() + }; + assert!(matches!( + cols[node.schema.column_id("value").unwrap()].expr, + ScalarExpr::Case { .. } + )); +} + +#[test] +fn scalar_plan_dependencies_remain_visible() { + let QueryRoot::Operator(node) = root("up * scalar(sum(up))") else { + panic!() + }; + assert_eq!(node.children().len(), 2); +} + +/// Pointwise functions own scalar parameters, including vector-to-scalar reads. +#[test] +fn pointwise_functions_are_typed_scalar_projections() { + for query in [ + "abs(up)", + "round(up, scalar(sum(other)))", + "clamp(up, time() - 1, time())", + "year(up)", + "hour()", + ] { + let QueryRoot::Operator(node) = root(query) else { + panic!() + }; + let NonASAPOp::Project { cols, .. } = node.expect_non_asap() else { + panic!("{query}: expected projection") + }; + assert!(matches!( + &cols[node.schema.column_id("value").unwrap()].expr, + ScalarExpr::FunctionCall { .. } + )); + node.validate_structure().unwrap(); + } +} + +/// Negation preserves the metric name and complete identity unlike multiplication. +#[test] +fn unary_minus_preserves_identity() { + let QueryRoot::Operator(node) = root("-up") else { + panic!() + }; + let NonASAPOp::Project { child, cols, .. } = node.expect_non_asap() else { + panic!() + }; + assert_eq!(node.schema, child.schema); + assert!(matches!( + &cols[node.schema.column_id("value").unwrap()].expr, + ScalarExpr::Negative { .. } + )); + for (index, col) in cols.iter().enumerate() { + if index != node.schema.column_id("value").unwrap() { + assert_eq!(col.expr, ScalarExpr::Column(index)); + } + } +} diff --git a/crates/frontend-promql/tests/support.rs b/crates/frontend-promql/tests/support.rs index 1f15b1ca2..c095eae2d 100644 --- a/crates/frontend-promql/tests/support.rs +++ b/crates/frontend-promql/tests/support.rs @@ -1,14 +1,17 @@ +use std::rc::Rc; + use asap_frontend_promql::{ lower_promql_workload, lower_promql_workload_with_histograms, HistogramCatalog, PromqlError, }; -use asap_types::pre_asap::QueryExpr; +use asap_types::ir::{NonASAPOp, OperatorNode, ScalarExpr}; +use asap_types::pre_asap::ScalarValue; use asap_types::types::AccuracyTarget; use asap_types::workload::{ AccuracyRequirement, BatchEntry, DataWorkload, DurationMs, Evidence, PlanningWorkload, Predictability, Query, QueryLanguage, QueryRequirements, QueryWorkload, TimeSelection, }; -fn workload(query: &str, accuracy: AccuracyTarget) -> PlanningWorkload { +pub fn workload(query: &str, accuracy: AccuracyTarget) -> PlanningWorkload { PlanningWorkload { query_workload: QueryWorkload { language: QueryLanguage::PromQL, @@ -35,7 +38,11 @@ fn workload(query: &str, accuracy: AccuracyTarget) -> PlanningWorkload { } } -pub fn lower_promql(query: &str, accuracy: AccuracyTarget) -> Result { +#[allow(dead_code)] +pub fn lower_promql( + query: &str, + accuracy: AccuracyTarget, +) -> Result, PromqlError> { let mut lowered = lower_promql_workload(&workload(query, accuracy), 0)?; Ok(lowered.remove(0)) } @@ -45,8 +52,59 @@ pub fn lower_promql_with_histograms( query: &str, accuracy: AccuracyTarget, histograms: HistogramCatalog, -) -> Result { +) -> Result, PromqlError> { let mut lowered = lower_promql_workload_with_histograms(&workload(query, accuracy), histograms, 0)?; Ok(lowered.remove(0)) } + +/// The value of a bare PromQL numeric literal / folded constant at an +/// scalar position (`Literal(Float64(v))`); `None` for any +/// other shape. +#[allow(dead_code)] +pub fn promql_scalar(node: &ScalarExpr) -> Option { + match node { + ScalarExpr::Literal(ScalarValue::Float64(v)) => Some(*v), + _ => None, + } +} + +/// Time `root` under the default materialization assignment (every summary +/// at query time) and export the physical DAG — export needs every node +/// timed first. +#[allow(dead_code)] +pub fn post_asap_dag(root: &Rc) -> asap_types::ir::export::PhysicalASAPDAG { + use asap_types::ir::{apply_materialization_timings, MaterializationAssignment, TimingMemo}; + let timed = apply_materialization_timings( + root, + &MaterializationAssignment::all_query_time(), + &mut TimingMemo::new(), + ) + .expect("default materialization timings"); + asap_types::ir::export::compile_physical_asap_dag(&timed).expect("post-ASAP DAG export") +} + +#[allow(dead_code)] +pub fn scalar_root(query: &str) -> ScalarExpr { + match asap_frontend_promql::lower_promql_query_workload( + &workload(query, AccuracyTarget::Exact), + 0, + ) + .unwrap() + .remove(0) + { + asap_types::ir::QueryRoot::Scalar(expr) => expr, + _ => panic!("expected scalar root: {query}"), + } +} + +#[allow(dead_code)] +pub fn sample_expression(node: &OperatorNode) -> &ScalarExpr { + match node.expect_non_asap() { + NonASAPOp::Project { cols, .. } => { + &cols[node.schema.column_id("value").unwrap_or(cols.len() - 1)].expr + } + NonASAPOp::Filter { pred, .. } => &pred.0, + other => panic!("expected sample expression, got {other:?}"), + } +} diff --git a/crates/frontend-promql/tests/univmon_candidates.rs b/crates/frontend-promql/tests/univmon_candidates.rs index 2b4891a08..12a0a53b5 100644 --- a/crates/frontend-promql/tests/univmon_candidates.rs +++ b/crates/frontend-promql/tests/univmon_candidates.rs @@ -5,15 +5,16 @@ use asap_aware_mapping::accuracy::{ }; use asap_aware_mapping::cost_model::DefaultCostModel; use asap_aware_mapping::replacement::{default_strategies, search_workload_with_targets}; -use asap_aware_mapping::{Replacement, ReplacementStrategy, SketchAlgorithmStrategy, TargetSubDAG}; +use asap_aware_mapping::{ASAPStrategies, Replacement, ReplacementStrategy, TargetSubDAG}; mod support; +use asap_types::ir::cse::share_common_sub_dags; +use asap_types::ir::{ASAPOp, Operator, OperatorNode}; use asap_types::post_asap::{ - compile_post_asap_dag, cse::share_common_summary_sub_dags, AccuracyError, BoundExpr, - CompositionOperator, ErrorMetric, FieldDataType, ProbabilityExpr, ResultGuarantee, - SketchAlgorithm, SketchStatistic, SummaryExpr, SummaryInputExpr, SummaryNode, + AccuracyError, BoundExpr, CompositionOperator, ErrorMetric, FieldDataType, ProbabilityExpr, + ResultGuarantee, SketchAlgorithm, SketchStatistic, SummaryInputExpr, }; use asap_types::types::AccuracyTarget; -use support::lower_promql; +use support::{lower_promql, post_asap_dag}; // Synthetic evidence exercises structural sharing, never runtime accuracy. struct TestEvidence; @@ -49,22 +50,22 @@ impl AccuracyModel for TestEvidence { } } -fn candidate(query: &str, accuracy: AccuracyTarget) -> Rc { +fn candidate(query: &str, accuracy: AccuracyTarget) -> Rc { let root = lower_promql(query, accuracy).unwrap(); - SketchAlgorithmStrategy::new_with_planning_inputs(&DefaultCostModel, &TestEvidence, &EqualSplitAllocator) - .replacements(&TargetSubDAG::new(&Rc::new(root))) + ASAPStrategies::new_with_planning_inputs(&DefaultCostModel, &TestEvidence, &EqualSplitAllocator) + .replacements(&TargetSubDAG::new(&root)) .into_iter() .find_map(|candidate| { - let Replacement::Summary(node) = candidate.replacement else { return None }; - let SummaryExpr::SummaryEstimate { summary_input, .. } = &node.expr else { return None }; - matches!(&summary_input.expr, SummaryExpr::SummaryAgg { family: FieldDataType::Sketch(kind, _), .. } + let Replacement::SubDAG(node) = candidate.replacement else { return None }; + let Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) = &node.operator else { return None }; + matches!(&summary_input.operator, Operator::ASAP(ASAPOp::SummaryAgg { family: FieldDataType::Sketch(kind, _), .. }) if kind.algorithm() == &SketchAlgorithm::UnivMon).then_some(node) }).expect("UnivMon candidate") } #[test] -fn four_readouts_share_one_value_frequency_state_and_keep_honest_guarantees() { - // Equal data, grouping and window produce one state independently of readout. +fn four_evaluations_share_one_value_frequency_state_and_keep_honest_guarantees() { + // Equal data, grouping and window produce one state independently of evaluation. let accuracy = AccuracyTarget::Epsilon(0.02); let roots: Vec<_> = [ ("distinct_over_time(m[5m])", accuracy.clone()), @@ -76,26 +77,25 @@ fn four_readouts_share_one_value_frequency_state_and_keep_honest_guarantees() { .enumerate() .map(|(id, (query, accuracy))| (id, candidate(query, accuracy))) .collect(); - let roots = share_common_summary_sub_dags(roots); + let roots = share_common_sub_dags(roots); let mut first_state = None; for (index, root) in &roots { - let SummaryExpr::SummaryEstimate { + let Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, query, - .. - } = &root.expr + }) = &root.operator else { panic!() }; if let Some(first) = &first_state { assert!( Rc::ptr_eq(first, summary_input), - "state must be shared across readouts" + "state must be shared across evaluations" ); } else { first_state = Some(Rc::clone(summary_input)); } - let SummaryExpr::SummaryAgg { input, .. } = &summary_input.expr else { + let Operator::ASAP(ASAPOp::SummaryAgg { input, .. }) = &summary_input.operator else { panic!() }; assert!(matches!(input.item, Some(SummaryInputExpr::Column(_)))); @@ -108,7 +108,7 @@ fn four_readouts_share_one_value_frequency_state_and_keep_honest_guarantees() { assert!(root.guarantee.as_ref().is_some_and(|g| g.is_exact())); } else { assert!(!root.guarantee.as_ref().unwrap().is_exact()); - let SummaryExpr::SummaryAgg { family, .. } = &summary_input.expr else { + let Operator::ASAP(ASAPOp::SummaryAgg { family, .. }) = &summary_input.operator else { panic!() }; assert!( @@ -118,12 +118,12 @@ fn four_readouts_share_one_value_frequency_state_and_keep_honest_guarantees() { "production has no calibrated error bound" ); } - compile_post_asap_dag(root).unwrap(); + post_asap_dag(root); } } #[test] -fn uncalibrated_frequency_readouts_do_not_bypass_accuracy_targets() { +fn uncalibrated_frequency_evaluations_do_not_bypass_accuracy_targets() { // An unmeasured heuristic remains inspectable but is never certified or // automatically selected for a caller-visible bounded-error result. for query in ["entropy_over_time(m[5m])", "l2_over_time(m[5m])"] { @@ -135,16 +135,16 @@ fn uncalibrated_frequency_readouts_do_not_bypass_accuracy_targets() { delta: 0.01, }, ] { - let root = Rc::new(lower_promql(query, target.clone()).unwrap()); - let candidates = SketchAlgorithmStrategy::default_cost_model() - .replacements(&TargetSubDAG::new(&root)); + let root = lower_promql(query, target.clone()).unwrap(); + let candidates = + ASAPStrategies::default_cost_model().replacements(&TargetSubDAG::new(&root)); let unknown = candidates .iter() .filter(|candidate| { matches!( &candidate.replacement, - Replacement::Summary(node) - if matches!(&node.expr, SummaryExpr::SummaryEstimate { .. }) + Replacement::SubDAG(node) + if matches!(&node.operator, Operator::ASAP(ASAPOp::SummaryEstimate { .. })) && node.guarantee.is_none() && candidate.has_missing_accuracy_evidence() ) diff --git a/crates/frontend-sql/Cargo.toml b/crates/frontend-sql/Cargo.toml index 102e222e5..3f81f1104 100644 --- a/crates/frontend-sql/Cargo.toml +++ b/crates/frontend-sql/Cargo.toml @@ -9,6 +9,7 @@ edition = "2021" # #225) it consults when lowering an aggregate call — never promql-parser. [dependencies] asap-types = { path = "../types" } +asap-frontend-common = { path = "../frontend-common" } asap-sql-function-catalog = { path = "../sql-function-catalog" } datafusion = "54" # `AggIntent::Extension.payload` for ClickHouse's argMax/argMin (issue #232) diff --git a/crates/frontend-sql/src/error.rs b/crates/frontend-sql/src/error.rs index 11d5acff4..059404ac1 100644 --- a/crates/frontend-sql/src/error.rs +++ b/crates/frontend-sql/src/error.rs @@ -1,11 +1,11 @@ use std::fmt; -use asap_types::pre_asap::ResolveDAGError; +use asap_frontend_common::ResolveDAGError; /// Errors from lowering a SQL query (parse + plan via DataFusion → the -/// canonical, unresolved DAG, built directly → -/// [`resolve_root`](asap_types::pre_asap::resolve_root) binds it to the -/// resolved DAG, issue #179). +/// name-based [`UnresolvedOp`](asap_frontend_common::UnresolvedOp) tree → +/// [`resolve_root`](asap_frontend_common::resolve_root) binds it into the +/// unified IR). /// /// Carries no PromQL type — the SQL front end never depends on the PromQL /// parser. The language-neutral variants (`UnsupportedFeature` / `WrongLanguage` @@ -28,8 +28,8 @@ pub enum SqlError { UnsupportedFeature(String), /// The workload's query language is not SQL. WrongLanguage(String), - /// Resolving the canonical unresolved DAG failed (name resolution - /// against the bound schema). + /// Resolving the name-based tree failed (name resolution against the + /// bound schema, or schema derivation). Convert(ResolveDAGError), } diff --git a/crates/frontend-sql/src/lib.rs b/crates/frontend-sql/src/lib.rs index 4ec61e69d..1747b09c8 100644 --- a/crates/frontend-sql/src/lib.rs +++ b/crates/frontend-sql/src/lib.rs @@ -1,25 +1,27 @@ -//! SQL front end: parse + plan (via DataFusion) → the canonical, unresolved -//! shape, built directly (issue #179) → [`resolve_root`]. +//! SQL front end: parse + plan (via DataFusion) → the name-based +//! [`UnresolvedOp`](asap_frontend_common::UnresolvedOp) tree, built directly +//! (issue #179) → [`resolve_root`]. //! -//! Emits [`UnresolvedQueryExpr`](asap_types::pre_asap::UnresolvedQueryExpr) itself — the -//! canonical `QueryExpr`, generic over an unresolved -//! [`ColumnRef`](asap_types::pre_asap::ColumnRef) — directly, rather than a -//! separate per-language relational DAG; `resolve_root` runs the -//! [`SchemaResolver`](asap_types::pre_asap::SchemaResolver) for positional name resolution. +//! Emits the shared front-end tree (`UnresolvedOp` / `UnresolvedScalar`, +//! name-based [`ColumnRef`](asap_types::pre_asap::ColumnRef)s) directly, rather +//! than a separate per-language relational tree; `resolve_root` binds it into +//! the unified [`OperatorNode`] IR, deriving every schema on the way. //! Depends on DataFusion only — never on the PromQL parser. pub mod error; pub mod sql; -use asap_types::pre_asap::resolve_root; -use asap_types::pre_asap::QueryExpr; +use std::rc::Rc; + +use asap_frontend_common::resolve_root; +use asap_types::ir::OperatorNode; use asap_types::types::AccuracyTarget; use asap_types::workload::{QueryLanguage, QueryWorkload, SqlDialect}; pub use error::SqlError; pub use sql::{SqlCatalog, SqlLowerer}; -/// Lower a single SQL query string to the canonical, resolved `QueryExpr`, +/// Lower a single SQL query string to the resolved, canonical operator DAG, /// parsed as `SqlDialect::DataFusionSQL`. /// /// The `catalog` supplies table schemas (used both to plan the SQL with @@ -29,7 +31,7 @@ pub async fn lower_sql( query: &str, catalog: &SqlCatalog, accuracy: AccuracyTarget, -) -> Result { +) -> Result, SqlError> { lower_sql_dialect(query, catalog, SqlDialect::DataFusionSQL, accuracy).await } @@ -46,20 +48,17 @@ pub async fn lower_sql_dialect( catalog: &SqlCatalog, dialect: SqlDialect, accuracy: AccuracyTarget, -) -> Result { +) -> Result, SqlError> { let unresolved = SqlLowerer::with_dialect(catalog, dialect) .lower(query, &accuracy) .await?; - let resolved = resolve_root(&unresolved)?; - // Binding resolves names; schema inference also checks result types such - // as temporal subtraction, whose duration unit the IR cannot represent. - resolved - .output_schema() - .map_err(|error| SqlError::InvalidExpression(error.to_string()))?; - Ok(resolved) + // Binding resolves names and derives every node's schema; result-type + // checks (such as temporal subtraction, whose duration unit the IR cannot + // represent) surface here as `ResolveDAGError::Schema`. + Ok(resolve_root(&unresolved)?) } -/// Lower every SQL batch entry in `workload` to a `QueryExpr`. +/// Lower every SQL batch entry in `workload` to an operator DAG. /// /// One `Result` per entry — errors are per-query, not fatal for the batch. /// Returns `WrongLanguage` for every entry if the workload is not SQL, and @@ -67,7 +66,7 @@ pub async fn lower_sql_dialect( pub async fn lower_sql_batch( workload: &QueryWorkload, catalog: &SqlCatalog, -) -> Vec> { +) -> Vec, SqlError>> { let entries = match &workload.query_batch { Some(e) if !e.is_empty() => e, _ => return vec![], diff --git a/crates/frontend-sql/src/sql/collection_planning.rs b/crates/frontend-sql/src/sql/collection_planning.rs index 9d28cd1df..62bbbbb6d 100644 --- a/crates/frontend-sql/src/sql/collection_planning.rs +++ b/crates/frontend-sql/src/sql/collection_planning.rs @@ -1,10 +1,10 @@ //! DataFusion planning adapters. Types come from the canonical signature rules; //! physical evaluation deliberately remains the query engine's responsibility. use super::types::{arrow_to_dtype, dtype_to_arrow, scalar_value_to_asap}; -use asap_types::pre_asap::scalar_type_rules::{ - element_access_type, struct_field_type, MapScalarFunction, -}; -use asap_types::pre_asap::{Field, QueryExpr, Schema}; +use asap_types::ir::scalar::{element_access_type, struct_field_type}; +use asap_types::ir::ScalarExpr; +use asap_types::pre_asap::scalar_type_rules::MapScalarFunction; +use asap_types::pre_asap::{Field, Schema}; use datafusion::arrow::datatypes::{DataType, Field as ArrowField, FieldRef}; use datafusion::common::{DataFusionError, Result, ScalarValue as DfScalarValue}; use datafusion::logical_expr::{ @@ -108,10 +108,10 @@ impl CollectionPlanningFunction { .map(|index| { if let Some(Some(value)) = literals.and_then(|args| args.get(index)) { scalar_value_to_asap(value) - .map(QueryExpr::Literal) + .map(ScalarExpr::Literal) .map_err(|error| DataFusionError::Plan(error.to_string())) } else { - Ok(QueryExpr::Column(index)) + Ok(ScalarExpr::Column(index)) } }) .collect::>>()?; diff --git a/crates/frontend-sql/src/sql/expr.rs b/crates/frontend-sql/src/sql/expr.rs index 32ba893df..3faf9c306 100644 --- a/crates/frontend-sql/src/sql/expr.rs +++ b/crates/frontend-sql/src/sql/expr.rs @@ -2,12 +2,14 @@ use std::rc::Rc; use datafusion::logical_expr::{BinaryExpr, Expr, Operator}; +use asap_frontend_common::UnresolvedScalar as Unresolved; +use asap_types::ir::ExprSemantics; use asap_types::pre_asap::{ArithmeticOpKind, ColumnRef, CompareOpKind, ScalarValue}; use crate::error::SqlError as LoweringError; use super::types::{arrow_to_dtype, scalar_value_to_asap}; -use super::Unresolved; +use super::SqlLowerer; pub(super) fn split_conjuncts(expr: &Expr) -> Vec<&Expr> { match expr { @@ -24,258 +26,276 @@ pub(super) fn split_conjuncts(expr: &Expr) -> Vec<&Expr> { } } -/// Translate a DataFusion `Expr` to the canonical, unresolved DAG. -/// Returns `UnsupportedFeature` for anything not needed in v1. -pub(super) fn df_expr_to_unresolved(expr: &Expr) -> Result { - match expr { - // Preserve DataFusion's relation qualifier so a column name shared - // across a join (`a.k` vs `b.k`) resolves to the correct side. - Expr::Column(col) => Ok(Unresolved::Column(match &col.relation { - Some(rel) => ColumnRef::Qualified { - table: rel.to_string(), - name: col.name.clone(), - }, - None => ColumnRef::Named(col.name.clone()), - })), - - // Keep Arrow date literals equivalent to SQL CAST('YYYY-MM-DD' AS DATE), - // including typed nulls, without adding another canonical scalar variant. - Expr::Literal( - sv @ (datafusion::common::ScalarValue::Date32(_) - | datafusion::common::ScalarValue::Date64(_)), - _, - ) => { - let text = sv.cast_to(&datafusion::arrow::datatypes::DataType::Utf8)?; - // Arrow formats Date64 with a time suffix; the canonical Date has - // no time-of-day, just like Date64 catalog registration as Date32. - let text = match text { - datafusion::common::ScalarValue::Utf8(Some(value)) => { - ScalarValue::Utf8(value.split('T').next().unwrap().to_owned()) - } - other => scalar_value_to_asap(&other)?, - }; - Ok(Unresolved::Cast { - expr: Rc::new(Unresolved::Literal(text)), - to: asap_types::pre_asap::schema::DataType::Date, - try_cast: false, - }) - } - Expr::Literal(sv, _) => scalar_value_to_asap(sv).map(Unresolved::Literal), - - Expr::Alias(a) => df_expr_to_unresolved(&a.expr), +impl SqlLowerer<'_> { + /// Translate a DataFusion `Expr` to the name-based scalar tree. Every + /// `Compare` / `Arithmetic` / `Negative` carries `ExprSemantics::Sql`. + /// Subquery-valued expressions lower their plan as a root of its own + /// (which is why this is a method: the plan walk needs the catalog). + /// Returns `UnsupportedFeature` for anything not needed in v1. + pub(super) fn lower_expr(&self, expr: &Expr) -> Result { + let bx = |e: &Expr| self.lower_expr(e).map(Box::new); + match expr { + // Preserve DataFusion's relation qualifier so a column name shared + // across a join (`a.k` vs `b.k`) resolves to the correct side. + Expr::Column(col) => Ok(Unresolved::Column(match &col.relation { + Some(rel) => ColumnRef::Qualified { + table: rel.to_string(), + name: col.name.clone(), + }, + None => ColumnRef::Named(col.name.clone()), + })), - Expr::BinaryExpr(BinaryExpr { left, op, right }) => match op { - Operator::And => { - let parts = split_conjuncts(expr); - let lowered: Result, _> = - parts.iter().map(|e| df_expr_to_unresolved(e)).collect(); - Ok(Unresolved::BoolAnd(lowered?)) - } - Operator::Or => { - let parts = split_disjuncts(expr); - let lowered: Result, _> = - parts.iter().map(|e| df_expr_to_unresolved(e)).collect(); - Ok(Unresolved::BoolOr(lowered?)) + // Keep Arrow date literals equivalent to SQL CAST('YYYY-MM-DD' AS DATE), + // including typed nulls, without adding another canonical scalar variant. + Expr::Literal( + sv @ (datafusion::common::ScalarValue::Date32(_) + | datafusion::common::ScalarValue::Date64(_)), + _, + ) => { + let text = sv.cast_to(&datafusion::arrow::datatypes::DataType::Utf8)?; + // Arrow formats Date64 with a time suffix; the canonical Date has + // no time-of-day, just like Date64 catalog registration as Date32. + let text = match text { + datafusion::common::ScalarValue::Utf8(Some(value)) => { + ScalarValue::Utf8(value.split('T').next().unwrap().to_owned()) + } + other => scalar_value_to_asap(&other)?, + }; + Ok(Unresolved::Cast { + expr: Box::new(Unresolved::Literal(text)), + to: asap_types::pre_asap::schema::DataType::Date, + try_cast: false, + }) } - Operator::Eq => compare(left, CompareOpKind::Eq, right), - Operator::NotEq => compare(left, CompareOpKind::Ne, right), - Operator::Lt => compare(left, CompareOpKind::Lt, right), - Operator::LtEq => compare(left, CompareOpKind::Le, right), - Operator::Gt => compare(left, CompareOpKind::Gt, right), - Operator::GtEq => compare(left, CompareOpKind::Ge, right), - // BinaryExpr LIKE/ILIKE operators (from optimizer rewrites) - Operator::LikeMatch => compare(left, CompareOpKind::Like, right), - Operator::ILikeMatch => compare(left, CompareOpKind::ILike, right), - Operator::NotLikeMatch => compare(left, CompareOpKind::NotLike, right), - Operator::NotILikeMatch => compare(left, CompareOpKind::NotILike, right), - // Arithmetic - Operator::Plus => arith(left, ArithmeticOpKind::Add, right), - Operator::Minus => arith(left, ArithmeticOpKind::Sub, right), - Operator::Multiply => arith(left, ArithmeticOpKind::Mul, right), - Operator::Divide => arith(left, ArithmeticOpKind::Div, right), - Operator::Modulo => arith(left, ArithmeticOpKind::Mod, right), - other => Err(LoweringError::UnsupportedFeature(format!( - "operator: {other:?}" - ))), - }, + Expr::Literal(sv, _) => scalar_value_to_asap(sv).map(Unresolved::Literal), - // SQL LIKE / ILIKE (dedicated expr node from the SQL parser) - Expr::Like(like) => { - let op = match (like.negated, like.case_insensitive) { - (false, false) => CompareOpKind::Like, - (true, false) => CompareOpKind::NotLike, - (false, true) => CompareOpKind::ILike, - (true, true) => CompareOpKind::NotILike, - }; - compare(&like.expr, op, &like.pattern) - } + Expr::Alias(a) => self.lower_expr(&a.expr), - // Unary minus: negate literals directly; wrap others in -1 * x. - Expr::Negative(inner) => { - let inner = df_expr_to_unresolved(inner)?; - match inner { - Unresolved::Literal(ScalarValue::Int64(v)) => { - Ok(Unresolved::Literal(ScalarValue::Int64(-v))) + Expr::BinaryExpr(BinaryExpr { left, op, right }) => match op { + Operator::And => { + let parts = split_conjuncts(expr); + let lowered: Result, _> = + parts.iter().map(|e| self.lower_expr(e)).collect(); + Ok(Unresolved::BoolAnd(lowered?)) } - Unresolved::Literal(ScalarValue::Float64(v)) => { - Ok(Unresolved::Literal(ScalarValue::Float64(-v))) + Operator::Or => { + let parts = split_disjuncts(expr); + let lowered: Result, _> = + parts.iter().map(|e| self.lower_expr(e)).collect(); + Ok(Unresolved::BoolOr(lowered?)) } - other => Ok(Unresolved::Arithmetic { - op: ArithmeticOpKind::Mul, - left: Rc::new(Unresolved::Literal(ScalarValue::Int64(-1))), - right: Rc::new(other), - }), + Operator::Eq => self.compare(left, CompareOpKind::Eq, right), + Operator::NotEq => self.compare(left, CompareOpKind::Ne, right), + Operator::Lt => self.compare(left, CompareOpKind::Lt, right), + Operator::LtEq => self.compare(left, CompareOpKind::Le, right), + Operator::Gt => self.compare(left, CompareOpKind::Gt, right), + Operator::GtEq => self.compare(left, CompareOpKind::Ge, right), + // BinaryExpr LIKE/ILIKE operators (from optimizer rewrites) + Operator::LikeMatch => self.compare(left, CompareOpKind::Like, right), + Operator::ILikeMatch => self.compare(left, CompareOpKind::ILike, right), + Operator::NotLikeMatch => self.compare(left, CompareOpKind::NotLike, right), + Operator::NotILikeMatch => self.compare(left, CompareOpKind::NotILike, right), + // Arithmetic + Operator::Plus => self.arith(left, ArithmeticOpKind::Add, right), + Operator::Minus => self.arith(left, ArithmeticOpKind::Sub, right), + Operator::Multiply => self.arith(left, ArithmeticOpKind::Mul, right), + Operator::Divide => self.arith(left, ArithmeticOpKind::Div, right), + Operator::Modulo => self.arith(left, ArithmeticOpKind::Mod, right), + other => Err(LoweringError::UnsupportedFeature(format!( + "operator: {other:?}" + ))), + }, + + // SQL LIKE / ILIKE (dedicated expr node from the SQL parser) + Expr::Like(like) => { + let op = match (like.negated, like.case_insensitive) { + (false, false) => CompareOpKind::Like, + (true, false) => CompareOpKind::NotLike, + (false, true) => CompareOpKind::ILike, + (true, true) => CompareOpKind::NotILike, + }; + self.compare(&like.expr, op, &like.pattern) } - } - // SQL CASE expression - Expr::Case(c) => { - let operand = c - .expr - .as_ref() - .map(|e| df_expr_to_unresolved(e).map(Rc::new)) - .transpose()?; - let branches = c - .when_then_expr - .iter() - .map(|(when, then)| { - Ok((df_expr_to_unresolved(when)?, df_expr_to_unresolved(then)?)) + // Unary minus. (DataFusion's planner already folds `-` + // into a negative literal, so this is a non-literal operand.) + Expr::Negative(inner) => Ok(Unresolved::Negative { + expr: bx(inner)?, + semantics: ExprSemantics::Sql, + }), + + // SQL CASE expression + Expr::Case(c) => { + let operand = c.expr.as_deref().map(bx).transpose()?; + let branches = c + .when_then_expr + .iter() + .map(|(when, then)| Ok((self.lower_expr(when)?, self.lower_expr(then)?))) + .collect::, LoweringError>>()?; + let else_expr = c.else_expr.as_deref().map(bx).transpose()?; + Ok(Unresolved::Case { + operand, + branches, + else_expr, }) - .collect::, LoweringError>>()?; - let else_expr = c - .else_expr - .as_ref() - .map(|e| df_expr_to_unresolved(e).map(Rc::new)) - .transpose()?; - Ok(Unresolved::Case { - operand, - branches, - else_expr, - }) - } + } - Expr::Not(inner) => Ok(Unresolved::Not(Rc::new(df_expr_to_unresolved(inner)?))), + Expr::Not(inner) => Ok(Unresolved::Not(bx(inner)?)), - Expr::IsNull(inner) => Ok(Unresolved::IsNull(Rc::new(df_expr_to_unresolved(inner)?))), + Expr::IsNull(inner) => Ok(Unresolved::IsNull(bx(inner)?)), - Expr::IsNotNull(inner) => Ok(Unresolved::IsNotNull(Rc::new(df_expr_to_unresolved( - inner, - )?))), + Expr::IsNotNull(inner) => Ok(Unresolved::IsNotNull(bx(inner)?)), - Expr::Cast(c) => { - let inner = df_expr_to_unresolved(&c.expr)?; - let to = arrow_to_dtype(c.field.data_type())?; - Ok(Unresolved::Cast { - expr: Rc::new(inner), - to, + // DataFusion 54 coerces a mixed signed/unsigned integer comparison + // (e.g. `approx_distinct(x) >= 1000`) through `Decimal128(20, 0)`. + // Canonical integers are all Int64, so that widening is a no-op. + Expr::Cast(c) + if matches!( + c.field.data_type(), + datafusion::arrow::datatypes::DataType::Decimal128(_, 0) + ) => + { + self.lower_expr(&c.expr) + } + Expr::Cast(c) => Ok(Unresolved::Cast { + expr: bx(&c.expr)?, + to: arrow_to_dtype(c.field.data_type())?, try_cast: false, - }) - } + }), - // TRY_CAST returns NULL on conversion failure; preserve that semantic. - Expr::TryCast(c) => { - let inner = df_expr_to_unresolved(&c.expr)?; - let to = arrow_to_dtype(c.field.data_type())?; - Ok(Unresolved::Cast { - expr: Rc::new(inner), - to, + // TRY_CAST returns NULL on conversion failure; preserve that semantic. + Expr::TryCast(c) => Ok(Unresolved::Cast { + expr: bx(&c.expr)?, + to: arrow_to_dtype(c.field.data_type())?, try_cast: true, - }) - } + }), - Expr::InList(il) => { - let expr = df_expr_to_unresolved(&il.expr)?; - let list: Result, _> = il.list.iter().map(df_expr_to_unresolved).collect(); - Ok(Unresolved::InList { - expr: Rc::new(expr), - list: list?, - negated: il.negated, - }) - } + Expr::InList(il) => { + let list: Result, _> = il.list.iter().map(|e| self.lower_expr(e)).collect(); + Ok(Unresolved::InList { + expr: bx(&il.expr)?, + list: list?, + negated: il.negated, + }) + } + + Expr::Between(b) => { + // Normalize: `x BETWEEN low AND high` → `x >= low AND x <= high`. + // `x NOT BETWEEN low AND high` → `x < low OR x > high`. + if b.negated { + let lt = self.compare(&b.expr, CompareOpKind::Lt, &b.low)?; + let gt = self.compare(&b.expr, CompareOpKind::Gt, &b.high)?; + Ok(Unresolved::BoolOr(vec![lt, gt])) + } else { + let x_low = self.compare(&b.expr, CompareOpKind::Ge, &b.low)?; + let x_high = self.compare(&b.expr, CompareOpKind::Le, &b.high)?; + Ok(Unresolved::BoolAnd(vec![x_low, x_high])) + } + } - Expr::Between(b) => { - // Normalize: `x BETWEEN low AND high` → `x >= low AND x <= high`. - // `x NOT BETWEEN low AND high` → `x < low OR x > high`. - let x_low = compare(&b.expr, CompareOpKind::Ge, &b.low)?; - let x_high = compare(&b.expr, CompareOpKind::Le, &b.high)?; - if b.negated { - // NOT BETWEEN: invert each side - let lt = compare(&b.expr, CompareOpKind::Lt, &b.low)?; - let gt = compare(&b.expr, CompareOpKind::Gt, &b.high)?; - Ok(Unresolved::BoolOr(vec![lt, gt])) - } else { - Ok(Unresolved::BoolAnd(vec![x_low, x_high])) + // `NOW()` / `CURRENT_TIMESTAMP` read the SQL statement evaluation + // time. Keep this timestamp-typed leaf distinct from PromQL's + // Float64 Unix-seconds `EvalTimestamp`. Issue #184. + Expr::ScalarFunction(sf) + if sf.args.is_empty() + && matches!( + sf.func.name().to_ascii_lowercase().as_str(), + "now" | "current_timestamp" + ) => + { + Ok(Unresolved::CurrentTimestamp) } - } - // `NOW()` / `CURRENT_TIMESTAMP` read the SQL statement evaluation - // time. Keep this timestamp-typed leaf distinct from PromQL's - // Float64 Unix-seconds `EvalTimestamp`. Issue #184. - Expr::ScalarFunction(sf) - if sf.args.is_empty() - && matches!( - sf.func.name().to_ascii_lowercase().as_str(), - "now" | "current_timestamp" - ) => - { - Ok(Unresolved::CurrentTimestamp) - } + Expr::ScalarFunction(sf) => { + let args: Result, _> = sf.args.iter().map(|e| self.lower_expr(e)).collect(); + Ok(Unresolved::FunctionCall { + name: if sf.func.name().eq_ignore_ascii_case("arrayelement") { + "asap_element_access".into() + } else if sf.func.name().eq_ignore_ascii_case("tupleelement") { + "asap_struct_field".into() + } else if sf.func.name() == super::collection_planning::MAP_PLANNING_NAME { + "map".into() + } else { + sf.func.name().to_string() + }, + args: args?, + }) + } - Expr::ScalarFunction(sf) => { - let args: Result, _> = sf.args.iter().map(df_expr_to_unresolved).collect(); - Ok(Unresolved::FunctionCall { - name: if sf.func.name().eq_ignore_ascii_case("arrayelement") { - "asap_element_access".into() - } else if sf.func.name().eq_ignore_ascii_case("tupleelement") { - "asap_struct_field".into() - } else if sf.func.name() == super::collection_planning::MAP_PLANNING_NAME { - "map".into() - } else { - sf.func.name().to_string() - }, - args: args?, - }) - } + // Subquery-valued expressions. Each subquery plan is lowered as a + // root of its own; `resolve_root` binds it in its own scope, so an + // outer reference inside it has nothing to resolve against — a + // correlated subquery is rejected rather than mislowered. + Expr::ScalarSubquery(sq) => Ok(Unresolved::ScalarSubquery(Rc::new( + self.lower_uncorrelated_subquery(sq, "scalar subquery")?, + ))), + Expr::Exists(ex) => Ok(Unresolved::Exists { + subquery: Rc::new(self.lower_uncorrelated_subquery(&ex.subquery, "EXISTS")?), + negated: ex.negated, + }), + Expr::InSubquery(is) => { + let fields = is.subquery.subquery.schema().fields().len(); + if fields != 1 { + return Err(LoweringError::InvalidExpression(format!( + "IN (subquery) must select exactly one column, got {fields}" + ))); + } + Ok(Unresolved::InSubquery { + expr: bx(&is.expr)?, + subquery: Rc::new( + self.lower_uncorrelated_subquery(&is.subquery, "IN (subquery)")?, + ), + negated: is.negated, + }) + } - // Subquery-valued expressions in a predicate/projection — `x > (SELECT - // …)`, `x IN (SELECT …)`, `EXISTS (SELECT …)`. These need a subquery - // node in the unresolved expression IR (and a correlated-vs-uncorrelated - // decision); rejected cleanly until that lands rather than mislowered. - // Derived tables in `FROM` (the common nesting shape) ARE supported — - // see `lower_plan`'s `SubqueryAlias` arm. - Expr::ScalarSubquery(_) | Expr::InSubquery(_) | Expr::Exists(_) => Err( - LoweringError::UnsupportedFeature("subquery-valued expression in predicate".into()), - ), + other => Err(LoweringError::UnsupportedFeature(format!( + "expression: {}", + other + ))), + } + } - other => Err(LoweringError::UnsupportedFeature(format!( - "expression: {}", - other - ))), + fn lower_uncorrelated_subquery( + &self, + sq: &datafusion::logical_expr::Subquery, + what: &str, + ) -> Result { + if !sq.outer_ref_columns.is_empty() { + return Err(LoweringError::UnsupportedFeature(format!( + "correlated {what}" + ))); + } + self.lower_plan(&sq.subquery) } -} -pub(super) fn compare( - left: &Expr, - op: CompareOpKind, - right: &Expr, -) -> Result { - Ok(Unresolved::Compare { - left: Rc::new(df_expr_to_unresolved(left)?), - op, - right: Rc::new(df_expr_to_unresolved(right)?), - }) -} + pub(super) fn compare( + &self, + left: &Expr, + op: CompareOpKind, + right: &Expr, + ) -> Result { + Ok(Unresolved::Compare { + left: Box::new(self.lower_expr(left)?), + op, + right: Box::new(self.lower_expr(right)?), + semantics: ExprSemantics::Sql, + }) + } -pub(super) fn arith( - left: &Expr, - op: ArithmeticOpKind, - right: &Expr, -) -> Result { - Ok(Unresolved::Arithmetic { - op, - left: Rc::new(df_expr_to_unresolved(left)?), - right: Rc::new(df_expr_to_unresolved(right)?), - }) + fn arith( + &self, + left: &Expr, + op: ArithmeticOpKind, + right: &Expr, + ) -> Result { + Ok(Unresolved::Arithmetic { + op, + left: Box::new(self.lower_expr(left)?), + right: Box::new(self.lower_expr(right)?), + semantics: ExprSemantics::Sql, + }) + } } pub(super) fn split_disjuncts(expr: &Expr) -> Vec<&Expr> { @@ -296,12 +316,15 @@ pub(super) fn split_disjuncts(expr: &Expr) -> Vec<&Expr> { #[cfg(test)] mod tests { use super::*; + use crate::sql::SqlCatalog; use asap_types::pre_asap::schema::DataType; use datafusion::common::ScalarValue as DfScalarValue; // Typed Arrow dates normalize to the same typed form as SQL date casts. #[test] fn arrow_date_literals_preserve_value_and_type() { + let catalog = SqlCatalog::new(); + let lowerer = SqlLowerer::new(&catalog); for (value, expected) in [ ( DfScalarValue::Date32(Some(0)), @@ -314,15 +337,32 @@ mod tests { (DfScalarValue::Date32(None), ScalarValue::Null), (DfScalarValue::Date64(None), ScalarValue::Null), ] { - let actual = df_expr_to_unresolved(&Expr::Literal(value, None)).unwrap(); + let actual = lowerer.lower_expr(&Expr::Literal(value, None)).unwrap(); assert_eq!( actual, Unresolved::Cast { - expr: Rc::new(Unresolved::Literal(expected)), + expr: Box::new(Unresolved::Literal(expected)), to: DataType::Date, try_cast: false, } ); } } + + // Unary minus over a non-literal is the `Negative` scalar, SQL-flavoured. + #[test] + fn unary_minus_lowers_to_negative_with_sql_semantics() { + let catalog = SqlCatalog::new(); + let lowerer = SqlLowerer::new(&catalog); + let expr = Expr::Negative(Box::new(Expr::Column( + datafusion::common::Column::new_unqualified("x"), + ))); + assert_eq!( + lowerer.lower_expr(&expr).unwrap(), + Unresolved::Negative { + expr: Box::new(Unresolved::Column(ColumnRef::Named("x".into()))), + semantics: ExprSemantics::Sql, + } + ); + } } diff --git a/crates/frontend-sql/src/sql/mod.rs b/crates/frontend-sql/src/sql/mod.rs index 3c708a2ed..78a067f53 100644 --- a/crates/frontend-sql/src/sql/mod.rs +++ b/crates/frontend-sql/src/sql/mod.rs @@ -1,12 +1,12 @@ -//! SQL → the canonical, unresolved -//! [`UnresolvedQueryExpr`](asap_types::pre_asap::query_expr::UnresolvedQueryExpr) -//! (`QueryExpr`). +//! SQL → the name-based front-end tree +//! ([`UnresolvedOp`](asap_frontend_common::UnresolvedOp) / +//! [`UnresolvedScalar`](asap_frontend_common::UnresolvedScalar)). //! //! Parses SQL via DataFusion (over the catalog's registered tables), then -//! walks the unoptimized `LogicalPlan` and emits `UnresolvedQueryExpr` nodes with -//! unresolved `ColumnRef`s directly (issue #179) — the same DAG shape -//! [`resolve_root`](asap_types::pre_asap::resolve_root) binds to canonical, -//! positional `QueryExpr`. Unlike PromQL's front end, SQL's +//! walks the unoptimized `LogicalPlan` and emits `UnresolvedOp` nodes with +//! unresolved `ColumnRef`s directly (issue #179) — the same tree shape +//! [`resolve_root`](asap_frontend_common::resolve_root) binds into the +//! positional, unified `OperatorNode` IR. Unlike PromQL's front end, SQL's //! Ordinary SQL `Aggregate` nodes are `Reduction::Reduce`. The explicit //! `asap_rate`/`asap_increase` bridge is the narrow exception: it //! spells a time-series range reducer with an explicit value, time-index, and @@ -52,17 +52,22 @@ use datafusion::prelude::{SessionConfig, SessionContext}; use datafusion::sql::parser::DFParser; use datafusion::sql::sqlparser::dialect::GenericDialect; +use asap_frontend_common::{ + resolve_root, UnresolvedOp as Unresolved, UnresolvedPredicate as Predicate, + UnresolvedProjectItem as ProjectItem, UnresolvedScalar as Scalar, UnresolvedSortKey as SortKey, +}; use asap_sql_function_catalog::{AggSemantic, Arity, RewriteKind}; -use asap_types::pre_asap::agg_intent::AggIntent; -use asap_types::pre_asap::query_expr::{ - GroupKeys, Predicate, ProjectItem, Reduction, SortKey, Source, - UnresolvedQueryExpr as Unresolved, WindowFrame, WindowFrameBound, WindowFrameOffset, +use asap_types::ir::operator_properties::{ + GroupKeys, Reduction, Source, WindowFrame, WindowFrameBound, WindowFrameOffset, WindowFrameUnits, }; +use asap_types::ir::TimeRangeKind; +use asap_types::pre_asap::agg_intent::AggIntent; use asap_types::pre_asap::schema::{DataType, FieldDataType, Schema}; + use asap_types::pre_asap::{ - resolve_column_ref, resolve_root, ColumnRef, CompareOpKind, JoinKind, RelationalSetOpKind, - ScalarValue, WindowFuncKind, + resolve_column_ref, ColumnRef, CompareOpKind, JoinKind, RelationalSetOpKind, ScalarValue, + WindowFuncKind, }; use asap_types::types::AccuracyTarget; use asap_types::workload::SqlDialect; @@ -76,7 +81,6 @@ mod types; pub use types::SqlCatalog; -use self::expr::df_expr_to_unresolved; use self::types::{arrow_to_dtype, scalar_value_to_asap, schema_to_arrow}; std::thread_local! { @@ -110,10 +114,10 @@ fn current_accuracy() -> AccuracyTarget { ACCURACY.with(|a| a.borrow().clone()) } -/// Lowers SQL strings to the canonical [`UnresolvedQueryExpr`](asap_types::pre_asap::UnresolvedQueryExpr) -/// over a table [`SqlCatalog`]. Call -/// [`resolve_root`](asap_types::pre_asap::resolve_root) on the result for -/// the canonical, resolved DAG. +/// Lowers SQL strings to the name-based [`UnresolvedOp`](asap_frontend_common::UnresolvedOp) +/// tree over a table [`SqlCatalog`]. Call +/// [`resolve_root`](asap_frontend_common::resolve_root) on the result for +/// the resolved operator DAG. pub struct SqlLowerer<'a> { catalog: &'a SqlCatalog, dialect: SqlDialect, @@ -139,7 +143,7 @@ impl<'a> SqlLowerer<'a> { Self { catalog, dialect } } - /// Parse + lower a SQL query to the canonical, unresolved shape, threading + /// Parse + lower a SQL query to the name-based tree, threading /// `accuracy` onto every approximate intent (`Count`, `Quantile`, /// `Cardinality`) as it is built. /// @@ -166,8 +170,8 @@ impl<'a> SqlLowerer<'a> { /// a rule) that isn't wanted here — e.g. it independently rejects a /// multi-column `IN (subquery)` before `lower_in_subquery`'s own arity /// check would. Going straight to `ApplyFunctionRewrites` avoids that - /// entirely: zero behavior change for every query that doesn't call a - /// catalog-listed ClickHouse builtin. + /// entirely. TypeCoercion then records implicit conversions explicitly, + /// including timestamp literals in predicates, before IR validation. pub async fn lower( &self, sql: &str, @@ -226,6 +230,8 @@ impl<'a> SqlLowerer<'a> { }) }) })?; + let plan = datafusion::optimizer::analyzer::type_coercion::TypeCoercion::new() + .analyze(plan, &ctx.state().options())?; let _guard = AccuracyGuard::install(accuracy.clone()); self.lower_plan(&plan) } @@ -275,8 +281,8 @@ impl<'a> SqlLowerer<'a> { // *scalar* builtin — same reason as the `AggregateUDF` loop above // (DataFusion otherwise rejects the call as an unknown function // during `SqlToRel` conversion), but with no rewrite step to follow: - // `df_expr_to_unresolved`'s `Expr::ScalarFunction` arm already lowers - // any scalar call generically to `Unresolved::FunctionCall { name, + // `lower_expr`'s `Expr::ScalarFunction` arm already lowers any + // scalar call generically to `UnresolvedScalar::FunctionCall { name, // args }`, so registering the stub is the entire fix (issue #230). for builtin in asap_sql_function_catalog::CLICKHOUSE_SCALAR_BUILTINS { ctx.register_udf(clickhouse_scalar_builtin_stub_udf( @@ -308,9 +314,24 @@ impl<'a> SqlLowerer<'a> { Ok(ctx) } - fn lower_plan(&self, plan: &LogicalPlan) -> Result { + pub(super) fn lower_plan(&self, plan: &LogicalPlan) -> Result { match plan { LogicalPlan::TableScan(scan) => self.lower_table_scan(scan), + // The one empty input row of a `SELECT` without `FROM`. + LogicalPlan::EmptyRelation(empty) => Ok(Unresolved::Values { + rows: if empty.produce_one_row { + vec![vec![]] + } else { + vec![] + }, + schema: Schema { + fields: vec![], + time_index: None, + unique_keys: vec![], + closed: true, + }, + }), + LogicalPlan::Values(values) => self.lower_values(values), LogicalPlan::Filter(filter) => self.lower_filter(filter), LogicalPlan::Projection(proj) => self.lower_projection(proj), LogicalPlan::Aggregate(agg) => self.lower_aggregate(agg), @@ -379,9 +400,7 @@ impl<'a> SqlLowerer<'a> { .iter() .map(|f| ProjectItem { alias: Some(f.name().clone()), - expr: Unresolved::Column(ColumnRef::Named( - f.name().clone(), - )), + expr: Scalar::Column(ColumnRef::Named(f.name().clone())), }) .collect(); Ok(Unresolved::Project { @@ -404,108 +423,48 @@ impl<'a> SqlLowerer<'a> { /// `WHERE` — a conjunction of ordinary predicates plus, possibly, subquery /// predicates (issue #111). /// - /// `c IN (SELECT …)` and `EXISTS (…)` are not expressions over rows; they are - /// *joins*. Each such conjunct peels off into a semi- / anti-join above the - /// filter's input, and the remaining conjuncts stay as an ordinary `Filter`. + /// The ordinary conjuncts stay one predicate, folded onto a bare `Scan` + /// (`filter_or_fold`). A subquery conjunct — `c IN (SELECT …)`, `EXISTS + /// (…)`, `x > (SELECT …)` — is a row filter whose predicate reads another + /// operator (`UnresolvedScalar::InSubquery` / `Exists` / + /// `ScalarSubquery`); each one becomes its own `Filter` **above** the + /// ordinary predicate, so the shared `canonicalize` pass can turn it into + /// the join it is without having to peel it out of a conjunction or off + /// a `Scan` (it only lifts subqueries out of `Filter` / `Project`). A + /// semi-join only ever drops left rows, so the two orders agree. /// - /// The residual filter is applied **below** the joins, which is where it sat - /// before: a semi-join only ever drops left rows, so the two orders agree — - /// and keeping the fold-onto-`Scan` (`filter_or_fold`) below the joins - /// matches where the old converter folded it too. + /// The one subquery shape still lowered to a join here is a *correlated* + /// `EXISTS`: its correlation references both sides, which only a join + /// predicate can bind (a subquery referenced from a scalar position is + /// resolved as a root in its own scope). fn lower_filter(&self, filter: &logical_expr::Filter) -> Result { let mut conjuncts = Vec::new(); split_conjunction(&filter.predicate, &mut conjuncts); - let (subqueries, residual): (Vec<_>, Vec<_>) = conjuncts - .into_iter() - .partition(|e| matches!(e, Expr::InSubquery(_) | Expr::Exists(_))); + let (subqueries, residual): (Vec<_>, Vec<_>) = + conjuncts.into_iter().partition(|e| reads_subquery(e)); let input = self.lower_plan(&filter.input)?; let mut node = match rebuild_conjunction(&residual) { - Some(pred) => filter_or_fold(df_expr_to_unresolved(&pred)?, input), + Some(pred) => filter_or_fold(self.lower_expr(&pred)?, input), None => input, }; for sq in subqueries { node = match sq { - Expr::InSubquery(is) => self.lower_in_subquery(is, node)?, - Expr::Exists(ex) => self.lower_exists(ex, node)?, - _ => unreachable!("partitioned above"), + Expr::Exists(ex) if !ex.subquery.outer_ref_columns.is_empty() => { + self.lower_correlated_exists(ex, node)? + } + other => Unresolved::Filter { + pred: Predicate(self.lower_expr(other)?), + child: Rc::new(node), + }, }; } Ok(node) } - /// `c IN (SELECT k FROM …)` → a semi-join on `c = k` (issue #111). - fn lower_in_subquery( - &self, - is: &logical_expr::expr::InSubquery, - left: Unresolved, - ) -> Result { - if is.negated { - // `NOT IN` is not an anti-join. Under three-valued logic a single - // NULL among the subquery's rows makes `c NOT IN (…)` UNKNOWN for - // every `c`, so the query returns nothing — while an anti-join - // returns every unmatched left row. Reject rather than mislower. - return Err(LoweringError::UnsupportedFeature( - "NOT IN (subquery): its NULL semantics are not an anti-join".into(), - )); - } - if !is.subquery.outer_ref_columns.is_empty() { - return Err(LoweringError::UnsupportedFeature( - "correlated IN (subquery)".into(), - )); - } - let inner = is.subquery.subquery.as_ref(); - let fields = inner.schema().fields(); - if fields.len() != 1 { - return Err(LoweringError::InvalidExpression(format!( - "IN (subquery) must select exactly one column, got {}", - fields.len() - ))); - } - let key = &fields[0]; - // Project the key under a name the outer relation cannot also carry. The - // join predicate resolves against the concatenated `left ++ right` - // schema, and a bare `hosts.service` over an unqualified subquery output - // falls back to a name lookup that finds the *left's* `service` first — - // silently making the predicate `service = service`, i.e. always true. - let right = match inner { - // Rebuild the subquery's projection with the synthetic alias, so a - // computed key (`SELECT bytes + 1 …`) is named rather than becoming - // the anonymous `col_0` that nothing can reference. - LogicalPlan::Projection(p) if p.expr.len() == 1 => Unresolved::Project { - cols: vec![ProjectItem { - alias: Some(IN_SUBQUERY_KEY.to_string()), - expr: df_expr_to_unresolved(unalias(&p.expr[0]))?, - }], - qualifier: None, - child: Rc::new(self.lower_plan(&p.input)?), - }, - other => Unresolved::Project { - cols: vec![ProjectItem { - alias: Some(IN_SUBQUERY_KEY.to_string()), - expr: Unresolved::Column(ColumnRef::Named(key.name().clone())), - }], - qualifier: None, - child: Rc::new(self.lower_plan(other)?), - }, - }; - Ok(Unresolved::Join { - kind: JoinKind::Semi, - pred: Predicate(Rc::new(Unresolved::Compare { - left: Rc::new(df_expr_to_unresolved(&is.expr)?), - op: CompareOpKind::Eq, - right: Rc::new(Unresolved::Column(ColumnRef::Named( - IN_SUBQUERY_KEY.to_string(), - ))), - })), - left: Rc::new(left), - right: Rc::new(right), - }) - } - /// `[NOT] EXISTS (SELECT … WHERE inner.k = outer.k)` → a semi- / anti-join /// on the correlation predicate (issue #111). - fn lower_exists( + fn lower_correlated_exists( &self, ex: &logical_expr::expr::Exists, left: Unresolved, @@ -526,12 +485,9 @@ impl<'a> SqlLowerer<'a> { // the join predicate. Whatever is left stays an ordinary inner filter. let (inner, correlation) = split_correlation(inner)?; let right = self.lower_plan(&inner)?; - // No correlation conjunct (a genuinely uncorrelated `EXISTS`) means - // the join condition is unconditionally true — same convention as an - // unconditional `JOIN` (`lower_join`, below). let pred = match correlation { - Some(e) => Predicate(Rc::new(df_expr_to_unresolved(&e)?)), - None => Predicate(Rc::new(Unresolved::Literal(ScalarValue::Boolean(true)))), + Some(e) => Predicate(self.lower_expr(&e)?), + None => Predicate(Scalar::Literal(ScalarValue::Boolean(true))), }; Ok(Unresolved::Join { kind, @@ -541,6 +497,37 @@ impl<'a> SqlLowerer<'a> { }) } + /// `VALUES (…), (…)` — one row per values row, typed by DataFusion's + /// declared schema. Row expressions have no input-column scope. + fn lower_values(&self, values: &logical_expr::Values) -> Result { + let rows = values + .values + .iter() + .map(|row| row.iter().map(|e| self.lower_expr(e)).collect()) + .collect::>, LoweringError>>()?; + let fields = values + .schema + .fields() + .iter() + .map(|f| { + Ok(asap_types::pre_asap::Field::plain( + f.name().clone(), + arrow_to_dtype(f.data_type())?, + f.is_nullable(), + )) + }) + .collect::, LoweringError>>()?; + Ok(Unresolved::Values { + rows, + schema: Schema { + fields, + time_index: None, + unique_keys: vec![], + closed: true, + }, + }) + } + /// Table leaf — carries the catalog's resolved schema directly on `Scan` /// (`schema: Some(_)`), so `resolve_root`'s SchemaResolver doesn't need to /// usage-derive it (SQL is never schemaless). Projection pushdown is left @@ -604,23 +591,17 @@ impl<'a> SqlLowerer<'a> { let mut conjuncts = join .on .iter() - .map(|(l, r)| { - Ok(Unresolved::Compare { - left: Rc::new(df_expr_to_unresolved(l)?), - op: CompareOpKind::Eq, - right: Rc::new(df_expr_to_unresolved(r)?), - }) - }) + .map(|(l, r)| self.compare(l, CompareOpKind::Eq, r)) .collect::, LoweringError>>()?; if let Some(filter) = &join.filter { - conjuncts.push(df_expr_to_unresolved(filter)?); + conjuncts.push(self.lower_expr(filter)?); } - let pred = Predicate(Rc::new(match conjuncts.len() { + let pred = Predicate(match conjuncts.len() { // No condition (a CROSS JOIN) is unconditionally true. - 0 => Unresolved::Literal(ScalarValue::Boolean(true)), + 0 => Scalar::Literal(ScalarValue::Boolean(true)), 1 => conjuncts.pop().unwrap(), - _ => Unresolved::BoolAnd(conjuncts), - })); + _ => Scalar::BoolAnd(conjuncts), + }); Ok(Unresolved::Join { kind, pred, @@ -643,6 +624,10 @@ impl<'a> SqlLowerer<'a> { .window_expr .first() .ok_or_else(|| LoweringError::InvalidExpression("empty window expression".into()))?; + let first = match first { + Expr::Alias(alias) => alias.expr.as_ref(), + other => other, + }; let Expr::WindowFunction(wf) = first else { return Err(LoweringError::InvalidExpression( "expected a window function in Window plan node".into(), @@ -653,12 +638,12 @@ impl<'a> SqlLowerer<'a> { .params .args .iter() - .map(df_expr_to_unresolved) + .map(|e| self.lower_expr(e)) .collect::, _>>()?; // Nth_value: lift N from the (literal) 2nd arg, keep only the column. let func = if matches!(func, WindowFuncKind::NthValue(None)) { let n = match args.get(1) { - Some(Unresolved::Literal(ScalarValue::Int64(n))) if *n > 0 => *n as u64, + Some(Scalar::Literal(ScalarValue::Int64(n))) if *n > 0 => *n as u64, other => { return Err(LoweringError::InvalidExpression(format!( "NTH_VALUE requires a positive integer literal 2nd arg, got {other:?}" @@ -681,7 +666,7 @@ impl<'a> SqlLowerer<'a> { .order_by .iter() .map(|s| { - df_expr_to_unresolved(&s.expr).map(|expr| SortKey { + self.lower_expr(&s.expr).map(|expr| SortKey { expr, ascending: s.asc, nulls_first: s.nulls_first, @@ -716,7 +701,7 @@ impl<'a> SqlLowerer<'a> { let input = self.lower_plan(&proj.input)?; return Ok(match bridge { PlanningBridge::PromqlSubquery { range, resolution } => { - let child = Rc::new(temporal_bridge_projection(proj, input)?); + let child = Rc::new(self.temporal_bridge_projection(proj, input)?); Unresolved::PromqlSubquery { range, resolution: Some(resolution), @@ -745,22 +730,22 @@ impl<'a> SqlLowerer<'a> { .map(|e| match e { Expr::Alias(a) => { let expr = if temporal_input && is_temporal_output_column(&a.expr) { - Unresolved::Column(ColumnRef::Named("value".into())) + Scalar::Column(ColumnRef::Named("value".into())) } else { - df_expr_to_unresolved(&a.expr)? + self.lower_expr(&a.expr)? }; - Ok::, LoweringError>(ProjectItem { + Ok::(ProjectItem { expr, alias: Some(a.name.clone()), }) } _ => { let expr = if temporal_input && is_temporal_output_column(e) { - Unresolved::Column(ColumnRef::Named("value".into())) + Scalar::Column(ColumnRef::Named("value".into())) } else { - df_expr_to_unresolved(e)? + self.lower_expr(e)? }; - Ok::, LoweringError>(ProjectItem { expr, alias: None }) + Ok::(ProjectItem { expr, alias: None }) } }) .collect::, _>>()?; @@ -807,7 +792,7 @@ impl<'a> SqlLowerer<'a> { // reducer expression (`GROUP BY date_trunc(…)`, `SUM(a * 8)`) has no // slot. Materialize each one as a derived column in a `Project` beneath // the aggregate, then group/reduce over that column (issue #110). - let mut derived = DerivedCols::default(); + let mut derived = DerivedCols::new(self); // DataFusion strips `AS m` from a grouping expression, so the aggregate // schema's field name is what the enclosing Projection references — @@ -832,7 +817,7 @@ impl<'a> SqlLowerer<'a> { .get(i) .cloned() .unwrap_or_else(|| other.to_string()); - derived.materialize(name.clone(), df_expr_to_unresolved(other)?)?; + derived.materialize(name.clone(), self.lower_expr(other)?)?; keys.push(ColumnRef::Named(name)); } } @@ -874,7 +859,7 @@ impl<'a> SqlLowerer<'a> { .iter() .map(|f| { f.as_ref() - .map(|f| Ok(Predicate(Rc::new(df_expr_to_unresolved(f)?)))) + .map(|f| Ok(Predicate(self.lower_expr(f)?))) .transpose() }) .collect::, LoweringError>>()? @@ -927,12 +912,7 @@ impl<'a> SqlLowerer<'a> { )) })?; - let resolved_input = resolve_root(&input)?; - let input_schema = resolved_input.output_schema().map_err(|error| { - LoweringError::InvalidExpression(format!( - "cannot derive temporal aggregate input schema: {error}" - )) - })?; + let input_schema = resolve_root(&input)?.schema.clone(); let timestamp_id = resolve_column_ref(×tamp_ref, &input_schema).map_err(|error| { LoweringError::InvalidExpression(format!("{name} timestamp argument: {error}")) })?; @@ -1005,18 +985,18 @@ impl<'a> SqlLowerer<'a> { let mut cols = vec![ ProjectItem { alias: Some("ts".into()), - expr: Unresolved::Column(timestamp_ref.clone()), + expr: Scalar::Column(timestamp_ref.clone()), }, ProjectItem { alias: Some("value".into()), - expr: Unresolved::Column(value_ref.clone()), + expr: Scalar::Column(value_ref.clone()), }, ]; for group_ref in group_refs { let group_name = named_ref(&group_ref).to_string(); cols.push(ProjectItem { alias: Some(group_name), - expr: Unresolved::Column(group_ref), + expr: Scalar::Column(group_ref), }); } let child = Unresolved::Project { @@ -1024,8 +1004,11 @@ impl<'a> SqlLowerer<'a> { qualifier: None, child: Rc::new(input), }; + // The explicit window is a range selector over the series, the same + // shape PromQL's `rate(m[5m])` lowers to. let child = Unresolved::TimeRange { range: Duration::from_millis(window_ms), + kind: TimeRangeKind::Range, child: Rc::new(child), }; let intent = match name.as_str() { @@ -1104,7 +1087,7 @@ impl<'a> SqlLowerer<'a> { // Reducer arguments still materialize as derived columns (#110); the // grouping keys are plain columns, so they only need carrying through. - let mut derived = DerivedCols::default(); + let mut derived = DerivedCols::new(self); for e in &distinct { derived.passthrough(e)?; } @@ -1142,10 +1125,10 @@ impl<'a> SqlLowerer<'a> { .map(|((name, dtype), e)| ProjectItem { alias: Some(name.clone()), expr: if level.contains(e) { - Unresolved::Column(ColumnRef::Named(name.clone())) + Scalar::Column(ColumnRef::Named(name.clone())) } else { - Unresolved::Cast { - expr: Rc::new(Unresolved::Literal(ScalarValue::Null)), + Scalar::Cast { + expr: Box::new(Scalar::Literal(ScalarValue::Null)), to: dtype.clone(), try_cast: false, } @@ -1153,7 +1136,7 @@ impl<'a> SqlLowerer<'a> { }) .chain(output_names.iter().map(|n| ProjectItem { alias: Some(n.clone()), - expr: Unresolved::Column(ColumnRef::Named(n.clone())), + expr: Scalar::Column(ColumnRef::Named(n.clone())), })) .collect(); Ok(Unresolved::Project { @@ -1185,7 +1168,7 @@ impl<'a> SqlLowerer<'a> { .expr .iter() .map(|s| { - df_expr_to_unresolved(&s.expr).map(|expr| SortKey { + self.lower_expr(&s.expr).map(|expr| SortKey { expr, ascending: s.asc, nulls_first: s.nulls_first, @@ -1205,8 +1188,10 @@ impl<'a> SqlLowerer<'a> { // Count-ranked `LIMIT k` over a `Sort` is promoted to the heavy-hitter // `TopK` by the shared `canonicalize` pass (issue #34), not here. Ok(Unresolved::Limit { - n: eval_fetch(&limit.fetch).unwrap_or(usize::MAX), + // No (literal) fetch is offset-only. + n: eval_fetch(&limit.fetch), offset: eval_fetch(&limit.skip).unwrap_or(0), + partition_by: GroupKeys::none(), child: Rc::new(self.lower_plan(&limit.input)?), }) } @@ -1286,49 +1271,52 @@ fn planning_bridge( /// its output slot (`... asap_promql_subquery(...) AS value ...`). This makes /// the bridge schema-preserving without silently retaining columns that SQL /// projected away. -fn temporal_bridge_projection( - projection: &logical_expr::Projection, - child: Unresolved, -) -> Result { - let cols = projection - .expr - .iter() - .map(|expr| { - if let Expr::ScalarFunction(call) = unalias(expr) { - if call - .func - .name() - .eq_ignore_ascii_case("asap_promql_subquery") - { - let Expr::Alias(alias) = expr else { - return Err(LoweringError::InvalidExpression( - "asap_promql_subquery must have an alias naming its child value column" - .into(), - )); - }; - return Ok(ProjectItem { - expr: Unresolved::Column(ColumnRef::Named(alias.name.clone())), +impl SqlLowerer<'_> { + fn temporal_bridge_projection( + &self, + projection: &logical_expr::Projection, + child: Unresolved, + ) -> Result { + let cols = projection + .expr + .iter() + .map(|expr| { + if let Expr::ScalarFunction(call) = unalias(expr) { + if call + .func + .name() + .eq_ignore_ascii_case("asap_promql_subquery") + { + let Expr::Alias(alias) = expr else { + return Err(LoweringError::InvalidExpression( + "asap_promql_subquery must have an alias naming its child value column" + .into(), + )); + }; + return Ok(ProjectItem { + expr: Scalar::Column(ColumnRef::Named(alias.name.clone())), + alias: Some(alias.name.clone()), + }); + } + } + match expr { + Expr::Alias(alias) => Ok(ProjectItem { + expr: self.lower_expr(&alias.expr)?, alias: Some(alias.name.clone()), - }); + }), + other => Ok(ProjectItem { + expr: self.lower_expr(other)?, + alias: None, + }), } - } - match expr { - Expr::Alias(alias) => Ok(ProjectItem { - expr: df_expr_to_unresolved(&alias.expr)?, - alias: Some(alias.name.clone()), - }), - other => Ok(ProjectItem { - expr: df_expr_to_unresolved(other)?, - alias: None, - }), - } + }) + .collect::, LoweringError>>()?; + Ok(Unresolved::Project { + cols, + qualifier: None, + child: Rc::new(child), }) - .collect::, LoweringError>>()?; - Ok(Unresolved::Project { - cols, - qualifier: None, - child: Rc::new(child), - }) + } } fn positive_millis_literal(expr: &Expr, argument: &str) -> Result { @@ -1413,8 +1401,8 @@ fn arity_to_signature(arity: Arity) -> Signature { // (which must become a real `AggIntent`, hence the rewrite to a native // DataFusion aggregate shape `lower_agg_intent` can classify), a scalar // function call in this IR is already deliberately opaque — -// `expr::df_expr_to_unresolved`'s `Expr::ScalarFunction` arm lowers *any* -// scalar call generically to `Unresolved::FunctionCall { name, args }`, with +// `SqlLowerer::lower_expr`'s `Expr::ScalarFunction` arm lowers *any* +// scalar call generically to `UnresolvedScalar::FunctionCall { name, args }`, with // zero name-specific logic. So teaching DataFusion's planner to accept a // ClickHouse scalar builtin's name — a stub `ScalarUDF`, registered below — // is the entire fix; the existing generic lowering already does the rest. @@ -1933,23 +1921,19 @@ fn lower_arg_selector( })) } -/// The name an `IN (subquery)`'s key column is projected under, so the join -/// predicate cannot bind it to a same-named column of the outer relation. -const IN_SUBQUERY_KEY: &str = "__asap_in_key"; - /// Fold `pred` directly onto `child.predicates` when `child` is a bare `Scan` /// (a `WHERE` directly over a table), otherwise wrap it in an ordinary /// `Filter` — canonical's invariant that a `Filter` never sits directly over a /// `Scan`. A front end emitting the canonical shape directly is responsible /// for maintaining that invariant itself (issue #179). -fn filter_or_fold(pred: Unresolved, child: Unresolved) -> Unresolved { +fn filter_or_fold(pred: Scalar, child: Unresolved) -> Unresolved { match child { Unresolved::Scan { source, mut predicates, schema, } => { - predicates.push(Predicate(Rc::new(pred))); + predicates.push(Predicate(pred)); Unresolved::Scan { source, predicates, @@ -1957,7 +1941,7 @@ fn filter_or_fold(pred: Unresolved, child: Unresolved) -> Unresolved { } } other => Unresolved::Filter { - pred: Predicate(Rc::new(pred)), + pred: Predicate(pred), child: Rc::new(other), }, } @@ -1974,6 +1958,18 @@ fn split_conjunction<'a>(expr: &'a Expr, out: &mut Vec<&'a Expr>) { } } +/// Whether `expr` reads another operator anywhere inside it (`EXISTS`, +/// `IN (…)`, a scalar subquery). +fn reads_subquery(expr: &Expr) -> bool { + expr.exists(|e| { + Ok(matches!( + e, + Expr::ScalarSubquery(_) | Expr::InSubquery(_) | Expr::Exists(_) + )) + }) + .expect("the predicate never fails") +} + /// Re-`AND` the conjuncts, or `None` when there are none left. fn rebuild_conjunction(conjuncts: &[&Expr]) -> Option { conjuncts @@ -2122,9 +2118,9 @@ fn expand_grouping_set(gs: &logical_expr::GroupingSet) -> Vec> { /// The projection also has to carry through the plain columns the aggregate /// still references, since a `Project` replaces its child's schema rather than /// extending it. -#[derive(Default)] -struct DerivedCols { - cols: Vec>, +struct DerivedCols<'l> { + lowerer: &'l SqlLowerer<'l>, + cols: Vec, /// Whether any column is genuinely derived. Without one the aggregate keeps /// its original child, so DAGs that lower today keep their exact shape. any: bool, @@ -2133,12 +2129,21 @@ struct DerivedCols { collision: Option, } -impl DerivedCols { +impl<'l> DerivedCols<'l> { + fn new(lowerer: &'l SqlLowerer<'l>) -> Self { + Self { + lowerer, + cols: Vec::new(), + any: false, + collision: None, + } + } + /// Add `alias := expr`, or note a collision if `alias` already means /// something else. `Project` carries one relation qualifier for all its /// columns, so `a.k` and `b.k` cannot both survive it — but that only /// matters when a projection gets inserted at all. - fn push(&mut self, alias: String, expr: Unresolved) { + fn push(&mut self, alias: String, expr: Scalar) { let existing = self .cols .iter() @@ -2161,12 +2166,12 @@ impl DerivedCols { let Expr::Column(c) = unalias(expr) else { return Ok(()); }; - self.push(c.name.clone(), df_expr_to_unresolved(expr)?); + self.push(c.name.clone(), self.lowerer.lower_expr(expr)?); Ok(()) } /// A genuinely derived column: `alias` now names `expr`'s value. - fn materialize(&mut self, alias: String, expr: Unresolved) -> Result<(), LoweringError> { + fn materialize(&mut self, alias: String, expr: Scalar) -> Result<(), LoweringError> { self.any = true; self.push(alias, expr); Ok(()) @@ -2188,7 +2193,7 @@ impl DerivedCols { let mut rewritten = agg_fn.clone(); for arg in &mut rewritten.params.args { let alias = unalias(arg).to_string(); - self.materialize(alias.clone(), df_expr_to_unresolved(arg)?)?; + self.materialize(alias.clone(), self.lowerer.lower_expr(arg)?)?; *arg = Expr::Column(DfColumn::new_unqualified(alias)); } return Ok(Expr::AggregateFunction(rewritten)); @@ -2211,12 +2216,12 @@ impl DerivedCols { } match agg_col_name(&agg_fn.params.args) { Some(name) => { - self.push(name, df_expr_to_unresolved(arg)?); + self.push(name, self.lowerer.lower_expr(arg)?); Ok(expr.clone()) } None => { let alias = unalias(arg).to_string(); - self.materialize(alias.clone(), df_expr_to_unresolved(arg)?)?; + self.materialize(alias.clone(), self.lowerer.lower_expr(arg)?)?; let mut agg_fn = agg_fn.clone(); agg_fn.params.args[0] = Expr::Column(DfColumn::new_unqualified(alias)); Ok(Expr::AggregateFunction(agg_fn)) @@ -2287,7 +2292,7 @@ fn expr_to_group_ref(expr: &Expr) -> Result { match expr { // Preserve the relation qualifier so a GROUP BY / PARTITION BY key over a // join (`b.k` vs `a.k`) resolves to the correct side — the same rule the - // scalar predicate path uses (`df_expr_to_unresolved`). + // scalar predicate path uses (`lower_expr`). Expr::Column(col) => Ok(match &col.relation { Some(rel) => ColumnRef::Qualified { table: rel.to_string(), diff --git a/crates/frontend-sql/tests/bgp_analytics/bgp_analytics.rs b/crates/frontend-sql/tests/bgp_analytics/bgp_analytics.rs index 23f757985..cc24329cd 100644 --- a/crates/frontend-sql/tests/bgp_analytics/bgp_analytics.rs +++ b/crates/frontend-sql/tests/bgp_analytics/bgp_analytics.rs @@ -35,9 +35,12 @@ //! `Err`, never panics. The pinned per-query outcomes document today's real //! coverage so a regression (or a future improvement) is visible, not silent. +use std::rc::Rc; + use asap_frontend_sql::{lower_sql_dialect, SqlCatalog, SqlError as LoweringError}; +use asap_types::ir::{NonASAPOp, OperatorNode}; use asap_types::pre_asap::schema::{DataType, Field, Schema}; -use asap_types::pre_asap::{AggIntent, GroupKeys, QueryExpr}; +use asap_types::pre_asap::{AggIntent, GroupKeys}; use asap_types::types::AccuracyTarget; use asap_types::workload::SqlDialect; use datafusion::error::DataFusionError; @@ -92,7 +95,7 @@ fn queries() -> Vec { .collect() } -async fn lower(q: &str) -> Result { +async fn lower(q: &str) -> Result, LoweringError> { lower_sql_dialect( q, &catalog(), @@ -218,19 +221,19 @@ async fn corpus_lowering_matches_the_pinned_per_query_outcome() { ); } -fn first_aggregate(qe: &QueryExpr) -> Option<(&GroupKeys, &Vec)> { - match qe { - QueryExpr::Aggregate { +fn first_aggregate(node: &OperatorNode) -> Option<(&GroupKeys, &Vec)> { + match node.expect_non_asap() { + NonASAPOp::Aggregate { reduction, measures, .. } => Some((reduction.expect_reduce(), measures)), - QueryExpr::Project { child, .. } - | QueryExpr::Filter { child, .. } - | QueryExpr::Sort { child, .. } - | QueryExpr::Limit { child, .. } - | QueryExpr::Dedup { child, .. } - | QueryExpr::PromqlSubquery { child, .. } => first_aggregate(child), + NonASAPOp::Project { child, .. } + | NonASAPOp::Filter { child, .. } + | NonASAPOp::Sort { child, .. } + | NonASAPOp::Limit { child, .. } + | NonASAPOp::Dedup { child, .. } + | NonASAPOp::PromqlSubquery { child, .. } => first_aggregate(child), _ => None, } } @@ -260,7 +263,7 @@ async fn top_k_queries_are_count_grouped_by_prefix() { idx + 1 ); assert!( - matches!(qe, QueryExpr::Limit { .. }), + matches!(qe.expect_non_asap(), NonASAPOp::Limit { .. }), "q{} ({label}) top-k shape keeps the LIMIT at the root: {qe:?}", idx + 1 ); diff --git a/crates/frontend-sql/tests/bgp_jan2024_workload/bgp_jan2024_workload.rs b/crates/frontend-sql/tests/bgp_jan2024_workload/bgp_jan2024_workload.rs index 4c6f0e8ea..d7c750d7d 100644 --- a/crates/frontend-sql/tests/bgp_jan2024_workload/bgp_jan2024_workload.rs +++ b/crates/frontend-sql/tests/bgp_jan2024_workload/bgp_jan2024_workload.rs @@ -70,7 +70,7 @@ fn catalog() -> SqlCatalog { .with_table("bgp.bgp_updates", updates) } -async fn lower(q: &str) -> Result { +async fn lower(q: &str) -> Result, SqlError> { lower_sql_dialect( q, &catalog(), @@ -91,6 +91,8 @@ async fn lower(q: &str) -> Result { /// is that signal, ratcheted so a category shifting size is visible. #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)] enum Category { + /// A planned expression lacks a faithful registered IR type contract. + InvalidRepresentation, Lowered, /// `DataFusionError::Plan` -- almost entirely "unknown function" for a /// ClickHouse-only builtin (`uniqExact`, `countIf`, `splitByChar`, ...). @@ -119,6 +121,7 @@ fn categorize(err: &SqlError) -> Category { SqlError::DataFusion(DataFusionError::SQL(_, _)) => Category::Parse, SqlError::DataFusion(DataFusionError::NotImplemented(_)) => Category::NotImplemented, SqlError::UnsupportedFeature(_) => Category::UnsupportedFeature, + SqlError::Convert(_) => Category::InvalidRepresentation, _ => Category::Other, } } @@ -194,12 +197,15 @@ async fn corpus_lowering_matches_the_pinned_aggregate_tally() { // 152 -> 154: `ScalarValue::Interval` (this branch) converts the // `INTERVAL x unit` literal the two `toStartOfInterval(...)` queries // carry. - // 154 -> 156 (DataFusion 54, issue #611): q128 calls `greatest`, which - // DataFusion now provides (was `Plan`), and q129's subquery - // `ORDER BY count(*)` no longer fails as `UnsupportedFeature("expression: - // count(*)")`. - expect(Category::Lowered, 156); - expect(Category::Plan, 39); + // Previously admitted ClickHouse stubs used placeholder Float64 types. + // Unregistered functions and incompatible operands now fail closed. + // DataFusion 54 (issue #611): q128's `greatest` is now provided by + // DataFusion (was `Plan`) and q129's subquery `ORDER BY count(*)` no + // longer fails as `UnsupportedFeature`; one lowers, the other now fails + // closed as `InvalidRepresentation`. + expect(Category::Lowered, 106); + expect(Category::InvalidRepresentation, 54); + expect(Category::Plan, 40); expect(Category::Schema, 0); expect(Category::Parse, 0); // One query that used to fail at `uniqExact` (`Plan`) now clears that @@ -211,7 +217,7 @@ async fn corpus_lowering_matches_the_pinned_aggregate_tally() { // Typed Map access lowers one prior gap; six array accesses now fail // during typed planning because the Map adapter rejects array inputs. expect(Category::NotImplemented, 0); - expect(Category::UnsupportedFeature, 5); + expect(Category::UnsupportedFeature, 0); // Was 2: the two `toStartOfInterval(...)` queries whose `INTERVAL`-literal // conversion gap the `toStartOfInterval` note above describes. Both now // lower end to end and are counted in `Lowered`. diff --git a/crates/frontend-sql/tests/data_quality_check/synthetic_packet_trace.rs b/crates/frontend-sql/tests/data_quality_check/synthetic_packet_trace.rs index caed56594..cce394a08 100644 --- a/crates/frontend-sql/tests/data_quality_check/synthetic_packet_trace.rs +++ b/crates/frontend-sql/tests/data_quality_check/synthetic_packet_trace.rs @@ -19,9 +19,12 @@ //! Schema: `packets(srcip, dstip, srcport, dstport, proto, time, pkt_len)`; //! flow / 5-tuple = `(srcip, dstip, srcport, dstport, proto)`. +use std::rc::Rc; + use asap_frontend_sql::{lower_sql, SqlCatalog, SqlError as LoweringError}; +use asap_types::ir::{NonASAPOp, OperatorNode}; use asap_types::pre_asap::schema::{DataType, Field, Schema}; -use asap_types::pre_asap::{AggIntent, GroupKeys, QueryExpr}; +use asap_types::pre_asap::{AggIntent, GroupKeys}; use asap_types::types::AccuracyTarget; const CORPUS: &str = include_str!("data/synthetic_packet_trace_queries.sql"); @@ -67,110 +70,61 @@ fn queries() -> Vec { // ── DAG helpers ────────────────────────────────────────────────────────────── -/// Every `AggIntent` in the DAG, root-to-leaf. -fn intents(e: &QueryExpr) -> Vec { - let mut out = Vec::new(); - fn go(e: &QueryExpr, out: &mut Vec) { - match e { - QueryExpr::Aggregate { - measures, child, .. - } => { - out.extend(measures.iter().cloned()); - go(child, out); - } - QueryExpr::TimeRange { child, .. } - | QueryExpr::TimeShift { child, .. } - | QueryExpr::Filter { child, .. } - | QueryExpr::Sort { child, .. } - | QueryExpr::Limit { child, .. } - | QueryExpr::PromqlSubquery { child, .. } - | QueryExpr::Dedup { child, .. } - | QueryExpr::SQLWindowFunc { child, .. } - | QueryExpr::Project { child, .. } - | QueryExpr::PromqlRelabel { child, .. } - | QueryExpr::PromqlSeriesSample { child, .. } - | QueryExpr::PromqlInfoEnrich { child, .. } => go(child, out), - QueryExpr::BinaryOp { lhs, rhs, .. } - | QueryExpr::Join { - left: lhs, - right: rhs, - .. - } - | QueryExpr::SetOp { - left: lhs, - right: rhs, - .. - } => { - go(lhs, out); - go(rhs, out); - } - QueryExpr::Concat { children, .. } => children.iter().for_each(|c| go(c, out)), - QueryExpr::PromqlVectorFromScalar(inner) | QueryExpr::PromqlScalarFromVector(inner) => { - go(inner, out) - } - QueryExpr::Scan { .. } - | QueryExpr::PromqlScalarBridge(_) - | QueryExpr::EvalTimestamp - | QueryExpr::CurrentTimestamp => {} - // Scalar expression variants (issue #205): `AggIntent` only ever - // lives in `Aggregate.measures`, never nested inside a scalar - // expression DAG, so there's nothing to recurse into here. - QueryExpr::Column(_) - | QueryExpr::Literal(_) - | QueryExpr::Compare { .. } - | QueryExpr::BoolAnd(_) - | QueryExpr::BoolOr(_) - | QueryExpr::Not(_) - | QueryExpr::IsNull(_) - | QueryExpr::IsNotNull(_) - | QueryExpr::Cast { .. } - | QueryExpr::InList { .. } - | QueryExpr::FunctionCall { .. } - | QueryExpr::Arithmetic { .. } - | QueryExpr::Case { .. } => {} - } - } - go(e, &mut out); - out +/// The operator of a front-end node: a front-end DAG never holds an ASAP node. +fn op(node: &OperatorNode) -> &NonASAPOp { + node.expect_non_asap() +} + +/// Every `AggIntent` in the DAG, root-to-leaf (every reachable node — +/// `AggIntent` only ever lives in `Aggregate.measures`). +fn intents(e: &Rc) -> Vec { + OperatorNode::reachable(e) + .iter() + .filter_map(|node| match op(node) { + NonASAPOp::Aggregate { measures, .. } => Some(measures.clone()), + _ => None, + }) + .flatten() + .collect() } /// The first `Aggregate`'s `(by, measures)` along the single-child spine. SQL /// never lowers to `Reduction::PerEntity` (it has no per-series concept), so /// `expect_reduce()` here is a safe, load-bearing assumption for these tests. -fn first_aggregate(qe: &QueryExpr) -> Option<(&GroupKeys, &Vec)> { - match qe { - QueryExpr::Aggregate { +fn first_aggregate(node: &OperatorNode) -> Option<(&GroupKeys, &Vec)> { + match op(node) { + NonASAPOp::Aggregate { reduction, measures, .. } => Some((reduction.expect_reduce(), measures)), - QueryExpr::Project { child, .. } - | QueryExpr::Filter { child, .. } - | QueryExpr::Dedup { child, .. } - | QueryExpr::Sort { child, .. } - | QueryExpr::Limit { child, .. } - | QueryExpr::SQLWindowFunc { child, .. } - | QueryExpr::PromqlSubquery { child, .. } => first_aggregate(child), + NonASAPOp::Project { child, .. } + | NonASAPOp::Filter { child, .. } + | NonASAPOp::Dedup { child, .. } + | NonASAPOp::Sort { child, .. } + | NonASAPOp::Limit { child, .. } + | NonASAPOp::SQLWindowFunc { child, .. } + | NonASAPOp::PromqlSubquery { child, .. } => first_aggregate(child), _ => None, } } /// Whether a `SQLWindowFunc` (analytic `OVER (…)`) node appears anywhere. -fn has_window_func(qe: &QueryExpr) -> bool { - match qe { - QueryExpr::SQLWindowFunc { .. } => true, - QueryExpr::Project { child, .. } - | QueryExpr::Filter { child, .. } - | QueryExpr::Aggregate { child, .. } - | QueryExpr::Dedup { child, .. } - | QueryExpr::Sort { child, .. } - | QueryExpr::Limit { child, .. } - | QueryExpr::PromqlSubquery { child, .. } => has_window_func(child), +fn has_window_func(node: &OperatorNode) -> bool { + match op(node) { + NonASAPOp::SQLWindowFunc { .. } => true, + NonASAPOp::Project { child, .. } + | NonASAPOp::Filter { child, .. } + | NonASAPOp::Aggregate { child, .. } + | NonASAPOp::Dedup { child, .. } + | NonASAPOp::Sort { child, .. } + | NonASAPOp::Limit { child, .. } + | NonASAPOp::PromqlSubquery { child, .. } => has_window_func(child), _ => false, } } -async fn lower(q: &str) -> QueryExpr { +async fn lower(q: &str) -> Rc { lower_sql(q, &catalog(), AccuracyTarget::Exact) .await .unwrap_or_else(|e| panic!("expected {q:?} to lower, got error: {e}")) diff --git a/crates/frontend-sql/tests/maintained_population.rs b/crates/frontend-sql/tests/maintained_population.rs index a6347c4aa..285dfe942 100644 --- a/crates/frontend-sql/tests/maintained_population.rs +++ b/crates/frontend-sql/tests/maintained_population.rs @@ -2,17 +2,18 @@ use asap_aware_mapping::maintained_population::MaintainedPopulationStrategy; use asap_frontend_sql::{lower_sql, SqlCatalog}; use asap_types::{ - post_asap::{ - compile_post_asap_dag, - maintained_population::{MaintainedPopulation, PopulationInput}, - share_common_summary_sub_dags, SummaryExpr, ValueOperation, + ir::{ + apply_materialization_timings, cse::share_common_sub_dags, + export::compile_physical_asap_dag, ASAPOp, MaterializationAssignment, NonASAPOp, Operator, + OperatorNode, TimingMemo, }, - pre_asap::{DataType, Field, QueryExpr, Schema}, + post_asap::maintained_population::{MaintainedPopulation, PopulationInput}, + pre_asap::{DataType, Field, Schema}, types::AccuracyTarget, }; use std::rc::Rc; -async fn aggregate(q: &str) -> Rc { +async fn aggregate(q: &str) -> Rc { let catalog = SqlCatalog::new().with_table( "samples", Schema::new(vec![ @@ -20,38 +21,38 @@ async fn aggregate(q: &str) -> Rc { Field::plain("job", DataType::Utf8, false), ]), ); - let root = lower_sql(q, &catalog, AccuracyTarget::Exact).await.unwrap(); - Rc::new(root) + lower_sql(q, &catalog, AccuracyTarget::Exact).await.unwrap() } -fn population( - mut node: &asap_types::post_asap::SummaryNode, -) -> ( - &Rc, - &MaintainedPopulation, -) { - while let SummaryExpr::ValueOperation { - child, - operation: ValueOperation::Project { .. }, - .. - } = &node.expr - { +/// The `MaintainPopulation` node a candidate's evaluation reads, and its spec. +fn population(mut node: &OperatorNode) -> (&Rc, &MaintainedPopulation) { + while let Operator::NonASAP(NonASAPOp::Project { child, .. }) = &node.operator { node = child; } - let SummaryExpr::ValueOperation { child, .. } = &node.expr else { - panic!("readout") + let Operator::ASAP(ASAPOp::EvaluatePopulation { child, .. }) = &node.operator else { + panic!("evaluation") }; - let SummaryExpr::ValueOperation { - operation: ValueOperation::MaintainPopulation { population }, - .. - } = &child.expr - else { + let Operator::ASAP(ASAPOp::MaintainPopulation { population, .. }) = &child.operator else { panic!("state") }; (child, population) } -// Quantile parameters are readout identity, while source, value column and grouping are state identity. +/// Export `plan` the way the planner does: assign the default materialization +/// timings, then compile the timed DAG. +fn compile(plan: &Rc) -> Result<(), String> { + let timed = apply_materialization_timings( + plan, + &MaterializationAssignment::all_query_time(), + &mut TimingMemo::new(), + ) + .map_err(|e| e.to_string())?; + compile_physical_asap_dag(&timed) + .map(|_| ()) + .map_err(|e| e.to_string()) +} + +// Quantile parameters are evaluation identity, while source, value column and grouping are state identity. #[tokio::test] async fn sql_quantiles_share_rows_without_promql_lookback() { let roots = vec![ @@ -59,7 +60,7 @@ async fn sql_quantiles_share_rows_without_promql_lookback() { aggregate("SELECT approx_percentile_cont(latency, 0.99) FROM samples").await, ]; let rule = MaintainedPopulationStrategy::new(&roots); - let plans = share_common_summary_sub_dags( + let plans = share_common_sub_dags( roots .iter() .enumerate() @@ -67,7 +68,7 @@ async fn sql_quantiles_share_rows_without_promql_lookback() { .collect(), ); for (_, plan) in &plans { - compile_post_asap_dag(plan).unwrap(); + compile(plan).unwrap(); } let (a, spec) = population(&plans[0].1); let (b, _) = population(&plans[1].1); @@ -107,9 +108,9 @@ async fn sql_filters_separate_populations() { assert_ne!(population(&a).1.input, population(&b).1.input); } -// All four scalar readouts can share the same non-null numeric SQL population. +// All four scalar evaluations can share the same non-null numeric SQL population. #[tokio::test] -async fn sql_scalar_readouts_share_membership() { +async fn sql_scalar_evaluations_share_membership() { let mut roots = Vec::new(); for function in [ "median(latency)", @@ -120,7 +121,7 @@ async fn sql_scalar_readouts_share_membership() { roots.push(aggregate(&format!("SELECT {function} FROM samples")).await); } let rule = MaintainedPopulationStrategy::new(&roots); - let plans = share_common_summary_sub_dags( + let plans = share_common_sub_dags( roots .iter() .enumerate() @@ -128,27 +129,29 @@ async fn sql_scalar_readouts_share_membership() { .collect(), ); for (_, plan) in &plans { - compile_post_asap_dag(plan).unwrap(); + compile(plan).unwrap(); assert!(Rc::ptr_eq(population(&plans[0].1).0, population(plan).0)); } } -// A readout cannot reinterpret a label column as its numeric population. +// A evaluation cannot reinterpret a label column as its numeric population. #[tokio::test] async fn malformed_table_population_fails_validation() { let root = aggregate("SELECT median(latency) FROM samples").await; let rule = MaintainedPopulationStrategy::new(std::slice::from_ref(&root)); let mut candidate = rule.candidate(&root).unwrap(); - let SummaryExpr::ValueOperation { child, .. } = &mut Rc::make_mut(&mut candidate).expr else { + let Operator::NonASAP(NonASAPOp::Project { child, .. }) = + &mut Rc::make_mut(&mut candidate).operator + else { unreachable!() }; - let SummaryExpr::ValueOperation { child, .. } = &mut Rc::make_mut(child).expr else { + let Operator::ASAP(ASAPOp::EvaluatePopulation { child, .. }) = + &mut Rc::make_mut(child).operator + else { unreachable!() }; - let SummaryExpr::ValueOperation { - operation: ValueOperation::MaintainPopulation { population }, - .. - } = &mut Rc::make_mut(child).expr + let Operator::ASAP(ASAPOp::MaintainPopulation { population, .. }) = + &mut Rc::make_mut(child).operator else { unreachable!() }; @@ -156,7 +159,7 @@ async fn malformed_table_population_fails_validation() { unreachable!() }; *value_column = 1; - assert!(compile_post_asap_dag(&candidate).is_err()); + assert!(compile(&candidate).is_err()); } // SQL ORDER BY value DESC LIMIT k uses the same maximum-k state contract. @@ -167,7 +170,7 @@ async fn sql_topk_limits_share_maximum_k() { aggregate("SELECT * FROM samples ORDER BY latency DESC LIMIT 5").await, ]; let rule = MaintainedPopulationStrategy::new(&roots); - let plans = share_common_summary_sub_dags( + let plans = share_common_sub_dags( roots .iter() .enumerate() @@ -175,7 +178,7 @@ async fn sql_topk_limits_share_maximum_k() { .collect(), ); for (_, plan) in &plans { - compile_post_asap_dag(plan).unwrap(); + compile(plan).unwrap(); assert_eq!(population(plan).1.max_k, 5); assert!(Rc::ptr_eq(population(&plans[0].1).0, population(plan).0)); } @@ -187,7 +190,7 @@ async fn sql_topk_over_an_identity_select_list_is_recognized() { let root = aggregate("SELECT latency, job FROM samples ORDER BY latency DESC LIMIT 5").await; let rule = MaintainedPopulationStrategy::new(std::slice::from_ref(&root)); let plan = rule.candidate(&root).expect("SQL topk"); - compile_post_asap_dag(&plan).unwrap(); + compile(&plan).unwrap(); assert_eq!(population(&plan).1.max_k, 5); } diff --git a/crates/frontend-sql/tests/netflow/netflow.rs b/crates/frontend-sql/tests/netflow/netflow.rs index 22236b850..da680d664 100644 --- a/crates/frontend-sql/tests/netflow/netflow.rs +++ b/crates/frontend-sql/tests/netflow/netflow.rs @@ -4,9 +4,12 @@ //! aggregate over a netflow table, a time predicate, optional grouping, //! optional `ORDER BY`/`LIMIT`, plus the nested aggregate shape. +use std::rc::Rc; + use asap_frontend_sql::{lower_sql, SqlCatalog}; +use asap_types::ir::{NonASAPOp, OperatorNode}; use asap_types::pre_asap::schema::{DataType, Field, Schema}; -use asap_types::pre_asap::{AggIntent, GroupKeys, QueryExpr}; +use asap_types::pre_asap::{AggIntent, GroupKeys}; use asap_types::types::AccuracyTarget; const CORPUS: &str = include_str!("data/netflow.sql"); @@ -109,11 +112,10 @@ async fn netflow_sql_corpus_lowers_to_expected_intents() { ); for (idx, (query, expected)) in queries.iter().zip(EXPECTED).enumerate() { + // A successful `lower_sql` already derived every node's schema. let qe = lower_sql(query, &catalog(), AccuracyTarget::Exact) .await .unwrap_or_else(|err| panic!("q{} failed to lower:\n{query}\n{err}", idx + 1)); - qe.output_schema() - .unwrap_or_else(|err| panic!("q{} schema derivation failed: {err}", idx + 1)); assert!( has_scan_predicate(&qe), "q{} should retain the netflow time predicate on the Scan: {qe:?}", @@ -123,7 +125,7 @@ async fn netflow_sql_corpus_lowers_to_expected_intents() { } } -fn assert_expected(qe: &QueryExpr, expected: Expected, case_no: usize) { +fn assert_expected(qe: &Rc, expected: Expected, case_no: usize) { match expected { Expected::Quantile { q, by } => { let (actual_by, measures) = first_aggregate(qe).expect("expected Aggregate"); @@ -190,53 +192,58 @@ impl AggKind { } } -fn first_aggregate(qe: &QueryExpr) -> Option<(&GroupKeys, &Vec)> { - match qe { - QueryExpr::Aggregate { +/// The operator of a front-end node: a front-end DAG never holds an ASAP node. +fn op(node: &OperatorNode) -> &NonASAPOp { + node.expect_non_asap() +} + +fn first_aggregate(node: &OperatorNode) -> Option<(&GroupKeys, &Vec)> { + match op(node) { + NonASAPOp::Aggregate { reduction, measures, .. } => Some((reduction.expect_reduce(), measures)), - QueryExpr::Project { child, .. } - | QueryExpr::Filter { child, .. } - | QueryExpr::Dedup { child, .. } - | QueryExpr::Sort { child, .. } - | QueryExpr::Limit { child, .. } - | QueryExpr::PromqlSubquery { child, .. } => first_aggregate(child), + NonASAPOp::Project { child, .. } + | NonASAPOp::Filter { child, .. } + | NonASAPOp::Dedup { child, .. } + | NonASAPOp::Sort { child, .. } + | NonASAPOp::Limit { child, .. } + | NonASAPOp::PromqlSubquery { child, .. } => first_aggregate(child), _ => None, } } -fn has_scan_predicate(qe: &QueryExpr) -> bool { +fn has_scan_predicate(qe: &Rc) -> bool { any_node( qe, - |node| matches!(node, QueryExpr::Scan { predicates, .. } if !predicates.is_empty()), + |node| matches!(op(node), NonASAPOp::Scan { predicates, .. } if !predicates.is_empty()), ) } -fn has_topk(qe: &QueryExpr, k: usize) -> bool { +fn has_topk(qe: &Rc, k: usize) -> bool { any_node(qe, |node| { matches!( - node, - QueryExpr::Aggregate { measures, .. } + op(node), + NonASAPOp::Aggregate { measures, .. } if measures.iter().any(|agg| matches!(agg, AggIntent::TopK { k: actual, .. } if *actual == k)) ) }) } fn aggregate_by_with( - qe: &QueryExpr, + qe: &Rc, by: &'static [usize], pred: impl Fn(&AggIntent) -> bool, ) -> bool { let expected_by = GroupKeys::by(by.to_vec()); let mut found = false; visit(qe, &mut |node| { - if let QueryExpr::Aggregate { + if let NonASAPOp::Aggregate { reduction, measures, .. - } = node + } = op(node) { found |= *reduction.expect_reduce() == expected_by && measures.iter().any(&pred); } @@ -244,78 +251,26 @@ fn aggregate_by_with( found } -fn all_intents(qe: &QueryExpr) -> Vec { +fn all_intents(qe: &Rc) -> Vec { let mut intents = Vec::new(); visit(qe, &mut |node| { - if let QueryExpr::Aggregate { measures, .. } = node { + if let NonASAPOp::Aggregate { measures, .. } = op(node) { intents.extend(measures.iter().cloned()); } }); intents } -fn any_node(qe: &QueryExpr, pred: impl Fn(&QueryExpr) -> bool) -> bool { +fn any_node(qe: &Rc, pred: impl Fn(&OperatorNode) -> bool) -> bool { let mut found = false; visit(qe, &mut |node| found |= pred(node)); found } -fn visit(qe: &QueryExpr, f: &mut impl FnMut(&QueryExpr)) { - f(qe); - match qe { - QueryExpr::Project { child, .. } - | QueryExpr::Filter { child, .. } - | QueryExpr::Aggregate { child, .. } - | QueryExpr::TimeRange { child, .. } - | QueryExpr::Sort { child, .. } - | QueryExpr::Limit { child, .. } - | QueryExpr::PromqlSubquery { child, .. } - | QueryExpr::Dedup { child, .. } - | QueryExpr::SQLWindowFunc { child, .. } - | QueryExpr::PromqlRelabel { child, .. } - | QueryExpr::PromqlSeriesSample { child, .. } - | QueryExpr::TimeShift { child, .. } - | QueryExpr::PromqlInfoEnrich { child, .. } => visit(child, f), - QueryExpr::BinaryOp { lhs, rhs, .. } - | QueryExpr::Join { - left: lhs, - right: rhs, - .. - } - | QueryExpr::SetOp { - left: lhs, - right: rhs, - .. - } => { - visit(lhs, f); - visit(rhs, f); - } - QueryExpr::Concat { children, .. } => { - for child in children { - visit(child, f); - } - } - QueryExpr::PromqlVectorFromScalar(child) | QueryExpr::PromqlScalarFromVector(child) => { - visit(child, f) - } - QueryExpr::Scan { .. } - | QueryExpr::PromqlScalarBridge(_) - | QueryExpr::EvalTimestamp - | QueryExpr::CurrentTimestamp => {} - // Scalar expression variants (issue #205) aren't relational nodes; - // this visitor only walks the relational DAG, so stop here. - QueryExpr::Column(_) - | QueryExpr::Literal(_) - | QueryExpr::Compare { .. } - | QueryExpr::BoolAnd(_) - | QueryExpr::BoolOr(_) - | QueryExpr::Not(_) - | QueryExpr::IsNull(_) - | QueryExpr::IsNotNull(_) - | QueryExpr::Cast { .. } - | QueryExpr::InList { .. } - | QueryExpr::FunctionCall { .. } - | QueryExpr::Arithmetic { .. } - | QueryExpr::Case { .. } => {} +/// Every reachable operator node, parents before children — including the +/// operators referenced from scalar positions (subqueries). +fn visit(qe: &Rc, f: &mut impl FnMut(&OperatorNode)) { + for node in OperatorNode::reachable(qe) { + f(&node); } } diff --git a/crates/frontend-sql/tests/pearson_corr.rs b/crates/frontend-sql/tests/pearson_corr.rs index 618f6c38f..560da2b48 100644 --- a/crates/frontend-sql/tests/pearson_corr.rs +++ b/crates/frontend-sql/tests/pearson_corr.rs @@ -2,7 +2,11 @@ use std::rc::Rc; use asap_frontend_sql::{lower_sql, SqlCatalog}; -use asap_types::pre_asap::{AggIntent, DataType, Field, QueryExpr, Schema}; +use asap_types::ir::{ + apply_materialization_timings, export::compile_physical_asap_dag, MaterializationAssignment, + NonASAPOp, OperatorNode, ScalarExpr, TimingMemo, +}; +use asap_types::pre_asap::{AggIntent, DataType, Field, Schema}; use asap_types::types::AccuracyTarget; fn catalog() -> SqlCatalog { @@ -16,20 +20,20 @@ fn catalog() -> SqlCatalog { .with_table("b", schema) } -async fn lower(sql: &str) -> QueryExpr { +async fn lower(sql: &str) -> Rc { lower_sql(sql, &catalog(), AccuracyTarget::Exact) .await .unwrap() } -fn aggregate(query: &QueryExpr) -> (&[AggIntent], &QueryExpr) { - match query { - QueryExpr::Aggregate { +fn aggregate(query: &OperatorNode) -> (&[AggIntent], &OperatorNode) { + match query.expect_non_asap() { + NonASAPOp::Aggregate { measures, child, .. } => (measures, child), - QueryExpr::Project { child, .. } - | QueryExpr::Filter { child, .. } - | QueryExpr::Sort { child, .. } => aggregate(child), + NonASAPOp::Project { child, .. } + | NonASAPOp::Filter { child, .. } + | NonASAPOp::Sort { child, .. } => aggregate(child), other => panic!("expected aggregate, got {other:?}"), } } @@ -46,17 +50,14 @@ async fn corr_materializes_both_arguments() { let query = lower(sql).await; let (measures, child) = aggregate(&query); assert_eq!(measures, &[AggIntent::PearsonCorr { left: 0, right: 1 }]); - let QueryExpr::Project { cols, .. } = child else { + let NonASAPOp::Project { cols, .. } = child.expect_non_asap() else { panic!("derived inputs") }; assert_eq!(cols.len(), 2); assert!(cols .iter() - .any(|col| !matches!(col.expr, QueryExpr::Column(_)))); - assert_eq!( - query.output_schema().unwrap().fields[0].dtype, - DataType::Float64 - ); + .any(|col| !matches!(col.expr, ScalarExpr::Column(_)))); + assert_eq!(query.schema.fields[0].dtype, DataType::Float64); } } @@ -66,11 +67,11 @@ async fn corr_preserves_qualified_join_inputs() { let query = lower("SELECT corr(a.x, b.x) FROM a JOIN b ON a.g = b.g").await; let (measures, child) = aggregate(&query); assert_eq!(measures[0].input_cols(), vec![0, 1]); - let QueryExpr::Project { cols, .. } = child else { + let NonASAPOp::Project { cols, .. } = child.expect_non_asap() else { panic!("paired projection") }; - assert_eq!(cols[0].expr, QueryExpr::Column(0)); - assert_eq!(cols[1].expr, QueryExpr::Column(3)); + assert_eq!(cols[0].expr, ScalarExpr::Column(0)); + assert_eq!(cols[1].expr, ScalarExpr::Column(3)); } // Grouping and sibling reducers cannot drop either correlation argument. @@ -82,12 +83,12 @@ async fn corr_coexists_with_grouping_having_and_other_measures() { .iter() .find(|m| matches!(m, AggIntent::PearsonCorr { .. })) .unwrap(); - let schema = child.output_schema().unwrap(); + let schema = &child.schema; for id in pair.input_cols() { assert!(id < schema.fields.len()); } assert!(measures.iter().any(|m| matches!(m, AggIntent::Sum { .. }))); - let output = query.output_schema().unwrap(); + let output = &query.schema; assert_eq!(output.fields[1].name, "r"); assert_eq!(output.fields[1].dtype, DataType::Float64); assert!(output.fields[1].nullable); @@ -99,8 +100,8 @@ async fn corr_repeated_input_and_serialization() { let query = lower("SELECT corr(x, x) FROM a").await; assert_eq!(aggregate(&query).0[0].input_cols(), vec![0, 0]); let encoded = serde_json::to_string(&query).unwrap(); - let decoded: QueryExpr = serde_json::from_str(&encoded).unwrap(); - assert_eq!(query, decoded); + let decoded: OperatorNode = serde_json::from_str(&encoded).unwrap(); + assert_eq!(*query, decoded); } // Unsupported modifiers and window calls fail instead of silently changing semantics. @@ -128,10 +129,10 @@ async fn corr_filter_is_a_measure_filter() { let query = lower("SELECT corr(x, y) FILTER (WHERE g > 0) FROM a").await; let (measures, _) = aggregate(&query); assert_eq!(measures[0].input_cols(), vec![0, 1]); - fn filters(query: &QueryExpr) -> &[Option] { - match query { - QueryExpr::Aggregate { filters, .. } => filters, - QueryExpr::Project { child, .. } | QueryExpr::Filter { child, .. } => filters(child), + fn filters(query: &OperatorNode) -> &[Option] { + match query.expect_non_asap() { + NonASAPOp::Aggregate { filters, .. } => filters, + NonASAPOp::Project { child, .. } | NonASAPOp::Filter { child, .. } => filters(child), other => panic!("expected aggregate, got {other:?}"), } } @@ -145,12 +146,17 @@ async fn corr_filter_is_a_measure_filter() { // Exact fallback retains the complete typed query and compiles to a post-ASAP DAG. #[tokio::test] async fn corr_survives_exact_plan_compilation() { - let query = Rc::new(lower("SELECT corr(x, y) AS r FROM a").await); - let plan = asap_aware_mapping::replacement::keep_pre_asap(&query).unwrap(); + let query = lower("SELECT corr(x, y) AS r FROM a").await; + let plan = asap_aware_mapping::replacement::retain_exact(&query).unwrap(); assert!(plan.guarantee.as_ref().unwrap().is_exact()); - let asap_types::post_asap::SummaryExpr::KeepPreAsap(retained) = &plan.expr else { - panic!("expected exact fallback"); - }; - assert_eq!(aggregate(retained).0, aggregate(&query).0); - asap_types::post_asap::compile_post_asap_dag(&plan).unwrap(); + // The exact fallback is the query's own operator DAG, no ASAP node added. + assert!(!plan.contains_asap(), "expected exact fallback"); + assert_eq!(aggregate(&plan).0, aggregate(&query).0); + let timed = apply_materialization_timings( + &plan, + &MaterializationAssignment::all_query_time(), + &mut TimingMemo::new(), + ) + .unwrap(); + compile_physical_asap_dag(&timed).unwrap(); } diff --git a/crates/frontend-sql/tests/sql_lowering.rs b/crates/frontend-sql/tests/sql_lowering.rs index bac54c54d..8e88d0742 100644 --- a/crates/frontend-sql/tests/sql_lowering.rs +++ b/crates/frontend-sql/tests/sql_lowering.rs @@ -1,15 +1,24 @@ -//! End-to-end SQL → unresolved → canonical DAG lowering tests (positional IR). +//! End-to-end SQL → unresolved → resolved operator DAG lowering tests. //! //! Validates the DataFusion front end: SQL parses + plans, lowers directly to -//! the canonical, unresolved shape (`QueryExpr`, issue #179), and -//! the shared `resolve_root` produces the positional, resolved canonical -//! DAG (the same resolver the PromQL path uses). - -use asap_frontend_sql::{lower_sql, lower_sql_dialect, SqlCatalog, SqlError as LoweringError}; +//! the name-based `UnresolvedOp` tree (issue #179), and the shared +//! `resolve_root` produces the positional, canonical `OperatorNode` DAG (the +//! same resolver the PromQL path uses). Every node's schema is derived during +//! resolution, so a successful `lower` already proves schema derivation is +//! total over the tree. + +use asap_types::ir::Predicate; +use std::rc::Rc; + +use asap_frontend_common::{UnresolvedOp, UnresolvedScalar}; +use asap_frontend_sql::{ + lower_sql, lower_sql_dialect, SqlCatalog, SqlError as LoweringError, SqlLowerer, +}; +use asap_types::ir::{ExprSemantics, NonASAPOp, OperatorNode, ScalarExpr}; use asap_types::pre_asap::schema::{DataType, Field, FieldDataType, Schema}; use asap_types::pre_asap::{ - AggIntent, CompareOpKind, GroupKeys, JoinKind, Predicate, QueryExpr, Reduction, ScalarValue, - Source, WindowFrameBound, WindowFrameOffset, WindowFrameUnits, WindowFuncKind, + AggIntent, CompareOpKind, GroupKeys, JoinKind, Reduction, ScalarValue, Source, + WindowFrameBound, WindowFrameOffset, WindowFrameUnits, WindowFuncKind, }; use asap_types::types::AccuracyTarget; use asap_types::workload::SqlDialect; @@ -43,37 +52,21 @@ fn catalog() -> SqlCatalog { ) } -async fn lower(sql: &str) -> QueryExpr { +async fn lower(sql: &str) -> Rc { lower_sql(sql, &catalog(), AccuracyTarget::Exact) .await .unwrap_or_else(|e| panic!("lower failed for {sql:?}: {e}")) } +/// The operator of a front-end node: a front-end DAG never holds an ASAP node. +fn op(node: &OperatorNode) -> &NonASAPOp { + node.expect_non_asap() +} + #[tokio::test] -async fn planning_subquery_bridge_reuses_canonical_promql_subquery() { - let query = lower( - "SELECT max(value) FROM (\ - SELECT asap_promql_subquery(21600000, 60000) AS value FROM (\ - SELECT sum(bytes) AS value FROM metrics))", - ) - .await; - let QueryExpr::Project { child, .. } = query else { - panic!("expected outer SQL projection"); - }; - let QueryExpr::Aggregate { child, .. } = child.as_ref() else { - panic!("expected outer max aggregate, got {child:?}"); - }; - let QueryExpr::PromqlSubquery { - range, - resolution, - child, - } = child.as_ref() - else { - panic!("expected canonical subquery bridge, got {child:?}"); - }; - assert_eq!(*range, std::time::Duration::from_secs(6 * 60 * 60)); - assert_eq!(*resolution, Some(std::time::Duration::from_secs(60))); - assert!(matches!(child.as_ref(), QueryExpr::Project { .. })); +async fn planning_subquery_bridge_rejects_a_relation_without_vector_conversion() { + let result = lower_sql("SELECT max(value) FROM (SELECT asap_promql_subquery(21600000, 60000) AS value FROM (SELECT sum(bytes) AS value FROM metrics))", &catalog(), AccuracyTarget::Exact).await; + assert!(result.is_err()); } #[tokio::test] @@ -83,12 +76,12 @@ async fn planning_histogram_bridge_reuses_classic_bucket_intent() { SELECT service AS le, sum(bytes) AS value FROM metrics GROUP BY service)", ) .await; - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, measures, child, .. - } = query + } = op(&query) else { panic!("expected canonical histogram aggregate"); }; @@ -98,7 +91,7 @@ async fn planning_histogram_bridge_reuses_classic_bucket_intent() { measures.as_slice(), [AggIntent::HistogramQuantile { q, le: 0 }] if (*q - 0.95).abs() < 1e-12 )); - assert!(matches!(child.as_ref(), QueryExpr::Project { .. })); + assert!(matches!(op(child), NonASAPOp::Project { .. })); } #[tokio::test] @@ -134,31 +127,31 @@ async fn planning_relation_bridges_reject_ambiguous_shapes() { } /// Find the first `Aggregate` node along the single-child spine. -fn find_aggregate(qe: &QueryExpr) -> Option<(&GroupKeys, &Vec)> { - match qe { - QueryExpr::Aggregate { +fn find_aggregate(node: &OperatorNode) -> Option<(&GroupKeys, &Vec)> { + match op(node) { + NonASAPOp::Aggregate { reduction, measures, .. } => Some((reduction.expect_reduce(), measures)), - QueryExpr::Project { child, .. } - | QueryExpr::Filter { child, .. } - | QueryExpr::Dedup { child, .. } - | QueryExpr::Sort { child, .. } - | QueryExpr::Limit { child, .. } - | QueryExpr::PromqlSubquery { child, .. } => find_aggregate(child), + NonASAPOp::Project { child, .. } + | NonASAPOp::Filter { child, .. } + | NonASAPOp::Dedup { child, .. } + | NonASAPOp::Sort { child, .. } + | NonASAPOp::Limit { child, .. } + | NonASAPOp::PromqlSubquery { child, .. } => find_aggregate(child), _ => None, } } /// The first `Aggregate` node itself, for tests that need its child. -fn find_aggregate_node(qe: &QueryExpr) -> Option<&QueryExpr> { - match qe { - QueryExpr::Aggregate { .. } => Some(qe), - QueryExpr::Project { child, .. } - | QueryExpr::Filter { child, .. } - | QueryExpr::Sort { child, .. } - | QueryExpr::Limit { child, .. } => find_aggregate_node(child), +fn find_aggregate_node(node: &OperatorNode) -> Option<&OperatorNode> { + match op(node) { + NonASAPOp::Aggregate { .. } => Some(node), + NonASAPOp::Project { child, .. } + | NonASAPOp::Filter { child, .. } + | NonASAPOp::Sort { child, .. } + | NonASAPOp::Limit { child, .. } => find_aggregate_node(child), _ => None, } } @@ -166,47 +159,47 @@ fn find_aggregate_node(qe: &QueryExpr) -> Option<&QueryExpr> { /// The names of the columns the first `Aggregate`'s reducers read, resolved /// against its child's schema, plus whether that child is a materializing /// `Project` (issue #110). -fn reducer_input_names(qe: &QueryExpr) -> (Vec, bool) { - let QueryExpr::Aggregate { +fn reducer_input_names(node: &OperatorNode) -> (Vec, bool) { + let NonASAPOp::Aggregate { measures, child, .. - } = find_aggregate_node(qe).expect("expected an Aggregate") + } = op(find_aggregate_node(node).expect("expected an Aggregate")) else { unreachable!() }; - let schema = child.output_schema().expect("child schema"); + let schema = &child.schema; let names = measures .iter() .flat_map(|a| a.input_cols()) .map(|id| schema.fields[id].name.clone()) .collect(); - (names, matches!(**child, QueryExpr::Project { .. })) + (names, matches!(op(child), NonASAPOp::Project { .. })) } /// Find the first `Join` node along the single-child spine. -fn find_join(qe: &QueryExpr) -> Option<&QueryExpr> { - match qe { - QueryExpr::Join { .. } => Some(qe), - QueryExpr::Project { child, .. } - | QueryExpr::Filter { child, .. } - | QueryExpr::Aggregate { child, .. } - | QueryExpr::Dedup { child, .. } - | QueryExpr::Sort { child, .. } - | QueryExpr::Limit { child, .. } - | QueryExpr::PromqlSubquery { child, .. } => find_join(child), +fn find_join(node: &OperatorNode) -> Option<&OperatorNode> { + match op(node) { + NonASAPOp::Join { .. } => Some(node), + NonASAPOp::Project { child, .. } + | NonASAPOp::Filter { child, .. } + | NonASAPOp::Aggregate { child, .. } + | NonASAPOp::Dedup { child, .. } + | NonASAPOp::Sort { child, .. } + | NonASAPOp::Limit { child, .. } + | NonASAPOp::PromqlSubquery { child, .. } => find_join(child), _ => None, } } /// The first `Filter` node along the single-child spine. -fn find_filter(qe: &QueryExpr) -> Option<&QueryExpr> { - match qe { - QueryExpr::Filter { .. } => Some(qe), - QueryExpr::Project { child, .. } - | QueryExpr::Aggregate { child, .. } - | QueryExpr::Dedup { child, .. } - | QueryExpr::Sort { child, .. } - | QueryExpr::Limit { child, .. } - | QueryExpr::PromqlSubquery { child, .. } => find_filter(child), +fn find_filter(node: &OperatorNode) -> Option<&OperatorNode> { + match op(node) { + NonASAPOp::Filter { .. } => Some(node), + NonASAPOp::Project { child, .. } + | NonASAPOp::Aggregate { child, .. } + | NonASAPOp::Dedup { child, .. } + | NonASAPOp::Sort { child, .. } + | NonASAPOp::Limit { child, .. } + | NonASAPOp::PromqlSubquery { child, .. } => find_filter(child), _ => None, } } @@ -215,14 +208,14 @@ fn find_filter(qe: &QueryExpr) -> Option<&QueryExpr> { async fn where_folds_predicate_onto_scan() { // WHERE folds onto the Scan predicates, below the SELECT projection. let qe = lower("SELECT * FROM metrics WHERE service = 'api'").await; - let QueryExpr::Project { child, .. } = &qe else { + let NonASAPOp::Project { child, .. } = op(&qe) else { panic!("expected Project at root, got {qe:?}"); }; - let QueryExpr::Scan { + let NonASAPOp::Scan { source, predicates, schema, - } = child.as_ref() + } = op(child) else { panic!("expected Scan under the projection, got {child:?}"); }; @@ -257,9 +250,7 @@ async fn projection_over_aggregate_resolves_output_types_via_output_names() { // onto the canonical Aggregate so the Project resolves real types — not // the Utf8 fallback that an unresolved column would get. let qe = lower("SELECT SUM(bytes), AVG(latency) FROM metrics").await; - let schema = qe - .output_schema() - .expect("root projection schema derivation"); + let schema = &qe.schema; assert_eq!(schema.fields.len(), 2); assert_eq!( schema.fields[0].dtype, @@ -287,7 +278,7 @@ async fn single_agg_group_by_keeps_key_in_output_schema() { )); // Both the group key and the aggregate resolve in the root projection schema. - let schema = qe.output_schema().expect("root projection schema"); + let schema = &qe.schema; assert_eq!(schema.fields.len(), 2); assert_eq!( schema.fields[0].dtype, @@ -318,7 +309,7 @@ async fn count_ranked_topk_is_heavy_hitter() { "count-ranked topk → heavy-hitter TopK, got {measures:?}" ); // The inner child is the explicit Count, grouped by service (col 1). - let QueryExpr::Aggregate { child, .. } = &qe else { + let NonASAPOp::Aggregate { child, .. } = op(&qe) else { panic!("expected outer Aggregate, got {qe:?}"); }; let (inner_by, inner_measures) = find_aggregate(child).expect("expected inner Count aggregate"); @@ -429,7 +420,7 @@ async fn select_distinct_lowers_to_distinct_with_positional_cols() { // (not name-based ColumnRefs). DataFusion's `Distinct::All` dedups on every // column, so `cols` is empty here — but the field type is now `Vec`. let qe = lower("SELECT DISTINCT service FROM metrics").await; - let QueryExpr::Dedup { cols, .. } = &qe else { + let NonASAPOp::Dedup { cols, .. } = op(&qe) else { panic!("expected a Dedup at the root, got {qe:?}"); }; let _: &Vec = cols; // compile-time: positional ids, not ColumnRefs @@ -444,34 +435,35 @@ async fn inner_join_lowers_to_join_over_two_scans() { FROM metrics JOIN hosts ON metrics.service = hosts.service", ) .await; - let join = find_join(&qe).expect("expected a Join in the DAG"); - let QueryExpr::Join { + let join = find_join(&qe).expect("expected a Join in the tree"); + let NonASAPOp::Join { kind, left, right, .. - } = join + } = op(join) else { unreachable!("find_join only returns Join"); }; assert_eq!(*kind, JoinKind::Inner); - assert!(matches!(left.as_ref(), QueryExpr::Scan { .. })); - assert!(matches!(right.as_ref(), QueryExpr::Scan { .. })); + assert!(matches!(op(left), NonASAPOp::Scan { .. })); + assert!(matches!(op(right), NonASAPOp::Scan { .. })); } /// The two `ColumnId`s an equijoin predicate `Column(l) = Column(r)` binds to, /// returned sorted so the assertion is independent of left/right ordering. -fn join_eq_columns(join: &QueryExpr) -> [usize; 2] { - let QueryExpr::Join { pred, .. } = join else { +fn join_eq_columns(join: &OperatorNode) -> [usize; 2] { + let NonASAPOp::Join { pred, .. } = op(join) else { unreachable!("expected a Join"); }; - let QueryExpr::Compare { + let ScalarExpr::Compare { left, op: CompareOpKind::Eq, right, - } = pred.0.as_ref() + .. + } = &pred.0 else { panic!("expected an equijoin Compare, got {:?}", pred.0); }; match (left.as_ref(), right.as_ref()) { - (QueryExpr::Column(l), QueryExpr::Column(r)) => { + (ScalarExpr::Column(l), ScalarExpr::Column(r)) => { let mut cols = [*l, *r]; cols.sort_unstable(); cols @@ -570,12 +562,12 @@ async fn qualified_where_over_join_resolves_to_right_side() { ) .await; let filter = find_filter(&qe).expect("expected a Filter over the join"); - let QueryExpr::Filter { pred, .. } = filter else { + let NonASAPOp::Filter { pred, .. } = op(filter) else { unreachable!("find_filter only returns Filter"); }; assert!( - matches!(pred.0.as_ref(), QueryExpr::Compare { left, op: CompareOpKind::Eq, .. } - if matches!(left.as_ref(), QueryExpr::Column(4))), + matches!(&pred.0, ScalarExpr::Compare { left, op: CompareOpKind::Eq, .. } + if matches!(left.as_ref(), ScalarExpr::Column(4))), "hosts.service must bind to concatenated position 4 (not the first `service`), got {:?}", pred.0 ); @@ -639,20 +631,24 @@ async fn aggregate_over_join_binds_against_concatenated_schema() { } // ── Issue #111: IN / EXISTS subquery predicates become semi / anti joins ──── +// +// The front end now leaves them as `UnresolvedScalar::{InSubquery, Exists}` +// filter conjuncts; the shared `canonicalize` pass (run by `resolve_root`) +// lowers each to the semi-/anti-join, so the resolved DAG a test sees is the +// same join shape the front end used to emit directly. /// The first `Join` node's `(kind, predicate, left column count)`. -fn join_parts(qe: &QueryExpr) -> (&JoinKind, &QueryExpr, usize) { - let QueryExpr::Join { +fn join_parts(node: &OperatorNode) -> (&JoinKind, &ScalarExpr, usize) { + let NonASAPOp::Join { kind, pred, left, right: _, - } = find_join(qe).expect("expected a Join") + } = op(find_join(node).expect("expected a Join")) else { unreachable!() }; - let left_len = left.output_schema().expect("left schema").fields.len(); - (kind, pred.0.as_ref(), left_len) + (kind, &pred.0, left.schema.fields.len()) } #[tokio::test] @@ -667,14 +663,15 @@ async fn in_subquery_lowers_to_a_semi_join() { // The predicate resolves against `left ++ right`. Both relations have a // `service` column, so a name-based lookup would bind *both* sides to the // left's — silently making this `service = service`, always true. The key is - // projected under a synthetic name to make that impossible. - let QueryExpr::Compare { left, right, .. } = pred else { + // bound positionally to the subquery's column (right after the left's), + // which makes that impossible. + let ScalarExpr::Compare { left, right, .. } = pred else { panic!("expected a comparison, got {pred:?}"); }; - assert_eq!(**left, QueryExpr::Column(1), "outer service"); + assert_eq!(**left, ScalarExpr::Column(1), "outer service"); assert_eq!( **right, - QueryExpr::Column(left_len), + ScalarExpr::Column(left_len), "the subquery key, not the outer column again" ); } @@ -685,20 +682,14 @@ async fn a_semi_join_outputs_only_the_left_schema() { let qe = lower("SELECT service FROM metrics WHERE service IN (SELECT service FROM hosts)").await; let join = find_join(&qe).expect("expected a Join"); - let names: Vec<_> = join - .output_schema() - .expect("join schema") - .fields - .iter() - .map(|c| c.name.clone()) - .collect(); + let names: Vec<_> = join.schema.fields.iter().map(|c| c.name.clone()).collect(); assert_eq!(names, ["ts", "service", "latency", "bytes"]); } #[tokio::test] async fn a_subquery_key_that_is_an_expression_still_binds() { - // `SELECT bytes + 1 …` has no column name of its own; it is projected under - // the synthetic key rather than becoming an unreferenceable `col_0`. + // `SELECT bytes + 1 …` has no column name of its own; the join key binds + // to it positionally rather than through an unreferenceable `col_0`. let qe = lower("SELECT service FROM metrics WHERE bytes IN (SELECT bytes + 1 FROM metrics)").await; assert_eq!(join_parts(&qe).0, &JoinKind::Semi); @@ -728,13 +719,13 @@ async fn an_ordinary_conjunct_still_folds_onto_the_scan() { AND service IN (SELECT service FROM hosts)", ) .await; - fn scan_has_predicate(qe: &QueryExpr) -> bool { - match qe { - QueryExpr::Scan { predicates, .. } => !predicates.is_empty(), - QueryExpr::Project { child, .. } - | QueryExpr::Filter { child, .. } - | QueryExpr::Aggregate { child, .. } => scan_has_predicate(child), - QueryExpr::Join { left, right, .. } => { + fn scan_has_predicate(node: &OperatorNode) -> bool { + match op(node) { + NonASAPOp::Scan { predicates, .. } => !predicates.is_empty(), + NonASAPOp::Project { child, .. } + | NonASAPOp::Filter { child, .. } + | NonASAPOp::Aggregate { child, .. } => scan_has_predicate(child), + NonASAPOp::Join { left, right, .. } => { scan_has_predicate(left) || scan_has_predicate(right) } _ => false, @@ -748,16 +739,16 @@ async fn an_ordinary_conjunct_still_folds_onto_the_scan() { } /// Find the first `SQLWindowFunc` node along the single-child spine. -fn find_windowfunc(qe: &QueryExpr) -> Option<&QueryExpr> { - match qe { - QueryExpr::SQLWindowFunc { .. } => Some(qe), - QueryExpr::Project { child, .. } - | QueryExpr::Filter { child, .. } - | QueryExpr::Aggregate { child, .. } - | QueryExpr::Dedup { child, .. } - | QueryExpr::Sort { child, .. } - | QueryExpr::Limit { child, .. } - | QueryExpr::PromqlSubquery { child, .. } => find_windowfunc(child), +fn find_windowfunc(node: &OperatorNode) -> Option<&OperatorNode> { + match op(node) { + NonASAPOp::SQLWindowFunc { .. } => Some(node), + NonASAPOp::Project { child, .. } + | NonASAPOp::Filter { child, .. } + | NonASAPOp::Aggregate { child, .. } + | NonASAPOp::Dedup { child, .. } + | NonASAPOp::Sort { child, .. } + | NonASAPOp::Limit { child, .. } + | NonASAPOp::PromqlSubquery { child, .. } => find_windowfunc(child), _ => None, } } @@ -771,12 +762,12 @@ async fn window_function_lowers_to_positional_windowfunc() { ) .await; let win = find_windowfunc(&qe).expect("expected a SQLWindowFunc node"); - let QueryExpr::SQLWindowFunc { + let NonASAPOp::SQLWindowFunc { func, partition_by, order_by, .. - } = win + } = op(win) else { unreachable!("find_windowfunc only returns SQLWindowFunc"); }; @@ -785,14 +776,14 @@ async fn window_function_lowers_to_positional_windowfunc() { assert_eq!(order_by.len(), 1); assert_eq!( order_by[0].expr, - QueryExpr::Column(3), + ScalarExpr::Column(3), "ORDER BY bytes → col 3" ); assert!(!order_by[0].ascending, "DESC"); // The window output column is appended to the schema (Int64 for ROW_NUMBER), // and the enclosing projection resolves it (output_name threading). - let schema = qe.output_schema().expect("root schema"); + let schema = &qe.schema; assert!( schema.fields.iter().any(|c| c.dtype == DataType::Int64), "row_number output column present, got {:?}", @@ -804,11 +795,11 @@ async fn window_function_lowers_to_positional_windowfunc() { async fn window_aggregate_lowers_to_windowfunc() { let qe = lower("SELECT service, SUM(bytes) OVER (PARTITION BY service) FROM metrics").await; let win = find_windowfunc(&qe).expect("expected a SQLWindowFunc node"); - let QueryExpr::SQLWindowFunc { func, args, .. } = win else { + let NonASAPOp::SQLWindowFunc { func, args, .. } = op(win) else { unreachable!(); }; assert_eq!(*func, WindowFuncKind::Sum); - assert_eq!(args, &vec![QueryExpr::Column(3)], "SUM(bytes) → arg col 3"); + assert_eq!(args, &vec![ScalarExpr::Column(3)], "SUM(bytes) → arg col 3"); } // ── Window frames (issue #268) ─────────────────────────────────────────────── @@ -832,8 +823,8 @@ async fn window_frame_is_captured_not_dropped() { ) .await; - let frame_of = |qe: &QueryExpr| { - let QueryExpr::SQLWindowFunc { frame, .. } = find_windowfunc(qe).unwrap() else { + let frame_of = |node: &OperatorNode| { + let NonASAPOp::SQLWindowFunc { frame, .. } = op(find_windowfunc(node).unwrap()) else { unreachable!(); }; frame @@ -873,9 +864,9 @@ async fn range_interval_frame_is_preserved() { RANGE BETWEEN INTERVAL '1' HOUR PRECEDING AND CURRENT ROW) FROM metrics", ) .await; - let QueryExpr::SQLWindowFunc { + let NonASAPOp::SQLWindowFunc { frame: Some(frame), .. - } = find_windowfunc(&qe).unwrap() + } = op(find_windowfunc(&qe).unwrap()) else { panic!("expected a window function with a concrete frame"); }; @@ -905,10 +896,10 @@ async fn range_numeric_frames_remain_scalar_offsets() { ) .await; - let start_bound = |qe: &QueryExpr| { - let QueryExpr::SQLWindowFunc { + let start_bound = |node: &OperatorNode| { + let NonASAPOp::SQLWindowFunc { frame: Some(frame), .. - } = find_windowfunc(qe).unwrap() + } = op(find_windowfunc(node).unwrap()) else { panic!("expected a window function with a concrete frame"); }; @@ -943,43 +934,17 @@ async fn groups_frame_is_rejected() { // ── Nested query functions: derived tables / inline views (issue #27) ─────────── -/// Collect every `AggIntent` in the DAG, root-to-leaf. -fn all_intents(qe: &QueryExpr) -> Vec { - let mut out = Vec::new(); - fn go(qe: &QueryExpr, out: &mut Vec) { - match qe { - QueryExpr::Aggregate { - measures, child, .. - } => { - out.extend(measures.iter().cloned()); - go(child, out); - } - QueryExpr::Project { child, .. } - | QueryExpr::Filter { child, .. } - | QueryExpr::Dedup { child, .. } - | QueryExpr::Sort { child, .. } - | QueryExpr::Limit { child, .. } - | QueryExpr::SQLWindowFunc { child, .. } - | QueryExpr::PromqlSubquery { child, .. } => go(child, out), - QueryExpr::BinaryOp { lhs, rhs, .. } - | QueryExpr::Join { - left: lhs, - right: rhs, - .. - } - | QueryExpr::SetOp { - left: lhs, - right: rhs, - .. - } => { - go(lhs, out); - go(rhs, out); - } - _ => {} - } - } - go(qe, &mut out); - out +/// Collect every `AggIntent` in the DAG, root-to-leaf (every reachable node, +/// including operators referenced from scalar positions). +fn all_intents(root: &Rc) -> Vec { + OperatorNode::reachable(root) + .iter() + .filter_map(|node| match op(node) { + NonASAPOp::Aggregate { measures, .. } => Some(measures.clone()), + _ => None, + }) + .flatten() + .collect() } #[tokio::test] @@ -1002,9 +967,9 @@ async fn derived_table_aggregate_over_aggregate_nests() { intents.iter().any(|i| matches!(i, AggIntent::Sum { .. })), "inner SUM survives, got {intents:?}" ); - // The whole nested DAG's output schema derives without error (positional - // resolution is total across the derived-table boundary). - assert_eq!(qe.output_schema().unwrap().fields.len(), 1); + // The whole nested tree's output schema derives (positional resolution + // is total across the derived-table boundary). + assert_eq!(qe.schema.fields.len(), 1); } #[tokio::test] @@ -1042,26 +1007,23 @@ async fn filter_over_derived_aggregate_resolves_alias_column() { assert!(all_intents(&qe) .iter() .any(|i| matches!(i, AggIntent::Sum { .. }))); - // Schema derivation is total across the boundary. - let _ = qe.output_schema().expect("nested schema derivation"); + // Schema derivation is total across the boundary: the root carries one. + assert_eq!(qe.schema.fields.len(), 2); } #[tokio::test] -async fn scalar_subquery_in_predicate_is_rejected() { - // A subquery-*valued* expression (`x > (SELECT …)`) needs a subquery node in - // the unresolved expression IR (and a correlated/uncorrelated decision); - // rejected cleanly until that lands. Derived tables in FROM (the common nesting - // shape) ARE supported — see the tests above. - let res = lower_sql( - "SELECT service FROM metrics WHERE bytes > (SELECT AVG(bytes) FROM metrics)", - &catalog(), - AccuracyTarget::Exact, - ) - .await; +async fn scalar_subquery_in_predicate_lowers_through_a_cross_join() { + let qe = + lower("SELECT service FROM metrics WHERE bytes > (SELECT AVG(bytes) FROM metrics)").await; + let filter = find_filter(&qe).unwrap(); + let NonASAPOp::Filter { pred, child } = op(filter) else { + panic!() + }; + assert!(matches!(op(child), NonASAPOp::Scan { .. })); assert!( - res.is_err(), - "scalar subquery in predicate should be rejected" + matches!(&pred.0,ScalarExpr::Compare { right,.. } if matches!(right.as_ref(),ScalarExpr::ScalarSubquery(_))) ); + qe.validate_structure().unwrap(); } #[tokio::test] @@ -1077,15 +1039,15 @@ async fn correlated_exists_lifts_its_correlation_into_the_join() { .await; let (kind, pred, left_len) = join_parts(&qe); assert_eq!(kind, &JoinKind::Semi); - let QueryExpr::Compare { left, right, .. } = pred else { + let ScalarExpr::Compare { left, right, .. } = pred else { panic!("expected the correlation as a comparison, got {pred:?}"); }; assert_eq!( **left, - QueryExpr::Column(left_len), + ScalarExpr::Column(left_len), "h.service (right side)" ); - assert_eq!(**right, QueryExpr::Column(1), "m.service (left side)"); + assert_eq!(**right, ScalarExpr::Column(1), "m.service (left side)"); } #[tokio::test] @@ -1104,24 +1066,62 @@ async fn an_uncorrelated_exists_is_an_unconditional_semi_join() { let qe = lower("SELECT service FROM metrics WHERE EXISTS (SELECT 1 FROM hosts)").await; let (kind, pred, _) = join_parts(&qe); assert_eq!(kind, &JoinKind::Semi); - assert_eq!(*pred, QueryExpr::Literal(ScalarValue::Boolean(true))); + assert_eq!(*pred, ScalarExpr::Literal(ScalarValue::Boolean(true))); } #[tokio::test] -async fn not_in_subquery_is_rejected_rather_than_mislowered_as_an_anti_join() { - // `NOT IN` is *not* an anti-join. Under three-valued logic a single NULL - // among the subquery's rows makes `c NOT IN (…)` UNKNOWN for every `c`, so - // the query returns nothing — while an anti-join returns every unmatched - // left row. Rejecting is the only correct option until the nullability is - // proven, and `NOT EXISTS` is the safe spelling. - let err = lower_sql( - "SELECT service FROM metrics WHERE service NOT IN (SELECT service FROM hosts)", - &catalog(), - AccuracyTarget::Exact, +async fn where_exists_resolves_to_a_semi_join_over_the_subquery() { + // The front end emits `Filter { Exists(s) }`; the resolved DAG is the + // `Semi` join with the subquery (a filtered `hosts` scan) on the right. + let qe = lower( + "SELECT service FROM metrics WHERE EXISTS (SELECT service FROM hosts WHERE region = 'eu')", ) - .await - .expect_err("NOT IN must not lower to an anti-join"); - assert!(format!("{err}").contains("NOT IN"), "got {err}"); + .await; + let NonASAPOp::Project { child, .. } = op(&qe) else { + panic!("expected the SELECT list as a Project, got {qe:?}"); + }; + let NonASAPOp::Join { + kind, + pred, + left, + right, + } = op(child) + else { + panic!("expected the Semi join directly under the Project, got {child:?}"); + }; + assert_eq!(*kind, JoinKind::Semi); + assert_eq!(pred.0, ScalarExpr::Literal(ScalarValue::Boolean(true))); + assert!( + matches!(op(left), NonASAPOp::Scan { .. }), + "left is metrics" + ); + let NonASAPOp::Project { child: scan, .. } = op(right) else { + panic!("expected the subquery's projection on the right, got {right:?}"); + }; + assert!( + matches!(op(scan), NonASAPOp::Scan { predicates, .. } if predicates.len() == 1), + "the subquery's WHERE stays on its own Scan, got {scan:?}" + ); + assert_eq!( + child.schema.fields.len(), + 4, + "a semi join outputs the left's columns alone" + ); +} + +#[tokio::test] +async fn not_in_subquery_is_rejected_rather_than_mislowered_as_an_anti_join() { + let qe = + lower("SELECT service FROM metrics WHERE service NOT IN (SELECT service FROM hosts)").await; + let filter = find_filter(&qe).unwrap(); + let NonASAPOp::Filter { pred, .. } = op(filter) else { + panic!() + }; + assert!(matches!( + pred.0, + ScalarExpr::InSubquery { negated: true, .. } + )); + qe.validate_structure().unwrap(); } #[tokio::test] @@ -1137,6 +1137,177 @@ async fn a_correlated_in_subquery_is_rejected() { assert!(format!("{err}").contains("correlated IN"), "got {err}"); } +// ── Subquery-valued expressions at the `UnresolvedOp` level ───────────────── + +/// `SqlLowerer::lower` output, before `resolve_root`. +async fn lower_unresolved(sql: &str) -> UnresolvedOp { + let catalog = catalog(); + SqlLowerer::new(&catalog) + .lower(sql, &AccuracyTarget::Exact) + .await + .unwrap_or_else(|e| panic!("lower failed for {sql:?}: {e}")) +} + +#[tokio::test] +async fn scalar_subquery_in_projection_lowers_to_a_scalar_subquery_item() { + // An uncorrelated `(SELECT max(v) FROM t2)` in the SELECT list is a + // `ScalarSubquery` projection item reading its own lowered plan; the + // cross-join rewrite is `canonicalize`'s job, not the front end's. + let tree = lower_unresolved("SELECT (SELECT max(latency) FROM metrics) FROM hosts").await; + let UnresolvedOp::Project { cols, child, .. } = &tree else { + panic!("expected the SELECT list as a Project, got {tree:?}"); + }; + assert!( + matches!(child.as_ref(), UnresolvedOp::Scan { source: Source::Table { table_ref }, .. } + if table_ref == "hosts"), + "the outer relation stays the projection's child, got {child:?}" + ); + assert_eq!(cols.len(), 1); + let UnresolvedScalar::ScalarSubquery(sub) = &cols[0].expr else { + panic!("expected a ScalarSubquery item, got {:?}", cols[0].expr); + }; + let UnresolvedOp::Project { child: inner, .. } = sub.as_ref() else { + panic!("expected the subquery's own SELECT list, got {sub:?}"); + }; + assert!( + matches!(inner.as_ref(), UnresolvedOp::Aggregate { measures, .. } + if matches!(measures.as_slice(), [AggIntent::Max { .. }])), + "the subquery plan is lowered as a root of its own, got {inner:?}" + ); +} + +#[tokio::test] +async fn exists_and_in_subqueries_lower_to_scalar_filter_conjuncts() { + // The front end no longer builds the semi join itself: `EXISTS` / `IN + // (…)` are `Filter` predicates reading the subquery operator. + let tree = + lower_unresolved("SELECT service FROM metrics WHERE EXISTS (SELECT 1 FROM hosts)").await; + let UnresolvedOp::Project { child, .. } = &tree else { + panic!("expected a Project, got {tree:?}"); + }; + assert!( + matches!(child.as_ref(), UnresolvedOp::Filter { pred, .. } + if matches!(pred.0, UnresolvedScalar::Exists { negated: false, .. })), + "expected Filter {{ Exists }}, got {child:?}" + ); + + let tree = lower_unresolved( + "SELECT service FROM metrics WHERE service IN (SELECT service FROM hosts)", + ) + .await; + let UnresolvedOp::Project { child, .. } = &tree else { + panic!("expected a Project, got {tree:?}"); + }; + assert!( + matches!(child.as_ref(), UnresolvedOp::Filter { pred, .. } + if matches!(pred.0, UnresolvedScalar::InSubquery { negated: false, .. })), + "expected Filter {{ InSubquery }}, got {child:?}" + ); +} + +// ── `SELECT` without `FROM`, unary minus, SQL expression semantics ────────── + +#[tokio::test] +async fn select_without_from_projects_over_one_empty_row() { + // `SELECT 1` has no table: DataFusion's `EmptyRelation` is one empty + // input row, which the SELECT list projects a literal over. + let qe = lower("SELECT 1").await; + let NonASAPOp::Project { cols, child, .. } = op(&qe) else { + panic!("expected Project at root, got {qe:?}"); + }; + assert_eq!(cols.len(), 1); + assert_eq!(cols[0].expr, ScalarExpr::Literal(ScalarValue::Int64(1))); + let NonASAPOp::Values { rows, schema } = op(child) else { + panic!("expected Values under the Project, got {child:?}"); + }; + assert_eq!(rows, &vec![Vec::::new()], "one empty row"); + assert!(schema.fields.is_empty() && schema.closed); + assert_eq!(qe.schema.fields.len(), 1); + assert_eq!(qe.schema.fields[0].dtype, DataType::Int64); +} + +#[tokio::test] +async fn values_lowers_to_one_row_per_values_row() { + let qe = lower("SELECT * FROM (VALUES (1, 'a'), (2, 'b')) AS v(n, s)").await; + let values = OperatorNode::reachable(&qe) + .into_iter() + .find(|n| matches!(op(n), NonASAPOp::Values { .. })) + .expect("expected a Values node"); + let NonASAPOp::Values { rows, schema } = op(&values) else { + unreachable!() + }; + assert_eq!(rows.len(), 2); + assert_eq!( + rows[1], + vec![ + ScalarExpr::Literal(ScalarValue::Int64(2)), + ScalarExpr::Literal(ScalarValue::Utf8("b".into())), + ] + ); + assert_eq!(schema.fields.len(), 2); + assert_eq!(schema.fields[0].dtype, DataType::Int64); + assert_eq!(schema.fields[1].dtype, DataType::Utf8); + assert_eq!( + qe.schema + .fields + .iter() + .map(|f| f.name.as_str()) + .collect::>(), + ["n", "s"] + ); +} + +#[tokio::test] +async fn unary_minus_lowers_to_negative() { + // `-x` over a column is the `Negative` scalar (a negative *literal* is + // folded by DataFusion's planner before lowering). + let qe = lower("SELECT -latency FROM metrics").await; + let NonASAPOp::Project { cols, .. } = op(&qe) else { + panic!("expected Project at root, got {qe:?}"); + }; + assert_eq!( + cols[0].expr, + ScalarExpr::Negative { + expr: Box::new(ScalarExpr::Column(2)), + semantics: ExprSemantics::Sql, + } + ); + assert_eq!(qe.schema.fields[0].dtype, DataType::Float64); +} + +#[tokio::test] +async fn sql_comparisons_and_arithmetic_carry_sql_semantics() { + let qe = lower("SELECT bytes * 8 FROM metrics WHERE latency > 1.5").await; + let NonASAPOp::Project { cols, child, .. } = op(&qe) else { + panic!("expected Project at root, got {qe:?}"); + }; + assert!( + matches!( + &cols[0].expr, + ScalarExpr::Arithmetic { + semantics: ExprSemantics::Sql, + .. + } + ), + "got {:?}", + cols[0].expr + ); + let NonASAPOp::Scan { predicates, .. } = op(child) else { + panic!("expected the WHERE folded onto the Scan, got {child:?}"); + }; + assert!( + matches!( + &predicates[0].0, + ScalarExpr::Compare { + semantics: ExprSemantics::Sql, + .. + } + ), + "got {:?}", + predicates[0].0 + ); +} + // ── Issue #115: Quantile / Cardinality carry their input column ───────────── #[tokio::test] @@ -1286,20 +1457,20 @@ async fn time_bucketing_group_by_lowers_to_a_derived_key() { let qe = lower("SELECT date_trunc('minute', ts) AS m, SUM(bytes) FROM metrics GROUP BY m").await; let node = find_aggregate_node(&qe).expect("expected an Aggregate"); - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction, measures, child, .. - } = node + } = op(node) else { unreachable!() }; assert!( - matches!(**child, QueryExpr::Project { .. }), + matches!(op(child), NonASAPOp::Project { .. }), "expected a materializing Project beneath the Aggregate" ); - let schema = child.output_schema().expect("child schema"); + let schema = &child.schema; assert_eq!(reduction, &Reduction::by(vec![0])); assert!( schema.fields[0].name.contains("date_trunc"), @@ -1322,14 +1493,14 @@ async fn time_bucketing_keeps_the_scan_predicate() { WHERE bytes > 10 GROUP BY m", ) .await; - fn scan_has_predicate(qe: &QueryExpr) -> bool { - match qe { - QueryExpr::Scan { predicates, .. } => !predicates.is_empty(), - QueryExpr::Project { child, .. } - | QueryExpr::Filter { child, .. } - | QueryExpr::Aggregate { child, .. } - | QueryExpr::Sort { child, .. } - | QueryExpr::Limit { child, .. } => scan_has_predicate(child), + fn scan_has_predicate(node: &OperatorNode) -> bool { + match op(node) { + NonASAPOp::Scan { predicates, .. } => !predicates.is_empty(), + NonASAPOp::Project { child, .. } + | NonASAPOp::Filter { child, .. } + | NonASAPOp::Aggregate { child, .. } + | NonASAPOp::Sort { child, .. } + | NonASAPOp::Limit { child, .. } => scan_has_predicate(child), _ => false, } } @@ -1346,13 +1517,13 @@ async fn a_plain_group_by_inserts_no_projection() { "SELECT COUNT(*) FROM metrics", ] { let qe = lower(q).await; - let QueryExpr::Aggregate { child, .. } = - find_aggregate_node(&qe).expect("expected an Aggregate") + let NonASAPOp::Aggregate { child, .. } = + op(find_aggregate_node(&qe).expect("expected an Aggregate")) else { unreachable!() }; assert!( - !matches!(**child, QueryExpr::Project { .. }), + !matches!(op(child), NonASAPOp::Project { .. }), "{q} should not gain a projection" ); } @@ -1361,14 +1532,14 @@ async fn a_plain_group_by_inserts_no_projection() { #[tokio::test] async fn a_shared_expression_is_materialized_once() { let qe = lower("SELECT SUM(bytes * 2), MIN(bytes * 2) FROM metrics").await; - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = find_aggregate_node(&qe).expect("expected an Aggregate") + } = op(find_aggregate_node(&qe).expect("expected an Aggregate")) else { unreachable!() }; assert_eq!( - child.output_schema().expect("child schema").fields.len(), + child.schema.fields.len(), 1, "the two reducers should share one derived column" ); @@ -1378,38 +1549,32 @@ async fn a_shared_expression_is_materialized_once() { // ── Issue #118: multi-level grouping expands into one Aggregate per level ─── /// The branches of the first `Concat` along the single-child spine. -fn merge_branches(qe: &QueryExpr) -> &Vec { - fn find(qe: &QueryExpr) -> Option<&Vec> { - match qe { - QueryExpr::Concat { children, .. } => Some(children), - QueryExpr::Project { child, .. } - | QueryExpr::Filter { child, .. } - | QueryExpr::Sort { child, .. } - | QueryExpr::Limit { child, .. } => find(child), +fn merge_branches(node: &OperatorNode) -> &Vec> { + fn find(node: &OperatorNode) -> Option<&Vec>> { + match op(node) { + NonASAPOp::Concat { children, .. } => Some(children), + NonASAPOp::Project { child, .. } + | NonASAPOp::Filter { child, .. } + | NonASAPOp::Sort { child, .. } + | NonASAPOp::Limit { child, .. } => find(child), _ => None, } } - find(qe).expect("expected a Concat") + find(node).expect("expected a Concat") } /// `(group keys, column names)` of each merged grouping level. -fn grouping_levels(qe: &QueryExpr) -> Vec<(GroupKeys, Vec)> { - merge_branches(qe) +fn grouping_levels(node: &OperatorNode) -> Vec<(GroupKeys, Vec)> { + merge_branches(node) .iter() .map(|b| { - let QueryExpr::Project { child, .. } = b else { + let NonASAPOp::Project { child, .. } = op(b) else { panic!("expected a Project per level, got {b:?}"); }; - let QueryExpr::Aggregate { reduction, .. } = child.as_ref() else { + let NonASAPOp::Aggregate { reduction, .. } = op(child) else { panic!("expected an Aggregate under the Project, got {child:?}"); }; - let names = b - .output_schema() - .expect("level schema") - .fields - .iter() - .map(|c| c.name.clone()) - .collect(); + let names = b.schema.fields.iter().map(|c| c.name.clone()).collect(); (reduction.expect_reduce().clone(), names) }) .collect() @@ -1468,9 +1633,7 @@ async fn omitted_grouping_keys_become_typed_nulls() { } // The `()` level projects `service` as a Utf8 null, not a Float64 one. - let schema = merge_branches(&qe)[1] - .output_schema() - .expect("level schema"); + let schema = &merge_branches(&qe)[1].schema; assert_eq!(schema.fields[0].name, "service"); assert_eq!( schema.fields[0].dtype, @@ -1488,8 +1651,7 @@ async fn grouping_levels_are_union_compatible() { let shapes: Vec<_> = merge_branches(&qe) .iter() .map(|b| { - b.output_schema() - .expect("level schema") + b.schema .fields .iter() .map(|c| (c.name.clone(), c.dtype.clone())) @@ -1539,12 +1701,12 @@ async fn multi_level_grouping_composes_with_a_derived_reducer_argument() { // #110's materializing Project sits beneath every level's Aggregate. let qe = lower("SELECT service, SUM(bytes * 8) FROM metrics GROUP BY ROLLUP(service)").await; for b in merge_branches(&qe) { - let QueryExpr::Project { child, .. } = b else { + let NonASAPOp::Project { child, .. } = op(b) else { panic!("expected a Project per level"); }; - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { measures, child, .. - } = child.as_ref() + } = op(child) else { panic!("expected an Aggregate"); }; @@ -1553,7 +1715,7 @@ async fn multi_level_grouping_composes_with_a_derived_reducer_argument() { [AggIntent::Sum { col: Some(_) }] )); assert!( - matches!(**child, QueryExpr::Project { .. }), + matches!(op(child), NonASAPOp::Project { .. }), "the derived-column projection should sit under each level" ); } @@ -1616,7 +1778,7 @@ async fn array_agg_is_deliberately_rejected() { // ── Issue #225: catalog-driven ClickHouse builtins (countIf, generalizing // uniqExact from #221) ─────────────────────────────────────────────────── -async fn lower_clickhouse(sql: &str) -> QueryExpr { +async fn lower_clickhouse(sql: &str) -> Rc { lower_sql_dialect( sql, &catalog(), @@ -1627,20 +1789,20 @@ async fn lower_clickhouse(sql: &str) -> QueryExpr { .unwrap_or_else(|e| panic!("lower failed for {sql:?}: {e}")) } -fn temporal_aggregate(qe: &QueryExpr) -> (&AggIntent, std::time::Duration, &QueryExpr) { - match qe { - QueryExpr::Aggregate { +fn temporal_aggregate(node: &OperatorNode) -> (&AggIntent, std::time::Duration, &OperatorNode) { + match op(node) { + NonASAPOp::Aggregate { reduction: Reduction::PerEntity, measures, child, .. } => { - let QueryExpr::TimeRange { range, child } = child.as_ref() else { + let NonASAPOp::TimeRange { range, child, .. } = op(child) else { panic!("temporal Aggregate must directly wrap TimeRange, got {child:?}"); }; (&measures[0], *range, child) } - QueryExpr::Project { child, .. } | QueryExpr::Filter { child, .. } => { + NonASAPOp::Project { child, .. } | NonASAPOp::Filter { child, .. } => { temporal_aggregate(child) } other => panic!("expected temporal Aggregate, got {other:?}"), @@ -1661,15 +1823,15 @@ async fn explicit_temporal_aggregates_share_promql_intents_and_timerange() { let (intent, range, child) = temporal_aggregate(&qe); assert_eq!(intent, &expected); assert_eq!(range, std::time::Duration::from_secs(300)); - assert!(matches!(child, QueryExpr::Project { child, .. } - if matches!(child.as_ref(), QueryExpr::Scan { predicates, .. } if predicates.len() == 1))); + assert!(matches!(op(child), NonASAPOp::Project { child, .. } + if matches!(op(child), NonASAPOp::Scan { predicates, .. } if predicates.len() == 1))); - let QueryExpr::Project { cols, .. } = &qe else { + let NonASAPOp::Project { cols, .. } = op(&qe) else { panic!("SELECT list must remain a Project, got {qe:?}"); }; - assert!(matches!(cols[0].expr, QueryExpr::Column(2))); + assert!(matches!(cols[0].expr, ScalarExpr::Column(2))); assert_eq!(cols[1].alias.as_deref(), Some("v")); - assert!(matches!(cols[1].expr, QueryExpr::Column(1))); + assert!(matches!(cols[1].expr, ScalarExpr::Column(1))); } } @@ -1830,20 +1992,20 @@ async fn project_filter_and_outer_aggregate_preserve_temporal_child() { ) r WHERE v >= 0", ) .await; - let QueryExpr::Project { child, .. } = &qe else { + let NonASAPOp::Project { child, .. } = op(&qe) else { panic!("expected outer SELECT Project, got {qe:?}"); }; - let QueryExpr::Aggregate { + let NonASAPOp::Aggregate { reduction: Reduction::Reduce(_), measures, child, .. - } = child.as_ref() + } = op(child) else { panic!("expected outer Aggregate, got {child:?}"); }; assert!(matches!(measures.as_slice(), [AggIntent::Max { .. }])); - let QueryExpr::Filter { child, .. } = child.as_ref() else { + let NonASAPOp::Filter { child, .. } = op(child) else { panic!("derived-table WHERE must remain above the inner query, got {child:?}"); }; let (intent, range, _) = temporal_aggregate(child); @@ -2007,13 +2169,13 @@ async fn lag_in_frame_lowers_to_its_own_kind_not_lag() { ) .await; let win = find_windowfunc(&qe).expect("expected a SQLWindowFunc node"); - let QueryExpr::SQLWindowFunc { func, args, .. } = win else { + let NonASAPOp::SQLWindowFunc { func, args, .. } = op(win) else { unreachable!(); }; assert_eq!(*func, WindowFuncKind::LagInFrame); assert_eq!( args, - &vec![QueryExpr::Column(3)], + &vec![ScalarExpr::Column(3)], "lagInFrame(bytes) → arg col 3" ); } @@ -2026,7 +2188,7 @@ async fn lead_in_frame_lowers_to_its_own_kind_not_lead() { ) .await; let win = find_windowfunc(&qe).expect("expected a SQLWindowFunc node"); - let QueryExpr::SQLWindowFunc { func, .. } = win else { + let NonASAPOp::SQLWindowFunc { func, .. } = op(win) else { unreachable!(); }; assert_eq!(*func, WindowFuncKind::LeadInFrame); @@ -2039,16 +2201,16 @@ async fn lead_in_frame_lowers_to_its_own_kind_not_lead() { async fn now_in_predicate_lowers_to_current_timestamp() { // WHERE folds onto Scan.predicates (no explicit Filter node). let qe = lower("SELECT * FROM metrics WHERE ts < NOW()").await; - let QueryExpr::Project { child, .. } = &qe else { + let NonASAPOp::Project { child, .. } = op(&qe) else { panic!("expected Project at root, got {qe:?}"); }; - let QueryExpr::Scan { predicates, .. } = child.as_ref() else { + let NonASAPOp::Scan { predicates, .. } = op(child) else { panic!("expected Scan under the projection, got {child:?}"); }; assert_eq!(predicates.len(), 1); assert!( - matches!(predicates[0].0.as_ref(), QueryExpr::Compare { right, .. } - if matches!(right.as_ref(), QueryExpr::CurrentTimestamp)), + matches!(&predicates[0].0, ScalarExpr::Compare { right, .. } + if matches!(right.as_ref(), ScalarExpr::Cast { expr, to: DataType::Timestamp, .. } if matches!(expr.as_ref(), ScalarExpr::CurrentTimestamp))), "NOW() must lower to CurrentTimestamp, got {:?}", predicates[0].0 ); @@ -2059,16 +2221,16 @@ async fn now_in_predicate_lowers_to_current_timestamp() { #[tokio::test] async fn clickhouse_now_in_predicate_lowers_to_current_timestamp() { let qe = lower_clickhouse("SELECT * FROM metrics WHERE ts < now()").await; - let QueryExpr::Project { child, .. } = &qe else { + let NonASAPOp::Project { child, .. } = op(&qe) else { panic!("expected Project at root, got {qe:?}"); }; - let QueryExpr::Scan { predicates, .. } = child.as_ref() else { + let NonASAPOp::Scan { predicates, .. } = op(child) else { panic!("expected Scan under the projection, got {child:?}"); }; assert_eq!(predicates.len(), 1); assert!( - matches!(predicates[0].0.as_ref(), QueryExpr::Compare { right, .. } - if matches!(right.as_ref(), QueryExpr::CurrentTimestamp)), + matches!(&predicates[0].0, ScalarExpr::Compare { right, .. } + if matches!(right.as_ref(), ScalarExpr::Cast { expr, to: DataType::Timestamp, .. } if matches!(expr.as_ref(), ScalarExpr::CurrentTimestamp))), "now() must lower to CurrentTimestamp, got {:?}", predicates[0].0 ); @@ -2077,12 +2239,16 @@ async fn clickhouse_now_in_predicate_lowers_to_current_timestamp() { #[tokio::test] async fn current_timestamp_lowers_to_typed_current_timestamp_leaf() { let qe = lower("SELECT CURRENT_TIMESTAMP FROM metrics").await; - let QueryExpr::Project { cols, .. } = &qe else { + let NonASAPOp::Project { cols, child, .. } = op(&qe) else { panic!("expected Project at root, got {qe:?}"); }; - assert!(matches!(&cols[0].expr, QueryExpr::CurrentTimestamp)); - let schema = cols[0].expr.output_schema().expect("timestamp schema"); - assert_eq!(schema.fields[0].dtype, DataType::Timestamp); + assert!(matches!(&cols[0].expr, ScalarExpr::CurrentTimestamp)); + let (dtype, _) = cols[0] + .expr + .scalar_type(&child.schema) + .expect("timestamp type"); + assert_eq!(dtype, DataType::Timestamp); + assert_eq!(qe.schema.fields[0].dtype, DataType::Timestamp); } // A `count` over a non-null input is a plain row count; over a nullable @@ -2125,10 +2291,7 @@ async fn count_null_semantics_become_a_measure_filter() { aggregate_filters(&qe) ); }; - assert!( - matches!(cond.as_ref(), QueryExpr::IsNotNull(_)), - "{sql}: {cond:?}" - ); + assert!(matches!(cond, ScalarExpr::IsNotNull(_)), "{sql}: {cond:?}"); } // Only the second measure is filtered. let qe = lower_sql( @@ -2175,7 +2338,7 @@ async fn grouped_map_column_preserves_map_type() { ) .await .unwrap(); - assert_eq!(query.output_schema().unwrap().fields[0].dtype, map); + assert_eq!(query.schema.fields[0].dtype, map); } #[tokio::test] @@ -2213,10 +2376,7 @@ async fn clickhouse_modulo_uses_native_arithmetic_types_and_nullability() { .await .unwrap(); assert_eq!(function, operator, "{call}"); - assert_eq!( - function.output_schema().unwrap(), - operator.output_schema().unwrap() - ); + assert_eq!(function.schema, operator.schema); } let nullable = lower_sql_dialect( "SELECT modulo(n, 3) AS value FROM numbers", @@ -2226,8 +2386,8 @@ async fn clickhouse_modulo_uses_native_arithmetic_types_and_nullability() { ) .await .unwrap() - .output_schema() - .unwrap(); + .schema + .clone(); assert_eq!(nullable.fields[0].dtype, DataType::Int64); assert!(nullable.fields[0].nullable); } @@ -2266,7 +2426,7 @@ async fn original_o11y_map_queries_lower_with_typed_results() { ) .await .unwrap_or_else(|e| panic!("{sql}: {e}")); - let schema = query.output_schema().unwrap(); + let schema = &query.schema; assert!( schema .fields @@ -2298,7 +2458,7 @@ async fn clickhouse_modulo_preserves_projection_names_and_outer_references() { ) .await .unwrap(); - assert_eq!(query.output_schema().unwrap().fields[0].name, name); + assert_eq!(query.schema.fields[0].name, name); } } @@ -2328,7 +2488,7 @@ async fn clickhouse_map_access_keeps_generated_names_and_rejects_variant_coercio ) .await .unwrap(); - let output = query.output_schema().unwrap(); + let output = &query.schema; assert_eq!(output.fields[0].name, "arrayElement(labels, 'job')"); assert_eq!(output.fields[0].dtype, DataType::Utf8); assert!(!output.fields[0].nullable); @@ -2380,7 +2540,7 @@ async fn arg_selector_result_schema_tracks_selected_argument() { ) .await .unwrap(); - let schema = query.output_schema().unwrap(); + let schema = &query.schema; assert_eq!(schema.fields[0].dtype, dtype); assert_eq!(schema.fields[0].nullable, nullable); } @@ -2414,7 +2574,7 @@ async fn clickhouse_list_element_uses_canonical_typed_access() { ) .await .unwrap(); - let output = query.output_schema().unwrap(); + let output = &query.schema; assert_eq!(output.fields[0].dtype, DataType::Int64); assert_eq!(output.fields[0].nullable, nullable); let serialized = serde_json::to_string(&query).unwrap(); @@ -2473,7 +2633,7 @@ async fn clickhouse_tuple_element_preserves_declared_field_metadata() { ) .await .unwrap(); - let output = query.output_schema().unwrap(); + let output = &query.schema; assert_eq!(output.fields[0].dtype, dtype); assert_eq!(output.fields[0].nullable, nullable); assert!(serde_json::to_string(&query) @@ -2500,7 +2660,7 @@ async fn clickhouse_tuple_element_preserves_declared_field_metadata() { #[tokio::test] async fn corr_result_is_nullable_float() { let query = lower("SELECT corr(latency, bytes) AS correlation FROM metrics").await; - let schema = query.output_schema().unwrap(); + let schema = &query.schema; assert_eq!(schema.fields[0].name, "correlation"); assert_eq!(schema.fields[0].dtype, DataType::Float64); assert!(schema.fields[0].nullable); @@ -2524,8 +2684,8 @@ async fn composite_distinct_counts_tuples() { ) .await .unwrap(); - let QueryExpr::Aggregate { measures, .. } = - find_aggregate_node(&composite).expect("expected an Aggregate") + let NonASAPOp::Aggregate { measures, .. } = + op(find_aggregate_node(&composite).expect("expected an Aggregate")) else { unreachable!() }; @@ -2541,8 +2701,8 @@ async fn composite_distinct_counts_tuples() { ) .await .unwrap(); - let QueryExpr::Aggregate { measures, .. } = - find_aggregate_node(&single).expect("expected an Aggregate") + let NonASAPOp::Aggregate { measures, .. } = + op(find_aggregate_node(&single).expect("expected an Aggregate")) else { unreachable!() }; @@ -2600,8 +2760,10 @@ async fn distinct_with_derived_sibling() { // ── Issue #466: per-measure FILTER predicates ───────────────────────────────── /// The first `Aggregate`'s `filters`, positional against its child. -fn aggregate_filters(qe: &QueryExpr) -> &[Option] { - let Some(QueryExpr::Aggregate { filters, .. }) = find_aggregate_node(qe) else { +fn aggregate_filters(qe: &OperatorNode) -> &[Option] { + let Some(NonASAPOp::Aggregate { filters, .. }) = + find_aggregate_node(qe).map(|n| n.expect_non_asap()) + else { panic!("expected an Aggregate, got {qe:?}"); }; filters @@ -2631,15 +2793,17 @@ async fn conditional_count_lowers_to_a_filtered_measure() { panic!("expected [Some, None], got {:?}", aggregate_filters(&qe)); }; assert!( - matches!(cond.as_ref(), QueryExpr::Compare { left, op: CompareOpKind::Gt, .. } - if matches!(left.as_ref(), QueryExpr::Column(2))), + matches!(cond, ScalarExpr::Compare { left, op: CompareOpKind::Gt, .. } + if matches!(left.as_ref(), ScalarExpr::Column(2))), "latency > 1.0 against the scan, got {cond:?}" ); - let Some(QueryExpr::Aggregate { child, .. }) = find_aggregate_node(&qe) else { + let Some(NonASAPOp::Aggregate { child, .. }) = + find_aggregate_node(&qe).map(|n| n.expect_non_asap()) + else { unreachable!() }; assert!( - matches!(child.as_ref(), QueryExpr::Scan { .. }), + matches!(child.expect_non_asap(), NonASAPOp::Scan { .. }), "{child:?}" ); } @@ -2653,9 +2817,9 @@ async fn filter_clause_lowers_to_a_measure_filter() { panic!("expected [Some, None], got {:?}", aggregate_filters(&qe)); }; assert!( - matches!(cond.as_ref(), QueryExpr::Compare { left, op: CompareOpKind::Eq, right } - if matches!(left.as_ref(), QueryExpr::Column(1)) - && matches!(right.as_ref(), QueryExpr::Literal(ScalarValue::Utf8(s)) if s == "a")), + matches!(cond, ScalarExpr::Compare { left, op: CompareOpKind::Eq, right, .. } + if matches!(left.as_ref(), ScalarExpr::Column(1)) + && matches!(right.as_ref(), ScalarExpr::Literal(ScalarValue::Utf8(s)) if s == "a")), "{cond:?}" ); } @@ -2669,7 +2833,7 @@ async fn count_of_a_nullable_expression_filters_nulls() { let [Some(Predicate(cond))] = aggregate_filters(&qe) else { panic!("expected [Some], got {:?}", aggregate_filters(&qe)); }; - assert!(matches!(cond.as_ref(), QueryExpr::IsNotNull(_)), "{cond:?}"); + assert!(matches!(cond, ScalarExpr::IsNotNull(_)), "{cond:?}"); assert!( matches!( find_aggregate(&qe).unwrap().1.as_slice(), @@ -2684,23 +2848,25 @@ async fn count_of_a_nullable_expression_filters_nulls() { #[tokio::test] async fn measure_filter_columns_survive_a_derived_column_projection() { let qe = lower("SELECT sum(bytes * 2) FILTER (WHERE latency > 1.0) FROM metrics").await; - let Some(QueryExpr::Aggregate { child, .. }) = find_aggregate_node(&qe) else { + let Some(NonASAPOp::Aggregate { child, .. }) = + find_aggregate_node(&qe).map(|n| n.expect_non_asap()) + else { unreachable!() }; assert!( - matches!(child.as_ref(), QueryExpr::Project { .. }), + matches!(child.expect_non_asap(), NonASAPOp::Project { .. }), "{child:?}" ); let [Some(Predicate(cond))] = aggregate_filters(&qe) else { panic!("expected [Some], got {:?}", aggregate_filters(&qe)); }; - let QueryExpr::Compare { left, .. } = cond.as_ref() else { + let ScalarExpr::Compare { left, .. } = cond else { panic!("{cond:?}"); }; - let QueryExpr::Column(id) = left.as_ref() else { + let ScalarExpr::Column(id) = left.as_ref() else { panic!("{left:?}"); }; - assert_eq!(child.output_schema().unwrap().fields[*id].name, "latency"); + assert_eq!(child.schema.fields[*id].name, "latency"); } // `GROUP BY ROLLUP` fans one measure list out into one `Aggregate` per level; diff --git a/crates/frontend-sql/tests/temporal_types.rs b/crates/frontend-sql/tests/temporal_types.rs index a6b4f1187..7e12c6f33 100644 --- a/crates/frontend-sql/tests/temporal_types.rs +++ b/crates/frontend-sql/tests/temporal_types.rs @@ -38,10 +38,7 @@ async fn date_shifts_keep_their_type() { let node = lower_sql(query, &catalog(), AccuracyTarget::Exact) .await .unwrap(); - assert_eq!( - node.output_schema().unwrap().fields[0].dtype, - DataType::Date - ); + assert_eq!(node.schema.fields[0].dtype, DataType::Date); } } // Interval literals and explicit interval casts must both cross the Arrow bridge. @@ -54,10 +51,7 @@ async fn interval_cast_lowers_like_interval_literal() { let node = lower_sql(query, &catalog(), AccuracyTarget::Exact) .await .unwrap(); - assert_eq!( - node.output_schema().unwrap().fields[0].dtype, - DataType::Interval - ); + assert_eq!(node.schema.fields[0].dtype, DataType::Interval); } } @@ -90,11 +84,7 @@ async fn negative_intervals_keep_their_type() { let node = lower_sql(query, &catalog(), AccuracyTarget::Exact) .await .unwrap(); - assert_eq!( - node.output_schema().unwrap().fields[0].dtype, - DataType::Interval, - "{query}" - ); + assert_eq!(node.schema.fields[0].dtype, DataType::Interval, "{query}"); } } @@ -108,9 +98,6 @@ async fn sql_date_literals_keep_their_type() { let node = lower_sql(query, &catalog(), AccuracyTarget::Exact) .await .unwrap(); - assert_eq!( - node.output_schema().unwrap().fields[0].dtype, - DataType::Date - ); + assert_eq!(node.schema.fields[0].dtype, DataType::Date); } } diff --git a/crates/integration-tests/Cargo.toml b/crates/integration-tests/Cargo.toml index 5a5de9902..afa7559b4 100644 --- a/crates/integration-tests/Cargo.toml +++ b/crates/integration-tests/Cargo.toml @@ -10,6 +10,7 @@ asap-frontend-sql = { path = "../frontend-sql" } asap-aware-mapping = { path = "../asap-aware-mapping" } [dev-dependencies] +asap-planner = { path = "../planner" } asap_sketchlib = { workspace = true } serde_json = "1" tokio = { version = "1", features = ["rt", "macros", "rt-multi-thread"] } diff --git a/crates/integration-tests/src/lib.rs b/crates/integration-tests/src/lib.rs index be8e259bc..af9598cd3 100644 --- a/crates/integration-tests/src/lib.rs +++ b/crates/integration-tests/src/lib.rs @@ -12,21 +12,34 @@ //! here derives or computes expected outputs. pub mod fixtures { - use asap_frontend_promql::lower_promql_workload; + + use asap_types::ir::OperatorNode; use asap_types::pre_asap::schema::{DataType, Field, Schema}; - use asap_types::pre_asap::QueryExpr; use asap_types::types::AccuracyTarget; use asap_types::workload::{ AccuracyRequirement, BatchEntry, DataWorkload, DurationMs, Evidence, PlanningWorkload, Predictability, Query, QueryLanguage, QueryRequirements, QueryWorkload, TimeSelection, }; + use std::rc::Rc; /// Lower one query through the plan-ready workload API using the test /// suite's declared one-second source cadence. pub fn lower_promql( query: &str, accuracy: AccuracyTarget, - ) -> Result { + ) -> Result, asap_frontend_promql::PromqlError> { + match lower_promql_root(query, accuracy)? { + asap_types::ir::QueryRoot::Operator(node) => Ok(node), + _ => Err(asap_frontend_promql::PromqlError::UnsupportedFeature( + "expected vector root".into(), + )), + } + } + + pub fn lower_promql_root( + query: &str, + accuracy: AccuracyTarget, + ) -> Result { let workload = PlanningWorkload { query_workload: QueryWorkload { language: QueryLanguage::PromQL, @@ -51,7 +64,7 @@ pub mod fixtures { ..Default::default() }), }; - let mut lowered = lower_promql_workload(&workload, 0)?; + let mut lowered = asap_frontend_promql::lower_promql_query_workload(&workload, 0)?; Ok(lowered.remove(0)) } @@ -83,3 +96,41 @@ pub mod fixtures { } } } + +/// Timing and export helpers for post-ASAP plans. +pub mod post_asap { + use asap_types::ir::export::{compile_physical_asap_dag, PhysicalASAPDAG}; + use asap_types::ir::{ + apply_materialization_timings, MaterializationAssignment, OperatorNode, TimingMemo, + }; + use std::rc::Rc; + + /// Time `root` under the default assignment (every summary computed at + /// query time). Returns the timed copy; read `node.timing` on it. + pub fn timed(root: &Rc) -> Rc { + timed_with(root, &MaterializationAssignment::all_query_time()) + } + + /// Time `root` with every summary maintained at ingestion time. + pub fn maintained(root: &Rc) -> Rc { + timed_with(root, &MaterializationAssignment::all_ingestion_time()) + } + + fn timed_with( + root: &Rc, + assignment: &MaterializationAssignment, + ) -> Rc { + apply_materialization_timings(root, assignment, &mut TimingMemo::new()) + .expect("materialization timing failed") + } + + /// Time `root` (default assignment), then export the physical DAG. + pub fn post_asap_dag(root: &Rc) -> PhysicalASAPDAG { + compile_physical_asap_dag(&timed(root)).expect("post-ASAP DAG export failed") + } + + /// Time `root` with every summary maintained, then export the physical DAG. + pub fn maintained_post_asap_dag(root: &Rc) -> PhysicalASAPDAG { + compile_physical_asap_dag(&maintained(root)).expect("post-ASAP DAG export failed") + } +} diff --git a/crates/integration-tests/tests/aggregate.rs b/crates/integration-tests/tests/aggregate.rs index 051eeb6b7..13d2875b9 100644 --- a/crates/integration-tests/tests/aggregate.rs +++ b/crates/integration-tests/tests/aggregate.rs @@ -1,47 +1,54 @@ -//! `QueryExpr::Aggregate` — cross-series aggregation tests. +//! `NonASAPOp::Aggregate` — cross-series aggregation tests. //! //! topk/bottomk are omitted — dispatch is deferred. //! -//! Cross-series aggregates lower to a single `Aggregate` node with no -//! `TimeRange` child (range functions use `TimeRange` — see `time_range.rs`). -//! Group keys land on `Aggregate.by` as positional `ColumnId`s. -//! Single-stat PromQL aggregates always get `output_names: [""]` (no alias) -//! and `having: None`. +//! Cross-series aggregates lower to a single `Aggregate` node over the +//! instant-selector `TimeRange` (range functions use a `Range` selector — +//! see `time_range.rs`). Group keys land on `Aggregate.reduction` as +//! positional `ColumnId`s. Single-stat PromQL aggregates always get +//! `output_names: [""]` (no alias) and `having: None`. use std::rc::Rc; use std::time::Duration; use asap_integration_tests::fixtures::lower_promql; use asap_integration_tests::fixtures::metric_schema; -use asap_types::pre_asap::{AggIntent, QueryExpr, Reduction, Source}; +use asap_types::ir::{NonASAPOp, OperatorNode, TimeRangeKind}; +use asap_types::pre_asap::{AggIntent, Reduction, Source}; use asap_types::types::AccuracyTarget; -fn lower(q: &str) -> QueryExpr { +fn lower(q: &str) -> Rc { lower_promql(q, AccuracyTarget::Exact).unwrap_or_else(|e| panic!("lower failed for {q:?}: {e}")) } -fn scan(metric: &str, labels: &[&str]) -> QueryExpr { - QueryExpr::Scan { +fn node(op: NonASAPOp) -> Rc { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(op)) + .expect("fixture node derives its schema") +} + +fn scan(metric: &str, labels: &[&str]) -> Rc { + node(NonASAPOp::Scan { source: Source::TimeSeries { metric: metric.into(), }, predicates: vec![], schema: metric_schema(labels), - } + }) } -fn agg(by: Vec, intent: AggIntent, child: QueryExpr) -> QueryExpr { - QueryExpr::Aggregate { +fn agg(by: Vec, intent: AggIntent, child: Rc) -> Rc { + node(NonASAPOp::Aggregate { reduction: Reduction::by(by), measures: vec![intent], output_names: vec!["".into()], filters: vec![], having: None, - child: Rc::new(QueryExpr::TimeRange { + child: node(NonASAPOp::TimeRange { range: Duration::from_secs(1), - child: Rc::new(child), + kind: TimeRangeKind::Instant, + child, }), - } + }) } // #5 — sum with no group keys @@ -169,7 +176,7 @@ fn q_stdvar_no_group() { ); } -// #10 — cross-series quantile; no TimeRange node (no range window) +// #10 — cross-series quantile; instant selector, no range window #[test] fn q10_quantile_cross_series() { assert_eq!( diff --git a/crates/integration-tests/tests/binary_op.rs b/crates/integration-tests/tests/binary_op.rs index 35f1c632d..284501080 100644 --- a/crates/integration-tests/tests/binary_op.rs +++ b/crates/integration-tests/tests/binary_op.rs @@ -1,92 +1,121 @@ -//! `QueryExpr::BinaryOp` — arithmetic, comparison, and vector-match tests. +//! `NonASAPOp::BinaryOp` — arithmetic, comparison, and vector-match tests. //! //! Each side of a `BinaryOp` is bound independently by the SchemaResolver, so each //! gets its own scan schema derived from the labels it references. -//! `VectorMatch` labels (e.g. `on(job)`) are carried as strings on the node -//! and are NOT resolved to column ids — the SchemaResolver does not see them. +//! `VectorMatch` labels (e.g. `on(job)`) are carried as strings on the +//! operator and are NOT resolved to column ids — the SchemaResolver does not +//! see them. use std::rc::Rc; use std::time::Duration; use asap_integration_tests::fixtures::lower_promql; use asap_integration_tests::fixtures::metric_schema; +use asap_types::ir::{BinaryOperator, NonASAPOp, OperatorNode, ScalarExpr, TimeRangeKind}; use asap_types::pre_asap::{ - AggIntent, ArithmeticOpKind, BinaryOpKind, CompareOpKind, GroupSide, QueryExpr, Reduction, - Source, VectorGrouping, VectorMatch, VectorMatchKind, + AggIntent, ArithmeticOpKind, BinaryOpKind, CompareOpKind, GroupSide, Reduction, Source, + VectorGrouping, VectorMatch, VectorMatchKind, }; use asap_types::types::AccuracyTarget; -fn lower(q: &str) -> QueryExpr { +fn lower(q: &str) -> Rc { lower_promql(q, AccuracyTarget::Exact).unwrap_or_else(|e| panic!("lower failed for {q:?}: {e}")) } -fn scan(metric: &str, labels: &[&str]) -> QueryExpr { - QueryExpr::TimeRange { +fn node(op: NonASAPOp) -> Rc { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(op)) + .expect("fixture node derives its schema") +} + +fn scan(metric: &str, labels: &[&str]) -> Rc { + node(NonASAPOp::TimeRange { range: Duration::from_secs(1), - child: Rc::new(source_scan(metric, labels)), - } + kind: TimeRangeKind::Instant, + child: source_scan(metric, labels), + }) } -fn source_scan(metric: &str, labels: &[&str]) -> QueryExpr { - QueryExpr::Scan { +fn source_scan(metric: &str, labels: &[&str]) -> Rc { + node(NonASAPOp::Scan { source: Source::TimeSeries { metric: metric.into(), }, predicates: vec![], schema: metric_schema(labels), - } + }) } -fn rate_agg(metric: &str) -> QueryExpr { - QueryExpr::Aggregate { +fn rate_agg(metric: &str) -> Rc { + node(NonASAPOp::Aggregate { reduction: Reduction::PerEntity, measures: vec![AggIntent::Rate], output_names: vec!["".into()], filters: vec![], having: None, - child: Rc::new(QueryExpr::TimeRange { + child: node(NonASAPOp::TimeRange { range: Duration::from_secs(300), - child: Rc::new(source_scan(metric, &[])), + kind: TimeRangeKind::Range, + child: source_scan(metric, &[]), }), - } + }) } -fn sum_by_job(metric: &str) -> QueryExpr { - QueryExpr::Aggregate { +fn sum_by_job(metric: &str) -> Rc { + node(NonASAPOp::Aggregate { reduction: Reduction::by(vec![2]), measures: vec![AggIntent::Sum { col: None }], output_names: vec!["".into()], filters: vec![], having: None, - child: Rc::new(scan(metric, &["job"])), - } + child: scan(metric, &["job"]), + }) +} + +/// A PromQL binary operator: no checked-division flags, no `bool` modifier. +fn binary( + kind: BinaryOpKind, + vector_match: Option, + lhs: Rc, + rhs: Rc, +) -> Rc { + node(NonASAPOp::BinaryOp { + operator: BinaryOperator { + checked_relative_division: false, + checked_finite_division: false, + kind, + vector_match, + }, + return_bool: false, + lhs, + rhs, + }) } // #18 — arithmetic binary op between two bare scans; no vector match #[test] fn q18_div_bare_scans() { - let expected = QueryExpr::BinaryOp { - op: BinaryOpKind::Arithmetic(ArithmeticOpKind::Div), - lhs: Rc::new(scan("http_requests_total", &[])), - rhs: Rc::new(scan("http_requests_total", &[])), - vector_match: None, - }; + let expected = binary( + BinaryOpKind::Arithmetic(ArithmeticOpKind::Div), + None, + scan("http_requests_total", &[]), + scan("http_requests_total", &[]), + ); assert_eq!(lower("http_requests_total / http_requests_total"), expected); } // #19 — add with on(job) vector match; match labels are strings, not column ids #[test] fn q19_add_with_on_match() { - let expected = QueryExpr::BinaryOp { - op: BinaryOpKind::Arithmetic(ArithmeticOpKind::Add), - lhs: Rc::new(scan("http_requests_total", &[])), - rhs: Rc::new(scan("http_requests_total", &[])), - vector_match: Some(VectorMatch { + let expected = binary( + BinaryOpKind::Arithmetic(ArithmeticOpKind::Add), + Some(VectorMatch { kind: VectorMatchKind::On, labels: vec!["job".into()], grouping: None, }), - }; + scan("http_requests_total", &[]), + scan("http_requests_total", &[]), + ); assert_eq!( lower("http_requests_total + on(job) http_requests_total"), expected @@ -96,12 +125,12 @@ fn q19_add_with_on_match() { // #20 — divide two rate aggregates over different metrics #[test] fn q20_div_two_rates() { - let expected = QueryExpr::BinaryOp { - op: BinaryOpKind::Arithmetic(ArithmeticOpKind::Div), - lhs: Rc::new(rate_agg("http_requests_total")), - rhs: Rc::new(rate_agg("http_errors_total")), - vector_match: None, - }; + let expected = binary( + BinaryOpKind::Arithmetic(ArithmeticOpKind::Div), + None, + rate_agg("http_requests_total"), + rate_agg("http_errors_total"), + ); assert_eq!( lower("rate(http_requests_total[5m]) / rate(http_errors_total[5m])"), expected, @@ -113,12 +142,12 @@ fn q20_div_two_rates() { fn q_gt_comparison() { assert_eq!( lower("http_requests_total > http_errors_total"), - QueryExpr::BinaryOp { - op: BinaryOpKind::Compare(CompareOpKind::Gt), - lhs: Rc::new(scan("http_requests_total", &[])), - rhs: Rc::new(scan("http_errors_total", &[])), - vector_match: None, - } + binary( + BinaryOpKind::Compare(CompareOpKind::Gt), + None, + scan("http_requests_total", &[]), + scan("http_errors_total", &[]), + ) ); } @@ -126,12 +155,12 @@ fn q_gt_comparison() { fn q_lt_comparison() { assert_eq!( lower("http_requests_total < http_errors_total"), - QueryExpr::BinaryOp { - op: BinaryOpKind::Compare(CompareOpKind::Lt), - lhs: Rc::new(scan("http_requests_total", &[])), - rhs: Rc::new(scan("http_errors_total", &[])), - vector_match: None, - } + binary( + BinaryOpKind::Compare(CompareOpKind::Lt), + None, + scan("http_requests_total", &[]), + scan("http_errors_total", &[]), + ) ); } @@ -139,12 +168,12 @@ fn q_lt_comparison() { fn q_ge_comparison() { assert_eq!( lower("http_requests_total >= http_errors_total"), - QueryExpr::BinaryOp { - op: BinaryOpKind::Compare(CompareOpKind::Ge), - lhs: Rc::new(scan("http_requests_total", &[])), - rhs: Rc::new(scan("http_errors_total", &[])), - vector_match: None, - } + binary( + BinaryOpKind::Compare(CompareOpKind::Ge), + None, + scan("http_requests_total", &[]), + scan("http_errors_total", &[]), + ) ); } @@ -152,12 +181,12 @@ fn q_ge_comparison() { fn q_le_comparison() { assert_eq!( lower("http_requests_total <= http_errors_total"), - QueryExpr::BinaryOp { - op: BinaryOpKind::Compare(CompareOpKind::Le), - lhs: Rc::new(scan("http_requests_total", &[])), - rhs: Rc::new(scan("http_errors_total", &[])), - vector_match: None, - } + binary( + BinaryOpKind::Compare(CompareOpKind::Le), + None, + scan("http_requests_total", &[]), + scan("http_errors_total", &[]), + ) ); } @@ -166,16 +195,16 @@ fn q_le_comparison() { fn q_add_with_ignoring() { assert_eq!( lower("http_requests_total + ignoring(job) http_errors_total"), - QueryExpr::BinaryOp { - op: BinaryOpKind::Arithmetic(ArithmeticOpKind::Add), - lhs: Rc::new(scan("http_requests_total", &[])), - rhs: Rc::new(scan("http_errors_total", &[])), - vector_match: Some(VectorMatch { + binary( + BinaryOpKind::Arithmetic(ArithmeticOpKind::Add), + Some(VectorMatch { kind: VectorMatchKind::Ignoring, labels: vec!["job".into()], grouping: None, }), - } + scan("http_requests_total", &[]), + scan("http_errors_total", &[]), + ) ); } @@ -184,11 +213,9 @@ fn q_add_with_ignoring() { fn q_mul_group_left() { assert_eq!( lower("http_requests_total * on(job) group_left() node_info"), - QueryExpr::BinaryOp { - op: BinaryOpKind::Arithmetic(ArithmeticOpKind::Mul), - lhs: Rc::new(scan("http_requests_total", &[])), - rhs: Rc::new(scan("node_info", &[])), - vector_match: Some(VectorMatch { + binary( + BinaryOpKind::Arithmetic(ArithmeticOpKind::Mul), + Some(VectorMatch { kind: VectorMatchKind::On, labels: vec!["job".into()], grouping: Some(VectorGrouping { @@ -196,7 +223,9 @@ fn q_mul_group_left() { labels: vec![], }), }), - } + scan("http_requests_total", &[]), + scan("node_info", &[]), + ) ); } @@ -205,11 +234,9 @@ fn q_mul_group_left() { fn q_mul_group_right() { assert_eq!( lower("node_info * on(job) group_right() http_requests_total"), - QueryExpr::BinaryOp { - op: BinaryOpKind::Arithmetic(ArithmeticOpKind::Mul), - lhs: Rc::new(scan("node_info", &[])), - rhs: Rc::new(scan("http_requests_total", &[])), - vector_match: Some(VectorMatch { + binary( + BinaryOpKind::Arithmetic(ArithmeticOpKind::Mul), + Some(VectorMatch { kind: VectorMatchKind::On, labels: vec!["job".into()], grouping: Some(VectorGrouping { @@ -217,7 +244,9 @@ fn q_mul_group_right() { labels: vec![], }), }), - } + scan("node_info", &[]), + scan("http_requests_total", &[]), + ) ); } @@ -225,12 +254,12 @@ fn q_mul_group_right() { // each side: Aggregate{Sum, by=[2]} over Scan([ts, value, job]) #[test] fn q21_div_two_sum_by_job() { - let expected = QueryExpr::BinaryOp { - op: BinaryOpKind::Arithmetic(ArithmeticOpKind::Div), - lhs: Rc::new(sum_by_job("http_requests_total")), - rhs: Rc::new(sum_by_job("http_errors_total")), - vector_match: None, - }; + let expected = binary( + BinaryOpKind::Arithmetic(ArithmeticOpKind::Div), + None, + sum_by_job("http_requests_total"), + sum_by_job("http_errors_total"), + ); assert_eq!( lower("sum by (job) (http_requests_total) / sum by (job) (http_errors_total)"), expected, @@ -238,34 +267,29 @@ fn q21_div_two_sum_by_job() { } // #36 — unary negation lowers as `expr * -1`: a Mul BinaryOp of the vector -// against PromqlScalarBridge(-1), no vector match. The vector side keeps its schema. +// against a `ScalarExpr(-1)` leaf, no vector match. The vector side keeps +// its schema. #[test] fn q36_unary_negation_is_multiply_by_minus_one() { - let expected = QueryExpr::BinaryOp { - op: BinaryOpKind::Arithmetic(ArithmeticOpKind::Mul), - lhs: Rc::new(scan("some_metric", &[])), - rhs: Rc::new(QueryExpr::promql_scalar(-1.0)), - vector_match: None, + let root = lower("-some_metric"); + let NonASAPOp::Project { cols, child, .. } = root.expect_non_asap() else { + panic!() }; - assert_eq!(lower("-some_metric"), expected); + assert!(child.schema.has_promql_series_identity()); + assert!(matches!(&cols[1].expr, ScalarExpr::Negative { .. })); } // #36 — negation nested inside an aggregate argument (issue #27 nesting): // `sum(-m)` → Aggregate{Sum} over the `m * -1` BinaryOp. #[test] fn q36_sum_of_negation_nests() { - let expected = QueryExpr::Aggregate { - reduction: Reduction::by(vec![]), - measures: vec![AggIntent::Sum { col: None }], - output_names: vec!["".into()], - filters: vec![], - having: None, - child: Rc::new(QueryExpr::BinaryOp { - op: BinaryOpKind::Arithmetic(ArithmeticOpKind::Mul), - lhs: Rc::new(scan("node_cpu_seconds_total", &[])), - rhs: Rc::new(QueryExpr::promql_scalar(-1.0)), - vector_match: None, - }), + let root = lower("sum(-node_cpu_seconds_total)"); + let NonASAPOp::Aggregate { + child, measures, .. + } = root.expect_non_asap() + else { + panic!() }; - assert_eq!(lower("sum(-node_cpu_seconds_total)"), expected); + assert!(matches!(measures.as_slice(), [AggIntent::Sum { .. }])); + assert!(matches!(child.expect_non_asap(), NonASAPOp::Project { .. })); } diff --git a/crates/integration-tests/tests/cse.rs b/crates/integration-tests/tests/cse.rs index bb11eee2d..56a0e657b 100644 --- a/crates/integration-tests/tests/cse.rs +++ b/crates/integration-tests/tests/cse.rs @@ -2,14 +2,14 @@ //! #223). //! //! Drives the full staged pipeline this issue lands: two independently -//! lowered `QueryExpr` DAGs → `share_common_sub_dags` (stage 1, -//! `asap-types::pre_asap::cse`, run internally by `search_workload`) → +//! lowered `OperatorNode` DAGs → `share_common_sub_dags` (stage 1, +//! `asap-types::ir::cse`, run internally by `search_workload`) → //! `search_workload` (stage 2, `asap-aware-mapping`) — and asserts the //! sharing that stage 1 decides survives into stage 2's discovered //! `CandidateLogicalASAPDAGs` as one genuinely shared `TargetSubDAGCandidates`, not just one shared -//! `Rc`. This is the "real caller" the issue's landing plan +//! `Rc`. This is the "real caller" the issue's landing plan //! requires before `share_common_sub_dags` is allowed to exist at all (its -//! predecessor, `asap-plan::cse::dedupe_subtrees`, was deleted in #192 for +//! predecessor, `asap-plan::cse::dedupe_sub-DAGs`, was deleted in #192 for //! being unwired dead code). //! //! Committing to one final, physically-materialized answer for a whole @@ -24,14 +24,14 @@ use std::rc::Rc; -use asap_aware_mapping::{search_workload, Replacement}; +use asap_aware_mapping::{is_logical_rewrite, search_workload, Replacement}; use asap_integration_tests::fixtures::lower_promql; -use asap_types::pre_asap::query_expr::QueryExpr; +use asap_types::ir::NonASAPOp; use asap_types::types::AccuracyTarget; /// Two workload entries that happen to submit the exact same query (a /// realistic case — two dashboards, or a query fired both standalone and as -/// part of a larger batch) collapse onto one shared `Rc` after +/// part of a larger batch) collapse onto one shared `Rc` after /// `search_workload`'s internal `share_common_sub_dags` pass, and onto one /// genuinely-shared [`TargetSubDAGCandidates`](asap_aware_mapping::TargetSubDAGCandidates) — carrying /// every candidate discovered for it exactly once, not once per root — no @@ -41,7 +41,7 @@ use asap_types::types::AccuracyTarget; fn duplicate_workload_queries_collapse_onto_one_memo_group() { // Grouped (`by (job)`), so the shared `Aggregate`'s output schema carries // a provable unique key — the legality gate `share_common_sub_dags` - // enforces (see `asap-types::pre_asap::cse`'s module doc) — and its + // enforces (see `asap-types::ir::cse`'s module doc) — and its // `ExactAggregate(Sum)` realization is deterministic regardless of the // accuracy target, so this pins the sharing mechanism itself rather than // any one particular summary-family choice. @@ -57,17 +57,17 @@ fn duplicate_workload_queries_collapse_onto_one_memo_group() { "fixture sanity: identical query text lowers identically" ); - let space = search_workload(vec![("a", Rc::new(a)), ("b", Rc::new(b))]); + let space = search_workload(vec![("a", a), ("b", b)]); // roots[0] and roots[1] must have merged onto the same Rc — the // `share_common_sub_dags` pass `search_workload` runs internally. assert!( Rc::ptr_eq(&space.roots[0].1, &space.roots[1].1), - "search_workload must collapse the two identical roots onto one Rc" + "search_workload must collapse the two identical roots onto one Rc" ); // The single shared root is one discovered TargetSubDAG, holding one - // TargetSubDAGCandidates with consumer_count 2 — SketchAlgorithmStrategy's one + // TargetSubDAGCandidates with consumer_count 2 — ASAPStrategies's one // ExactAggregate candidate *and* SharedSubDAGStrategy's share-vs- // recompute pair, exactly as `shared_aggregate_across_two_roots_gets_both_strategies_candidates` // (asap-aware-mapping::replacement's own equivalent, internal test) @@ -79,19 +79,21 @@ fn duplicate_workload_queries_collapse_onto_one_memo_group() { assert_eq!( group.candidates.len(), 3, - "1 ExactAggregate Summary + 2 Rewrite (share/recompute): {:?}", + "1 ExactAggregate summary + 2 logical rewrites (share/recompute): {:?}", group.candidates ); + // A bound summary is a `Subtree` with an ASAP operator in it; a logical + // rewrite is a `Subtree` with none (`is_logical_rewrite`). let summary_count = group .candidates .iter() - .filter(|c| matches!(c.replacement, Replacement::Summary(_))) + .filter(|c| matches!(&c.replacement, Replacement::SubDAG(n) if n.contains_asap())) .count(); let rewrite_count = group .candidates .iter() - .filter(|c| matches!(c.replacement, Replacement::Rewrite(_))) + .filter(|c| matches!(&c.replacement, Replacement::SubDAG(n) if is_logical_rewrite(n))) .count(); assert_eq!(summary_count, 1); assert_eq!(rewrite_count, 2); @@ -100,12 +102,14 @@ fn duplicate_workload_queries_collapse_onto_one_memo_group() { // "false-positive dedup" failure mode `is_duplicate_rewrite` exists to // prevent): one shares the group's own target `Rc`, the other is a // structurally-identical but independently-built `Rc`. - let one_is_the_target = group.candidates.iter().any( - |c| matches!(&c.replacement, Replacement::Rewrite(rc) if Rc::ptr_eq(rc, &group.target)), - ); - let one_is_not = group.candidates.iter().any( - |c| matches!(&c.replacement, Replacement::Rewrite(rc) if !Rc::ptr_eq(rc, &group.target)), - ); + let one_is_the_target = group.candidates.iter().any(|c| { + matches!(&c.replacement, Replacement::SubDAG(rc) + if is_logical_rewrite(rc) && Rc::ptr_eq(rc, &group.target)) + }); + let one_is_not = group.candidates.iter().any(|c| { + matches!(&c.replacement, Replacement::SubDAG(rc) + if is_logical_rewrite(rc) && !Rc::ptr_eq(rc, &group.target)) + }); assert!(one_is_the_target && one_is_not); } @@ -121,7 +125,7 @@ fn distinct_workload_queries_get_independent_memo_groups() { .expect("query b failed to lower"); assert_ne!(a, b, "fixture sanity: the two queries differ"); - let space = search_workload(vec![("a", Rc::new(a)), ("b", Rc::new(b))]); + let space = search_workload(vec![("a", a), ("b", b)]); assert!(!Rc::ptr_eq(&space.roots[0].1, &space.roots[1].1)); let group_a = space @@ -140,7 +144,7 @@ fn distinct_workload_queries_get_independent_memo_groups() { /// Single-query CSE (a repeated sub-expression within one query) also /// survives through `search_workload`: the two grouped-`Aggregate` branches -/// of a `BinaryOp` collapse to one shared `Rc` in the internal +/// of a `BinaryOp` collapse to one shared `Rc` in the internal /// `share_common_sub_dags` pass, and to one shared `TargetSubDAGCandidates` (with /// `consumer_count == 2`, one per branch) here. #[test] @@ -148,16 +152,16 @@ fn single_query_repeated_subexpression_shares_one_memo_group() { let query = "sum by (job) (http_requests_total) / sum by (job) (http_requests_total)"; let expr = lower_promql(query, AccuracyTarget::Exact).expect("query failed to lower"); - let space = search_workload(vec![("q", Rc::new(expr))]); + let space = search_workload(vec![("q", expr)]); let [(_, root)] = space.roots.as_slice() else { panic!("expected 1 root"); }; - let QueryExpr::BinaryOp { lhs, rhs, .. } = root.as_ref() else { + let Some(NonASAPOp::BinaryOp { lhs, rhs, .. }) = root.non_asap() else { panic!("expected a BinaryOp root, got {root:?}"); }; assert!( Rc::ptr_eq(lhs, rhs), - "the two identical sum-by-job branches must collapse onto one Rc" + "the two identical sum-by-job branches must collapse onto one Rc" ); let group = space diff --git a/crates/integration-tests/tests/exact_composition.rs b/crates/integration-tests/tests/exact_composition.rs index 917ef7b3a..f8e069a3d 100644 --- a/crates/integration-tests/tests/exact_composition.rs +++ b/crates/integration-tests/tests/exact_composition.rs @@ -1,5 +1,5 @@ //! Issue #171 — composing exact operators with summary plans across -//! explicit update/readout boundaries, end to end through +//! explicit update/evaluation boundaries, end to end through //! `search_workload_with` → `CandidateLogicalASAPDAGs::global_selection` → //! `GlobalSelection::assemble_selected_dag` → `dag_export`. //! @@ -16,27 +16,37 @@ use asap_aware_mapping::cost_model::{ CostProvenance, CostUnit, ExactCompositionCostInputs, ExactCompositionCostRequest, ValueOperationCapabilities, }; +use asap_aware_mapping::exact_composition::ExactOperation; use asap_aware_mapping::replacement::{ - default_strategies_with, search_workload_with, Replacement, ReplacementProvenance, - ReplacementStrategy, SketchAlgorithmStrategy, TargetSubDAG, + default_strategies_with, search_workload_with, ASAPStrategies, Replacement, + ReplacementProvenance, ReplacementStrategy, TargetSubDAG, }; use asap_aware_mapping::{ CostModel, DefaultCostModel, EvaluationRate, ExplanationKind, OperationPlacement, }; use asap_integration_tests::fixtures::lower_promql; +use asap_integration_tests::post_asap::{maintained, post_asap_dag, timed}; use asap_types::dag_export; +use asap_types::ir::export::{NonASAPOpKind, PhysicalASAPOperatorPayload}; +use asap_types::ir::operator_properties::{Reduction, Source}; +use asap_types::ir::timing::data_state; +use asap_types::ir::{ASAPOp, NonASAPOp, Operator, OperatorNode, TimeRangeKind}; use asap_types::post_asap::{ - validate_execution_data_states, ExactKind, ExactOperation, ExecutionDataState, ExecutionTiming, - FieldDataType, SketchAlgorithm, SummaryExpr, SummaryNode, SummaryUpdate, + ExactKind, ExecutionDataState, ExecutionTiming, FieldDataType, SketchAlgorithm, SummaryUpdate, }; use asap_types::pre_asap::agg_intent::{default_quantile, AggIntent}; -use asap_types::pre_asap::query_expr::{QueryExpr, Reduction, Source}; use asap_types::pre_asap::schema::{DataType, Field, Schema}; + use asap_types::types::AccuracyTarget; // ── fixtures ──────────────────────────────────────────────────────────── -fn metric_scan(labels: &[&str]) -> QueryExpr { +fn node(op: NonASAPOp) -> Rc { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(op)) + .expect("fixture node derives its schema") +} + +fn metric_scan(labels: &[&str]) -> Rc { let mut columns = vec![ Field::plain("ts", DataType::Timestamp, false), Field::plain("value", DataType::Float64, false), @@ -46,17 +56,17 @@ fn metric_scan(labels: &[&str]) -> QueryExpr { .iter() .map(|n| Field::plain(*n, DataType::Utf8, true)), ); - QueryExpr::Scan { + node(NonASAPOp::Scan { source: Source::TimeSeries { metric: "latency".into(), }, predicates: vec![], schema: Schema::with_time_index(columns, 0, vec![]), - } + }) } -fn agg(by: Vec, intent: AggIntent, child: Rc) -> Rc { - Rc::new(QueryExpr::Aggregate { +fn agg(by: Vec, intent: AggIntent, child: Rc) -> Rc { + node(NonASAPOp::Aggregate { reduction: Reduction::by(by), measures: vec![intent], output_names: vec![], @@ -66,8 +76,8 @@ fn agg(by: Vec, intent: AggIntent, child: Rc) -> Rc }) } -fn per_entity(intent: AggIntent, child: Rc) -> Rc { - Rc::new(QueryExpr::Aggregate { +fn per_entity(intent: AggIntent, child: Rc) -> Rc { + node(NonASAPOp::Aggregate { reduction: Reduction::PerEntity, measures: vec![intent], output_names: vec![], @@ -78,11 +88,11 @@ fn per_entity(intent: AggIntent, child: Rc) -> Rc { } /// `quantile by (zone, host) (latency)` — the fine-grained inner summary. -fn fine_quantile() -> Rc { +fn fine_quantile() -> Rc { agg( vec![2, 3], default_quantile(0.99), - Rc::new(metric_scan(&["zone", "host"])), + metric_scan(&["zone", "host"]), ) } @@ -96,7 +106,7 @@ struct StatsModel; fn custom_accuracy_rule_survives_root_target_and_materialization() { use asap_aware_mapping::{AccuracyModel, DefaultAccuracyModel, PropagationStats}; use asap_types::post_asap::{ - AccuracyError, CompositionOperator, ExactOperation, ResultGuarantee, SketchStatistic, + AccuracyError, CompositionOperator, ResultGuarantee, SketchStatistic, }; struct Model; impl AccuracyModel for Model { @@ -278,34 +288,44 @@ fn unknown_runtime_capability_keeps_candidate_but_prevents_selection() { } fn plan( - roots: Vec<(&'static str, Rc)>, + roots: Vec<(&'static str, Rc)>, cost_model: &dyn CostModel, ) -> asap_aware_mapping::CandidateLogicalASAPDAGs<&'static str> { search_workload_with(roots, &default_strategies_with(cost_model)) } -fn is_plain(node: &SummaryNode) -> bool { +fn is_plain(node: &OperatorNode) -> bool { node.schema .fields .iter() .all(|f| matches!(f.dtype, FieldDataType::Plain(_))) } -fn names(node: &SummaryNode) -> Vec<&str> { +fn names(node: &OperatorNode) -> Vec<&str> { node.schema.fields.iter().map(|f| f.name.as_str()).collect() } +/// The composed query-time shape: an exact `Aggregate` directly over a +/// summary evaluation, at query time. +fn is_query_time_fold(node: &OperatorNode) -> bool { + matches!( + node.non_asap(), + Some(NonASAPOp::Aggregate { child, .. }) + if matches!(child.operator, Operator::ASAP(ASAPOp::SummaryEstimate { .. })) + ) +} + // ── step 1: pin every already-supported exact-accumulator nesting ─────── #[test] fn every_exact_accumulator_is_finalized_before_an_outer_sketch() { use std::time::Duration; - let cases: Vec<(Rc, ExactKind)> = vec![ + let cases: Vec<(Rc, ExactKind)> = vec![ ( agg( vec![2], AggIntent::Sum { col: None }, - Rc::new(metric_scan(&["zone"])), + metric_scan(&["zone"]), ), ExactKind::Sum, ), @@ -315,7 +335,7 @@ fn every_exact_accumulator_is_finalized_before_an_outer_sketch() { AggIntent::Count { accuracy: AccuracyTarget::Exact, }, - Rc::new(metric_scan(&["zone"])), + metric_scan(&["zone"]), ), ExactKind::Count, ), @@ -323,7 +343,7 @@ fn every_exact_accumulator_is_finalized_before_an_outer_sketch() { agg( vec![2], AggIntent::Min { col: None }, - Rc::new(metric_scan(&["zone"])), + metric_scan(&["zone"]), ), ExactKind::Min, ), @@ -331,16 +351,17 @@ fn every_exact_accumulator_is_finalized_before_an_outer_sketch() { agg( vec![2], AggIntent::Max { col: None }, - Rc::new(metric_scan(&["zone"])), + metric_scan(&["zone"]), ), ExactKind::Max, ), ( per_entity( AggIntent::Rate, - Rc::new(QueryExpr::TimeRange { + node(NonASAPOp::TimeRange { range: Duration::from_secs(300), - child: Rc::new(metric_scan(&["zone"])), + kind: TimeRangeKind::Range, + child: metric_scan(&["zone"]), }), ), ExactKind::Rate, @@ -348,9 +369,10 @@ fn every_exact_accumulator_is_finalized_before_an_outer_sketch() { ( per_entity( AggIntent::Increase, - Rc::new(QueryExpr::TimeRange { + node(NonASAPOp::TimeRange { range: Duration::from_secs(300), - child: Rc::new(metric_scan(&["zone"])), + kind: TimeRangeKind::Range, + child: metric_scan(&["zone"]), }), ), ExactKind::Increase, @@ -359,40 +381,43 @@ fn every_exact_accumulator_is_finalized_before_an_outer_sketch() { for (inner, kind) in cases { let outer = agg(vec![], default_quantile(0.9), inner); let target = TargetSubDAG::new(&outer); - let candidates = SketchAlgorithmStrategy::default_cost_model().replacements(&target); - let Replacement::Summary(root) = &candidates[0].replacement else { + let candidates = ASAPStrategies::default_cost_model().replacements(&target); + let Replacement::SubDAG(root) = &candidates[0].replacement else { unreachable!() }; - let SummaryExpr::SummaryEstimate { summary_input, .. } = &root.expr else { - panic!("expected KLL readout, got {:?}", root.expr); + // Timing is not stored on the plan: time it with the outer summary + // maintained (which also validates every edge) and inspect the copy. + let root = maintained(root); + let Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) = &root.operator else { + panic!("expected KLL evaluation, got {:?}", root.operator); }; - let SummaryExpr::SummaryAgg { child, .. } = &summary_input.expr else { + let Operator::ASAP(ASAPOp::SummaryAgg { child, .. }) = &summary_input.operator else { panic!("expected outer SummaryAgg"); }; - let SummaryExpr::ValueOperation { - child, - operation: asap_types::post_asap::ValueOperation::FinalizeExactAccumulator, - timing: ExecutionTiming::IngestionTime, - } = &child.expr + let Operator::ASAP(ASAPOp::FinalizeExactAccumulator { child: finalized }) = &child.operator else { panic!("{kind:?}: missing maintenance finalization"); }; + assert_eq!( + child.timing, + Some(ExecutionTiming::IngestionTime), + "{kind:?}: finalization runs at maintenance time" + ); assert!( matches!( - &child.expr, - SummaryExpr::SummaryAgg { family: FieldDataType::ExactAggregate(k, _), .. } if *k == kind + &finalized.operator, + Operator::ASAP(ASAPOp::SummaryAgg { family: FieldDataType::ExactAggregate(k, _), .. }) if *k == kind ), "{kind:?}: expected the exact accumulator under its finalization, got {:?}", - child.expr + finalized.operator ); - validate_execution_data_states(root).expect("accumulator state composes under maintenance"); } } -// ── direction 1: outer exact fold over an inner summary readout ──────── +// ── direction 1: outer exact fold over an inner summary evaluation ──────── -/// Before this PR both `max`/`avg` over a quantile collapsed into one -/// opaque `KeepPreAsap`. Now: the outer group holds an `ValueOperationAtQueryTime` +/// `max`/`avg` over a quantile does not collapse into one opaque kept +/// sub-DAG: the outer group holds an `ValueOperationAtQueryTime` /// candidate referencing the inner target, the inner group keeps its own /// sketch candidates, and with statistics the pair is committed and /// materializes as `ValueOperationAtQueryTime → SummaryEstimate → SummaryAgg`. @@ -402,7 +427,7 @@ fn max_and_avg_over_quantile_compose_at_query_time_with_statistics() { let root = agg(vec![0], intent.clone(), fine_quantile()); let space = plan(vec![("q", Rc::clone(&root))], &StatsModel); let root = Rc::clone(&space.roots[0].1); - let QueryExpr::Aggregate { child: inner, .. } = root.as_ref() else { + let Some(NonASAPOp::Aggregate { child: inner, .. }) = root.non_asap() else { unreachable!() }; @@ -419,9 +444,9 @@ fn max_and_avg_over_quantile_compose_at_query_time_with_statistics() { inner_group .candidates .iter() - .any(|c| matches!(&c.replacement, Replacement::Summary(n) - if matches!(n.expr, SummaryExpr::SummaryEstimate { .. }))), - "{intent:?}: the inner quantile keeps its own readout candidates" + .any(|c| matches!(&c.replacement, Replacement::SubDAG(n) + if matches!(n.operator, Operator::ASAP(ASAPOp::SummaryEstimate { .. })))), + "{intent:?}: the inner quantile keeps its own evaluation candidates" ); let selection = space.global_selection(&StatsModel); @@ -449,18 +474,16 @@ fn max_and_avg_over_quantile_compose_at_query_time_with_statistics() { )); let composed = selection.assemble_selected_dag(&root).unwrap().unwrap(); - let SummaryExpr::ValueOperation { - child, - timing: ExecutionTiming::QueryTime, - .. - } = &composed.expr - else { + let Some(NonASAPOp::Aggregate { child, .. }) = composed.non_asap() else { panic!( "{intent:?}: expected ValueOperationAtQueryTime root, got {:?}", - composed.expr + composed.operator ); }; - assert!(matches!(child.expr, SummaryExpr::SummaryEstimate { .. })); + assert!(matches!( + child.operator, + Operator::ASAP(ASAPOp::SummaryEstimate { .. }) + )); assert!( child.guarantee.is_some(), "child has its KLL rank guarantee" @@ -472,15 +495,18 @@ fn max_and_avg_over_quantile_compose_at_query_time_with_statistics() { assert!(is_plain(&composed)); assert_eq!( names(&composed), - root.output_schema() - .unwrap() + root.schema .fields .iter() .map(|c| c.name.as_str()) .collect::>(), "the composed plan's schema is the pre-ASAP target's own" ); - validate_execution_data_states(&composed).unwrap(); + assert_eq!( + timed(&composed).timing, + Some(ExecutionTiming::QueryTime), + "{intent:?}: the exact fold runs at query time" + ); } } @@ -490,11 +516,7 @@ fn max_and_avg_over_quantile_compose_at_query_time_with_statistics() { fn avg_over_quantile_keeps_the_sum_over_count_rewrite_as_a_competitor() { // `by (zone)` over `by (zone)`: the averaged column resolves to the // non-null quantile output, which is what the rewrite requires. - let inner = agg( - vec![2], - default_quantile(0.99), - Rc::new(metric_scan(&["zone"])), - ); + let inner = agg(vec![2], default_quantile(0.99), metric_scan(&["zone"])); let root = agg(vec![0], AggIntent::Avg { col: None }, inner); let space = plan(vec![("q", root)], &StatsModel); let group = space.candidates_for_target(&space.roots[0].1).unwrap(); @@ -508,11 +530,7 @@ fn avg_over_quantile_keeps_the_sum_over_count_rewrite_as_a_competitor() { /// is the same, only the fold's row multiplicity differs. #[test] fn identity_and_genuine_multi_row_folds_both_compose() { - let identity_inner = agg( - vec![2], - default_quantile(0.99), - Rc::new(metric_scan(&["zone"])), - ); + let identity_inner = agg(vec![2], default_quantile(0.99), metric_scan(&["zone"])); for (label, inner) in [ ("identity", identity_inner), ("fine-to-coarse", fine_quantile()), @@ -527,14 +545,17 @@ fn identity_and_genuine_multi_row_folds_both_compose() { .unwrap(); assert!( matches!( - composed.expr, - SummaryExpr::ValueOperation { - timing: ExecutionTiming::QueryTime, - .. - } + composed.non_asap(), + Some(NonASAPOp::Aggregate { child, .. }) + if matches!(child.operator, Operator::ASAP(ASAPOp::SummaryEstimate { .. })) ), "{label}: {:?}", - composed.expr + composed.operator + ); + assert_eq!( + timed(&composed).timing, + Some(ExecutionTiming::QueryTime), + "{label}" ); assert_eq!(names(&composed), vec!["zone", "max"], "{label}"); } @@ -543,7 +564,7 @@ fn identity_and_genuine_multi_row_folds_both_compose() { /// One inner quantile consumed by two outer folds in two queries: CSE /// collapses the inner target onto one `Rc`, both compositions commit to /// the *same* child candidate, and both materializations share one -/// `Rc` for it — the summary is maintained once. +/// `Rc` for it — the summary is maintained once. #[test] fn a_shared_inner_summary_is_materialized_once_for_several_outer_folds() { let max = agg(vec![0], AggIntent::Max { col: None }, fine_quantile()); @@ -551,9 +572,9 @@ fn a_shared_inner_summary_is_materialized_once_for_several_outer_folds() { let space = plan(vec![("max", max), ("min", min)], &StatsModel); let selection = space.global_selection(&StatsModel); - let roots: Vec> = space.roots.iter().map(|(_, r)| Rc::clone(r)).collect(); - let inner_of = |r: &Rc| match r.as_ref() { - QueryExpr::Aggregate { child, .. } => Rc::clone(child), + let roots: Vec> = space.roots.iter().map(|(_, r)| Rc::clone(r)).collect(); + let inner_of = |r: &Rc| match r.non_asap() { + Some(NonASAPOp::Aggregate { child, .. }) => Rc::clone(child), _ => unreachable!(), }; assert!( @@ -589,17 +610,20 @@ fn a_shared_inner_summary_is_materialized_once_for_several_outer_folds() { .iter() .map(|r| selection.assemble_selected_dag(r).unwrap().unwrap()) .collect(); - let child_of = |n: &Rc| match &n.expr { - SummaryExpr::ValueOperation { - child, - timing: ExecutionTiming::QueryTime, - .. - } => Rc::clone(child), - other => panic!("expected ValueOperationAtQueryTime, got {other:?}"), + let child_of = |n: &Rc| match n.non_asap() { + Some(NonASAPOp::Aggregate { child, .. }) + if matches!( + child.operator, + Operator::ASAP(ASAPOp::SummaryEstimate { .. }) + ) => + { + Rc::clone(child) + } + _ => panic!("expected ValueOperationAtQueryTime, got {:?}", n.operator), }; assert!( Rc::ptr_eq(&child_of(&composed[0]), &child_of(&composed[1])), - "both folds compose over the same Rc" + "both folds compose over the same Rc" ); } @@ -614,15 +638,16 @@ fn outer_summary_over_an_exact_function_composes_at_ingestion_time() { use std::time::Duration; let deriv = per_entity( AggIntent::Deriv, - Rc::new(QueryExpr::TimeRange { + node(NonASAPOp::TimeRange { range: Duration::from_secs(300), - child: Rc::new(metric_scan(&["zone"])), + kind: TimeRangeKind::Range, + child: metric_scan(&["zone"]), }), ); let root = agg(vec![], default_quantile(0.99), deriv); let space = plan(vec![("q", root)], &StatsModel); let root = Rc::clone(&space.roots[0].1); - let QueryExpr::Aggregate { child: deriv, .. } = root.as_ref() else { + let Some(NonASAPOp::Aggregate { child: deriv, .. }) = root.non_asap() else { unreachable!() }; assert!(space @@ -643,33 +668,25 @@ fn outer_summary_over_an_exact_function_composes_at_ingestion_time() { assert!(decision.cost_rate < decision.baseline_rate); let composed = selection.assemble_selected_dag(&root).unwrap().unwrap(); - let SummaryExpr::SummaryEstimate { summary_input, .. } = &composed.expr else { - panic!("expected readout root, got {:?}", composed.expr); + // Walk the timed copy, with the outer summary maintained at ingestion time. + let composed = maintained(&composed); + let Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) = &composed.operator else { + panic!("expected evaluation root, got {:?}", composed.operator); }; - let SummaryExpr::SummaryAgg { child, .. } = &summary_input.expr else { + let Operator::ASAP(ASAPOp::SummaryAgg { child, .. }) = &summary_input.operator else { panic!("expected SummaryAgg"); }; - let SummaryExpr::ValueOperation { - child: raw, - timing: ExecutionTiming::IngestionTime, - .. - } = &child.expr - else { + let Some(NonASAPOp::Aggregate { child: raw, .. }) = child.non_asap() else { panic!( "expected ValueOperationAtIngestionTime under the maintained summary, got {:?}", - child.expr + child.operator ); }; - assert!(matches!(raw.expr, SummaryExpr::KeepPreAsap(_))); - let assignment = validate_execution_data_states(&composed).unwrap(); - assert_eq!( - assignment.data_state_of(child), - Some(ExecutionDataState::INGESTION_ROWS) - ); - assert_eq!( - assignment.data_state_of(raw), - Some(ExecutionDataState::INGESTION_ROWS) - ); + // The raw input is kept as-is. + assert!(matches!(raw.non_asap(), Some(NonASAPOp::TimeRange { .. }))); + assert!(!raw.contains_asap()); + assert_eq!(data_state(child), Some(ExecutionDataState::INGESTION_ROWS)); + assert_eq!(data_state(raw), Some(ExecutionDataState::INGESTION_ROWS)); } // ── rejection, capability, statistics ─────────────────────────────────── @@ -685,24 +702,28 @@ fn summary_construction_follows_its_value_input_phase() { .assemble_selected_dag(&space.roots[0].1) .unwrap() .unwrap(); - let illegal = Rc::new(SummaryNode { - expr: SummaryExpr::SummaryAgg { - child: post, - family: FieldDataType::ExactAggregate( - ExactKind::Max, - asap_types::post_asap::ExactParams::Max, - ), - input: SummaryUpdate::column(asap_types::pre_asap::ColumnRef::SampleValue), - reduction: Reduction::by(vec![]), - grouping: Default::default(), - filter: None, - }, - schema: asap_types::post_asap::Schema::lifted(vec![], None), - guarantee: None, - }); - let state = asap_types::post_asap::produced_data_state(&illegal.expr).unwrap(); + let illegal = std::rc::Rc::new( + OperatorNode::with_schema( + asap_types::ir::Operator::ASAP(ASAPOp::SummaryAgg { + child: post, + family: FieldDataType::ExactAggregate( + ExactKind::Max, + asap_types::post_asap::ExactParams::Max, + ), + input: SummaryUpdate::column(asap_types::pre_asap::ColumnRef::SampleValue), + reduction: Reduction::by(vec![]), + grouping: Default::default(), + filter: None, + }), + Schema::lifted(vec![], None), + ) + .with_guarantee(None), + ); + // Even under an ingestion-time consumer the state is built at query + // time, because a evaluation sits below it. + let state = asap_types::ir::planned_data_state(&illegal, ExecutionTiming::IngestionTime); assert_eq!(state.timing, ExecutionTiming::QueryTime); - asap_types::post_asap::validate_execution_data_states_at(&illegal, state).unwrap(); + asap_types::ir::validate_maintained(&illegal, state.timing).unwrap(); } #[test] @@ -718,9 +739,9 @@ fn a_runtime_without_mixed_execution_gets_no_composition_candidates() { let selection = space.global_selection(&NoCapabilityModel); assert!(selection.for_target(&root).unwrap().composition.is_none()); let node = selection.assemble_selected_dag(&root).unwrap().unwrap(); - assert!(!matches!(node.expr, SummaryExpr::ValueOperation { .. })); + assert!(!is_query_time_fold(&node)); // The inner quantile is still independently selectable. - let QueryExpr::Aggregate { child, .. } = root.as_ref() else { + let Some(NonASAPOp::Aggregate { child, .. }) = root.non_asap() else { unreachable!() }; assert!(selection.for_target(child).unwrap().chosen.is_some()); @@ -731,7 +752,7 @@ fn a_runtime_without_mixed_execution_gets_no_composition_candidates() { /// site keeps a non-composed alternative, and the inner summary stays /// independently selectable. #[test] -fn missing_cost_statistics_preserve_the_conservative_keep_pre_asap() { +fn missing_cost_statistics_preserve_the_conservative_retain_exact() { let root = agg(vec![0], AggIntent::Max { col: None }, fine_quantile()); let space = plan(vec![("q", root)], &DefaultCostModel); let root = Rc::clone(&space.roots[0].1); @@ -749,9 +770,9 @@ fn missing_cost_statistics_preserve_the_conservative_keep_pre_asap() { Some(Replacement::ExactComposition(_)) )); let node = selection.assemble_selected_dag(&root).unwrap().unwrap(); - assert!(!matches!(node.expr, SummaryExpr::ValueOperation { .. })); + assert!(!is_query_time_fold(&node)); - let explanations = asap_aware_mapping::explain_replacements(vec![("q", (*root).clone())]); + let explanations = asap_aware_mapping::explain_replacements(vec![("q", Rc::clone(&root))]); assert!(explanations .iter() .any(|e| e.kind == ExplanationKind::ExactComposition)); @@ -771,12 +792,19 @@ fn dag_export_carries_explicit_stage_and_plain_schema_for_a_composed_plan() { .unwrap(); let dag = dag_export::export_summary(&composed); let node = &dag.nodes[dag.root as usize]; - assert_eq!(node.kind, "ValueOperation"); - assert_eq!(node.detail["timing"], "query_time"); - assert!(node.detail["operation"] - .as_str() - .unwrap() - .starts_with("Exact(Aggregate")); + assert_eq!(node.kind, "aggregate"); + assert!(node.detail["measures"].is_array()); + // Timing is explicit in the wire-6 DAG: the root is a relational + // aggregate placed at query time. + let wire = post_asap_dag(&composed); + let wire_root = wire.nodes.iter().find(|n| n.id == wire.roots[0]).unwrap(); + assert!(matches!( + wire_root.payload, + PhysicalASAPOperatorPayload::Relational { + operator: NonASAPOpKind::Aggregate { .. } + } + )); + assert_eq!(wire_root.output_state.timing, ExecutionTiming::QueryTime); // Pre-ASAP export of the same target still describes the same columns. let pre = dag_export::export(root); @@ -798,7 +826,7 @@ fn promql_max_by_zone_over_quantile_over_time_composes() { AccuracyTarget::Epsilon(0.01), ) .unwrap(); - let space = plan(vec![("q", Rc::new(expr))], &StatsModel); + let space = plan(vec![("q", expr)], &StatsModel); let root = &space.roots[0].1; let selection = space.global_selection(&StatsModel); let selected = selection.for_target(root).unwrap(); @@ -815,13 +843,8 @@ fn promql_max_by_zone_over_quantile_over_time_composes() { .collect::>() ); let composed = selection.assemble_selected_dag(root).unwrap().unwrap(); - assert!(matches!( - composed.expr, - SummaryExpr::ValueOperation { - timing: ExecutionTiming::QueryTime, - .. - } - )); + assert!(is_query_time_fold(&composed), "{:?}", composed.operator); + assert_eq!(timed(&composed).timing, Some(ExecutionTiming::QueryTime)); assert_eq!( selected.composition.as_ref().map(|d| d.inputs.unit), Some(CostUnit::CostUnitsPerSecond) diff --git a/crates/integration-tests/tests/frontend_timestamps.rs b/crates/integration-tests/tests/frontend_timestamps.rs index 388261da6..300f0cee7 100644 --- a/crates/integration-tests/tests/frontend_timestamps.rs +++ b/crates/integration-tests/tests/frontend_timestamps.rs @@ -1,9 +1,9 @@ //! Cross-frontend evaluation-time semantics (issues #46 and #184). use asap_frontend_sql::{lower_sql, SqlCatalog}; -use asap_integration_tests::fixtures::lower_promql; +use asap_integration_tests::fixtures::lower_promql_root; +use asap_types::ir::{NonASAPOp, ScalarExpr}; use asap_types::pre_asap::schema::{DataType, Field, Schema}; -use asap_types::pre_asap::QueryExpr; use asap_types::types::AccuracyTarget; /// PromQL exposes its evaluation time as Unix seconds, whereas SQL exposes @@ -11,10 +11,21 @@ use asap_types::types::AccuracyTarget; /// but must remain distinguishable in the shared IR and type inference. #[tokio::test] async fn promql_eval_time_and_sql_current_timestamp_remain_distinct() { - let promql = lower_promql("time()", AccuracyTarget::Exact).expect("lower PromQL time()"); - assert!(matches!(promql, QueryExpr::EvalTimestamp)); - let promql_schema = promql.output_schema().expect("PromQL time() schema"); - assert_eq!(promql_schema.fields[0].dtype, DataType::Float64); + let promql = lower_promql_root("time()", AccuracyTarget::Exact).expect("lower PromQL time()"); + assert!( + matches!( + promql, + asap_types::ir::QueryRoot::Scalar(ScalarExpr::EvalTimestamp) + ), + "expected a bare evaluation-time scalar, got {promql:?}" + ); + assert_eq!( + ScalarExpr::EvalTimestamp + .scalar_type(&Schema::default()) + .unwrap() + .0, + DataType::Float64 + ); let catalog = SqlCatalog::new().with_table( "metrics", @@ -27,13 +38,14 @@ async fn promql_eval_time_and_sql_current_timestamp_remain_distinct() { ) .await .expect("lower SQL CURRENT_TIMESTAMP"); - let QueryExpr::Project { cols, .. } = sql else { + let Some(NonASAPOp::Project { cols, child, .. }) = sql.non_asap() else { panic!("expected SQL projection, got {sql:?}"); }; - assert!(matches!(&cols[0].expr, QueryExpr::CurrentTimestamp)); - let sql_schema = cols[0] + assert!(matches!(&cols[0].expr, ScalarExpr::CurrentTimestamp)); + let (sql_dtype, _) = cols[0] .expr - .output_schema() - .expect("SQL CURRENT_TIMESTAMP schema"); - assert_eq!(sql_schema.fields[0].dtype, DataType::Timestamp); + .scalar_type(&child.schema) + .expect("SQL CURRENT_TIMESTAMP type"); + assert_eq!(sql_dtype, DataType::Timestamp); + assert_eq!(sql.schema.fields[0].dtype, DataType::Timestamp); } diff --git a/crates/integration-tests/tests/kll_pane_execution.rs b/crates/integration-tests/tests/kll_pane_execution.rs index b48d14bf7..4869d681b 100644 --- a/crates/integration-tests/tests/kll_pane_execution.rs +++ b/crates/integration-tests/tests/kll_pane_execution.rs @@ -1,7 +1,7 @@ //! Maintenance -> stored pane state -> independently bound query execution. mod physical_common; use asap_physical_operators::{ - operators::{Operator, ReadoutQuery}, + operators::{Operator, SummaryEvaluation}, physical_planner::{CompiledPhysicalDAG, InputContract, Source}, plan::{PhysicalDAG, PhysicalOperator, PlanProperties}, runtime::{Input, Limits, OutputStream, RunContext, Scope}, @@ -32,8 +32,8 @@ fn family(k: u32) -> FieldDataType { } fn raw_schema() -> SchemaRef { Arc::new(Schema { - closed: true, unique_keys: vec![], + closed: false, fields: vec![Field { table: None, name: "value".into(), @@ -98,11 +98,11 @@ fn restore(schema: SchemaRef, states: &[Arc]) -> Batch { ) .unwrap() } -fn readout(schema: SchemaRef, q: f64) -> Operator { - Operator::readout( +fn evaluation(schema: SchemaRef, q: f64) -> Operator { + Operator::evaluation( schema, 0, - ReadoutQuery::Sketch(SketchStatistic::Quantile { q }), + SummaryEvaluation::Sketch(SketchStatistic::Quantile { q }), ) .unwrap() } @@ -159,8 +159,8 @@ fn five_panes_roundtrip_and_shared_merge_runs_once() { ), ), (6, (vec![5], merge.clone())), - (7, (vec![6], readout(schema.clone(), 0.5))), - (8, (vec![6], readout(schema.clone(), 0.99))), + (7, (vec![6], evaluation(schema.clone(), 0.5))), + (8, (vec![6], evaluation(schema.clone(), 0.99))), ]), vec![6, 7, 8], ) @@ -247,8 +247,10 @@ fn five_panes_roundtrip_and_shared_merge_runs_once() { }, ) .unwrap(); - dag.add(2, vec![1], readout(schema.clone(), 0.5)).unwrap(); - dag.add(3, vec![1], readout(schema.clone(), 0.99)).unwrap(); + dag.add(2, vec![1], evaluation(schema.clone(), 0.5)) + .unwrap(); + dag.add(3, vec![1], evaluation(schema.clone(), 0.99)) + .unwrap(); let outputs = block_on(futures::future::join_all( dag.execute( &[2, 3], diff --git a/crates/integration-tests/tests/nested.rs b/crates/integration-tests/tests/nested.rs index 1e3e34ebd..26ac23a24 100644 --- a/crates/integration-tests/tests/nested.rs +++ b/crates/integration-tests/tests/nested.rs @@ -1,8 +1,8 @@ //! Multi-node pipeline tests — nested `Aggregate`, `TimeRange`, `BinaryOp`, and `Scan`. //! //! Key invariant: `rate`/`increase` are label-preserving (per-series), so an -//! outer `Aggregate.by` resolves its group keys against the inner aggregate's -//! output schema, which still carries all label columns. +//! outer `Aggregate` reduction resolves its group keys against the inner +//! aggregate's output schema, which still carries all label columns. //! //! Label column ordering is always alphabetical, so in a query that references //! both `job` and `status`: @@ -13,56 +13,107 @@ use std::time::Duration; use asap_integration_tests::fixtures::lower_promql; use asap_integration_tests::fixtures::metric_schema; +use asap_types::ir::{ + BinaryOperator, ExprSemantics, NonASAPOp, OperatorNode, Predicate, ScalarExpr, TimeRangeKind, +}; use asap_types::pre_asap::{ - AggIntent, ArithmeticOpKind, AtModifier, BinaryOpKind, CompareOpKind, GroupKeys, Predicate, - PromQLVectorSetOpKind, QueryExpr, Reduction, ScalarValue, Source, TimeShift, VectorMatch, - VectorMatchKind, + AggIntent, ArithmeticOpKind, AtModifier, BinaryOpKind, CompareOpKind, GroupKeys, + PromQLVectorSetOpKind, Reduction, ScalarValue, Source, TimeShift, VectorMatch, VectorMatchKind, }; use asap_types::types::AccuracyTarget; -fn lower(q: &str) -> QueryExpr { +fn lower(q: &str) -> Rc { lower_promql(q, AccuracyTarget::Exact).unwrap_or_else(|e| panic!("lower failed for {q:?}: {e}")) } -fn agg(by: Vec, intent: AggIntent, child: QueryExpr) -> QueryExpr { - QueryExpr::Aggregate { +fn node(op: NonASAPOp) -> Rc { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(op)) + .expect("fixture node derives its schema") +} + +fn scan(metric: &str, predicates: Vec, labels: &[&str]) -> Rc { + node(NonASAPOp::Scan { + source: Source::TimeSeries { + metric: metric.into(), + }, + predicates, + schema: metric_schema(labels), + }) +} + +fn instant(child: Rc) -> Rc { + node(NonASAPOp::TimeRange { + range: Duration::from_secs(1), + kind: TimeRangeKind::Instant, + child, + }) +} + +fn range(secs: u64, child: Rc) -> Rc { + node(NonASAPOp::TimeRange { + range: Duration::from_secs(secs), + kind: TimeRangeKind::Range, + child, + }) +} + +fn eq_pred(col_id: usize, value: &str) -> Predicate { + Predicate(ScalarExpr::Compare { + left: Box::new(ScalarExpr::Column(col_id)), + op: CompareOpKind::Eq, + right: Box::new(ScalarExpr::Literal(ScalarValue::Utf8(value.into()))), + semantics: ExprSemantics::Promql, + }) +} + +fn agg(by: Vec, intent: AggIntent, child: Rc) -> Rc { + node(NonASAPOp::Aggregate { reduction: Reduction::by(by), measures: vec![intent], output_names: vec!["".into()], filters: vec![], having: None, - child: Rc::new(child), - } + child, + }) } -fn agg_per_entity(intent: AggIntent, child: QueryExpr) -> QueryExpr { - QueryExpr::Aggregate { +fn agg_per_entity(intent: AggIntent, child: Rc) -> Rc { + node(NonASAPOp::Aggregate { reduction: Reduction::PerEntity, measures: vec![intent], output_names: vec!["".into()], filters: vec![], having: None, - child: Rc::new(child), - } + child, + }) +} + +fn binary( + kind: BinaryOpKind, + vector_match: Option, + lhs: Rc, + rhs: Rc, +) -> Rc { + node(NonASAPOp::BinaryOp { + operator: BinaryOperator { + checked_relative_division: false, + checked_finite_division: false, + kind, + vector_match, + }, + return_bool: false, + lhs, + rhs, + }) } // #22 — sum by job over rate; outer by=[2] resolves against rate's // label-preserving output schema [ts, value, job] #[test] fn q22_sum_by_job_over_rate() { - let scan = QueryExpr::Scan { - source: Source::TimeSeries { - metric: "http_requests_total".into(), - }, - predicates: vec![], - schema: metric_schema(&["job"]), - }; let inner_rate = agg_per_entity( AggIntent::Rate, - QueryExpr::TimeRange { - range: Duration::from_secs(300), - child: Rc::new(scan), - }, + range(300, scan("http_requests_total", vec![], &["job"])), ); let expected = agg(vec![2], AggIntent::Sum { col: None }, inner_rate); assert_eq!( @@ -76,25 +127,12 @@ fn q22_sum_by_job_over_rate() { // predicate on status (col 3); group key job (col 2) #[test] fn q23_sum_by_job_over_filtered_scan() { - let scan = QueryExpr::Scan { - source: Source::TimeSeries { - metric: "http_requests_total".into(), - }, - predicates: vec![Predicate(Rc::new(QueryExpr::Compare { - left: Rc::new(QueryExpr::Column(3)), - op: CompareOpKind::Eq, - right: Rc::new(QueryExpr::Literal(ScalarValue::Utf8("200".into()))), - }))], - schema: metric_schema(&["job", "status"]), - }; - let expected = agg( - vec![2], - AggIntent::Sum { col: None }, - QueryExpr::TimeRange { - range: Duration::from_secs(1), - child: Rc::new(scan), - }, + let scan = scan( + "http_requests_total", + vec![eq_pred(3, "200")], + &["job", "status"], ); + let expected = agg(vec![2], AggIntent::Sum { col: None }, instant(scan)); assert_eq!( lower(r#"sum by (job) (http_requests_total{status="200"})"#), expected @@ -108,54 +146,30 @@ fn q23_sum_by_job_over_filtered_scan() { // schema [ts, value, job]; outer by=[2] (job) #[test] fn q25_div_over_complex_sub_dags() { - let lhs_scan = QueryExpr::Scan { - source: Source::TimeSeries { - metric: "http_requests_total".into(), - }, - predicates: vec![Predicate(Rc::new(QueryExpr::Compare { - left: Rc::new(QueryExpr::Column(3)), - op: CompareOpKind::Eq, - right: Rc::new(QueryExpr::Literal(ScalarValue::Utf8("200".into()))), - }))], - schema: metric_schema(&["job", "status"]), - }; + let lhs_scan = scan( + "http_requests_total", + vec![eq_pred(3, "200")], + &["job", "status"], + ); let lhs = agg( vec![2], AggIntent::Sum { col: None }, - agg_per_entity( - AggIntent::Rate, - QueryExpr::TimeRange { - range: Duration::from_secs(300), - child: Rc::new(lhs_scan), - }, - ), + agg_per_entity(AggIntent::Rate, range(300, lhs_scan)), ); - let rhs_scan = QueryExpr::Scan { - source: Source::TimeSeries { - metric: "http_errors_total".into(), - }, - predicates: vec![], - schema: metric_schema(&["job"]), - }; + let rhs_scan = scan("http_errors_total", vec![], &["job"]); let rhs = agg( vec![2], AggIntent::Sum { col: None }, - agg_per_entity( - AggIntent::Rate, - QueryExpr::TimeRange { - range: Duration::from_secs(300), - child: Rc::new(rhs_scan), - }, - ), + agg_per_entity(AggIntent::Rate, range(300, rhs_scan)), ); - let expected = QueryExpr::BinaryOp { - op: BinaryOpKind::Arithmetic(ArithmeticOpKind::Div), - lhs: Rc::new(lhs), - rhs: Rc::new(rhs), - vector_match: None, - }; + let expected = binary( + BinaryOpKind::Arithmetic(ArithmeticOpKind::Div), + None, + lhs, + rhs, + ); assert_eq!( lower( r#"sum by (job) (rate(http_requests_total{status="200"}[5m])) / sum by (job) (rate(http_errors_total[5m]))"# @@ -171,19 +185,9 @@ fn q25_div_over_complex_sub_dags() { // label-preserving output schema; the outer `max` has no grouping. #[test] fn q27_max_over_sum_by_job_over_rate() { - let scan = QueryExpr::Scan { - source: Source::TimeSeries { - metric: "http_requests_total".into(), - }, - predicates: vec![], - schema: metric_schema(&["job"]), - }; let inner_rate = agg_per_entity( AggIntent::Rate, - QueryExpr::TimeRange { - range: Duration::from_secs(300), - child: Rc::new(scan), - }, + range(300, scan("http_requests_total", vec![], &["job"])), ); let sum_by_job = agg(vec![2], AggIntent::Sum { col: None }, inner_rate); let expected = agg(vec![], AggIntent::Max { col: None }, sum_by_job); @@ -201,25 +205,12 @@ fn q27_max_over_sum_by_job_over_rate() { // Scan schema: [ts(0), value(1), group(2), job(3)] (labels alphabetical). #[test] fn q53_outer_group_key_absent_from_nested_aggregate() { - let scan = QueryExpr::Scan { - source: Source::TimeSeries { - metric: "http_requests".into(), - }, - predicates: vec![Predicate(Rc::new(QueryExpr::Compare { - left: Rc::new(QueryExpr::Column(3)), - op: CompareOpKind::Eq, - right: Rc::new(QueryExpr::Literal(ScalarValue::Utf8("api-server".into()))), - }))], - schema: metric_schema(&["group", "job"]), - }; - let inner = agg( - vec![2], - AggIntent::Sum { col: None }, - QueryExpr::TimeRange { - range: Duration::from_secs(1), - child: Rc::new(scan), - }, + let scan = scan( + "http_requests", + vec![eq_pred(3, "api-server")], + &["group", "job"], ); + let inner = agg(vec![2], AggIntent::Sum { col: None }, instant(scan)); let expected = agg(vec![], AggIntent::Sum { col: None }, inner); assert_eq!( lower(r#"sum(sum by (group)(http_requests{job="api-server"})) by (job)"#), @@ -236,33 +227,26 @@ fn q53_outer_group_key_absent_from_nested_aggregate() { // parser's default `ignoring([])` match modifier. #[test] fn q52_outer_name_label_over_binary_op() { - let side = |metric: &str, env: &str| QueryExpr::TimeRange { - range: Duration::from_secs(1), - child: Rc::new(QueryExpr::Scan { - source: Source::TimeSeries { - metric: metric.into(), - }, - predicates: vec![Predicate(Rc::new(QueryExpr::Compare { - left: Rc::new(QueryExpr::Column(2)), // env - op: CompareOpKind::Eq, - right: Rc::new(QueryExpr::Literal(ScalarValue::Utf8(env.into()))), - }))], - schema: metric_schema(&["env", "__name__"]), - }), + let side = |metric: &str, env: &str| { + instant(scan( + metric, + vec![eq_pred(2, env)], // env + &["env", "__name__"], + )) }; let expected = agg( vec![3], // __name__ AggIntent::Sum { col: None }, - QueryExpr::BinaryOp { - op: BinaryOpKind::Set(PromQLVectorSetOpKind::Or), - lhs: Rc::new(side("metric_a", "1")), - rhs: Rc::new(side("metric_b", "2")), - vector_match: Some(VectorMatch { + binary( + BinaryOpKind::Set(PromQLVectorSetOpKind::Or), + Some(VectorMatch { kind: VectorMatchKind::Ignoring, labels: vec![], grouping: None, }), - }, + side("metric_a", "1"), + side("metric_b", "2"), + ), ); assert_eq!( lower(r#"sum by (__name__)(metric_a{env="1"} or metric_b{env="2"})"#), @@ -276,28 +260,18 @@ fn q52_outer_name_label_over_binary_op() { // the inner rate is label-preserving. Scan schema [ts(0), value(1), instance(2)]. #[test] fn q39_sum_without_instance_over_rate() { - let scan = QueryExpr::Scan { - source: Source::TimeSeries { - metric: "http_requests_total".into(), - }, - predicates: vec![], - schema: metric_schema(&["instance"]), - }; let inner_rate = agg_per_entity( AggIntent::Rate, - QueryExpr::TimeRange { - range: Duration::from_secs(300), - child: Rc::new(scan), - }, + range(300, scan("http_requests_total", vec![], &["instance"])), ); - let expected = QueryExpr::Aggregate { + let expected = node(NonASAPOp::Aggregate { reduction: Reduction::Reduce(GroupKeys::without(vec![2])), // exclude `instance` measures: vec![AggIntent::Sum { col: None }], output_names: vec!["".into()], filters: vec![], having: None, - child: Rc::new(inner_rate), - }; + child: inner_rate, + }); assert_eq!( lower("sum without (instance) (rate(http_requests_total[5m]))"), expected, @@ -310,35 +284,25 @@ fn q39_sum_without_instance_over_rate() { #[test] fn q40_week_over_week_offset() { let rate_over = |shift: Option| { - let scan = QueryExpr::Scan { - source: Source::TimeSeries { metric: "m".into() }, - predicates: vec![], - schema: metric_schema(&[]), - }; + let scan = scan("m", vec![], &[]); let ranged = match shift { - Some(ms) => QueryExpr::TimeShift { + Some(ms) => node(NonASAPOp::TimeShift { shift: TimeShift { offset_ms: ms, at: None, }, - child: Rc::new(scan), - }, + child: scan, + }), None => scan, }; - agg_per_entity( - AggIntent::Rate, - QueryExpr::TimeRange { - range: Duration::from_secs(300), - child: Rc::new(ranged), - }, - ) - }; - let expected = QueryExpr::BinaryOp { - op: BinaryOpKind::Arithmetic(ArithmeticOpKind::Sub), - lhs: Rc::new(rate_over(None)), - rhs: Rc::new(rate_over(Some(604_800_000))), // 1w - vector_match: None, + agg_per_entity(AggIntent::Rate, range(300, ranged)) }; + let expected = binary( + BinaryOpKind::Arithmetic(ArithmeticOpKind::Sub), + None, + rate_over(None), + rate_over(Some(604_800_000)), // 1w + ); assert_eq!(lower("rate(m[5m]) - rate(m[5m] offset 1w)"), expected,); } @@ -346,22 +310,13 @@ fn q40_week_over_week_offset() { // (seconds → ms); a bare selector wrapped in a `TimeShift` carrying the anchor. #[test] fn q40_at_modifier_absolute() { - let expected = QueryExpr::TimeRange { - range: Duration::from_secs(1), - child: Rc::new(QueryExpr::TimeShift { - shift: TimeShift { - offset_ms: 0, - at: Some(AtModifier::Timestamp(1_609_746_000_000)), - }, - child: Rc::new(QueryExpr::Scan { - source: Source::TimeSeries { - metric: "up".into(), - }, - predicates: vec![], - schema: metric_schema(&[]), - }), - }), - }; + let expected = instant(node(NonASAPOp::TimeShift { + shift: TimeShift { + offset_ms: 0, + at: Some(AtModifier::Timestamp(1_609_746_000_000)), + }, + child: scan("up", vec![], &[]), + })); assert_eq!(lower("up @ 1609746000"), expected); } @@ -370,24 +325,12 @@ fn q40_at_modifier_absolute() { // so outer sum by job still finds job at col 2 #[test] fn q24_sum_by_job_over_rate_over_filtered_scan() { - let scan = QueryExpr::Scan { - source: Source::TimeSeries { - metric: "http_requests_total".into(), - }, - predicates: vec![Predicate(Rc::new(QueryExpr::Compare { - left: Rc::new(QueryExpr::Column(3)), - op: CompareOpKind::Eq, - right: Rc::new(QueryExpr::Literal(ScalarValue::Utf8("200".into()))), - }))], - schema: metric_schema(&["job", "status"]), - }; - let inner_rate = agg_per_entity( - AggIntent::Rate, - QueryExpr::TimeRange { - range: Duration::from_secs(300), - child: Rc::new(scan), - }, + let scan = scan( + "http_requests_total", + vec![eq_pred(3, "200")], + &["job", "status"], ); + let inner_rate = agg_per_entity(AggIntent::Rate, range(300, scan)); let expected = agg(vec![2], AggIntent::Sum { col: None }, inner_rate); assert_eq!( lower(r#"sum by (job) (rate(http_requests_total{status="200"}[5m]))"#), @@ -403,35 +346,25 @@ fn q24_sum_by_job_over_rate_over_filtered_scan() { // the whole spine survives verbatim and the schema stays label-preserving. #[test] fn q27_nested_subquery_prometheus_docs_example() { - let scan = QueryExpr::Scan { - source: Source::TimeSeries { - metric: "distance_covered_total".into(), - }, - predicates: vec![], - schema: metric_schema(&[]), - }; let rate = agg_per_entity( AggIntent::Rate, - QueryExpr::TimeRange { - range: Duration::from_secs(5), - child: Rc::new(scan), - }, + range(5, scan("distance_covered_total", vec![], &[])), ); let deriv = agg_per_entity( AggIntent::Deriv, - QueryExpr::PromqlSubquery { + node(NonASAPOp::PromqlSubquery { range: Duration::from_secs(30), resolution: Some(Duration::from_secs(5)), - child: Rc::new(rate), - }, + child: rate, + }), ); let expected = agg_per_entity( AggIntent::Max { col: None }, - QueryExpr::PromqlSubquery { + node(NonASAPOp::PromqlSubquery { range: Duration::from_secs(600), resolution: None, - child: Rc::new(deriv), - }, + child: deriv, + }), ); assert_eq!( lower("max_over_time(deriv(rate(distance_covered_total[5s])[30s:5s])[10m:])"), diff --git a/crates/integration-tests/tests/operator_design_examples.rs b/crates/integration-tests/tests/operator_design_examples.rs new file mode 100644 index 000000000..3c4c028d6 --- /dev/null +++ b/crates/integration-tests/tests/operator_design_examples.rs @@ -0,0 +1,396 @@ +//! #511 examples: source text → unified dag → summary rewrite → flat export. +use asap_frontend_sql::{lower_sql, SqlCatalog}; +use asap_types::ir::summary_coverage::{CoverageRegion, SummaryCoverage}; +use asap_types::ir::{ASAPOp, NonASAPOp, Operator, OperatorNode, ScalarExpr}; +use asap_types::post_asap::{ + ExactKind, ExactParams, FieldDataType, GroupingStrategy, SummaryUpdate, +}; +use asap_types::pre_asap::{AggIntent, ColumnRef, DataType, Field, Schema}; +use asap_types::types::AccuracyTarget; +use std::rc::Rc; +mod physical_common; + +fn catalog() -> SqlCatalog { + SqlCatalog::new() + .with_table( + "requests", + Schema::new(vec![ + Field::plain("bytes", DataType::Int64, true), + Field::plain("status", DataType::Int64, false), + ]), + ) + .with_table( + "lineitem", + Schema::new(vec![Field::plain("l_quantity", DataType::Int64, false)]), + ) +} + +/// The SQL scalar example keeps column scopes and a Boolean row predicate. +#[tokio::test] +async fn sql_filter_projection_example() { + let root = lower_sql( + "SELECT l_quantity * 2 AS q2 FROM lineitem WHERE l_quantity > 10", + &catalog(), + AccuracyTarget::Exact, + ) + .await + .unwrap(); + root.validate_structure().unwrap(); + assert_eq!( + root.schema.fields[0], + Field::plain("q2", DataType::Int64, false) + ); + assert!( + matches!(root.expect_non_asap(),NonASAPOp::Project { cols,.. } if matches!(cols[0].expr,ScalarExpr::Arithmetic { .. })) + ); + let wire = physical_common::compile_physical_asap_dag(&root).unwrap(); + wire.validate().unwrap(); + assert_eq!(wire.nodes.len(), OperatorNode::reachable(&root).len()); +} + +/// SUM's evaluation preserves integer type and SQL NULL behavior across the rewrite. +#[tokio::test] +async fn sql_sum_projection_before_and_after_summary_rewrite() { + let root = lower_sql( + "SELECT SUM(bytes) + 1 AS total_bytes FROM requests WHERE status = 200", + &catalog(), + AccuracyTarget::Exact, + ) + .await + .unwrap(); + root.validate_structure().unwrap(); + assert_eq!( + root.schema.fields[0], + Field::plain("total_bytes", DataType::Int64, true) + ); + fn rewrite(node: &Rc) -> Rc { + if let Some(NonASAPOp::Aggregate { + child, + reduction, + measures, + .. + }) = node.non_asap() + { + let [AggIntent::Sum { col: Some(column) }] = measures.as_slice() else { + panic!() + }; + let state = Rc::new( + OperatorNode::new(Operator::ASAP(ASAPOp::SummaryAgg { + child: Rc::clone(child), + family: FieldDataType::ExactAggregate(ExactKind::Sum, ExactParams::Sum), + input: SummaryUpdate::column(ColumnRef::Named( + child.schema.fields[*column].name.clone(), + )), + reduction: reduction.clone(), + grouping: GroupingStrategy::default(), + filter: None, + })) + .unwrap() + // Whole-source coverage, as the planner declares it today (#570). + .with_coverage(SummaryCoverage { + source: asap_types::pre_asap::Source::Table { + table_ref: "requests".into(), + }, + regions: vec![CoverageRegion { + time_ms: None, + population: Default::default(), + }], + }) + .unwrap(), + ); + let finalize = std::rc::Rc::new( + OperatorNode::with_schema( + asap_types::ir::Operator::ASAP(ASAPOp::FinalizeExactAccumulator { + child: state, + }), + node.schema.clone(), + ) + .with_guarantee(None), + ); + return finalize; + } + Rc::new(node.map_children(rewrite).unwrap()) + } + let rewritten = rewrite(&root); + rewritten.validate_structure().unwrap(); + assert_eq!(rewritten.schema, root.schema); + let dag = OperatorNode::reachable(&rewritten); + assert!(dag + .iter() + .any(|n| matches!(n.asap(), Some(ASAPOp::SummaryAgg { .. })))); + assert!(dag + .iter() + .any(|n| matches!(n.asap(), Some(ASAPOp::FinalizeExactAccumulator { .. })))); + let wire = physical_common::compile_physical_asap_dag(&rewritten).unwrap(); + wire.validate().unwrap(); + assert_eq!(wire.nodes.len(), dag.len()); + let json = serde_json::to_string(&wire).unwrap(); + assert!(!json.contains("KeepPreAsap") && !json.contains("ScalarBridge")); +} + +/// Scalar subqueries survive normalization with shared, visible producers. +#[tokio::test] +async fn sql_scalar_subquery_retains_its_cardinality_contract() { + for query in [ + "SELECT (SELECT bytes FROM requests) AS v FROM lineitem", + "SELECT l_quantity NOT IN (SELECT bytes FROM requests) AS present FROM lineitem", + ] { + let root = lower_sql(query, &catalog(), AccuracyTarget::Exact) + .await + .unwrap(); + root.validate_structure().unwrap(); + assert!(root.children().len() > 1); + let wire = physical_common::compile_physical_asap_dag(&root).unwrap(); + assert!(wire + .edges + .iter() + .any(|e| e.role == asap_types::ir::export::EdgeRole::ScalarRef)); + } +} + +/// Execute the SQL SUM example for nonempty, empty and all-NULL populations. +#[tokio::test] +async fn sql_sum_example_executes_with_sql_null_semantics() { + use asap_physical_operators::{ + physical_planner::{compile, InputContract, Source}, + runtime::{Limits, RunContext, Scope}, + sources::{DataSources, MemorySource}, + values::{Batch, Value}, + }; + use futures::StreamExt; + use std::{collections::BTreeMap, sync::Arc}; + let root = lower_sql( + "SELECT SUM(bytes) + 1 AS total_bytes FROM requests WHERE status = 200", + &catalog(), + AccuracyTarget::Exact, + ) + .await + .unwrap(); + let logical_scan = OperatorNode::reachable(&root) + .into_iter() + .find(|node| matches!(node.non_asap(), Some(NonASAPOp::Scan { .. }))) + .unwrap(); + let NonASAPOp::Scan { source, .. } = logical_scan.expect_non_asap() else { + panic!() + }; + let wire = physical_common::compile_physical_asap_dag(&root).unwrap(); + let scan = wire + .nodes + .iter() + .find(|node| { + matches!( + &node.payload, + asap_types::ir::export::PhysicalASAPOperatorPayload::Relational { + operator: asap_types::ir::export::NonASAPOpKind::Scan { .. } + } + ) + }) + .unwrap(); + let schema = Arc::new(scan.output_schema.clone()); + let plan = compile( + &wire, + BTreeMap::from([(u64::from(scan.id.0), InputContract::bounded(schema.clone()))]), + &[u64::from(wire.roots[0].0)], + ) + .unwrap(); + for (rows, expected) in [ + ( + vec![ + vec![Value::Int64(10), Value::Int64(200)], + vec![Value::Int64(20), Value::Int64(500)], + vec![Value::Null, Value::Int64(200)], + ], + Value::Int64(11), + ), + (vec![], Value::Null), + (vec![vec![Value::Null, Value::Int64(200)]], Value::Null), + ] { + let mut sources = DataSources::default(); + sources + .register( + source.clone(), + Arc::new( + MemorySource::new( + schema.clone(), + vec![Batch::try_new(schema.clone(), rows).unwrap()], + ) + .unwrap(), + ), + ) + .unwrap(); + let bound = plan + .instantiate(BTreeMap::from([( + u64::from(scan.id.0), + Box::new(sources.bind(&logical_scan).unwrap()) as Source<'_>, + )])) + .unwrap(); + let mut stream = bound + .execute( + plan.roots(), + RunContext::new( + Scope::Query { + evaluation_time_ms: 300_000, + revision: 1, + }, + Limits::default(), + ) + .unwrap(), + ) + .unwrap() + .remove(0); + let mut rows = vec![]; + while let Some(batch) = stream.next().await { + rows.extend(batch.unwrap().rows().iter().cloned()); + } + assert_eq!(rows.len(), 1); + assert_eq!(rows[0].len(), 1); + match (&rows[0][0], expected) { + (Value::Null, Value::Null) => {} + (Value::Int64(actual), Value::Int64(expected)) => assert_eq!(*actual, expected), + other => panic!("{other:?}"), + } + } +} + +/// Empty window frames and filtered groups can yield NULL even on non-NULL input. +#[tokio::test] +async fn sql_window_and_filtered_aggregate_types() { + for query in [ + "SELECT SUM(l_quantity) OVER (ORDER BY l_quantity ROWS BETWEEN 2 PRECEDING AND 1 PRECEDING) AS s FROM lineitem", + "SELECT MIN(l_quantity) OVER (ORDER BY l_quantity ROWS BETWEEN 2 PRECEDING AND 1 PRECEDING) AS s FROM lineitem", + "SELECT SUM(l_quantity) FILTER (WHERE l_quantity < 0) AS s FROM lineitem GROUP BY l_quantity", + ] { + let root = lower_sql(query, &catalog(), AccuracyTarget::Exact).await.unwrap(); + root.validate_structure().unwrap(); + assert_eq!(root.schema.fields[0], Field::plain("s", DataType::Int64, true), "{query}"); + } +} + +/// A real query batch selects one shared SUM producer, retains two result roots, +/// and executes both selected plans. No replacement dag is constructed by the test. +#[tokio::test] +async fn batch_planning_replaces_and_shares_summary_operators() { + use asap_aware_mapping::pass::PlanningModels; + use asap_physical_operators::{ + physical_planner::{compile, InputContract}, + runtime::Scope, + values::{Batch, Value}, + }; + use asap_planner::{e2e_plan, FrontendInput, UserInput}; + use asap_types::workload::*; + use std::{collections::BTreeMap, sync::Arc}; + let queries = [ + "SELECT SUM(bytes) + 1 AS result FROM requests", + "SELECT SUM(bytes) * 2 AS result FROM requests", + ]; + let workload = PlanningWorkload { + query_workload: QueryWorkload { + language: QueryLanguage::SQL(SqlDialect::DataFusionSQL), + query_batch: Some( + queries + .iter() + .map(|query| BatchEntry { + query: Query((*query).into()), + requirements: QueryRequirements { + accuracy: AccuracyRequirement::Explicit(AccuracyTarget::Exact), + ..Default::default() + }, + predictability: Predictability::Unknown, + invocations: 2, + execute_at: None, + time_selection: TimeSelection::default(), + }) + .collect(), + ), + repeating_queries: None, + }, + data_workload: Some(DataWorkload { + arrival: DataArrival::AtRest, + ..Default::default() + }), + }; + let catalog = SqlCatalog::new().with_table( + "requests", + Schema::new(vec![Field::plain("bytes", DataType::Float64, false)]), + ); + let output = e2e_plan(UserInput::new( + &workload, + FrontendInput::Sql { catalog: &catalog }, + PlanningModels::builtin(), + )) + .await + .unwrap(); + assert_eq!(output.entry_indices(), [0, 1]); + assert_eq!(output.roots().len(), 2); + let states: Vec<_> = output + .operators() + .into_iter() + .filter(|n| matches!(n.asap(), Some(ASAPOp::SummaryAgg { .. }))) + .collect(); + assert_eq!(states.len(), 1, "the batch owns one shared SUM state"); + for (plan, expected) in output.plans.iter().zip([31.0, 60.0]) { + let root = &plan.root; + root.validate_structure().unwrap(); + assert!(OperatorNode::reachable(root) + .iter() + .any(|n| Rc::ptr_eq(n, &states[0]))); + let wire = physical_common::compile_physical_asap_dag(root).unwrap(); + let scan = wire + .nodes + .iter() + .find(|n| { + matches!( + n.payload, + asap_types::ir::export::PhysicalASAPOperatorPayload::Relational { + operator: asap_types::ir::export::NonASAPOpKind::Scan { .. } + } + ) + }) + .unwrap(); + let schema = Arc::new(scan.output_schema.clone()); + let program = compile( + &wire, + BTreeMap::from([(u64::from(scan.id.0), InputContract::bounded(schema.clone()))]), + &[u64::from(wire.roots[0].0)], + ) + .unwrap(); + let result = physical_common::execute( + &program, + BTreeMap::from([( + u64::from(scan.id.0), + Batch::try_new( + schema, + vec![vec![Value::Float64(10.0)], vec![Value::Float64(20.0)]], + ) + .unwrap(), + )]), + Scope::Query { + evaluation_time_ms: 0, + revision: 1, + }, + ); + let rows: Vec<_> = result[0].iter().flat_map(|batch| batch.rows()).collect(); + assert_eq!(rows.len(), 1); + assert!( + matches!(rows[0][0], Value::Float64(v) if v == expected), + "{:?}", + rows + ); + } + // The batch exports as one physical DAG: a root per query and the shared + // SUM state once. + let workload_dag = output.execution_timed_dag().unwrap(); + assert_eq!(workload_dag.roots.len(), 2); + assert_ne!(workload_dag.roots[0], workload_dag.roots[1]); + assert_eq!( + workload_dag + .nodes + .iter() + .filter(|n| matches!( + n.payload, + asap_types::ir::export::PhysicalASAPOperatorPayload::SummaryAgg { .. } + )) + .count(), + 1 + ); +} diff --git a/crates/integration-tests/tests/operator_sharing.rs b/crates/integration-tests/tests/operator_sharing.rs new file mode 100644 index 000000000..6a87a879a --- /dev/null +++ b/crates/integration-tests/tests/operator_sharing.rs @@ -0,0 +1,195 @@ +//! Acceptance tests for operator sharing (issue #468): one operator IR +//! before and after ASAP optimization, so non-ASAP operators sit both above +//! and below summary operators, can share inputs with them, and can carry +//! summaries below set operators. +//! +//! Each test drives SQL text through `lower_sql` → `search_workload` → +//! global selection → `assemble_selected_dag`, the pipeline +//! `sql_to_post_asap.rs` uses. + +use std::rc::Rc; + +use asap_aware_mapping::{search_workload, DefaultCostModel}; +use asap_frontend_sql::{lower_sql, SqlCatalog}; +use asap_integration_tests::post_asap::post_asap_dag; +use asap_types::ir::{ASAPOp, NonASAPOp, Operator, OperatorNode}; +use asap_types::pre_asap::schema::{DataType, Field, Schema}; +use asap_types::types::AccuracyTarget; + +fn col(name: &str, dtype: DataType) -> Field { + Field::plain(name, dtype, false) +} + +/// TPC-H `lineitem`, as `frontend-sql/tests/data_quality_check/tpch_deequ.rs` +/// declares it (DECIMAL columns as `Float64`, no time index, no keys). +fn catalog() -> SqlCatalog { + SqlCatalog::new().with_table( + "lineitem", + Schema::new(vec![ + col("l_orderkey", DataType::Int64), + col("l_partkey", DataType::Int64), + col("l_suppkey", DataType::Int64), + col("l_linenumber", DataType::Int64), + col("l_quantity", DataType::Float64), + col("l_extendedprice", DataType::Float64), + col("l_discount", DataType::Float64), + col("l_tax", DataType::Float64), + col("l_returnflag", DataType::Utf8), + col("l_linestatus", DataType::Utf8), + col("l_shipdate", DataType::Date), + col("l_commitdate", DataType::Date), + col("l_receiptdate", DataType::Date), + col("l_shipinstruct", DataType::Utf8), + col("l_shipmode", DataType::Utf8), + col("l_comment", DataType::Utf8), + ]), + ) +} + +/// Lower `sql`, search, select with the default cost model and assemble the +/// selected post-ASAP DAG. +async fn plan(sql: &str, accuracy: AccuracyTarget) -> Rc { + let pre = lower_sql(sql, &catalog(), accuracy) + .await + .unwrap_or_else(|e| panic!("lower failed for {sql:?}: {e}")); + let space = search_workload(vec![("query", pre)]); + let selection = space.global_selection(&DefaultCostModel); + selection + .assemble_selected_dag(&space.roots[0].1) + .expect("materialization failed") + .expect("root must be discovered") +} + +/// Every unique node reachable from `root` whose operator matches `pred`. +fn find_all( + root: &Rc, + pred: impl Fn(&OperatorNode) -> bool, +) -> Vec> { + OperatorNode::reachable(root) + .into_iter() + .filter(|node| pred(node)) + .collect() +} + +fn is_summary_evaluation(node: &OperatorNode) -> bool { + matches!( + node.operator, + Operator::ASAP( + ASAPOp::SummaryEstimate { .. } + | ASAPOp::FinalizeExactAccumulator { .. } + | ASAPOp::EvaluatePopulation { .. } + ) + ) +} + +fn is_scan(node: &OperatorNode) -> bool { + matches!(node.non_asap(), Some(NonASAPOp::Scan { .. })) +} + +/// The first node reached through single-input non-ASAP operators below +/// `node` (inclusive) that is not one: where an operator chain meets a +/// summary or a multi-input operator. +fn through_unary_non_asap(node: &Rc) -> &Rc { + match node.non_asap().map(|op| op.children()) { + Some(children) if children.len() == 1 => through_unary_non_asap(children[0]), + _ => node, + } +} + +// #468 problem 1: the Project above the summary evaluation and the Scan below +// it are both plain NonASAP nodes (no post-ASAP-only wrapper variant). +#[ignore = "planner chooses no summary here: Avg has no summary realization, so the Aggregate stays a logical pass-through"] +#[tokio::test] +async fn project_above_and_scan_below_a_summary_are_both_non_asap_nodes() { + let root = plan( + "WITH metric AS (SELECT avg(CASE WHEN l_quantity BETWEEN 1 AND 50 THEN 1.0 ELSE 0.0 END) \ + AS in_range FROM lineitem) SELECT in_range, in_range = 1.0 AS ok FROM metric", + AccuracyTarget::Exact, + ) + .await; + // The root is the outer SELECT list: a NonASAP Project. + assert!( + matches!(root.operator, Operator::NonASAP(NonASAPOp::Project { .. })), + "root must be the outer Project, got {:?}", + root.operator + ); + // A summary evaluation sits below the Project chain. + let evaluation = through_unary_non_asap(&root); + assert!( + is_summary_evaluation(evaluation), + "the Project chain must read a summary, got {:?}", + evaluation.operator + ); + // Below the summary the Scan is the same NonASAP operator a front end emits. + let scans = find_all(evaluation, is_scan); + assert_eq!(scans.len(), 1, "one lineitem Scan below the summary"); + assert!(!scans[0].is_asap()); + // The flat plan exports (time first, wire 6). + post_asap_dag(&root); +} + +// #468 problem 2: the exact aggregate and the sketch read one shared Scan +// (`Rc::ptr_eq`), not two copies. +#[ignore = "waits for the binding rule splitting multi-measure aggregates"] +#[tokio::test] +async fn exact_aggregate_and_sketch_share_one_scan() { + let root = plan( + "SELECT avg(l_extendedprice), approx_percentile_cont(l_discount, 0.99) FROM lineitem", + AccuracyTarget::Epsilon(0.01), + ) + .await; + let exact = find_all(&root, |node| { + matches!(node.non_asap(), Some(NonASAPOp::Aggregate { .. })) + }); + let sketch = find_all(&root, |node| { + matches!(node.asap(), Some(ASAPOp::SummaryAgg { .. })) + }); + assert_eq!(exact.len(), 1, "one exact Aggregate for avg: {root:?}"); + assert_eq!( + sketch.len(), + 1, + "one sketch SummaryAgg for the percentile: {root:?}" + ); + let scan_under = |node: &Rc| { + let scans = find_all(node, is_scan); + assert_eq!(scans.len(), 1, "one Scan under {:?}", node.operator); + Rc::clone(&scans[0]) + }; + assert!( + Rc::ptr_eq(&scan_under(&exact[0]), &scan_under(&sketch[0])), + "the exact aggregate and the sketch must read one shared Scan" + ); +} + +// #468 problem 3: a summary can sit below a set operator — each side of the +// UNION ALL holds its own SummaryEstimate. +#[tokio::test] +async fn each_side_of_union_all_holds_a_summary_estimate() { + let root = plan( + "SELECT approx_distinct(l_partkey) FROM lineitem \ + UNION ALL SELECT approx_distinct(l_suppkey) FROM lineitem", + AccuracyTarget::Epsilon(0.01), + ) + .await; + // The SQL front end lowers UNION ALL to `SetOp { all: true }`. + let Some(NonASAPOp::SetOp { + all: true, + left, + right, + .. + }) = root.non_asap() + else { + panic!("root must be the UNION ALL SetOp, got {:?}", root.operator) + }; + for side in [left, right] { + let estimates = find_all(side, |node| { + matches!(node.asap(), Some(ASAPOp::SummaryEstimate { .. })) + }); + assert!( + !estimates.is_empty(), + "UNION ALL side has no SummaryEstimate: {:?}", + side.operator + ); + } + post_asap_dag(&root); +} diff --git a/crates/integration-tests/tests/physical_common/mod.rs b/crates/integration-tests/tests/physical_common/mod.rs index 93bebd338..fc4c2b655 100644 --- a/crates/integration-tests/tests/physical_common/mod.rs +++ b/crates/integration-tests/tests/physical_common/mod.rs @@ -7,6 +7,7 @@ use asap_physical_operators::{ use futures::{executor::block_on, StreamExt}; use std::collections::BTreeMap; +#[allow(dead_code)] pub fn execute( plan: &CompiledPhysicalDAG, inputs: BTreeMap, @@ -40,3 +41,34 @@ pub fn execute( .await }) } + +#[allow(dead_code)] +pub fn compile_physical_asap_dag( + root: &std::rc::Rc, +) -> Result> { + compile_with( + root, + &asap_types::ir::MaterializationAssignment::all_query_time(), + ) +} + +/// As [`compile_physical_asap_dag`], with every summary maintained at +/// ingestion time, the placement precompute compilation requires. +#[allow(dead_code)] // Not every test binary sharing this module compiles precompute. +pub fn compile_maintained_physical_asap_dag( + root: &std::rc::Rc, +) -> Result> { + compile_with( + root, + &asap_types::ir::MaterializationAssignment::all_ingestion_time(), + ) +} + +fn compile_with( + root: &std::rc::Rc, + assignment: &asap_types::ir::MaterializationAssignment, +) -> Result> { + let root = + asap_types::ir::apply_materialization_timings(root, assignment, &mut Default::default())?; + Ok(asap_types::ir::export::compile_physical_asap_dag(&root)?) +} diff --git a/crates/integration-tests/tests/precompute_raw_samples.rs b/crates/integration-tests/tests/precompute_raw_samples.rs index 9937469cc..f0a270b0d 100644 --- a/crates/integration-tests/tests/precompute_raw_samples.rs +++ b/crates/integration-tests/tests/precompute_raw_samples.rs @@ -1,10 +1,14 @@ //! Planner-selected summaries over raw samples compile as precompute DAGs //! and produce the same estimates as feeding their kernel sample by sample. +mod physical_common; +use asap_types::ir::export::{PhysicalASAPDAG, PhysicalASAPOperatorPayload}; +use asap_types::ir::OperatorNode; +use physical_common::compile_maintained_physical_asap_dag; use std::{collections::BTreeMap, collections::BTreeSet, rc::Rc, sync::Arc}; use asap_aware_mapping::cost_model::DefaultCostModel; use asap_aware_mapping::{ - search_workload, Replacement, ReplacementStrategy, ReplacementSubDAG, SketchAlgorithmStrategy, + search_workload, ASAPStrategies, Replacement, ReplacementStrategy, ReplacementSubDAG, TargetSubDAG, }; use asap_integration_tests::fixtures::lower_promql; @@ -18,11 +22,10 @@ use asap_physical_operators::{ AggregateCore, KeyByLabelValues, Statistic, }; use asap_types::post_asap::{ - compile_post_asap_dag, EntityIdentity, ExactKind, FieldDataType, PostAsapDAG, - PostAsapOperatorPayload, SketchAlgorithm, SketchStatistic, SummaryInputExpr, SummaryNode, + EntityIdentity, ExactKind, FieldDataType, SketchAlgorithm, SketchStatistic, SummaryInputExpr, SummaryUpdate, }; -use asap_types::pre_asap::{expr_ir::ColumnRef, query_expr::Reduction}; +use asap_types::pre_asap::{expr_ir::ColumnRef, Reduction}; use asap_types::types::AccuracyTarget; use futures::{executor::block_on, StreamExt}; @@ -51,14 +54,14 @@ fn canonical(labels: &Series) -> Series { /// Every Planner candidate for `query`: the searched selection plus each /// summary replacement of the root. -fn candidates(query: &str, accuracy: AccuracyTarget) -> Vec> { - let root = Rc::new(lower_promql(query, accuracy).expect("lowering failed")); - let mut result = SketchAlgorithmStrategy::default_cost_model() +fn candidates(query: &str, accuracy: AccuracyTarget) -> Vec> { + let root = lower_promql(query, accuracy).expect("lowering failed"); + let mut result = ASAPStrategies::default_cost_model() .replacements(&TargetSubDAG::new(&root)) .into_iter() .filter_map(|candidate| match candidate { ReplacementSubDAG { - replacement: Replacement::Summary(node), + replacement: Replacement::SubDAG(node), .. } => Some(node), _ => None, @@ -75,10 +78,10 @@ fn candidates(query: &str, accuracy: AccuracyTarget) -> Vec> { } /// Raw-input summary nodes: `(dag, raw source id, summary id)`. -fn raw_summaries(dag: &PostAsapDAG) -> Vec<(u64, u64)> { +fn raw_summaries(dag: &PhysicalASAPDAG) -> Vec<(u64, u64)> { dag.nodes .iter() - .filter(|node| matches!(node.payload, PostAsapOperatorPayload::SummaryAgg { .. })) + .filter(|node| matches!(node.payload, PhysicalASAPOperatorPayload::SummaryAgg { .. })) .filter_map(|node| { let inputs = dag .edges @@ -89,8 +92,13 @@ fn raw_summaries(dag: &PostAsapDAG) -> Vec<(u64, u64)> { return None; }; let source = dag.nodes.iter().find(|n| n.id == edge.producer)?; - matches!(source.payload, PostAsapOperatorPayload::Fallback { .. }) - .then_some((u64::from(source.id.0), u64::from(node.id.0))) + matches!( + source.payload, + PhysicalASAPOperatorPayload::Relational { + operator: asap_types::ir::export::NonASAPOpKind::TimeRange { .. } + } + ) + .then_some((u64::from(source.id.0), u64::from(node.id.0))) }) .collect() } @@ -114,7 +122,7 @@ fn samples() -> Vec<(Series, i64, f64)> { } fn execute( - dag: &PostAsapDAG, + dag: &PhysicalASAPDAG, source: u64, root: u64, rows: &[(Series, i64, f64)], @@ -240,7 +248,7 @@ fn weight(update: &SummaryUpdate, value: f64) -> f64 { } /// Estimates that identify a state's content for comparison. -fn readouts(state: &dyn AggregateCore, family: &FieldDataType) -> Vec { +fn evaluations(state: &dyn AggregateCore, family: &FieldDataType) -> Vec { if let Some(exact) = state.as_any().downcast_ref::() { let FieldDataType::ExactAggregate(kind, _) = family else { unreachable!() @@ -255,7 +263,7 @@ fn readouts(state: &dyn AggregateCore, family: &FieldDataType) -> Vec { other => panic!("unexpected exact kind {other:?}"), }; return vec![exact - .readout(statistic, None, None::<&KeyByLabelValues>) + .evaluation(statistic, None, None::<&KeyByLabelValues>) .unwrap() .unwrap()]; } @@ -277,7 +285,7 @@ fn readouts(state: &dyn AggregateCore, family: &FieldDataType) -> Vec { /// or the family when it has no native state. fn check( query: &str, - dag: &PostAsapDAG, + dag: &PhysicalASAPDAG, source: u64, root: u64, rows: &[(Series, i64, f64)], @@ -287,7 +295,7 @@ fn check( .iter() .find(|n| u64::from(n.id.0) == root) .unwrap(); - let PostAsapOperatorPayload::SummaryAgg { + let PhysicalASAPOperatorPayload::SummaryAgg { family, input, reduction, @@ -370,8 +378,8 @@ fn check( for (labels, state) in actual { let reference = expected[&labels].snapshot_accumulator(); assert_eq!( - readouts(state.as_ref(), family), - readouts(reference.as_ref(), family), + evaluations(state.as_ref(), family), + evaluations(reference.as_ref(), family), "{query}: {labels:?}" ); } @@ -413,7 +421,7 @@ fn raw_sample_summaries_compile_and_match_their_kernels() { let mut checked = BTreeMap::new(); for (query, accuracy) in queries { for candidate in candidates(query, accuracy.clone()) { - let dag = compile_post_asap_dag(&candidate).unwrap(); + let dag = compile_maintained_physical_asap_dag(&candidate).unwrap(); for (source, root) in raw_summaries(&dag) { match check(query, &dag, source, root, &rows) { Ok(family) => { @@ -459,21 +467,21 @@ fn raw_sample_summaries_compile_and_match_their_kernels() { /// Replace the raw summary of `sum by (service) (sum_over_time(m[5m]))` with /// another update, keeping its raw input and reduction. -fn grouped_raw_summary(family: FieldDataType, input: SummaryUpdate) -> (PostAsapDAG, u64, u64) { +fn grouped_raw_summary(family: FieldDataType, input: SummaryUpdate) -> (PhysicalASAPDAG, u64, u64) { let candidate = candidates( "sum by (service) (sum_over_time(m[5m]))", AccuracyTarget::Exact, ) .pop() .unwrap(); - let mut dag = compile_post_asap_dag(&candidate).unwrap(); + let mut dag = compile_maintained_physical_asap_dag(&candidate).unwrap(); let (source, root) = raw_summaries(&dag)[0]; let node = dag .nodes .iter_mut() .find(|n| u64::from(n.id.0) == root) .unwrap(); - let PostAsapOperatorPayload::SummaryAgg { + let PhysicalASAPOperatorPayload::SummaryAgg { family: old, input: update, .. @@ -587,7 +595,7 @@ fn raw_sample_heaps_resolve_items_from_labels() { // `without` grouping over raw samples drops the listed labels and `__name__`. #[test] fn raw_sample_without_grouping_drops_labels_and_name() { - use asap_types::pre_asap::query_expr::GroupKeys; + use asap_types::pre_asap::GroupKeys; let family = FieldDataType::ExactAggregate(ExactKind::Sum, asap_types::post_asap::ExactParams::Sum); let (mut dag, source, root) = @@ -607,7 +615,7 @@ fn raw_sample_without_grouping_drops_labels_and_name() { .iter_mut() .find(|n| u64::from(n.id.0) == root) .unwrap(); - let PostAsapOperatorPayload::SummaryAgg { reduction, .. } = &mut node.payload else { + let PhysicalASAPOperatorPayload::SummaryAgg { reduction, .. } = &mut node.payload else { unreachable!() }; *reduction = Reduction::Reduce(GroupKeys::without(vec![service])); diff --git a/crates/integration-tests/tests/promql_numeric_regressions.rs b/crates/integration-tests/tests/promql_numeric_regressions.rs index 692fe9c7a..3ec4d8eac 100644 --- a/crates/integration-tests/tests/promql_numeric_regressions.rs +++ b/crates/integration-tests/tests/promql_numeric_regressions.rs @@ -1,36 +1,41 @@ -//! Numeric regression fixtures: actual PromQL lowering plus numeric update/readout checks. +//! Numeric regression fixtures: actual PromQL lowering plus numeric update/evaluation checks. //! The count/sum interpreter below verifies planner update semantics, not a deployed backend. -use asap_aware_mapping::{Replacement, ReplacementStrategy, SketchAlgorithmStrategy, TargetSubDAG}; +use asap_aware_mapping::replacement::is_logical_rewrite; +use asap_aware_mapping::{ASAPStrategies, Replacement, ReplacementStrategy, TargetSubDAG}; use asap_integration_tests::fixtures::lower_promql; -use asap_types::post_asap::{ - compile_post_asap_dag, ExactKind, FieldDataType, SummaryExpr, SummaryInputExpr, SummaryNode, - SummaryUpdate, -}; +use asap_integration_tests::post_asap::post_asap_dag; +use asap_types::ir::{ASAPOp, NonASAPOp, Operator, OperatorNode}; +use asap_types::post_asap::{ExactKind, FieldDataType, SummaryInputExpr, SummaryUpdate}; use asap_types::pre_asap::{ColumnRef, Reduction}; use asap_types::types::AccuracyTarget; use std::rc::Rc; -fn plan(query: &str, accuracy: AccuracyTarget) -> Rc { - let pre = Rc::new(lower_promql(query, accuracy).unwrap()); - SketchAlgorithmStrategy::default_cost_model() +fn plan(query: &str, accuracy: AccuracyTarget) -> Rc { + let pre = lower_promql(query, accuracy).unwrap(); + ASAPStrategies::default_cost_model() .replacements(&TargetSubDAG::new(&pre)) .into_iter() .find_map(|r| match r.replacement { - Replacement::Summary(n) => Some(n), + // A bound decision: a summary DAG or a kept (exact) sub-DAG. + Replacement::SubDAG(n) if !is_logical_rewrite(&n) => Some(n), _ => None, }) - .unwrap_or_else(|| asap_aware_mapping::replacement::keep_pre_asap(&pre).unwrap()) + .unwrap_or_else(|| asap_aware_mapping::replacement::retain_exact(&pre).unwrap()) } -fn aggregate(node: &SummaryNode) -> (&FieldDataType, &SummaryUpdate, &Reduction) { - match &node.expr { - SummaryExpr::SummaryAgg { +fn aggregate(node: &OperatorNode) -> (&FieldDataType, &SummaryUpdate, &Reduction) { + match &node.operator { + Operator::ASAP(ASAPOp::SummaryAgg { family, input, reduction, .. - } => (family, input, reduction), - SummaryExpr::SummaryEstimate { summary_input, .. } => aggregate(summary_input), - SummaryExpr::ValueOperation { child, .. } => aggregate(child), + }) => (family, input, reduction), + Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) => aggregate(summary_input), + Operator::ASAP(ASAPOp::FinalizeExactAccumulator { child }) => aggregate(child), + // A value operation (Project/Filter/Sort/Limit/...) over the state. + Operator::NonASAP(op) if op.children().len() == 1 && node.contains_asap() => { + aggregate(op.children()[0]) + } other => panic!("not a maintained accumulator: {other:?}"), } } @@ -63,7 +68,7 @@ fn count_up_counts_targets_even_when_values_repeat_or_change_sign() { 3. ); } - compile_post_asap_dag(&node).unwrap(); + post_asap_dag(&node); } /// Ten samples give count ten, whereas sum retains the signed sample values. @@ -81,7 +86,7 @@ fn window_counts_and_sums_distinguish_one_zero_three_and_negative_values() { let got: f64 = (0..10).map(|_| contribution(family, update, value)).sum(); assert_eq!(got, if is_count { 10. } else { value * 10. }); } - compile_post_asap_dag(&node).unwrap(); + post_asap_dag(&node); } } @@ -97,7 +102,7 @@ fn sum_rate_and_increase_have_real_exact_accumulator_nodes() { let (family, _, _) = aggregate(&node); assert!(matches!(family, FieldDataType::ExactAggregate(k, _) if *k == kind)); assert!(node.guarantee.as_ref().unwrap().is_exact()); - compile_post_asap_dag(&node).unwrap(); + post_asap_dag(&node); } } @@ -109,11 +114,12 @@ fn checked_ratio_must_not_certify_cross_zero_interpolation() { AccuracyTarget::Epsilon(0.01), ); assert!( - matches!(node.expr, SummaryExpr::BinaryOp { .. }), + matches!(node.operator, Operator::NonASAP(NonASAPOp::BinaryOp { .. })) + && node.contains_asap(), "direct quantile ratio should remain an available candidate" ); assert!(node.guarantee.is_none()); - compile_post_asap_dag(&node).unwrap(); + post_asap_dag(&node); // Keep the actual signed-sketch counterexample: division guards alone pass // even though the quantile interpolation does not preserve relative error. let alpha = (0.01 - 8.0 * f64::EPSILON) / 2.01; @@ -148,20 +154,20 @@ fn quantile_over_temporal_average_keeps_a_legal_candidate() { ] { let node = plan(query, AccuracyTarget::Epsilon(0.01)); assert!( - !matches!(node.expr, SummaryExpr::KeepPreAsap(_)), + node.contains_asap(), "outer sketch candidate must survive: {query}" ); - let SummaryExpr::SummaryEstimate { summary_input, .. } = &node.expr else { - panic!("outer sketch readout") + let Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) = &node.operator else { + panic!("outer sketch evaluation") }; - let SummaryExpr::SummaryAgg { child, .. } = &summary_input.expr else { + let Operator::ASAP(ASAPOp::SummaryAgg { child, .. }) = &summary_input.operator else { panic!("outer sketch state") }; assert!( - matches!(child.expr, SummaryExpr::KeepPreAsap(_)), + !child.contains_asap(), "guarded expression must retain native maintenance input" ); - compile_post_asap_dag(&node).unwrap(); + post_asap_dag(&node); } } @@ -195,7 +201,7 @@ fn sketch_counts_use_unit_weights_and_signed_sums_keep_value_weights() { use asap_aware_mapping::accuracy::{DefaultAccuracyModel, EqualSplitAllocator}; use asap_aware_mapping::cost_model::DefaultCostModel; use asap_types::post_asap::{NonNegativeWeightProof, SketchAlgorithm, WeightDomain}; - let strategy = SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence( + let strategy = ASAPStrategies::new_with_planning_inputs_and_evidence( &DefaultCostModel, &DefaultAccuracyModel, &EqualSplitAllocator, @@ -207,7 +213,7 @@ fn sketch_counts_use_unit_weights_and_signed_sums_keep_value_weights() { } else { "topk(1, sum_over_time(up[5m]))" }; - let pre = Rc::new(lower_promql(query, AccuracyTarget::Epsilon(0.01)).unwrap()); + let pre = lower_promql(query, AccuracyTarget::Epsilon(0.01)).unwrap(); let candidates = strategy.replacements(&TargetSubDAG::new(&pre)); let wanted = if is_count { SketchAlgorithm::CmsWithHeap @@ -217,7 +223,7 @@ fn sketch_counts_use_unit_weights_and_signed_sums_keep_value_weights() { let node = candidates .iter() .find_map(|c| { - let Replacement::Summary(node) = &c.replacement else { + let Replacement::SubDAG(node) = &c.replacement else { return None; }; let (family, _, _) = aggregate(node); @@ -240,7 +246,7 @@ fn sketch_counts_use_unit_weights_and_signed_sums_keep_value_weights() { SummaryInputExpr::Column(ColumnRef::SampleValue) ); for c in &candidates { - if let Replacement::Summary(n) = &c.replacement { + if let Replacement::SubDAG(n) = &c.replacement { assert!( !matches!(aggregate(n).0, FieldDataType::Sketch(kind, _) if kind.algorithm() == &SketchAlgorithm::CmsWithHeap) ); @@ -271,6 +277,6 @@ fn sketch_counts_use_unit_weights_and_signed_sums_keep_value_weights() { }; assert_eq!(got, if is_count { 10. } else { 10. * value }); } - compile_post_asap_dag(node).unwrap(); + post_asap_dag(node); } } diff --git a/crates/integration-tests/tests/promql_to_post_asap.rs b/crates/integration-tests/tests/promql_to_post_asap.rs index 97a08a0c4..24c4209ec 100644 --- a/crates/integration-tests/tests/promql_to_post_asap.rs +++ b/crates/integration-tests/tests/promql_to_post_asap.rs @@ -1,8 +1,8 @@ //! End-to-end query-string → post-ASAP IR pin (issue #98). //! -//! Drives the full pipeline — PromQL text → pre-ASAP `QueryExpr` -//! (`lower_promql`) → post-ASAP `SummaryExpr` DAG (via -//! `SketchAlgorithmStrategy::replacements`, see [`realize`] below) — and pins +//! Drives the full pipeline — PromQL text → non-ASAP `OperatorNode` +//! (`lower_promql`) → post-ASAP `OperatorNode` DAG (via +//! `ASAPStrategies::replacements`, see [`realize`] below) — and pins //! the summary-bound shape node by node, including the family `(Kind, //! Params)` committed on each edge's schema. @@ -13,67 +13,79 @@ use asap_aware_mapping::accuracy::{ QuantileInputDomain, }; use asap_aware_mapping::cost_model::DefaultCostModel; -use asap_aware_mapping::replacement::{keep_pre_asap, RealizationError}; +use asap_aware_mapping::replacement::{is_logical_rewrite, retain_exact, RealizationError}; use asap_aware_mapping::{ - search_workload, search_workload_with_targets, AccuracyModel, Replacement, ReplacementStrategy, - ReplacementSubDAG, SketchAlgorithmStrategy, TargetSubDAG, + search_workload, search_workload_with_targets, ASAPStrategies, AccuracyModel, Replacement, + ReplacementStrategy, ReplacementSubDAG, TargetSubDAG, }; use asap_integration_tests::fixtures::lower_promql; +use asap_integration_tests::post_asap::{ + maintained, maintained_post_asap_dag, post_asap_dag, timed, +}; +use asap_types::ir::export::{NonASAPOpKind, PhysicalASAPOperatorPayload}; +use asap_types::ir::operator_properties::Reduction; +use asap_types::ir::{ASAPOp, NonASAPOp, Operator, OperatorNode, ScalarExpr}; use asap_types::post_asap::{ - compile_post_asap_dag, CompositionOperator, EntityIdentity, ExactKind, ExactParams, - FieldDataType, GroupingStrategy, Schema, SketchAlgorithm, SketchKind, SketchParams, - SketchStatistic, SummaryExpr, SummaryInputExpr, SummaryNode, SummaryUpdate, ValueOperation, + CompositionOperator, EntityIdentity, ExactKind, ExactParams, FieldDataType, GroupingStrategy, + Schema, SketchAlgorithm, SketchKind, SketchParams, SketchStatistic, SummaryInputExpr, + SummaryUpdate, }; use asap_types::pre_asap::expr_ir::ColumnRef; -use asap_types::pre_asap::query_expr::{QueryExpr, Reduction}; use asap_types::pre_asap::schema::DataType; use asap_types::types::AccuracyTarget; -/// This crate has no "bind me one DAG" public API any more — -/// `SketchAlgorithmStrategy::replacements` always returns every candidate, and +/// This crate has no "bind me one tree" public API any more — +/// `ASAPStrategies::replacements` always returns every candidate, and /// a caller decides what to keep. This test-only helper reproduces the /// take-the-first-(`cost_model`-preferred)-candidate pattern so the /// single-answer pins below don't all repeat it by hand. -fn realize(expr: &QueryExpr) -> Result, RealizationError> { - let root = Rc::new(expr.clone()); - let target = TargetSubDAG::new(&root); - match SketchAlgorithmStrategy::default_cost_model() +fn realize(root: &Rc) -> Result, RealizationError> { + let target = TargetSubDAG::new(root); + match ASAPStrategies::default_cost_model() .replacements(&target) .into_iter() .next() { + // A bound decision (summary DAG or kept sub-DAG); a logical rewrite + // is not a binding, so it falls back to keeping the target. Some(ReplacementSubDAG { - replacement: Replacement::Summary(node), + replacement: Replacement::SubDAG(node), .. - }) => Ok(node), - _ => keep_pre_asap(&root), + }) if !is_logical_rewrite(&node) => Ok(node), + _ => retain_exact(root), } + .inspect(|node| { + node.validate_structure() + .expect("planned dag satisfies the unified IR contract") + }) } #[test] -fn distinct_over_time_offers_hll_cardinality_readout() { +fn distinct_over_time_offers_hll_cardinality_evaluation() { // The real frontend must reach an existing HLL candidate without a // function-specific post-ASAP node or a sample-count rewrite. - let root = Rc::new( - lower_promql( - "distinct_over_time(cpu_usage{job=\"worker\"}[5m])", - AccuracyTarget::Epsilon(0.02), - ) - .unwrap(), - ); - let candidates = - SketchAlgorithmStrategy::default_cost_model().replacements(&TargetSubDAG::new(&root)); + let root = lower_promql( + "distinct_over_time(cpu_usage{job=\"worker\"}[5m])", + AccuracyTarget::Epsilon(0.02), + ) + .unwrap(); + let candidates = ASAPStrategies::default_cost_model().replacements(&TargetSubDAG::new(&root)); + for candidate in &candidates { + if let Replacement::SubDAG(node) = &candidate.replacement { + node.validate_structure().unwrap(); + } + } assert!(candidates.iter().any(|candidate| { - let Replacement::Summary(node) = &candidate.replacement else { return false }; - let SummaryExpr::SummaryEstimate { summary_input, query, .. } = &node.expr else { return false }; + let Replacement::SubDAG(node) = &candidate.replacement else { return false }; + let Some(ASAPOp::SummaryEstimate { summary_input, query, .. }) = node.asap() else { return false }; matches!(query, SketchStatistic::Cardinality) - && matches!(&summary_input.expr, SummaryExpr::SummaryAgg { family: FieldDataType::Sketch(kind, _), .. } + && matches!(summary_input.asap(), Some(ASAPOp::SummaryAgg { family: FieldDataType::Sketch(kind, _), .. }) if kind.algorithm() == &SketchAlgorithm::Hll) }), "no HLL cardinality candidate: {candidates:?}"); } -fn lower_search_and_materialize(query: &str) -> Rc { - let pre = Rc::new(lower_promql(query, AccuracyTarget::Exact).expect("lowering failed")); +fn lower_search_and_materialize(query: &str) -> Rc { + let pre = lower_promql(query, AccuracyTarget::Exact).expect("lowering failed"); let space = search_workload(vec![("query", pre)]); let selection = space.global_selection(&DefaultCostModel); selection @@ -88,36 +100,38 @@ fn value_ranked_topk_preserves_summary_children_in_post_asap_dag() { "topk(3, rate(cpu_seconds_total[5m]))", "topk by (job) (2, max_over_time(memory_bytes[6h]))", ] { - let root = lower_search_and_materialize(query); - let SummaryExpr::ValueOperation { - operation: ValueOperation::Limit { n, offset, .. }, + let root = timed(&lower_search_and_materialize(query)); + let Some(NonASAPOp::Limit { + n, + offset, child: sort, .. - } = &root.expr + }) = root.non_asap() else { - panic!("expected query-time Limit for {query}, got {:?}", root.expr); + panic!( + "expected query-time Limit for {query}, got {:?}", + root.operator + ); }; - assert!(*n > 0 && *offset == 0); - let SummaryExpr::ValueOperation { - operation: ValueOperation::Sort { .. }, - child, - .. - } = &sort.expr - else { + assert_eq!( + root.timing, + Some(asap_types::post_asap::ExecutionTiming::QueryTime) + ); + assert!(n.is_some_and(|n| n > 0) && *offset == 0); + let Some(NonASAPOp::Sort { child, .. }) = sort.non_asap() else { panic!("expected query-time Sort under Limit for {query}"); }; - let SummaryExpr::ValueOperation { - operation: ValueOperation::FinalizeExactAccumulator, - child: state, - .. - } = &child.expr - else { + assert_eq!( + sort.timing, + Some(asap_types::post_asap::ExecutionTiming::QueryTime) + ); + let Some(ASAPOp::FinalizeExactAccumulator { child: state }) = child.asap() else { panic!( "Sort must consume finalized values for {query}: {:?}", - child.expr + child.operator ); }; - assert!(matches!(state.expr, SummaryExpr::SummaryAgg { .. })); + assert!(matches!(state.asap(), Some(ASAPOp::SummaryAgg { .. }))); assert!(child .schema .fields @@ -135,9 +149,9 @@ fn exact_counter_weighted_topk_fails_closed_without_membership_certificate() { ] { let root = lower_search_and_materialize(query); assert!( - matches!(root.expr, SummaryExpr::KeepPreAsap(_)), + !root.contains_asap(), "exact target must not accept an uncertified membership sidecar for {query}: {:?}", - root.expr + root.operator ); } } @@ -146,23 +160,14 @@ fn exact_counter_weighted_topk_fails_closed_without_membership_certificate() { fn instant_topk_and_unsupported_child_remain_local_residuals() { for query in ["topk(3, memory_bytes)", "topk(3, deriv(memory_bytes[5m]))"] { let root = lower_search_and_materialize(query); - let SummaryExpr::ValueOperation { - operation: ValueOperation::Limit { .. }, - child: sort, - .. - } = &root.expr - else { + let Some(NonASAPOp::Limit { child: sort, .. }) = root.non_asap() else { panic!("expected Limit for {query}"); }; - let SummaryExpr::ValueOperation { - child, operation, .. - } = &sort.expr - else { + let Some(NonASAPOp::Sort { child, .. }) = sort.non_asap() else { panic!("expected Sort for {query}"); }; - assert!(matches!(operation, ValueOperation::Sort { .. })); assert!( - matches!(child.expr, SummaryExpr::KeepPreAsap(_)), + !child.contains_asap(), "only the unsupported child should remain exact for {query}" ); } @@ -177,7 +182,7 @@ fn dtype<'a>(schema: &'a Schema, name: &str) -> &'a FieldDataType { .dtype } -fn lower_and_realize(query: &str) -> Rc { +fn lower_and_realize(query: &str) -> Rc { let pre = lower_promql(query, AccuracyTarget::Exact).expect("lowering failed"); realize(&pre).expect("binding failed") } @@ -186,19 +191,17 @@ fn lower_and_realize(query: &str) -> Rc { fn promql_binary_arithmetic_retains_two_summary_leaves() { for op in ["+", "-", "*", "/", "%", "^", "atan2"] { let root = lower_and_realize(&format!("rate(a[1m]) {op} rate(b[1m])")); - let SummaryExpr::BinaryOp { lhs, rhs, .. } = &root.expr else { - panic!("expected BinaryOp for {op}, got {:?}", root.expr); + let Some(NonASAPOp::BinaryOp { lhs, rhs, .. }) = root.non_asap() else { + panic!("expected BinaryOp for {op}, got {:?}", root.operator); }; for operand in [lhs, rhs] { - let SummaryExpr::ValueOperation { - child, - operation: ValueOperation::FinalizeExactAccumulator, - .. - } = &operand.expr - else { - panic!("expected an explicit exact readout, got {:?}", operand.expr); + let Some(ASAPOp::FinalizeExactAccumulator { child }) = operand.asap() else { + panic!( + "expected an explicit exact evaluation, got {:?}", + operand.operator + ); }; - assert!(matches!(child.expr, SummaryExpr::SummaryAgg { .. })); + assert!(matches!(child.asap(), Some(ASAPOp::SummaryAgg { .. }))); } } } @@ -207,47 +210,36 @@ fn promql_binary_arithmetic_retains_two_summary_leaves() { fn value_ranked_topk_over_binary_ratio_finalizes_both_summary_operands() { let query = "topk(1, sum by(job)(increase(a[6h])) / sum by(job)(increase(b[6h])))"; let root = lower_search_and_materialize(query); - let SummaryExpr::ValueOperation { - operation: ValueOperation::Limit { - n: 1, offset: 0, .. - }, + let Some(NonASAPOp::Limit { + n: Some(1), + offset: 0, child: sort, .. - } = &root.expr + }) = root.non_asap() else { - panic!("expected Limit root, got {:?}", root.expr); + panic!("expected Limit root, got {:?}", root.operator); }; - let SummaryExpr::ValueOperation { - operation: ValueOperation::Sort { .. }, - child: binary, - .. - } = &sort.expr - else { - panic!("expected Sort below Limit, got {:?}", sort.expr); + let Some(NonASAPOp::Sort { child: binary, .. }) = sort.non_asap() else { + panic!("expected Sort below Limit, got {:?}", sort.operator); }; - let SummaryExpr::BinaryOp { lhs, rhs, .. } = &binary.expr else { - panic!("expected BinaryOp below Sort, got {:?}", binary.expr); + let Some(NonASAPOp::BinaryOp { lhs, rhs, .. }) = binary.non_asap() else { + panic!("expected BinaryOp below Sort, got {:?}", binary.operator); }; for operand in [lhs, rhs] { - let SummaryExpr::ValueOperation { - operation: ValueOperation::FinalizeExactAccumulator, - child, - .. - } = &operand.expr - else { + let Some(ASAPOp::FinalizeExactAccumulator { child }) = operand.asap() else { panic!( "expected exact accumulator finalization, got {:?}", - operand.expr + operand.operator ); }; - assert!(matches!(child.expr, SummaryExpr::SummaryAgg { .. })); + assert!(matches!(child.asap(), Some(ASAPOp::SummaryAgg { .. }))); } } struct SeparatedTopK; impl AccuracyEvidenceProvider for SeparatedTopK { - fn topk_max_distinct_items(&self, _: &QueryExpr) -> Option { + fn topk_max_distinct_items(&self, _: &OperatorNode) -> Option { Some(1000) } @@ -271,14 +263,12 @@ impl AccuracyEvidenceProvider for SeparatedTopK { // Rate-weighted summaries must consume finalized rates, never raw counter deltas. #[test] fn grouped_rate_topk_consumes_finalized_rate_values() { - let root = Rc::new( - lower_promql( - "topk by(job)(2, sum by(service, job)(rate(m[1m])))", - AccuracyTarget::Epsilon(0.01), - ) - .unwrap(), - ); - let strategy = SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence( + let root = lower_promql( + "topk by(job)(2, sum by(service, job)(rate(m[1m])))", + AccuracyTarget::Epsilon(0.01), + ) + .unwrap(); + let strategy = ASAPStrategies::new_with_planning_inputs_and_evidence( &DefaultCostModel, &DefaultAccuracyModel, &EqualSplitAllocator, @@ -288,24 +278,31 @@ fn grouped_rate_topk_consumes_finalized_rate_values() { .replacements(&TargetSubDAG::new(&root)) .into_iter() .find_map(|candidate| match candidate.replacement { - Replacement::Summary(node) if candidate.rationale.contains("CmsWithHeap") => Some(node), + Replacement::SubDAG(node) if candidate.rationale.contains("CmsWithHeap") => Some(node), _ => None, }) .expect("rate-weighted CMS plan"); - let dag = compile_post_asap_dag(&plan).unwrap(); + let dag = post_asap_dag(&plan); assert!(!dag.nodes.iter().any(|node| matches!( node.payload, - asap_types::post_asap::PostAsapOperatorPayload::RelationalJoin { .. } + PhysicalASAPOperatorPayload::Relational { + operator: NonASAPOpKind::Join { .. } + } ))); - let node = dag.nodes.iter().find(|node| matches!(&node.payload, - asap_types::post_asap::PostAsapOperatorPayload::SummaryAgg { family: FieldDataType::Sketch(kind, _), .. } - if kind.algorithm() == &SketchAlgorithm::CmsWithHeap)).unwrap(); + let node = dag + .nodes + .iter() + .find(|node| { + matches!(&node.payload, + PhysicalASAPOperatorPayload::SummaryAgg { family: FieldDataType::Sketch(kind, _), .. } + if kind.algorithm() == &SketchAlgorithm::CmsWithHeap) + }) + .unwrap(); assert_eq!( node.output_state.timing, asap_types::post_asap::ExecutionTiming::QueryTime ); - let asap_types::post_asap::PostAsapOperatorPayload::SummaryAgg { input, .. } = &node.payload - else { + let PhysicalASAPOperatorPayload::SummaryAgg { input, .. } = &node.payload else { unreachable!() }; assert_eq!( @@ -332,14 +329,12 @@ fn weighted_topk_keeps_candidates_with_missing_population_evidence() { SeparatedTopK.propagation_stats(op, family, query) } } - let root = Rc::new( - lower_promql( - "topk by(job)(2, sum by(service, job)(rate(m[1m])))", - AccuracyTarget::Epsilon(0.01), - ) - .unwrap(), - ); - let strategy = SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence( + let root = lower_promql( + "topk by(job)(2, sum by(service, job)(rate(m[1m])))", + AccuracyTarget::Epsilon(0.01), + ) + .unwrap(); + let strategy = ASAPStrategies::new_with_planning_inputs_and_evidence( &DefaultCostModel, &DefaultAccuracyModel, &EqualSplitAllocator, @@ -355,27 +350,24 @@ fn weighted_topk_keeps_candidates_with_missing_population_evidence() { // Unknown requirements must survive physical export for deployment to inspect. #[test] fn weighted_topk_exports_symbolic_evidence_requirements() { - let root = Rc::new( - lower_promql( - "topk by(job)(2, sum by(service, job)(rate(m[1m])))", - AccuracyTarget::EpsilonDelta { - epsilon: 0.01, - delta: 0.01, - }, - ) - .unwrap(), - ); - let candidates = - SketchAlgorithmStrategy::default_cost_model().replacements(&TargetSubDAG::new(&root)); + let root = lower_promql( + "topk by(job)(2, sum by(service, job)(rate(m[1m])))", + AccuracyTarget::EpsilonDelta { + epsilon: 0.01, + delta: 0.01, + }, + ) + .unwrap(); + let candidates = ASAPStrategies::default_cost_model().replacements(&TargetSubDAG::new(&root)); let candidate = candidates .iter() .find(|candidate| candidate.rationale.contains("CmsWithHeap")) .unwrap(); assert!(candidate.has_missing_accuracy_evidence()); - let Replacement::Summary(node) = &candidate.replacement else { + let Replacement::SubDAG(node) = &candidate.replacement else { panic!("summary candidate") }; - let dag = compile_post_asap_dag(node).unwrap(); + let dag = post_asap_dag(node); let exported = serde_json::to_string(&dag).unwrap(); assert!(exported.contains("topk_max_distinct_items")); assert!(exported.contains("topk_membership_margin")); @@ -387,18 +379,16 @@ fn weighted_topk_exports_symbolic_evidence_requirements() { fn weighted_topk_rejects_invalid_population_evidence() { struct InvalidPopulation; impl AccuracyEvidenceProvider for InvalidPopulation { - fn topk_max_distinct_items(&self, _: &QueryExpr) -> Option { + fn topk_max_distinct_items(&self, _: &OperatorNode) -> Option { Some(0) } } - let root = Rc::new( - lower_promql( - "topk by(job)(2, sum by(service, job)(rate(m[1m])))", - AccuracyTarget::Epsilon(0.01), - ) - .unwrap(), - ); - let strategy = SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence( + let root = lower_promql( + "topk by(job)(2, sum by(service, job)(rate(m[1m])))", + AccuracyTarget::Epsilon(0.01), + ) + .unwrap(); + let strategy = ASAPStrategies::new_with_planning_inputs_and_evidence( &DefaultCostModel, &DefaultAccuracyModel, &EqualSplitAllocator, @@ -415,17 +405,15 @@ fn rate_and_increase_topk_use_summary_scores_and_grouped_limits() { "topk by(job)(2, sum by(service, job)(rate(m[1m])))", "topk(2, sum by(job)(increase(m[6h])))", ] { - let root = Rc::new( - lower_promql( - query, - AccuracyTarget::EpsilonDelta { - epsilon: 0.01, - delta: 0.01, - }, - ) - .unwrap(), - ); - let strategy = SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence( + let root = lower_promql( + query, + AccuracyTarget::EpsilonDelta { + epsilon: 0.01, + delta: 0.01, + }, + ) + .unwrap(); + let strategy = ASAPStrategies::new_with_planning_inputs_and_evidence( &DefaultCostModel, &DefaultAccuracyModel, &EqualSplitAllocator, @@ -435,60 +423,50 @@ fn rate_and_increase_topk_use_summary_scores_and_grouped_limits() { .replacements(&TargetSubDAG::new(&root)) .into_iter() .find_map(|candidate| match candidate.replacement { - Replacement::Summary(node) if candidate.rationale.contains("CmsWithHeap") => { + Replacement::SubDAG(node) if candidate.rationale.contains("CmsWithHeap") => { Some(node) } _ => None, }) .expect("weighted summary"); - let SummaryExpr::ValueOperation { + let Some(NonASAPOp::Limit { + n: Some(2), + offset: 0, + partition_by, child: sorted, - operation: - ValueOperation::Limit { - n: 2, - offset: 0, - partition_by, - }, - .. - } = &plan.expr + }) = plan.non_asap() else { panic!("grouped limit") }; - let SummaryExpr::ValueOperation { + let Some(NonASAPOp::Sort { + partition_by: sort_groups, child: projected, - operation: - ValueOperation::Sort { - partition_by: sort_groups, - .. - }, .. - } = &sorted.expr + }) = sorted.non_asap() else { panic!("grouped sort") }; assert_eq!(partition_by, sort_groups); assert_eq!(partition_by.len(), usize::from(query.contains("topk by"))); - let SummaryExpr::ValueOperation { - child: readout, - operation: ValueOperation::Project { .. }, - .. - } = &projected.expr + let Some(NonASAPOp::Project { + child: evaluation, .. + }) = projected.non_asap() else { panic!("logical output projection") }; - let SummaryExpr::SummaryEstimate { + let Some(ASAPOp::SummaryEstimate { summary_input, query: SketchStatistic::TopK { k }, - } = &readout.expr + }) = evaluation.asap() else { - panic!("heap readout") + panic!("heap evaluation") }; assert!(*k > 2, "candidate capacity is independent of output count"); - let SummaryExpr::SummaryAgg { + let Some(ASAPOp::SummaryAgg { child: rates, input, .. - } = &summary_input.expr + }) = summary_input.asap() else { panic!("weighted summary") }; @@ -497,13 +475,10 @@ fn rate_and_increase_topk_use_summary_scores_and_grouped_limits() { SummaryInputExpr::Column(ColumnRef::SampleValue) ); assert!(matches!( - rates.expr, - SummaryExpr::ValueOperation { - operation: ValueOperation::FinalizeExactAccumulator, - .. - } + rates.asap(), + Some(ASAPOp::FinalizeExactAccumulator { .. }) )); - let dag = compile_post_asap_dag(&plan).unwrap(); + let dag = post_asap_dag(&plan); for phase in [ asap_types::post_asap::ExecutionTiming::IngestionTime, asap_types::post_asap::ExecutionTiming::QueryTime, @@ -525,57 +500,41 @@ fn rate_and_increase_topk_use_summary_scores_and_grouped_limits() { #[test] fn promql_binary_arithmetic_preserves_both_scalar_operand_orders() { - fn is_exact_readout_or_scalar(node: &SummaryNode) -> bool { - matches!(node.expr, SummaryExpr::KeepPreAsap(_)) - || matches!( - node.expr, - SummaryExpr::ValueOperation { - operation: ValueOperation::FinalizeExactAccumulator, - .. - } - ) - } - for query in ["rate(a[1m]) / 2", "2 / rate(a[1m])"] { + for (query, scalar_left) in [("rate(a[1m]) / 2", false), ("2 / rate(a[1m])", true)] { let root = lower_and_realize(query); - let SummaryExpr::BinaryOp { lhs, rhs, .. } = &root.expr else { - panic!("expected BinaryOp for {query}, got {:?}", root.expr); + let Some(NonASAPOp::Project { cols, .. }) = root.non_asap() else { + panic!("expected Project") }; - assert!(is_exact_readout_or_scalar(lhs)); - assert!(is_exact_readout_or_scalar(rhs)); - assert!( - matches!( - lhs.expr, - SummaryExpr::ValueOperation { - operation: ValueOperation::FinalizeExactAccumulator, - .. - } - ) || matches!( - rhs.expr, - SummaryExpr::ValueOperation { - operation: ValueOperation::FinalizeExactAccumulator, - .. - } - ) - ); + let ScalarExpr::Arithmetic { left, right, .. } = &cols[1].expr else { + panic!() + }; + let (scalar, sample) = if scalar_left { + (left, right) + } else { + (right, left) + }; + assert_eq!(**scalar, ScalarExpr::literal_f64(2.0)); + assert_eq!(**sample, ScalarExpr::Column(1)); + assert!(root.schema.has_promql_series_identity()); } } #[test] fn promql_binary_arithmetic_falls_back_as_a_whole_for_unsupported_arm() { let root = lower_and_realize("rate(a[1m]) + stddev_over_time(b[1m])"); - assert!(matches!(root.expr, SummaryExpr::KeepPreAsap(_))); + assert!(!root.contains_asap()); } #[test] fn promql_binary_arithmetic_preserves_nested_structure_and_rejects_modifiers() { let nested = lower_and_realize("(rate(a[1m]) + rate(b[1m])) / 2"); - let SummaryExpr::BinaryOp { lhs, .. } = &nested.expr else { - panic!("expected outer BinaryOp, got {:?}", nested.expr); + let Some(NonASAPOp::Project { child: lhs, .. }) = nested.non_asap() else { + panic!("expected outer BinaryOp, got {:?}", nested.operator); }; - assert!(matches!(lhs.expr, SummaryExpr::BinaryOp { .. })); + assert!(matches!(lhs.non_asap(), Some(NonASAPOp::BinaryOp { .. }))); let modified = lower_and_realize("rate(a[1m]) + on(job) rate(b[1m])"); - assert!(matches!(modified.expr, SummaryExpr::KeepPreAsap(_))); + assert!(!modified.contains_asap()); } #[test] @@ -586,8 +545,8 @@ fn promql_binary_arithmetic_never_relabels_approximate_children_as_exact() { ) .expect("lowering failed"); let root = realize(&pre).expect("binding failed"); - let SummaryExpr::BinaryOp { lhs, rhs, .. } = &root.expr else { - panic!("expected BinaryOp, got {:?}", root.expr); + let Some(NonASAPOp::BinaryOp { lhs, rhs, .. }) = root.non_asap() else { + panic!("expected BinaryOp, got {:?}", root.operator); }; assert!(lhs.guarantee.as_ref().is_some_and(|g| !g.is_exact())); assert!(rhs.guarantee.as_ref().is_some_and(|g| !g.is_exact())); @@ -606,13 +565,11 @@ fn ddsketch_quantile_ratio_meets_the_shared_relative_error_target() { epsilon: 0.01, delta: 0.01, }; - let query = Rc::new( - lower_promql( - "quantile_over_time(0.9, data[5m]) / quantile_over_time(0.5, data[5m])", - target.clone(), - ) - .expect("lowering failed"), - ); + let query = lower_promql( + "quantile_over_time(0.9, data[5m]) / quantile_over_time(0.5, data[5m])", + target.clone(), + ) + .expect("lowering failed"); let evidence = FixtureQuantileDomain { lower: 1.0, @@ -632,7 +589,7 @@ fn ddsketch_quantile_ratio_meets_the_shared_relative_error_target() { .for_target(root) .and_then(|selection| selection.chosen.as_ref()) .expect("the certified DDSketch ratio should be selectable"); - let Replacement::Summary(node) = &chosen.replacement else { + let Replacement::SubDAG(node) = &chosen.replacement else { panic!("expected a summary candidate") }; let guarantee = node.guarantee.as_ref().expect("ratio guarantee"); @@ -642,23 +599,22 @@ fn ddsketch_quantile_ratio_meets_the_shared_relative_error_target() { "ratio guarantee should satisfy the requested target: {guarantee:?}" ); - let shared = - asap_types::post_asap::share_common_summary_sub_dags(vec![("ratio", node.clone())]); - let SummaryExpr::BinaryOp { lhs, rhs, .. } = &shared[0].1.expr else { + let shared = asap_types::ir::cse::share_common_sub_dags(vec![("ratio", node.clone())]); + let Some(NonASAPOp::BinaryOp { lhs, rhs, .. }) = shared[0].1.non_asap() else { panic!("expected binary ratio") }; - let producer = |readout: &Rc| match &readout.expr { - SummaryExpr::SummaryEstimate { summary_input, .. } => Rc::clone(summary_input), - other => panic!("expected DDSketch readout, got {other:?}"), + let producer = |evaluation: &Rc| match &evaluation.operator { + Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) => Rc::clone(summary_input), + other => panic!("expected DDSketch evaluation, got {other:?}"), }; assert!( Rc::ptr_eq(&producer(lhs), &producer(rhs)), - "the two quantile readouts should share one DDSketch producer" + "the two quantile evaluations should share one DDSketch producer" ); } #[test] -fn planner_only_e2e_temporal_topk_preserves_query_update_and_readout_contract() { +fn planner_only_e2e_temporal_topk_preserves_query_update_and_evaluation_contract() { // Self-contained Planner E2E: each case starts from PromQL text and ends // at the post-ASAP summary DAG. No controller/backend types, // fixtures, configuration, or runtime are involved. @@ -677,17 +633,15 @@ fn planner_only_e2e_temporal_topk_preserves_query_update_and_readout_contract() ), ]; for (source, expected_update, expected_family, excluded_labels) in cases { - let pre = Rc::new( - lower_promql( - source, - AccuracyTarget::EpsilonDelta { - epsilon: 0.01, - delta: 0.01, - }, - ) - .expect("lower temporal Top-K"), - ); - let strategy = SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence( + let pre = lower_promql( + source, + AccuracyTarget::EpsilonDelta { + epsilon: 0.01, + delta: 0.01, + }, + ) + .expect("lower temporal Top-K"); + let strategy = ASAPStrategies::new_with_planning_inputs_and_evidence( &DefaultCostModel, &DefaultAccuracyModel, &EqualSplitAllocator, @@ -697,29 +651,29 @@ fn planner_only_e2e_temporal_topk_preserves_query_update_and_readout_contract() .replacements(&TargetSubDAG::new(&pre)) .into_iter() .find_map(|candidate| match candidate.replacement { - Replacement::Summary(node) if candidate.rationale.contains(expected_family) => { + Replacement::SubDAG(node) if candidate.rationale.contains(expected_family) => { Some(node) } _ => None, }) .expect("heap-backed temporal Top-K candidate"); - let SummaryExpr::SummaryEstimate { + let Some(ASAPOp::SummaryEstimate { summary_input, query: SketchStatistic::TopK { k, .. }, - } = &candidate.expr + }) = candidate.asap() else { - panic!("expected Top-K estimate, got {:?}", candidate.expr) + panic!("expected Top-K estimate, got {:?}", candidate.operator) }; assert_eq!( *k, 5, "the requested Top-K cardinality must survive binding" ); - let SummaryExpr::SummaryAgg { + let Some(ASAPOp::SummaryAgg { input: state_input, family, child, .. - } = &summary_input.expr + }) = summary_input.asap() else { panic!("expected structured Top-K state input") }; @@ -742,42 +696,41 @@ fn planner_only_e2e_temporal_topk_preserves_query_update_and_readout_contract() )) ); assert_eq!(state_input.weight, expected_update); - assert!(matches!(child.expr, SummaryExpr::KeepPreAsap(_))); + assert!(!child.contains_asap()); } } /// Execute the ungrouped temporal TopK subset with exact state. This tests /// the emitted update contract, not sketch approximation or backend execution. -fn execute_topk_reference(plan: &SummaryNode) -> Vec<(String, f64)> { +fn execute_topk_reference(plan: &OperatorNode) -> Vec<(String, f64)> { use std::collections::BTreeMap; - let SummaryExpr::SummaryEstimate { + let Some(ASAPOp::SummaryEstimate { summary_input, query: SketchStatistic::TopK { k }, - } = &plan.expr + }) = plan.asap() else { - panic!("expected TopK readout") + panic!("expected TopK evaluation") }; - let SummaryExpr::SummaryAgg { + let Some(ASAPOp::SummaryAgg { input, child, reduction, .. - } = &summary_input.expr + }) = summary_input.asap() else { panic!("expected summary updates") }; assert_eq!(reduction, &Reduction::by(vec![])); - let SummaryExpr::KeepPreAsap(raw) = &child.expr else { - panic!("expected fused raw input") - }; - let QueryExpr::TimeRange { range, child } = raw.as_ref() else { + // The fused raw input is the kept non-ASAP sub-DAG itself. + assert!(!child.contains_asap(), "expected fused raw input"); + let Some(NonASAPOp::TimeRange { range, child, .. }) = child.non_asap() else { panic!("expected temporal input") }; - let QueryExpr::Scan { + let Some(NonASAPOp::Scan { source: asap_types::pre_asap::Source::TimeSeries { metric }, predicates, .. - } = child.as_ref() + }) = child.non_asap() else { panic!("expected metric scan") }; @@ -849,17 +802,15 @@ fn planner_heap_topk_reference_execution_matches_ground_truth() { vec![("worker", 100.0), ("cron", 30.0)], ), ] { - let pre = Rc::new( - lower_promql( - query, - AccuracyTarget::EpsilonDelta { - epsilon: 0.01, - delta: 0.01, - }, - ) - .unwrap(), - ); - let strategy = SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence( + let pre = lower_promql( + query, + AccuracyTarget::EpsilonDelta { + epsilon: 0.01, + delta: 0.01, + }, + ) + .unwrap(); + let strategy = ASAPStrategies::new_with_planning_inputs_and_evidence( &DefaultCostModel, &DefaultAccuracyModel, &EqualSplitAllocator, @@ -868,10 +819,10 @@ fn planner_heap_topk_reference_execution_matches_ground_truth() { // This reference executor consumes keyed heap updates. The inventory // also contains maintained exact values followed by sort/limit; those // have a different execution contract and must not enter this fixture. - let candidates: Vec<_> = strategy.replacements(&TargetSubDAG::new(&pre)).into_iter().filter(|candidate| matches!(&candidate.replacement, Replacement::Summary(plan) if matches!(plan.expr, SummaryExpr::SummaryEstimate { query: SketchStatistic::TopK { .. }, .. }))).collect(); + let candidates: Vec<_> = strategy.replacements(&TargetSubDAG::new(&pre)).into_iter().filter(|candidate| matches!(&candidate.replacement, Replacement::SubDAG(plan) if matches!(plan.asap(), Some(ASAPOp::SummaryEstimate { query: SketchStatistic::TopK { .. }, .. })))).collect(); assert!(!candidates.is_empty(), "no heap candidate for {query}"); for candidate in candidates { - let Replacement::Summary(plan) = candidate.replacement else { + let Replacement::SubDAG(plan) = candidate.replacement else { panic!("expected summary plan for {query}") }; let expected: Vec<_> = expected @@ -889,11 +840,11 @@ fn planner_heap_topk_reference_execution_matches_ground_truth() { /// SummaryEstimate { query: Quantile{0.99} } → {quantile_0_99: Float64} /// └─ SummaryAgg { Kll{k:269}, input: SampleValue } → {value: Sketch(Kll, {k:269})} /// └─ SummaryAgg { Rate, input: SampleValue } → {ts, value: ExactAggregate(Rate), …} -/// └─ KeepPreAsap(TimeRange{5m} → Scan) → {ts, value} +/// └─ TimeRange{5m} → Scan → {ts, value} /// ``` /// -/// The nested DAG exercises both realizations: the approximate quantile -/// binds a KLL sketch + readout; the per-series `rate` binds the exact +/// The nested tree exercises both realizations: the approximate quantile +/// binds a KLL sketch + evaluation; the per-series `rate` binds the exact /// counter-reset-aware accumulator (no estimate — its state is the value). #[test] fn promql_quantile_of_rate_binds_kll_over_rate_accumulator() { @@ -904,13 +855,13 @@ fn promql_quantile_of_rate_binds_kll_over_rate_accumulator() { .expect("lowering failed"); let root = realize(&pre_asap).expect("binding failed"); - // Root: the sketch readout, back to a plain row shape. - let SummaryExpr::SummaryEstimate { + // Root: the sketch evaluation, back to a plain row shape. + let Some(ASAPOp::SummaryEstimate { summary_input, query, - } = &root.expr + }) = root.asap() else { - panic!("expected SummaryEstimate root, got {:?}", root.expr); + panic!("expected SummaryEstimate root, got {:?}", root.operator); }; assert!(matches!(query, SketchStatistic::Quantile { q } if *q == 0.99)); assert_eq!( @@ -924,15 +875,15 @@ fn promql_quantile_of_rate_binds_kll_over_rate_accumulator() { // reduction, one output row — not to be confused with the inner rate's // per-entity grouping below, even though both once collapsed to the // same empty `by: []` (issue #163). - let SummaryExpr::SummaryAgg { + let Some(ASAPOp::SummaryAgg { child, family, input, reduction, .. - } = &summary_input.expr + }) = summary_input.asap() else { - panic!("expected SummaryAgg, got {:?}", summary_input.expr); + panic!("expected SummaryAgg, got {:?}", summary_input.operator); }; assert_eq!( family, @@ -955,26 +906,24 @@ fn promql_quantile_of_rate_binds_kll_over_rate_accumulator() { ) ); - let SummaryExpr::ValueOperation { - child, - operation: ValueOperation::FinalizeExactAccumulator, - timing: asap_types::post_asap::ExecutionTiming::IngestionTime, - } = &child.expr - else { - panic!("rate needs a maintenance readout"); + let Some(ASAPOp::FinalizeExactAccumulator { child }) = child.asap() else { + panic!("rate needs a maintenance evaluation"); }; // The rate: exact counter-reset-aware accumulator, per-series (labels // and time axis preserved), no estimate wrapper. `rate(...)` has no // grouping concept at all — every entity stays its own summary. - let SummaryExpr::SummaryAgg { + let Some(ASAPOp::SummaryAgg { child: leaf, family, reduction, .. - } = &child.expr + }) = child.asap() else { - panic!("expected inner SummaryAgg for rate, got {:?}", child.expr); + panic!( + "expected inner SummaryAgg for rate, got {:?}", + child.operator + ); }; assert_eq!( family, @@ -992,14 +941,20 @@ fn promql_quantile_of_rate_binds_kll_over_rate_accumulator() { ); // The leaf: unrewritten pass-through — TimeRange marker over the Scan. - let SummaryExpr::KeepPreAsap(kept_leaf) = &leaf.expr else { - panic!("expected KeepPreAsap leaf, got {:?}", leaf.expr); - }; - let QueryExpr::TimeRange { range, child: scan } = kept_leaf.as_ref() else { - panic!("expected TimeRange leaf, got {kept_leaf:?}"); + // The kept leaf is the non-ASAP sub-DAG itself. + assert!( + !leaf.contains_asap(), + "expected kept leaf, got {:?}", + leaf.operator + ); + let Some(NonASAPOp::TimeRange { + range, child: scan, .. + }) = leaf.non_asap() + else { + panic!("expected TimeRange leaf, got {:?}", leaf.operator); }; assert_eq!(range.as_secs(), 300); - assert!(matches!(scan.as_ref(), QueryExpr::Scan { .. })); + assert!(matches!(scan.non_asap(), Some(NonASAPOp::Scan { .. }))); assert!( leaf.schema .fields @@ -1017,11 +972,11 @@ fn promql_exact_workload_binds_accumulators_not_sketches() { let pre_asap = lower_promql("sum by (job) (http_requests_total)", AccuracyTarget::Exact) .expect("lowering failed"); let root = realize(&pre_asap).expect("binding failed"); - let SummaryExpr::SummaryAgg { + let Some(ASAPOp::SummaryAgg { family, reduction, .. - } = &root.expr + }) = root.asap() else { - panic!("expected SummaryAgg, got {:?}", root.expr); + panic!("expected SummaryAgg, got {:?}", root.operator); }; assert_eq!( family, @@ -1042,21 +997,19 @@ fn promql_exact_workload_binds_accumulators_not_sketches() { lower_promql("avg(http_requests_total)", AccuracyTarget::Exact).expect("lowering failed"); let root = realize(&pre_asap).expect("binding failed"); assert!( - matches!(root.expr, SummaryExpr::KeepPreAsap(_)), + !root.contains_asap(), "avg has no mergeable accumulator — stays logical" ); } #[test] fn promql_sum_of_count_over_time_is_composed_by_default_search() { - let original = Rc::new( - lower_promql( - "sum by (service) (count_over_time(metrics[5m]))", - AccuracyTarget::Exact, - ) - .expect("lowering failed"), - ); - let original_schema = original.output_schema().unwrap(); + let original = lower_promql( + "sum by (service) (count_over_time(metrics[5m]))", + AccuracyTarget::Exact, + ) + .expect("lowering failed"); + let original_schema = original.schema.clone(); let space = search_workload(vec![("query", original)]); let root = &space.roots[0].1; let group = space.candidates_for_target(root).expect("root memo group"); @@ -1065,20 +1018,21 @@ fn promql_sum_of_count_over_time_is_composed_by_default_search() { .iter() .find(|candidate| candidate.strategy == "SemanticEquivalentRewriteStrategy") .expect("default search should compose the lowered PromQL query"); - let Replacement::Rewrite(rewritten) = &candidate.replacement else { + let Replacement::SubDAG(rewritten) = &candidate.replacement else { panic!("expected logical rewrite") }; + assert!(is_logical_rewrite(rewritten), "expected logical rewrite"); - assert_eq!(rewritten.output_schema().unwrap(), original_schema); - let QueryExpr::Project { child, .. } = rewritten.as_ref() else { + assert_eq!(rewritten.schema, original_schema); + let Some(NonASAPOp::Project { child, .. }) = rewritten.non_asap() else { panic!("sum(count_over_time) needs a Float64 cast Project") }; - let QueryExpr::Aggregate { + let Some(NonASAPOp::Aggregate { reduction: Reduction::Reduce(by), measures, child, .. - } = child.as_ref() + }) = child.non_asap() else { panic!("expected one composed aggregate") }; @@ -1090,9 +1044,9 @@ fn promql_sum_of_count_over_time_is_composed_by_default_search() { }] )); assert!(matches!( - child.as_ref(), - QueryExpr::TimeRange { range, child } - if range.as_secs() == 300 && matches!(child.as_ref(), QueryExpr::Scan { .. }) + child.non_asap(), + Some(NonASAPOp::TimeRange { range, child, .. }) + if range.as_secs() == 300 && matches!(child.non_asap(), Some(NonASAPOp::Scan { .. })) )); } @@ -1100,50 +1054,42 @@ fn promql_sum_of_count_over_time_is_composed_by_default_search() { fn nested_summary_explicitly_finalizes_exact_child_at_ingestion_time() { // Real workload selection must expose the state-to-value edge; an outer // sketch must not interpret exact accumulator bytes as input samples. - let pre = Rc::new( - lower_promql( - "quantile(0.9, sum_over_time(m[1m]))", - AccuracyTarget::Epsilon(0.05), - ) - .unwrap(), - ); + let pre = lower_promql( + "quantile(0.9, sum_over_time(m[1m]))", + AccuracyTarget::Epsilon(0.05), + ) + .unwrap(); let space = search_workload(vec![("query", pre)]); let selected = space.global_selection(&DefaultCostModel); let plan = selected .assemble_selected_dag(&space.roots[0].1) .unwrap() .unwrap(); - let SummaryExpr::SummaryEstimate { summary_input, .. } = &plan.expr else { + // Stored timings are gone: time the plan with its outer summary + // maintained and read the timed copy. + let timed_plan = maintained(&plan); + let Some(ASAPOp::SummaryEstimate { summary_input, .. }) = timed_plan.asap() else { panic!("expected selected quantile summary"); }; - let SummaryExpr::SummaryAgg { child, .. } = &summary_input.expr else { + let Some(ASAPOp::SummaryAgg { child, .. }) = summary_input.asap() else { panic!("expected maintained outer summary"); }; - let SummaryExpr::ValueOperation { - child: source, - operation, - timing, - } = &child.expr - else { + let Some(ASAPOp::FinalizeExactAccumulator { child: source }) = child.asap() else { panic!( "missing explicit accumulator finalization: {:?}", - child.expr + child.operator ); }; - assert!(matches!( - operation, - ValueOperation::FinalizeExactAccumulator - )); assert_eq!( - *timing, - asap_types::post_asap::ExecutionTiming::IngestionTime + child.timing, + Some(asap_types::post_asap::ExecutionTiming::IngestionTime) ); assert!(matches!( - source.expr, - SummaryExpr::SummaryAgg { + source.asap(), + Some(ASAPOp::SummaryAgg { family: FieldDataType::ExactAggregate(ExactKind::Sum, _), .. - } + }) )); assert!(child .schema @@ -1155,12 +1101,13 @@ fn nested_summary_explicitly_finalizes_exact_child_at_ingestion_time() { .fields .iter() .any(|field| matches!(field.dtype, FieldDataType::Plain(DataType::Float64)))); - compile_post_asap_dag(&plan).expect("explicit boundary is a valid post-ASAP DAG"); + // Explicit boundary is a valid post-ASAP DAG. + post_asap_dag(&plan); } #[test] fn physical_node_owns_phase_independently_of_binary_payload() { - use asap_types::post_asap::{ExecutionTiming, PostAsapOperatorPayload}; + use asap_types::post_asap::ExecutionTiming; for (query, expected) in [ ( // One selector: both operands cover the same series. @@ -1173,27 +1120,32 @@ fn physical_node_owns_phase_independently_of_binary_payload() { ), ] { let input = lower_promql(query, AccuracyTarget::Epsilon(0.05)).unwrap(); - // Backend lowering carries opaque series identity before candidate export. - let input = asap_types::pre_asap::schema::with_promql_series_identity(&input).unwrap(); - let search = search_workload(vec![("q", Rc::new(input))]); + let search = search_workload(vec![("q", input)]); let choice = search.global_selection(&DefaultCostModel); let plan = choice .assemble_selected_dag(&search.roots[0].1) .unwrap() .unwrap(); - let dag = compile_post_asap_dag(&plan).unwrap(); + let dag = maintained_post_asap_dag(&plan); let node = dag .nodes .iter() - .find(|node| matches!(node.payload, PostAsapOperatorPayload::Binary { .. })) + .find(|node| { + matches!( + node.payload, + PhysicalASAPOperatorPayload::Relational { + operator: NonASAPOpKind::BinaryOp { .. } + } + ) + }) .unwrap(); assert_eq!(node.output_state.timing, expected); let wire = serde_json::to_value(&node.payload).unwrap(); assert!(wire.get("timing").is_none()); let mut obsolete = wire.clone(); obsolete["timing"] = serde_json::json!(expected.as_str()); - assert!(serde_json::from_value::(obsolete).is_err()); - let restored: PostAsapOperatorPayload = serde_json::from_value(wire).unwrap(); + assert!(serde_json::from_value::(obsolete).is_err()); + let restored: PhysicalASAPOperatorPayload = serde_json::from_value(wire).unwrap(); assert_eq!(restored, node.payload); } } @@ -1207,14 +1159,10 @@ fn ddsketch_ratio_without_domain_proof_is_uncertified() { ) .unwrap(); let root = realize(&pre).unwrap(); - assert!(matches!(root.expr, SummaryExpr::BinaryOp { .. })); + assert!(matches!(root.non_asap(), Some(NonASAPOp::BinaryOp { .. }))); assert!(root.guarantee.is_none()); let space = search_workload_with_targets( - vec![( - "unproven", - Rc::new(pre), - Some(AccuracyTarget::Epsilon(0.01)), - )], + vec![("unproven", pre, Some(AccuracyTarget::Epsilon(0.01)))], &asap_aware_mapping::default_strategies(), &DefaultAccuracyModel, ); @@ -1226,8 +1174,8 @@ fn ddsketch_ratio_without_domain_proof_is_uncertified() { root_group.candidates.iter().any(|candidate| { matches!( &candidate.replacement, - Replacement::Summary(node) - if matches!(node.expr, SummaryExpr::BinaryOp { .. }) + Replacement::SubDAG(node) + if matches!(node.non_asap(), Some(NonASAPOp::BinaryOp { .. })) && node.guarantee.is_none() ) }), @@ -1247,7 +1195,7 @@ fn ddsketch_ratio_without_domain_proof_is_uncertified() { .assemble_selected_dag(&space.roots[0].1) .unwrap() .expect("materialized root"); - assert!(matches!(materialized.expr, SummaryExpr::KeepPreAsap(_))); + assert!(!materialized.contains_asap()); } struct FixtureQuantileDomain { @@ -1255,7 +1203,7 @@ struct FixtureQuantileDomain { upper: f64, } impl AccuracyEvidenceProvider for FixtureQuantileDomain { - fn quantile_input_domain(&self, _: &QueryExpr) -> Option { + fn quantile_input_domain(&self, _: &OperatorNode) -> Option { Some(QuantileInputDomain { lower: self.lower, upper: self.upper, @@ -1278,14 +1226,12 @@ fn ddsketch_ratio_rejects_unsafe_domains() { (f64::MIN_POSITIVE / 2., f64::MIN_POSITIVE / 2.), ] { let evidence = FixtureQuantileDomain { lower, upper }; - let pre = Rc::new( - lower_promql( - "quantile_over_time(0.9, data[5m]) / quantile_over_time(0.5, data[5m])", - AccuracyTarget::Epsilon(0.01), - ) - .unwrap(), - ); - let strategy = SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence( + let pre = lower_promql( + "quantile_over_time(0.9, data[5m]) / quantile_over_time(0.5, data[5m])", + AccuracyTarget::Epsilon(0.01), + ) + .unwrap(); + let strategy = ASAPStrategies::new_with_planning_inputs_and_evidence( &DefaultCostModel, &DefaultAccuracyModel, &EqualSplitAllocator, @@ -1304,8 +1250,8 @@ fn ddsketch_ratio_rejects_unsafe_domains() { fn ddsketch_ratio_rejects_one_invalid_domain_when_the_other_is_missing() { struct PartialUnsafeDomain; impl AccuracyEvidenceProvider for PartialUnsafeDomain { - fn quantile_input_domain(&self, operand: &QueryExpr) -> Option { - let QueryExpr::Aggregate { measures, .. } = operand else { + fn quantile_input_domain(&self, operand: &OperatorNode) -> Option { + let Some(NonASAPOp::Aggregate { measures, .. }) = operand.non_asap() else { return None; }; matches!( @@ -1321,14 +1267,12 @@ fn ddsketch_ratio_rejects_one_invalid_domain_when_the_other_is_missing() { } } - let pre = Rc::new( - lower_promql( - "quantile_over_time(0.9, data[5m]) / quantile_over_time(0.5, data[5m])", - AccuracyTarget::Epsilon(0.01), - ) - .unwrap(), - ); - let strategy = SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence( + let pre = lower_promql( + "quantile_over_time(0.9, data[5m]) / quantile_over_time(0.5, data[5m])", + AccuracyTarget::Epsilon(0.01), + ) + .unwrap(); + let strategy = ASAPStrategies::new_with_planning_inputs_and_evidence( &DefaultCostModel, &DefaultAccuracyModel, &EqualSplitAllocator, @@ -1339,40 +1283,38 @@ fn ddsketch_ratio_rejects_one_invalid_domain_when_the_other_is_missing() { /// The committed planner alpha is exercised against the pinned sketch implementation. #[test] -fn ddsketch_ratio_bound_holds_for_signed_pinned_sketch_readouts() { +fn ddsketch_ratio_bound_holds_for_signed_pinned_sketch_evaluations() { for sign in [-1., 1.] { let evidence = FixtureQuantileDomain { lower: if sign < 0. { -100. } else { 1. }, upper: if sign < 0. { -1. } else { 100. }, }; - let pre = Rc::new( - lower_promql( - "quantile_over_time(0.9, data[5m]) / quantile_over_time(0.5, data[5m])", - AccuracyTarget::Epsilon(0.01), - ) - .unwrap(), - ); - let strategy = SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence( + let pre = lower_promql( + "quantile_over_time(0.9, data[5m]) / quantile_over_time(0.5, data[5m])", + AccuracyTarget::Epsilon(0.01), + ) + .unwrap(); + let strategy = ASAPStrategies::new_with_planning_inputs_and_evidence( &DefaultCostModel, &DefaultAccuracyModel, &EqualSplitAllocator, &evidence, ); let candidates = strategy.replacements(&TargetSubDAG::new(&pre)); - let Replacement::Summary(node) = &candidates[0].replacement else { + let Replacement::SubDAG(node) = &candidates[0].replacement else { panic!("summary") }; - let SummaryExpr::BinaryOp { lhs, rhs, .. } = &node.expr else { + let Some(NonASAPOp::BinaryOp { lhs, rhs, .. }) = node.non_asap() else { panic!("ratio") }; - let alpha = |node: &SummaryNode| { - let SummaryExpr::SummaryEstimate { summary_input, .. } = &node.expr else { - panic!("readout") + let alpha = |node: &OperatorNode| { + let Some(ASAPOp::SummaryEstimate { summary_input, .. }) = node.asap() else { + panic!("evaluation") }; - let SummaryExpr::SummaryAgg { + let Some(ASAPOp::SummaryAgg { family: FieldDataType::Sketch(kind, _), .. - } = &summary_input.expr + }) = summary_input.asap() else { panic!("sketch") }; @@ -1407,12 +1349,12 @@ fn ddsketch_ratio_bound_holds_for_signed_pinned_sketch_readouts() { } } -/// Empty or overlarge population contracts cannot promise a supported readout. +/// Empty or overlarge population contracts cannot promise a supported evaluation. #[test] fn ddsketch_ratio_requires_a_supported_population_size() { struct PopulationEvidence(u64); impl AccuracyEvidenceProvider for PopulationEvidence { - fn quantile_input_domain(&self, _: &QueryExpr) -> Option { + fn quantile_input_domain(&self, _: &OperatorNode) -> Option { Some(QuantileInputDomain { lower: 1., upper: 10., @@ -1421,16 +1363,14 @@ fn ddsketch_ratio_requires_a_supported_population_size() { }) } } - let pre = Rc::new( - lower_promql( - "quantile_over_time(0.9, data[5m]) / quantile_over_time(0.5, data[5m])", - AccuracyTarget::Epsilon(0.01), - ) - .unwrap(), - ); + let pre = lower_promql( + "quantile_over_time(0.9, data[5m]) / quantile_over_time(0.5, data[5m])", + AccuracyTarget::Epsilon(0.01), + ) + .unwrap(); for count in [0, (1u64 << 53) + 1] { let evidence = PopulationEvidence(count); - let strategy = SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence( + let strategy = ASAPStrategies::new_with_planning_inputs_and_evidence( &DefaultCostModel, &DefaultAccuracyModel, &EqualSplitAllocator, @@ -1441,7 +1381,7 @@ fn ddsketch_ratio_requires_a_supported_population_size() { } // Every `without` aggregation candidate exports a valid DAG: its summary state -// column carries the family instead of the readout's Float64 value. +// column carries the family instead of the evaluation's Float64 value. #[test] fn without_aggregation_candidates_export_valid_dags() { for accuracy in [ @@ -1452,7 +1392,7 @@ fn without_aggregation_candidates_export_valid_dags() { }, ] { for query in ["sum without (pod) (m)", "quantile without (pod) (0.5, m)"] { - let root = Rc::new(lower_promql(query, accuracy.clone()).unwrap()); + let root = lower_promql(query, accuracy.clone()).unwrap(); let space = search_workload_with_targets( vec![(0, root, Some(accuracy.clone()))], &asap_aware_mapping::default_strategies(), @@ -1461,7 +1401,7 @@ fn without_aggregation_candidates_export_valid_dags() { let inventory = space.enumerate_candidate_dags_for_root(&0, 65_536).unwrap(); assert!(!inventory.candidates.is_empty(), "{query}"); for (_, node) in inventory.candidates.iter().flatten() { - compile_post_asap_dag(node).unwrap_or_else(|e| panic!("{query}: {e}")); + post_asap_dag(node); } } } diff --git a/crates/integration-tests/tests/scan.rs b/crates/integration-tests/tests/scan.rs index bb7988d7a..e43e27a6c 100644 --- a/crates/integration-tests/tests/scan.rs +++ b/crates/integration-tests/tests/scan.rs @@ -1,4 +1,4 @@ -//! `QueryExpr::Scan` — label matcher / predicate tests. +//! `NonASAPOp::Scan` — label matcher / predicate tests. //! //! The Scan schema is always [ts(0), value(1), label_a(2), label_b(3), …] //! where labels are appended alphabetically after dedup by the SchemaResolver. @@ -11,60 +11,62 @@ use std::time::Duration; use asap_integration_tests::fixtures::lower_promql; use asap_integration_tests::fixtures::metric_schema; -use asap_types::pre_asap::{CompareOpKind, Predicate, QueryExpr, ScalarValue, Source}; +use asap_types::ir::{ + ExprSemantics, NonASAPOp, OperatorNode, Predicate, ScalarExpr, TimeRangeKind, +}; +use asap_types::pre_asap::{CompareOpKind, ScalarValue, Source}; use asap_types::types::AccuracyTarget; -fn lower(q: &str) -> QueryExpr { +fn lower(q: &str) -> Rc { lower_promql(q, AccuracyTarget::Exact).unwrap_or_else(|e| panic!("lower failed for {q:?}: {e}")) } -fn bare_scan(metric: &str, labels: &[&str]) -> QueryExpr { - QueryExpr::Scan { +fn node(op: NonASAPOp) -> Rc { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(op)) + .expect("fixture node derives its schema") +} + +fn bare_scan(metric: &str, labels: &[&str]) -> Rc { + node(NonASAPOp::Scan { source: Source::TimeSeries { metric: metric.into(), }, predicates: vec![], schema: metric_schema(labels), - } + }) } -fn instant(child: QueryExpr) -> QueryExpr { - QueryExpr::TimeRange { +fn instant(child: Rc) -> Rc { + node(NonASAPOp::TimeRange { range: Duration::from_secs(1), - child: Rc::new(child), - } + kind: TimeRangeKind::Instant, + child, + }) +} + +fn label_pred(col_id: usize, op: CompareOpKind, value: &str) -> Predicate { + Predicate(ScalarExpr::Compare { + left: Box::new(ScalarExpr::Column(col_id)), + op, + right: Box::new(ScalarExpr::Literal(ScalarValue::Utf8(value.into()))), + semantics: ExprSemantics::Promql, + }) } fn eq_pred(col_id: usize, value: &str) -> Predicate { - Predicate(Rc::new(QueryExpr::Compare { - left: Rc::new(QueryExpr::Column(col_id)), - op: CompareOpKind::Eq, - right: Rc::new(QueryExpr::Literal(ScalarValue::Utf8(value.into()))), - })) + label_pred(col_id, CompareOpKind::Eq, value) } fn ne_pred(col_id: usize, value: &str) -> Predicate { - Predicate(Rc::new(QueryExpr::Compare { - left: Rc::new(QueryExpr::Column(col_id)), - op: CompareOpKind::Ne, - right: Rc::new(QueryExpr::Literal(ScalarValue::Utf8(value.into()))), - })) + label_pred(col_id, CompareOpKind::Ne, value) } fn regex_pred(col_id: usize, pattern: &str) -> Predicate { - Predicate(Rc::new(QueryExpr::Compare { - left: Rc::new(QueryExpr::Column(col_id)), - op: CompareOpKind::Regex, - right: Rc::new(QueryExpr::Literal(ScalarValue::Utf8(pattern.into()))), - })) + label_pred(col_id, CompareOpKind::Regex, pattern) } fn notregex_pred(col_id: usize, pattern: &str) -> Predicate { - Predicate(Rc::new(QueryExpr::Compare { - left: Rc::new(QueryExpr::Column(col_id)), - op: CompareOpKind::NotRegex, - right: Rc::new(QueryExpr::Literal(ScalarValue::Utf8(pattern.into()))), - })) + label_pred(col_id, CompareOpKind::NotRegex, pattern) } // #1 — bare metric name, no matchers @@ -80,13 +82,13 @@ fn q01_bare_scan() { // schema: [ts(0), value(1), job(2)] #[test] fn q02_equality_predicate() { - let expected = instant(QueryExpr::Scan { + let expected = instant(node(NonASAPOp::Scan { source: Source::TimeSeries { metric: "http_requests_total".into(), }, predicates: vec![eq_pred(2, "api-server")], schema: metric_schema(&["job"]), - }); + })); assert_eq!(lower(r#"http_requests_total{job="api-server"}"#), expected); } @@ -94,13 +96,13 @@ fn q02_equality_predicate() { // schema: [ts(0), value(1), status(2)] #[test] fn q03_inequality_predicate() { - let expected = instant(QueryExpr::Scan { + let expected = instant(node(NonASAPOp::Scan { source: Source::TimeSeries { metric: "http_requests_total".into(), }, predicates: vec![ne_pred(2, "500")], schema: metric_schema(&["status"]), - }); + })); assert_eq!(lower(r#"http_requests_total{status!="500"}"#), expected); } @@ -108,13 +110,13 @@ fn q03_inequality_predicate() { // schema: [ts(0), value(1), job(2)] #[test] fn q04_regex_predicate() { - let expected = instant(QueryExpr::Scan { + let expected = instant(node(NonASAPOp::Scan { source: Source::TimeSeries { metric: "http_requests_total".into(), }, predicates: vec![regex_pred(2, "api.*")], schema: metric_schema(&["job"]), - }); + })); assert_eq!(lower(r#"http_requests_total{job=~"api.*"}"#), expected); } @@ -122,13 +124,13 @@ fn q04_regex_predicate() { // schema: [ts(0), value(1), job(2)] #[test] fn q_notregex_predicate() { - let expected = instant(QueryExpr::Scan { + let expected = instant(node(NonASAPOp::Scan { source: Source::TimeSeries { metric: "http_requests_total".into(), }, predicates: vec![notregex_pred(2, "internal.*")], schema: metric_schema(&["job"]), - }); + })); assert_eq!(lower(r#"http_requests_total{job!~"internal.*"}"#), expected); } @@ -137,13 +139,13 @@ fn q_notregex_predicate() { // predicates in same alphabetical order: job first, then status #[test] fn q_multi_two_predicates() { - let expected = instant(QueryExpr::Scan { + let expected = instant(node(NonASAPOp::Scan { source: Source::TimeSeries { metric: "http_requests_total".into(), }, predicates: vec![eq_pred(2, "api-server"), ne_pred(3, "500")], schema: metric_schema(&["job", "status"]), - }); + })); assert_eq!( lower(r#"http_requests_total{job="api-server",status!="500"}"#), expected, diff --git a/crates/integration-tests/tests/schema.rs b/crates/integration-tests/tests/schema.rs index 08b925dd1..c616c0d5f 100644 --- a/crates/integration-tests/tests/schema.rs +++ b/crates/integration-tests/tests/schema.rs @@ -1,7 +1,7 @@ //! `Schema::closed` propagation — open/closed invariant tests. //! -//! Verifies that `QueryExpr::output_schema()` propagates the open/closed -//! completeness flag correctly through a lowered query DAG. +//! Verifies that the derived `OperatorNode::schema` propagates the open/closed +//! completeness flag correctly through a lowered query tree. //! //! Key invariant: a PromQL scan is always `closed: false` (open) because its //! label set is runtime-only. The schema freezes to `closed: true` exactly at @@ -12,14 +12,14 @@ use asap_integration_tests::fixtures::lower_promql; use asap_types::types::AccuracyTarget; -fn lower(q: &str) -> asap_types::pre_asap::QueryExpr { +fn lower(q: &str) -> std::rc::Rc { lower_promql(q, AccuracyTarget::Exact).unwrap_or_else(|e| panic!("lower failed for {q:?}: {e}")) } // bare scan is open — the metric's full label set is unknown at plan time #[test] fn schema_bare_scan_is_open() { - let s = lower("http_requests_total").output_schema().unwrap(); + let s = lower("http_requests_total").schema.clone(); assert!(!s.closed, "PromQL scan must be open"); } @@ -27,8 +27,8 @@ fn schema_bare_scan_is_open() { #[test] fn schema_filtered_scan_is_open() { let s = lower(r#"http_requests_total{job="api-server"}"#) - .output_schema() - .unwrap(); + .schema + .clone(); assert!(!s.closed, "PromQL scan with predicates must remain open"); assert_eq!(s.fields.len(), 3, "[ts, value, job]"); } @@ -36,9 +36,7 @@ fn schema_filtered_scan_is_open() { // per-series rate is label-preserving → output stays open #[test] fn schema_rate_stays_open() { - let s = lower("rate(http_requests_total[5m])") - .output_schema() - .unwrap(); + let s = lower("rate(http_requests_total[5m])").schema.clone(); assert!(!s.closed, "per-series rate is label-preserving; stays open"); } @@ -46,24 +44,22 @@ fn schema_rate_stays_open() { #[test] fn schema_count_over_time_stays_open() { let s = lower("count_over_time(http_requests_total[5m])") - .output_schema() - .unwrap(); + .schema + .clone(); assert!(!s.closed, "per-series count_over_time stays open"); } // cross-series sum with no group keys freezes to closed #[test] fn schema_sum_freezes_to_closed() { - let s = lower("sum(http_requests_total)").output_schema().unwrap(); + let s = lower("sum(http_requests_total)").schema.clone(); assert!(s.closed, "cross-series aggregate must freeze to closed"); } // cross-series sum grouped by job also freezes to closed #[test] fn schema_sum_by_job_freezes_to_closed() { - let s = lower("sum by (job) (http_requests_total)") - .output_schema() - .unwrap(); + let s = lower("sum by (job) (http_requests_total)").schema.clone(); assert!( s.closed, "grouped cross-series aggregate must freeze to closed" @@ -74,8 +70,8 @@ fn schema_sum_by_job_freezes_to_closed() { #[test] fn schema_sum_over_rate_freezes_to_closed() { let s = lower("sum by (job) (rate(http_requests_total[5m]))") - .output_schema() - .unwrap(); + .schema + .clone(); assert!( s.closed, "cross-series aggregate over rate must freeze to closed" @@ -86,8 +82,8 @@ fn schema_sum_over_rate_freezes_to_closed() { #[test] fn schema_binary_op_two_open_stays_open() { let s = lower("http_requests_total / http_errors_total") - .output_schema() - .unwrap(); + .schema + .clone(); assert!(!s.closed, "binary op over two open scans must stay open"); } @@ -95,8 +91,8 @@ fn schema_binary_op_two_open_stays_open() { #[test] fn schema_binary_op_two_closed_is_closed() { let s = lower("sum by (job) (http_requests_total) / sum by (job) (http_errors_total)") - .output_schema() - .unwrap(); + .schema + .clone(); assert!( s.closed, "binary op over two closed aggregates must be closed" diff --git a/crates/integration-tests/tests/sql_to_physical.rs b/crates/integration-tests/tests/sql_to_physical.rs index dd4426c22..3bd253748 100644 --- a/crates/integration-tests/tests/sql_to_physical.rs +++ b/crates/integration-tests/tests/sql_to_physical.rs @@ -1,4 +1,5 @@ //! SQL frontend, candidate selection, physical compilation and fresh-run execution. +mod physical_common; use asap_aware_mapping::{search_workload, DefaultCostModel}; use asap_frontend_sql::{lower_sql, SqlCatalog}; use asap_physical_operators::{ @@ -7,13 +8,15 @@ use asap_physical_operators::{ sources::{DataSources, MemorySource}, values::{Batch, Value}, }; +use asap_types::ir::export::PhysicalASAPOperatorPayload; use asap_types::{ - post_asap::{compile_post_asap_dag, FieldDataType, PostAsapOperatorPayload}, - pre_asap::{DataType, Field, QueryExpr, Schema}, + post_asap::FieldDataType, + pre_asap::{DataType, Field, Schema}, types::AccuracyTarget, }; use futures::StreamExt; -use std::{collections::BTreeMap, rc::Rc, sync::Arc}; +use physical_common::compile_physical_asap_dag; +use std::{collections::BTreeMap, sync::Arc}; /// SQL filtering and grouped aggregation survive logical/physical lowering; /// rebinding the compiled DAG runs against new data rather than cached results. @@ -30,26 +33,24 @@ async fn sql_filter_grouped_sum_executes_and_rebinds() { "SELECT service, SUM(value) AS total FROM metrics WHERE value > 1 GROUP BY service", "SELECT service, SUM(value) AS total FROM metrics GROUP BY service", ] { - let logical = Rc::new( - lower_sql(query, &catalog, AccuracyTarget::Exact) - .await - .unwrap(), - ); + let logical = lower_sql(query, &catalog, AccuracyTarget::Exact) + .await + .unwrap(); let space = search_workload(vec![("sql", logical)]); let selected = space .global_selection(&DefaultCostModel) .assemble_selected_dag(&space.roots[0].1) .unwrap() .unwrap(); - let dag = compile_post_asap_dag(&selected).unwrap(); + let dag = compile_physical_asap_dag(&selected).unwrap(); let scan = dag .nodes .iter() .find(|node| { matches!( &node.payload, - PostAsapOperatorPayload::Fallback { - expression: QueryExpr::Scan { .. } + PhysicalASAPOperatorPayload::Relational { + operator: asap_types::ir::export::NonASAPOpKind::Scan { .. } } ) }) @@ -62,7 +63,7 @@ async fn sql_filter_grouped_sum_executes_and_rebinds() { let plan = compile( &dag, BTreeMap::from([(u64::from(scan.id.0), InputContract::bounded(schema.clone()))]), - &[u64::from(dag.root.0)], + &[u64::from(dag.roots[0].0)], ) .unwrap(); for multiplier in [1., 2.] { @@ -88,12 +89,18 @@ async fn sql_filter_grouped_sum_executes_and_rebinds() { .collect() }) .collect(); - let PostAsapOperatorPayload::Fallback { expression } = &scan.payload else { - unreachable!() - }; - let QueryExpr::Scan { source, .. } = expression else { + let PhysicalASAPOperatorPayload::Relational { + operator: + asap_types::ir::export::NonASAPOpKind::Scan { + source, + predicates: _, + schema: _scan_schema, + }, + } = &scan.payload + else { unreachable!() }; + let expression = asap_types::ir::OperatorNode::reachable(&selected).into_iter().find(|n| matches!(n.non_asap(), Some(asap_types::ir::NonASAPOp::Scan { source: s, .. }) if s == source)).unwrap(); let mut sources = DataSources::default(); sources .register( @@ -110,7 +117,7 @@ async fn sql_filter_grouped_sum_executes_and_rebinds() { let bound = plan .instantiate(BTreeMap::from([( u64::from(scan.id.0), - Box::new(sources.bind(expression).unwrap()) as Source<'_>, + Box::new(sources.bind(&expression).unwrap()) as Source<'_>, )])) .unwrap(); let mut stream = bound diff --git a/crates/integration-tests/tests/sql_to_post_asap.rs b/crates/integration-tests/tests/sql_to_post_asap.rs index 4cecd6952..673d939ec 100644 --- a/crates/integration-tests/tests/sql_to_post_asap.rs +++ b/crates/integration-tests/tests/sql_to_post_asap.rs @@ -1,63 +1,98 @@ //! End-to-end SQL query-string → post-ASAP IR pin (issue #191). //! //! The SQL counterpart of `promql_to_post_asap.rs`: drives SQL text — -//! `lower_sql` (text → pre-ASAP `QueryExpr`) → -//! `SketchAlgorithmStrategy::replacements` (pre-ASAP → post-ASAP -//! `SummaryExpr`, see [`realize`] below) — and pins the resulting -//! sketch-vs-exact-accumulator shape node by node, the way -//! `promql_to_post_asap.rs` does for PromQL. +//! `lower_sql` (text → non-ASAP `OperatorNode` tree) → +//! `ASAPStrategies::replacements` (→ a tree with ASAP operators, +//! see [`realize`] below) — and pins the resulting sketch-vs-exact-accumulator +//! shape node by node, the way `promql_to_post_asap.rs` does for PromQL. //! //! ## A structural wrinkle PromQL doesn't have //! -//! `lower_promql` returns a *bare* `QueryExpr::Aggregate` for a top-level +//! `lower_promql` returns a *bare* `NonASAPOp::Aggregate` for a top-level //! aggregation (`sum by (job) (m)`, `quantile(0.99, …)`), so [`realize`] can //! bind it directly at the DAG root. `lower_sql` never does: DataFusion's //! planner always wraps even a single, unaliased aggregate in an identity //! `Project` (confirmed below), so a SQL DAG's *root* is normally `Project { //! child: Aggregate { .. } }`. Final materialization retains that projection -//! as a query-time value operation and independently plans its child, keeping +//! as a query-time non-ASAP node and independently plans its child, keeping //! both SELECT-list semantics and the summary-bound aggregate visible. use std::rc::Rc; -use asap_aware_mapping::replacement::{keep_pre_asap, RealizationError}; +use asap_aware_mapping::replacement::{retain_exact, RealizationError}; use asap_aware_mapping::{ - search_workload, DefaultCostModel, Replacement, ReplacementStrategy, ReplacementSubDAG, - SketchAlgorithmStrategy, TargetSubDAG, + search_workload, ASAPStrategies, DefaultCostModel, Replacement, ReplacementStrategy, + ReplacementSubDAG, TargetSubDAG, }; use asap_frontend_sql::{lower_sql, lower_sql_dialect, SqlCatalog}; +use asap_integration_tests::post_asap::post_asap_dag; +use asap_types::ir::export::{ + EdgeRole, NonASAPOpKind, PhysicalASAPNodeId, PhysicalASAPOperatorPayload, WirePredicate, + WireScalarExpr, +}; +use asap_types::ir::operator_properties::Reduction; +use asap_types::ir::{ASAPOp, NonASAPOp, Operator, OperatorNode, Predicate, ScalarExpr}; use asap_types::post_asap::{ - compile_post_asap_dag, EdgeRole, ExactKind, ExactParams, FieldDataType, GroupingStrategy, - PostAsapOperatorPayload, SketchAlgorithm, SketchKind, SketchParams, SketchStatistic, - SummaryExpr, SummaryNode, SummaryUpdate, ValueOperation, + ExactKind, ExactParams, FieldDataType, GroupingStrategy, SketchAlgorithm, SketchKind, + SketchParams, SketchStatistic, SummaryUpdate, }; use asap_types::pre_asap::expr_ir::ColumnRef; -use asap_types::pre_asap::query_expr::{QueryExpr, Reduction}; use asap_types::pre_asap::schema::{DataType, Field, Schema}; use asap_types::types::AccuracyTarget; use asap_types::workload::SqlDialect; -/// This crate has no "bind me one DAG" public API any more — -/// `SketchAlgorithmStrategy::replacements` always returns every candidate, and +/// This crate has no "bind me one tree" public API any more — +/// `ASAPStrategies::replacements` always returns every candidate, and /// a caller decides what to keep. This test-only helper reproduces the -/// take-the-first-(`cost_model`-preferred)-candidate pattern so the +/// take-the-first-(`cost_model`-preferred)-summary-candidate pattern so the /// single-answer pins below don't all repeat it by hand. -fn realize(expr: &QueryExpr) -> Result, RealizationError> { - let root = Rc::new(expr.clone()); - let target = TargetSubDAG::new(&root); - match SketchAlgorithmStrategy::default_cost_model() - .replacements(&target) +fn realize(target: &Rc) -> Result, RealizationError> { + let target_dag = TargetSubDAG::new(target); + match ASAPStrategies::default_cost_model() + .replacements(&target_dag) .into_iter() .next() { Some(ReplacementSubDAG { - replacement: Replacement::Summary(node), + replacement: Replacement::SubDAG(node), .. - }) => Ok(node), - _ => keep_pre_asap(&root), + }) if node.contains_asap() => Ok(node), + _ => retain_exact(target), + } + .inspect(|node| { + node.validate_structure() + .expect("planned dag satisfies the unified IR contract") + }) +} + +/// The single input of a unary non-ASAP node (Project, Filter, Sort, ...) or +/// of a `FinalizeExactAccumulator`; `None` for anything else. +fn unary_child(node: &OperatorNode) -> Option<&Rc> { + match &node.operator { + Operator::NonASAP(op) => match op.children().as_slice() { + [child] => Some(*child), + _ => None, + }, + Operator::ASAP(ASAPOp::FinalizeExactAccumulator { child }) => Some(child), + Operator::ASAP(_) => None, } } +/// A sub-DAG kept as plain (non-ASAP) work: no ASAP operator anywhere below. +fn is_kept_non_asap(node: &OperatorNode) -> bool { + node.non_asap().is_some() && !node.contains_asap() +} + +/// Mirror a scalar-only predicate (no operator references) to its wire form. +fn wire_pred(pred: &Predicate) -> WirePredicate { + WirePredicate(WireScalarExpr::from_expr( + &pred.0, + &mut |_: &Rc| -> PhysicalASAPNodeId { + panic!("fixture predicate references no operator") + }, + )) +} + fn dtype<'a>(schema: &'a Schema, name: &str) -> &'a FieldDataType { &schema .fields @@ -89,7 +124,7 @@ fn catalog() -> SqlCatalog { ) } -async fn lower(sql: &str, accuracy: AccuracyTarget) -> QueryExpr { +async fn lower(sql: &str, accuracy: AccuracyTarget) -> Rc { lower_sql(sql, &catalog(), accuracy) .await .unwrap_or_else(|e| panic!("lower failed for {sql:?}: {e}")) @@ -121,26 +156,27 @@ async fn clickhouse_temporal_sql_reuses_rate_and_increase_physical_summaries() { .expect("explicit temporal SQL must lower"); let physical = realize(inner_aggregate(&pre_asap)).expect("temporal reducer must be planned"); - let SummaryExpr::SummaryAgg { + let Operator::ASAP(ASAPOp::SummaryAgg { family, reduction, child, .. - } = &physical.expr + }) = &physical.operator else { - panic!("expected a shared SummaryAgg, got {:?}", physical.expr); + panic!("expected a shared SummaryAgg, got {:?}", physical.operator); }; assert_eq!(family, &expected); assert_eq!(reduction, &Reduction::PerEntity); - let SummaryExpr::KeepPreAsap(raw) = &child.expr else { - panic!( - "expected a retained temporal SQL input, got {:?}", - child.expr - ); - }; - assert!(matches!(raw.as_ref(), QueryExpr::TimeRange { range, child } + assert!( + is_kept_non_asap(child), + "expected a retained temporal SQL input, got {:?}", + child.operator + ); + assert!( + matches!(child.non_asap(), Some(NonASAPOp::TimeRange { range, child, .. }) if *range == std::time::Duration::from_secs(300) - && matches!(child.as_ref(), QueryExpr::Project { .. }))); + && matches!(child.non_asap(), Some(NonASAPOp::Project { .. }))) + ); } } @@ -156,16 +192,14 @@ async fn clickhouse_outer_sum_recursively_binds_inner_temporal_aggregate() { SELECT service, {function}(latency, ts, {window_ms}) AS v \ FROM metrics GROUP BY service)" ); - let pre_asap = Rc::new( - lower_sql_dialect( - &sql, - &catalog(), - SqlDialect::ClickhouseSQL, - AccuracyTarget::Exact, - ) - .await - .expect("nested temporal SQL must lower"), - ); + let pre_asap = lower_sql_dialect( + &sql, + &catalog(), + SqlDialect::ClickhouseSQL, + AccuracyTarget::Exact, + ) + .await + .expect("nested temporal SQL must lower"); let space = search_workload(vec![("nested", Rc::clone(&pre_asap))]); let selection = space.global_selection(&DefaultCostModel); let root = selection @@ -173,30 +207,27 @@ async fn clickhouse_outer_sum_recursively_binds_inner_temporal_aggregate() { .expect("materialization failed") .expect("root must be discovered"); - fn has_temporal_summary(node: &SummaryNode) -> bool { - match &node.expr { - SummaryExpr::SummaryAgg { + fn has_temporal_summary(node: &OperatorNode) -> bool { + match &node.operator { + Operator::ASAP(ASAPOp::SummaryAgg { family: FieldDataType::ExactAggregate(ExactKind::Rate | ExactKind::Increase, _), .. - } => true, - SummaryExpr::ValueOperation { child, .. } - | SummaryExpr::SummaryEstimate { - summary_input: child, - .. - } => has_temporal_summary(child), - _ => false, + }) => true, + Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) => { + has_temporal_summary(summary_input) + } + _ => unary_child(node).is_some_and(|child| has_temporal_summary(child)), } } assert!( has_temporal_summary(&root), "inner {function} was hidden: {root:?}" ); - let dag = compile_post_asap_dag(&root).expect("nested SQL DAG must compile"); + let dag = post_asap_dag(&root); assert!(dag.nodes.iter().any(|node| matches!( node.payload, - PostAsapOperatorPayload::Value { - operation: ValueOperation::Exact(_), - .. + PhysicalASAPOperatorPayload::Relational { + operator: NonASAPOpKind::Aggregate { .. }, } ))); } @@ -204,11 +235,14 @@ async fn clickhouse_outer_sum_recursively_binds_inner_temporal_aggregate() { /// The `Aggregate` node beneath the identity `Project` DataFusion's planner /// always wraps a top-level aggregate in — see the module docs above. -fn inner_aggregate(qe: &QueryExpr) -> &QueryExpr { - match qe { - QueryExpr::Project { child, .. } => inner_aggregate(child), - QueryExpr::Aggregate { .. } => qe, - other => panic!("expected a Project{{Aggregate}} shape, got {other:?}"), +fn inner_aggregate(node: &Rc) -> &Rc { + match node.non_asap() { + Some(NonASAPOp::Project { child, .. }) => inner_aggregate(child), + Some(NonASAPOp::Aggregate { .. }) => node, + _ => panic!( + "expected a Project{{Aggregate}} shape, got {:?}", + node.operator + ), } } @@ -221,32 +255,27 @@ async fn sql_full_query_retains_project_and_binds_inner_aggregate() { AccuracyTarget::Epsilon(0.01), ) .await; - assert!( - matches!(pre_asap, QueryExpr::Project { .. }), - "sanity: a SQL root is a Project, unlike lower_promql's bare Aggregate" - ); - let pre_asap = Rc::new(pre_asap); + let Some(NonASAPOp::Project { + cols: expected_cols, + qualifier: expected_qualifier, + .. + }) = pre_asap.non_asap() + else { + panic!("sanity: a SQL root is a Project, unlike lower_promql's bare Aggregate"); + }; let space = search_workload(vec![("query", Rc::clone(&pre_asap))]); let selection = space.global_selection(&DefaultCostModel); let root = selection .assemble_selected_dag(&space.roots[0].1) .expect("materialization failed") .expect("root must be discovered"); - let QueryExpr::Project { - cols: expected_cols, - qualifier: expected_qualifier, - .. - } = pre_asap.as_ref() - else { - unreachable!() - }; - let SummaryExpr::ValueOperation { + let Some(NonASAPOp::Project { child, - operation: asap_types::post_asap::ValueOperation::Project { cols, qualifier }, - .. - } = &root.expr + cols, + qualifier, + }) = root.non_asap() else { - panic!("expected retained Project root, got {:?}", root.expr); + panic!("expected retained Project root, got {:?}", root.operator); }; assert_eq!(cols, expected_cols, "projection expressions and aliases"); assert_eq!(qualifier, expected_qualifier, "projection qualifier"); @@ -256,7 +285,10 @@ async fn sql_full_query_retains_project_and_binds_inner_aggregate() { FieldDataType::Plain(DataType::Float64) ); assert!( - matches!(child.expr, SummaryExpr::SummaryEstimate { .. }), + matches!( + child.operator, + Operator::ASAP(ASAPOp::SummaryEstimate { .. }) + ), "the Aggregate under Project must be summary-bound" ); } @@ -265,63 +297,62 @@ async fn sql_full_query_retains_project_and_binds_inner_aggregate() { /// aggregates are independently selected as physical summaries. #[tokio::test] async fn sql_join_recursively_binds_both_temporal_aggregate_children() { - let pre_asap = Rc::new( - lower_sql_dialect( - "SELECT a.service, a.v / b.v AS ratio FROM \ - (SELECT service, asap_rate(latency, ts, 300000) AS v FROM metrics WHERE service='errors' GROUP BY service) a \ - INNER JOIN \ - (SELECT service, asap_rate(latency, ts, 300000) AS v FROM metrics WHERE service='requests' GROUP BY service) b \ - ON b.service=a.service", - &catalog(), - SqlDialect::ClickhouseSQL, - AccuracyTarget::Exact, - ) - .await - .expect("two-subquery rate ratio must lower"), - ); + let pre_asap = lower_sql_dialect( + "SELECT a.service, a.v / b.v AS ratio FROM \ + (SELECT service, asap_rate(latency, ts, 300000) AS v FROM metrics WHERE service='errors' GROUP BY service) a \ + INNER JOIN \ + (SELECT service, asap_rate(latency, ts, 300000) AS v FROM metrics WHERE service='requests' GROUP BY service) b \ + ON b.service=a.service", + &catalog(), + SqlDialect::ClickhouseSQL, + AccuracyTarget::Exact, + ) + .await + .expect("two-subquery rate ratio must lower"); let space = search_workload(vec![("ratio", Rc::clone(&pre_asap))]); let selection = space.global_selection(&DefaultCostModel); let root = selection .assemble_selected_dag(&space.roots[0].1) .expect("materialization failed") .expect("root must be discovered"); - let SummaryExpr::ValueOperation { - child: join, - operation: ValueOperation::Project { cols, .. }, - .. - } = &root.expr + let Some(NonASAPOp::Project { + child: join, cols, .. + }) = root.non_asap() else { panic!( "expected Project above relational join, got {:?}", - root.expr + root.operator ); }; assert!(matches!( &cols[1].expr, - QueryExpr::Arithmetic { + ScalarExpr::Arithmetic { op: asap_types::pre_asap::ArithmeticOpKind::Div, .. } )); - let SummaryExpr::RelationalJoin { + let Some(NonASAPOp::Join { left, right, kind, pred, - pruning: None, - } = &join.expr + }) = join.non_asap() else { - panic!("expected read-time relational join, got {:?}", join.expr); + panic!( + "expected read-time relational join, got {:?}", + join.operator + ); }; assert_eq!(kind, &asap_types::pre_asap::JoinKind::Inner); assert!(matches!( - pred.0.as_ref(), - QueryExpr::Compare { + &pred.0, + ScalarExpr::Compare { left, op: asap_types::pre_asap::CompareOpKind::Eq, right, - } if matches!(left.as_ref(), QueryExpr::Column(0)) - && matches!(right.as_ref(), QueryExpr::Column(2)) + .. + } if matches!(left.as_ref(), ScalarExpr::Column(0)) + && matches!(right.as_ref(), ScalarExpr::Column(2)) )); assert_eq!( join.schema @@ -332,39 +363,44 @@ async fn sql_join_recursively_binds_both_temporal_aggregate_children() { vec!["service", "v", "service", "v"] ); for child in [left, right] { - let SummaryExpr::ValueOperation { - child: aggregate, - operation: ValueOperation::Project { .. }, - .. - } = &child.expr + let Some(NonASAPOp::Project { + child: aggregate, .. + }) = child.non_asap() else { - panic!("derived table Project was not retained: {:?}", child.expr); + panic!( + "derived table Project was not retained: {:?}", + child.operator + ); }; - let SummaryExpr::ValueOperation { - child: aggregate, - operation: ValueOperation::FinalizeExactAccumulator, - .. - } = &aggregate.expr + let Operator::ASAP(ASAPOp::FinalizeExactAccumulator { child: aggregate }) = + &aggregate.operator else { panic!("derived table Project must consume finalized exact values"); }; assert!(matches!( - aggregate.expr, - SummaryExpr::SummaryAgg { + aggregate.operator, + Operator::ASAP(ASAPOp::SummaryAgg { family: FieldDataType::ExactAggregate(ExactKind::Rate, ExactParams::Rate), .. - } + }) )); } assert!(join .guarantee .as_ref() .is_some_and(|value| value.is_exact())); - let dag = compile_post_asap_dag(&root).expect("join DAG must compile"); + let dag = post_asap_dag(&root); let join_id = dag .nodes .iter() - .find(|node| matches!(node.payload, PostAsapOperatorPayload::RelationalJoin { .. })) + .find(|node| { + matches!( + node.payload, + PhysicalASAPOperatorPayload::Relational { + operator: NonASAPOpKind::Join { .. }, + } + ) + }) .expect("relational join node") .id; let roles = dag @@ -383,29 +419,27 @@ async fn unsupported_sql_join_shapes_remain_fail_closed() { "SELECT a.service FROM (SELECT service, asap_rate(latency, ts, 300000) v FROM metrics GROUP BY service) a INNER JOIN (SELECT service, asap_rate(latency, ts, 300000) v FROM metrics GROUP BY service) b ON a.v>b.v", "SELECT a.service FROM (SELECT service, asap_rate(latency, ts, 300000) v FROM metrics GROUP BY service) a INNER JOIN (SELECT service, asap_rate(latency, ts, 300000) v FROM metrics GROUP BY service) b ON a.service=a.service", ] { - let pre_asap = Rc::new( - lower_sql_dialect( - sql, - &catalog(), - SqlDialect::ClickhouseSQL, - AccuracyTarget::Exact, - ) - .await - .unwrap_or_else(|error| panic!("join must lower before fail-closed mapping: {error}")), - ); + let pre_asap = lower_sql_dialect( + sql, + &catalog(), + SqlDialect::ClickhouseSQL, + AccuracyTarget::Exact, + ) + .await + .unwrap_or_else(|error| panic!("join must lower before fail-closed mapping: {error}")); let space = search_workload(vec![("unsupported-join", Rc::clone(&pre_asap))]); let selection = space.global_selection(&DefaultCostModel); let root = selection .assemble_selected_dag(&space.roots[0].1) .expect("materialization failed") .expect("root must be discovered"); - let SummaryExpr::ValueOperation { child, .. } = &root.expr else { - panic!("SQL projection must remain explicit: {:?}", root.expr); + let Some(NonASAPOp::Project { child, .. }) = root.non_asap() else { + panic!("SQL projection must remain explicit: {:?}", root.operator); }; assert!( - matches!(child.expr, SummaryExpr::KeepPreAsap(_)), + is_kept_non_asap(child), "unsupported join was partially accelerated: {:?}", - child.expr + child.operator ); } } @@ -414,16 +448,14 @@ async fn unsupported_sql_join_shapes_remain_fail_closed() { /// explicit read-time nodes while the aggregate is summary-bound. #[tokio::test] async fn sql_relational_parents_retain_summary_bound_aggregate() { - let pre_asap = Rc::new( - lower( - "SELECT t.service, t.p FROM \ - (SELECT service, approx_percentile_cont(latency, 0.9) AS p \ - FROM metrics GROUP BY service) t \ - WHERE t.p > 100 ORDER BY t.p DESC LIMIT 5", - AccuracyTarget::Epsilon(0.01), - ) - .await, - ); + let pre_asap = lower( + "SELECT t.service, t.p FROM \ + (SELECT service, approx_percentile_cont(latency, 0.9) AS p \ + FROM metrics GROUP BY service) t \ + WHERE t.p > 100 ORDER BY t.p DESC LIMIT 5", + AccuracyTarget::Epsilon(0.01), + ) + .await; let space = search_workload(vec![("query", Rc::clone(&pre_asap))]); let selection = space.global_selection(&DefaultCostModel); let root = selection @@ -437,28 +469,29 @@ async fn sql_relational_parents_retain_summary_bound_aggregate() { let mut saw_sort = false; let mut saw_limit = false; loop { - match &node.expr { - SummaryExpr::ValueOperation { - child, operation, .. - } => { - match operation { - asap_types::post_asap::ValueOperation::Project { .. } => saw_project = true, - asap_types::post_asap::ValueOperation::Filter { .. } => saw_filter = true, - asap_types::post_asap::ValueOperation::Sort { .. } => saw_sort = true, - asap_types::post_asap::ValueOperation::Limit { n, offset, .. } => { - assert_eq!((*n, *offset), (5, 0)); - saw_limit = true; - } - _ => {} - } - node = child; - } - SummaryExpr::SummaryEstimate { summary_input, .. } => { - assert!(matches!(summary_input.expr, SummaryExpr::SummaryAgg { .. })); - break; + if let Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) = &node.operator { + assert!(matches!( + summary_input.operator, + Operator::ASAP(ASAPOp::SummaryAgg { .. }) + )); + break; + } + match node.non_asap() { + Some(NonASAPOp::Project { .. }) => saw_project = true, + Some(NonASAPOp::Filter { .. }) => saw_filter = true, + Some(NonASAPOp::Sort { .. }) => saw_sort = true, + Some(NonASAPOp::Limit { n, offset, .. }) => { + assert_eq!((*n, *offset), (Some(5), 0)); + saw_limit = true; } - other => panic!("expected relational parents over SummaryEstimate, got {other:?}"), + _ => {} } + node = unary_child(node).unwrap_or_else(|| { + panic!( + "expected relational parents over SummaryEstimate, got {:?}", + node.operator + ) + }); } assert!(saw_project && saw_filter && saw_sort && saw_limit); } @@ -468,39 +501,47 @@ async fn sql_relational_parents_retain_summary_bound_aggregate() { /// may be dropped or moved across the aggregation boundary. #[tokio::test] async fn sql_filter_keeps_read_predicate_and_summary_population_selection() { - let pre_asap = Rc::new( - lower( - "SELECT t.service, t.p FROM \ - (SELECT service, approx_percentile_cont(latency, 0.9) AS p \ - FROM metrics WHERE service = 'api' GROUP BY service) t \ - WHERE t.p > 100", - AccuracyTarget::Epsilon(0.01), - ) - .await, - ); + let pre_asap = lower( + "SELECT t.service, t.p FROM \ + (SELECT service, approx_percentile_cont(latency, 0.9) AS p \ + FROM metrics WHERE service = 'api' GROUP BY service) t \ + WHERE t.p > 100", + AccuracyTarget::Epsilon(0.01), + ) + .await; let expected_read_predicate = { - let mut node = pre_asap.as_ref(); + let mut node = &pre_asap; loop { - match node { - QueryExpr::Filter { pred, .. } => break pred.clone(), - QueryExpr::Project { child, .. } - | QueryExpr::Sort { child, .. } - | QueryExpr::Limit { child, .. } => node = child, - other => panic!("expected a Filter above the aggregate, got {other:?}"), + match node.non_asap() { + Some(NonASAPOp::Filter { pred, .. }) => break pred.clone(), + Some( + NonASAPOp::Project { child, .. } + | NonASAPOp::Sort { child, .. } + | NonASAPOp::Limit { child, .. }, + ) => node = child, + _ => panic!( + "expected a Filter above the aggregate, got {:?}", + node.operator + ), } } }; let expected_source_predicates = { - let mut node = pre_asap.as_ref(); + let mut node = &pre_asap; loop { - match node { - QueryExpr::Scan { predicates, .. } => break predicates.clone(), - QueryExpr::Project { child, .. } - | QueryExpr::Filter { child, .. } - | QueryExpr::Aggregate { child, .. } - | QueryExpr::Sort { child, .. } - | QueryExpr::Limit { child, .. } => node = child, - other => panic!("expected a unary SQL plan over Scan, got {other:?}"), + match node.non_asap() { + Some(NonASAPOp::Scan { predicates, .. }) => break predicates.clone(), + Some( + NonASAPOp::Project { child, .. } + | NonASAPOp::Filter { child, .. } + | NonASAPOp::Aggregate { child, .. } + | NonASAPOp::Sort { child, .. } + | NonASAPOp::Limit { child, .. }, + ) => node = child, + _ => panic!( + "expected a unary SQL plan over Scan, got {:?}", + node.operator + ), } } }; @@ -516,41 +557,39 @@ async fn sql_filter_keeps_read_predicate_and_summary_population_selection() { let mut node = root.as_ref(); let mut retained_read_predicate = None; loop { - match &node.expr { - SummaryExpr::ValueOperation { - child, - operation: ValueOperation::Filter { pred }, - .. - } => { - retained_read_predicate = Some(pred.clone()); - node = child; - } - SummaryExpr::ValueOperation { child, .. } => node = child, - SummaryExpr::SummaryEstimate { summary_input, .. } => { - let SummaryExpr::SummaryAgg { child, .. } = &summary_input.expr else { - panic!("expected SummaryAgg below SummaryEstimate"); - }; - let SummaryExpr::KeepPreAsap(raw_input) = &child.expr else { - panic!("expected raw summary population below SummaryAgg"); - }; - let QueryExpr::Scan { predicates, .. } = raw_input.as_ref() else { - panic!("expected source selection to remain a Scan"); - }; - assert_eq!(predicates, &expected_source_predicates); - break; - } - other => panic!("expected read-time operations over a summary, got {other:?}"), + if let Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) = &node.operator { + let Operator::ASAP(ASAPOp::SummaryAgg { child, .. }) = &summary_input.operator else { + panic!("expected SummaryAgg below SummaryEstimate"); + }; + assert!( + is_kept_non_asap(child), + "expected raw summary population below SummaryAgg" + ); + let Some(NonASAPOp::Scan { predicates, .. }) = child.non_asap() else { + panic!("expected source selection to remain a Scan"); + }; + assert_eq!(predicates, &expected_source_predicates); + break; + } + if let Some(NonASAPOp::Filter { pred, .. }) = node.non_asap() { + retained_read_predicate = Some(pred.clone()); } + node = unary_child(node).unwrap_or_else(|| { + panic!( + "expected read-time operations over a summary, got {:?}", + node.operator + ) + }); } assert_eq!(retained_read_predicate, Some(expected_read_predicate)); - let dag = compile_post_asap_dag(&root).expect("typed DAG compilation failed"); + let dag = post_asap_dag(&root); + let expected_wire = wire_pred(retained_read_predicate.as_ref().unwrap()); assert!(dag.nodes.iter().any(|node| matches!( &node.payload, - PostAsapOperatorPayload::Value { - operation: ValueOperation::Filter { pred }, - .. - } if pred == retained_read_predicate.as_ref().unwrap() + PhysicalASAPOperatorPayload::Relational { + operator: NonASAPOpKind::Filter { pred }, + } if *pred == expected_wire ))); } @@ -559,15 +598,13 @@ async fn sql_filter_keeps_read_predicate_and_summary_population_selection() { /// read-time operation. #[tokio::test] async fn sql_filter_preserves_local_fallback_boundary_for_unsupported_child() { - let pre_asap = Rc::new( - lower( - "SELECT t.service, t.avg_bytes FROM \ - (SELECT service, AVG(bytes) AS avg_bytes FROM metrics GROUP BY service) t \ - WHERE t.avg_bytes > 100", - AccuracyTarget::Exact, - ) - .await, - ); + let pre_asap = lower( + "SELECT t.service, t.avg_bytes FROM \ + (SELECT service, AVG(bytes) AS avg_bytes FROM metrics GROUP BY service) t \ + WHERE t.avg_bytes > 100", + AccuracyTarget::Exact, + ) + .await; let space = search_workload(vec![("query", Rc::clone(&pre_asap))]); let selection = space.global_selection(&DefaultCostModel); let root = selection @@ -578,22 +615,20 @@ async fn sql_filter_preserves_local_fallback_boundary_for_unsupported_child() { let mut node = root.as_ref(); let mut saw_filter = false; loop { - match &node.expr { - SummaryExpr::ValueOperation { - child, operation, .. - } => { - saw_filter |= matches!(operation, ValueOperation::Filter { .. }); - node = child; - } - SummaryExpr::KeepPreAsap(fallback) => { - assert!( - matches!(fallback.as_ref(), QueryExpr::BinaryOp { .. }), - "AVG's unsupported rewritten child should be opaque, got {fallback:?}" - ); - break; - } - other => panic!("expected local value operations over fallback child, got {other:?}"), + if let Some(NonASAPOp::BinaryOp { .. }) = node.non_asap() { + assert!( + is_kept_non_asap(node), + "AVG's unsupported rewritten child should be kept whole, got {node:?}" + ); + break; } + saw_filter |= matches!(node.non_asap(), Some(NonASAPOp::Filter { .. })); + node = unary_child(node).unwrap_or_else(|| { + panic!( + "expected local value operations over fallback child, got {:?}", + node.operator + ) + }); } assert!(saw_filter, "supported Filter must remain explicit"); } @@ -604,7 +639,7 @@ async fn sql_filter_preserves_local_fallback_boundary_for_unsupported_child() { /// ```text /// SummaryEstimate { query: Quantile{0.99} } → {…: Float64} /// └─ SummaryAgg { Kll{k:269}, input: metrics.latency } → {…: Sketch(Kll, {k:269})} -/// └─ KeepPreAsap(Scan) → {ts, service, latency, bytes} +/// └─ Scan (kept non-ASAP) → {ts, service, latency, bytes} /// ``` /// /// The SQL counterpart of `promql_to_post_asap.rs`'s @@ -622,12 +657,12 @@ async fn sql_quantile_binds_kll_sketch_over_named_column() { let agg = inner_aggregate(&pre_asap); let root = realize(agg).expect("binding failed"); - let SummaryExpr::SummaryEstimate { + let Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, query, - } = &root.expr + }) = &root.operator else { - panic!("expected SummaryEstimate root, got {:?}", root.expr); + panic!("expected SummaryEstimate root, got {:?}", root.operator); }; assert!(matches!(query, SketchStatistic::Quantile { q } if *q == 0.99)); assert_eq!( @@ -641,15 +676,15 @@ async fn sql_quantile_binds_kll_sketch_over_named_column() { "the summary-state type must not propagate past the estimate" ); - let SummaryExpr::SummaryAgg { + let Operator::ASAP(ASAPOp::SummaryAgg { child, family, input, reduction, .. - } = &summary_input.expr + }) = &summary_input.operator else { - panic!("expected SummaryAgg, got {:?}", summary_input.expr); + panic!("expected SummaryAgg, got {:?}", summary_input.operator); }; assert_eq!( family, @@ -679,10 +714,12 @@ async fn sql_quantile_binds_kll_sketch_over_named_column() { ) ); - let SummaryExpr::KeepPreAsap(kept_leaf) = &child.expr else { - panic!("expected KeepPreAsap leaf, got {:?}", child.expr); - }; - assert!(matches!(kept_leaf.as_ref(), QueryExpr::Scan { .. })); + assert!( + is_kept_non_asap(child), + "expected a kept non-ASAP leaf, got {:?}", + child.operator + ); + assert!(matches!(child.non_asap(), Some(NonASAPOp::Scan { .. }))); assert!( child .schema @@ -709,12 +746,12 @@ async fn sql_count_distinct_with_epsilon_binds_hll_rse_over_named_column() { let agg = inner_aggregate(&pre_asap); let root = realize(agg).expect("binding failed"); - let SummaryExpr::SummaryEstimate { + let Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, query, - } = &root.expr + }) = &root.operator else { - panic!("expected SummaryEstimate root, got {:?}", root.expr); + panic!("expected SummaryEstimate root, got {:?}", root.operator); }; assert!(matches!(query, SketchStatistic::Cardinality)); assert_eq!( @@ -723,14 +760,14 @@ async fn sql_count_distinct_with_epsilon_binds_hll_rse_over_named_column() { "COUNT(DISTINCT …) reads back out as an integer count" ); - let SummaryExpr::SummaryAgg { + let Operator::ASAP(ASAPOp::SummaryAgg { family, input, reduction, .. - } = &summary_input.expr + }) = &summary_input.operator else { - panic!("expected SummaryAgg, got {:?}", summary_input.expr); + panic!("expected SummaryAgg, got {:?}", summary_input.operator); }; assert_eq!( family, @@ -763,11 +800,11 @@ async fn sql_exact_workload_binds_accumulators_not_sketches() { .await; let agg = inner_aggregate(&pre_asap); let root = realize(agg).expect("binding failed"); - let SummaryExpr::SummaryAgg { + let Operator::ASAP(ASAPOp::SummaryAgg { family, reduction, .. - } = &root.expr + }) = &root.operator else { - panic!("expected SummaryAgg, got {:?}", root.expr); + panic!("expected SummaryAgg, got {:?}", root.operator); }; assert_eq!( family, @@ -788,37 +825,42 @@ async fn sql_exact_workload_binds_accumulators_not_sketches() { let agg = inner_aggregate(&pre_asap); let root = realize(agg).expect("binding failed"); assert!( - matches!(root.expr, SummaryExpr::KeepPreAsap(_)), + is_kept_non_asap(&root), "avg has no mergeable accumulator — stays logical" ); + assert!( + root.guarantee.as_ref().is_some_and(|g| g.is_exact()), + "a kept logical sub_dag is exact" + ); } #[tokio::test] async fn map_projection_export_preserves_unsupported_child_boundary() { - let pre = Rc::new(lower_sql_dialect( + let pre = lower_sql_dialect( "SELECT map('job', t.service) AS labels, t.avg_bytes FROM (SELECT service, AVG(bytes) AS avg_bytes FROM metrics GROUP BY service) t WHERE t.avg_bytes > 100", &catalog(), SqlDialect::ClickhouseSQL, AccuracyTarget::Exact, - ).await.unwrap()); + ).await.unwrap(); let space = search_workload(vec![("map_query", pre)]); let root = space .global_selection(&DefaultCostModel) .assemble_selected_dag(&space.roots[0].1) .unwrap() .unwrap(); - let dag = compile_post_asap_dag(&root).unwrap(); + let dag = post_asap_dag(&root); assert!(dag.nodes.iter().any(|node| matches!(&node.payload, - PostAsapOperatorPayload::Value { operation: ValueOperation::Project { cols, .. }, .. } - if cols.iter().any(|item| matches!(&item.expr, QueryExpr::FunctionCall { name, .. } if name == "map")) + PhysicalASAPOperatorPayload::Relational { operator: NonASAPOpKind::Project { cols, .. } } + if cols.iter().any(|item| matches!(&item.expr, WireScalarExpr::FunctionCall { name, .. } if name == "map")) ))); let mut node = root.as_ref(); loop { - match &node.expr { - SummaryExpr::ValueOperation { child, .. } => node = child, - SummaryExpr::KeepPreAsap(child) => { - assert!(matches!(child.as_ref(), QueryExpr::BinaryOp { .. })); - break; - } - other => panic!("unexpected map/fallback composition: {other:?}"), + if let Some(NonASAPOp::BinaryOp { .. }) = node.non_asap() { + assert!( + is_kept_non_asap(node), + "fallback child must stay whole: {node:?}" + ); + break; } + node = unary_child(node) + .unwrap_or_else(|| panic!("unexpected map/fallback composition: {:?}", node.operator)); } } diff --git a/crates/integration-tests/tests/summary_maintenance_lifecycle_e2e.rs b/crates/integration-tests/tests/summary_maintenance_lifecycle_e2e.rs deleted file mode 100644 index eeade3ae5..000000000 --- a/crates/integration-tests/tests/summary_maintenance_lifecycle_e2e.rs +++ /dev/null @@ -1,1147 +0,0 @@ -//! End-to-end coverage for workload-aware summary-maintenance planning: -//! source workload -> PromQL lowering -> candidate search -> -//! summary-maintenance lifecycle selection -> materialized deployment guarantees. - -use std::rc::Rc; - -use asap_aware_mapping::cost_model::Cost; -use asap_aware_mapping::CostRate; -use asap_aware_mapping::{ - assemble_selected_dag_with_summary_maintenance_lifecycles, export_summary_maintenance_plan, - global_selection_with_summary_maintenance_lifecycles, search_workload_with, CostModel, Horizon, - SummaryMaintenanceCapabilities, SummaryMaintenanceLifecycleCapabilities, - SummaryMaintenanceLifecycleCostInputs, SummaryMaintenanceLifecycleRejection, WorkloadDemand, -}; -use asap_frontend_promql::lower_promql_workload; -use asap_types::post_asap::{ - EvaluationSchedule, SummaryMaintenanceLifecycle, SummaryMaintenanceMode, SummaryNode, -}; -use asap_types::pre_asap::agg_intent::AggIntent; -use asap_types::types::AccuracyTarget; -use asap_types::workload::{ - AccuracyRequirement, BatchEntry, DataArrival, DataWorkload, DurationMs, Evidence, - EvidenceSource, PlanningWorkload, Predictability, Query, QueryLanguage, QueryRequirements, - QueryTimeScope, QueryWorkload, Rate, RepeatedDemand, RepeatingEntry, RepetitionInterval, - TimeSelection, -}; - -const NOW_MS: u64 = 1_000_000; - -struct FullyCostedRuntime; - -impl CostModel for FullyCostedRuntime { - fn raw_query_recompute_total_cost( - &self, - _target: &asap_types::pre_asap::QueryExpr, - _expected_reads: f64, - ) -> Option { - Some(Cost(1_000.0)) - } - - fn rank_candidates( - &self, - _intent: &AggIntent, - candidates: &[asap_types::post_asap::SketchAlgorithm], - ) -> Vec { - candidates.to_vec() - } - - fn summary_maintenance_lifecycle_cost_inputs( - &self, - _summary: &SummaryNode, - ) -> SummaryMaintenanceLifecycleCostInputs { - SummaryMaintenanceLifecycleCostInputs { - build_cost: Some(Cost(10.0)), - maintenance_cost_per_update: Some(Cost(1.0)), - summary_read_cost: Some(Cost(1.0)), - retention_cost_rate: Some(CostRate(0.1)), - retirement_cost: Some(Cost(1.0)), - } - } - - fn summary_maintenance_capabilities( - &self, - _summary: &SummaryNode, - ) -> SummaryMaintenanceCapabilities { - SummaryMaintenanceCapabilities { - incremental_update: true, - merge: true, - delete: true, - } - } -} - -fn dashboard_workload() -> PlanningWorkload { - let query = Query("quantile_over_time(0.99, latency[5m])".into()); - let requirements = QueryRequirements { - accuracy: AccuracyRequirement::Explicit(AccuracyTarget::Epsilon(0.01)), - ..QueryRequirements::default() - }; - PlanningWorkload { - query_workload: QueryWorkload { - language: QueryLanguage::PromQL, - query_batch: Some(vec![BatchEntry { - query: query.clone(), - requirements: requirements.clone(), - predictability: Predictability::AdHoc, - invocations: 1, - execute_at: None, - time_selection: TimeSelection::default(), - }]), - repeating_queries: Some(vec![RepeatingEntry { - query, - demand: RepeatedDemand::FixedInterval(RepetitionInterval(1_000)), - requirements, - predictability: Predictability::Predictable { known_at: None }, - time_selection: TimeSelection { - scope: QueryTimeScope::RealTime, - ..TimeSelection::default() - }, - }]), - }, - data_workload: Some(DataWorkload { - arrival: DataArrival::ContinuouslyIngesting, - ingestion_rate: Evidence { - value: Some(Rate(1.0)), - source: EvidenceSource::Observed, - observed_at_ms: Some(NOW_MS), - valid_for_ms: Some(60_000), - }, - data_ingestion_interval: Evidence { - value: Some(DurationMs(1_000)), - ..Default::default() - }, - ..DataWorkload::default() - }), - } -} - -#[test] -fn promql_dashboard_materializes_continuous_summary_with_explained_rejections() { - let workload = dashboard_workload(); - let plan = selected_plan(&workload); - - assert!(!plan.selected_raw_recompute); - assert_eq!(plan.expected_reads, Some(100.0)); - assert_eq!(plan.deployments.len(), 1); - - let deployment = &plan.deployments[0]; - let guarantee = deployment - .summary_maintenance_lifecycle_guarantee - .as_ref() - .expect("selected lifecycle guarantee"); - assert_eq!( - guarantee.summary_maintenance_lifecycle, - SummaryMaintenanceLifecycle::ContinuouslyMaintained - ); - assert_eq!(guarantee.evaluation_schedule, EvaluationSchedule::PerUpdate); - assert_eq!( - guarantee.summary_maintenance_mode, - SummaryMaintenanceMode::Incremental - ); - assert!(deployment.alternatives.iter().any(|alternative| { - matches!( - alternative.summary_maintenance_lifecycle, - SummaryMaintenanceLifecycle::Prepared { .. } - ) && alternative.rejection - == Some(SummaryMaintenanceLifecycleRejection::RequiresPredictableOneTimeQuery) - })); - assert!(deployment.alternatives.iter().any(|alternative| { - matches!( - alternative.summary_maintenance_lifecycle, - SummaryMaintenanceLifecycle::Shared { .. } - ) && alternative.rejection - == Some(SummaryMaintenanceLifecycleRejection::UnsupportedByRuntime) - })); - - let exported = serde_json::to_value(export_summary_maintenance_plan(&plan)).unwrap(); - assert_eq!( - exported["deployments"][0]["selected"]["lifecycle"]["kind"], - "continuously_maintained" - ); - assert_eq!( - exported["deployments"][0]["selected"]["maintenance_mode"], - "incremental" - ); - let alternatives = exported["deployments"][0]["alternatives"] - .as_array() - .expect("exported lifecycle alternatives"); - assert!(alternatives.iter().any(|alternative| { - alternative["lifecycle"]["kind"] == "prepared" - && alternative["rejection"] == "requires_predictable_one_time_query" - })); - assert!(alternatives.iter().any(|alternative| { - alternative["lifecycle"]["kind"] == "shared" - && alternative["rejection"] == "unsupported_by_runtime" - })); - assert!(exported["dag"]["nodes"].as_array().is_some()); - let summary_node = exported["dag"]["nodes"] - .as_array() - .unwrap() - .iter() - .find(|node| node["kind"] == "SummaryAgg") - .expect("exported SummaryAgg node"); - assert_eq!( - summary_node["detail"]["summary_maintenance"]["selected"]["lifecycle"]["kind"], - "continuously_maintained" - ); -} - -fn selected_plan( - workload: &PlanningWorkload, -) -> asap_aware_mapping::SummaryMaintenanceLifecyclePlan { - selected_plan_with_model(workload, &FullyCostedRuntime) -} - -fn selected_plan_with_model( - workload: &PlanningWorkload, - model: &dyn CostModel, -) -> asap_aware_mapping::SummaryMaintenanceLifecyclePlan { - selected_plan_with_horizon(workload, model, Horizon(100.)) -} - -fn selected_plan_with_horizon( - workload: &PlanningWorkload, - model: &dyn CostModel, - horizon: Horizon, -) -> asap_aware_mapping::SummaryMaintenanceLifecyclePlan { - workload.validate().unwrap(); - - let lowered = lower_promql_workload(workload, 0) - .expect("valid PromQL workload") - .into_iter() - .next() - .expect("one normalized workload entry"); - selected_plan_for_lowered(workload, lowered, model, horizon) -} - -fn selected_plan_for_lowered( - workload: &PlanningWorkload, - lowered: asap_types::pre_asap::QueryExpr, - model: &dyn CostModel, - horizon: Horizon, -) -> asap_aware_mapping::SummaryMaintenanceLifecyclePlan { - let root = Rc::new(lowered); - let strategies = asap_aware_mapping::default_strategies_with(model); - let space = search_workload_with(vec![("dashboard", Rc::clone(&root))], &strategies); - let target = Rc::clone(&space.roots[0].1); - let capabilities = SummaryMaintenanceLifecycleCapabilities { - supports_ephemeral: true, - supports_prepared: false, - supports_shared: false, - supports_continuously_maintained: true, - }; - - let selection = global_selection_with_summary_maintenance_lifecycles( - &space, - WorkloadDemand { - workload: &workload.query_workload, - data_workload: workload.data_workload.as_ref(), - entry_indices: &[1], - }, - NOW_MS, - Some(horizon), - capabilities, - model, - ) - .unwrap(); - assemble_selected_dag_with_summary_maintenance_lifecycles( - &selection, - &target, - WorkloadDemand::new_with_data( - &workload.query_workload, - workload.data_workload.as_ref().unwrap(), - &[1], - ), - NOW_MS, - Some(horizon), - capabilities, - model, - ) - .unwrap() - .expect("selected summary plan") -} - -mod physical_common; - -/// A selected continuous lifecycle supplies a materialization boundary; its -/// maintenance and query DAGs execute the selected KLL computation in fresh runs. -#[test] -fn continuous_lifecycle_compiles_and_executes_spatial_kll() { - use asap_physical_operators::{ - physical_planner::{compile_candidate, InputContract}, - runtime::Scope, - values::{Batch, Value}, - }; - use asap_types::{ - post_asap::{compile_post_asap_dag, FieldDataType, PostAsapOperatorPayload}, - pre_asap::DataType, - }; - use std::{collections::BTreeMap, sync::Arc}; - let mut workload = dashboard_workload(); - workload.query_workload.query_batch.as_mut().unwrap()[0].query = - Query("quantile(0.99, latency)".into()); - workload.query_workload.repeating_queries.as_mut().unwrap()[0].query = - Query("quantile(0.99, latency)".into()); - let selected = selected_plan(&workload); - assert_eq!( - selected.deployments[0] - .summary_maintenance_lifecycle_guarantee - .as_ref() - .unwrap() - .summary_maintenance_lifecycle, - SummaryMaintenanceLifecycle::ContinuouslyMaintained - ); - let dag = compile_post_asap_dag(&selected.root).unwrap(); - let build = dag - .nodes - .iter() - .find(|node| matches!(node.payload, PostAsapOperatorPayload::SummaryAgg { .. })) - .unwrap(); - let input = dag - .edges - .iter() - .find(|edge| edge.consumer == build.id) - .unwrap() - .producer; - let raw = dag.nodes.iter().find(|node| node.id == input).unwrap(); - let schema = Arc::new(raw.output_schema.clone()); - let candidate = compile_candidate( - &dag, - BTreeMap::from([(u64::from(input.0), InputContract::bounded(schema.clone()))]), - &[u64::from(dag.root.0)], - &[u64::from(build.id.0)], - ) - .unwrap(); - - // A continuous input without a finite pane boundary cannot implement this - // blocking builder. Retain lifecycle ownership in the candidate payload; - // only the legal bounded request candidate reaches workload pricing. - let mut unbounded = InputContract::bounded(schema.clone()); - unbounded.properties.boundedness = asap_physical_operators::plan::Boundedness::Unbounded; - let rejected = compile_candidate( - &dag, - BTreeMap::from([(u64::from(input.0), unbounded)]), - &[u64::from(dag.root.0)], - &[u64::from(build.id.0)], - ); - assert!(rejected.is_err()); - let request = compile_candidate( - &dag, - BTreeMap::from([(u64::from(input.0), InputContract::bounded(schema.clone()))]), - &[u64::from(dag.root.0)], - &[], - ) - .unwrap(); - let mut priced = 0; - let feedback = asap_physical_operators::physical_planner::select_candidate( - vec![ - rejected.map(|candidate| { - ( - SummaryMaintenanceLifecycle::ContinuouslyMaintained, - candidate, - ) - }), - Ok((SummaryMaintenanceLifecycle::Ephemeral, request)), - ], - |_| { - priced += 1; - Ok(Some( - asap_physical_operators::physical_planner::CandidateCost { - workload_scope: "dashboard".into(), - horizon_seconds: 100., - total_cost: 1000., - }, - )) - }, - ) - .unwrap(); - assert_eq!(priced, 1); - assert_eq!(feedback.candidate.0, SummaryMaintenanceLifecycle::Ephemeral); - for revision in [1, 2] { - let rows = (1..=100) - .map(|value| { - schema - .fields - .iter() - .map(|field| match field.dtype { - FieldDataType::Plain(DataType::Float64) => Value::Float64(f64::from(value)), - FieldDataType::Plain(DataType::Timestamp) => Value::Timestamp(300_000), - _ => panic!("unexpected field {field:?}"), - }) - .collect() - }) - .collect(); - let raw_batch = Batch::try_new(schema.clone(), rows).unwrap(); - let direct = physical_common::execute( - &feedback.candidate.1.query, - BTreeMap::from([(u64::from(input.0), raw_batch.clone())]), - Scope::Query { - evaluation_time_ms: 300_000, - revision, - }, - ); - let state = physical_common::execute( - candidate.precompute.as_ref().unwrap(), - BTreeMap::from([(u64::from(input.0), raw_batch)]), - Scope::Ingestion { - window_start_ms: 0, - window_end_ms: 300_000, - revision, - }, - ); - let result = physical_common::execute( - &candidate.query, - BTreeMap::from([(u64::from(build.id.0), state[0][0].clone())]), - Scope::Query { - evaluation_time_ms: 300_000, - revision, - }, - ); - let values: Vec<_> = result[0] - .iter() - .flat_map(|batch| batch.rows()) - .flat_map(|row| row.iter()) - .filter_map(|value| { - if let Value::Float64(value) = value { - Some(*value) - } else { - None - } - }) - .collect(); - let direct_values: Vec<_> = direct[0] - .iter() - .flat_map(|batch| batch.rows()) - .flat_map(|row| row.iter()) - .filter_map(|value| { - if let Value::Float64(value) = value { - Some(*value) - } else { - None - } - }) - .collect(); - assert_eq!( - values, direct_values, - "maintenance and request candidates preserve the same population" - ); - assert_eq!(values.len(), 1); - assert!( - (98. ..=100.).contains(&values[0]), - "p99 rank must reflect the supplied population" - ); - } -} - -fn quantile_workload(query: &str) -> PlanningWorkload { - let mut workload = dashboard_workload(); - workload.query_workload.query_batch.as_mut().unwrap()[0].query = Query(query.into()); - workload.query_workload.repeating_queries.as_mut().unwrap()[0].query = Query(query.into()); - workload -} - -/// Timed DAG for `query` after binding every summary state to `lifecycle`. -/// Grouped queries carry a physical series identity, as per-entity state needs. -fn lifecycle_timed_dag( - query: &str, - lifecycle: &SummaryMaintenanceLifecycle, -) -> (asap_types::post_asap::PostAsapDAG, Vec) { - use asap_aware_mapping::enumerate_summary_maintenance_lifecycles; - let workload = quantile_workload(query); - let mut lowered = lower_promql_workload(&workload, 0).unwrap().remove(0); - if query.contains(" by(") { - lowered = - asap_physical_operators::physical_planner::promql_rows::with_series_identity(&lowered) - .unwrap(); - } - let root = - selected_plan_for_lowered(&workload, lowered, &FullyCostedRuntime, Horizon(100.)).root; - let candidates = enumerate_summary_maintenance_lifecycles( - root, - WorkloadDemand::new_with_data( - &workload.query_workload, - workload.data_workload.as_ref().unwrap(), - &[1], - ), - NOW_MS, - Some(Horizon(100.)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &FullyCostedRuntime, - ) - .unwrap(); - let choices: Vec<_> = candidates - .deployments() - .iter() - .map(|deployment| (deployment.post_asap_node_id, lifecycle.clone())) - .collect(); - let mut states: Vec<_> = choices.iter().map(|(id, _)| u64::from(id.0)).collect(); - states.sort_unstable(); - let dag = candidates - .select(&choices) - .unwrap() - .execution_timed_dag() - .unwrap(); - (dag, states) -} - -/// Compile inputs for a timed DAG: its raw source, available at either phase. -fn raw_inputs( - dag: &asap_types::post_asap::PostAsapDAG, -) -> std::collections::BTreeMap { - let raw = dag - .nodes - .iter() - .find(|node| { - matches!( - node.payload, - asap_types::post_asap::PostAsapOperatorPayload::Fallback { .. } - ) - }) - .unwrap(); - std::collections::BTreeMap::from([( - u64::from(raw.id.0), - asap_physical_operators::physical_planner::InputContract::bounded(std::sync::Arc::new( - raw.output_schema.clone(), - )), - )]) -} - -/// For existing PromQL fixtures, Planner's own retained lifecycle selection -/// reproduces the timing that realization strategies assign today. -#[test] -fn planner_lifecycle_selection_reproduces_strategy_timing() { - for query in [ - "quantile_over_time(0.99, latency[5m])", - "quantile(0.99, latency)", - "sum by(job)(rate(m[1m]))", - ] { - let plan = selected_plan(&quantile_workload(query)); - assert!(!plan.selected_raw_recompute, "{query}"); - assert!(plan.deployments.iter().all(|deployment| { - deployment - .summary_maintenance_lifecycle_guarantee - .as_ref() - .is_some_and(|guarantee| { - guarantee.summary_maintenance_lifecycle - != SummaryMaintenanceLifecycle::Ephemeral - }) - })); - let strategy = asap_types::post_asap::compile_post_asap_dag(&plan.root).unwrap(); - assert_eq!(plan.execution_timed_dag().unwrap(), strategy, "{query}"); - } -} - -/// An explicitly chosen lifecycle reaches physical compilation through timing: -/// ContinuouslyMaintained puts the state in precompute, Ephemeral leaves -/// precompute empty and reads the raw source at query time; both answer alike. -#[test] -fn chosen_lifecycle_timing_decides_precompute_contents() { - use asap_physical_operators::{ - physical_planner::{compile_candidate, frontier_from_timing}, - runtime::Scope, - values::{Batch, Value}, - }; - use asap_types::{post_asap::FieldDataType, pre_asap::DataType}; - use std::collections::BTreeMap; - - let mut answers = Vec::new(); - for lifecycle in [ - SummaryMaintenanceLifecycle::ContinuouslyMaintained, - SummaryMaintenanceLifecycle::Ephemeral, - ] { - let (dag, states) = lifecycle_timed_dag("quantile(0.99, latency)", &lifecycle); - let [state] = states[..] else { - panic!("one summary state"); - }; - let inputs = raw_inputs(&dag); - let (&raw_id, contract) = inputs.iter().next().unwrap(); - let schema = contract.schema.clone(); - let frontier = frontier_from_timing(&dag).unwrap(); - let candidate = - compile_candidate(&dag, inputs, &[u64::from(dag.root.0)], &frontier).unwrap(); - let rows = (1..=100) - .map(|value| { - schema - .fields - .iter() - .map(|field| match field.dtype { - FieldDataType::Plain(DataType::Float64) => Value::Float64(f64::from(value)), - FieldDataType::Plain(DataType::Timestamp) => Value::Timestamp(300_000), - _ => panic!("unexpected field {field:?}"), - }) - .collect() - }) - .collect(); - let raw_batch = Batch::try_new(schema.clone(), rows).unwrap(); - let query_scope = Scope::Query { - evaluation_time_ms: 300_000, - revision: 1, - }; - let result = if lifecycle == SummaryMaintenanceLifecycle::Ephemeral { - assert!(frontier.is_empty()); - assert!(candidate.precompute.is_none()); - physical_common::execute( - &candidate.query, - BTreeMap::from([(raw_id, raw_batch)]), - query_scope, - ) - } else { - assert_eq!(frontier, [state]); - assert_eq!( - candidate - .materialized_outputs - .keys() - .copied() - .collect::>(), - [state] - ); - let stored = physical_common::execute( - candidate.precompute.as_ref().unwrap(), - BTreeMap::from([(raw_id, raw_batch)]), - Scope::Ingestion { - window_start_ms: 0, - window_end_ms: 300_000, - revision: 1, - }, - ); - physical_common::execute( - &candidate.query, - BTreeMap::from([(state, stored[0][0].clone())]), - query_scope, - ) - }; - answers.push( - result[0] - .iter() - .flat_map(|batch| batch.rows()) - .flat_map(|row| row.iter()) - .filter_map(|value| match value { - Value::Float64(value) => Some(*value), - _ => None, - }) - .collect::>(), - ); - } - assert_eq!(answers[0], answers[1]); - assert_eq!(answers[0].len(), 1); -} - -/// One compilation, cut by each lifecycle assignment's timing, yields exactly -/// the candidate `compile_candidate` builds for that timed DAG: the retained -/// state is the frontier under ContinuouslyMaintained, and nothing under -/// Ephemeral. Covers the KLL quantile fixture and grouped Rate→Sum. -#[test] -fn lifecycle_timing_cuts_one_compilation() { - use asap_physical_operators::physical_planner::{ - compile, compile_candidate, cut_candidate, frontier_from_timing, - }; - for query in ["quantile(0.99, latency)", "sum by(job)(rate(m[1m]))"] { - let ephemeral = SummaryMaintenanceLifecycle::Ephemeral; - let (compiled_dag, _) = lifecycle_timed_dag(query, &ephemeral); - let inputs = raw_inputs(&compiled_dag); - let roots = [u64::from(compiled_dag.root.0)]; - let compiled = compile(&compiled_dag, inputs.clone(), &roots).unwrap(); - for lifecycle in [ - SummaryMaintenanceLifecycle::ContinuouslyMaintained, - ephemeral, - ] { - let (dag, states) = lifecycle_timed_dag(query, &lifecycle); - let frontier = frontier_from_timing(&dag).unwrap(); - // Retained states read by a query-time consumer, or the root itself. - let query_time = |id: u64| { - dag.nodes.iter().any(|node| { - u64::from(node.id.0) == id - && node.output_state.timing - == asap_types::post_asap::ExecutionTiming::QueryTime - }) - }; - let expected_frontier = if lifecycle == SummaryMaintenanceLifecycle::Ephemeral { - vec![] - } else { - states - .iter() - .copied() - .filter(|state| { - *state == u64::from(dag.root.0) - || dag.edges.iter().any(|edge| { - u64::from(edge.producer.0) == *state - && query_time(u64::from(edge.consumer.0)) - }) - }) - .collect() - }; - assert_eq!(frontier, expected_frontier, "{query} {lifecycle:?}"); - let cut = cut_candidate(&compiled, &frontier).unwrap(); - let expected = compile_candidate(&dag, inputs.clone(), &roots, &frontier).unwrap(); - assert_eq!( - serde_json::to_vec(&cut).unwrap(), - serde_json::to_vec(&expected).unwrap(), - "{query} {lifecycle:?}" - ); - } - } -} - -/// A maintained current-series population is placed by its lifecycle choice: -/// ContinuouslyMaintained stores the population in precompute, Ephemeral -/// rebuilds it from the raw source at query time; both rank alike. -#[test] -fn chosen_population_lifecycle_decides_precompute_contents() { - use asap_aware_mapping::{ - enumerate_summary_maintenance_lifecycles, - maintained_population::MaintainedPopulationStrategy, - }; - use asap_physical_operators::{ - physical_planner::{ - compile_candidate, - promql_rows::{series_row, with_series_identity}, - InputContract, - }, - runtime::Scope, - values::{Batch, Value}, - }; - use asap_types::post_asap::{ - maintained_population::PopulationInput, PostAsapOperatorPayload, ValueOperation, - }; - use std::{collections::BTreeMap, sync::Arc}; - - let workload = quantile_workload("topk by(job)(1, m)"); - let root = Rc::new( - with_series_identity(&lower_promql_workload(&workload, 0).unwrap().remove(0)).unwrap(), - ); - let root = MaintainedPopulationStrategy::new(std::slice::from_ref(&root)) - .candidate(&root) - .unwrap(); - let mut answers = Vec::new(); - for lifecycle in [ - SummaryMaintenanceLifecycle::ContinuouslyMaintained, - SummaryMaintenanceLifecycle::Ephemeral, - ] { - let candidates = enumerate_summary_maintenance_lifecycles( - Rc::clone(&root), - WorkloadDemand::new_with_data( - &workload.query_workload, - workload.data_workload.as_ref().unwrap(), - &[1], - ), - NOW_MS, - Some(Horizon(100.)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &FullyCostedRuntime, - ) - .unwrap(); - let [deployment] = candidates.deployments() else { - panic!("one population state"); - }; - let id = deployment.post_asap_node_id; - let dag = candidates - .select(&[(id, lifecycle.clone())]) - .unwrap() - .execution_timed_dag() - .unwrap(); - let population = dag.nodes.iter().find(|node| node.id == id).unwrap(); - let PostAsapOperatorPayload::Value { - operation: ValueOperation::MaintainPopulation { population }, - } = &population.payload - else { - panic!("the deployment is the maintained population"); - }; - let PopulationInput::CurrentSeries(spec) = &population.input else { - panic!("current-series population"); - }; - let lookback = i64::try_from(spec.lookback_ms).unwrap(); - let raw = dag - .nodes - .iter() - .find(|node| matches!(node.payload, PostAsapOperatorPayload::Fallback { .. })) - .unwrap(); - let (raw_id, schema) = (u64::from(raw.id.0), Arc::new(raw.output_schema.clone())); - let frontier = - asap_physical_operators::physical_planner::frontier_from_timing(&dag).unwrap(); - let candidate = compile_candidate( - &dag, - BTreeMap::from([(raw_id, InputContract::bounded(schema.clone()))]), - &[u64::from(dag.root.0)], - &frontier, - ) - .unwrap(); - let end = 60_000; - let rows = [("a", end - 1, 100.), ("a", end, 1.), ("b", end, 20.)] - .into_iter() - .map(|(instance, at, value)| { - series_row( - &schema, - &BTreeMap::from([ - ("job".into(), "api".into()), - ("instance".into(), instance.into()), - ]), - at, - value, - ) - .unwrap() - }) - .collect(); - let raw_batch = Batch::try_new(schema.clone(), rows).unwrap(); - let query_scope = Scope::Query { - evaluation_time_ms: end, - revision: 1, - }; - let result = if lifecycle == SummaryMaintenanceLifecycle::Ephemeral { - assert!(frontier.is_empty()); - assert!(candidate.precompute.is_none()); - physical_common::execute( - &candidate.query, - BTreeMap::from([(raw_id, raw_batch)]), - query_scope, - ) - } else { - let state = u64::from(id.0); - assert_eq!(frontier, [state]); - let stored = physical_common::execute( - candidate.precompute.as_ref().unwrap(), - BTreeMap::from([(raw_id, raw_batch)]), - Scope::Ingestion { - window_start_ms: end - lookback, - window_end_ms: end, - revision: 1, - }, - ); - physical_common::execute( - &candidate.query, - BTreeMap::from([(state, stored[0][0].clone())]), - query_scope, - ) - }; - answers.push( - result[0] - .iter() - .flat_map(|batch| batch.rows()) - .flat_map(|row| row.iter()) - .filter_map(|value| match value { - Value::Float64(value) => Some(*value), - _ => None, - }) - .collect::>(), - ); - } - assert_eq!(answers[0], answers[1]); - assert_eq!(answers[0], [20.]); -} - -/// Grouped Rate→Sum is one inventory candidate: retaining the Sum state puts -/// Rate and Sum in precompute, while an `Ephemeral` Sum over a retained Rate -/// state leaves Sum in the query DAG. -#[test] -fn grouped_rate_sum_placement_is_a_lifecycle_choice() { - use asap_aware_mapping::enumerate_summary_maintenance_lifecycles; - use asap_physical_operators::physical_planner::{compile_candidate, InputContract}; - use asap_types::post_asap::{ExactKind, FieldDataType, PostAsapOperatorPayload, SummaryExpr}; - use std::{collections::BTreeMap, sync::Arc}; - - let workload = quantile_workload("sum by(job)(rate(m[1m]))"); - let root = Rc::new( - asap_physical_operators::physical_planner::promql_rows::with_series_identity( - &lower_promql_workload(&workload, 0).unwrap().remove(0), - ) - .unwrap(), - ); - let is_exact = |node: &SummaryNode, kind: ExactKind| { - matches!(&node.expr, SummaryExpr::SummaryAgg { - family: FieldDataType::ExactAggregate(k, _), .. - } if *k == kind) - }; - let inventory = asap_aware_mapping::search_workload(vec![("q", root)]) - .enumerate_candidate_dags(4096) - .unwrap(); - let candidates = inventory - .candidates - .into_iter() - .map(|mut forest| forest.remove(0).1) - .filter(|candidate| { - matches!(&candidate.expr, SummaryExpr::ValueOperation { child, .. } - if is_exact(child, ExactKind::Sum)) - }) - .collect::>(); - let [candidate] = candidates.as_slice() else { - panic!("one grouped Sum candidate, got {}", candidates.len()); - }; - let mut placements = Vec::new(); - for sum_lifecycle in [ - SummaryMaintenanceLifecycle::ContinuouslyMaintained, - SummaryMaintenanceLifecycle::Ephemeral, - ] { - let lifecycles = enumerate_summary_maintenance_lifecycles( - Rc::clone(candidate), - WorkloadDemand::new_with_data( - &workload.query_workload, - workload.data_workload.as_ref().unwrap(), - &[1], - ), - NOW_MS, - Some(Horizon(100.)), - SummaryMaintenanceLifecycleCapabilities::ALL, - &FullyCostedRuntime, - ) - .unwrap(); - let choices = lifecycles - .deployments() - .iter() - .map(|deployment| { - let lifecycle = if is_exact(&deployment.summary, ExactKind::Sum) { - sum_lifecycle.clone() - } else { - SummaryMaintenanceLifecycle::ContinuouslyMaintained - }; - (deployment.post_asap_node_id, lifecycle) - }) - .collect::>(); - assert_eq!(choices.len(), 2, "Rate and Sum states"); - let dag = lifecycles - .select(&choices) - .unwrap() - .execution_timed_dag() - .unwrap(); - let raw = dag - .nodes - .iter() - .find(|node| matches!(node.payload, PostAsapOperatorPayload::Fallback { .. })) - .unwrap(); - let frontier = - asap_physical_operators::physical_planner::frontier_from_timing(&dag).unwrap(); - let [boundary] = frontier.as_slice() else { - panic!("one precompute output, got {frontier:?}"); - }; - let boundary = dag - .nodes - .iter() - .find(|node| u64::from(node.id.0) == *boundary) - .unwrap(); - let physical = compile_candidate( - &dag, - BTreeMap::from([( - u64::from(raw.id.0), - InputContract::bounded(Arc::new(raw.output_schema.clone())), - )]), - &[u64::from(dag.root.0)], - &frontier, - ) - .unwrap(); - let json = |value| String::from_utf8(serde_json::to_vec(value).unwrap()).unwrap(); - placements.push(( - boundary.payload.clone(), - json(physical.precompute.as_ref().unwrap()), - json(&physical.query), - )); - } - let builds = |json: &str, kind: &str| { - json.contains(&format!( - r#"{{"SummaryBuild":{{"family":{{"ExactAggregate":["{kind}","{kind}"]}}"# - )) - }; - let [(retained, retained_pre, retained_query), (ephemeral, ephemeral_pre, ephemeral_query)] = - placements.as_slice() - else { - unreachable!() - }; - let state = |payload: &PostAsapOperatorPayload, kind: ExactKind| { - matches!(payload, PostAsapOperatorPayload::SummaryAgg { - family: FieldDataType::ExactAggregate(k, _), .. - } if *k == kind) - }; - assert!(state(retained, ExactKind::Sum)); - assert!(builds(retained_pre, "Rate") && builds(retained_pre, "Sum")); - assert!(!retained_query.contains("SummaryBuild")); - assert!(state(ephemeral, ExactKind::Rate)); - assert!(builds(ephemeral_pre, "Rate") && !builds(ephemeral_pre, "Sum")); - assert!(builds(ephemeral_query, "Sum")); -} - -/// The lifecycle-timed DAG Planner selects for `query` with upfront series -/// typing, and whether it keeps an ingestion-time Binary. -fn typed_selection(query: &str) -> (asap_types::post_asap::PostAsapDAG, bool) { - use asap_types::post_asap::{ExecutionTiming, PostAsapOperatorPayload}; - let workload = quantile_workload(query); - let lowered = asap_types::pre_asap::schema::with_promql_series_identity( - &lower_promql_workload(&workload, 0).unwrap().remove(0), - ) - .unwrap(); - let dag = selected_plan_for_lowered(&workload, lowered, &FullyCostedRuntime, Horizon(100.)) - .execution_timed_dag() - .unwrap(); - let ingestion_binary = dag.nodes.iter().any(|node| { - matches!(node.payload, PostAsapOperatorPayload::Binary { .. }) - && node.output_state.timing == ExecutionTiming::IngestionTime - }); - (dag, ingestion_binary) -} - -/// Execute a timed DAG's precompute and query DAGs over `samples` -/// (`(metric, job, seconds, value)`) at 300s; returns the root's values. -fn execute_timed( - dag: &asap_types::post_asap::PostAsapDAG, - samples: &[(&str, &str, i64, f64)], -) -> Vec { - use asap_physical_operators::{ - physical_planner::{ - compile_candidate, frontier_from_timing, promql_fallback, promql_rows, InputContract, - }, - runtime::Scope, - values::{Batch, Value}, - }; - use asap_types::{ - post_asap::PostAsapOperatorPayload, - pre_asap::{QueryExpr, Source}, - }; - use std::{collections::BTreeMap, sync::Arc}; - // Raw inputs: a selector Fallback is itself the input; a retained - // expression reads each of its selectors through its raw-series slots. - let mut raw = BTreeMap::new(); - for node in &dag.nodes { - let PostAsapOperatorPayload::Fallback { expression } = &node.payload else { - continue; - }; - let metric = |selector: &QueryExpr| match selector { - QueryExpr::TimeRange { child, .. } => match child.as_ref() { - QueryExpr::Scan { - source: Source::TimeSeries { metric }, - .. - } => Some(metric.clone()), - _ => None, - }, - QueryExpr::Scan { - source: Source::TimeSeries { metric }, - .. - } => Some(metric.clone()), - _ => None, - }; - if let Some(name) = metric(expression) { - raw.insert( - u64::from(node.id.0), - (Arc::new(node.output_schema.clone()), name), - ); - } else { - for (i, (selector, schema)) in promql_fallback::raw_series(expression) - .unwrap() - .into_iter() - .enumerate() - { - raw.insert( - promql_fallback::raw_series_input(u64::from(node.id.0), i), - (schema, metric(&selector).unwrap()), - ); - } - } - } - let batch = |schema: &asap_physical_operators::values::SchemaRef, name: &str| { - let rows = samples - .iter() - .filter(|sample| sample.0 == name) - .map(|(metric, job, seconds, value)| { - let labels = BTreeMap::from([ - ("__name__".to_string(), metric.to_string()), - ("job".to_string(), job.to_string()), - ]); - promql_rows::series_row(schema, &labels, seconds * 1000, *value).unwrap() - }) - .collect(); - Batch::try_new(schema.clone(), rows).unwrap() - }; - let frontier = frontier_from_timing(dag).unwrap(); - let candidate = compile_candidate( - dag, - raw.iter() - .map(|(id, (schema, _))| (*id, InputContract::bounded(schema.clone()))) - .collect(), - &[u64::from(dag.root.0)], - &frontier, - ) - .unwrap(); - let raw_sources = |plan: &asap_physical_operators::physical_planner::CompiledPhysicalDAG| { - plan.input_contracts() - .filter_map(|(id, _)| raw.get(&id).map(|(schema, name)| (id, batch(schema, name)))) - .collect::>() - }; - let mut query_sources = raw_sources(&candidate.query); - if let Some(precompute) = &candidate.precompute { - let stored = physical_common::execute( - precompute, - raw_sources(precompute), - Scope::Ingestion { - window_start_ms: 240_000, - window_end_ms: 300_000, - revision: 1, - }, - ); - for (root, batches) in precompute.roots().iter().zip(stored) { - query_sources.insert(*root, batches[0].clone()); - } - } - let result = physical_common::execute( - &candidate.query, - query_sources, - Scope::Query { - evaluation_time_ms: 300_000, - revision: 1, - }, - ); - result[0] - .iter() - .flat_map(|batch| batch.rows()) - .flat_map(|row| row.iter()) - .filter_map(|value| match value { - Value::Float64(value) => Some(*value), - _ => None, - }) - .collect() -} - -/// Prometheus drops series without a match: arithmetic over different -/// selectors keeps only label sets present on both sides (none when disjoint), -/// and such arithmetic never becomes aligned maintenance. -#[test] -fn maintained_arithmetic_over_different_selectors_matches_prometheus() { - let query = "sum(sum_over_time(m[1m]) + sum_over_time(n[1m]))"; - let (dag, ingestion_binary) = typed_selection(query); - let disjoint = [ - ("m", "a", 250, 1.0), - ("m", "a", 290, 2.0), - ("n", "b", 250, 5.0), - ]; - let values = execute_timed(&dag, &disjoint); - assert!(values.is_empty(), "{values:?}"); - // Only job a is on both sides: m_a + n_a = (1 + 2) + 7; m{job="b"} is dropped. - let overlapping = [ - ("m", "a", 250, 1.0), - ("m", "a", 290, 2.0), - ("m", "b", 250, 5.0), - ("n", "a", 250, 7.0), - ]; - assert_eq!(execute_timed(&dag, &overlapping), [10.0]); - assert!(!ingestion_binary); - // The quantile's exact fallback runs outside Planner; it must not be maintained either. - let (_, ingestion_binary) = - typed_selection("quantile(0.9, sum_over_time(m[1m]) + sum_over_time(n[1m]))"); - assert!(!ingestion_binary); -} - -/// Arithmetic over one selector keeps its maintained layout and adds each -/// series' two readouts before the quantile. -#[test] -fn maintained_arithmetic_over_one_selector_executes() { - let (dag, ingestion_binary) = - typed_selection("quantile(0.9, sum_over_time(m[1m]) + sum_over_time(m[1m]))"); - assert!(ingestion_binary, "one selector shares its key set"); - let values = execute_timed( - &dag, - &[ - ("m", "a", 250, 1.0), - ("m", "a", 290, 2.0), - ("m", "b", 250, 5.0), - ], - ); - // job a: 3 + 3 = 6; job b: 5 + 5 = 10 (mispairing a with b gives 8 and 8). - // KLL at epsilon 0.01 returns an input value within 0.01 of rank 0.9; of - // two values only the larger is. - assert_eq!(values, [10.0]); -} diff --git a/crates/integration-tests/tests/time_range.rs b/crates/integration-tests/tests/time_range.rs index d3ab732fe..95212ca99 100644 --- a/crates/integration-tests/tests/time_range.rs +++ b/crates/integration-tests/tests/time_range.rs @@ -1,46 +1,53 @@ -//! `QueryExpr::TimeRange` — range / streaming function tests. +//! `NonASAPOp::TimeRange` — range / streaming function tests. //! -//! All range functions lower to `Aggregate { child: TimeRange { range, child: Scan } }`. +//! All range functions lower to `Aggregate { child: TimeRange { range, kind: Range, child: Scan } }`. //! The temporal range lives on the `TimeRange` node, not in the `AggIntent`. //! `rate` / `increase` use `AggIntent::Rate` / `AggIntent::Increase` (no window field). //! `*_over_time` functions reuse the corresponding cross-series intents -//! (`Count`, `Sum`, `Quantile`, …) — the `TimeRange` child is what marks them -//! as per-series reductions. +//! (`Count`, `Sum`, `Quantile`, …) — the `Range` selector child is what marks +//! them as per-series reductions. use std::rc::Rc; use std::time::Duration; use asap_integration_tests::fixtures::lower_promql; use asap_integration_tests::fixtures::metric_schema; -use asap_types::pre_asap::{AggIntent, QueryExpr, Reduction, Source}; +use asap_types::ir::{NonASAPOp, OperatorNode, TimeRangeKind}; +use asap_types::pre_asap::{AggIntent, Reduction, Source}; use asap_types::types::AccuracyTarget; -fn lower(q: &str) -> QueryExpr { +fn lower(q: &str) -> Rc { lower_promql(q, AccuracyTarget::Exact).unwrap_or_else(|e| panic!("lower failed for {q:?}: {e}")) } -fn scan(metric: &str) -> QueryExpr { - QueryExpr::Scan { +fn node(op: NonASAPOp) -> Rc { + OperatorNode::new_shared(asap_types::ir::Operator::NonASAP(op)) + .expect("fixture node derives its schema") +} + +fn scan(metric: &str) -> Rc { + node(NonASAPOp::Scan { source: Source::TimeSeries { metric: metric.into(), }, predicates: vec![], schema: metric_schema(&[]), - } + }) } -fn range_agg(range_secs: u64, intent: AggIntent, metric: &str) -> QueryExpr { - QueryExpr::Aggregate { +fn range_agg(range_secs: u64, intent: AggIntent, metric: &str) -> Rc { + node(NonASAPOp::Aggregate { reduction: Reduction::PerEntity, measures: vec![intent], output_names: vec!["".into()], filters: vec![], having: None, - child: Rc::new(QueryExpr::TimeRange { + child: node(NonASAPOp::TimeRange { range: Duration::from_secs(range_secs), - child: Rc::new(scan(metric)), + kind: TimeRangeKind::Range, + child: scan(metric), }), - } + }) } // #13 — rate: counter-reset-aware per-second rate; range on TimeRange node diff --git a/crates/metricsql-parser-vendored/src/optimizer/const_evaluator.rs b/crates/metricsql-parser-vendored/src/optimizer/const_evaluator.rs index 3ac1170e8..6befd206d 100644 --- a/crates/metricsql-parser-vendored/src/optimizer/const_evaluator.rs +++ b/crates/metricsql-parser-vendored/src/optimizer/const_evaluator.rs @@ -12,7 +12,7 @@ use crate::functions::{BuiltinFunction, TransformFunction}; use crate::parser::{parse_number, ParseError, ParseResult}; #[allow(rustdoc::private_intra_doc_links)] -/// Partially evaluate `Expr`s so constant subtrees are evaluated at plan time. +/// Partially evaluate `Expr`s so constant sub-DAGs are evaluated at plan time. /// /// Note it does not handle algebraic rewrites such as `(a or false)` /// --> `a`, which is handled by [`Simplifier`] diff --git a/crates/planner/src/lib.rs b/crates/planner/src/lib.rs index 88a085bf8..506ed12ea 100644 --- a/crates/planner/src/lib.rs +++ b/crates/planner/src/lib.rs @@ -11,15 +11,13 @@ //! and a catalog — skips this crate and calls //! [`asap_aware_mapping::optimize`] directly. -use std::rc::Rc; - use asap_types::parsed_workload::{ParsedWorkload, ParsedWorkloadError}; -use asap_types::pre_asap::query_expr::QueryExpr; use asap_types::workload::{PlanningWorkload, QueryLanguage, SqlDialect, WorkloadError}; -use asap_frontend_metricsql::{lower_metricsql, MetricsqlError}; +use asap_frontend_metricsql::{lower_metricsql_query, MetricsqlError}; use asap_frontend_promql::{ - lower_promql_workload, lower_promql_workload_with_histograms, HistogramCatalog, PromqlError, + lower_promql_query_workload, lower_promql_query_workload_with_histograms, HistogramCatalog, + PromqlError, }; use asap_frontend_sql::{lower_sql_dialect, SqlCatalog, SqlError}; @@ -27,8 +25,8 @@ use asap_frontend_sql::{lower_sql_dialect, SqlCatalog, SqlError}; // configures the same models and reads the same output whether it goes through // `e2e_plan` or straight to `optimize`. pub use asap_aware_mapping::pass::{ - optimize, LifecycleInput, MajorPass, OptimizationInput, OptimizationPass, OptimizeError, - PassRegistry, PlanOutput, PlanningModels, QueryLifecyclePlan, + optimize, MajorPass, OptimizationInput, OptimizationPass, OptimizeError, PassRegistry, + PlanOutput, PlanningModels, QueryPlan, }; // ── Input ──────────────────────────────────────────────────────────────── @@ -55,9 +53,6 @@ pub struct UserInput<'a> { pub workload: &'a PlanningWorkload, pub frontend_specific: FrontendInput<'a>, pub models: PlanningModels<'a>, - /// Planning clock and runtime capabilities for the - /// maintenance-versus-recomputation decision every plan carries. - pub lifecycle: LifecycleInput, /// `None` uses [`MajorPass`]. A black-box caller never sets this. pub pass: Option<&'a dyn OptimizationPass>, } @@ -67,13 +62,11 @@ impl<'a> UserInput<'a> { workload: &'a PlanningWorkload, frontend_specific: FrontendInput<'a>, models: PlanningModels<'a>, - lifecycle: LifecycleInput, ) -> Self { Self { workload, frontend_specific, models, - lifecycle, pass: None, } } @@ -103,21 +96,6 @@ impl<'a> UserInput<'a> { }); } - if let Some(horizon) = self.lifecycle.horizon { - if !horizon.0.is_finite() || horizon.0 <= 0.0 { - return Err(UserInputError::InvalidHorizon(horizon.0)); - } - } - // Two clocks would let the DAG be built for one instant and priced - // for another, with neither stage able to notice. - if let FrontendInput::Promql { now_ms, .. } = &self.frontend_specific { - if *now_ms != self.lifecycle.now_ms { - return Err(UserInputError::PlanningTimeMismatch { - frontend: *now_ms, - lifecycle: self.lifecycle.now_ms, - }); - } - } Ok(()) } } @@ -144,10 +122,6 @@ pub enum UserInputError { language: String, frontend: &'static str, }, - #[error("planning horizon must be finite and positive, got {0}")] - InvalidHorizon(f64), - #[error("frontend planning time {frontend} ms disagrees with lifecycle planning time {lifecycle} ms")] - PlanningTimeMismatch { frontend: u64, lifecycle: u64 }, } #[derive(Debug, thiserror::Error)] @@ -191,12 +165,12 @@ pub async fn e2e_plan(input: UserInput<'_>) -> Result { input.validate()?; let exprs = lower(&input).await?; - let parsed = ParsedWorkload::new(input.workload.clone(), exprs)?; + let parsed = ParsedWorkload::from_roots(input.workload.clone(), exprs)?; let fallback = MajorPass; let pass: &dyn OptimizationPass = input.pass.unwrap_or(&fallback); - let optimization = OptimizationInput::new(&parsed, input.models, input.lifecycle); + let optimization = OptimizationInput::new(&parsed, input.models); optimize(pass, optimization).map_err(PlanError::Optimize) } @@ -204,9 +178,8 @@ pub async fn e2e_plan(input: UserInput<'_>) -> Result { /// /// The SQL and MetricsQL frontends are driven one entry at a time rather than /// through `lower_sql_batch`, which walks `query_batch` alone and would drop -/// every repeating query — exactly the entries whose recurrence the lifecycle -/// stage needs. -async fn lower(input: &UserInput<'_>) -> Result>, PlanError> { +/// every repeating query, and the output must cover every entry. +async fn lower(input: &UserInput<'_>) -> Result, PlanError> { let entries = || input.workload.query_workload.entries(); match &input.frontend_specific { @@ -229,7 +202,7 @@ async fn lower(input: &UserInput<'_>) -> Result>, PlanError> { entry_index: Some(index), source: LoweringError::Sql(source), })?; - lowered.push(Rc::new(expr)); + lowered.push(expr.into()); } Ok(lowered) } @@ -237,28 +210,29 @@ async fn lower(input: &UserInput<'_>) -> Result>, PlanError> { now_ms, histograms, .. } => { let lowered = match histograms { - Some(histograms) => lower_promql_workload_with_histograms( + Some(histograms) => lower_promql_query_workload_with_histograms( input.workload, histograms.clone(), *now_ms, ), - None => lower_promql_workload(input.workload, *now_ms), + None => lower_promql_query_workload(input.workload, *now_ms), } .map_err(|source| PlanError::Lowering { entry_index: None, source: LoweringError::Promql(source), })?; - Ok(lowered.into_iter().map(Rc::new).collect()) + Ok(lowered) } FrontendInput::Metricsql => { let mut lowered = Vec::new(); for (index, entry) in entries().enumerate() { - let expr = lower_metricsql(&entry.query.0, entry.requirements.accuracy.target()) - .map_err(|source| PlanError::Lowering { - entry_index: Some(index), - source: LoweringError::Metricsql(source), - })?; - lowered.push(Rc::new(expr)); + let expr = + lower_metricsql_query(&entry.query.0, entry.requirements.accuracy.target()) + .map_err(|source| PlanError::Lowering { + entry_index: Some(index), + source: LoweringError::Metricsql(source), + })?; + lowered.push(expr); } Ok(lowered) } diff --git a/crates/planner/tests/e2e_plan.rs b/crates/planner/tests/e2e_plan.rs index ff8a8dde0..0f929c96d 100644 --- a/crates/planner/tests/e2e_plan.rs +++ b/crates/planner/tests/e2e_plan.rs @@ -7,12 +7,9 @@ use asap_aware_mapping::pass::{ OptimizationInput, OptimizationPass, OptimizeError, PlanOutput, PlanningModels, }; use asap_aware_mapping::replacement::default_strategies_with_evidence; -use asap_aware_mapping::{ - search_workload_with_targets, Horizon, LifecycleInput, SummaryMaintenanceLifecycleCapabilities, -}; +use asap_aware_mapping::search_workload_with_targets; use asap_frontend_sql::{lower_sql_dialect, SqlCatalog}; use asap_planner::{e2e_plan, FrontendInput, PlanError, UserInput, UserInputError}; -use asap_types::post_asap::SummaryExpr; use asap_types::pre_asap::schema::{DataType, Field, Schema}; use asap_types::types::AccuracyTarget; use asap_types::workload::{ @@ -41,12 +38,6 @@ fn batch(sql: &str) -> BatchEntry { } } -/// The planning clock and default capabilities, no horizon: the least a -/// caller can supply. -fn lifecycle() -> LifecycleInput { - LifecycleInput::new(NOW_MS, SummaryMaintenanceLifecycleCapabilities::default()) -} - fn lineitem_catalog() -> SqlCatalog { SqlCatalog::new().with_table( "lineitem", @@ -90,7 +81,6 @@ async fn plans_every_query_in_entry_order() { &workload, FrontendInput::Sql { catalog: &catalog }, PlanningModels::builtin(), - lifecycle(), ); let output = e2e_plan(input).await.expect("workload plans"); @@ -98,13 +88,10 @@ async fn plans_every_query_in_entry_order() { assert_eq!(output.entry_indices(), vec![0, 1]); } -/// With the built-in cost model no lifecycle cost is ever known, and -/// lifecycle-aware selection then finalizes every summary target as raw -/// recompute: the cost-only selection picks a sketch for the same workload. -/// This pins that behavior so the facade's output is not mistaken for a -/// decision; it is a defect of `DefaultCostModel`, not addressed here. +/// The facade selects what workload-wide cost selection selects over the +/// same search space: here a summary for both approximate queries. #[tokio::test] -async fn builtin_cost_model_cannot_price_lifecycles_and_falls_back_to_raw_recompute() { +async fn facade_plans_match_cost_only_selection() { let workload = sql_workload( vec![ batch("SELECT COUNT(DISTINCT l_orderkey) FROM lineitem"), @@ -119,7 +106,6 @@ async fn builtin_cost_model_cannot_price_lifecycles_and_falls_back_to_raw_recomp &workload, FrontendInput::Sql { catalog: &catalog }, models, - lifecycle(), )) .await .expect("workload plans"); @@ -137,7 +123,7 @@ async fn builtin_cost_model_cannot_price_lifecycles_and_falls_back_to_raw_recomp ) .await .expect("lowers"); - roots.push((index, Rc::new(expr), Some(accuracy))); + roots.push((index, expr, Some(accuracy))); } let strategies = default_strategies_with_evidence(models.cost, models.evidence); let space = search_workload_with_targets(roots, &strategies, models.accuracy); @@ -150,25 +136,21 @@ async fn builtin_cost_model_cannot_price_lifecycles_and_falls_back_to_raw_recomp .expect("assembles") .expect("root has a group"); assert!( - !matches!(cost_only.expr, SummaryExpr::KeepPreAsap(_)), + cost_only.contains_asap(), "entry {}: cost-only selection was expected to pick a summary", plan.entry_index ); - assert!( - matches!(plan.plan.root.expr, SummaryExpr::KeepPreAsap(_)) - && plan.plan.selected_raw_recompute - && plan.plan.deployments.is_empty() - && plan.plan.summary_total_cost.is_none() - && plan.plan.raw_recompute_total_cost.is_none(), - "entry {}: the built-in model priced a lifecycle", + assert_eq!( + plan.root, cost_only, + "entry {}: the facade selected a different DAG", plan.entry_index ); } } /// A repeating SQL query reaches the optimizer. `lower_sql_batch` walks -/// `query_batch` alone, so driving the frontend through it would drop exactly -/// the entries whose recurrence the lifecycle stage reads. +/// `query_batch` alone, so driving the frontend through it would drop the +/// repeating entries. #[tokio::test] async fn lowers_repeating_sql_entries_too() { let workload = sql_workload( @@ -188,7 +170,6 @@ async fn lowers_repeating_sql_entries_too() { &workload, FrontendInput::Sql { catalog: &catalog }, PlanningModels::builtin(), - lifecycle(), ); let output = e2e_plan(input).await.expect("workload plans"); @@ -230,7 +211,6 @@ async fn runs_a_caller_supplied_pass_instead_of_the_shipped_one() { &workload, FrontendInput::Sql { catalog: &catalog }, PlanningModels::builtin(), - lifecycle(), ) .with_pass(&pass); @@ -271,7 +251,6 @@ async fn harness_rejects_a_pass_that_mislabels_entry_indices() { &workload, FrontendInput::Sql { catalog: &catalog }, PlanningModels::builtin(), - lifecycle(), ) .with_pass(&pass); @@ -303,7 +282,6 @@ async fn rejects_a_frontend_that_does_not_match_the_workload_language() { histograms: None, }, PlanningModels::builtin(), - lifecycle(), ); let err = e2e_plan(input).await.unwrap_err(); @@ -313,48 +291,9 @@ async fn rejects_a_frontend_that_does_not_match_the_workload_language() { )); } -/// Two planning clocks would let the DAG be built for one instant and priced -/// for another; the input check refuses that before lowering. -#[test] -fn rejects_disagreeing_planning_clocks() { - let workload = PlanningWorkload { - query_workload: QueryWorkload { - language: QueryLanguage::PromQL, - query_batch: Some(vec![batch("up")]), - repeating_queries: None, - }, - data_workload: Some(DataWorkload { - arrival: DataArrival::ContinuouslyIngesting, - data_ingestion_interval: Evidence { - value: Some(DurationMs(15_000)), - ..Default::default() - }, - ..Default::default() - }), - }; - let input = UserInput::new( - &workload, - FrontendInput::Promql { - now_ms: NOW_MS, - histograms: None, - }, - PlanningModels::builtin(), - LifecycleInput::new( - NOW_MS + 1, - SummaryMaintenanceLifecycleCapabilities::default(), - ), - ); - - assert!(matches!( - input.validate(), - Err(UserInputError::PlanningTimeMismatch { .. }) - )); -} - -/// The maintenance decisions ride inside each plan, and the DAG is still -/// there — inside the plan's `root`, not alongside it. +/// A repeating PromQL query yields one plan carrying its selected DAG root. #[tokio::test] -async fn lifecycle_decisions_ride_inside_each_plan() { +async fn each_plan_carries_its_selected_root() { let workload = PlanningWorkload { query_workload: QueryWorkload { language: QueryLanguage::PromQL, @@ -383,57 +322,61 @@ async fn lifecycle_decisions_ride_inside_each_plan() { histograms: None, }, PlanningModels::builtin(), - lifecycle().with_horizon(Horizon(3_600.0)), ); let output = e2e_plan(input).await.expect("workload plans"); assert_eq!(output.plans.len(), 1); assert_eq!(output.plans[0].entry_index, 0); - let _: &Rc<_> = &output.plans[0].plan.root; - assert_eq!(output.dags().len(), 1); + let _: &Rc<_> = &output.plans[0].root; + assert_eq!(output.operator_roots().len(), 1); } -/// Each root's lifecycle is planned against the entries that read it: a -/// query polled every minute and an unrelated one polled every ten minutes -/// each see only their own reads over the hour, not the workload's 66. +/// Scalar-only and mixed workloads preserve entry bindings without wrapper nodes. #[tokio::test] -async fn each_plan_counts_only_its_own_entries_reads() { - let repeating = |query: &str, interval_ms: u32| RepeatingEntry { - query: Query(query.into()), - demand: RepeatedDemand::FixedInterval(RepetitionInterval(interval_ms)), - requirements: approximate(), - predictability: Predictability::Unknown, - time_selection: TimeSelection::default(), - }; - let workload = PlanningWorkload { - query_workload: QueryWorkload { - language: QueryLanguage::PromQL, - query_batch: None, - repeating_queries: Some(vec![ - repeating("count_over_time(up[5m])", 60_000), - repeating("sum_over_time(latency[5m])", 600_000), - ]), - }, - data_workload: Some(DataWorkload { - arrival: DataArrival::ContinuouslyIngesting, - data_ingestion_interval: Evidence { - value: Some(DurationMs(15_000)), +async fn scalar_roots_survive_planning_in_workload_order() { + for queries in [ + vec!["2", "time()"], + vec!["2", "up * 2", "scalar(sum(up)) + 1"], + ] { + let workload = PlanningWorkload { + query_workload: QueryWorkload { + language: QueryLanguage::PromQL, + query_batch: Some(queries.iter().map(|q| batch(q)).collect()), + repeating_queries: None, + }, + data_workload: Some(DataWorkload { + data_ingestion_interval: Evidence { + value: Some(DurationMs(1000)), + ..Default::default() + }, ..Default::default() + }), + }; + let output = e2e_plan(UserInput::new( + &workload, + FrontendInput::Promql { + now_ms: NOW_MS, + histograms: None, }, - ..Default::default() - }), - }; - let input = UserInput::new( - &workload, - FrontendInput::Promql { - now_ms: NOW_MS, - histograms: None, - }, - PlanningModels::builtin(), - lifecycle().with_horizon(Horizon(3_600.0)), - ); - - let output = e2e_plan(input).await.expect("workload plans"); - let reads: Vec<_> = output.plans.iter().map(|p| p.plan.expected_reads).collect(); - assert_eq!(reads, vec![Some(60.0), Some(6.0)]); + PlanningModels::builtin(), + )) + .await + .unwrap(); + assert_eq!( + output.entry_indices(), + (0..queries.len()).collect::>() + ); + assert!(matches!( + output.roots()[0], + asap_types::ir::QueryRoot::Scalar(_) + )); + assert_eq!(output.roots().len(), queries.len()); + if queries.len() == 3 { + assert_eq!(output.plans[0].entry_index, 1); + let asap_types::ir::QueryRoot::Scalar(expr) = &output.roots()[2] else { + panic!() + }; + assert_eq!(expr.operator_refs().len(), 1); + } + } } diff --git a/crates/planner/tests/summary_sharing.rs b/crates/planner/tests/summary_sharing.rs index 41b489e9c..8eb9ed4f8 100644 --- a/crates/planner/tests/summary_sharing.rs +++ b/crates/planner/tests/summary_sharing.rs @@ -1,35 +1,30 @@ //! Structurally identical summary producers chosen by different queries are -//! shared after Pass 1: one `Rc` across their plans, costed once. +//! shared after Pass 1: one `Rc` across their plans. +use asap_types::ir::cse::share_common_sub_dags; +use asap_types::ir::{ASAPOp, OperatorNode}; use std::rc::Rc; use asap_aware_mapping::accuracy::{ AccuracyModel, DefaultAccuracyModel, EqualSplitAllocator, PropagationStats, }; -use asap_aware_mapping::cost_model::Cost; -use asap_aware_mapping::pass::{PlanOutput, PlanningModels}; +use asap_aware_mapping::pass::{PlanOutput, PlanningModels, QueryPlan}; use asap_aware_mapping::replacement::{default_size_params, DEFAULT_DELTA}; use asap_aware_mapping::{ - global_selection_with_summary_maintenance_lifecycles, search_workload_with_targets, - ReplacementStrategy, SketchAlgorithmStrategy, WorkloadDemand, -}; -use asap_aware_mapping::{ - CostModel, CostRate, DefaultCostModel, Horizon, LifecycleInput, SummaryMaintenanceCapabilities, - SummaryMaintenanceLifecycleCapabilities, SummaryMaintenanceLifecycleCostInputs, + search_workload_with_targets, ASAPStrategies, CostModel, DefaultCostModel, Replacement, + ReplacementStrategy, ReplacementSubDAG, TargetSubDAG, }; use asap_frontend_promql::lower_promql_workload; use asap_frontend_sql::SqlCatalog; use asap_planner::{e2e_plan, FrontendInput, UserInput}; use asap_types::post_asap::{ - share_common_summary_sub_dags, AccuracyError, BoundExpr, CompositionOperator, ErrorMetric, - ProbabilityExpr, ResultGuarantee, SketchStatistic, -}; -use asap_types::post_asap::{ - FieldDataType, SketchAlgorithm, SketchParams, SummaryExpr, SummaryNode, + AccuracyError, BoundExpr, CompositionOperator, ErrorMetric, ProbabilityExpr, ResultGuarantee, + SketchStatistic, }; +use asap_types::post_asap::{FieldDataType, SketchAlgorithm, SketchKind, SketchParams}; use asap_types::pre_asap::agg_intent::default_quantile; use asap_types::pre_asap::schema::{DataType, Field, Schema}; -use asap_types::pre_asap::{AggIntent, QueryExpr}; +use asap_types::pre_asap::AggIntent; use asap_types::types::AccuracyTarget; use asap_types::workload::{ AccuracyRequirement, DataArrival, DataWorkload, DurationMs, Evidence, LatencyRequirement, @@ -38,16 +33,18 @@ use asap_types::workload::{ }; const NOW_MS: u64 = 1_700_000_000_000; -const HORIZON_S: f64 = 3_600.0; -/// A state costs `build` once however often it is read; raw recomputation -/// costs `raw_per_read` per read. -struct FixedCosts { - build: f64, - raw_per_read: f64, -} +/// Stand-in for the workload-level amortization Stage 2 materialization will +/// price: a sketch candidate costs `preference(kind)` per sketch state, any +/// other candidate more than every sketch. Ranking is otherwise built-in. +struct PreferSketch(fn(&SketchKind) -> f64); + +impl CostModel for PreferSketch { + // Selection takes the cheapest candidate by `estimate_cost`. + fn candidate_cost_covers_complete_plan(&self) -> bool { + true + } -impl CostModel for FixedCosts { fn rank_candidates( &self, intent: &AggIntent, @@ -56,41 +53,42 @@ impl CostModel for FixedCosts { DefaultCostModel.rank_candidates(intent, candidates) } - fn summary_maintenance_lifecycle_cost_inputs( - &self, - _summary: &SummaryNode, - ) -> SummaryMaintenanceLifecycleCostInputs { - SummaryMaintenanceLifecycleCostInputs { - build_cost: Some(Cost(self.build)), - maintenance_cost_per_update: Some(Cost::ZERO), - summary_read_cost: Some(Cost::ZERO), - retention_cost_rate: Some(CostRate(0.0)), - retirement_cost: Some(Cost::ZERO), - } - } - - fn summary_maintenance_capabilities( - &self, - _summary: &SummaryNode, - ) -> SummaryMaintenanceCapabilities { - SummaryMaintenanceCapabilities { - incremental_update: true, - merge: true, - delete: true, + fn estimate_cost(&self, candidate: &ReplacementSubDAG, _: &TargetSubDAG<'_>) -> f64 { + let Replacement::SubDAG(root) = &candidate.replacement else { + return 1e9; + }; + let kinds: Vec<_> = OperatorNode::reachable(root) + .into_iter() + .filter_map(|node| match &node.operator { + asap_types::ir::Operator::ASAP(ASAPOp::SummaryAgg { + family: FieldDataType::Sketch(kind, _), + .. + }) => Some(kind.clone()), + _ => None, + }) + .collect(); + if kinds.is_empty() { + 1e9 + } else { + kinds.iter().map(self.0).sum() } } - - fn raw_query_recompute_cost(&self, _target: &QueryExpr) -> Option { - Some(Cost(self.raw_per_read)) - } } -/// Summaries are far cheaper than raw recomputation, so every query selects -/// one independently and only sharing is under test. -const CHEAP_SUMMARY: FixedCosts = FixedCosts { - build: 1.0, - raw_per_read: 1_000.0, -}; +/// Prefers the largest KLL, i.e. one sized for the strictest consumer. +const PREFER_LARGE_KLL: PreferSketch = PreferSketch(|kind| match kind.params() { + SketchParams::Kll { k } => 1.0 / f64::from(*k), + _ => 1.0, +}); + +/// Prefers UnivMon, which can serve every frequency moment from one state. +const PREFER_UNIVMON: PreferSketch = PreferSketch(|kind| { + if kind.algorithm() == &SketchAlgorithm::UnivMon { + 0.0 + } else { + 1.0 + } +}); fn requirements(epsilon: f64) -> QueryRequirements { QueryRequirements { @@ -110,11 +108,6 @@ fn repeating(query: &str, epsilon: f64) -> RepeatingEntry { } } -fn lifecycle() -> LifecycleInput { - LifecycleInput::new(NOW_MS, SummaryMaintenanceLifecycleCapabilities::default()) - .with_horizon(Horizon(HORIZON_S)) -} - fn promql_workload(queries: &[(&str, f64)]) -> PlanningWorkload { PlanningWorkload { query_workload: QueryWorkload { @@ -142,7 +135,11 @@ fn promql_workload(queries: &[(&str, f64)]) -> PlanningWorkload { } } -async fn plan_promql(queries: &[(&str, f64)], costs: &FixedCosts) -> PlanOutput { +async fn plan_promql(queries: &[(&str, f64)]) -> PlanOutput { + plan_promql_with(queries, &DefaultCostModel).await +} + +async fn plan_promql_with(queries: &[(&str, f64)], cost: &dyn CostModel) -> PlanOutput { let workload = promql_workload(queries); let input = UserInput::new( &workload, @@ -150,13 +147,12 @@ async fn plan_promql(queries: &[(&str, f64)], costs: &FixedCosts) -> PlanOutput now_ms: NOW_MS, histograms: None, }, - PlanningModels::builtin().with_cost(costs), - lifecycle(), + PlanningModels::builtin().with_cost(cost), ); e2e_plan(input).await.expect("workload plans") } -async fn plan_sql(queries: &[&str], costs: &FixedCosts) -> PlanOutput { +async fn plan_sql(queries: &[&str]) -> PlanOutput { let workload = PlanningWorkload { query_workload: QueryWorkload { language: QueryLanguage::SQL(SqlDialect::DataFusionSQL), @@ -178,31 +174,39 @@ async fn plan_sql(queries: &[&str], costs: &FixedCosts) -> PlanOutput { let input = UserInput::new( &workload, FrontendInput::Sql { catalog: &catalog }, - PlanningModels::builtin().with_cost(costs), - lifecycle(), + PlanningModels::builtin(), ); e2e_plan(input).await.expect("workload plans") } -/// Every summary state each plan deploys. -fn states(output: &PlanOutput) -> Vec>> { +/// Every summary state (`SummaryAgg`) each plan reaches, in traversal order. +fn plan_states(plan: &QueryPlan) -> Vec> { + OperatorNode::reachable(&plan.root) + .into_iter() + .filter(|node| { + matches!( + node.operator, + asap_types::ir::Operator::ASAP(ASAPOp::SummaryAgg { .. }) + ) + }) + .collect() +} + +/// Every summary state each plan reaches; each plan selects at least one. +fn states(output: &PlanOutput) -> Vec>> { output .plans .iter() .map(|plan| { - assert!(!plan.plan.selected_raw_recompute, "{:?}", plan.plan.root); - assert!(!plan.plan.deployments.is_empty()); - plan.plan - .deployments - .iter() - .map(|deployment| Rc::clone(&deployment.summary)) - .collect() + let states = plan_states(plan); + assert!(!states.is_empty(), "{:?}", plan.root); + states }) .collect() } /// Whether the two plans deploy exactly the same states, by pointer. -fn same_states(states: &[Vec>]) -> bool { +fn same_states(states: &[Vec>]) -> bool { states[0].len() == states[1].len() && states[0] .iter() @@ -210,12 +214,12 @@ fn same_states(states: &[Vec>]) -> bool { .all(|(left, right)| Rc::ptr_eq(left, right)) } -/// The deployments a consumer would run, deduplicated by pointer. +/// The summary states a consumer would run, deduplicated by pointer. fn unique_deployments(output: &PlanOutput) -> usize { - let mut seen: Vec<*const SummaryNode> = Vec::new(); + let mut seen: Vec<*const OperatorNode> = Vec::new(); for plan in &output.plans { - for deployment in &plan.plan.deployments { - let ptr = Rc::as_ptr(&deployment.summary); + for state in plan_states(plan) { + let ptr = Rc::as_ptr(&state); if !seen.contains(&ptr) { seen.push(ptr); } @@ -225,39 +229,18 @@ fn unique_deployments(output: &PlanOutput) -> usize { } /// p50 and p99 over the same window and accuracy read one KLL: the -/// equal-params subset of summary capability. Both plans hold the same `Rc` -/// with the same lifecycle, so a consumer maintains it once. +/// equal-params subset of summary capability. Both plans hold the same `Rc`, +/// so a consumer maintains it once. #[tokio::test] async fn quantiles_with_equal_params_share_one_producer() { - let output = plan_promql( - &[ - ("quantile_over_time(0.5, lat[5m])", 0.01), - ("quantile_over_time(0.99, lat[5m])", 0.01), - ], - &CHEAP_SUMMARY, - ) + let output = plan_promql(&[ + ("quantile_over_time(0.5, lat[5m])", 0.01), + ("quantile_over_time(0.99, lat[5m])", 0.01), + ]) .await; assert!(same_states(&states(&output))); - assert!(!Rc::ptr_eq( - &output.plans[0].plan.root, - &output.plans[1].plan.root - )); + assert!(!Rc::ptr_eq(&output.plans[0].root, &output.plans[1].root)); assert_eq!(unique_deployments(&output), 1); - let lifecycles: Vec<_> = output - .plans - .iter() - .map(|plan| { - plan.plan.deployments[0] - .summary_maintenance_lifecycle_guarantee - .clone() - }) - .collect(); - assert_eq!(lifecycles[0], lifecycles[1]); - assert!(lifecycles[0].is_some()); - // Each plan is planned against both queries' reads. - for plan in &output.plans { - assert_eq!(plan.plan.expected_reads, Some(12.0)); - } } /// A different window or label selector is a different producer, even when @@ -282,27 +265,27 @@ async fn different_producers_are_not_shared() { ("quantile_over_time(0.99, lat{job=\"b\"}[5m])", 0.01), ], ] { - let output = plan_promql(&queries, &CHEAP_SUMMARY).await; + let output = plan_promql(&queries).await; assert!(!same_states(&states(&output)), "{queries:?}"); assert_eq!(unique_deployments(&output), 2, "{queries:?}"); for (plan, (_, epsilon)) in output.plans.iter().zip(queries) { - assert_eq!(plan.plan.expected_reads, Some(6.0), "{queries:?}"); assert_eq!(kll_k(plan), kll_k_for(epsilon), "{queries:?}"); } } } /// The KLL `k` of the one state a plan deploys. -fn kll_k(plan: &asap_aware_mapping::pass::QueryLifecyclePlan) -> u32 { - let [deployment] = plan.plan.deployments.as_slice() else { - panic!("one state: {:?}", plan.plan.deployments.len()); +fn kll_k(plan: &QueryPlan) -> u32 { + let states = plan_states(plan); + let [deployment] = states.as_slice() else { + panic!("one state: {:?}", states.len()); }; - let SummaryExpr::SummaryAgg { + let asap_types::ir::Operator::ASAP(ASAPOp::SummaryAgg { family: FieldDataType::Sketch(kind, _), .. - } = &deployment.summary.expr + }) = &deployment.operator else { - panic!("sketch state: {:?}", deployment.summary.expr); + panic!("sketch state: {:?}", deployment.operator); }; let SketchParams::Kll { k } = kind.params() else { panic!("KLL state: {kind:?}"); @@ -324,19 +307,20 @@ fn kll_k_for(epsilon: f64) -> u32 { } /// p50 at ε=0.01 and p99 at ε=0.001 over the same input share one KLL sized -/// for the strictest consumer; each reader's guarantee meets its own target. +/// for the strictest consumer when the cost model prefers that candidate; each +/// reader's guarantee meets its own target. #[tokio::test] async fn quantiles_share_one_producer_sized_for_the_strictest_consumer() { let p50 = ("quantile_over_time(0.5, lat[5m])", 0.01); let p99 = ("quantile_over_time(0.99, lat[5m])", 0.001); assert!(kll_k_for(0.001) > kll_k_for(0.01)); - let output = plan_promql(&[p50, p99], &CHEAP_SUMMARY).await; + let output = plan_promql_with(&[p50, p99], &PREFER_LARGE_KLL).await; assert!(same_states(&states(&output))); assert_eq!(unique_deployments(&output), 1); for (plan, (_, epsilon)) in output.plans.iter().zip([p50, p99]) { assert_eq!(kll_k(plan), kll_k_for(0.001)); - let guarantee = plan.plan.root.guarantee.as_ref().expect("certified"); + let guarantee = plan.root.guarantee.as_ref().expect("certified"); assert!( guarantee.bound.evaluate().unwrap() <= epsilon, "{guarantee:?}" @@ -344,7 +328,7 @@ async fn quantiles_share_one_producer_sized_for_the_strictest_consumer() { } // Alone, the looser query keeps its own, smaller KLL. - let alone = plan_promql(&[p50], &CHEAP_SUMMARY).await; + let alone = plan_promql_with(&[p50], &PREFER_LARGE_KLL).await; assert_eq!(kll_k(&alone.plans[0]), kll_k_for(0.01)); } @@ -352,11 +336,7 @@ async fn quantiles_share_one_producer_sized_for_the_strictest_consumer() { /// quantile, so p50 and p99 over one selector share it. #[tokio::test] async fn cross_series_p50_and_p99_share_one_producer() { - let output = plan_promql( - &[("quantile(0.5, lat)", 0.01), ("quantile(0.99, lat)", 0.01)], - &CHEAP_SUMMARY, - ) - .await; + let output = plan_promql(&[("quantile(0.5, lat)", 0.01), ("quantile(0.99, lat)", 0.01)]).await; assert!(same_states(&states(&output))); assert_eq!(unique_deployments(&output), 1); } @@ -366,7 +346,7 @@ async fn cross_series_p50_and_p99_share_one_producer() { #[tokio::test] async fn identical_ungrouped_queries_share_their_producers() { let query = ("sum(rate(x[5m]))", 0.01); - let output = plan_promql(&[query, query], &CHEAP_SUMMARY).await; + let output = plan_promql(&[query, query]).await; assert!(same_states(&states(&output))); assert_eq!(unique_deployments(&output), 2); } @@ -377,12 +357,12 @@ async fn identical_ungrouped_queries_share_their_producers() { async fn identical_sql_percentiles_share_one_producer() { let query = "SELECT approx_percentile_cont(l_extendedprice, 0.5) FROM lineitem WHERE l_orderkey > 10"; - let output = plan_sql(&[query, query], &CHEAP_SUMMARY).await; + let output = plan_sql(&[query, query]).await; assert!(same_states(&states(&output))); assert_eq!(unique_deployments(&output), 1); } -/// The quantile is a readout parameter: SQL p50 and p99 over one filtered +/// The quantile is a evaluation parameter: SQL p50 and p99 over one filtered /// column build one KLL, named after its input, while each query keeps its /// own output column. #[tokio::test] @@ -391,15 +371,14 @@ async fn sql_p50_and_p99_share_one_producer() { "SELECT approx_percentile_cont(l_extendedprice, 0.5) FROM lineitem WHERE l_orderkey > 10"; let p99 = "SELECT approx_percentile_cont(l_extendedprice, 0.99) FROM lineitem WHERE l_orderkey > 10"; - let output = plan_sql(&[p50, p99], &CHEAP_SUMMARY).await; + let output = plan_sql(&[p50, p99]).await; assert!(same_states(&states(&output))); assert_eq!(unique_deployments(&output), 1); let names: Vec<_> = output .plans .iter() .map(|plan| { - plan.plan - .root + plan.root .schema .fields .iter() @@ -425,33 +404,13 @@ async fn sql_p50_and_p99_share_one_producer() { "SELECT approx_percentile_cont(l_orderkey, 0.99) FROM lineitem WHERE l_orderkey > 10", ], ] { - let output = plan_sql(&queries, &CHEAP_SUMMARY).await; + let output = plan_sql(&queries).await; assert!(!same_states(&states(&output)), "{queries:?}"); assert_eq!(unique_deployments(&output), 2, "{queries:?}"); } } -/// A state costs 100 and recomputing a query costs 60 over its six reads: -/// alone, the query recomputes raw. Shared by p50 and p99, the state costs 50 -/// per query, so both keep it. -#[tokio::test] -async fn shared_amortization_alone_can_beat_raw_recompute() { - let costs = FixedCosts { - build: 100.0, - raw_per_read: 10.0, - }; - let p50 = ("quantile_over_time(0.5, lat[5m])", 0.01); - let p99 = ("quantile_over_time(0.99, lat[5m])", 0.01); - - let alone = plan_promql(&[p50], &costs).await; - assert!(alone.plans[0].plan.selected_raw_recompute); - - let output = plan_promql(&[p50, p99], &costs).await; - assert!(same_states(&states(&output))); - assert_eq!(unique_deployments(&output), 1); -} - -/// Synthetic evidence certifying UnivMon readouts; it exercises sharing, never +/// Synthetic evidence certifying UnivMon evaluations; it exercises sharing, never /// runtime accuracy. struct UnivMonEvidence; @@ -489,11 +448,11 @@ impl AccuracyModel for UnivMonEvidence { } /// Distinct count, entropy and L2 over one input, certified by an accuracy -/// model, read one UnivMon state: #515 sharing is the summary-capability rule +/// model and selected by a cost model preferring UnivMon, read one UnivMon state: #515 sharing is the summary-capability rule /// when the states are identical. `MajorPass` builds candidates with the /// built-in accuracy model, so this runs its pipeline with the test model. #[test] -fn certified_frequency_readouts_share_one_univmon_state() { +fn certified_frequency_evaluations_share_one_univmon_state() { let queries = [ ("distinct_over_time(m[5m])", 0.02), ("entropy_over_time(m[5m])", 0.02), @@ -505,31 +464,16 @@ fn certified_frequency_readouts_share_one_univmon_state() { .into_iter() .zip(queries) .enumerate() - .map(|(index, (expr, (_, epsilon)))| { - (index, Rc::new(expr), Some(AccuracyTarget::Epsilon(epsilon))) - }) + .map(|(index, (expr, (_, epsilon)))| (index, expr, Some(AccuracyTarget::Epsilon(epsilon)))) .collect(); let strategies: Vec> = - vec![Box::new(SketchAlgorithmStrategy::new_with_planning_inputs( - &CHEAP_SUMMARY, + vec![Box::new(ASAPStrategies::new_with_planning_inputs( + &PREFER_UNIVMON, &UnivMonEvidence, &EqualSplitAllocator, ))]; let space = search_workload_with_targets(roots, &strategies, &UnivMonEvidence); - let entry_indices: Vec = (0..queries.len()).collect(); - let selection = global_selection_with_summary_maintenance_lifecycles( - &space, - WorkloadDemand { - workload: &workload.query_workload, - data_workload: workload.data_workload.as_ref(), - entry_indices: &entry_indices, - }, - NOW_MS, - Some(Horizon(HORIZON_S)), - SummaryMaintenanceLifecycleCapabilities::default(), - &CHEAP_SUMMARY, - ) - .expect("selects"); + let selection = space.global_selection(&PREFER_UNIVMON); let assembled = space .roots .iter() @@ -541,15 +485,17 @@ fn certified_frequency_readouts_share_one_univmon_state() { (*index, dag) }) .collect(); - let mut states: Vec> = Vec::new(); - for (_, root) in share_common_summary_sub_dags(assembled) { - assert!(root.guarantee.is_some(), "{:?}", root.expr); - let SummaryExpr::SummaryEstimate { summary_input, .. } = &root.expr else { - panic!("summary readout: {:?}", root.expr); + let mut states: Vec> = Vec::new(); + for (_, root) in share_common_sub_dags(assembled) { + assert!(root.guarantee.is_some(), "{:?}", root.operator); + let asap_types::ir::Operator::ASAP(ASAPOp::SummaryEstimate { summary_input, .. }) = + &root.operator + else { + panic!("summary evaluation: {:?}", root.operator); }; assert!(matches!( - &summary_input.expr, - SummaryExpr::SummaryAgg { family: FieldDataType::Sketch(kind, _), .. } + &summary_input.operator, + asap_types::ir::Operator::ASAP(ASAPOp::SummaryAgg { family: FieldDataType::Sketch(kind, _), .. }) if kind.algorithm() == &SketchAlgorithm::UnivMon )); states.push(Rc::clone(summary_input)); diff --git a/crates/sql-function-catalog/src/lib.rs b/crates/sql-function-catalog/src/lib.rs index 0ae4ee5ab..f2aedbaa9 100644 --- a/crates/sql-function-catalog/src/lib.rs +++ b/crates/sql-function-catalog/src/lib.rs @@ -277,7 +277,7 @@ pub struct ClickHouseBuiltin { pub const CLICKHOUSE_BUILTINS: &[ClickHouseBuiltin] = &[ // Explicit time-series reducers. These deliberately survive under their // own names: the SQL frontend validates (value, timestamp, window_ms) and - // lowers the window to QueryExpr::TimeRange rather than pretending these + // lowers the window to NonASAPOp::TimeRange rather than pretending these // are ordinary tabular aggregates. ClickHouseBuiltin { name: "asap_rate", diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml index 8572854a9..0e10ccdf4 100644 --- a/crates/types/Cargo.toml +++ b/crates/types/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" # execution logic — removed, no real implementor existed; see issue #190). # No internal deps. [dependencies] -# "rc" — QueryExpr's child fields are Rc> (issue #212, #222: +# "rc" — OperatorNode child fields are Rc (issue #212, #222: # shared sub-expressions), and Rc's Serialize/Deserialize impls live behind # this feature flag. dag_export.rs / DAGNode already flatten the DAG to a # node+edge list for JSON export, so this does not change wire format — a diff --git a/crates/types/src/dag_export.rs b/crates/types/src/dag_export.rs index f26673ea7..9efbd66c5 100644 --- a/crates/types/src/dag_export.rs +++ b/crates/types/src/dag_export.rs @@ -1,31 +1,46 @@ -//! Export the pre-ASAP [`QueryExpr`] DAG as a generic node/edge DAG, for tools -//! that need to render or diff the IR (the `dag_export` example + the -//! `tools/dag-viewer` viewer — see issue #133) rather than walk it in Rust. +//! Export an [`OperatorNode`] DAG as a generic node/edge dag, for tools +//! that need to render or diff the IR (the `dag_export` devtools binary + +//! the `tools/dag-viewer` viewer — see issue #133) rather than walk it in +//! Rust. //! -//! `QueryExpr` already derives `Serialize`, but as a Rust-shaped tagged DAG -//! (`Rc` children nested inside each variant's own field). This module -//! flattens that into an explicit node list + child-id edges — the shape a -//! generic DAG renderer wants — and additionally tags each node with -//! [`structural_hash`](crate::pre_asap::cse::structural_hash), so a caller -//! with several exported queries can spot identical sub-DAGs (a -//! shared `Scan`, a repeated `Aggregate` shape, …) by comparing hashes -//! rather than re-implementing `QueryExpr: PartialEq` structural comparison -//! client-side. +//! `OperatorNode` already derives `Serialize`, but as a Rust-shaped tagged +//! tree (`Rc` children nested inside each variant's own field, repeated once +//! per reference). This module flattens that into an explicit node list + +//! child-id edges — one entry per unique node, deduplicated by `Rc` pointer +//! identity, so a shared sub-DAG stays one node with several parents — and +//! additionally tags each node with +//! [`structural_hash`](crate::ir::cse::structural_hash), so a caller with +//! several exported queries can spot identical sub-DAGs (a shared `Scan`, a +//! repeated `Aggregate` shape, …) by comparing hashes rather than +//! re-implementing structural comparison client-side. //! //! This is literally the same hashing -//! [`share_common_sub_dags`](crate::pre_asap::cse::share_common_sub_dags) -//! uses to bucket candidates in its `InternTable` (issue #223 stage 3) — not -//! a parallel reimplementation. `tools/dag-viewer`'s "shared sub-DAG" +//! [`share_common_sub_dags`](crate::ir::cse::share_common_sub_dags) uses to +//! bucket candidates in its `InternTable` (issue #223 stage 3) — not a +//! parallel reimplementation. `tools/dag-viewer`'s "shared sub-DAG" //! highlighting is still a *proxy* for real CSE, though: a hash match here //! only means two nodes are legal `InternTable` bucket-mates (same coarse -//! hash), the same candidate-narrowing step `structural_hash` performs -//! inside `InternTable::intern` — it does not mean `share_common_sub_dags` -//! actually ran on this data and merged them onto one `Rc` (that also -//! requires the `PartialEq` check `InternTable::intern` performs, and the +//! hash) — it does not mean `share_common_sub_dags` actually ran on this +//! data and merged them onto one `Rc` (that also requires the structural +//! equality check `InternTable::intern` performs, and the //! `Schema::has_unique_key` legality gate, neither of which this export //! step evaluates). See `tools/dag-viewer/README.md` for the up-to-date //! caveat. //! +//! There is one IR before and after ASAP optimization, so there is one +//! exporter: an ordinary operator and an ASAP summary operator are both +//! rendered by the same per-variant [`shape`] match, whichever entry point +//! ([`export`], [`export_summary`], [`export_post_asap`]) reached them. +//! +//! ## Scalar expressions +//! +//! A [`ScalarExpr`] is owned by value by an operator field (`Filter.pred`, +//! `Project.cols`, …) and is rendered into that operator's `detail`, not as +//! a node of its own. The operator nodes a scalar expression reads +//! (`scalar(v)`, `EXISTS (subquery)`, …) *are* nodes of the dag — they are +//! in [`OperatorNode::children`] — so inside `detail` each such reference is +//! rendered as `{"scalar_ref": }` rather than inlined. +//! //! ## `DAGNode::notes` — a layering seam, not a feature this module implements //! //! [`DAGNode`] also carries `notes: Vec<`[`DAGNote`]`>`, always empty coming @@ -33,13 +48,12 @@ //! `asap_types`, never the reverse — can annotate an already-exported DAG //! after the fact without this module needing to know anything about that //! layer's concepts. Concretely: `asap-aware-mapping`'s `explanation` module -//! (issue #257) computes `structural_hash` over the same `QueryExpr` -//! sub-DAGs this module does (via the identical function). The devtools -//! exporter uses that hash to narrow candidates, then compares -//! `ReplacementExplanation::target` with [`DAGNode::source_expr`] for a -//! collision-safe match before pushing a [`DAGNote`] onto the node. -//! `asap_types` itself never constructs a `DAGNote` — see [`DAGNode::notes`] -//! for the layering rule this keeps. +//! (issue #257) computes `structural_hash` over the same nodes this module +//! does (via the identical function). The devtools exporter uses that hash +//! to narrow candidates, then compares its target with +//! [`DAGNode::source_node`] for a collision-safe match before pushing a +//! [`DAGNote`] onto the node. `asap_types` itself never constructs a +//! `DAGNote` — see [`DAGNode::notes`] for the layering rule this keeps. use std::collections::HashMap; use std::rc::Rc; @@ -47,9 +61,11 @@ use std::rc::Rc; use serde::Serialize; use crate::cost::CostAnnotation; -use crate::post_asap::{AccuracyError, ResultGuarantee, SummaryExpr, SummaryNode}; -use crate::pre_asap::cse::{structural_hash, HashCache}; -use crate::pre_asap::query_expr::{QueryExpr, Source}; +use crate::ir::cse::{structural_hash, HashCache}; +use crate::ir::operator_properties::Source; +use crate::ir::{ASAPOp, NonASAPOp, Operator, OperatorNode, ScalarExpr}; +use crate::post_asap::{AccuracyError, ResultGuarantee}; +use crate::pre_asap::schema::FieldDataType; /// One flattened IR node. `detail` holds this node's own scalar fields /// (predicates, aggregate funcs, schema, sort keys, …) — everything except @@ -57,56 +73,48 @@ use crate::pre_asap::query_expr::{QueryExpr, Source}; #[derive(Debug, Clone, Serialize)] pub struct DAGNode { pub id: u32, - /// The `QueryExpr` variant name (e.g. `"Aggregate"`). + /// The operator variant name — [`Operator::kind_name`] (e.g. + /// `"Aggregate"`, `"SummaryAgg"`). pub kind: &'static str, /// Short human-readable summary for a node's collapsed on-DAG label. pub label: String, pub detail: serde_json::Value, - /// Output schema carried by every exported node. Edge renderers use the - /// child node's schema as the schema flowing along child → consumer. + /// Output schema carried by every exported node ([`OperatorNode::schema`] + /// as JSON). Edge renderers use the child node's schema as the schema + /// flowing along child → consumer. #[serde(skip_serializing_if = "Option::is_none")] pub schema: Option, - /// Child node ids, in the variant's field order (e.g. `Join` is - /// `[left, right]`). + /// Child node ids in [`OperatorNode::children`] order: the operator's + /// own inputs in field order (e.g. `Join` is `[left, right]`), then the + /// nodes referenced from its scalar expressions. pub children: Vec, /// Explicit workload-wide identity assigned by a higher-level exporter. /// Viewers use this field to union nodes and must not reconstruct a /// structural signature client-side. #[serde(skip_serializing_if = "Option::is_none")] pub workload_node_id: Option, - /// [`structural_hash`](crate::pre_asap::cse::structural_hash) of the - /// sub-DAG rooted at this node — the exact same function `cse`'s - /// `InternTable` uses to bucket CSE candidates, so two nodes hash - /// equally here iff they would land in the same `InternTable` bucket. - /// See the module doc for what a hash match here does and doesn't - /// guarantee. - /// - /// `None` for the same reason `source_expr` is `None` — a post-ASAP- - /// originated node in an [`export_post_asap`] merged DAG has no - /// `QueryExpr` to hash. Omitted from JSON entirely (rather than, say, - /// serialized as `0`) so a consumer's shared-sub-DAG-by-hash pass can - /// tell "no hash" apart from a real hash that happens to collide with a - /// placeholder — `0` is a legal `structural_hash` output, not a safe - /// sentinel. + /// [`structural_hash`](crate::ir::cse::structural_hash) of the sub-DAG + /// rooted at this node — the exact same function `cse`'s `InternTable` + /// uses to bucket CSE candidates, so two nodes hash equally here iff they + /// would land in the same `InternTable` bucket. See the module doc for + /// what a hash match here does and doesn't guarantee. Always `Some` + /// for a node this module produces; the `Option` is retained for the + /// JSON shape (`None` is omitted rather than serialized as a sentinel, + /// since `0` is a legal hash). #[serde(skip_serializing_if = "Option::is_none")] pub hash: Option, - /// Exact source expression for in-process annotation matching. It is not - /// part of the JSON format: callers first narrow by `hash`, then compare - /// this value structurally to avoid treating a hash collision as node - /// identity. - /// - /// `None` for a node with no corresponding pre-ASAP `QueryExpr` at all — - /// only possible for a post-ASAP-originated node inside a merged - /// [`export_post_asap`] DAG (a `SummaryAgg`/`SummaryJoin`/… node has no - /// single `QueryExpr` it corresponds to). Every node [`export`] itself - /// produces is pre-ASAP by construction and always carries `Some`. + /// The exported node itself, for in-process annotation matching. Not + /// part of the JSON format: callers first narrow by `hash`, then + /// compare this value (by pointer or structurally) to avoid treating a + /// hash collision as node identity. Always `Some` for a node this + /// module produces. #[serde(skip)] - pub source_expr: Option, - /// In-process identity of the source `QueryExpr`. Unlike `source_expr`'s - /// structural value, this preserves an `Rc` child reached from multiple - /// parents so post-ASAP flattening can retain true DAG sharing. + pub source_node: Option>, + /// In-process identity of `source_node` (`Rc::as_ptr` as an address): + /// the key the builder deduplicates on, so a node reached from several + /// parents is exported once. Not part of the JSON format. #[serde(skip)] - source_ptr: Option, + pub source_ptr: Option, /// Arbitrary reporting-layer annotations for this node — e.g. why a /// replacement exists here. `asap_types` never populates this itself /// (it has no notion of a "replacement" at all — see the module doc's @@ -187,7 +195,7 @@ pub struct EdgeCostAnnotation { pub cost: CostAnnotation, } -/// One query's exported DAG. `nodes[root as usize]` is the DAG's root. +/// One query's exported dag. `nodes[root as usize]` is the DAG's root. #[derive(Debug, Clone, Serialize)] pub struct ExportDAG { pub nodes: Vec, @@ -195,8 +203,7 @@ pub struct ExportDAG { /// See [`EdgeCostAnnotation`]. Always empty unless a higher layer /// explicitly populated it (same layering rule as [`DAGNode::notes`]); /// omitted from JSON entirely when empty, so every existing producer of - /// [`ExportDAG`] (every call to [`export`]/[`export_summary`]) is - /// unaffected. + /// [`ExportDAG`] is unaffected. #[serde(default, skip_serializing_if = "Vec::is_empty")] pub edge_annotations: Vec, } @@ -205,10 +212,10 @@ pub struct ExportDAG { #[derive(Debug, Clone, Serialize)] pub struct NamedDAG { pub name: String, - /// The original query text (SQL or PromQL) this DAG was lowered from, - /// for display alongside the DAG — not used by `export` itself, since - /// that only sees the already-lowered `QueryExpr`. Optional because not - /// every producer of a `NamedDAG` has the source text on hand. + /// The original query text (SQL or PromQL) this dag was lowered from, + /// for display alongside the dag — not used by `export` itself, since + /// that only sees the already-lowered DAG. Optional because not every + /// producer of a `NamedDAG` has the source text on hand. #[serde(skip_serializing_if = "Option::is_none")] pub source: Option, pub dag: ExportDAG, @@ -228,15 +235,13 @@ pub struct NamedDAG { /// [`TargetReplacement::before`]/`::after` (small, self-contained /// before/after pairs, one per independently-discovered replacement /// site), this is a single flattened [`ExportDAG`] spanning the whole - /// query: every node that has no winning replacement renders as an - /// ordinary pre-ASAP [`DAGNode`] (same shape [`export`] itself - /// produces), and every node that does splices in its winning - /// candidate's shape instead — a rewritten [`QueryExpr`] sub-DAG, or a - /// bound `SummaryNode` sub-DAG, rendered inline in the very same node - /// list. `None` unless a higher layer explicitly built one (e.g. the - /// `dag_export` devtools binary's `--post-asap` flag); omitted from the - /// JSON entirely when absent, so every existing producer/consumer of - /// `NamedDAG` is unaffected. + /// query: every node that has no winning replacement renders as it does + /// in [`export`], and every node that does splices in its winning + /// candidate's sub-DAG instead, in the very same node list. `None` + /// unless a higher layer explicitly built one (e.g. the `dag_export` + /// devtools binary's `--post-asap` flag); omitted from the JSON entirely + /// when absent, so every existing producer/consumer of `NamedDAG` is + /// unaffected. #[serde(default, skip_serializing_if = "Option::is_none")] pub post_dag: Option, /// This query's own selected-workload cost/benefit — one of issue @@ -282,81 +287,51 @@ pub struct WorkloadDAG { pub workload_cost: Option, } -// ── Post-ASAP replacement export — a second, layering-seam-shaped feature ── +// ── Post-ASAP replacement export — a layering-seam-shaped feature ────────── // -// Everything below this point is the post-ASAP counterpart of the pre-ASAP -// flattening above: [`export_summary`] flattens a `SummaryNode` the same way -// [`export`] flattens a `QueryExpr`, and [`TargetReplacement`] is the -// generic, crate-agnostic "one replacement site, before and after" shape a -// higher layer (`asap-aware-mapping`, via the `dag_export` devtools binary's -// `--post-asap` flag) populates after running its own search — the exact -// same layering rule [`DAGNode::notes`]'s doc above already states: this -// module never runs `asap_aware_mapping::replacement::search_workload_with` -// itself, never picks a "winning" candidate, and has no opinion on what a +// [`TargetReplacement`] is the generic, crate-agnostic "one replacement +// site, before and after" shape a higher layer (`asap-aware-mapping`, via +// the `dag_export` devtools binary's `--post-asap` flag) populates after +// running its own search — the exact same layering rule [`DAGNode::notes`]'s +// doc above already states: this module never runs +// `asap_aware_mapping::replacement::search_workload_with` itself, never +// picks a "winning" candidate, and has no opinion on what a // `ReplacementProvenance` or a cost model even is. It only defines shapes // concrete and serializable enough for a higher layer to fill in, and for // `tools/dag-viewer` to render without needing to know anything about // `asap-aware-mapping`'s own vocabulary. -// -// A single whole-query "post-ASAP DAG" isn't attempted here, and isn't -// representable in the current type system either: `SummaryExpr` has no -// variant letting a `SummaryNode` be embedded back inside a plain -// `QueryExpr`'s child slot (`QueryExpr`'s own children are always -// `Rc`, never `Rc`), so there is no way to splice a -// post-ASAP binding back into its original pre-ASAP DAG in place. Inventing -// a bridge type for that is a real `asap_types`/`asap-aware-mapping` IR -// design decision, well beyond what a devtools visualization export should -// decide unilaterally. Instead, each independently-discovered replacement -// target gets its own small, self-contained `before`/`after` pair — the -// target's own pre-ASAP sub-DAG, and either the winning `SummaryNode` or the -// winning rewritten `QueryExpr`, both of which *are* fully representable -// today via [`export`]/[`export_summary`] as-is. - -/// One flattened post-ASAP node — the [`SummaryExpr`] analogue of -/// [`DAGNode`]. `detail` holds this node's own scalar fields (the summarized -/// column, the summary family, grouping strategy, sketch-query kind, …) — -/// everything except its `SummaryNode` children, which live in `children` -/// instead. -/// -/// Unlike [`DAGNode`], this carries no `hash`/`source_expr` pair: nothing in -/// this module ever needs to re-identify a particular `SummaryDAGNode` the -/// way `DAGNode::hash` lets a higher layer re-identify a pre-ASAP node (a -/// `SummaryNode` is always freshly exported for exactly one -/// [`TargetReplacementAfter::Summary`] site, never matched back against a -/// separately-exported DAG the way pre-ASAP notes are). -/// -/// Several of `SummaryExpr`'s own fields (`FieldDataType`, -/// `GroupingStrategy`, `SketchStatistic`) derive neither `Serialize` nor -/// `Deserialize` in `asap_types::post_asap` — they carry no reporting -/// obligation there, since nothing before this module ever needed to -/// serialize a post-ASAP node. Rather than adding `Serialize` impls to -/// `post_asap`'s own core types purely for this devtools-facing export (a -/// change to that module's own public API contract, out of scope for a -/// reporting concern), this module renders those particular fields into -/// `detail` via their `Debug` formatting instead — human-readable, and -/// sufficient for the display purpose `detail` exists for on every other -/// node in this file (see [`DAGNode::detail`]'s own doc), at the cost of -/// those particular fields being opaque strings rather than structured JSON -/// on the `SummaryDAGNode` side of the export. + +/// One flattened node of a [`SummaryDAG`] — the same node as a +/// [`DAGNode`], in the shape the summary-maintenance consumers read: +/// snake_case `kind`, the accuracy guarantee as its own field, no +/// hash/annotation seams. #[derive(Debug, Clone, Serialize)] pub struct SummaryDAGNode { pub id: u32, - /// The `SummaryExpr` variant name (e.g. `"SummaryAgg"`). + /// The operator variant name in snake_case (e.g. `"summary_agg"`, + /// `"scan"`) — see [`snake_case_kind`]. pub kind: &'static str, /// Short human-readable summary for a node's collapsed on-DAG label. pub label: String, pub detail: serde_json::Value, - /// Child node ids, in the variant's field order (e.g. `SummaryJoin` is - /// `[outer, inner]`). + /// [`OperatorNode::schema`] as JSON. + #[serde(skip_serializing_if = "Option::is_none")] + pub schema: Option, + /// Child node ids in [`OperatorNode::children`] order. pub children: Vec, /// The value's machine-readable accuracy guarantee (issue #172) — - /// [`SummaryNode::guarantee`] serialized structurally (metric, symbolic + /// [`OperatorNode::guarantee`] serialized structurally (metric, symbolic /// bound, failure probability, provenance including any budget /// allocation), not as prose. Omitted when the node carries none (raw /// summary state, or a family with no error model), so every consumer /// predating this field parses the same shape it always has. #[serde(default, skip_serializing_if = "Option::is_none")] pub guarantee: Option, + /// The exported node itself, so a caller annotating the dag can find + /// a node by `Rc` pointer identity rather than by walk order. Not part + /// of the JSON format. Always `Some`. + #[serde(skip)] + pub source_node: Option>, } /// One accuracy-illegal candidate a higher layer's search refused for a @@ -378,239 +353,14 @@ pub struct TargetRejection { pub error: AccuracyError, } -/// One post-ASAP `SummaryNode` DAG, flattened the same way [`ExportDAG`] -/// flattens a pre-ASAP `QueryExpr` DAG. +/// A DAG flattened into [`SummaryDAGNode`]s — the same dag [`ExportDAG`] +/// holds, in the summary-maintenance consumers' node shape. #[derive(Debug, Clone, Serialize)] pub struct SummaryDAG { pub nodes: Vec, pub root: u32, } -/// Flatten a [`SummaryNode`] the same way [`export`] flattens a `QueryExpr` -/// — post-order, one [`SummaryDAGNode`] per [`SummaryExpr`] variant, no -/// memoization of repeated `Rc` references (a shared -/// sub-expression reachable through two parents is flattened twice, into two -/// separate node entries — the same "this is a flattened DAG view, not a -/// pointer-identity-preserving DAG" behavior [`build`] already has for -/// `QueryExpr`). -/// -/// A `KeepPreAsap(inner)` leaf embeds the *whole* pre-ASAP sub-DAG beneath it -/// as a nested [`ExportDAG`] (via [`export(inner)`](export)) inside its own -/// `detail` field (`{"pre_asap_sub_dag": }`) rather than trying to -/// flatten it into this same node list — [`DAGNode`] and [`SummaryDAGNode`] -/// are different types with different id spaces, so mixing them into one -/// `Vec` isn't type-safe; nesting is. `label` for a `KeepPreAsap` node is -/// `format!("KeepPreAsap({kind})")`, where `kind` is the inner sub-DAG's own -/// top-level `DAGNode::kind`. -pub fn export_summary(node: &SummaryNode) -> SummaryDAG { - let mut nodes = Vec::new(); - let root = build_summary(node, &mut nodes); - SummaryDAG { nodes, root } -} - -fn push_summary_node( - nodes: &mut Vec, - kind: &'static str, - label: String, - detail: serde_json::Value, - children: Vec, - guarantee: Option, -) -> u32 { - let id = nodes.len() as u32; - nodes.push(SummaryDAGNode { - id, - kind, - label, - detail, - children, - guarantee, - }); - id -} - -/// A short, human-readable label for a [`crate::post_asap::FieldDataType`] -/// (e.g. `"Sketch(Kll)"`, `"ExactAggregate(Sum)"`) — for -/// [`SummaryDAGNode::label`] text on a `SummaryAgg`/`SummaryJoin` node. Not -/// exhaustive prose (mirrors `asap_aware_mapping::replacement::describe_intent`'s -/// own "this is a label, not a decision" stance) — every variant is covered, -/// but via `Debug` for the inner kind rather than hand-written prose per -/// algorithm. -fn family_label(family: &crate::post_asap::FieldDataType) -> String { - use crate::post_asap::FieldDataType; - match family { - FieldDataType::Plain(dtype) => format!("Plain({dtype:?})"), - FieldDataType::ExactAggregate(kind, _) => format!("ExactAggregate({kind:?})"), - FieldDataType::Sketch(kind, _grouping) => format!("Sketch({:?})", kind.algorithm()), - FieldDataType::Sample(kind, _) => format!("Sample({kind:?})"), - FieldDataType::Wavelet(kind, _) => format!("Wavelet({kind:?})"), - FieldDataType::StatModel(kind, _) => format!("StatModel({kind:?})"), - } -} - -/// `(kind, label, detail)` for every [`SummaryExpr`] variant *except* -/// [`SummaryExpr::KeepPreAsap`] — that variant has no `SummaryDAGNode`/ -/// `DAGNode` of its own (see [`build_summary`]/[`build_summary_hybrid`], its -/// only two callers, both of which special-case it before ever reaching -/// this function). Factored out so [`build_summary`] (nests a `KeepPreAsap` -/// leaf's pre-ASAP sub-DAG as its own [`SummaryDAG`]) and -/// [`build_summary_hybrid`] (splices that same sub-DAG directly into a -/// shared [`ExportDAG`] node list — see [`export_post_asap`]) can't drift -/// apart on how every *other* variant's own shape is described, since -/// nothing about that description differs between the two. -macro_rules! define_summary_kind_tags { - ($($pattern:pat => $tag:literal),+ $(,)?) => { - #[cfg(test)] - const SUMMARY_KIND_TAGS: &[&str] = &[$($tag),+]; - - fn summary_kind_tag(expr: &SummaryExpr) -> &'static str { - match expr { - SummaryExpr::KeepPreAsap(_) => unreachable!( - "summary_kind_tag's callers special-case KeepPreAsap" - ), - $($pattern => $tag),+ - } - } - }; -} - -define_summary_kind_tags! { - SummaryExpr::BinaryOp { .. } => "SummaryBinaryOp", - - SummaryExpr::ValueOperation { .. } => "ValueOperation", - SummaryExpr::RelationalJoin { .. } => "RelationalJoin", - SummaryExpr::SummaryAgg { .. } => "SummaryAgg", - SummaryExpr::SummaryJoin { .. } => "SummaryJoin", - SummaryExpr::SummarySubtract { .. } => "SummarySubtract", - SummaryExpr::SummaryDelete { .. } => "SummaryDelete", - SummaryExpr::SummaryEstimate { .. } => "SummaryEstimate", - SummaryExpr::SummaryMerge { .. } => "SummaryMerge", -} - -fn summary_shape(expr: &SummaryExpr) -> (&'static str, String, serde_json::Value) { - let kind = summary_kind_tag(expr); - match expr { - SummaryExpr::KeepPreAsap(_) => { - unreachable!("summary_shape's callers special-case KeepPreAsap before calling it") - } - SummaryExpr::BinaryOp { operator, .. } => { - let label = format!("BinaryOp({:?})", operator.kind); - let detail = serde_json::json!({ - "kind": format!("{:?}", operator.kind), - "vector_match": operator.vector_match, - }); - (kind, label, detail) - } - - SummaryExpr::ValueOperation { - operation, timing, .. - } => ( - kind, - format!("ValueOperation({operation:?})"), - serde_json::json!({ - "operation": format!("{operation:?}"), - "timing": timing.as_str(), - }), - ), - SummaryExpr::RelationalJoin { - kind: join_kind, - pred, - .. - } => ( - kind, - format!("RelationalJoin({join_kind:?})"), - serde_json::json!({ "join_kind": join_kind, "predicate": pred }), - ), - SummaryExpr::SummaryAgg { - family, - input, - reduction, - grouping, - .. - } => { - let label = format!("SummaryAgg({})", family_label(family)); - let detail = serde_json::json!({ - "family": format!("{family:?}"), - "input": input, - "reduction": reduction, - "grouping": format!("{grouping:?}"), - }); - (kind, label, detail) - } - SummaryExpr::SummaryJoin { key, family, .. } => { - let label = format!("SummaryJoin({})", family_label(family)); - let detail = serde_json::json!({ - "key": key, - "family": format!("{family:?}"), - }); - (kind, label, detail) - } - SummaryExpr::SummarySubtract { .. } => { - (kind, "SummarySubtract".into(), serde_json::json!({})) - } - SummaryExpr::SummaryDelete { key, .. } => { - let detail = serde_json::json!({ "key": key }); - (kind, "SummaryDelete".into(), detail) - } - SummaryExpr::SummaryEstimate { query, .. } => { - let label = format!("SummaryEstimate({query:?})"); - let detail = serde_json::json!({ "query": format!("{query:?}") }); - (kind, label, detail) - } - SummaryExpr::SummaryMerge { children, .. } => { - let label = format!("SummaryMerge({} children)", children.len()); - (kind, label, serde_json::json!({})) - } - } -} - -/// `expr`'s own `Rc` children, in the variant's field order -/// (e.g. `SummaryJoin` is `[outer, inner]`) — empty for -/// [`SummaryExpr::KeepPreAsap`], which has no `SummaryNode` children at all -/// (only a boxed pre-ASAP `QueryExpr`). Shared by [`build_summary`] and -/// [`build_summary_hybrid`] for the same reason [`summary_shape`] is. -fn summary_children(expr: &SummaryExpr) -> Vec<&Rc> { - match expr { - SummaryExpr::KeepPreAsap(_) => vec![], - SummaryExpr::BinaryOp { lhs, rhs, .. } => vec![lhs, rhs], - - SummaryExpr::ValueOperation { child, .. } => vec![child], - SummaryExpr::RelationalJoin { left, right, .. } => vec![left, right], - SummaryExpr::SummaryAgg { child, .. } => vec![child], - SummaryExpr::SummaryJoin { outer, inner, .. } => vec![outer, inner], - SummaryExpr::SummarySubtract { left, right } => vec![left, right], - SummaryExpr::SummaryDelete { summary_input, .. } => vec![summary_input], - SummaryExpr::SummaryEstimate { summary_input, .. } => vec![summary_input], - SummaryExpr::SummaryMerge { children, .. } => children.iter().collect(), - } -} - -/// Recursively flatten `node`, appending [`SummaryDAGNode`]s to `nodes` in -/// post-order (children pushed before their parent), and return the pushed -/// root's id. Exhaustive over every [`SummaryExpr`] variant, matching this -/// file's own exhaustive style for `QueryExpr` in [`build`]. -fn build_summary(node: &SummaryNode, nodes: &mut Vec) -> u32 { - if let SummaryExpr::KeepPreAsap(inner) = &node.expr { - let pre_asap_sub_dag = export(inner); - let inner_kind = pre_asap_sub_dag.nodes[pre_asap_sub_dag.root as usize].kind; - let label = format!("KeepPreAsap({inner_kind})"); - let detail = serde_json::json!({ "pre_asap_sub_dag": pre_asap_sub_dag }); - return push_summary_node( - nodes, - "KeepPreAsap", - label, - detail, - vec![], - node.guarantee.clone(), - ); - } - let children: Vec = summary_children(&node.expr) - .into_iter() - .map(|child| build_summary(child, nodes)) - .collect(); - let (kind, label, detail) = summary_shape(&node.expr); - push_summary_node(nodes, kind, label, detail, children, node.guarantee.clone()) -} - /// One replacement site a higher layer (the `dag_export` binary) found by /// running `asap_aware_mapping::replacement::search_workload_with` + /// `CandidateLogicalASAPDAGs::cost_sorted` and picking the best-ranked candidate for one @@ -624,7 +374,7 @@ pub struct TargetReplacement { /// so renderers can explain a clicked post-ASAP node without guessing by /// label, hash, or DAG shape. pub decision_id: u32, - /// Id of the [`DAGNode`] (in this query's own `DAG.nodes`, i.e. the + /// Id of the [`DAGNode`] (in this query's own `dag.nodes`, i.e. the /// [`NamedDAG`] this `TargetReplacement` is attached to) this /// replacement's `before` sub-DAG is rooted at. pub target_pre_id: u32, @@ -648,7 +398,7 @@ pub struct TargetReplacement { /// doesn't estimate a numeric cost for this candidate shape (see that /// field's own doc upstream). pub cost: f64, - /// The target's own pre-ASAP sub-DAG, before replacement — literally + /// The target's own sub-DAG, before replacement — literally /// `export(target)` for the `TargetSubDAGCandidates`'s own `target`, reused as-is. pub before: ExportDAG, pub after: TargetReplacementAfter, @@ -668,8 +418,10 @@ pub struct TargetReplacement { } /// What a [`TargetReplacement`] became — either a genuine post-ASAP binding -/// or a still-pre-ASAP-shaped structural rewrite, mirroring -/// `asap_aware_mapping::replacement::Replacement`'s own two variants. +/// or a still-relational structural rewrite, mirroring +/// `asap_aware_mapping::replacement::Replacement`'s own two variants. Both +/// carry an ordinary [`ExportDAG`]: the unified IR renders a summary sub-DAG +/// and a rewritten relational sub-DAG through the same [`export`]. /// /// Serializes as `{"kind": "Summary"|"Rewrite", "DAG": {...}}` (serde's /// adjacently-tagged representation for a `#[serde(tag = "kind", content = @@ -680,73 +432,83 @@ pub struct TargetReplacement { #[serde(tag = "kind", content = "dag")] pub enum TargetReplacementAfter { /// A `Replacement::Summary` candidate — a genuine post-ASAP binding. - Summary(SummaryDAG), - /// A `Replacement::Rewrite` candidate — still pre-ASAP shaped (CSE + Summary(ExportDAG), + /// A `Replacement::Rewrite` candidate — still relational (CSE /// share/recompute, `AvgToSumOverCountStrategy`, and `RollupStrategy` - /// all produce this kind), so this reuses [`ExportDAG`]/[`export`] too, - /// not a new type. + /// all produce this kind). Rewrite(ExportDAG), } -/// Flatten `expr` into a [`ExportDAG`]. -pub fn export(expr: &QueryExpr) -> ExportDAG { - let mut nodes = Vec::new(); - // One cache for the whole export — persisted across every `build`/ - // `push_node` call, not reset per node, so `structural_hash` memoizes - // real work across this pass instead of re-walking an already-hashed - // shared descendant once per node that references it. - let mut cache = HashCache::new(); - // No substitution: an ordinary pre-ASAP export never splices anything - // in — see `build`'s own doc for why it always takes a `find_winner` - // callback regardless (so `export_post_asap` can share this exact - // per-variant traversal instead of duplicating it). - let root = build(expr, &mut nodes, &mut cache, &mut |_| None); - ExportDAG { - nodes, - root, - edge_annotations: Vec::new(), - } -} - -/// What a higher layer found for one specific pre-ASAP node when building a -/// merged post-ASAP DAG via [`export_post_asap`] — see that function's own -/// doc for the full design. `asap_types` has no opinion on *how* this is +/// What a higher layer found for one specific node when building a merged +/// post-ASAP dag via [`export_post_asap`] — see that function's own doc +/// for the full design. `asap_types` has no opinion on *how* this is /// decided (that's `asap_aware_mapping::replacement::search_workload_with` + /// `CandidateLogicalASAPDAGs::cost_sorted`'s job, a higher layer, exactly the layering rule /// [`DAGNode::notes`] already states); it only defines the shape a decision -/// comes back in. +/// comes back in. Both variants render identically (one IR, one builder); +/// they are kept apart so the caller's `Replacement` maps one-to-one. #[derive(Debug, Clone)] pub enum PostAsapSubstitution { /// This exact node has a winning `Replacement::Rewrite` — keep building - /// from `.0` instead of the original node. Still pre-ASAP shaped, so - /// [`build`] renders it via the same ordinary `DAGNode` path — see - /// [`build`]'s own doc for why `.0`'s own top level is rendered without - /// re-querying `find_winner` on it (its descendants still are). + /// from `replacement` instead of the original node. Rewrite { - replacement: Rc, + replacement: Rc, decision: DAGDecision, }, - /// This exact node has a winning `Replacement::Summary` — switch to - /// rendering `.0`'s bound `SummaryNode` shape from here down, via - /// [`build_summary_hybrid`]. + /// This exact node has a winning `Replacement::Summary` — keep building + /// from `replacement` (a summary-bound sub-DAG) instead of the original + /// node. Summary { - replacement: Rc, + replacement: Rc, decision: DAGDecision, }, } +/// Flatten the DAG rooted at `root` into a [`ExportDAG`]: one [`DAGNode`] +/// per unique reachable node, children pushed before their parents. +pub fn export(root: &Rc) -> ExportDAG { + let mut no_substitution = |_: &Rc| None; + let mut builder = Builder::new(&mut no_substitution); + let root = builder.build(root); + builder.finish(root) +} + +/// Flatten the DAG rooted at `node` into a [`SummaryDAG`] — the same +/// nodes [`export`] produces, in the [`SummaryDAGNode`] shape (snake_case +/// `kind`, `guarantee` as its own field). +pub fn export_summary(node: &Rc) -> SummaryDAG { + let dag = export(node); + let nodes = dag + .nodes + .into_iter() + .map(|node| { + let source = node + .source_node + .expect("every exported node carries its source"); + SummaryDAGNode { + id: node.id, + kind: snake_case_kind(&source.operator), + label: node.label, + detail: node.detail, + schema: node.schema, + children: node.children, + guarantee: source.guarantee.clone(), + source_node: Some(source), + } + }) + .collect(); + SummaryDAG { + nodes, + root: dag.root, + } +} + /// Build one merged "whole query, but post-ASAP" [`ExportDAG`] by walking -/// `root`'s ordinary pre-ASAP shape and, at every node, asking `find_winner` -/// whether *that exact node* has a winning replacement — if so, splicing -/// the replacement's own shape in at that position instead, in the very -/// same flattened node list (not a nested sub-DAG the way -/// [`TargetReplacement::before`]/`::after` — small, independent, per-site -/// before/after pairs — already do; see this file's "Post-ASAP replacement -/// export" section doc for why *that* design doesn't attempt a single -/// whole-query composite, and why this one can: this is a synthetic -/// id/edge list, the same kind of thing [`ExportDAG`] already is for the -/// pre-ASAP side, not a real `QueryExpr`/`SummaryNode` value with a type -/// system to satisfy). +/// `root` and, at every node, asking `find_winner` whether *that exact +/// node* has a winning replacement — if so, splicing the replacement's own +/// sub-DAG in at that position instead, in the very same flattened node +/// list (not a nested sub-dag the way [`TargetReplacement::before`]/ +/// `::after` — small, independent, per-site before/after pairs — do). /// /// `find_winner` is the whole layering seam: `asap_types` never runs /// `asap_aware_mapping::replacement::search_workload_with` or @@ -758,7 +520,7 @@ pub enum PostAsapSubstitution { /// for [`TargetReplacement`] discovery, and passes it in here unchanged. /// /// `find_winner` is deliberately consulted only once per node, at the -/// moment [`build`] first reaches it — **not** re-consulted on a +/// moment the builder first reaches it — **not** re-consulted on a /// substitution's own immediate top level (only on that substitution's /// *descendants*, which get an ordinary fresh call same as any other node). /// This matters for correctness, not just efficiency: @@ -770,225 +532,189 @@ pub enum PostAsapSubstitution { /// re-query at exactly that one level is what makes this termination-safe /// for every registered strategy, not just the ones that happen not to /// return the target itself as a candidate. +/// +/// Every node a substitution introduced carries the substitution's +/// [`DAGDecision`] (`role = "replacement_root"` on the spliced-in root, +/// `"replacement_region"` on its newly exported descendants); a descendant +/// that was already exported before the splice (a shared input the +/// replacement reuses) keeps whatever it already had. pub fn export_post_asap( - root: &QueryExpr, - find_winner: &mut dyn FnMut(&QueryExpr) -> Option, + root: &Rc, + find_winner: &mut dyn FnMut(&Rc) -> Option, ) -> ExportDAG { - let mut nodes = Vec::new(); - let mut cache = HashCache::new(); - let root_id = build(root, &mut nodes, &mut cache, find_winner); - deduplicate_pointer_shared_nodes(nodes, root_id) + let mut builder = Builder::new(find_winner); + let root = builder.build(root); + builder.finish(root) } -fn deduplicate_pointer_shared_nodes(nodes: Vec, root: u32) -> ExportDAG { - let mut by_source_ptr = HashMap::::new(); - let mut old_to_new = vec![0_u32; nodes.len()]; - let mut deduplicated = Vec::with_capacity(nodes.len()); - for mut node in nodes { - node.children = node - .children - .into_iter() - .map(|child| old_to_new[child as usize]) - .collect(); - if let Some(existing) = node - .source_ptr - .and_then(|source_ptr| by_source_ptr.get(&source_ptr).copied()) - { - old_to_new[node.id as usize] = existing; - continue; - } - let old_id = node.id; - let new_id = deduplicated.len() as u32; - node.id = new_id; - if let Some(source_ptr) = node.source_ptr { - by_source_ptr.insert(source_ptr, new_id); +/// The one flattening pass behind every entry point. Nodes are memoized by +/// `Rc` pointer identity: a node reached from several parents (an operator +/// input shared with a scalar reference, say) is exported once. +struct Builder<'a> { + nodes: Vec, + /// `Rc::as_ptr` of every node already exported (or substituted) → its id. + ids: HashMap<*const OperatorNode, u32>, + /// One cache for the whole export — persisted across every node, not + /// reset per node, so `structural_hash` memoizes real work across this + /// pass instead of re-walking an already-hashed shared descendant once + /// per node that references it. + cache: HashCache, + find_winner: &'a mut dyn FnMut(&Rc) -> Option, +} + +impl<'a> Builder<'a> { + fn new( + find_winner: &'a mut dyn FnMut(&Rc) -> Option, + ) -> Self { + Self { + nodes: Vec::new(), + ids: HashMap::new(), + cache: HashCache::new(), + find_winner, } - old_to_new[old_id as usize] = new_id; - deduplicated.push(node); } - ExportDAG { - nodes: deduplicated, - root: old_to_new[root as usize], - edge_annotations: Vec::new(), + fn finish(self, root: u32) -> ExportDAG { + ExportDAG { + nodes: self.nodes, + root, + edge_annotations: Vec::new(), + } } -} -macro_rules! define_query_kind_tags { - ($($pattern:pat => $tag:literal),+ $(,)?) => { - #[cfg(test)] - const QUERY_KIND_TAGS: &[&str] = &[$($tag),+]; - - fn kind_tag(expr: &QueryExpr) -> &'static str { - match expr { - $($pattern => $tag),+, - other @ (QueryExpr::Column(_) - | QueryExpr::Literal(_) - | QueryExpr::Compare { .. } - | QueryExpr::BoolAnd(_) - | QueryExpr::BoolOr(_) - | QueryExpr::Not(_) - | QueryExpr::IsNull(_) - | QueryExpr::IsNotNull(_) - | QueryExpr::Cast { .. } - | QueryExpr::InList { .. } - | QueryExpr::FunctionCall { .. } - | QueryExpr::Arithmetic { .. } - | QueryExpr::Case { .. }) => unreachable!( - "kind_tag reached a scalar QueryExpr variant directly: {other:?}" - ), + /// Export `node` (or, when `find_winner` has a substitution for it, the + /// substitution's sub-DAG in its place) and return its id. + fn build(&mut self, node: &Rc) -> u32 { + let ptr = Rc::as_ptr(node); + if let Some(&id) = self.ids.get(&ptr) { + return id; + } + let (replacement, decision) = match (self.find_winner)(node) { + None => return self.build_node(node), + Some(PostAsapSubstitution::Rewrite { + replacement, + decision, + }) + | Some(PostAsapSubstitution::Summary { + replacement, + decision, + }) => (replacement, decision), + }; + let first = self.nodes.len(); + let root = self.build_node(&replacement); + for exported in &mut self.nodes[first..] { + if exported.decision.is_none() { + let mut node_decision = decision.clone(); + node_decision.role = if exported.id == root { + "replacement_root" + } else { + "replacement_region" + }; + exported.decision = Some(node_decision); } } - }; -} - -define_query_kind_tags! { - QueryExpr::Scan { .. } => "Scan", - QueryExpr::PromqlScalarBridge(_) => "PromqlScalarBridge", - QueryExpr::EvalTimestamp => "EvalTimestamp", - QueryExpr::CurrentTimestamp => "CurrentTimestamp", - QueryExpr::PromqlVectorFromScalar(_) => "PromqlVectorFromScalar", - QueryExpr::PromqlScalarFromVector(_) => "PromqlScalarFromVector", - QueryExpr::PromqlRelabel { .. } => "PromqlRelabel", - QueryExpr::PromqlInfoEnrich { .. } => "PromqlInfoEnrich", - QueryExpr::PromqlSeriesSample { .. } => "PromqlSeriesSample", - QueryExpr::Filter { .. } => "Filter", - QueryExpr::Project { .. } => "Project", - QueryExpr::Aggregate { .. } => "Aggregate", - QueryExpr::Dedup { .. } => "Dedup", - QueryExpr::Concat { .. } => "Concat", - QueryExpr::Join { .. } => "Join", - QueryExpr::SetOp { .. } => "SetOp", - QueryExpr::Sort { .. } => "Sort", - QueryExpr::Limit { .. } => "Limit", - QueryExpr::PromqlSubquery { .. } => "PromqlSubquery", - QueryExpr::TimeRange { .. } => "TimeRange", - QueryExpr::TimeShift { .. } => "TimeShift", - QueryExpr::SQLWindowFunc { .. } => "SQLWindowFunc", - QueryExpr::BinaryOp { .. } => "BinaryOp", -} - -/// Push one flattened node for `expr`. `expr` is the *whole* sub-DAG this -/// node represents (not just its own fields) — `hash` is -/// [`structural_hash(expr)`](structural_hash), the identical function and -/// the identical input `InternTable::intern` would hash for this same -/// sub-DAG, so this node's `hash` matches what `cse::share_common_sub_dags` -/// would bucket it under. `kind` is [`kind_tag(expr)`](kind_tag), not a -/// caller-supplied argument — see that function's doc for why. -fn push_node( - nodes: &mut Vec, - expr: &QueryExpr, - cache: &mut HashCache, - label: String, - detail: serde_json::Value, - children: Vec, -) -> u32 { - let id = nodes.len() as u32; - let hash = Some(structural_hash(expr, cache)); - nodes.push(DAGNode { - id, - kind: kind_tag(expr), - label, - detail, - schema: expr - .output_schema() - .ok() - .and_then(|schema| serde_json::to_value(schema).ok()), - children, - workload_node_id: None, - hash, - source_expr: Some(expr.clone()), - source_ptr: Some(expr as *const QueryExpr as usize), - notes: Vec::new(), - decision: None, - }); - id -} + // The original node now resolves to the substitution: another + // parent of the same `Rc` reuses the spliced-in sub-DAG. + self.ids.insert(ptr, root); + root + } -/// Push one flattened node with no corresponding pre-ASAP `QueryExpr` at -/// all — a post-ASAP-originated node inside [`export_post_asap`]'s merged -/// DAG (a `SummaryAgg`/`SummaryJoin`/… node, via [`build_summary_hybrid`]). -/// `hash`/`source_expr`-based re-identification (see [`DAGNode::hash`]'s own -/// doc) has no meaning for a node with no `QueryExpr` behind it, so this -/// pushes a fixed placeholder hash (`0`) and `source_expr: None` rather than -/// inventing a hash over `SummaryExpr` (which, unlike `QueryExpr`, has no -/// [`structural_hash`]-equivalent function at all — see [`SummaryDAGNode`]'s -/// own doc on why `SummaryExpr`'s fields don't even derive `Hash`/`PartialEq` -/// consistently enough to build one). -fn push_summary_originated_node( - nodes: &mut Vec, - kind: &'static str, - label: String, - detail: serde_json::Value, - children: Vec, -) -> u32 { - let id = nodes.len() as u32; - nodes.push(DAGNode { - id, - kind, - label, - detail, - schema: None, - children, - workload_node_id: None, - hash: None, - source_expr: None, - source_ptr: None, - notes: Vec::new(), - decision: None, - }); - id + /// Export `node` itself (no substitution check at this level; children + /// still go through [`Self::build`]) and return its id. + fn build_node(&mut self, node: &Rc) -> u32 { + let ptr = Rc::as_ptr(node); + if let Some(&id) = self.ids.get(&ptr) { + return id; + } + let children: Vec = node.children().into_iter().map(|c| self.build(c)).collect(); + let (label, mut detail) = shape(node, &self.ids); + if let serde_json::Value::Object(map) = &mut detail { + if let Some(timing) = node.timing { + map.insert("timing".into(), serde_json::json!(timing.as_str())); + } + if let Some(guarantee) = &node.guarantee { + if let Ok(value) = serde_json::to_value(guarantee) { + map.insert("guarantee".into(), value); + } + } + } + let hash = structural_hash(node, &mut self.cache); + self.cache.insert(ptr, hash); + let id = self.nodes.len() as u32; + self.nodes.push(DAGNode { + id, + kind: node.operator.kind_name(), + label, + detail, + schema: serde_json::to_value(&node.schema).ok(), + children, + workload_node_id: None, + hash: Some(hash), + source_node: Some(Rc::clone(node)), + source_ptr: Some(ptr as usize), + notes: Vec::new(), + decision: None, + }); + self.ids.insert(ptr, id); + id + } } -/// The [`build_summary`]/[`build_summary_hybrid`] counterpart of [`build`] -/// for a bound [`SummaryNode`] reached while building -/// [`export_post_asap`]'s merged DAG: appends into the *same* `nodes: -/// Vec` list `build` itself is filling, instead of a separate -/// [`SummaryDAG`]. A `KeepPreAsap(inner)` leaf recurses back into -/// [`build`] on `inner` (the general pre-ASAP entry, `find_winner` included) -/// rather than nesting a `{"pre_asap_sub_dag": ...}` blob the way -/// [`build_summary`] does — so the merged DAG reads as one seamless DAG -/// with no dead ends, and so a target reachable underneath a `KeepPreAsap` -/// wrapper (a nested aggregate a strategy independently found a -/// replacement for, say) still gets spliced in correctly. -fn build_summary_hybrid( - node: &SummaryNode, - nodes: &mut Vec, - cache: &mut HashCache, - find_winner: &mut dyn FnMut(&QueryExpr) -> Option, -) -> u32 { - if let SummaryExpr::KeepPreAsap(inner) = &node.expr { - return build(inner, nodes, cache, find_winner); - } - let children: Vec = summary_children(&node.expr) - .into_iter() - .map(|child| build_summary_hybrid(child, nodes, cache, find_winner)) - .collect(); - let (kind, label, mut detail) = summary_shape(&node.expr); - // The merged DAG's `DAGNode` has no dedicated guarantee field (it is - // the pre-ASAP node shape); the guarantee rides in `detail` under the - // same key/shape `SummaryDAGNode::guarantee` uses, additively. - if let Some(guarantee) = &node.guarantee { - if let (serde_json::Value::Object(map), Ok(value)) = - (&mut detail, serde_json::to_value(guarantee)) - { - map.insert("guarantee".into(), value); - } +/// [`Operator::kind_name`] in snake_case, for [`SummaryDAGNode::kind`]. +/// Exhaustive so a new operator variant fails to compile here until it is +/// named. +fn snake_case_kind(operator: &Operator) -> &'static str { + match operator { + Operator::NonASAP(op) => match op { + NonASAPOp::Scan { .. } => "scan", + NonASAPOp::Values { .. } => "values", + NonASAPOp::Filter { .. } => "filter", + NonASAPOp::Project { .. } => "project", + NonASAPOp::Aggregate { .. } => "aggregate", + NonASAPOp::Join { .. } => "join", + NonASAPOp::SetOp { .. } => "set_op", + NonASAPOp::Concat { .. } => "concat", + NonASAPOp::Dedup { .. } => "dedup", + NonASAPOp::Sort { .. } => "sort", + NonASAPOp::Limit { .. } => "limit", + NonASAPOp::BinaryOp { .. } => "binary_op", + NonASAPOp::SQLWindowFunc { .. } => "sql_window_func", + NonASAPOp::TimeRange { .. } => "time_range", + NonASAPOp::TimeShift { .. } => "time_shift", + NonASAPOp::PromqlVectorFromScalar(_) => "promql_vector_from_scalar", + NonASAPOp::PromqlRelabel { .. } => "promql_relabel", + NonASAPOp::PromqlInfoEnrich { .. } => "promql_info_enrich", + NonASAPOp::PromqlSeriesSample { .. } => "promql_series_sample", + NonASAPOp::PromqlSubquery { .. } => "promql_subquery", + }, + Operator::ASAP(op) => match op { + ASAPOp::SummaryAgg { .. } => "summary_agg", + ASAPOp::SummaryEstimate { .. } => "summary_estimate", + ASAPOp::FinalizeExactAccumulator { .. } => "finalize_exact_accumulator", + ASAPOp::MaintainPopulation { .. } => "maintain_population", + ASAPOp::EvaluatePopulation { .. } => "read_population", + ASAPOp::SummaryMerge { .. } => "summary_merge", + ASAPOp::SummarySubtract { .. } => "summary_subtract", + ASAPOp::SummaryDelete { .. } => "summary_delete", + ASAPOp::SummaryJoin { .. } => "summary_join", + ASAPOp::Extension { .. } => "extension", + }, } - let id = push_summary_originated_node(nodes, kind, label, detail, children); - nodes[id as usize].schema = Some(summary_schema_json(&node.schema)); - id } -fn summary_schema_json(schema: &crate::post_asap::Schema) -> serde_json::Value { - serde_json::json!({ - "fields": schema.fields.iter().map(|field| serde_json::json!({ - "name": field.name, - "dtype": format!("{:?}", field.dtype), - "nullable": field.nullable, - })).collect::>(), - "time_index": schema.time_index, - }) +/// A short, human-readable label for a [`FieldDataType`] (e.g. +/// `"Sketch(Kll)"`, `"ExactAggregate(Sum)"`) — for the label text on a +/// `SummaryAgg`/`SummaryJoin` node. Every variant is covered, via `Debug` +/// for the inner kind rather than hand-written prose per algorithm. +fn family_label(family: &FieldDataType) -> String { + match family { + FieldDataType::Plain(dtype) => format!("Plain({dtype:?})"), + FieldDataType::ExactAggregate(kind, _) => format!("ExactAggregate({kind:?})"), + FieldDataType::Sketch(kind, _grouping) => format!("Sketch({:?})", kind.algorithm()), + FieldDataType::Sample(kind, _) => format!("Sample({kind:?})"), + FieldDataType::Wavelet(kind, _) => format!("Wavelet({kind:?})"), + FieldDataType::StatModel(kind, _) => format!("StatModel({kind:?})"), + } } fn source_label(source: &Source) -> String { @@ -998,407 +724,336 @@ fn source_label(source: &Source) -> String { } } -/// Recursively flatten `expr`, appending nodes to `nodes` in post-order -/// (children pushed before their parent), and return the id of the pushed -/// root node. Exhaustive over every **operator** `QueryExpr` variant — a new -/// one fails to compile here until this match is extended, matching the rest -/// of the IR's exhaustive-match style (e.g. `output_schema`). The scalar -/// variants (issue #205) are never passed to `build` directly: every operator -/// arm that carries one (`Filter.pred`, `Project.cols`, `Aggregate.having`, …) -/// serializes it as opaque `detail` JSON via `Predicate`/`ProjectItem`/ -/// `AggIntent`'s own `Serialize` impl, same as before the merge — a scalar -/// sub-DAG was never a separate DAG node, so this doesn't change that. -/// -/// `find_winner` is [`export_post_asap`]'s substitution seam, threaded -/// through every recursive call (including [`export`]'s own, which always -/// passes a closure that returns `None`) so both entry points share this -/// exact traversal instead of maintaining two copies of it. `build` itself -/// only ever calls `find_winner` once, right here at the top, before -/// dispatching into the ordinary per-variant match below — see -/// [`export_post_asap`]'s own doc for why a substitution's own immediate -/// result is rendered via that match directly (recursing into its children -/// through `build` again, so *they* still get a fresh `find_winner` call) -/// rather than by looping back through this check a second time. -fn build( - expr: &QueryExpr, - nodes: &mut Vec, - cache: &mut HashCache, - find_winner: &mut dyn FnMut(&QueryExpr) -> Option, -) -> u32 { - match find_winner(expr) { - Some(PostAsapSubstitution::Rewrite { - replacement, - decision, - }) => { - let first = nodes.len(); - let root = build_no_recheck(&replacement, nodes, cache, find_winner); - for node in &mut nodes[first..] { - if node.decision.is_none() { - let mut node_decision = decision.clone(); - node_decision.role = if node.id == root { - "replacement_root" - } else { - "replacement_region" - }; - node.decision = Some(node_decision); - } +/// `(label, detail)` for one node: its own fields, never its children. +/// Exhaustive over every operator variant — a new one fails to compile +/// here until this match is extended, matching the rest of the IR's +/// exhaustive-match style. Scalar expressions are rendered through +/// [`scalar_json`] with `ids` resolving their operator references. +fn shape( + node: &OperatorNode, + ids: &HashMap<*const OperatorNode, u32>, +) -> (String, serde_json::Value) { + let scalar = |expr: &ScalarExpr| scalar_json(expr, ids); + let scalars = + |exprs: &[ScalarExpr]| -> Vec { exprs.iter().map(scalar).collect() }; + let predicate = |pred: &crate::ir::Predicate| scalar(&pred.0); + let sort_keys = |keys: &[crate::ir::SortKey]| -> Vec { + keys.iter() + .map(|key| { + serde_json::json!({ + "expr": scalar(&key.expr), + "ascending": key.ascending, + "nulls_first": key.nulls_first, + }) + }) + .collect() + }; + match &node.operator { + Operator::NonASAP(op) => match op { + NonASAPOp::Scan { + source, + predicates, + schema, + } => ( + format!("Scan({})", source_label(source)), + serde_json::json!({ + "source": source, + "predicates": predicates.iter().map(predicate).collect::>(), + "schema": schema, + }), + ), + NonASAPOp::Values { rows, schema } => ( + format!("Values({} rows)", rows.len()), + serde_json::json!({ + "rows": rows.iter().map(|row| scalars(row)).collect::>(), + "schema": schema, + }), + ), + NonASAPOp::Filter { pred, .. } => ( + "Filter".into(), + serde_json::json!({ "pred": predicate(pred) }), + ), + NonASAPOp::Project { + cols, qualifier, .. + } => ( + format!("Project({} cols)", cols.len()), + serde_json::json!({ + "cols": cols.iter().map(|item| serde_json::json!({ + "alias": item.alias, + "expr": scalar(&item.expr), + })).collect::>(), + "qualifier": qualifier, + }), + ), + NonASAPOp::Aggregate { + reduction, + measures, + output_names, + having, + .. + } => ( + format!("Aggregate({} measures)", measures.len()), + serde_json::json!({ + "reduction": reduction, + "measures": measures, + "output_names": output_names, + "having": having.as_ref().map(predicate), + }), + ), + NonASAPOp::Join { kind, pred, .. } => ( + format!("Join({kind:?})"), + serde_json::json!({ "kind": kind, "pred": predicate(pred) }), + ), + NonASAPOp::SetOp { kind, all, .. } => ( + format!("SetOp({kind:?})"), + serde_json::json!({ "kind": kind, "all": all }), + ), + NonASAPOp::Concat { + children, + discriminator_unique_key, + } => ( + format!("Concat({} branches)", children.len()), + serde_json::json!({ "discriminator_unique_key": discriminator_unique_key }), + ), + NonASAPOp::Dedup { cols, .. } => ( + format!("Dedup({} cols)", cols.len()), + serde_json::json!({ "cols": cols }), + ), + NonASAPOp::Sort { + keys, partition_by, .. + } => ( + format!("Sort({} keys)", keys.len()), + serde_json::json!({ "keys": sort_keys(keys), "partition_by": partition_by }), + ), + NonASAPOp::Limit { + n, + offset, + partition_by, + .. + } => ( + match n { + Some(n) => format!("Limit({n})"), + None => format!("Limit(offset {offset})"), + }, + serde_json::json!({ "n": n, "offset": offset, "partition_by": partition_by }), + ), + NonASAPOp::BinaryOp { + operator, + return_bool, + .. + } => ( + format!("BinaryOp({})", operator.kind), + serde_json::json!({ + "op": operator.kind.to_string(), + "vector_match": operator.vector_match, + "checked_relative_division": operator.checked_relative_division, + "checked_finite_division": operator.checked_finite_division, + "return_bool": return_bool, + }), + ), + NonASAPOp::SQLWindowFunc { + func, + args, + partition_by, + order_by, + frame, + output_name, + .. + } => ( + format!("SQLWindowFunc({func:?})"), + serde_json::json!({ + "func": func, + "args": scalars(args), + "partition_by": partition_by, + "order_by": sort_keys(order_by), + "frame": frame, + "output_name": output_name, + }), + ), + NonASAPOp::TimeRange { range, kind, .. } => ( + format!("TimeRange({kind:?}, {range:?})"), + serde_json::json!({ "range": range, "kind": kind }), + ), + NonASAPOp::TimeShift { shift, .. } => { + ("TimeShift".into(), serde_json::json!({ "shift": shift })) } - return root; - } - Some(PostAsapSubstitution::Summary { - replacement, - decision, - }) => { - let first = nodes.len(); - let root = build_summary_hybrid(&replacement, nodes, cache, find_winner); - for node in &mut nodes[first..] { - if node.decision.is_none() { - let mut node_decision = decision.clone(); - node_decision.role = if node.id == root { - "replacement_root" - } else { - "replacement_region" - }; - node.decision = Some(node_decision); - } + NonASAPOp::PromqlVectorFromScalar(value) => ( + "vector()".into(), + serde_json::json!({ "value": scalar(value) }), + ), + NonASAPOp::PromqlRelabel { dst, value, .. } => ( + format!("PromqlRelabel(dst={dst})"), + serde_json::json!({ "dst": dst, "value": scalar(value) }), + ), + NonASAPOp::PromqlInfoEnrich { selector, .. } => ( + "PromqlInfoEnrich".into(), + serde_json::json!({ "selector": selector }), + ), + NonASAPOp::PromqlSeriesSample { by, kind, .. } => ( + format!("PromqlSeriesSample({kind:?})"), + serde_json::json!({ "by": by, "kind": kind }), + ), + NonASAPOp::PromqlSubquery { + range, resolution, .. + } => ( + "PromqlSubquery".into(), + serde_json::json!({ "range": range, "resolution": resolution }), + ), + }, + Operator::ASAP(op) => match op { + ASAPOp::SummaryAgg { + family, + input, + reduction, + grouping, + .. + } => ( + format!("SummaryAgg({})", family_label(family)), + serde_json::json!({ + "family": format!("{family:?}"), + "input": input, + "reduction": reduction, + "grouping": format!("{grouping:?}"), + }), + ), + ASAPOp::SummaryEstimate { query, .. } => ( + format!("SummaryEstimate({query:?})"), + serde_json::json!({ "query": format!("{query:?}") }), + ), + ASAPOp::FinalizeExactAccumulator { .. } => { + ("FinalizeExactAccumulator".into(), serde_json::json!({})) } - return root; - } - None => {} + ASAPOp::MaintainPopulation { population, .. } => ( + format!("MaintainPopulation(max_k={})", population.max_k), + serde_json::json!({ "population": population }), + ), + ASAPOp::EvaluatePopulation { evaluation, .. } => ( + format!("EvaluatePopulation({evaluation:?})"), + serde_json::json!({ "evaluation": evaluation }), + ), + ASAPOp::SummaryMerge { children } => ( + format!("SummaryMerge({} children)", children.len()), + serde_json::json!({}), + ), + ASAPOp::SummarySubtract { .. } => ("SummarySubtract".into(), serde_json::json!({})), + ASAPOp::SummaryDelete { key, .. } => { + ("SummaryDelete".into(), serde_json::json!({ "key": key })) + } + ASAPOp::SummaryJoin { key, family, .. } => ( + format!("SummaryJoin({})", family_label(family)), + serde_json::json!({ "key": key, "family": format!("{family:?}") }), + ), + ASAPOp::Extension { name, .. } => ( + format!("Extension({name})"), + serde_json::json!({ "name": name }), + ), + }, } - build_no_recheck(expr, nodes, cache, find_winner) } -/// The actual per-variant match [`build`] dispatches to once it has decided -/// (by consulting `find_winner` exactly once) which `QueryExpr` value to -/// render at this position — either `expr` itself (unchanged), or a winning -/// `Replacement::Rewrite`'s own target. Every recursive call here goes back -/// through [`build`] (not this function), so every child gets its own fresh -/// `find_winner` query. -fn build_no_recheck( - expr: &QueryExpr, - nodes: &mut Vec, - cache: &mut HashCache, - find_winner: &mut dyn FnMut(&QueryExpr) -> Option, -) -> u32 { +/// `{"scalar_ref": }` for an operator node a scalar expression reads. +/// The node is one of the owning operator's children, so it has already +/// been exported by the time its parent's `detail` is built. +fn scalar_ref( + node: &Rc, + ids: &HashMap<*const OperatorNode, u32>, +) -> serde_json::Value { + serde_json::json!({ "scalar_ref": ids.get(&Rc::as_ptr(node)).copied() }) +} + +/// `expr` as JSON in `ScalarExpr`'s own serde shape (externally tagged +/// variants), except that every operator reference is rendered via +/// [`scalar_ref`] instead of inlining the referenced sub-DAG. Exhaustive so +/// a new variant fails to compile here until it is rendered. +fn scalar_json(expr: &ScalarExpr, ids: &HashMap<*const OperatorNode, u32>) -> serde_json::Value { + let sub = |e: &ScalarExpr| scalar_json(e, ids); + let list = |es: &[ScalarExpr]| -> Vec { es.iter().map(sub).collect() }; match expr { - QueryExpr::Scan { - source, - predicates, - schema, - } => { - let label = format!("Scan({})", source_label(source)); - let detail = serde_json::json!({ - "source": source, - "predicates": predicates, - "schema": schema, - }); - push_node(nodes, expr, cache, label, detail, vec![]) - } - // The bridged child is a scalar-sub-language node (issue #220), not - // an operator node `build` can recurse into — serialize it as opaque - // `detail` JSON, same as every other scalar-typed field - // (`Filter.pred`, `Project.cols`, …) rather than pushing it as a - // separate DAG node. - QueryExpr::PromqlScalarBridge(inner) => { - let detail = serde_json::json!({ "value": inner }); - push_node( - nodes, - expr, - cache, - format!("PromqlScalarBridge({inner:?})"), - detail, - vec![], - ) - } - QueryExpr::EvalTimestamp => push_node( - nodes, - expr, - cache, - "EvalTimestamp".into(), - serde_json::json!({}), - vec![], - ), - QueryExpr::CurrentTimestamp => push_node( - nodes, - expr, - cache, - "CurrentTimestamp".into(), - serde_json::json!({}), - vec![], - ), - QueryExpr::PromqlVectorFromScalar(child) => { - let c = build(child, nodes, cache, find_winner); - push_node( - nodes, - expr, - cache, - "vector()".into(), - serde_json::json!({}), - vec![c], - ) - } - QueryExpr::PromqlScalarFromVector(child) => { - let c = build(child, nodes, cache, find_winner); - push_node( - nodes, - expr, - cache, - "scalar()".into(), - serde_json::json!({}), - vec![c], - ) - } - QueryExpr::PromqlRelabel { dst, value, child } => { - let c = build(child, nodes, cache, find_winner); - let detail = serde_json::json!({ "dst": dst, "value": value }); - push_node( - nodes, - expr, - cache, - format!("PromqlRelabel(dst={dst})"), - detail, - vec![c], - ) - } - QueryExpr::PromqlInfoEnrich { selector, child } => { - let c = build(child, nodes, cache, find_winner); - let detail = serde_json::json!({ "selector": selector }); - push_node( - nodes, - expr, - cache, - "PromqlInfoEnrich".into(), - detail, - vec![c], - ) - } - QueryExpr::PromqlSeriesSample { by, kind, child } => { - let c = build(child, nodes, cache, find_winner); - let detail = serde_json::json!({ "by": by, "kind": kind }); - push_node( - nodes, - expr, - cache, - format!("PromqlSeriesSample({kind:?})"), - detail, - vec![c], - ) - } - QueryExpr::Filter { pred, child } => { - let c = build(child, nodes, cache, find_winner); - let detail = serde_json::json!({ "pred": pred }); - push_node(nodes, expr, cache, "Filter".into(), detail, vec![c]) - } - QueryExpr::Project { - cols, - qualifier, - child, - } => { - let c = build(child, nodes, cache, find_winner); - let detail = serde_json::json!({ "cols": cols, "qualifier": qualifier }); - push_node( - nodes, - expr, - cache, - format!("Project({} cols)", cols.len()), - detail, - vec![c], - ) - } - QueryExpr::Aggregate { - reduction, - measures, - output_names, - filters, - having, - child, - } => { - let c = build(child, nodes, cache, find_winner); - let detail = serde_json::json!({ - "reduction": reduction, - "measures": measures, - "output_names": output_names, - "filters": filters, - "having": having, - }); - push_node( - nodes, - expr, - cache, - format!("Aggregate({} measures)", measures.len()), - detail, - vec![c], - ) - } - QueryExpr::Dedup { cols, child } => { - let c = build(child, nodes, cache, find_winner); - let detail = serde_json::json!({ "cols": cols }); - push_node( - nodes, - expr, - cache, - format!("Dedup({} cols)", cols.len()), - detail, - vec![c], - ) - } - QueryExpr::Concat { - children, - discriminator_unique_key, - } => { - let ids: Vec = children - .iter() - .map(|c| build(c, nodes, cache, find_winner)) - .collect(); - let label = format!("Concat({} branches)", ids.len()); - let detail = - serde_json::json!({ "discriminator_unique_key": discriminator_unique_key }); - push_node(nodes, expr, cache, label, detail, ids) - } - QueryExpr::Join { - kind, - pred, + ScalarExpr::Column(id) => serde_json::json!({ "Column": id }), + ScalarExpr::Literal(value) => serde_json::json!({ "Literal": value }), + ScalarExpr::Negative { expr, semantics } => serde_json::json!({ + "Negative": { "expr": sub(expr), "semantics": semantics } + }), + ScalarExpr::Compare { left, + op, right, - } => { - let l = build(left, nodes, cache, find_winner); - let r = build(right, nodes, cache, find_winner); - let detail = serde_json::json!({ "kind": kind, "pred": pred }); - push_node( - nodes, - expr, - cache, - format!("Join({kind:?})"), - detail, - vec![l, r], - ) - } - QueryExpr::SetOp { - kind, - all, + semantics, + } => serde_json::json!({ + "Compare": { + "left": sub(left), + "op": op, + "right": sub(right), + "semantics": semantics, + } + }), + ScalarExpr::BoolAnd(parts) => serde_json::json!({ "BoolAnd": list(parts) }), + ScalarExpr::BoolOr(parts) => serde_json::json!({ "BoolOr": list(parts) }), + ScalarExpr::Not(e) => serde_json::json!({ "Not": sub(e) }), + ScalarExpr::IsNull(e) => serde_json::json!({ "IsNull": sub(e) }), + ScalarExpr::IsNotNull(e) => serde_json::json!({ "IsNotNull": sub(e) }), + ScalarExpr::Cast { expr, to, try_cast } => serde_json::json!({ + "Cast": { "expr": sub(expr), "to": to, "try_cast": try_cast } + }), + ScalarExpr::InList { + expr, + list: items, + negated, + } => serde_json::json!({ + "InList": { "expr": sub(expr), "list": list(items), "negated": negated } + }), + ScalarExpr::FunctionCall { name, args } => serde_json::json!({ + "FunctionCall": { "name": name, "args": list(args) } + }), + ScalarExpr::Arithmetic { + op, left, right, - } => { - let l = build(left, nodes, cache, find_winner); - let r = build(right, nodes, cache, find_winner); - let detail = serde_json::json!({ "kind": kind, "all": all }); - push_node( - nodes, - expr, - cache, - format!("SetOp({kind:?})"), - detail, - vec![l, r], - ) - } - QueryExpr::Sort { - keys, - partition_by, - child, - } => { - let c = build(child, nodes, cache, find_winner); - let detail = serde_json::json!({ "keys": keys, "partition_by": partition_by }); - push_node( - nodes, - expr, - cache, - format!("Sort({} keys)", keys.len()), - detail, - vec![c], - ) - } - QueryExpr::Limit { n, offset, child } => { - let c = build(child, nodes, cache, find_winner); - let detail = serde_json::json!({ "n": n, "offset": offset }); - push_node(nodes, expr, cache, format!("Limit({n})"), detail, vec![c]) - } - QueryExpr::PromqlSubquery { - range, - resolution, - child, - } => { - let c = build(child, nodes, cache, find_winner); - let detail = serde_json::json!({ "range": range, "resolution": resolution }); - push_node(nodes, expr, cache, "PromqlSubquery".into(), detail, vec![c]) - } - QueryExpr::TimeRange { range, child } => { - let c = build(child, nodes, cache, find_winner); - let detail = serde_json::json!({ "range": range }); - push_node( - nodes, - expr, - cache, - format!("TimeRange({range:?})"), - detail, - vec![c], - ) - } - QueryExpr::TimeShift { shift, child } => { - let c = build(child, nodes, cache, find_winner); - let detail = serde_json::json!({ "shift": shift }); - push_node(nodes, expr, cache, "TimeShift".into(), detail, vec![c]) - } - QueryExpr::SQLWindowFunc { - func, - args, - partition_by, - order_by, - frame, - output_name, - child, - } => { - let c = build(child, nodes, cache, find_winner); - let detail = serde_json::json!({ - "func": func, - "args": args, - "partition_by": partition_by, - "order_by": order_by, - "frame": frame, - "output_name": output_name, - }); - push_node( - nodes, - expr, - cache, - format!("SQLWindowFunc({func:?})"), - detail, - vec![c], - ) - } - QueryExpr::BinaryOp { - op, - lhs, - rhs, - vector_match, - } => { - let l = build(lhs, nodes, cache, find_winner); - let r = build(rhs, nodes, cache, find_winner); - let detail = serde_json::json!({ "op": op.to_string(), "vector_match": vector_match }); - push_node( - nodes, - expr, - cache, - format!("BinaryOp({op})"), - detail, - vec![l, r], - ) - } - other @ (QueryExpr::Column(_) - | QueryExpr::Literal(_) - | QueryExpr::Compare { .. } - | QueryExpr::BoolAnd(_) - | QueryExpr::BoolOr(_) - | QueryExpr::Not(_) - | QueryExpr::IsNull(_) - | QueryExpr::IsNotNull(_) - | QueryExpr::Cast { .. } - | QueryExpr::InList { .. } - | QueryExpr::FunctionCall { .. } - | QueryExpr::Arithmetic { .. } - | QueryExpr::Case { .. }) => { - unreachable!("dag_export::build reached a scalar QueryExpr variant directly: {other:?}") - } + semantics, + } => serde_json::json!({ + "Arithmetic": { + "op": op, + "left": sub(left), + "right": sub(right), + "semantics": semantics, + } + }), + ScalarExpr::Case { + operand, + branches, + else_expr, + } => serde_json::json!({ + "Case": { + "operand": operand.as_deref().map(sub), + "branches": branches + .iter() + .map(|(when, then)| serde_json::json!([sub(when), sub(then)])) + .collect::>(), + "else_expr": else_expr.as_deref().map(sub), + } + }), + ScalarExpr::CurrentTimestamp => serde_json::json!("CurrentTimestamp"), + ScalarExpr::EvalTimestamp => serde_json::json!("EvalTimestamp"), + ScalarExpr::PromqlScalarFromVector(node) => serde_json::json!({ + "PromqlScalarFromVector": scalar_ref(node, ids) + }), + ScalarExpr::ScalarSubquery(node) => serde_json::json!({ + "ScalarSubquery": scalar_ref(node, ids) + }), + ScalarExpr::Exists { subquery, negated } => serde_json::json!({ + "Exists": { "subquery": scalar_ref(subquery, ids), "negated": negated } + }), + ScalarExpr::InSubquery { + expr, + subquery, + negated, + } => serde_json::json!({ + "InSubquery": { + "expr": sub(expr), + "subquery": scalar_ref(subquery, ids), + "negated": negated, + } + }), } } @@ -1407,14 +1062,20 @@ mod tests { use std::rc::Rc; use super::*; + use crate::ir::operator_properties::{GroupKeys, JoinKind, Reduction}; + use crate::ir::Predicate; + use crate::post_asap::{ + BoundExpr, CompositionOperator, ErrorMetric, GroupingStrategy, GuaranteeSource, + ProbabilityExpr, SketchAlgorithm, SketchKind, SketchParams, SketchStatistic, SummaryUpdate, + }; use crate::pre_asap::agg_intent::AggIntent; - use crate::pre_asap::expr_ir::ScalarValue; - use crate::pre_asap::query_expr::{GroupKeys, Predicate, Reduction}; + use crate::pre_asap::expr_ir::{ColumnRef, ScalarValue}; use crate::pre_asap::schema::{DataType, Field, Schema}; + use crate::types::AccuracyTarget; - fn scan(table: &str, columns: Vec) -> QueryExpr { - QueryExpr::Scan { + fn scan(table: &str, columns: Vec) -> Rc { + OperatorNode::new_shared(crate::ir::Operator::NonASAP(NonASAPOp::Scan { source: Source::Table { table_ref: table.into(), }, @@ -1425,25 +1086,95 @@ mod tests { unique_keys: vec![], closed: true, }, - } + })) + .unwrap() } fn value_col() -> Vec { vec![Field::plain("value", DataType::Float64, false)] } + fn true_pred() -> Predicate { + Predicate(ScalarExpr::Literal(ScalarValue::Boolean(true))) + } + + fn count_agg(child: Rc) -> Rc { + OperatorNode::new_shared(crate::ir::Operator::NonASAP(NonASAPOp::Aggregate { + reduction: Reduction::Reduce(GroupKeys::none()), + measures: vec![AggIntent::Count { + accuracy: AccuracyTarget::Exact, + }], + output_names: vec![], + filters: vec![], + having: None, + child, + })) + .unwrap() + } + + fn join(left: Rc, right: Rc) -> Rc { + OperatorNode::new_shared(crate::ir::Operator::NonASAP(NonASAPOp::Join { + kind: JoinKind::Inner, + pred: true_pred(), + left, + right, + })) + .unwrap() + } + + /// A KLL `SummaryAgg` over `leaf`'s `v` column, read out as a quantile. + fn quantile_evaluation( + leaf: Rc, + guarantee: Option, + ) -> (Rc, Rc) { + let family = FieldDataType::Sketch( + SketchKind::new(SketchAlgorithm::Kll, SketchParams::Kll { k: 40 }), + GroupingStrategy::default(), + ); + let agg = std::rc::Rc::new( + OperatorNode::with_schema( + crate::ir::Operator::ASAP(ASAPOp::SummaryAgg { + child: leaf, + family: family.clone(), + input: SummaryUpdate::column(ColumnRef::Named("v".into())), + reduction: Reduction::by(vec![]), + grouping: GroupingStrategy::default(), + filter: None, + }), + Schema::lifted(vec![Field::new("state", family, false)], None), + ) + .with_guarantee(None), + ); + let evaluation = std::rc::Rc::new( + OperatorNode::with_schema( + crate::ir::Operator::ASAP(ASAPOp::SummaryEstimate { + summary_input: Rc::clone(&agg), + query: SketchStatistic::Quantile { q: 0.99 }, + }), + Schema::lifted( + vec![Field::plain("quantile", DataType::Float64, false)], + None, + ), + ) + .with_guarantee(guarantee), + ); + (agg, evaluation) + } + #[test] fn leaf_scan_is_a_single_node() { let dag = export(&scan("metrics", value_col())); assert_eq!(dag.nodes.len(), 1); assert_eq!(dag.root, 0); assert_eq!(dag.nodes[0].kind, "Scan"); + assert_eq!(dag.nodes[0].label, "Scan(metrics)"); assert!(dag.nodes[0].children.is_empty()); + assert!(dag.nodes[0].source_node.is_some()); } /// `export` itself never populates higher-layer annotations. Empty - /// annotations must not appear in serialized JSON, so ordinary (non-ASAP) - /// exports retain their existing shape. + /// annotations must not appear in serialized JSON, so ordinary exports + /// retain their existing shape. #[test] fn export_omits_empty_higher_layer_annotations() { let dag = export(&scan("metrics", value_col())); @@ -1460,6 +1191,10 @@ mod tests { !json.contains("decision"), "empty `decision` must be skipped, not serialized as `null`: {json}" ); + assert!( + !json.contains("source_node"), + "`source_node` is in-process only: {json}" + ); let dag_json = serde_json::to_string(&dag).unwrap(); assert!( !dag_json.contains("edge_annotations"), @@ -1473,22 +1208,29 @@ mod tests { // single child slot) share the exact same `Rc` Scan — // `export_post_asap` must merge them onto one node id. Sharing alone // is not physical cost evidence, so no edge cost may be fabricated. - let shared_scan = Rc::new(scan("metrics", value_col())); - let left_branch = QueryExpr::Dedup { - cols: vec![0], - child: Rc::clone(&shared_scan), - }; - let right_branch = QueryExpr::Limit { - n: 5, - offset: 0, - child: Rc::clone(&shared_scan), - }; - let root = QueryExpr::Concat { + let shared_scan = scan("metrics", value_col()); + let left_branch = + OperatorNode::new_shared(crate::ir::Operator::NonASAP(NonASAPOp::Dedup { + cols: vec![0], + child: Rc::clone(&shared_scan), + })) + .unwrap(); + let right_branch = + OperatorNode::new_shared(crate::ir::Operator::NonASAP(NonASAPOp::Limit { + n: Some(5), + offset: 0, + partition_by: GroupKeys::none(), + child: Rc::clone(&shared_scan), + })) + .unwrap(); + let root = OperatorNode::new_shared(crate::ir::Operator::NonASAP(NonASAPOp::Concat { children: vec![left_branch, right_branch], discriminator_unique_key: None, - }; + })) + .unwrap(); let dag = export_post_asap(&root, &mut |_| None); + assert_eq!(dag.nodes.len(), 4, "Scan, Dedup, Limit, Concat"); assert_eq!( dag.nodes.iter().filter(|n| n.kind == "Scan").count(), 1, @@ -1497,20 +1239,15 @@ mod tests { assert!(dag.edge_annotations.is_empty()); } - /// Regression test: a single parent referencing the same shared child - /// from two of its own operand slots at once (a `Join` whose left and - /// right sides are the exact same `Rc`, post pointer-dedup) is *one* - /// downstream consumer, not two — this must not inflate - /// produce an edge-cost annotation without explicit physical evidence. + /// A single parent referencing the same shared child from two of its + /// own operand slots at once (a `Join` whose left and right sides are + /// the exact same `Rc`) is *one* downstream consumer, not two — this + /// must not produce an edge-cost annotation without explicit physical + /// evidence. #[test] fn a_single_parent_referencing_a_shared_child_twice_is_one_consumer_not_two() { - let shared_scan = Rc::new(scan("metrics", value_col())); - let root = QueryExpr::Join { - kind: crate::pre_asap::query_expr::JoinKind::Inner, - pred: Predicate(Rc::new(QueryExpr::Literal(ScalarValue::Boolean(true)))), - left: Rc::clone(&shared_scan), - right: Rc::clone(&shared_scan), - }; + let shared_scan = scan("metrics", value_col()); + let root = join(Rc::clone(&shared_scan), Rc::clone(&shared_scan)); let dag = export_post_asap(&root, &mut |_| None); assert_eq!( @@ -1518,6 +1255,7 @@ mod tests { 1, "the shared Scan must be merged onto one node, not duplicated" ); + assert_eq!(dag.nodes[dag.root as usize].children, vec![0, 0]); assert!( dag.edge_annotations.is_empty(), "a single parent referencing the same child twice is one consumer, not a genuine \ @@ -1527,38 +1265,33 @@ mod tests { } #[test] - fn export_never_produces_edge_annotations_since_it_never_shares_nodes() { - // Plain `export` (no `export_post_asap`) never deduplicates by `Rc` - // pointer identity — even a workload-level shared sub-DAG renders as - // two independent DAG nodes here, so there is nothing to annotate. - let shared_scan = Rc::new(scan("metrics", value_col())); - let root = QueryExpr::Join { - kind: crate::pre_asap::query_expr::JoinKind::Inner, - pred: Predicate(Rc::new(QueryExpr::Literal(ScalarValue::Boolean(true)))), - left: Rc::clone(&shared_scan), - right: Rc::clone(&shared_scan), - }; - let dag = export(&root); - assert_eq!(dag.nodes.iter().filter(|n| n.kind == "Scan").count(), 2); + fn export_merges_pointer_shared_nodes_but_not_equal_copies() { + // Plain `export` deduplicates by `Rc` pointer identity: the same + // `Rc` reached twice is one node ... + let shared_scan = scan("metrics", value_col()); + let dag = export(&join(Rc::clone(&shared_scan), Rc::clone(&shared_scan))); + assert_eq!(dag.nodes.iter().filter(|n| n.kind == "Scan").count(), 1); assert!(dag.edge_annotations.is_empty()); + + // ... while two structurally equal but distinct `Rc`s stay two + // nodes (with equal hashes — that is CSE's job, not the export's). + let dag = export(&join( + scan("metrics", value_col()), + scan("metrics", value_col()), + )); + let scans: Vec<_> = dag.nodes.iter().filter(|n| n.kind == "Scan").collect(); + assert_eq!(scans.len(), 2); + assert_eq!(scans[0].hash, scans[1].hash); } #[test] fn chain_preserves_shape_and_child_links() { - let expr = QueryExpr::Filter { - pred: Predicate(Rc::new(QueryExpr::Literal(ScalarValue::Boolean(true)))), - child: Rc::new(QueryExpr::Aggregate { - reduction: Reduction::Reduce(GroupKeys::none()), - measures: vec![AggIntent::Count { - accuracy: AccuracyTarget::Exact, - }], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(scan("metrics", value_col())), - }), - }; - let dag = export(&expr); + let root = OperatorNode::new_shared(crate::ir::Operator::NonASAP(NonASAPOp::Filter { + pred: true_pred(), + child: count_agg(scan("metrics", value_col())), + })) + .unwrap(); + let dag = export(&root); assert_eq!(dag.nodes.len(), 3, "Filter -> Aggregate -> Scan"); let filter = &dag.nodes[dag.root as usize]; @@ -1567,6 +1300,7 @@ mod tests { let agg = &dag.nodes[filter.children[0] as usize]; assert_eq!(agg.kind, "Aggregate"); + assert_eq!(agg.label, "Aggregate(1 measures)"); assert_eq!(agg.children.len(), 1); let leaf = &dag.nodes[agg.children[0] as usize]; @@ -1576,18 +1310,76 @@ mod tests { #[test] fn merge_keeps_every_branch_as_a_child() { - let expr = QueryExpr::concat(vec![ - scan("a", value_col()), - scan("b", value_col()), - scan("c", value_col()), - ]); - let dag = export(&expr); + let root = OperatorNode::new_shared(crate::ir::Operator::NonASAP(NonASAPOp::Concat { + children: vec![ + scan("a", value_col()), + scan("b", value_col()), + scan("c", value_col()), + ], + discriminator_unique_key: None, + })) + .unwrap(); + let dag = export(&root); assert_eq!(dag.nodes.len(), 4, "3 branches + the Concat node"); let merge = &dag.nodes[dag.root as usize]; assert_eq!(merge.kind, "Concat"); assert_eq!(merge.children.len(), 3); } + /// An operator node read from a scalar expression is a child of the + /// owning operator (after its operator inputs), and the expression's + /// `detail` points at it by id instead of inlining it. + #[test] + fn scalar_operator_references_are_children_rendered_as_scalar_refs() { + let subquery = scan("other", value_col()); + let root = OperatorNode::new_shared(crate::ir::Operator::NonASAP(NonASAPOp::Filter { + pred: Predicate(ScalarExpr::Exists { + subquery: Rc::clone(&subquery), + negated: false, + }), + child: scan("metrics", value_col()), + })) + .unwrap(); + let dag = export(&root); + assert_eq!(dag.nodes.len(), 3); + let filter = &dag.nodes[dag.root as usize]; + assert_eq!( + filter.children.len(), + 2, + "operator input, then the scalar reference" + ); + let input = &dag.nodes[filter.children[0] as usize]; + let referenced = &dag.nodes[filter.children[1] as usize]; + assert_eq!(input.label, "Scan(metrics)"); + assert_eq!(referenced.label, "Scan(other)"); + assert_eq!( + filter.detail["pred"]["Exists"]["subquery"]["scalar_ref"], + serde_json::json!(referenced.id) + ); + assert_eq!(filter.detail["pred"]["Exists"]["negated"], false); + let json = serde_json::to_string(&filter.detail).unwrap(); + assert!( + !json.contains("other"), + "the referenced sub_dag must not be inlined into detail: {json}" + ); + } + + #[test] + fn limit_without_n_is_offset_only() { + let root = OperatorNode::new_shared(crate::ir::Operator::NonASAP(NonASAPOp::Limit { + n: None, + offset: 3, + partition_by: GroupKeys::none(), + child: scan("metrics", value_col()), + })) + .unwrap(); + let dag = export(&root); + let limit = &dag.nodes[dag.root as usize]; + assert_eq!(limit.label, "Limit(offset 3)"); + assert_eq!(limit.detail["n"], serde_json::Value::Null); + assert_eq!(limit.detail["offset"], 3); + } + #[test] fn identical_sub_dags_hash_equal_and_differing_ones_dont() { let left = scan("metrics", value_col()); @@ -1615,17 +1407,18 @@ mod tests { // Two roots that each wrap the *same* Scan shape in a different outer // node — the exported hash should still flag the shared Scan even // though it's embedded at different depths / under different parents. - let shared_shape = || scan("metrics", value_col()); - - let q1 = QueryExpr::Limit { - n: 10, + let q1 = OperatorNode::new_shared(crate::ir::Operator::NonASAP(NonASAPOp::Limit { + n: Some(10), offset: 0, - child: Rc::new(shared_shape()), - }; - let q2 = QueryExpr::Dedup { + partition_by: GroupKeys::none(), + child: scan("metrics", value_col()), + })) + .unwrap(); + let q2 = OperatorNode::new_shared(crate::ir::Operator::NonASAP(NonASAPOp::Dedup { cols: vec![0], - child: Rc::new(shared_shape()), - }; + child: scan("metrics", value_col()), + })) + .unwrap(); let g1 = export(&q1); let g2 = export(&q2); @@ -1647,9 +1440,9 @@ mod tests { fn root_hash_matches_cse_structural_hash_for_the_same_node() { // Not just "hashes equal for equal inputs" (any two consistent hash // functions would do that) — the exported root's `hash` must be the - // literal `u64` `crate::pre_asap::cse::structural_hash` produces for - // this exact node, because it's the same function call, not a - // parallel reimplementation that happens to agree. + // literal `u64` `crate::ir::cse::structural_hash` produces for this + // exact node, because it's the same function call, not a parallel + // reimplementation that happens to agree. let leaf = scan("metrics", value_col()); let dag = export(&leaf); assert_eq!( @@ -1661,24 +1454,15 @@ mod tests { #[test] fn every_node_hash_matches_cse_structural_hash_on_its_own_sub_dag() { - // A multi-level DAG: check the parity holds at every depth, not - // just the root — each `DAGNode::hash` must equal - // `structural_hash` applied to the actual `QueryExpr` sub-DAG that - // node represents. - let agg = QueryExpr::Aggregate { - reduction: Reduction::Reduce(GroupKeys::none()), - measures: vec![AggIntent::Count { - accuracy: AccuracyTarget::Exact, - }], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(scan("metrics", value_col())), - }; - let root = QueryExpr::Filter { - pred: Predicate(Rc::new(QueryExpr::Literal(ScalarValue::Boolean(true)))), - child: Rc::new(agg.clone()), - }; + // A multi-level tree: check the parity holds at every depth, not + // just the root — each `DAGNode::hash` must equal `structural_hash` + // applied to the actual node it represents. + let agg = count_agg(scan("metrics", value_col())); + let root = OperatorNode::new_shared(crate::ir::Operator::NonASAP(NonASAPOp::Filter { + pred: true_pred(), + child: Rc::clone(&agg), + })) + .unwrap(); let dag = export(&root); assert_eq!( @@ -1697,39 +1481,23 @@ mod tests { ); } - /// Issue #172: a readout's guarantee is exported structurally — metric, + /// Issue #172: a evaluation's guarantee is exported structurally — metric, /// symbolic bound, failure probability, provenance (allocation - /// included) — and a rejection carries its typed reason. + /// included) — and a rejection carries its typed reason. A relational + /// node below a summary is its own node, in the same dag. #[test] fn export_carries_guarantee_allocation_and_rejection_reason() { - use crate::post_asap::{ - BoundExpr, CompositionOperator, ErrorMetric, FieldDataType, GroupingStrategy, - GuaranteeSource, ProbabilityExpr, Schema, SketchAlgorithm, SketchKind, SketchParams, - SketchStatistic, - }; - let leaf = Rc::new(scan("t", vec![Field::plain("v", DataType::Float64, false)])); - let kept = Rc::new(SummaryNode { - expr: SummaryExpr::KeepPreAsap(Rc::clone(&leaf)), - schema: Schema::lifted(vec![], None), - guarantee: Some(ResultGuarantee::exact("KeepPreAsap")), - }); - let agg = Rc::new(SummaryNode { - expr: SummaryExpr::SummaryAgg { - child: kept, - family: FieldDataType::Sketch( - SketchKind::new(SketchAlgorithm::Kll, SketchParams::Kll { k: 40 }), - GroupingStrategy::default(), - ), - input: crate::post_asap::SummaryUpdate::column( - crate::pre_asap::expr_ir::ColumnRef::Named("v".into()), - ), - reduction: Reduction::by(vec![]), - grouping: GroupingStrategy::default(), - filter: None, - }, - schema: Schema::lifted(vec![], None), - guarantee: None, - }); + let leaf = Rc::new( + OperatorNode::new(Operator::NonASAP(NonASAPOp::Scan { + source: Source::Table { + table_ref: "t".into(), + }, + predicates: vec![], + schema: Schema::lifted(vec![Field::plain("v", DataType::Float64, false)], None), + })) + .unwrap() + .with_guarantee(Some(ResultGuarantee::exact("Scan"))), + ); let guarantee = ResultGuarantee { metric: ErrorMetric::Rank, bound: BoundExpr::Sum { @@ -1755,15 +1523,15 @@ mod tests { }, ], }; - let root = SummaryNode { - expr: SummaryExpr::SummaryEstimate { - summary_input: agg, - query: SketchStatistic::Quantile { q: 0.99 }, - }, - schema: Schema::lifted(vec![], None), - guarantee: Some(guarantee), - }; + let (_, root) = quantile_evaluation(Rc::clone(&leaf), Some(guarantee)); let dag = export_summary(&root); + assert_eq!( + dag.nodes.iter().map(|n| n.kind).collect::>(), + ["scan", "summary_agg", "summary_estimate"] + ); + assert_eq!(dag.nodes[1].label, "SummaryAgg(Sketch(Kll))"); + assert!(dag.nodes[2].label.starts_with("SummaryEstimate(Quantile")); + assert!(dag.nodes.iter().all(|n| n.schema.is_some())); let json = serde_json::to_value(&dag).unwrap(); let root_json = &json["nodes"][dag.root as usize]; assert_eq!(root_json["guarantee"]["metric"], "rank"); @@ -1779,10 +1547,18 @@ mod tests { assert!(provenance.iter().any(|s| s["kind"] == "composition_step")); // Raw sketch state carries none; the exact leaf carries zero error. let state = &json["nodes"][1]; - assert_eq!(state["kind"], "SummaryAgg"); assert!(state.get("guarantee").is_none()); assert_eq!(json["nodes"][0]["guarantee"]["bound"]["op"], "zero"); + // The `DAGNode` shape carries the same guarantee inside `detail`. + let dag = export(&root); + assert_eq!( + dag.nodes.iter().map(|n| n.kind).collect::>(), + ["Scan", "SummaryAgg", "SummaryEstimate"] + ); + assert_eq!(dag.nodes[2].detail["guarantee"]["metric"], "rank"); + assert!(dag.nodes[1].detail.get("guarantee").is_none()); + let named = NamedDAG { name: "q".into(), source: None, @@ -1792,7 +1568,7 @@ mod tests { workload_cost: None, rejections: vec![TargetRejection { target_pre_id: 0, - strategy: "SketchAlgorithmStrategy".into(), + strategy: "ASAPStrategies".into(), description: "quantile over quantile".into(), error: AccuracyError::UnsupportedComposition { operator: CompositionOperator::ApproximateAggregate, @@ -1819,38 +1595,166 @@ mod tests { .is_none()); } - fn viewer_kind_categories() -> std::collections::BTreeMap { - const START: &str = "const KIND_CATEGORY_JSON = `"; - let source = include_str!(concat!( - env!("CARGO_MANIFEST_DIR"), - "/../../tools/dag-viewer/node-style.js" - )); - let json = source - .split_once(START) - .expect("node-style.js must declare KIND_CATEGORY_JSON") - .1 - .split_once("`;") - .expect("KIND_CATEGORY_JSON must be a template literal") - .0; - serde_json::from_str(json).expect("KIND_CATEGORY_JSON must be valid JSON") + /// `export_post_asap` splices a winning summary in place of its target, + /// tags every node the splice introduced with the decision, and leaves + /// the rest of the query — including an input the summary reuses that + /// was already exported — untagged and shared. + #[test] + fn export_post_asap_splices_a_summary_substitution_in_place() { + let leaf = scan("t", vec![Field::plain("v", DataType::Float64, false)]); + let target = count_agg(Rc::clone(&leaf)); + // `leaf` is exported through the Join's left side before the target + // (its right side) is reached and substituted. + let root = join(Rc::clone(&leaf), Rc::clone(&target)); + let (_, evaluation) = quantile_evaluation(Rc::clone(&leaf), None); + let decision = DAGDecision { + id: 7, + strategy: "Sketch".into(), + rationale: "quantile via KLL".into(), + rank: 0, + cost: 1.0, + role: "", + baseline_cost: None, + selected_cost: None, + benefit: None, + }; + let mut calls = Vec::new(); + let dag = export_post_asap(&root, &mut |node| { + calls.push(node.operator.kind_name()); + Rc::ptr_eq(node, &target).then(|| PostAsapSubstitution::Summary { + replacement: Rc::clone(&evaluation), + decision: decision.clone(), + }) + }); + + let kinds: Vec<_> = dag.nodes.iter().map(|n| n.kind).collect(); + assert_eq!(kinds, ["Scan", "SummaryAgg", "SummaryEstimate", "Join"]); + assert!(!kinds.contains(&"Aggregate"), "the target itself is gone"); + let join_node = &dag.nodes[dag.root as usize]; + assert_eq!(join_node.children, vec![0, 2]); + assert!(join_node.decision.is_none()); + let estimate = &dag.nodes[2]; + assert_eq!(estimate.kind, "SummaryEstimate"); + assert_eq!( + estimate.decision.as_ref().map(|d| (d.id, d.role)), + Some((7, "replacement_root")) + ); + let agg = &dag.nodes[estimate.children[0] as usize]; + assert_eq!( + agg.decision.as_ref().map(|d| (d.id, d.role)), + Some((7, "replacement_region")) + ); + let scan_node = &dag.nodes[agg.children[0] as usize]; + assert_eq!( + scan_node.id, 0, + "the summary reuses the already-exported input" + ); + assert!( + scan_node.decision.is_none(), + "a node exported before the splice is not tagged by it" + ); + assert_eq!( + calls, + ["Join", "Scan", "Aggregate", "SummaryAgg"], + "the substitution's own top level (SummaryEstimate) is never re-queried; its \ + descendants are, except the input already exported" + ); } + /// A `SharedSubDAGStrategy`-shaped substitution returns the target + /// itself as its replacement; the walk must still terminate and render + /// the target once. #[test] - fn viewer_categorizes_exactly_the_exported_node_kinds() { - let expected: std::collections::BTreeSet<_> = QUERY_KIND_TAGS - .iter() - .chain(SUMMARY_KIND_TAGS) - .copied() - .chain(std::iter::once("KeepPreAsap")) - .collect(); + fn export_post_asap_terminates_when_the_replacement_is_the_target() { + let target = count_agg(scan("t", value_col())); + let decision = DAGDecision { + id: 1, + strategy: "SharedSubDAG".into(), + rationale: "share".into(), + rank: 0, + cost: f64::NAN, + role: "", + baseline_cost: None, + selected_cost: None, + benefit: None, + }; + let dag = export_post_asap(&target, &mut |node| { + Rc::ptr_eq(node, &target).then(|| PostAsapSubstitution::Rewrite { + replacement: Rc::clone(&target), + decision: decision.clone(), + }) + }); + assert_eq!(dag.nodes.len(), 2); + assert_eq!(dag.nodes[dag.root as usize].kind, "Aggregate"); assert_eq!( - expected.len(), - QUERY_KIND_TAGS.len() + SUMMARY_KIND_TAGS.len() + 1, - "exported kind tags must be unique" + dag.nodes[dag.root as usize] + .decision + .as_ref() + .map(|d| d.role), + Some("replacement_root") ); - let categories = viewer_kind_categories(); - let actual: std::collections::BTreeSet<_> = categories.keys().map(String::as_str).collect(); + } - assert_eq!(actual, expected); + /// The snake_case `kind` table is exactly `kind_name` re-cased, for + /// every variant: a `SummaryDAGNode` and a `DAGNode` for the same node + /// never disagree on what it is. + #[test] + fn summary_kind_is_the_operator_kind_name_in_snake_case() { + fn to_snake(name: &str) -> String { + let mut out = String::new(); + let chars: Vec = name.chars().collect(); + for (i, &c) in chars.iter().enumerate() { + if c.is_ascii_uppercase() { + let prev_lower = i > 0 && !chars[i - 1].is_ascii_uppercase(); + let next_lower = chars.get(i + 1).is_some_and(|n| n.is_ascii_lowercase()); + if i > 0 && (prev_lower || next_lower) { + out.push('_'); + } + out.push(c.to_ascii_lowercase()); + } else { + out.push(c); + } + } + out + } + let leaf = scan("t", vec![Field::plain("v", DataType::Float64, false)]); + let (_, evaluation) = quantile_evaluation(Rc::clone(&leaf), None); + let finalize = std::rc::Rc::new( + OperatorNode::with_schema( + crate::ir::Operator::ASAP(ASAPOp::FinalizeExactAccumulator { child: evaluation }), + Schema::lifted(vec![], None), + ) + .with_guarantee(None), + ); + let root = + OperatorNode::new_shared(crate::ir::Operator::NonASAP(NonASAPOp::SQLWindowFunc { + func: crate::ir::operator_properties::WindowFuncKind::RowNumber, + args: vec![], + partition_by: GroupKeys::none(), + order_by: vec![], + frame: None, + output_name: "rn".into(), + child: finalize, + })) + .unwrap(); + let dag = export(&root); + let summary = export_summary(&root); + assert_eq!(dag.nodes.len(), summary.nodes.len()); + for (a, b) in dag.nodes.iter().zip(&summary.nodes) { + assert_eq!(a.id, b.id); + assert_eq!(b.kind, to_snake(a.kind), "{}", a.kind); + assert_eq!(a.children, b.children); + assert_eq!(a.label, b.label); + } + assert_eq!( + summary.nodes.iter().map(|n| n.kind).collect::>(), + [ + "scan", + "summary_agg", + "summary_estimate", + "finalize_exact_accumulator", + "sql_window_func", + ] + ); } } diff --git a/crates/types/src/ir/asap.rs b/crates/types/src/ir/asap.rs index faee35c5f..b9fbcf6f5 100644 --- a/crates/types/src/ir/asap.rs +++ b/crates/types/src/ir/asap.rs @@ -6,6 +6,7 @@ use std::rc::Rc; use serde::{Deserialize, Serialize}; use super::node::{OperatorNode, OperatorResultKind}; +use super::summary_coverage::{CoverageError, SummaryCoverage}; use crate::ir::operator_properties::Reduction; use crate::ir::SchemaDerivationError; use crate::post_asap::maintained_population::{MaintainedPopulation, PopulationStatistic}; @@ -39,9 +40,7 @@ pub enum ASAPOp { }, /// Read an exact accumulator's state as its finalized value: the /// maintenance-to-read boundary before query-time operators. - FinalizeExactAccumulator { - child: Rc, - }, + FinalizeExactAccumulator { child: Rc }, /// Maintain the full declared population, including membership changes. MaintainPopulation { child: Rc, @@ -52,10 +51,9 @@ pub enum ASAPOp { child: Rc, evaluation: PopulationStatistic, }, - // ── Reserved: migrated but unimplemented (§1.3 of the proposal) ── - SummaryMerge { - children: Vec>, - }, + /// Merge compatible partial states for the same grouping and family. + SummaryMerge { children: Vec> }, + // ── Reserved: migrated but unimplemented ── SummarySubtract { left: Rc, right: Rc, @@ -186,11 +184,7 @@ impl ASAPOp { use ASAPOp::*; matches!( self, - SummaryMerge { .. } - | SummarySubtract { .. } - | SummaryDelete { .. } - | SummaryJoin { .. } - | Extension { .. } + SummarySubtract { .. } | SummaryDelete { .. } | SummaryJoin { .. } | Extension { .. } ) } @@ -202,10 +196,32 @@ impl ASAPOp { pub fn produced_state(&self) -> Option<&FieldDataType> { match self { ASAPOp::SummaryAgg { family, .. } | ASAPOp::SummaryJoin { family, .. } => Some(family), + ASAPOp::SummaryMerge { children } => children.first().and_then(|child| { + child + .schema + .fields + .iter() + .find(|field| !field.is_plain()) + .map(|field| &field.dtype) + }), _ => None, } } + /// Derive the merged node's coverage; unknown or overlapping inputs fail closed. + pub fn merged_coverage(&self) -> Result { + let ASAPOp::SummaryMerge { children } = self else { + return Err(SchemaDerivationError::InvalidScalarSignature( + "coverage merge requires SummaryMerge".into(), + )); + }; + let inputs = children + .iter() + .map(|child| child.coverage.clone().ok_or(CoverageError::UnknownInput)) + .collect::, _>>()?; + Ok(SummaryCoverage::merge_disjoint(&inputs)?) + } + /// Output schema derived from the operator and its children. Summary /// planning may retain a more specific schema (evaluation column naming) /// through [`OperatorNode::with_schema`]; all structural metadata must @@ -405,8 +421,11 @@ impl ASAPOp { .output_schema()? } } - SummaryMerge { .. } - | SummarySubtract { .. } + SummaryMerge { children } => { + self.validate_inputs()?; + children[0].schema.clone() + } + SummarySubtract { .. } | SummaryDelete { .. } | SummaryJoin { .. } | Extension { .. } => return Err(Self::unimplemented()), @@ -444,6 +463,46 @@ impl ASAPOp { } }; match self { + SummaryMerge { children } => { + let Some(first) = children.first() else { + return Err(SchemaDerivationError::InvalidScalarSignature( + "summary merge requires at least one state input".into(), + )); + }; + // Matching state parameters and grouping positions are necessary; + // matching names alone cannot prove two states compatible. + if first + .schema + .fields + .iter() + .filter(|field| !field.is_plain()) + .count() + != 1 + { + return Err(SchemaDerivationError::InvalidScalarSignature( + "summary merge requires exactly one state column".into(), + )); + } + for child in children { + needs_state(child, "SummaryMerge")?; + if child.schema != first.schema { + return Err(SchemaDerivationError::InvalidScalarSignature( + "summary merge inputs must have identical state and grouping schemas" + .into(), + )); + } + } + // Coverage records only time and population; what each state + // summarizes and how it is grouped come from the producers. + let update = first.summary_update(); + if update.is_none() || children.iter().any(|c| c.summary_update() != update) { + return Err(SchemaDerivationError::InvalidScalarSignature( + "summary merge inputs must share update expression and reduction".into(), + )); + } + self.merged_coverage()?; + Ok(()) + } SummaryEstimate { summary_input, query, diff --git a/crates/types/src/ir/canonicalize.rs b/crates/types/src/ir/canonicalize.rs new file mode 100644 index 000000000..d9a0034a4 --- /dev/null +++ b/crates/types/src/ir/canonicalize.rs @@ -0,0 +1,1077 @@ +//! Post-lowering canonicalization of the operator DAG. +//! +//! Erases *structural* differences between semantically identical queries so +//! a post-ASAP binding rule matching on the intent algebra sees one canonical +//! spelling regardless of source language (issue #34). +//! +//! ## Heavy-hitter promotion +//! +//! An additive-ranked "order by the aggregate, take the top k" is a +//! heavy-hitter represented by [`AggIntent::TopK`]. Front ends may emit it as +//! an ordinary `Limit { Sort { … Aggregate } }`; this pass promotes that shape +//! to the canonical +//! +//! ```text +//! Aggregate { reduction: Reduce(), measures: [TopK{k}], +//! child: Aggregate { measures: [Count | Sum], … } } +//! ``` +//! +//! Count supplies unit weights and Sum supplies value weights. Because the +//! match is positional, aliases do not affect it. Other ranked expressions +//! retain Sort + Limit. +//! +//! ## Subquery lowering +//! +//! EXISTS/NOT EXISTS and positive IN filter conjuncts may use semi/anti joins. +//! Scalar subqueries remain explicit: a cross join does not preserve their +//! zero-row NULL or multiple-row error semantics. All scalar plan references +//! participate in DAG traversal and canonicalization. + +use std::collections::HashMap; +use std::rc::Rc; + +use super::node::{Operator, OperatorNode}; +use super::non_asap::NonASAPOp; +use super::scalar::{ExprSemantics, Predicate, ProjectItem, ScalarExpr, SortKey}; +use crate::ir::operator_properties::{JoinKind, Reduction}; +use crate::ir::SchemaDerivationError; +use crate::pre_asap::agg_intent::{topk, AggIntent}; +use crate::pre_asap::expr_ir::{CompareOpKind, ScalarValue}; +use crate::types::AccuracyTarget; + +/// Rewrite the DAG under `root` into its canonical form (bottom-up). +/// Idempotent: an already-canonical DAG comes back as the same `Rc`. Only +/// nodes that change (or whose inputs change) are rebuilt; every untouched +/// sub-DAG keeps its pointer identity, and a shared sub-DAG that is rewritten +/// stays shared. +pub fn canonicalize(root: Rc) -> Result, SchemaDerivationError> { + canon(&root, &mut HashMap::new()) +} + +fn canon( + node: &Rc, + memo: &mut HashMap<*const OperatorNode, Rc>, +) -> Result, SchemaDerivationError> { + if let Some(done) = memo.get(&Rc::as_ptr(node)) { + return Ok(Rc::clone(done)); + } + + // A `Concat` asserting a caller-proven `discriminator_unique_key` (issue + // #228) had that key's `ColumnId`s resolved against exactly the first + // branch's output schema *as it stood before this pass ran*. The rewrites + // below can restructure that branch (anywhere within it) into a shape + // with a different output schema, which would leave those `ColumnId`s + // pointing at the wrong column, or out of bounds. Snapshot the schema the + // key was resolved against before recursing into the children. + let discriminator_branch_schema_before = match &node.operator { + Operator::NonASAP(NonASAPOp::Concat { + children, + discriminator_unique_key: Some(_), + }) => children.first().map(|c| c.schema.clone()), + _ => None, + }; + + // Bottom-up: canonicalize every operator input before matching at this + // node, so an inner heavy-hitter is promoted before an enclosing rewrite + // inspects it. + let mut rebuilt: Vec<(*const OperatorNode, Rc)> = Vec::new(); + let mut changed = false; + for child in operator_children(&node.operator) { + let new = canon(child, memo)?; + changed |= !Rc::ptr_eq(&new, child); + rebuilt.push((Rc::as_ptr(child), new)); + } + let mut current = if changed { + // `map_children` also visits the operator nodes referenced from + // scalar expressions; those are not in `rebuilt` and pass through + // unchanged. (A node that is both an operator input and a scalar + // reference is one shared node, so it takes its canonical form in + // both places.) + let rebuilt_child = |c: &Rc| { + rebuilt + .iter() + .find(|(ptr, _)| *ptr == Rc::as_ptr(c)) + .map_or_else(|| Rc::clone(c), |(_, new)| Rc::clone(new)) + }; + Rc::new(node.map_children(rebuilt_child)?) + } else { + Rc::clone(node) + }; + + // If the first branch's output schema moved out from under the asserted + // key, the key can no longer be trusted — drop it (never re-derive it by + // guessing at name/position). A wrong `unique_keys` claim is a wrong + // query answer, not a missed optimization, so any difference at all + // drops the key. + if let Operator::NonASAP(NonASAPOp::Concat { + children, + discriminator_unique_key: Some(_), + }) = ¤t.operator + { + let after = children.first().map(|c| &c.schema); + if discriminator_branch_schema_before.as_ref() != after { + current = OperatorNode::new_shared(crate::ir::Operator::NonASAP(NonASAPOp::Concat { + children: children.clone(), + discriminator_unique_key: None, + }))?; + } + } + + let current = apply_local_rules(current, memo)?; + + memo.insert(Rc::as_ptr(node), Rc::clone(¤t)); + Ok(current) +} + +type Memo = HashMap<*const OperatorNode, Rc>; + +/// Apply the local rewrite rules at `node` (whose inputs are already +/// canonical) until none matches. The rules chain: a `ROW_NUMBER()`- +/// partitioned top-k rewrites to a `Limit{Sort}`, which the heavy-hitter +/// rule may then promote to an `Aggregate([TopK])`; a `Filter` with several +/// subquery conjuncts sheds one per round. Each rule strictly simplifies the +/// node (one fewer idiom, or one fewer subquery reference), so the loop +/// terminates. +fn apply_local_rules( + mut current: Rc, + memo: &mut Memo, +) -> Result, SchemaDerivationError> { + loop { + let next = if let Some(next) = try_promote_additive_top_ranking(¤t)? { + next + } else if let Some(next) = try_lower_subquery_conjunct(¤t, memo)? { + next + } else { + break; + }; + current = next; + } + Ok(current) +} + +/// The direct **operator** inputs of a node — the relational skeleton only. +/// Operator nodes referenced from a scalar position (`ScalarSubquery`, +/// `Exists`, …) are not visited here: a subquery that the lowering rules +/// lift into a join is canonicalized at that point, and one they leave in +/// place (`NOT IN`, an `EXISTS` outside a `Filter` conjunct) stays as the +/// front end emitted it. +fn operator_children(op: &Operator) -> Vec<&Rc> { + op.children() +} + +/// Recognise an additive-ranked +/// `Limit { Sort { [Project] Aggregate([Count | Sum]) } }` and rewrite it to +/// the canonical heavy-hitter `Aggregate([TopK])` over the explicit inner +/// aggregate. Returns `None` when the shape does not match. +fn try_promote_additive_top_ranking( + node: &OperatorNode, +) -> Result>, SchemaDerivationError> { + // Limit k, no offset (an OFFSET means "not the top k"). + let Some(NonASAPOp::Limit { + n: Some(k), + offset: 0, + partition_by: limit_partition, + child, + }) = node.non_asap() + else { + return Ok(None); + }; + // A single ordering key on a column. + let Some(NonASAPOp::Sort { + keys, + partition_by, + child: sort_child, + }) = child.non_asap() + else { + return Ok(None); + }; + // A per-group `Limit` must agree with its `Sort`'s partition: the + // ranking's partition is what the outer `TopK` groups by. + if !limit_partition.is_empty() && limit_partition != partition_by { + return Ok(None); + } + let [SortKey { + expr: ScalarExpr::Column(sort_col), + ascending, + .. + }] = keys.as_slice() + else { + return Ok(None); + }; + + // The ordered relation is an `Aggregate`, optionally behind a passthrough + // projection (a bare-column SELECT list). Map the sort key through the + // projection to the aggregate's own output column. + let (agg_node, ranked_col) = match sort_child.non_asap() { + Some(NonASAPOp::Project { cols, child, .. }) => { + let Some(ProjectItem { + expr: ScalarExpr::Column(underlying), + .. + }) = cols.get(*sort_col) + else { + return Ok(None); + }; + (child, *underlying) + } + _ => (sort_child, *sort_col), + }; + + // Exactly one aggregate, ranked by *its* output column — the measure sits + // at index `by.len()` (after the group keys). A `PerEntity` reduction has + // no `by` to rank a measure against, so it is a non-match. + let Some(NonASAPOp::Aggregate { + reduction, + measures, + child: aggregate_child, + .. + }) = agg_node.non_asap() + else { + return Ok(None); + }; + let Reduction::Reduce(by) = reduction else { + return Ok(None); + }; + let [ranked_agg] = measures.as_slice() else { + return Ok(None); + }; + if ranked_col != by.len() { + return Ok(None); + } + // The heavy-hitter decision — descending, over a measure with a realised + // heavy-hitter sketch — is the shared rule both front ends consult (issue + // #38). An ascending additive-ranked limit (bottom-k) stays generic. + if !topk::Ranking::from_aggregate(ranked_agg).is_supported(!ascending) { + return Ok(None); + } + // A direct Sum is a stream of additive observation weights. A Sum over a + // derived child such as Rate/Increase still needs exact reset-aware + // values to rerank sketch candidates, and the post-ASAP IR has no + // candidate-sidecar + exact-rerank node, so that shape keeps Sort + Limit. + if matches!(ranked_agg, AggIntent::Sum { .. }) + && matches!( + aggregate_child.non_asap(), + Some(NonASAPOp::Aggregate { .. }) + ) + { + return Ok(None); + } + // Count ranks unit updates; a direct Sum ranks weighted updates. + let accuracy = match ranked_agg { + AggIntent::Count { accuracy } => accuracy.clone(), + AggIntent::Sum { .. } => AccuracyTarget::Exact, + _ => unreachable!("additive ranking gate admitted a non-additive measure"), + }; + + // Outer heavy-hitter `TopK`, grouped by the ranking's partition (empty for + // a global `ORDER BY … LIMIT k`; the `by` labels for a partitioned `topk + // by`), over the unchanged inner additive aggregate. + OperatorNode::new_shared(crate::ir::Operator::NonASAP(NonASAPOp::Aggregate { + reduction: Reduction::by(partition_by.to_vec()), + measures: vec![AggIntent::TopK { k: *k, accuracy }], + output_names: Vec::new(), + filters: vec![], + having: None, + child: Rc::clone(agg_node), + })) + .map(Some) +} + +// ROW_NUMBER filters retain the window output. Eliminating it without a +// consumer-aware rewrite drops a visible column and invalidates outer scopes. + +/// `Predicate(true)`: the unconditional join predicate the SQL front end +/// emits for an uncorrelated `EXISTS` and for a `CROSS JOIN`. +fn always_true() -> Predicate { + Predicate(ScalarExpr::Literal(ScalarValue::Boolean(true))) +} + +/// Whether `conjunct` is one this pass lowers to a semi/anti join. +fn is_join_conjunct(conjunct: &ScalarExpr) -> bool { + match conjunct { + ScalarExpr::Exists { .. } => true, + // An `IN` whose probe expression itself reads a scalar subquery is + // lowered only after that subquery has been joined in by + // `try_lower_scalar_subquery` (a `Join` predicate is not a place that + // rule looks). `NOT IN` is never lowered — see the module docs. + ScalarExpr::InSubquery { + expr, + negated: false, + .. + } => find_scalar_subquery(expr).is_none(), + _ => false, + } +} + +/// Lower one `[NOT] EXISTS (s)` / `x IN (s)` conjunct of a `Filter` to the +/// semi-/anti-join the SQL front end used to emit directly. The remaining +/// conjuncts stay in an outer `Filter` over the join: a semi/anti join's +/// output schema is the left's, so their column ids are unchanged. One +/// conjunct per call; the fixpoint loop picks up the next. +fn try_lower_subquery_conjunct( + node: &OperatorNode, + memo: &mut Memo, +) -> Result>, SchemaDerivationError> { + let Some(NonASAPOp::Filter { + pred: Predicate(pred), + child, + }) = node.non_asap() + else { + return Ok(None); + }; + let conjuncts = pred.conjuncts(); + let Some(idx) = conjuncts.iter().position(is_join_conjunct) else { + return Ok(None); + }; + let left_width = child.schema.fields.len(); + let (kind, subquery, join_pred) = match &conjuncts[idx] { + // Uncorrelated by construction (the IR's `Exists` carries no outer + // column references), so the join condition is unconditionally true. + ScalarExpr::Exists { subquery, negated } => { + let kind = if *negated { + JoinKind::Anti + } else { + JoinKind::Semi + }; + (kind, subquery, always_true()) + } + // `x = `, which sits right after the + // left's columns in the `left ++ right` scope the predicate resolves + // against. + ScalarExpr::InSubquery { expr, subquery, .. } => ( + JoinKind::Semi, + subquery, + Predicate(ScalarExpr::Compare { + left: expr.clone(), + op: CompareOpKind::Eq, + right: Box::new(ScalarExpr::Column(left_width)), + semantics: ExprSemantics::Sql, + }), + ), + _ => unreachable!("`is_join_conjunct` admitted a non-subquery conjunct"), + }; + let join = OperatorNode::new_shared(crate::ir::Operator::NonASAP(NonASAPOp::Join { + kind, + pred: join_pred, + left: Rc::clone(child), + right: canon(subquery, memo)?, + }))?; + let mut rest: Vec = conjuncts + .iter() + .enumerate() + .filter(|(i, _)| *i != idx) + .map(|(_, c)| c.clone()) + .collect(); + let out = match rest.len() { + 0 => join, + 1 => filter(rest.remove(0), join)?, + _ => filter(ScalarExpr::BoolAnd(rest), join)?, + }; + Ok(Some(out)) +} + +/// Lower one scalar subquery read by a `Project` item or a `Filter` +/// predicate: the owner reads it through a cross join against the subquery, +/// whose single column is appended after the left's (`Column(|left|)`), and +/// every occurrence of that subquery node in the owner is replaced by that +/// column reference. One subquery node per call; the fixpoint loop handles +/// the rest, each getting its own cross join further out (so earlier column +/// ids are never shifted). For a `Filter` the output schema is restored to +/// the left's columns by a positional `Project` over the result. +/// +/// Not representable in the IR, and therefore not checked here: SQL raises +/// an error when a scalar subquery yields more than one row (the cross join +/// would duplicate the left's rows instead), and yields NULL when it yields +/// none (the cross join yields no rows instead). +fn filter( + pred: ScalarExpr, + child: Rc, +) -> Result, SchemaDerivationError> { + OperatorNode::new_shared(crate::ir::Operator::NonASAP(NonASAPOp::Filter { + pred: Predicate(pred), + child, + })) +} + +/// The first `ScalarSubquery` node read by `expr` (pre-order over its scalar +/// children; referenced operator subgraphs are their own scope and are not +/// entered). +fn find_scalar_subquery(expr: &ScalarExpr) -> Option<&Rc> { + if let ScalarExpr::ScalarSubquery(node) = expr { + return Some(node); + } + expr.children().into_iter().find_map(find_scalar_subquery) +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::ir::operator_properties::WindowFuncKind; + use crate::ir::operator_properties::{ + ConcatDiscriminatorKey, GroupKeys, Source, WindowFrame, WindowFrameBound, + WindowFrameOffset, WindowFrameUnits, + }; + use crate::pre_asap::schema::{DataType, Field, Schema}; + + fn node(op: NonASAPOp) -> Rc { + Rc::new(OperatorNode::new(Operator::NonASAP(op)).expect("fixture derives a schema")) + } + + fn scan() -> Rc { + node(NonASAPOp::Scan { + source: Source::TimeSeries { metric: "m".into() }, + predicates: vec![], + schema: Schema::with_time_index( + vec![ + Field::plain("ts", DataType::Timestamp, false), + Field::plain("service", DataType::Utf8, false), + Field::plain("value", DataType::Float64, false), + ], + 0, + vec![], + ), + }) + } + + fn aggregate( + reduction: Reduction, + agg: AggIntent, + child: Rc, + ) -> Rc { + node(NonASAPOp::Aggregate { + reduction, + measures: vec![agg], + output_names: vec![], + filters: vec![], + having: None, + child, + }) + } + + fn count() -> AggIntent { + AggIntent::Count { + accuracy: AccuracyTarget::Exact, + } + } + + /// `Aggregate{ by: [1], [Count] }` over the scan — output cols `[service, count]`. + fn count_by_service() -> Rc { + aggregate(Reduction::by(vec![1]), count(), scan()) + } + + fn key(col: usize, ascending: bool) -> Vec { + vec![SortKey { + expr: ScalarExpr::Column(col), + ascending, + nulls_first: false, + }] + } + + fn desc(col: usize) -> Vec { + key(col, false) + } + + fn limit(n: usize, offset: usize, child: Rc) -> Rc { + node(NonASAPOp::Limit { + n: Some(n), + offset, + partition_by: GroupKeys::none(), + child, + }) + } + + fn sort(keys: Vec, child: Rc) -> Rc { + node(NonASAPOp::Sort { + keys, + partition_by: GroupKeys::none(), + child, + }) + } + + fn passthrough_project(child: Rc) -> Rc { + node(NonASAPOp::Project { + cols: vec![ + ProjectItem { + alias: None, + expr: ScalarExpr::Column(0), + }, + ProjectItem { + alias: Some("c".into()), + expr: ScalarExpr::Column(1), + }, + ], + qualifier: None, + child, + }) + } + + fn concat( + children: Vec>, + key: Option, + ) -> Rc { + node(NonASAPOp::Concat { + children, + discriminator_unique_key: key, + }) + } + + fn measures(n: &OperatorNode) -> &[AggIntent] { + match n.non_asap() { + Some(NonASAPOp::Aggregate { measures, .. }) => measures, + _ => &[], + } + } + + fn is_topk_over_count(n: &OperatorNode) -> bool { + let Some(NonASAPOp::Aggregate { + measures, child, .. + }) = n.non_asap() + else { + return false; + }; + matches!(measures.as_slice(), [AggIntent::TopK { k: 5, .. }]) + && matches!(self::measures(child), [AggIntent::Count { .. }]) + } + + #[test] + fn promotes_count_ranked_limit_sort() { + // Limit 5 { Sort DESC by count-col (1) { Aggregate[Count] by [1] } }. + let q = limit(5, 0, sort(desc(1), count_by_service())); + assert!(is_topk_over_count(&canonicalize(q).unwrap())); + } + + #[test] + fn promotes_through_a_passthrough_projection() { + // …with a `SELECT service, count` projection between the Sort and the Agg. + let q = limit(5, 0, sort(desc(1), passthrough_project(count_by_service()))); + assert!(is_topk_over_count(&canonicalize(q).unwrap())); + } + + #[test] + fn promoted_topk_reuses_the_inner_aggregate_node() { + // The inner aggregate is untouched, so the rewrite shares it rather + // than copying it. + let agg = count_by_service(); + let out = canonicalize(limit(5, 0, sort(desc(1), Rc::clone(&agg)))).unwrap(); + let Some(NonASAPOp::Aggregate { child, .. }) = out.non_asap() else { + panic!("expected TopK aggregate"); + }; + assert!(Rc::ptr_eq(child, &agg)); + } + + #[test] + fn is_idempotent() { + let q = limit(5, 0, sort(desc(1), count_by_service())); + let once = canonicalize(q).unwrap(); + let twice = canonicalize(Rc::clone(&once)).unwrap(); + assert!(Rc::ptr_eq(&once, &twice), "canonicalize must be idempotent"); + } + + #[test] + fn untouched_dag_is_returned_pointer_equal() { + // Nothing here matches a rewrite: a Concat of two projections over + // one shared aggregate. The root (and everything under it) must come + // back as the same `Rc`. + let agg = count_by_service(); + let q = concat( + vec![ + passthrough_project(Rc::clone(&agg)), + passthrough_project(Rc::clone(&agg)), + ], + None, + ); + let out = canonicalize(Rc::clone(&q)).unwrap(); + assert!(Rc::ptr_eq(&out, &q)); + } + + #[test] + fn rewritten_shared_subtree_stays_shared() { + // One promotable sub-DAG referenced twice is rewritten once. + let branch = limit(5, 0, sort(desc(1), count_by_service())); + let q = concat(vec![Rc::clone(&branch), Rc::clone(&branch)], None); + let out = canonicalize(q).unwrap(); + let Some(NonASAPOp::Concat { children, .. }) = out.non_asap() else { + panic!("expected Concat"); + }; + assert!(is_topk_over_count(&children[0])); + assert!(Rc::ptr_eq(&children[0], &children[1])); + } + + // ── Concat's discriminator_unique_key vs. canonicalize (issue #228) ── + // + // `discriminator_unique_key`'s `ColumnId`s were resolved against the + // first branch's *pre-canonicalize* output schema. The key is dropped + // whenever that branch's schema actually changed, and survives untouched + // otherwise. Never guessed at. + + fn discriminator_key(n: &OperatorNode) -> &Option { + match n.non_asap() { + Some(NonASAPOp::Concat { + discriminator_unique_key, + .. + }) => discriminator_unique_key, + _ => panic!("expected Concat"), + } + } + + #[test] + fn concat_discriminator_key_survives_canonicalize_when_first_branch_is_unaffected() { + // A plain `Aggregate` first branch matches neither rewrite trigger, + // so its schema is identical before and after canonicalize. + let q = concat( + vec![count_by_service(), count_by_service()], + Some(ConcatDiscriminatorKey::new(0, vec![1])), + ); + let out = canonicalize(Rc::clone(&q)).unwrap(); + assert!( + discriminator_key(&out).is_some(), + "an untouched first branch's discriminator key must survive canonicalize" + ); + assert!(Rc::ptr_eq(&out, &q)); + } + + #[test] + fn concat_discriminator_key_is_dropped_when_first_branch_gets_rewritten() { + // The first branch is exactly the heavy-hitter promotion trigger, so + // canonicalize rewrites it to `Aggregate{TopK}`, whose own output is + // a single column, not the original two (`[service, count]`). A key + // resolved against the 2-column shape must not survive pointing at + // the new 1-column schema. + let promotable_branch = limit(5, 0, sort(desc(1), count_by_service())); + let q = concat( + vec![promotable_branch, count_by_service()], + Some(ConcatDiscriminatorKey::new(0, vec![1])), + ); + let out = canonicalize(q).unwrap(); + let Some(NonASAPOp::Concat { + children, + discriminator_unique_key, + }) = out.non_asap() + else { + panic!("expected Concat"); + }; + assert!( + is_topk_over_count(&children[0]), + "the first branch is still promoted normally" + ); + assert!( + discriminator_unique_key.is_none(), + "a stale discriminator key must be dropped, never silently kept wrong" + ); + assert!( + out.schema.unique_keys.is_empty(), + "the dropped key leaves the schema" + ); + } + + #[test] + fn does_not_promote_ascending_sort() { + // Ascending = bottom-k: the Top-K ranking rule rejects it (needs + // descending), so it stays a generic Sort+Limit (issue #38). + let q = limit(5, 0, sort(key(1, true), count_by_service())); + assert!(!is_topk_over_count(&canonicalize(q).unwrap())); + } + + #[test] + fn does_not_promote_with_offset() { + let q = limit(5, 2, sort(desc(1), count_by_service())); + assert!(!is_topk_over_count(&canonicalize(q).unwrap())); + } + + #[test] + fn does_not_promote_ranking_by_a_group_key() { + // DESC by col 0 (the `service` group key), not the count → not a + // frequency heavy-hitter. + let q = limit(5, 0, sort(desc(0), count_by_service())); + assert!(!is_topk_over_count(&canonicalize(q).unwrap())); + } + + #[test] + fn does_not_promote_when_limit_partition_disagrees_with_sort() { + // A per-group Limit partitioned differently from its Sort is not the + // top-k shape. + let q = node(NonASAPOp::Limit { + n: Some(5), + offset: 0, + partition_by: GroupKeys::by(vec![0]), + child: sort(desc(1), count_by_service()), + }); + assert!(!is_topk_over_count(&canonicalize(q).unwrap())); + } + + #[test] + fn promotes_sum_ranked_limit_sort_as_weighted_heavy_hitter() { + let sum = aggregate(Reduction::by(vec![1]), AggIntent::Sum { col: None }, scan()); + let out = canonicalize(limit(5, 0, sort(desc(1), sum))).unwrap(); + let Some(NonASAPOp::Aggregate { + measures, child, .. + }) = out.non_asap() + else { + panic!("expected weighted TopK aggregate"); + }; + assert!(matches!( + measures.as_slice(), + [AggIntent::TopK { k: 5, .. }] + )); + assert!(matches!(self::measures(child), [AggIntent::Sum { .. }])); + } + + #[test] + fn keeps_sum_over_counter_reduction_as_exact_value_ranking() { + for counter in [AggIntent::Rate, AggIntent::Increase] { + let derived = aggregate(Reduction::PerEntity, counter, scan()); + let sum = aggregate( + Reduction::by(vec![1]), + AggIntent::Sum { col: None }, + derived, + ); + let out = canonicalize(limit(5, 0, sort(desc(1), sum))).unwrap(); + let Some(NonASAPOp::Limit { child, .. }) = out.non_asap() else { + panic!("expected Limit, got {out:?}"); + }; + let Some(NonASAPOp::Sort { child, .. }) = child.non_asap() else { + panic!("expected Sort under the Limit"); + }; + let Some(NonASAPOp::Aggregate { + measures, child, .. + }) = child.non_asap() + else { + panic!("expected Aggregate under the Sort"); + }; + assert!(matches!(measures.as_slice(), [AggIntent::Sum { .. }])); + assert!(matches!( + child.non_asap(), + Some(NonASAPOp::Aggregate { .. }) + )); + } + } + + // ── ROW_NUMBER() partitioned top-k (issue #24) ────────────────────────── + + /// A scan with `[ts, service, region, value]`. + fn scan4() -> Rc { + node(NonASAPOp::Scan { + source: Source::TimeSeries { metric: "m".into() }, + predicates: vec![], + schema: Schema::with_time_index( + vec![ + Field::plain("ts", DataType::Timestamp, false), + Field::plain("service", DataType::Utf8, false), + Field::plain("region", DataType::Utf8, false), + Field::plain("value", DataType::Float64, false), + ], + 0, + vec![], + ), + }) + } + + /// `Aggregate{ by: [1,2] (service, region), [agg] }` — output `[service, + /// region, ]` (3 cols), so a ROW_NUMBER over it appends `rn` at index 3. + fn grouped(agg: AggIntent) -> Rc { + aggregate(Reduction::by(vec![1, 2]), agg, scan4()) + } + + /// `ROW_NUMBER` ignores its frame clause; any concrete frame works. + fn rownumber_frame() -> WindowFrame { + WindowFrame { + units: WindowFrameUnits::Rows, + start_bound: WindowFrameBound::Preceding(WindowFrameOffset::Scalar(ScalarValue::Null)), + end_bound: WindowFrameBound::Following(WindowFrameOffset::Scalar(ScalarValue::Null)), + } + } + + /// `SQLWindowFunc{ RowNumber, PARTITION BY region(2), ORDER BY col(2) DESC } { agg }`. + fn rownumber_window(agg: Rc) -> Rc { + node(NonASAPOp::SQLWindowFunc { + func: WindowFuncKind::RowNumber, + args: vec![], + partition_by: GroupKeys::by(vec![2]), // region + order_by: vec![SortKey { + expr: ScalarExpr::Column(2), // the aggregate output column + ascending: false, + nulls_first: true, + }], + frame: Some(rownumber_frame()), + output_name: "rn".into(), + child: agg, + }) + } + + /// `Filter{ col <= 5 } { child }`. + fn filter_le_5(col: usize, child: Rc) -> Rc { + node(NonASAPOp::Filter { + pred: Predicate(ScalarExpr::Compare { + left: Box::new(ScalarExpr::Column(col)), + op: CompareOpKind::Le, + right: Box::new(ScalarExpr::Literal(ScalarValue::Int64(5))), + semantics: ExprSemantics::Sql, + }), + child, + }) + } + + /// `Filter{ rn(3) <= 5 } { ROW_NUMBER window { agg } }`. + fn rownumber_topk(agg: Rc) -> Rc { + filter_le_5(3, rownumber_window(agg)) + } + + #[test] + fn rownumber_count_topk_becomes_a_partitioned_heavy_hitter() { + let original = rownumber_topk(grouped(count())); + let out = canonicalize(Rc::clone(&original)).unwrap(); + assert_eq!(out.schema, original.schema); + assert!( + matches!(out.non_asap(),Some(NonASAPOp::Filter { child,.. }) if matches!(child.non_asap(),Some(NonASAPOp::SQLWindowFunc { .. }))) + ); + assert_idempotent(&out); + } + + #[test] + fn rownumber_avg_topk_becomes_a_partitioned_sort_limit() { + let original = rownumber_topk(grouped(AggIntent::Avg { col: None })); + let out = canonicalize(Rc::clone(&original)).unwrap(); + assert_eq!(out.schema, original.schema); + assert!( + matches!(out.non_asap(),Some(NonASAPOp::Filter { child,.. }) if matches!(child.non_asap(),Some(NonASAPOp::SQLWindowFunc { .. }))) + ); + assert_idempotent(&out); + } + + #[test] + fn filter_on_a_non_rownumber_column_is_left_alone() { + // `WHERE service_len <= 5` (col 0, not the rn window column) must not + // be mistaken for a top-k. + let q = filter_le_5(0, rownumber_window(grouped(count()))); + let out = canonicalize(Rc::clone(&q)).unwrap(); + assert!(Rc::ptr_eq(&out, &q), "left as the same Filter"); + } + + // ── Subquery lowering ─────────────────────────────────────────────────── + + fn filter_of(pred: ScalarExpr, child: Rc) -> Rc { + node(NonASAPOp::Filter { + pred: Predicate(pred), + child, + }) + } + + /// `SELECT service FROM scan` — a one-column subquery. + /// Scalar reads retain cardinality/null semantics and a shared producer. + #[test] + fn scalar_subqueries_remain_explicit_and_shared() { + let sub = one_column_subquery(); + let root = node(NonASAPOp::Project { + child: scan(), + qualifier: None, + cols: vec![ + ProjectItem { + alias: Some("a".into()), + expr: ScalarExpr::ScalarSubquery(Rc::clone(&sub)), + }, + ProjectItem { + alias: Some("b".into()), + expr: ScalarExpr::ScalarSubquery(Rc::clone(&sub)), + }, + ], + }); + let out = canonicalize(root).unwrap(); + let NonASAPOp::Project { cols, child, .. } = out.expect_non_asap() else { + panic!() + }; + assert!(matches!(child.expect_non_asap(), NonASAPOp::Scan { .. })); + for col in cols { + assert!(matches!(&col.expr,ScalarExpr::ScalarSubquery(node) if Rc::ptr_eq(node,&sub))); + } + assert!(out.schema.fields.iter().all(|f| f.nullable)); + assert_idempotent(&out); + } + + fn one_column_subquery() -> Rc { + node(NonASAPOp::Scan { + source: Source::Table { + table_ref: "sub".into(), + }, + predicates: vec![], + schema: Schema::new(vec![Field::plain("value", DataType::Float64, false)]), + }) + } + + fn exists(subquery: Rc, negated: bool) -> ScalarExpr { + ScalarExpr::Exists { subquery, negated } + } + + fn in_subquery(expr: ScalarExpr, subquery: Rc, negated: bool) -> ScalarExpr { + ScalarExpr::InSubquery { + expr: Box::new(expr), + subquery, + negated, + } + } + + /// `value(2) > 1`. + fn value_gt_1() -> ScalarExpr { + ScalarExpr::Compare { + left: Box::new(ScalarExpr::Column(2)), + op: CompareOpKind::Gt, + right: Box::new(ScalarExpr::Literal(ScalarValue::Int64(1))), + semantics: ExprSemantics::Sql, + } + } + + fn literal_true() -> ScalarExpr { + ScalarExpr::Literal(ScalarValue::Boolean(true)) + } + + fn join_parts( + n: &OperatorNode, + ) -> (JoinKind, &ScalarExpr, &Rc, &Rc) { + match n.non_asap() { + Some(NonASAPOp::Join { + kind, + pred: Predicate(pred), + left, + right, + }) => (kind.clone(), pred, left, right), + _ => panic!("expected a Join, got {n:?}"), + } + } + + fn assert_idempotent(once: &Rc) { + let twice = canonicalize(Rc::clone(once)).unwrap(); + assert!(Rc::ptr_eq(once, &twice), "canonicalize must be idempotent"); + } + + #[test] + fn exists_filter_becomes_semi_join() { + let (left, sub) = (scan(), one_column_subquery()); + let q = filter_of(exists(Rc::clone(&sub), false), Rc::clone(&left)); + let out = canonicalize(q).unwrap(); + let (kind, pred, l, r) = join_parts(&out); + assert_eq!(kind, JoinKind::Semi); + assert_eq!(*pred, literal_true()); + assert!(Rc::ptr_eq(l, &left) && Rc::ptr_eq(r, &sub)); + assert_eq!( + out.schema.fields, left.schema.fields, + "a semi join outputs the left's columns" + ); + assert_idempotent(&out); + } + + #[test] + fn not_exists_becomes_anti_join() { + let (left, sub) = (scan(), one_column_subquery()); + let q = filter_of(exists(Rc::clone(&sub), true), Rc::clone(&left)); + let out = canonicalize(q).unwrap(); + let (kind, pred, l, r) = join_parts(&out); + assert_eq!(kind, JoinKind::Anti); + assert_eq!(*pred, literal_true()); + assert!(Rc::ptr_eq(l, &left) && Rc::ptr_eq(r, &sub)); + assert_idempotent(&out); + } + + #[test] + fn in_subquery_becomes_semi_join_on_the_subquery_column() { + // `WHERE service IN (SELECT service …)` over a 3-column left: the + // subquery's column is `Column(3)` in the `left ++ right` scope. + let (left, sub) = (scan(), one_column_subquery()); + let q = filter_of( + in_subquery(ScalarExpr::Column(1), Rc::clone(&sub), false), + Rc::clone(&left), + ); + let out = canonicalize(q).unwrap(); + let (kind, pred, l, r) = join_parts(&out); + assert_eq!(kind, JoinKind::Semi); + assert_eq!( + *pred, + ScalarExpr::Compare { + left: Box::new(ScalarExpr::Column(1)), + op: CompareOpKind::Eq, + right: Box::new(ScalarExpr::Column(3)), + semantics: ExprSemantics::Sql, + } + ); + assert!(Rc::ptr_eq(l, &left) && Rc::ptr_eq(r, &sub)); + assert_eq!( + out.schema.fields, left.schema.fields, + "a semi join outputs the left's columns" + ); + assert_idempotent(&out); + } + + #[test] + fn exists_with_other_conjuncts_keeps_an_outer_filter() { + // `WHERE value > 1 AND EXISTS (…)` → Filter{ value > 1 }{ Semi }. + let (left, sub) = (scan(), one_column_subquery()); + let q = filter_of( + ScalarExpr::BoolAnd(vec![value_gt_1(), exists(Rc::clone(&sub), false)]), + Rc::clone(&left), + ); + let out = canonicalize(q).unwrap(); + let Some(NonASAPOp::Filter { + pred: Predicate(pred), + child, + }) = out.non_asap() + else { + panic!("expected an outer Filter, got {out:?}"); + }; + assert_eq!(*pred, value_gt_1()); + let (kind, _, l, r) = join_parts(child); + assert_eq!(kind, JoinKind::Semi); + assert!(Rc::ptr_eq(l, &left) && Rc::ptr_eq(r, &sub)); + assert_idempotent(&out); + } + + #[test] + fn two_subquery_conjuncts_become_nested_joins() { + // `WHERE EXISTS (a) AND service NOT EXISTS (b) AND value > 1` sheds + // one conjunct per round: Filter{ value > 1 }{ Anti{ Semi{ l, a }, b } }. + let (left, a, b) = (scan(), one_column_subquery(), one_column_subquery()); + let q = filter_of( + ScalarExpr::BoolAnd(vec![ + exists(Rc::clone(&a), false), + exists(Rc::clone(&b), true), + value_gt_1(), + ]), + Rc::clone(&left), + ); + let out = canonicalize(q).unwrap(); + let Some(NonASAPOp::Filter { + pred: Predicate(pred), + child, + }) = out.non_asap() + else { + panic!("expected an outer Filter, got {out:?}"); + }; + assert_eq!(*pred, value_gt_1()); + let (kind, _, inner, r) = join_parts(child); + assert_eq!(kind, JoinKind::Anti); + assert!(Rc::ptr_eq(r, &b)); + let (kind, _, l, r) = join_parts(inner); + assert_eq!(kind, JoinKind::Semi); + assert!(Rc::ptr_eq(l, &left) && Rc::ptr_eq(r, &a)); + assert_idempotent(&out); + } + + #[test] + fn not_in_subquery_is_left_alone() { + let q = filter_of( + in_subquery(ScalarExpr::Column(1), one_column_subquery(), true), + scan(), + ); + let out = canonicalize(Rc::clone(&q)).unwrap(); + assert!(Rc::ptr_eq(&out, &q), "NOT IN keeps its Filter"); + assert_idempotent(&out); + } + + #[test] + fn lifted_subquery_is_canonicalized() { + // The subquery is itself a promotable heavy-hitter; once lifted into + // the join it is canonical, so a second pass finds nothing to do. + let sub = limit(5, 0, sort(desc(1), count_by_service())); + let q = filter_of(exists(sub, false), scan()); + let out = canonicalize(q).unwrap(); + let (_, _, _, r) = join_parts(&out); + assert!(is_topk_over_count(r)); + assert_idempotent(&out); + } +} diff --git a/crates/types/src/ir/cse.rs b/crates/types/src/ir/cse.rs new file mode 100644 index 000000000..eb6fc4bf7 --- /dev/null +++ b/crates/types/src/ir/cse.rs @@ -0,0 +1,791 @@ +//! Structural common-subexpression elimination over the unified operator IR: +//! bottom-up hash-consing of [`OperatorNode`] DAGs across a workload's roots. +//! +//! CSE only runs on already-bound, already-canonicalized plans — structural +//! matching is meaningless before canonicalization has converged +//! semantically-equivalent queries onto one shape. [`share_common_sub_dags`] +//! is the single entry point, run once per workload batch (a batch of one +//! still deduplicates a query's own repeated sub-DAGs, see below). +//! +//! ## Algorithm: classic hash-consing / value-numbering +//! +//! Bottom-up: every child is interned before its parent, so two parents whose +//! children were independently deduplicated down to the same `Rc`s are +//! structurally identical iff their own fields also match, without re-walking +//! the sub-DAGs. "Child" means everything [`OperatorNode::children`] returns: +//! the operator inputs *and* the operator nodes a scalar expression reads +//! (`PromqlScalarFromVector`, `ScalarSubquery`, `Exists`, `InSubquery`), so a +//! vector read by `scalar(v)` in two queries is shared like any other input. +//! The scalar expressions themselves stay opaque data on their owning node. +//! +//! ## Correctness: hash is a filter, `PartialEq` is the decision +//! +//! This is the one non-negotiable rule. A **false positive** here — two +//! sub-DAGs wrongly judged shareable — is a wrong query answer, not a missed +//! optimization: two different queries would read each other's data. +//! [`structural_hash`] (SipHash over a canonical serialization, no +//! collision-freedom guarantee) may only narrow the candidate set within one +//! bucket; the typed equality check on that bucket ([`same_node`]) is what +//! actually decides sharing, every time, no exceptions for "the hash probably +//! didn't collide." Equality is intentionally conservative: it recognizes +//! *exact* structural matches only, never "a stricter-accuracy summary could +//! also answer a looser request" (that subsumption question belongs to the +//! ASAP matcher, not here). +//! +//! ## Legality +//! +//! Structural equality is necessary but not sufficient. A non-ASAP node is +//! only ever *returned* as a match for another when its output has a provable +//! unique key (`Schema::has_unique_key()`): a producer's output can only be +//! shared across consumers when its row identity is stable across reads, so +//! an ungrouped aggregate, a `without(..)` grouping, a `Concat`/`SetOp` that +//! drops its keys, … is always inserted fresh even when it is structurally +//! identical to something already interned. An ASAP node (summary state and +//! its evaluations) has no such gate: equal operator, schema and guarantee make +//! it shareable, exactly as post-ASAP sharing decided before this IR. +//! +//! ## Single-query CSE falls out for free +//! +//! A repeated sub-expression within *one* query (the same grouped aggregate on +//! both `BinaryOp` branches) is deduplicated by the same bottom-up interning — +//! a workload of size one still interns bottom-up within that one DAG. + +use std::collections::hash_map::DefaultHasher; +use std::collections::HashMap; +use std::hash::{Hash, Hasher}; +use std::rc::Rc; + +use super::node::{Operator, OperatorNode}; +use super::non_asap::NonASAPOp; +use crate::pre_asap::schema::Schema; + +/// [`structural_hash`]'s memoization cache: an already-hashed node's `Rc` +/// pointer to its hash. A fresh cache is always correct; what matters is +/// letting it persist across every node of one bottom-up pass rather than +/// starting a new one per call. The caller must keep every cached node alive +/// for the cache's lifetime, or a reused address would alias a stale entry. +pub type HashCache = HashMap<*const OperatorNode, u64>; + +/// A constant stand-in for every child position. Substituting it before +/// serializing or comparing a node leaves exactly the node's own fields. +fn placeholder() -> Rc { + Rc::new(OperatorNode::with_schema( + Operator::NonASAP(NonASAPOp::Values { + rows: vec![], + schema: Schema::lifted(vec![], None), + }), + Schema::lifted(vec![], None), + )) +} + +/// The operator with every child — operator inputs and the operator nodes +/// referenced from its scalar expressions alike — replaced by +/// [`placeholder`]. What remains is the node's own data: variant tag, scalar +/// expressions (with their operator references blanked), parameters. +fn own_fields(node: &OperatorNode) -> Operator { + let placeholder = placeholder(); + node.operator.map_children(|_| Rc::clone(&placeholder)) +} + +/// Coarse structural hash used only to bucket [`InternTable::intern`]'s +/// candidate search — never the sharing decision ([`same_node`] is). +/// +/// `OperatorNode` carries `f64`s (`ScalarValue::Float64`, quantile targets, +/// `ResultGuarantee` bounds, …), so it cannot derive `std::hash::Hash`. The +/// hash is SipHash over two parts: +/// +/// 1. the canonical JSON of [`own_fields`] plus `result_kind`, `schema`, +/// `guarantee` and `timing` — every field `PartialEq` compares except the +/// children. A scalar expression is serialized as data with each operator +/// node it reads replaced by a constant placeholder, so a reference to an +/// interned sub-DAG contributes nothing of its own here; +/// 2. for every child in [`OperatorNode::children`] order (operator inputs, +/// then scalar-referenced nodes), the child's own `structural_hash`, +/// memoized in `cache` by `Rc` pointer identity. +/// +/// Part 2 is what makes equal sub-DAGs hash equal whether they are reached +/// through an operator input or through a `scalar(v)`, and what keeps the +/// pass linear: a node is generally a DAG, and re-serializing a shared +/// descendant once per parent would cost `O(sub-DAG)` per node instead of +/// `O(1)` beyond the children's already-known hashes. A non-finite `f64` +/// serializes as `null`, merely widening one (still equality-checked) bucket. +pub fn structural_hash(node: &OperatorNode, cache: &mut HashCache) -> u64 { + fn child_hash(child: &Rc, cache: &mut HashCache) -> u64 { + let ptr = Rc::as_ptr(child); + if let Some(&h) = cache.get(&ptr) { + return h; + } + let h = structural_hash(child, cache); + cache.insert(ptr, h); + h + } + + let mut hasher = DefaultHasher::new(); + let own = ( + own_fields(node), + node.result_kind, + &node.schema, + &node.guarantee, + node.timing, + &node.coverage, + ); + serde_json::to_string(&own) + .unwrap_or_default() + .hash(&mut hasher); + for child in node.children() { + child_hash(child, cache).hash(&mut hasher); + } + hasher.finish() +} + +/// Numeric `PartialEq` alone conflates signed zeros. The serialized check is +/// additional evidence, never a replacement for typed equality (JSON maps +/// non-finite floats to `null`). Used for the guarantee, whose bounds are +/// floats a shared node must preserve bit-for-bit. +fn same_value(left: &T, right: &T) -> bool { + left == right + && match (serde_json::to_string(left), serde_json::to_string(right)) { + (Ok(left), Ok(right)) => left == right, + _ => false, + } +} + +/// Memo of child-pair comparisons already decided by [`same_node`], keyed by +/// pointer pair. Only interned (table-owned, hence alive) nodes are keys. +type EqMemo = HashMap<(*const OperatorNode, *const OperatorNode), bool>; + +/// The sharing decision: typed equality of two nodes. +/// +/// `OperatorNode`'s derived `PartialEq` would recurse into children by value +/// even when both sides hold the same `Rc` (`OperatorNode` is not `Eq`, so +/// `Rc` gets no pointer shortcut), expanding a shared diamond once per path. +/// Children are therefore compared by pointer first; only when the pointers +/// differ (an equal child that was not legal to share) are the values +/// compared, memoized per pair so a diamond is still walked once. +fn same_node(left: &OperatorNode, right: &OperatorNode, memo: &mut EqMemo) -> bool { + let (lc, rc) = (left.children(), right.children()); + if lc.len() != rc.len() { + return false; + } + let children_equal = lc.iter().zip(&rc).all(|(a, b)| { + if Rc::ptr_eq(a, b) { + return true; + } + let key = (Rc::as_ptr(a), Rc::as_ptr(b)); + if let Some(&eq) = memo.get(&key) { + return eq; + } + let eq = same_node(a, b, memo); + memo.insert(key, eq); + eq + }); + children_equal + && left.result_kind == right.result_kind + && left.schema == right.schema + && left.timing == right.timing + && left.coverage == right.coverage + && same_value(&left.guarantee, &right.guarantee) + && same_value(&own_fields(left), &own_fields(right)) +} + +/// Bottom-up hash-consing table: structurally-equal, sharing-legal nodes +/// collapse onto one `Rc`. +/// +/// `buckets` is keyed by [`structural_hash`] — a coarse candidate filter +/// only. Every entry within one bucket is a full node kept around for the +/// [`same_node`] comparison that actually decides a match; a hash collision +/// between structurally different nodes just means a harmless linear scan of +/// a few extra candidates. +struct InternTable { + buckets: HashMap>>, + /// Persisted for the table's whole lifetime so hashing is `O(1)` per node + /// beyond its children; every cached node is owned by `buckets`. + hash_cache: HashCache, + eq_memo: EqMemo, +} + +impl InternTable { + fn new() -> Self { + Self { + buckets: HashMap::new(), + hash_cache: HashMap::new(), + eq_memo: HashMap::new(), + } + } + + /// Intern one node whose children are already interned: look it up by + /// [`structural_hash`], confirm with [`same_node`], and — only when + /// sharing is legal (module doc, "Legality") — return the existing `Rc` + /// instead of allocating a new one. + fn intern(&mut self, node: OperatorNode) -> Rc { + let hash = structural_hash(&node, &mut self.hash_cache); + // A node that is not legal to share is never *returned* as a match + // for something else; it still occupies a fresh slot in the bucket + // (harmless: later scans require legality of the new node too). + let reusable = node.is_asap() || node.schema.has_unique_key(); + let bucket = self.buckets.entry(hash).or_default(); + if reusable { + if let Some(existing) = bucket + .iter() + .find(|candidate| same_node(candidate, &node, &mut self.eq_memo)) + { + return Rc::clone(existing); + } + } + let rc = Rc::new(node); + bucket.push(Rc::clone(&rc)); + rc + } +} + +/// Count of *unique* nodes reachable from `root` (pointer identity, +/// following [`OperatorNode::children`]): the real size of the DAG, not a +/// tree-walk count that re-counts a shared descendant once per parent. +pub fn dag_node_count(root: &Rc) -> usize { + OperatorNode::reachable(root).len() +} + +/// Input pointer → (input `Rc`, interned result). The input `Rc` is retained +/// so its address cannot be freed and reused by a fresh allocation while the +/// memo still maps it. +type Visited = HashMap<*const OperatorNode, (Rc, Rc)>; + +/// Intern `node`'s children (recursively), then `node` itself. The rebuilt +/// node keeps `node`'s retained schema, result kind, guarantee and timing: +/// every child is replaced by an equal node, so each derived property stays +/// valid, and the result is `PartialEq`-equal to the input. +fn intern_bottom_up( + table: &mut InternTable, + visited: &mut Visited, + node: &Rc, +) -> Rc { + if let Some((_, interned)) = visited.get(&Rc::as_ptr(node)) { + return Rc::clone(interned); + } + let operator = node + .operator + .map_children(|child| intern_bottom_up(table, visited, child)); + let rebuilt = OperatorNode { + operator, + result_kind: node.result_kind, + schema: node.schema.clone(), + guarantee: node.guarantee.clone(), + timing: node.timing, + coverage: node.coverage.clone(), + }; + let interned = table.intern(rebuilt); + visited.insert(Rc::as_ptr(node), (Rc::clone(node), Rc::clone(&interned))); + interned +} + +/// Share structurally-identical, sharing-legal sub-DAGs across a workload's +/// roots (or within one root). Every root's *value* is unchanged +/// (`PartialEq`-equal to its input) — only its internal `Rc` structure may +/// now alias another root's, or another part of its own DAG. A node already +/// reached through two paths is visited once. +/// +/// `Id` is caller-chosen — a workload entry's key, an index, a query name. +pub fn share_common_sub_dags( + roots: Vec<(Id, Rc)>, +) -> Vec<(Id, Rc)> { + let mut table = InternTable::new(); + let mut visited = Visited::new(); + roots + .into_iter() + .map(|(id, root)| (id, intern_bottom_up(&mut table, &mut visited, &root))) + .collect() +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::ir::asap::ASAPOp; + use crate::ir::operator_properties::{BinaryOpKind, GroupKeys, Reduction, Source}; + use crate::ir::BinaryOperator; + use crate::ir::ScalarExpr; + use crate::post_asap::guarantee::ResultGuarantee; + use crate::post_asap::sketch::{ + GroupingStrategy, SketchAlgorithm, SketchKind, SketchParams, SummaryUpdate, + }; + use crate::pre_asap::agg_intent::AggIntent; + use crate::pre_asap::expr_ir::{ColumnRef, CompareOpKind}; + use crate::pre_asap::schema::{DataType, Field, FieldDataType, Schema}; + + use crate::types::AccuracyTarget; + + fn node(op: NonASAPOp) -> Rc { + OperatorNode::new_shared(crate::ir::Operator::NonASAP(op)).unwrap() + } + + /// `[ts, service, value, latency]`, no unique key. + fn scan() -> Rc { + node(NonASAPOp::Scan { + source: Source::TimeSeries { metric: "m".into() }, + predicates: vec![], + schema: Schema::with_time_index( + vec![ + Field::plain("ts", DataType::Timestamp, false), + Field::plain("service", DataType::Utf8, false), + Field::plain("value", DataType::Float64, false), + Field::plain("latency", DataType::Float64, false), + ], + 0, + vec![], + ), + }) + } + + fn quantile_agg(by: Vec, col: Option, q: f64) -> Rc { + node(NonASAPOp::Aggregate { + reduction: Reduction::by(by), + measures: vec![AggIntent::Quantile { + col, + q, + accuracy: AccuracyTarget::Exact, + }], + output_names: vec![], + filters: vec![], + having: None, + child: scan(), + }) + } + + fn compare(lhs: Rc, rhs: Rc) -> Rc { + node(NonASAPOp::BinaryOp { + operator: BinaryOperator { + checked_relative_division: false, + checked_finite_division: false, + kind: BinaryOpKind::Compare(CompareOpKind::Eq), + vector_match: None, + }, + return_bool: false, + lhs, + rhs, + }) + } + + fn two_roots(a: Rc, b: Rc) -> (Rc, Rc) { + let shared = share_common_sub_dags(vec![("a", a), ("b", b)]); + let [(_, ra), (_, rb)] = shared.as_slice() else { + panic!("expected 2 roots"); + }; + (Rc::clone(ra), Rc::clone(rb)) + } + + #[test] + fn distinct_column_quantiles_do_not_merge() { + // Grouped (unique key present) so only the differing `col` blocks it. + let (ra, rb) = two_roots( + quantile_agg(vec![1], Some(2), 0.5), + quantile_agg(vec![1], Some(3), 0.5), + ); + assert!(!Rc::ptr_eq(&ra, &rb)); + assert_ne!(ra, rb); + } + + #[test] + fn no_unique_keys_means_no_merge_even_when_structurally_identical() { + let a = quantile_agg(vec![], Some(2), 0.9); + let b = quantile_agg(vec![], Some(2), 0.9); + assert_eq!(a, b, "fixture sanity: structurally equal"); + assert!( + !a.schema.has_unique_key(), + "fixture sanity: a global aggregate has no provable unique key" + ); + let (ra, rb) = two_roots(a, b); + assert!( + !Rc::ptr_eq(&ra, &rb), + "no unique key ⇒ never hoisted, even for an identical structural match" + ); + } + + #[test] + fn median_and_explicit_half_percentile_merge() { + // Two spellings that lower to the identical grouped `Quantile { q: 0.5 }`. + let (m, p) = two_roots( + quantile_agg(vec![1], Some(2), 0.5), + quantile_agg(vec![1], Some(2), 0.5), + ); + assert!(Rc::ptr_eq(&m, &p)); + } + + #[test] + fn single_query_shares_its_own_repeated_sub_dag() { + // One root with the same grouped aggregate on both branches, built as + // two separately-allocated sub-DAGs (no sharing yet). + let root = compare( + quantile_agg(vec![1], Some(2), 0.5), + quantile_agg(vec![1], Some(2), 0.5), + ); + let shared = share_common_sub_dags(vec![("q", root)]); + let [(_, root)] = shared.as_slice() else { + panic!("expected 1 root"); + }; + let Some(NonASAPOp::BinaryOp { lhs, rhs, .. }) = root.non_asap() else { + panic!("expected BinaryOp root, got {root:?}"); + }; + assert!(Rc::ptr_eq(lhs, rhs)); + } + + #[test] + fn shared_root_value_is_unchanged() { + let a = quantile_agg(vec![1], Some(2), 0.5) + .as_ref() + .clone() + .with_guarantee(Some(ResultGuarantee::exact("fixture"))); + let before = Rc::new(a); + let (ra, _) = two_roots(Rc::clone(&before), Rc::clone(&before)); + assert_eq!(ra.as_ref(), before.as_ref()); + assert!( + ra.guarantee.is_some(), + "retained properties survive the rebuild" + ); + } + + // ── scalar-referenced sub-DAGs ────────────────────────────────────── + + /// `vector(scalar(sum by (service) (up)))`. + fn scalar_of_vector() -> Rc { + let sum_up = node(NonASAPOp::Aggregate { + reduction: Reduction::by(vec![1]), + measures: vec![AggIntent::Sum { col: Some(2) }], + output_names: vec![], + filters: vec![], + having: None, + child: scan(), + }); + assert!(sum_up.schema.has_unique_key(), "fixture sanity"); + node(NonASAPOp::PromqlVectorFromScalar( + ScalarExpr::PromqlScalarFromVector(sum_up), + )) + } + + fn bridged_vector(root: &Rc) -> &Rc { + match root.non_asap() { + Some(NonASAPOp::PromqlVectorFromScalar(ScalarExpr::PromqlScalarFromVector(v))) => v, + other => panic!("expected vector(scalar(v)), got {other:?}"), + } + } + + #[test] + fn scalar_referenced_vector_is_shared_across_queries() { + let (ra, rb) = two_roots(scalar_of_vector(), scalar_of_vector()); + assert!( + Rc::ptr_eq(bridged_vector(&ra), bridged_vector(&rb)), + "the vector read by scalar(v) is a child and must be interned" + ); + assert!( + !Rc::ptr_eq(&ra, &rb), + "the scalar bridge itself has no unique key and stays separate" + ); + } + + #[test] + fn structural_hash_sees_through_a_scalar_reference() { + // Two equal bridges must hash equal whether or not their referenced + // vector is the same Rc — the reference contributes the vector's + // memoized hash, not its identity. + let a = scalar_of_vector(); + let b = scalar_of_vector(); + let mut cache = HashMap::new(); + assert_eq!( + structural_hash(&a, &mut cache), + structural_hash(&b, &mut cache) + ); + assert_eq!( + cache.len(), + 4, + "aggregate + scan cached once per root: {cache:?}" + ); + let other = node(NonASAPOp::PromqlVectorFromScalar( + ScalarExpr::PromqlScalarFromVector(quantile_agg(vec![1], Some(2), 0.5)), + )); + assert_ne!( + structural_hash(&a, &mut cache), + structural_hash(&other, &mut cache) + ); + } + + // ── ASAP nodes ────────────────────────────────────────────────────── + + fn summary_agg(alpha: f64, guarantee: Option) -> Rc { + let family = FieldDataType::Sketch( + SketchKind::new(SketchAlgorithm::DDSketch, SketchParams::DDSketch { alpha }), + GroupingStrategy::default(), + ); + let schema = Schema::lifted(vec![Field::new("state", family.clone(), false)], None); + assert!(!schema.has_unique_key(), "fixture sanity"); + Rc::new( + OperatorNode::with_schema( + Operator::ASAP(ASAPOp::SummaryAgg { + child: scan(), + family, + input: SummaryUpdate::column(ColumnRef::SampleValue), + reduction: Reduction::PerEntity, + grouping: GroupingStrategy::default(), + filter: None, + }), + schema, + ) + .with_guarantee(guarantee), + ) + } + + #[test] + fn asap_nodes_share_without_a_unique_key() { + let exact = || Some(ResultGuarantee::exact("fixture")); + let (ra, rb) = two_roots(summary_agg(0.01, exact()), summary_agg(0.01, exact())); + assert!(Rc::ptr_eq(&ra, &rb)); + assert!(ra.guarantee.is_some()); + } + + #[test] + fn asap_nodes_with_distinct_parameters_or_guarantees_are_not_shared() { + let exact = || Some(ResultGuarantee::exact("fixture")); + let (ra, rb) = two_roots(summary_agg(0.01, exact()), summary_agg(0.001, exact())); + assert!(!Rc::ptr_eq(&ra, &rb), "different sketch parameters"); + let (ra, rb) = two_roots(summary_agg(0.01, exact()), summary_agg(0.01, None)); + assert!( + !Rc::ptr_eq(&ra, &rb), + "an unknown guarantee never borrows an exact one" + ); + assert!(rb.guarantee.is_none()); + } + + #[test] + fn evaluations_share_their_producer_but_not_each_other() { + use crate::post_asap::sketch::SketchStatistic; + let evaluation = |q: f64| { + Rc::new(OperatorNode::with_schema( + Operator::ASAP(ASAPOp::SummaryEstimate { + summary_input: summary_agg(0.01, None), + query: SketchStatistic::Quantile { q }, + }), + Schema::lifted( + vec![Field::plain("quantile", DataType::Float64, false)], + None, + ), + )) + }; + let (p95, p99) = two_roots(evaluation(0.95), evaluation(0.99)); + let producer = |n: &Rc| Rc::clone(n.children()[0]); + assert!(!Rc::ptr_eq(&p95, &p99)); + assert!(Rc::ptr_eq(&producer(&p95), &producer(&p99))); + } + + // ── structural_hash (DAG-aware memoization) ───────────────────────── + + #[test] + fn structural_hash_is_stable_across_cache_states() { + let agg = quantile_agg(vec![1], Some(2), 0.5); + let mut cold = HashMap::new(); + let mut warm = HashMap::new(); + structural_hash(&scan(), &mut warm); + assert_eq!( + structural_hash(&agg, &mut cold), + structural_hash(&agg, &mut warm), + "hash must be independent of unrelated cache state" + ); + } + + #[test] + fn structural_hash_of_an_internally_shared_dag_matches_the_unshared_equivalent() { + let agg = quantile_agg(vec![1], Some(2), 0.5); + let shared_root = compare(Rc::clone(&agg), Rc::clone(&agg)); + let unshared_root = compare( + quantile_agg(vec![1], Some(2), 0.5), + quantile_agg(vec![1], Some(2), 0.5), + ); + assert_eq!( + structural_hash(&shared_root, &mut HashMap::new()), + structural_hash(&unshared_root, &mut HashMap::new()), + ); + } + + #[test] + fn structural_hash_memoizes_a_shared_descendant_exactly_once() { + let agg = quantile_agg(vec![1], Some(2), 0.5); + let root = compare(Rc::clone(&agg), Rc::clone(&agg)); + let mut cache = HashMap::new(); + structural_hash(&root, &mut cache); + assert_eq!( + cache.len(), + 2, + "one entry per unique node in the shared branch (Aggregate + Scan): {cache:?}" + ); + } + + // ── dag_node_count ─────────────────────────────────────────────────── + + #[test] + fn dag_node_count_is_the_naive_count_when_nothing_is_shared() { + assert_eq!(dag_node_count(&scan()), 1); + assert_eq!(dag_node_count(&quantile_agg(vec![1], Some(2), 0.5)), 2); + assert_eq!( + dag_node_count(&scalar_of_vector()), + 3, + "follows scalar references" + ); + } + + #[test] + fn dag_node_count_deduplicates_an_internally_shared_sub_dag() { + let root = compare( + quantile_agg(vec![1], Some(2), 0.5), + quantile_agg(vec![1], Some(2), 0.5), + ); + assert_eq!( + dag_node_count(&root), + 5, + "fixture sanity: nothing shared yet" + ); + let shared = share_common_sub_dags(vec![("q", root)]); + let [(_, root)] = shared.as_slice() else { + panic!("expected 1 root"); + }; + assert_eq!( + dag_node_count(root), + 3, + "BinaryOp + one Aggregate + its Scan" + ); + } + + #[test] + fn dag_node_count_deduplicates_across_two_workload_roots() { + let (ra, rb) = two_roots( + quantile_agg(vec![1], Some(2), 0.5), + quantile_agg(vec![1], Some(2), 0.5), + ); + assert!(Rc::ptr_eq(&ra, &rb), "fixture sanity: the two roots merged"); + assert_eq!(dag_node_count(&ra), 2); + assert_eq!(dag_node_count(&rb), 2); + } + + #[test] + fn dedup_gates_sharing_the_same_as_aggregate() { + // `Dedup { cols }` adds `cols` as a unique key, so two identical + // `Dedup`s merge even though their keyless `Scan`s could not. + let dedup = || { + node(NonASAPOp::Dedup { + cols: vec![1], + child: scan(), + }) + }; + let (ra, rb) = two_roots(dedup(), dedup()); + assert!(Rc::ptr_eq(&ra, &rb)); + } + + #[test] + fn group_keys_gate_still_prevented_when_partition_by_without_used() { + let without_agg = || { + node(NonASAPOp::Aggregate { + reduction: Reduction::Reduce(GroupKeys::without(vec![0])), + measures: vec![AggIntent::Count { + accuracy: AccuracyTarget::Exact, + }], + output_names: vec![], + filters: vec![], + having: None, + child: scan(), + }) + }; + let a = without_agg(); + assert!(!a.schema.has_unique_key()); + let (ra, rb) = two_roots(a, without_agg()); + assert!(!Rc::ptr_eq(&ra, &rb)); + } + + #[test] + fn already_shared_nodes_are_visited_once() { + // A diamond already present in the input stays one node and is not + // re-interned per path. + let agg = quantile_agg(vec![1], Some(2), 0.5); + let root = compare(Rc::clone(&agg), Rc::clone(&agg)); + let shared = share_common_sub_dags(vec![("q", root)]); + let Some(NonASAPOp::BinaryOp { lhs, rhs, .. }) = shared[0].1.non_asap() else { + panic!("expected BinaryOp root"); + }; + assert!(Rc::ptr_eq(lhs, rhs)); + assert_eq!(dag_node_count(&shared[0].1), 3); + } + + // Comparing a shareable node whose equal-but-unshareable children form a + // deep diamond must not expand the diamond once per path. The timeout is + // a coarse runaway guard, not a performance SLA. + #[test] + fn shared_diamond_does_not_expand_during_comparison() { + let (done, completion) = std::sync::mpsc::channel(); + let worker = std::thread::spawn(move || { + fn keyed_diamond() -> Rc { + // BinaryOp over a keyless scan has no unique key at any level, + // so none of the 24 levels is shareable; the `Dedup` on top is. + let mut current = scan(); + for _ in 0..24 { + current = compare(Rc::clone(¤t), current); + } + node(NonASAPOp::Dedup { + cols: vec![1], + child: current, + }) + } + let (ra, rb) = two_roots(keyed_diamond(), keyed_diamond()); + assert!(Rc::ptr_eq(&ra, &rb)); + done.send(()).unwrap(); + }); + completion + .recv_timeout(std::time::Duration::from_secs(5)) + .expect("comparison expanded the shared DAG"); + worker.join().unwrap(); + } + + /// A keyed (hence shareable) projection emitting the literal `value`. + fn keyed_literal(value: f64) -> Rc { + let keyed = node(NonASAPOp::Scan { + source: Source::TimeSeries { metric: "m".into() }, + predicates: vec![], + schema: Schema::with_time_index( + vec![ + Field::plain("ts", DataType::Timestamp, false), + Field::plain("service", DataType::Utf8, false), + ], + 0, + vec![vec![1]], + ), + }); + node(NonASAPOp::Project { + cols: vec![ + crate::ir::ProjectItem { + alias: None, + expr: ScalarExpr::Column(1), + }, + crate::ir::ProjectItem { + alias: Some("v".into()), + expr: ScalarExpr::literal_f64(value), + }, + ], + qualifier: None, + child: keyed, + }) + } + + /// Sharing preserves IEEE signed zero, and JSON's `null` encoding of + /// non-finite floats never becomes the equality decision. + #[test] + fn signed_zero_and_nonfinite_values_remain_distinct() { + assert!( + keyed_literal(0.0).schema.has_unique_key(), + "fixture is shareable" + ); + for (a, b) in [ + (0.0, -0.0), + (-0.0, 0.0), + (f64::INFINITY, f64::NEG_INFINITY), + (f64::NAN, f64::NAN), + ] { + let (ra, rb) = two_roots(keyed_literal(a), keyed_literal(b)); + assert!(!Rc::ptr_eq(&ra, &rb), "{a} and {b} must not be shared"); + } + let (ra, rb) = two_roots(keyed_literal(f64::INFINITY), keyed_literal(f64::INFINITY)); + assert!(Rc::ptr_eq(&ra, &rb)); + } +} diff --git a/crates/types/src/ir/error.rs b/crates/types/src/ir/error.rs index 4b6849965..a0f9e2271 100644 --- a/crates/types/src/ir/error.rs +++ b/crates/types/src/ir/error.rs @@ -16,4 +16,6 @@ pub enum SchemaDerivationError { EmptyConcat, #[error("invalid per-series sample column: {0}")] InvalidSampleColumn(String), + #[error("invalid summary coverage: {0}")] + Coverage(#[from] super::summary_coverage::CoverageError), } diff --git a/crates/types/src/ir/export.rs b/crates/types/src/ir/export.rs new file mode 100644 index 000000000..9fa6496de --- /dev/null +++ b/crates/types/src/ir/export.rs @@ -0,0 +1,366 @@ +//! Logical ASAP DAG transport (planner-layering stage 1), with no execution timing assigned. +//! +//! This representation preserves operator semantics and summary state types. +//! Timing is derived from materialization during physical planning; +//! physical implementation, materialization and retention remain downstream. +use std::collections::{HashMap, HashSet}; +use std::rc::Rc; + +use serde::{Deserialize, Serialize}; +use thiserror::Error; + +pub use super::physical_export::*; +pub use super::wire::NonASAPOpKind; +use super::wire::{grouping_compatibility, input_edges, payload_of}; +pub use super::wire::{ + EdgeRole, GroupingEdgeCompatibility, LogicalASAPNodeId, LogicalASAPOperatorPayload, + WirePredicate, WireProjectItem, WireScalarExpr, WireSortKey, +}; +use super::{ASAPOp, Operator, OperatorNode, OperatorResultKind, QueryRoot, SchemaDerivationError}; +use crate::post_asap::guarantee::ResultGuarantee; +use crate::pre_asap::{FieldDataType, Schema}; + +/// Independent envelope version: this replaces the older phase-assigned format. +pub const LOGICAL_ASAP_DAG_WIRE_VERSION: u32 = 1; + +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +#[serde(deny_unknown_fields)] +pub struct LogicalASAPDAGNode { + pub id: LogicalASAPNodeId, + pub payload: LogicalASAPOperatorPayload, + pub result_kind: OperatorResultKind, + pub output_schema: Schema, + pub guarantee: Option, + #[serde(default)] + pub coverage: Option, +} + +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +#[serde(deny_unknown_fields)] +pub struct LogicalASAPDAGEdge { + pub producer: LogicalASAPNodeId, + pub consumer: LogicalASAPNodeId, + pub role: EdgeRole, + pub intermediate_schema: Schema, + pub grouping: GroupingEdgeCompatibility, +} + +/// Standalone scalars remain scalar roots rather than fabricated operator nodes. +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +#[serde(deny_unknown_fields)] +pub enum LogicalASAPQueryRoot { + Operator(LogicalASAPNodeId), + Scalar(WireScalarExpr), +} +impl LogicalASAPQueryRoot { + pub fn operator_refs(&self) -> Vec { + match self { + Self::Operator(id) => vec![*id], + Self::Scalar(expr) => expr.operator_refs(), + } + } +} + +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +#[serde(deny_unknown_fields)] +pub struct LogicalASAPDAG { + pub nodes: Vec, + pub edges: Vec, + /// One root per query of the batch, in workload order. Queries that share + /// a sub-DAG reference the same exported nodes. + pub roots: Vec, +} + +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +#[serde(deny_unknown_fields)] +pub struct LogicalASAPDAGDocument { + pub schema_version: u32, + pub dag: LogicalASAPDAG, +} + +#[derive(Debug, Clone, PartialEq, Eq, Error)] +pub enum LogicalASAPDAGValidationError { + #[error("unsupported logical ASAP DAG version {0}")] + UnsupportedVersion(u32), + #[error("duplicate logical node {0:?}")] + DuplicateNode(LogicalASAPNodeId), + #[error("missing logical node {0:?}")] + MissingNode(LogicalASAPNodeId), + #[error("edge schema differs from producer {0:?}")] + EdgeSchemaMismatch(LogicalASAPNodeId), + #[error("summary node {0:?} schema does not contain its declared family/grouping")] + SummarySchemaMismatch(LogicalASAPNodeId), + #[error("invalid summary coverage at {0:?}")] + InvalidCoverage(LogicalASAPNodeId), + #[error("logical ASAP DAG has no query roots")] + NoRoots, + #[error("logical ASAP DAG contains a cycle")] + Cycle, + #[error("unreachable logical node {0:?}")] + UnreachableNode(LogicalASAPNodeId), +} + +impl LogicalASAPDAGDocument { + pub fn new(dag: LogicalASAPDAG) -> Self { + Self { + schema_version: LOGICAL_ASAP_DAG_WIRE_VERSION, + dag, + } + } + + pub fn validate(&self) -> Result<(), LogicalASAPDAGValidationError> { + if self.schema_version != LOGICAL_ASAP_DAG_WIRE_VERSION { + return Err(LogicalASAPDAGValidationError::UnsupportedVersion( + self.schema_version, + )); + } + self.dag.validate() + } +} + +impl LogicalASAPDAG { + /// Transport integrity checks; full operator/scalar typing is checked on + /// the in-memory IR before compilation. + pub fn validate(&self) -> Result<(), LogicalASAPDAGValidationError> { + let mut nodes = HashMap::new(); + for node in &self.nodes { + if nodes.insert(node.id, node).is_some() { + return Err(LogicalASAPDAGValidationError::DuplicateNode(node.id)); + } + if let Some(coverage) = &node.coverage { + if node.result_kind != OperatorResultKind::State || coverage.validate().is_err() { + return Err(LogicalASAPDAGValidationError::InvalidCoverage(node.id)); + } + } + if let LogicalASAPOperatorPayload::SummaryAgg { + family, grouping, .. + } = &node.payload + { + if node.coverage.is_none() { + return Err(LogicalASAPDAGValidationError::InvalidCoverage(node.id)); + } + if !node.output_schema.fields.iter().any(|field| &field.dtype == family) + || node.output_schema.fields.iter().any(|field| matches!(&field.dtype, FieldDataType::Sketch(_, actual) if actual != grouping)) { + return Err(LogicalASAPDAGValidationError::SummarySchemaMismatch(node.id)); + } + } + } + if self.roots.is_empty() { + return Err(LogicalASAPDAGValidationError::NoRoots); + } + let roots: Vec<_> = self + .roots + .iter() + .flat_map(LogicalASAPQueryRoot::operator_refs) + .collect(); + for root in &roots { + if !nodes.contains_key(root) { + return Err(LogicalASAPDAGValidationError::MissingNode(*root)); + } + } + let mut inputs: HashMap<_, Vec<_>> = HashMap::new(); + for edge in &self.edges { + let producer = nodes + .get(&edge.producer) + .ok_or(LogicalASAPDAGValidationError::MissingNode(edge.producer))?; + if !nodes.contains_key(&edge.consumer) { + return Err(LogicalASAPDAGValidationError::MissingNode(edge.consumer)); + } + if edge.intermediate_schema != producer.output_schema { + return Err(LogicalASAPDAGValidationError::EdgeSchemaMismatch( + edge.producer, + )); + } + inputs.entry(edge.consumer).or_default().push(edge.producer); + } + for node in &self.nodes { + if matches!(node.payload, LogicalASAPOperatorPayload::SummaryMerge) { + let coverage = inputs + .get(&node.id) + .into_iter() + .flatten() + .map(|id| { + nodes[id] + .coverage + .clone() + .ok_or(LogicalASAPDAGValidationError::InvalidCoverage(node.id)) + }) + .collect::, _>>()?; + let merged = super::summary_coverage::SummaryCoverage::merge_disjoint(&coverage) + .map_err(|_| LogicalASAPDAGValidationError::InvalidCoverage(node.id))?; + if node.coverage.as_ref() != Some(&merged) { + return Err(LogicalASAPDAGValidationError::InvalidCoverage(node.id)); + } + } + } + fn visit( + id: LogicalASAPNodeId, + inputs: &HashMap>, + active: &mut HashSet, + done: &mut HashSet, + ) -> Result<(), LogicalASAPDAGValidationError> { + if done.contains(&id) { + return Ok(()); + } + if !active.insert(id) { + return Err(LogicalASAPDAGValidationError::Cycle); + } + for child in inputs.get(&id).into_iter().flatten() { + visit(*child, inputs, active, done)?; + } + active.remove(&id); + done.insert(id); + Ok(()) + } + let mut done = HashSet::new(); + for root in roots { + visit(root, &inputs, &mut HashSet::new(), &mut done)?; + } + if let Some(id) = nodes.keys().find(|id| !done.contains(id)) { + return Err(LogicalASAPDAGValidationError::UnreachableNode(*id)); + } + Ok(()) + } +} + +/// Compiler-local identity mapping; IDs are local to this logical export. +#[derive(Debug, Clone)] +pub struct LogicalASAPNodeIdentityMap { + nodes_by_id: Vec>, +} + +impl LogicalASAPNodeIdentityMap { + pub fn node_id(&self, node: &Rc) -> Option { + self.nodes_by_id + .iter() + .position(|candidate| Rc::ptr_eq(candidate, node)) + .map(|id| LogicalASAPNodeId(id as u32)) + } + pub fn operator_node(&self, id: LogicalASAPNodeId) -> Option<&Rc> { + self.nodes_by_id.get(id.0 as usize) + } +} + +#[derive(Debug, Clone)] +pub struct LogicalASAPDAGCompilation { + pub dag: LogicalASAPDAG, + pub node_ids: LogicalASAPNodeIdentityMap, +} + +pub fn compile_logical_asap_dag( + root: &Rc, +) -> Result { + Ok(compile_logical_asap_dag_with_node_ids(root)?.dag) +} + +pub fn compile_logical_asap_dag_with_node_ids( + root: &Rc, +) -> Result { + compile_logical_asap_query_with_node_ids(&QueryRoot::Operator(Rc::clone(root))) +} + +pub fn compile_logical_asap_query( + root: &QueryRoot, +) -> Result { + Ok(compile_logical_asap_query_with_node_ids(root)?.dag) +} + +pub fn compile_logical_asap_query_with_node_ids( + root: &QueryRoot, +) -> Result { + compile_logical_asap_workload_with_node_ids(std::slice::from_ref(root)) +} + +/// Export a batch of queries as one DAG with one root per query. +pub fn compile_logical_asap_workload( + roots: &[QueryRoot], +) -> Result { + Ok(compile_logical_asap_workload_with_node_ids(roots)?.dag) +} + +pub fn compile_logical_asap_workload_with_node_ids( + roots: &[QueryRoot], +) -> Result { + let mut exporter = Exporter::default(); + let mut exported = Vec::with_capacity(roots.len()); + for root in roots { + root.validate_structure()?; + exported.push(match root { + QueryRoot::Operator(node) => LogicalASAPQueryRoot::Operator(exporter.visit(node)), + QueryRoot::Scalar(expr) => { + for node in expr.operator_refs() { + exporter.visit(node); + } + LogicalASAPQueryRoot::Scalar(WireScalarExpr::from_expr(expr, &mut |n| { + exporter.ids[&Rc::as_ptr(n)] + })) + } + }); + } + let dag = LogicalASAPDAG { + nodes: exporter.nodes, + edges: exporter.edges, + roots: exported, + }; + Ok(LogicalASAPDAGCompilation { + dag, + node_ids: LogicalASAPNodeIdentityMap { + nodes_by_id: exporter.nodes_by_id, + }, + }) +} + +#[derive(Default)] +struct Exporter { + ids: HashMap<*const OperatorNode, LogicalASAPNodeId>, + nodes: Vec, + edges: Vec, + nodes_by_id: Vec>, +} + +impl Exporter { + fn visit(&mut self, node: &Rc) -> LogicalASAPNodeId { + if let Some(id) = self.ids.get(&Rc::as_ptr(node)) { + return *id; + } + let mut producers = Vec::new(); + for (child, role) in input_edges(&node.operator) { + producers.push((self.visit(child), child, role)); + } + let scalars = match &node.operator { + Operator::NonASAP(op) => op.scalar_exprs(), + Operator::ASAP(ASAPOp::SummaryAgg { + filter: Some(filter), + .. + }) => vec![&filter.0], + _ => vec![], + }; + for expr in scalars { + for referenced in expr.operator_refs() { + producers.push((self.visit(referenced), referenced, EdgeRole::ScalarRef)); + } + } + let id = LogicalASAPNodeId(self.nodes.len() as u32); + let payload = payload_of(&node.operator, &mut |n| self.ids[&Rc::as_ptr(n)]); + self.nodes.push(LogicalASAPDAGNode { + id, + payload, + result_kind: node.result_kind, + output_schema: node.schema.clone(), + guarantee: node.guarantee.clone(), + coverage: node.coverage.clone(), + }); + self.nodes_by_id.push(Rc::clone(node)); + self.ids.insert(Rc::as_ptr(node), id); + for (producer, child, role) in producers { + self.edges.push(LogicalASAPDAGEdge { + producer, + consumer: id, + role, + intermediate_schema: child.schema.clone(), + grouping: grouping_compatibility(&child.operator, &node.operator), + }); + } + id + } +} diff --git a/crates/types/src/ir/mod.rs b/crates/types/src/ir/mod.rs index d20bfd075..01d1da021 100644 --- a/crates/types/src/ir/mod.rs +++ b/crates/types/src/ir/mod.rs @@ -1,6 +1,4 @@ -//! Unified operator and scalar representation from #511. -//! Graph algorithms are added in the next stack layer; legacy consumers -//! remain on their existing representation until the planner cutover. +//! The operator IR from #511: one operator DAG for every planning stage. pub mod aggregate_schema; pub mod asap; pub mod error; @@ -15,3 +13,20 @@ pub use node::{Operator, OperatorNode, OperatorResultKind}; pub use non_asap::{BinaryOperator, NonASAPOp, TimeRangeKind}; pub use query::QueryRoot; pub use scalar::{ExprSemantics, Predicate, ProjectItem, ScalarExpr, SortKey}; + +pub mod canonicalize; +pub mod cse; +pub mod export; +/// Physical ASAP DAG transport: the logical payloads plus execution timing. +pub mod physical_export; +/// Execution timing for physical plans: a materialization assignment expanded onto every node. +pub mod timing; +pub use timing::{ + apply_materialization_timings, data_state, planned_data_state, split_shared_by_phase, + validate_maintained, MaterializationAssignment, TimingMemo, +}; +/// Semantic observation coverage, separate from field layout and physical timing. +pub mod summary_coverage; +mod wire; + +pub mod schema_support; diff --git a/crates/types/src/ir/node.rs b/crates/types/src/ir/node.rs index d68f5aa03..15431962f 100644 --- a/crates/types/src/ir/node.rs +++ b/crates/types/src/ir/node.rs @@ -10,9 +10,12 @@ use serde::{Deserialize, Serialize}; use super::asap::ASAPOp; use super::non_asap::NonASAPOp; +use super::operator_properties::Reduction; +use super::summary_coverage::{CoverageError, SummaryCoverage}; use crate::ir::SchemaDerivationError; use crate::post_asap::execution_data_state::ExecutionTiming; use crate::post_asap::guarantee::ResultGuarantee; +use crate::post_asap::SummaryUpdate; use crate::pre_asap::schema::Schema; /// The output category of an operator, derived from the operation and its @@ -86,7 +89,7 @@ impl Operator { /// `schema` and `result_kind` are derived from `operator` and its children /// at construction and retained. `guarantee` is `None` until accuracy /// assessment establishes one (`None` never means exact). `timing` is `None` -/// until a lifecycle assignment is applied; export rejects an executable +/// until a materialization assignment is applied; export rejects an executable /// node without one. #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] pub struct OperatorNode { @@ -95,6 +98,8 @@ pub struct OperatorNode { pub schema: Schema, pub guarantee: Option, pub timing: Option, + #[serde(default)] + pub coverage: Option, } impl OperatorNode { @@ -103,7 +108,11 @@ impl OperatorNode { /// ASAP operator, ...). pub fn new(operator: Operator) -> Result { let schema = operator.output_schema()?; - Ok(Self::with_schema(operator, schema)) + let mut node = Self::with_schema(operator, schema); + if let Some(op @ ASAPOp::SummaryMerge { .. }) = node.asap() { + node.coverage = Some(op.merged_coverage()?); + } + Ok(node) } /// Build a node with caller-supplied output names and qualifiers. For @@ -117,6 +126,7 @@ impl OperatorNode { schema, guarantee: None, timing: None, + coverage: None, } } @@ -137,6 +147,40 @@ impl OperatorNode { self } + /// Attach caller-established coverage. Required on summary nodes; see + /// [`Self::requires_coverage`]. + pub fn with_coverage( + mut self, + coverage: SummaryCoverage, + ) -> Result { + coverage.validate()?; + if self.result_kind != OperatorResultKind::State { + return Err(CoverageError::NotState.into()); + } + self.coverage = Some(coverage); + Ok(self) + } + + /// What a summary state is updated with and how it is grouped: the + /// `SummaryAgg` fields, or those shared by a `SummaryMerge`'s inputs. + pub fn summary_update(&self) -> Option<(&SummaryUpdate, &Reduction)> { + match self.asap()? { + ASAPOp::SummaryAgg { + input, reduction, .. + } => Some((input, reduction)), + ASAPOp::SummaryMerge { children } => children.first()?.summary_update(), + _ => None, + } + } + + /// Summary nodes whose state can be composed must declare coverage. + pub fn requires_coverage(&self) -> bool { + matches!( + self.asap(), + Some(ASAPOp::SummaryAgg { .. } | ASAPOp::SummaryMerge { .. }) + ) + } + pub fn non_asap(&self) -> Option<&NonASAPOp> { match &self.operator { Operator::NonASAP(op) => Some(op), @@ -286,6 +330,18 @@ impl OperatorNode { "invalid time or identity column in schema".into(), )); } + match &node.coverage { + Some(coverage) => { + (*node.as_ref()).clone().with_coverage(coverage.clone())?; + } + None if node.requires_coverage() => return Err(CoverageError::Missing.into()), + None => {} + } + if let Some(op @ ASAPOp::SummaryMerge { .. }) = node.asap() { + if node.coverage.as_ref() != Some(&op.merged_coverage()?) { + return Err(CoverageError::MergeOutputMismatch.into()); + } + } node.operator.validate_inputs()?; if node.result_kind != node.operator.output_kind() { return Err(SchemaDerivationError::InvalidScalarSignature( diff --git a/crates/types/src/ir/operator_properties.rs b/crates/types/src/ir/operator_properties.rs index 4737e6278..27648351b 100644 --- a/crates/types/src/ir/operator_properties.rs +++ b/crates/types/src/ir/operator_properties.rs @@ -1,8 +1,564 @@ -//! Operator parameters shared with the existing dag during migration. -//! Definitions move here when legacy dag consumers are removed. -pub use crate::pre_asap::query_expr::{ - AtModifier, BinaryOpKind, ColState, ConcatDiscriminatorKey, DataModel, GroupKeys, GroupSide, - InfoMatcher, JoinKind, PromQLVectorSetOpKind, Reduction, RelationalSetOpKind, SampleKind, - Source, TimeShift, VectorGrouping, VectorMatch, VectorMatchKind, WindowFrame, WindowFrameBound, - WindowFrameOffset, WindowFrameUnits, WindowFuncKind, -}; +//! Supporting parameter types used inside operator payloads. +//! +//! For example, `Aggregate.by` uses [`GroupKeys`], a join chooses [`JoinKind`], +//! and a SQL window carries [`WindowFrame`]. These types describe what an +//! operator does. Derived node metadata (schema, guarantee, timing) lives on +//! [`super::OperatorNode`], not in this module. +use crate::pre_asap::{ArithmeticOpKind, ColumnId, ColumnRef, CompareOpKind, ScalarValue}; +use serde::{Deserialize, Serialize}; +/// The column-reference type an operator parameter is generic over: +/// positional [`ColumnId`] once bound, name-based [`ColumnRef`] before. +pub trait ColState: + Clone + std::fmt::Debug + PartialEq + Serialize + for<'de> Deserialize<'de> +{ +} + +impl ColState for ColumnId {} + +impl ColState for ColumnRef {} + +// ── Leaf / supporting types ─────────────────────────────────────────────────── + +/// Positional grouping keys, shared by every "operate per group" operator: +/// `Aggregate.by` (reduce per group), `Sort.partition_by` (rank per group — +/// including generic `topk`/`bottomk`), and `SQLWindowFunc.partition_by` (window +/// per group). One spelling so grouping has a single home to evolve. Empty +/// (and `by`) = no grouping (a global operation). +/// +/// Heavy-hitter `AggIntent::TopK` carries its grouping here too, via the +/// enclosing `Aggregate.by` (issue #13) — so reduce, rank, and window groupings +/// all share this one type. +/// +/// ## `by` vs `without` (issue #39) +/// +/// The stored [`keys`](Self::keys) are **kept** labels for `by(...)` and +/// **excluded** labels for `without(...)`. PromQL's `without(labels)` groups by +/// every label *except* those listed; the complement can't be enumerated at +/// lowering time under an open (usage-derived) schema, so it is deferred to the +/// runtime — the excluded positions are stored, the kept set stays open. Only +/// `Aggregate` ever produces the `without` form; `Sort` / `SQLWindowFunc` / +/// `PromqlSeriesSample` groupings are always `by`. +/// +/// Serialises as a bare array for the (overwhelmingly common) `by` case — +/// wire-compatible with the `Vec` this field held before — and as +/// `{"without": [...]}` for the exclusion case. +#[derive(Debug, Clone, PartialEq, Eq, Hash)] +pub struct GroupKeys { + keys: Vec, + without: bool, +} + +// Not `#[derive(Default)]`: derive would add a `C: Default` bound, but an +// empty key set needs nothing from `C` — `ColumnRef` has no meaningful +// default anyway. +impl Default for GroupKeys { + fn default() -> Self { + Self { + keys: Vec::new(), + without: false, + } + } +} + +impl GroupKeys { + /// An empty key set — a global (ungrouped) operation. + pub fn none() -> Self { + Self::default() + } + /// `by(keys)` — group by exactly these columns. + pub fn by(keys: Vec) -> Self { + Self { + keys, + without: false, + } + } + /// `without(keys)` — group by every label *except* these (issue #39). The + /// kept set is runtime-resolved; only the excluded positions are stored. + pub fn without(keys: Vec) -> Self { + Self { + keys, + without: true, + } + } + /// Whether this is a `without(...)` exclusion grouping. + pub fn is_without(&self) -> bool { + self.without + } + /// The named keys — kept labels for `by`, excluded labels for `without`. + pub fn keys(&self) -> &[C] { + &self.keys + } +} + +impl std::ops::Deref for GroupKeys { + type Target = [C]; + fn deref(&self) -> &Self::Target { + &self.keys + } +} + +impl From> for GroupKeys { + fn from(keys: Vec) -> Self { + Self::by(keys) + } +} + +impl FromIterator for GroupKeys { + fn from_iter>(iter: I) -> Self { + Self::by(iter.into_iter().collect()) + } +} + +impl<'a, C> IntoIterator for &'a GroupKeys { + type Item = &'a C; + type IntoIter = std::slice::Iter<'a, C>; + fn into_iter(self) -> Self::IntoIter { + self.keys.iter() + } +} + +/// Compare directly against a `Vec` so call sites and tests can keep +/// writing `keys == vec![..]` / `assert_eq!(keys, &vec![..])`. A `without` +/// grouping never equals a bare `by` list. +impl PartialEq> for GroupKeys { + fn eq(&self, other: &Vec) -> bool { + !self.without && &self.keys == other + } +} + +/// (De)serialise as a bare array for `by`, or `{"without": [...]}` for the +/// exclusion form — keeping the `by` wire format identical to the old newtype. +/// Borrowed for `Serialize` (no `C: Clone` needed to write one out), owned for +/// `Deserialize` (there's nothing to borrow from). +#[derive(Serialize)] +#[serde(untagged)] +enum GroupKeysReprRef<'a, C> { + By(&'a [C]), + Without { without: &'a [C] }, +} + +#[derive(Deserialize)] +#[serde(untagged)] +enum GroupKeysRepr { + By(Vec), + Without { without: Vec }, +} + +impl Serialize for GroupKeys { + fn serialize(&self, serializer: S) -> Result { + if self.without { + GroupKeysReprRef::Without { + without: self.keys.as_slice(), + } + .serialize(serializer) + } else { + GroupKeysReprRef::By(self.keys.as_slice()).serialize(serializer) + } + } +} + +impl<'de, C: Deserialize<'de>> Deserialize<'de> for GroupKeys { + fn deserialize>(deserializer: D) -> Result { + Ok(match GroupKeysRepr::deserialize(deserializer)? { + GroupKeysRepr::By(keys) => Self::by(keys), + GroupKeysRepr::Without { without } => Self::without(without), + }) + } +} + +/// Which data model a `Source` / `AggIntent` operates over. +#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] +pub enum DataModel { + TimeSeries, + Tabular, + Any, +} + +/// The leaf data source of a `Scan`. The schema itself rides on the +/// `Scan.schema` field (SchemaResolver-built); `Source` carries only the leaf's +/// identity. +#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] +pub enum Source { + /// Time-series leaf — PromQL / DC lifecycle. Produces `(ts, value, *labels)`. + TimeSeries { metric: String }, + /// Tabular leaf — asap-fusion / future OLAP. Columns ride on `Scan.schema`. + Table { table_ref: String }, +} + +impl Source { + pub fn data_model(&self) -> DataModel { + match self { + Source::TimeSeries { .. } => DataModel::TimeSeries, + Source::Table { .. } => DataModel::Tabular, + } + } +} + +/// Operator on the query-level `BinaryOp` node. Reuses the scalar IR's +/// [`ArithmeticOpKind`] / [`CompareOpKind`] so every arithmetic/comparison +/// operator has exactly one representation (and one `Display`) across the IR. +#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] +pub enum BinaryOpKind { + /// Arithmetic — `Add/Sub/Mul/Div/Mod` (shared with `ScalarExpr::Arithmetic`). + Arithmetic(ArithmeticOpKind), + /// Comparison — `Eq/Ne/Lt/Le/Gt/Ge` + `Like/ILike/Regex` family (shared + /// with `ScalarExpr::Compare`). PromQL keeps the matched series whose + /// comparison holds. + Compare(CompareOpKind), + /// PromQL comparison with the `bool` modifier: every matched series + /// yields 1 or 0 and loses its metric name. A separate variant, not a + /// flag, because only comparisons take `bool`. + CompareBool(CompareOpKind), + /// PromQL vector-set operation. + Set(PromQLVectorSetOpKind), +} + +impl std::fmt::Display for BinaryOpKind { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + match self { + BinaryOpKind::Arithmetic(op) => write!(f, "{op}"), + BinaryOpKind::Compare(op) => write!(f, "{op}"), + BinaryOpKind::CompareBool(op) => write!(f, "{op} bool"), + BinaryOpKind::Set(PromQLVectorSetOpKind::And) => f.write_str("AND"), + BinaryOpKind::Set(PromQLVectorSetOpKind::Or) => f.write_str("OR"), + BinaryOpKind::Set(PromQLVectorSetOpKind::Unless) => f.write_str("unless"), + } + } +} + +#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] +pub enum JoinKind { + Inner, + Left, + Right, + Full, + Cross, + /// Left semi-join — each left row that has **at least one** match, once. + /// `WHERE c IN (SELECT …)` / `WHERE EXISTS (…)` (issue #111). + /// + /// Output schema is the **left's alone**; the right side is a filter, not a + /// source of columns. The join predicate still resolves against the + /// concatenated `left ++ right` schema — its scope is deliberately wider + /// than the node's output. + Semi, + /// Left anti-join — each left row with **no** match. `WHERE NOT EXISTS (…)`. + /// Same schema rule as [`JoinKind::Semi`]. + /// + /// Note this is *not* `NOT IN (SELECT …)`: under SQL's three-valued logic a + /// NULL on the right makes `NOT IN` yield no rows at all, where an anti-join + /// yields every left row. The SQL front end rejects `NOT IN (subquery)` + /// rather than lower it here. + Anti, +} + +#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] +pub enum RelationalSetOpKind { + Union, + Intersect, + Except, +} + +/// PromQL vector-set operator used by [`BinaryOpKind::Set`]. +#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] +pub enum PromQLVectorSetOpKind { + And, + Or, + Unless, +} + +/// SQL analytic window function (`fn(...) OVER (…)`). Distinct from a streaming +/// time `Window`: this is an analytic frame over already-materialised rows. +#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "snake_case")] +pub enum WindowFuncKind { + RowNumber, + Rank, + DenseRank, + Lag, + Lead, + /// ClickHouse `lagInFrame`/`leadInFrame`: unlike [`Lag`](Self::Lag)/[`Lead`](Self::Lead), + /// these respect the window frame bounds (NULL/default past the frame edge) + /// rather than reaching arbitrarily far back/forward. Kept as distinct + /// variants so the frame clause is never silently discarded by conflating + /// them with `Lag`/`Lead` (#267). `WindowFuncKind` still has no frame + /// representation, so today these lower and behave exactly like + /// `Lag`/`Lead` — the tag is correct, the frame-respecting behavior isn't + /// implemented yet. See #231 for modeling window frames properly. + LagInFrame, + LeadInFrame, + FirstValue, + LastValue, + /// `NTH_VALUE(expr, n)` — `n` is resolved from the (literal) 2nd argument. + NthValue(Option), + Sum, + Avg, + Count, + Min, + Max, +} + +/// A window's frame-spec (`ROWS`/`RANGE BETWEEN … AND …`) — which rows around +/// the current one an analytic window function reads. `GROUPS` is rejected at +/// lowering time (issue #268): every SQL corpus in this repo uses only `ROWS`, +/// and nothing downstream interprets frame semantics yet, so it isn't worth +/// modelling untested. +/// +/// Meaningless (but harmless) on the rank-only and navigation functions +/// (`ROW_NUMBER`/`RANK`/`DENSE_RANK`/`LAG`/`LEAD`), which ignore the frame per +/// SQL semantics — DataFusion still attaches one, stored here verbatim. +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +pub struct WindowFrame { + pub units: WindowFrameUnits, + pub start_bound: WindowFrameBound, + pub end_bound: WindowFrameBound, +} + +/// A finite window-frame displacement. Intervals are normalized to Arrow's +/// month/day/nanosecond representation so SQL `RANGE INTERVAL ...` bounds +/// survive lowering without leaking DataFusion types into the canonical IR. +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +#[serde(rename_all = "snake_case")] +pub enum WindowFrameOffset { + Scalar(ScalarValue), + Interval { + months: i32, + days: i32, + nanoseconds: i64, + }, +} + +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +#[serde(rename_all = "snake_case")] +pub enum WindowFrameUnits { + /// Boundaries count physical rows: `ROWS BETWEEN 2 PRECEDING AND CURRENT ROW`. + Rows, + /// Boundaries count by value-distance on the (single) `ORDER BY` column: + /// `RANGE BETWEEN INTERVAL '1' HOUR PRECEDING AND CURRENT ROW`. + Range, +} + +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +#[serde(rename_all = "snake_case")] +pub enum WindowFrameBound { + /// `UNBOUNDED PRECEDING` is + /// `Preceding(WindowFrameOffset::Scalar(ScalarValue::Null))`. + Preceding(WindowFrameOffset), + CurrentRow, + /// `UNBOUNDED FOLLOWING` is + /// `Following(WindowFrameOffset::Scalar(ScalarValue::Null))`. + Following(WindowFrameOffset), +} + +/// A symbolic label matcher on the **info metric** side of an +/// [`crate::ir::NonASAPOp::PromqlInfoEnrich`] (issue #84). Unlike a `Scan` predicate it is not +/// resolved positionally — it references the info metric's labels (`__name__` +/// picks the metric, the rest constrain data labels), which aren't in the input +/// vector's schema; the post-ASAP realization pass applies it against the info metric. +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +pub struct InfoMatcher { + pub label: String, + /// One of `Eq` / `Ne` / `Regex` / `NotRegex` (PromQL `=`/`!=`/`=~`/`!~`). + pub op: CompareOpKind, + pub value: String, +} + +/// Series-sampling selection mode (PromQL `limitk` / `limit_ratio`, issue #86). +/// A [`crate::ir::NonASAPOp::PromqlSeriesSample`] keeps a *subset of whole series*, unchanged — it does +/// not rank or reduce, so it is distinct from `TopK` and from `Sort → Limit`. +#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)] +#[serde(rename_all = "snake_case")] +pub enum SampleKind { + /// `limitk(k, v)` — up to `k` series per group. Which series survive is + /// deterministic across evaluations but otherwise unspecified (no ordering). + LimitK(usize), + /// `limit_ratio(r, v)` — a deterministic `r`-fraction of series per group. + /// `r ∈ [-1, 1]`; a negative `r` selects the complementary fraction. + LimitRatio(f64), +} + +/// PromQL vector-match modifier (`on`/`ignoring` + `group_left`/`group_right`). +#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] +pub struct VectorMatch { + pub kind: VectorMatchKind, + pub labels: Vec, + pub grouping: Option, +} + +/// PromQL `@` modifier — pins a selector's evaluation time to an anchor instead +/// of the query evaluation time (issue #40). +#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)] +pub enum AtModifier { + /// `@ start()` — the query range's start instant. + Start, + /// `@ end()` — the query range's end instant. + End, + /// `@ ` — an absolute instant, milliseconds since the Unix epoch (may be + /// negative). PromQL writes the timestamp in seconds; the front end scales it. + Timestamp(i64), +} + +/// PromQL per-selector **time-shift** modifiers — `offset` and `@` (issue #40). +/// Neither changes a selector's *schema*; both move *when* it is evaluated, so +/// the shift is a pass-through wrapper ([`crate::ir::NonASAPOp::TimeShift`]) over the +/// selector rather than a new leaf shape. The runtime resolves the anchor and +/// applies the offset. +#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Serialize, Deserialize)] +pub struct TimeShift { + /// `offset ` as signed milliseconds — a positive value shifts the + /// lookback *back* in time (`offset 5m`), a negative value shifts it + /// *forward* (`offset -5m`). `0` = no offset. + pub offset_ms: i64, + /// `@` anchor; `None` = evaluate at the query time. + pub at: Option, +} + +impl TimeShift { + /// Whether this shift is the identity (no `offset`, no `@`) — the state of + /// every selector that carries neither modifier. + pub fn is_identity(&self) -> bool { + self.offset_ms == 0 && self.at.is_none() + } +} + +#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] +pub enum VectorMatchKind { + On, + Ignoring, +} + +#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] +pub struct VectorGrouping { + pub side: GroupSide, + pub labels: Vec, +} + +#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] +pub enum GroupSide { + Left, + Right, +} + +// ── Intent algebra IR ──────────────────────────────────────────────────────── + +/// What kind of computation an `Aggregate` node performs — orthogonal to +/// *which* columns it groups by (that's still [`GroupKeys`], inside +/// `Reduce`). Explicit, decided once by whichever pass constructs the node +/// (structural, at front-end lowering time), rather than inferred downstream from +/// whether a grouping-key list happens to be empty or from a neighboring +/// node's shape. See design proposal #165. +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +pub enum Reduction { + /// Collapses input rows via `by` — `by`/`without` semantics are exactly + /// [`GroupKeys`]'s. May still collapse every row into one (an empty, + /// non-`without` `by`) — that's a genuine reduction with zero grouping + /// columns, not "no grouping concept." + Reduce(GroupKeys), + /// No grouping concept at all: preserves one output row per input + /// entity (e.g. a per-series windowed computation with no `by(...)` + /// clause to begin with, because there's no aggregation operator here + /// for such a clause to attach to). Never merges across entities, and + /// never collapses an entity's own row structure (e.g. a time axis) — + /// unlike `Reduce(GroupKeys::without(vec![]))` ("group by every + /// label"), which is still a genuine reduction and does collapse it. + PerEntity, +} + +impl Reduction { + /// Shorthand for the common case — group by these (possibly empty) + /// keys, kept rather than excluded. + pub fn by(keys: Vec) -> Self { + Self::Reduce(GroupKeys::by(keys)) + } + + /// The grouping keys, if this is a genuine reduction — `None` for + /// `PerEntity`, which has no grouping-keys concept to report. + pub fn group_keys(&self) -> Option<&GroupKeys> { + match self { + Self::Reduce(by) => Some(by), + Self::PerEntity => None, + } + } + + /// The grouping keys, panicking if this is `PerEntity` — for call sites + /// (tests, mostly) that already know, from the shape they built or are + /// asserting on, that this must be a genuine reduction. Prefer + /// [`group_keys`](Self::group_keys) wherever the caller can't assume that. + pub fn expect_reduce(&self) -> &GroupKeys { + match self { + Self::Reduce(by) => by, + Self::PerEntity => panic!("expected Reduction::Reduce, got PerEntity"), + } + } +} + +/// A caller-proven compound unique key for a [`crate::ir::NonASAPOp::Concat`] (issue +/// #228) — built only via [`ConcatDiscriminatorKey::new`], never by naming `discriminator` directly +/// in a struct literal (both fields are private): from *other Rust code*, +/// the only way to end up with one of these is to hand over a specific +/// column as the discriminator, by name, at the call site. +/// +/// Caveat: this is a Rust-API-level guarantee, not a data-level one. The +/// derived `Deserialize` impl below builds a `ConcatDiscriminatorKey` +/// directly from field values, bypassing `new()`. Deserialization is therefore +/// equivalent to a caller supplying the assertion directly; it does not prove +/// either fact below. An external boundary accepting IR data must +/// reject this field or validate both obligations before treating it as +/// uniqueness evidence. +/// +/// # Soundness +/// +/// `Concat`'s default (see its own doc) is to drop `unique_keys` +/// unconditionally, because a key unique **within** one branch is not unique +/// **across** the concatenation unless the branches' value sets for that key +/// are provably disjoint — nothing about matching schemas or matching +/// per-branch keys establishes that on its own. Two different branches can +/// trivially emit the same `inner_key` value (e.g. two PromQL +/// `histogram_quantiles` branches keyed on `(host, le)` can both produce a +/// `(host, le)` pair for different φ). +/// +/// Prepending `discriminator` restores a compound key only when two facts +/// hold: `inner_key` uniquely identifies rows **within every branch**, and +/// `discriminator`'s value is **guaranteed to differ between branches** — a +/// literal the producer just tagged the branch with (PromQL φ riding along via +/// [`crate::ir::NonASAPOp::PromqlRelabel`], a Postgres-style synthetic `GROUPING()` id +/// for `ROLLUP`/`CUBE`, …), never something inferred structurally from the +/// branches' own data — then `discriminator` alone partitions rows into +/// disjoint sets independent of what the branches actually contain, so +/// `(discriminator, inner_key)` is sound even when otherwise-identical +/// `inner_key` values occur in different branches. Neither fact is verified +/// here; both are part of the caller-proven claim. +/// +/// This is a **caller-proven claim, not something `Concat` can verify**: +/// nothing stops a caller from asserting a discriminator that in fact +/// repeats across branches, in which case the resulting `unique_keys` claim +/// is simply wrong — `output_schema` trusts it without checking. The +/// obligation is on the constructor call site, exactly as it is on +/// [`crate::ir::NonASAPOp::Dedup`]'s `cols` or any other unverified `unique_keys` +/// producer in this module. +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +#[serde(deny_unknown_fields)] +#[serde(bound(serialize = "C: ColState", deserialize = "C: ColState"))] +pub struct ConcatDiscriminatorKey { + discriminator: C, + inner_key: Vec, +} + +impl ConcatDiscriminatorKey { + /// The only constructor — `discriminator` must be named explicitly by + /// the caller. See the type's doc for the soundness obligation this + /// puts on that caller. + pub fn new(discriminator: C, inner_key: Vec) -> Self { + Self { + discriminator, + inner_key, + } + } + + pub fn discriminator(&self) -> &C { + &self.discriminator + } + + pub fn inner_key(&self) -> &[C] { + &self.inner_key + } +} diff --git a/crates/types/src/ir/physical_export.rs b/crates/types/src/ir/physical_export.rs new file mode 100644 index 000000000..cc38ddf7c --- /dev/null +++ b/crates/types/src/ir/physical_export.rs @@ -0,0 +1,452 @@ +//! Physical ASAP DAG transport (planner-layering stage 2 output). +//! +//! Same operator payloads as the logical export, plus the execution timing +//! (data state) of every node and edge. The input must already be timed +//! ([`super::timing::apply_materialization_timings`]); export reads each node's +//! timing and does not re-run data-state validation. + +use std::collections::{BTreeMap, HashMap, HashSet}; +use std::rc::Rc; + +use serde::{Deserialize, Serialize}; +use thiserror::Error; + +use super::asap::ASAPOp; +use super::node::{Operator, OperatorNode}; +use super::timing::data_state; +use super::wire::{grouping_compatibility, input_edges, payload_of}; +use super::wire::{EdgeRole, GroupingEdgeCompatibility, LogicalASAPOperatorPayload}; +use crate::post_asap::execution_data_state::{ + ExecutionDataState, ExecutionDataStateError, ExecutionTiming, +}; +use crate::post_asap::guarantee::ResultGuarantee; +use crate::pre_asap::schema::{FieldDataType, Schema}; + +pub const PHYSICAL_ASAP_DAG_WIRE_VERSION: u32 = 8; + +/// Operator payloads are shared with the logical export. +pub type PhysicalASAPOperatorPayload = LogicalASAPOperatorPayload; + +#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)] +pub enum WindowEdgeCompatibility { + /// Physical lowering must prove equal pane/query phase or install an + /// exact boundary residual. The logical DAG alone cannot make that claim. + #[serde(rename = "RequiresAlignedPanePhaseOrExactBoundaryResidual")] + RequiresAlignedPanePhaseOrExactWindowEdgeResidual, + NotApplicable, +} + +/// Node ids are shared with the logical export, since payloads embed them. +pub type PhysicalASAPNodeId = super::wire::LogicalASAPNodeId; + +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +#[serde(deny_unknown_fields)] +pub struct PhysicalASAPDAGNode { + pub id: PhysicalASAPNodeId, + /// The payload variant is the sole operator identity (`payload.kind` in JSON). + pub payload: PhysicalASAPOperatorPayload, + /// Phase is a placement choice for every operator, independent of payload kind. + pub output_state: ExecutionDataState, + pub output_schema: Schema, + pub guarantee: Option, + #[serde(default)] + pub coverage: Option, +} + +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +#[serde(deny_unknown_fields)] +pub struct PhysicalASAPDAGEdge { + pub producer: PhysicalASAPNodeId, + pub consumer: PhysicalASAPNodeId, + pub role: EdgeRole, + pub intermediate_schema: Schema, + pub data_state: ExecutionDataState, + pub grouping: GroupingEdgeCompatibility, + pub window: WindowEdgeCompatibility, +} + +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +#[serde(deny_unknown_fields)] +pub struct PhysicalASAPDAG { + pub nodes: Vec, + pub edges: Vec, + /// Semantic workload root. Physical query/precompute sinks are selected + /// downstream by the control plane. + /// One root per query of the batch, in workload order. Scalar query roots + /// are not physical nodes yet. + pub roots: Vec, +} + +/// Versioned transport envelope for a physical ASAP DAG. +/// +/// Process boundaries exchange this envelope and call [`Self::validate`]. +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +#[serde(deny_unknown_fields)] +pub struct PhysicalASAPDAGDocument { + pub schema_version: u32, + pub dag: PhysicalASAPDAG, +} + +#[derive(Debug, Clone, PartialEq, Eq, Error)] +pub enum PhysicalASAPDAGValidationError { + #[error("phase assignment must name every DAG node exactly once")] + IncompletePhaseAssignment, + #[error("ingestion node {consumer:?} depends on query node {producer:?}")] + QueryDependencyInIngestion { + producer: PhysicalASAPNodeId, + consumer: PhysicalASAPNodeId, + }, + #[error("unsupported physical ASAP DAG schema version {0}")] + UnsupportedVersion(u32), + #[error("duplicate physical ASAP node id {0:?}")] + DuplicateNodeId(PhysicalASAPNodeId), + #[error("physical ASAP DAG root {0:?} does not name a node")] + MissingRoot(PhysicalASAPNodeId), + #[error("edge endpoint {0:?} does not name a node")] + MissingEdgeEndpoint(PhysicalASAPNodeId), + #[error("edge {producer:?}->{consumer:?} schema differs from producer output")] + EdgeSchemaMismatch { + producer: PhysicalASAPNodeId, + consumer: PhysicalASAPNodeId, + }, + #[error("edge {producer:?}->{consumer:?} data state differs from producer output")] + EdgeDataStateMismatch { + producer: PhysicalASAPNodeId, + consumer: PhysicalASAPNodeId, + }, + #[error("physical ASAP DAG has no query roots")] + NoRoots, + #[error("physical ASAP DAG contains a cycle")] + Cycle, + #[error("physical ASAP node {0:?} is not reachable from the root")] + UnreachableNode(PhysicalASAPNodeId), + #[error("summary aggregate node {node:?} output schema does not contain its declared family")] + SummaryFamilySchemaMismatch { node: PhysicalASAPNodeId }, + #[error( + "summary aggregate node {node:?} declares grouping inconsistent with its sketch state" + )] + SummaryGroupingMismatch { node: PhysicalASAPNodeId }, +} + +impl PhysicalASAPDAGDocument { + pub fn new(dag: PhysicalASAPDAG) -> Self { + Self { + schema_version: PHYSICAL_ASAP_DAG_WIRE_VERSION, + dag, + } + } + + pub fn validate(&self) -> Result<(), PhysicalASAPDAGValidationError> { + if self.schema_version != PHYSICAL_ASAP_DAG_WIRE_VERSION { + return Err(PhysicalASAPDAGValidationError::UnsupportedVersion( + self.schema_version, + )); + } + self.dag.validate() + } +} + +impl PhysicalASAPDAG { + /// Assign execution phases without changing operator semantics. Phase choices + /// do not prove deployment support: callers must bind concrete implementations + /// and storage boundaries before installing this plan. + pub fn with_execution_phases( + &self, + phases: &BTreeMap, + ) -> Result { + self.validate()?; + if phases.len() != self.nodes.len() + || self.nodes.iter().any(|node| !phases.contains_key(&node.id)) + { + return Err(PhysicalASAPDAGValidationError::IncompletePhaseAssignment); + } + let mut dag = self.clone(); + for node in &mut dag.nodes { + node.output_state.timing = phases[&node.id]; + } + let states: HashMap<_, _> = dag.nodes.iter().map(|n| (n.id, n.output_state)).collect(); + for edge in &mut dag.edges { + edge.data_state = states[&edge.producer]; + } + dag.validate()?; + Ok(dag) + } + + pub fn validate(&self) -> Result<(), PhysicalASAPDAGValidationError> { + let mut nodes = HashMap::new(); + for node in &self.nodes { + if nodes.insert(node.id, node).is_some() { + return Err(PhysicalASAPDAGValidationError::DuplicateNodeId(node.id)); + } + if let PhysicalASAPOperatorPayload::SummaryAgg { + family, grouping, .. + } = &node.payload + { + let mut found_family = false; + for field in &node.output_schema.fields { + if &field.dtype == family { + found_family = true; + } + if let FieldDataType::Sketch(_, schema_grouping) = &field.dtype { + if schema_grouping != grouping { + return Err(PhysicalASAPDAGValidationError::SummaryGroupingMismatch { + node: node.id, + }); + } + } + } + if !found_family { + return Err( + PhysicalASAPDAGValidationError::SummaryFamilySchemaMismatch { + node: node.id, + }, + ); + } + } + } + if self.roots.is_empty() { + return Err(PhysicalASAPDAGValidationError::NoRoots); + } + for root in &self.roots { + if !nodes.contains_key(root) { + return Err(PhysicalASAPDAGValidationError::MissingRoot(*root)); + } + } + let mut children: HashMap> = HashMap::new(); + for edge in &self.edges { + let producer = nodes.get(&edge.producer).ok_or( + PhysicalASAPDAGValidationError::MissingEdgeEndpoint(edge.producer), + )?; + if !nodes.contains_key(&edge.consumer) { + return Err(PhysicalASAPDAGValidationError::MissingEdgeEndpoint( + edge.consumer, + )); + } + if producer.output_state.timing == ExecutionTiming::QueryTime + && nodes[&edge.consumer].output_state.timing == ExecutionTiming::IngestionTime + { + return Err(PhysicalASAPDAGValidationError::QueryDependencyInIngestion { + producer: edge.producer, + consumer: edge.consumer, + }); + } + if edge.intermediate_schema != producer.output_schema { + return Err(PhysicalASAPDAGValidationError::EdgeSchemaMismatch { + producer: edge.producer, + consumer: edge.consumer, + }); + } + if edge.data_state != producer.output_state { + return Err(PhysicalASAPDAGValidationError::EdgeDataStateMismatch { + producer: edge.producer, + consumer: edge.consumer, + }); + } + children + .entry(edge.consumer) + .or_default() + .push(edge.producer); + } + fn visit( + id: PhysicalASAPNodeId, + children: &HashMap>, + visiting: &mut HashSet, + visited: &mut HashSet, + ) -> bool { + if visited.contains(&id) { + return true; + } + if !visiting.insert(id) { + return false; + } + if children + .get(&id) + .into_iter() + .flatten() + .any(|child| !visit(*child, children, visiting, visited)) + { + return false; + } + visiting.remove(&id); + visited.insert(id); + true + } + let mut visited = HashSet::new(); + for root in &self.roots { + if !visit(*root, &children, &mut HashSet::new(), &mut visited) { + return Err(PhysicalASAPDAGValidationError::Cycle); + } + } + fn mark( + id: PhysicalASAPNodeId, + children: &HashMap>, + reachable: &mut HashSet, + ) { + if !reachable.insert(id) { + return; + } + for child in children.get(&id).into_iter().flatten() { + mark(*child, children, reachable); + } + } + let mut reachable = HashSet::new(); + for root in &self.roots { + mark(*root, &children, &mut reachable); + } + if let Some(id) = nodes.keys().find(|id| !reachable.contains(id)) { + return Err(PhysicalASAPDAGValidationError::UnreachableNode(*id)); + } + Ok(()) + } +} + +// ── Compilation from the IR ────────────────────────────────────────────── + +/// Compiler-local identity assignment. It deliberately retains `Rc` handles +/// and is not serialized; deployed artifacts persist the physical ASAP node ID +/// together with their physical materialization/query IDs. +#[derive(Debug, Clone)] +pub struct PhysicalASAPNodeIdentityMap { + nodes_by_id: Vec>, +} + +impl PhysicalASAPNodeIdentityMap { + pub fn node_id(&self, node: &Rc) -> Option { + self.nodes_by_id + .iter() + .position(|candidate| Rc::ptr_eq(candidate, node)) + .map(|id| super::wire::LogicalASAPNodeId(id as u32)) + } + + pub fn operator_node(&self, id: PhysicalASAPNodeId) -> Option<&Rc> { + self.nodes_by_id.get(id.0 as usize) + } +} + +#[derive(Debug, Clone)] +pub struct PhysicalASAPDAGCompilation { + pub dag: PhysicalASAPDAG, + pub node_ids: PhysicalASAPNodeIdentityMap, +} + +pub fn compile_physical_asap_dag( + root: &Rc, +) -> Result { + Ok(compile_physical_asap_dag_with_node_ids(root)?.dag) +} + +/// Export the timed DAG below `root`. Every reachable node must carry a +/// timing (see [`super::timing::apply_materialization_timings`]); the data-state +/// rules were checked by that pass and are not re-run here. +pub fn compile_physical_asap_dag_with_node_ids( + root: &Rc, +) -> Result { + compile_physical_asap_workload_with_node_ids(std::slice::from_ref(root)) +} + +/// Export a timed batch as one DAG with one root per query. +pub fn compile_physical_asap_workload( + roots: &[Rc], +) -> Result { + Ok(compile_physical_asap_workload_with_node_ids(roots)?.dag) +} + +pub fn compile_physical_asap_workload_with_node_ids( + roots: &[Rc], +) -> Result { + let mut exporter = Exporter::default(); + let roots = roots + .iter() + .map(|root| exporter.visit(root)) + .collect::, _>>()?; + let dag = PhysicalASAPDAG { + nodes: exporter.nodes, + edges: exporter.edges, + roots, + }; + dag.validate() + .expect("compiler emits a valid physical ASAP DAG"); + Ok(PhysicalASAPDAGCompilation { + dag, + node_ids: PhysicalASAPNodeIdentityMap { + nodes_by_id: exporter.nodes_by_id, + }, + }) +} + +#[derive(Default)] +struct Exporter { + ids: HashMap<*const OperatorNode, PhysicalASAPNodeId>, + nodes: Vec, + edges: Vec, + nodes_by_id: Vec>, +} + +impl Exporter { + fn visit( + &mut self, + node: &Rc, + ) -> Result { + if let Some(id) = self.ids.get(&Rc::as_ptr(node)) { + return Ok(*id); + } + let output_state = data_state(node).ok_or(ExecutionDataStateError::UntimedNode { + operator: node.operator.kind_name(), + })?; + // Operator inputs first, then the nodes read from scalar expressions. + let mut producers = Vec::new(); + for (child, role) in input_edges(&node.operator) { + producers.push((self.visit(child)?, child, role)); + } + { + let scalars = match &node.operator { + Operator::NonASAP(op) => op.scalar_exprs(), + Operator::ASAP(ASAPOp::SummaryAgg { + filter: Some(filter), + .. + }) => vec![&filter.0], + _ => vec![], + }; + for expr in scalars { + for referenced in expr.operator_refs() { + producers.push((self.visit(referenced)?, referenced, EdgeRole::ScalarRef)); + } + } + } + let id = super::wire::LogicalASAPNodeId(self.nodes.len() as u32); + let payload = { + let ids = &self.ids; + let mut id_of = |n: &Rc| ids[&Rc::as_ptr(n)]; + payload_of(&node.operator, &mut id_of) + }; + self.nodes.push(PhysicalASAPDAGNode { + id, + payload, + output_state, + output_schema: node.schema.clone(), + guarantee: node.guarantee.clone(), + coverage: node.coverage.clone(), + }); + self.nodes_by_id.push(Rc::clone(node)); + self.ids.insert(Rc::as_ptr(node), id); + for (producer, child, role) in producers { + let producer_state = self.nodes[producer.0 as usize].output_state; + let maintenance_dependency = producer_state.timing == ExecutionTiming::IngestionTime + && output_state.timing == ExecutionTiming::IngestionTime; + self.edges.push(PhysicalASAPDAGEdge { + producer, + consumer: id, + role, + intermediate_schema: child.schema.clone(), + data_state: producer_state, + grouping: grouping_compatibility(&child.operator, &node.operator), + window: if maintenance_dependency { + WindowEdgeCompatibility::RequiresAlignedPanePhaseOrExactWindowEdgeResidual + } else { + WindowEdgeCompatibility::NotApplicable + }, + }); + } + Ok(id) + } +} diff --git a/crates/types/src/ir/schema_support.rs b/crates/types/src/ir/schema_support.rs new file mode 100644 index 000000000..95c42070d --- /dev/null +++ b/crates/types/src/ir/schema_support.rs @@ -0,0 +1,94 @@ +//! Series-identity realization for the unified dag. +use crate::pre_asap::schema::*; +/// Resolve a PromQL root to rows carrying [`PROMQL_SERIES_IDENTITY`] before +/// candidate search. `closed` describes physical columns here: the final +/// column contains every dynamic source label. It does not assert that the +/// query's projected labels are the full label set. +/// +/// This realization supports explicit `by` grouping and per-series computation. +/// Operators that rewrite or implicitly match dynamic label sets require their +/// own realization; they must not accidentally treat the opaque identity as a +/// user label or silently discard it. +pub fn with_promql_series_identity( + root: &std::rc::Rc, +) -> Result, String> { + use crate::ir::{NonASAPOp, Operator, OperatorNode}; + use crate::pre_asap::Source; + use std::{collections::HashMap, rc::Rc}; + fn visit( + node: &Rc, + memo: &mut HashMap<*const OperatorNode, Rc>, + ) -> Result, String> { + if let Some(found) = memo.get(&Rc::as_ptr(node)) { + return Ok(Rc::clone(found)); + } + let mut error = None; + let mut operator = node + .operator + .map_children(|child| match visit(child, memo) { + Ok(child) => child, + Err(e) => { + error = Some(e); + Rc::clone(child) + } + }); + if let Some(error) = error { + return Err(error); + } + match &mut operator { + Operator::NonASAP(NonASAPOp::Scan { + source: Source::TimeSeries { .. }, + schema, + .. + }) => { + if schema + .fields + .iter() + .any(|field| field.name == PROMQL_SERIES_IDENTITY) + { + if !schema.has_promql_series_identity() { + return Err("invalid physical series identity".into()); + } + memo.insert(Rc::as_ptr(node), Rc::clone(node)); + return Ok(Rc::clone(node)); + } + if schema.closed { + return Err("dynamic series identity requires an open PromQL source".into()); + } + schema.fields.push(Field::new( + PROMQL_SERIES_IDENTITY, + FieldDataType::Plain(DataType::Utf8), + false, + )); + schema.closed = true; + } + Operator::NonASAP(NonASAPOp::Sort { partition_by, .. }) + if partition_by.is_without() => + { + return Err("dynamic without ranking requires label-set projection".into()); + } + Operator::NonASAP( + NonASAPOp::TimeRange { .. } + | NonASAPOp::Limit { .. } + | NonASAPOp::Project { .. } + | NonASAPOp::Filter { .. } + | NonASAPOp::TimeShift { .. } + | NonASAPOp::PromqlSubquery { .. } + | NonASAPOp::PromqlRelabel { .. } + | NonASAPOp::PromqlVectorFromScalar(_) + | NonASAPOp::BinaryOp { .. } + | NonASAPOp::Concat { .. } + | NonASAPOp::Aggregate { .. } + | NonASAPOp::Sort { .. }, + ) => {} + _ => return Err("operator has no dynamic series-identity realization".into()), + } + let mut rebuilt = OperatorNode::new(operator).map_err(|e| e.to_string())?; + rebuilt.guarantee = node.guarantee.clone(); + rebuilt.timing = node.timing; + let rebuilt = Rc::new(rebuilt); + memo.insert(Rc::as_ptr(node), Rc::clone(&rebuilt)); + Ok(rebuilt) + } + visit(root, &mut HashMap::new()) +} diff --git a/crates/types/src/ir/summary_coverage.rs b/crates/types/src/ir/summary_coverage.rs new file mode 100644 index 000000000..747f87f76 --- /dev/null +++ b/crates/types/src/ir/summary_coverage.rs @@ -0,0 +1,126 @@ +//! Joint time/population coverage for summary composition, independent of schema. +//! Equality predicates are a deliberately narrow proof vocabulary. Unsupported +//! predicates cannot be declared disjoint merely by giving them different names. +use crate::pre_asap::Source; +use serde::{Deserialize, Serialize}; +use std::collections::BTreeMap; +use std::ops::Range; +use thiserror::Error; + +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +#[serde(deny_unknown_fields)] +pub struct SummaryCoverage { + /// Observation data source, as named by `Scan`: a table or a time series. + /// Region time bounds refer to its time column. + pub source: Source, + /// Union of joint regions; never the Cartesian product of independent bounds. + pub regions: Vec, +} + +#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] +#[serde(deny_unknown_fields)] +pub struct CoverageRegion { + /// Half-open bounds on the source's time column, in milliseconds. `None` + /// means no time restriction, e.g. a source without a time column. + pub time_ms: Option>, + /// Conjunction of non-null equality predicates; empty means unrestricted. + pub population: BTreeMap, +} + +#[derive(Debug, Clone, PartialEq, Eq, Error)] +pub enum CoverageError { + #[error("coverage interval must have start < end")] + InvalidInterval, + #[error("population dimension names cannot be empty")] + InvalidPopulation, + #[error("summary coverage sources differ")] + SourceMismatch, + #[error("coverage overlap is not proven absent")] + PossibleOverlap, + #[error("coverage merge requires at least one input")] + EmptyMerge, + #[error("summary coverage requires state output")] + NotState, + #[error("summary node requires coverage")] + Missing, + #[error("summary merge requires known coverage on every input")] + UnknownInput, + #[error("retained merge coverage disagrees with input union")] + MergeOutputMismatch, +} + +impl SummaryCoverage { + pub fn validate(&self) -> Result<(), CoverageError> { + for (index, region) in self.regions.iter().enumerate() { + if region.time_ms.as_ref().is_some_and(Range::is_empty) { + return Err(CoverageError::InvalidInterval); + } + if region.population.keys().any(String::is_empty) { + return Err(CoverageError::InvalidPopulation); + } + if self.regions[..index] + .iter() + .any(|other| region.may_overlap(other)) + { + return Err(CoverageError::PossibleOverlap); + } + } + Ok(()) + } + + /// Every observation in a region is assumed to contribute once to the state. + /// Compose once-per-observation summaries only when their joint regions are + /// provably disjoint. Update/reduction compatibility, family merge capability + /// and accuracy are checked by `SummaryMerge`, not here. + pub fn merge_disjoint(inputs: &[Self]) -> Result { + let first = inputs.first().ok_or(CoverageError::EmptyMerge)?; + let mut merged = first.clone(); + merged.regions.clear(); + for input in inputs { + input.validate()?; + if input.source != first.source { + return Err(CoverageError::SourceMismatch); + } + merged.regions.extend(input.regions.iter().cloned()); + } + merged.validate()?; + // Coalesce adjacent intervals only for identical population predicates. + merged.regions.sort_by(|a, b| { + a.population.cmp(&b.population).then( + a.time_ms + .as_ref() + .map(|t| t.start) + .cmp(&b.time_ms.as_ref().map(|t| t.start)), + ) + }); + let mut normalized: Vec = Vec::new(); + for region in merged.regions { + if let Some(last) = normalized.last_mut() { + if let (Some(last_time), Some(time)) = (&mut last.time_ms, ®ion.time_ms) { + if last.population == region.population && last_time.end == time.start { + last_time.end = time.end; + continue; + } + } + } + normalized.push(region); + } + merged.regions = normalized; + Ok(merged) + } +} +impl CoverageRegion { + fn may_overlap(&self, other: &Self) -> bool { + let time_overlaps = match (&self.time_ms, &other.time_ms) { + (Some(a), Some(b)) => a.start < b.end && b.start < a.end, + _ => true, + }; + time_overlaps + && !self.population.iter().any(|(dimension, value)| { + other + .population + .get(dimension) + .is_some_and(|other| other != value) + }) + } +} diff --git a/crates/types/src/ir/timing.rs b/crates/types/src/ir/timing.rs new file mode 100644 index 000000000..eb6f5a9d5 --- /dev/null +++ b/crates/types/src/ir/timing.rs @@ -0,0 +1,951 @@ +//! Execution timing: written into every node from a materialization +//! assignment, then validated against each operator's kind and its consuming +//! edges. +//! +//! The logical DAG carries no timing. Materialization decides per summary +//! state whether it is maintained at ingestion time or computed at query +//! time; [`MaterializationAssignment`] records that choice per `SummaryAgg` +//! and [`apply_materialization_timings`] expands it into a timing on every node: +//! +//! - a node of fixed kind takes its kind's timing (`SummaryEstimate` and +//! `EvaluatePopulation` run at query time, `MaintainPopulation` at ingestion +//! time); +//! - a `SummaryAgg` takes the assignment's timing (default: query time, until +//! Stage 2 materialization (#509) chooses otherwise), unless something below +//! it can only exist at query time; +//! - every other node runs when its consumer runs: everything that feeds a +//! maintained state runs at ingestion time, everything above a evaluation at +//! query time. +//! +//! A node reached from two consumers that need different timings cannot be +//! executed once for both; [`split_shared_by_phase`] copies such a sub-DAG +//! for one side before the assignment is applied, and the pass itself +//! rejects a conflict it still finds. +//! +//! ## Edge rules (checked after the write) +//! +//! | Consumer | Accepts from an input | +//! |---|---| +//! | `SummaryAgg.child` | Rows, or exact-accumulator state, never a query-time value when the state is maintained | +//! | `SummaryEstimate.summary_input` | Summary state at either phase | +//! | `FinalizeExactAccumulator.child` | Exact-accumulator state | +//! | `EvaluatePopulation.child` | A `MaintainPopulation` at ingestion time | +//! | `MaintainPopulation.child` | Ingestion-time rows matching the population's input | +//! | any `NonASAP` consumer | Rows (or exact-accumulator state for a projection-like operator) at the consumer's own timing; ingestion work never reads a query-time value | + +use std::collections::HashMap; +use std::rc::Rc; + +use super::asap::ASAPOp; +use super::node::{Operator, OperatorNode}; +use super::non_asap::NonASAPOp; +use crate::ir::operator_properties::BinaryOpKind; +use crate::post_asap::execution_data_state::{ + DataPrimitive, ExecutionDataState, ExecutionDataStateError, ExecutionTiming, +}; +use crate::pre_asap::schema::{DataType, FieldDataType, Schema}; + +/// The per-state materialization choice: for each `SummaryAgg` node (by +/// identity), whether its state is maintained at ingestion time or computed +/// at query time. A state absent from the map takes the assignment's default. +/// `Default` is [`Self::all_query_time`]: nothing is materialized until Stage 2 +/// materialization (#509) decides otherwise. +#[derive(Debug, Clone, Default)] +pub struct MaterializationAssignment { + summary_timings: HashMap<*const OperatorNode, ExecutionTiming>, + default_timing: ExecutionTiming, +} + +impl MaterializationAssignment { + /// Every summary state computed at query time. + pub fn all_query_time() -> Self { + Self::default() + } + + /// Every summary state maintained at ingestion time. + pub fn all_ingestion_time() -> Self { + Self { + summary_timings: HashMap::new(), + default_timing: ExecutionTiming::IngestionTime, + } + } + + pub fn set(&mut self, summary: &Rc, timing: ExecutionTiming) { + self.summary_timings.insert(Rc::as_ptr(summary), timing); + } + + pub fn summary_timing(&self, summary: &Rc) -> ExecutionTiming { + self.summary_timings + .get(&Rc::as_ptr(summary)) + .copied() + .unwrap_or(self.default_timing) + } +} + +/// Memo of one [`apply_materialization_timings`] pass: `input node → timed node`, +/// shared by every root of a workload so a node shared by two roots stays +/// one `Rc`. Re-reaching a node with a different timing is a conflict. +#[derive(Default)] +pub struct TimingMemo { + done: HashMap<*const OperatorNode, Rc>, +} + +impl TimingMemo { + pub fn new() -> Self { + Self::default() + } + + /// The timed node produced for `input`, if the pass has reached it. + pub fn timed(&self, input: &Rc) -> Option<&Rc> { + self.done.get(&Rc::as_ptr(input)) + } +} + +/// The data state a timed node's output carries. +pub fn data_state(node: &OperatorNode) -> Option { + Some(ExecutionDataState { + timing: node.timing?, + primitive: match &node.operator { + Operator::ASAP(op) if op.produced_state().is_some() => DataPrimitive::SummaryState, + Operator::ASAP(ASAPOp::MaintainPopulation { .. }) => DataPrimitive::SummaryState, + _ => DataPrimitive::Raw, + }, + }) +} + +/// Whether the sub-DAG below `node` contains a node that can only run at +/// query time (a evaluation), which forces every consumer above it to query +/// time as well. +fn forces_query_time(node: &OperatorNode, seen: &mut HashMap<*const OperatorNode, bool>) -> bool { + let key = node as *const OperatorNode; + if let Some(&cached) = seen.get(&key) { + return cached; + } + let forced = match &node.operator { + _ if node.timing == Some(ExecutionTiming::QueryTime) => true, + Operator::ASAP(ASAPOp::SummaryEstimate { .. }) + | Operator::ASAP(ASAPOp::EvaluatePopulation { .. }) => true, + Operator::NonASAP(NonASAPOp::BinaryOp { lhs, rhs, .. }) + if node + .schema + .fields + .iter() + .any(|f| f.name == crate::pre_asap::schema::PROMQL_SERIES_IDENTITY) + && per_series_rows(lhs).is_none_or(|rows| per_series_rows(rhs) != Some(rows)) => + { + true + } + _ => node + .children() + .iter() + .any(|child| forces_query_time(child, seen)), + }; + seen.insert(key, forced); + forced +} + +/// Write the timings of `assignment` into every node reachable from `root`, +/// top-down, then validate every edge. Returns the timed copy of `root`; +/// `memo` carries the sharing across the roots of one workload. +pub fn apply_materialization_timings( + root: &Rc, + assignment: &MaterializationAssignment, + memo: &mut TimingMemo, +) -> Result, ExecutionDataStateError> { + let mut forced = HashMap::new(); + let timed = write( + root, + ExecutionTiming::QueryTime, + assignment, + memo, + &mut forced, + )?; + if timed.timing == Some(ExecutionTiming::IngestionTime) + && data_state(&timed).map(|s| s.primitive) == Some(DataPrimitive::Raw) + { + return Err(ExecutionDataStateError::MaintenanceRowsAtRoot); + } + validate(&timed, &mut HashMap::new())?; + Ok(timed) +} + +/// Validate the sub-DAG below `root` with every summary maintained at +/// ingestion time ([`MaterializationAssignment::all_ingestion_time`]) and +/// `root` consumed at `root_timing`. For planning-time legality checks of a +/// candidate before it is assembled into a workload DAG: a candidate must stay +/// executable if materialization later maintains its states. Nothing is kept. +pub fn validate_maintained( + root: &Rc, + root_timing: ExecutionTiming, +) -> Result<(), ExecutionDataStateError> { + let assignment = MaterializationAssignment::all_ingestion_time(); + let mut memo = TimingMemo::new(); + let mut forced = HashMap::new(); + let timed = write(root, root_timing, &assignment, &mut memo, &mut forced)?; + validate(&timed, &mut HashMap::new()) +} + +/// The data state `node` produces with every summary maintained at ingestion +/// time when its consumer runs at `consumer` — the planning-time answer to +/// "what does this candidate's output look like", consistent with +/// [`validate_maintained`]. +pub fn planned_data_state( + node: &Rc, + consumer: ExecutionTiming, +) -> ExecutionDataState { + let mut forced = HashMap::new(); + let timing = own_timing( + node, + consumer, + &MaterializationAssignment::all_ingestion_time(), + &mut forced, + ); + ExecutionDataState { + timing, + primitive: match &node.operator { + Operator::ASAP(op) if op.produced_state().is_some() => DataPrimitive::SummaryState, + Operator::ASAP(ASAPOp::MaintainPopulation { .. }) => DataPrimitive::SummaryState, + _ => DataPrimitive::Raw, + }, + } +} + +/// The timing `node` takes when its consumer runs at `consumer`. +fn own_timing( + node: &Rc, + consumer: ExecutionTiming, + assignment: &MaterializationAssignment, + forced: &mut HashMap<*const OperatorNode, bool>, +) -> ExecutionTiming { + // A placement fixed when the candidate was built (an exact-state read + // boundary that must run at query time, or one that feeds maintenance) + // is honored; a conflicting consumer is rejected by validation. + if let Some(placed) = node.timing { + return placed; + } + match &node.operator { + Operator::ASAP(ASAPOp::SummaryEstimate { .. }) + | Operator::ASAP(ASAPOp::EvaluatePopulation { .. }) => ExecutionTiming::QueryTime, + Operator::ASAP(ASAPOp::MaintainPopulation { .. }) => ExecutionTiming::IngestionTime, + Operator::ASAP(ASAPOp::SummaryAgg { child, .. }) => { + if forces_query_time(child, forced) { + ExecutionTiming::QueryTime + } else { + assignment.summary_timing(node) + } + } + _ => consumer, + } +} + +fn write( + node: &Rc, + consumer: ExecutionTiming, + assignment: &MaterializationAssignment, + memo: &mut TimingMemo, + forced: &mut HashMap<*const OperatorNode, bool>, +) -> Result, ExecutionDataStateError> { + let timing = own_timing(node, consumer, assignment, forced); + if let Some(done) = memo.done.get(&Rc::as_ptr(node)) { + let previous = done.timing.expect("memoized node is timed"); + if previous != timing { + return Err(ExecutionDataStateError::ConflictingTiming { + first: ExecutionDataState { + timing: previous, + primitive: data_state(done).map_or(DataPrimitive::Raw, |s| s.primitive), + }, + second: ExecutionDataState { + timing, + primitive: data_state(done).map_or(DataPrimitive::Raw, |s| s.primitive), + }, + }); + } + return Ok(Rc::clone(done)); + } + let mut error = None; + let operator = + node.operator.map_children( + |child| match write(child, timing, assignment, memo, forced) { + Ok(timed) => timed, + Err(e) => { + error.get_or_insert(e); + Rc::clone(child) + } + }, + ); + if let Some(e) = error { + return Err(e); + } + let timed = Rc::new(OperatorNode { + operator, + result_kind: node.result_kind, + schema: node.schema.clone(), + guarantee: node.guarantee.clone(), + timing: Some(timing), + // Timing copies the same logical sub-DAG; its observations are unchanged. + coverage: node.coverage.clone(), + }); + memo.done.insert(Rc::as_ptr(node), Rc::clone(&timed)); + Ok(timed) +} + +fn state_of(node: &OperatorNode) -> ExecutionDataState { + data_state(node).expect("timed node") +} + +/// Check every edge below `node` against the module-level rules. +fn validate( + node: &Rc, + seen: &mut HashMap<*const OperatorNode, ()>, +) -> Result<(), ExecutionDataStateError> { + if seen.insert(Rc::as_ptr(node), ()).is_some() { + return Ok(()); + } + let timing = node.timing.expect("timed node"); + match &node.operator { + Operator::ASAP(op) => validate_asap(node, op, timing)?, + Operator::NonASAP(op) => validate_non_asap(node, op, timing)?, + } + for child in node.children() { + validate(child, seen)?; + } + Ok(()) +} + +fn is_exact_accumulator_state(schema: &Schema) -> Result<(), ExecutionDataStateError> { + for field in &schema.fields { + match &field.dtype { + FieldDataType::Plain(_) | FieldDataType::ExactAggregate(..) => {} + other => { + return Err(ExecutionDataStateError::UnsupportedStateComposition { + family: format!("{other:?}"), + }) + } + } + } + Ok(()) +} + +fn validate_asap( + node: &OperatorNode, + op: &ASAPOp, + timing: ExecutionTiming, +) -> Result<(), ExecutionDataStateError> { + match op { + ASAPOp::SummaryAgg { child, .. } => { + let avail = state_of(child); + match avail { + ExecutionDataState::INGESTION_ROWS | ExecutionDataState::QUERY_ROWS => {} + s if s.primitive == DataPrimitive::SummaryState => { + is_exact_accumulator_state(&child.schema)? + } + other => { + return Err(ExecutionDataStateError::EvaluationUnderMaintenance { + edge: "SummaryAgg.child", + child: other, + }) + } + } + if timing == ExecutionTiming::IngestionTime + && avail.timing == ExecutionTiming::QueryTime + { + return Err(ExecutionDataStateError::EvaluationUnderMaintenance { + edge: "SummaryAgg.child", + child: avail, + }); + } + Ok(()) + } + ASAPOp::SummaryEstimate { summary_input, .. } => { + let s = state_of(summary_input); + if s.primitive != DataPrimitive::SummaryState { + return Err(ExecutionDataStateError::IllegalChildDataState { + edge: "SummaryEstimate.summary_input", + child: s, + }); + } + if timing != ExecutionTiming::QueryTime { + return Err(ExecutionDataStateError::IllegalChildDataState { + edge: "SummaryEstimate", + child: state_of(node), + }); + } + Ok(()) + } + ASAPOp::FinalizeExactAccumulator { child } => { + let s = state_of(child); + if s.primitive != DataPrimitive::SummaryState + || is_exact_accumulator_state(&child.schema).is_err() + || (timing == ExecutionTiming::IngestionTime && s.timing != timing) + { + return Err(ExecutionDataStateError::IllegalChildDataState { + edge: "FinalizeExactAccumulator.child", + child: s, + }); + } + Ok(()) + } + ASAPOp::MaintainPopulation { child, population } => { + let valid = population.matches_node(child) + && state_of(child) + == ExecutionDataState { + timing, + primitive: DataPrimitive::Raw, + }; + if !valid { + return Err(ExecutionDataStateError::InvalidMaintainedPopulation); + } + Ok(()) + } + ASAPOp::EvaluatePopulation { child, evaluation } => { + let valid = timing == ExecutionTiming::QueryTime + && matches!( + &child.operator, + Operator::ASAP(ASAPOp::MaintainPopulation { population, .. }) + if population.supports(evaluation) + && child.timing.is_some() + ); + if !valid { + return Err(ExecutionDataStateError::InvalidMaintainedPopulation); + } + Ok(()) + } + ASAPOp::SummaryMerge { .. } + | ASAPOp::SummarySubtract { .. } + | ASAPOp::SummaryDelete { .. } + | ASAPOp::SummaryJoin { .. } + | ASAPOp::Extension { .. } => Err(ExecutionDataStateError::UnimplementedOperator { + operator: op.kind_name(), + }), + } +} + +fn check_plain_or_exact_values(input: &Schema) -> Result<(), ExecutionDataStateError> { + for field in &input.fields { + if !matches!( + field.dtype, + FieldDataType::Plain(_) | FieldDataType::ExactAggregate(..) + ) { + return Err(ExecutionDataStateError::NonPlainOperand { + column: field.name.clone(), + dtype: format!("{:?}", field.dtype), + }); + } + } + Ok(()) +} + +fn check_all_plain(input: &Schema) -> Result<(), ExecutionDataStateError> { + for field in &input.fields { + if !field.is_plain() { + return Err(ExecutionDataStateError::NonPlainOperand { + column: field.name.clone(), + dtype: format!("{:?}", field.dtype), + }); + } + } + Ok(()) +} + +fn validate_non_asap( + node: &OperatorNode, + op: &NonASAPOp, + timing: ExecutionTiming, +) -> Result<(), ExecutionDataStateError> { + // Every input is rows at this node's own timing. Ingestion work never + // reads a query-time value; exact-accumulator state may pass through + // the projection-like operators unchanged. + for child in op.children() { + let s = state_of(child); + let passes_state = matches!( + op, + NonASAPOp::Project { .. } + | NonASAPOp::Filter { .. } + | NonASAPOp::Sort { .. } + | NonASAPOp::Limit { .. } + ) && s.primitive == DataPrimitive::SummaryState + && is_exact_accumulator_state(&child.schema).is_ok(); + if s.timing != timing || (s.primitive != DataPrimitive::Raw && !passes_state) { + return Err(ExecutionDataStateError::IllegalChildDataState { + edge: op.kind_name(), + child: s, + }); + } + } + match op { + NonASAPOp::Project { child, .. } + | NonASAPOp::Filter { child, .. } + | NonASAPOp::Sort { child, .. } + | NonASAPOp::Limit { child, .. } => check_plain_or_exact_values(&child.schema)?, + NonASAPOp::Aggregate { + reduction, + measures, + child, + .. + } => { + let mut referenced: Vec = reduction + .group_keys() + .map(|keys| keys.keys().to_vec()) + .unwrap_or_default(); + for m in measures { + referenced.extend(m.input_cols()); + } + let implicit = measures.iter().any(|m| m.input_cols().is_empty()); + for (i, field) in child.schema.fields.iter().enumerate() { + if (implicit || referenced.contains(&i)) && !field.is_plain() { + return Err(ExecutionDataStateError::NonPlainOperand { + column: field.name.clone(), + dtype: format!("{:?}", field.dtype), + }); + } + } + } + NonASAPOp::BinaryOp { + operator, lhs, rhs, .. + } => { + let is_div = matches!( + operator.kind, + BinaryOpKind::Arithmetic(crate::pre_asap::ArithmeticOpKind::Div) + ); + if (operator.checked_relative_division && operator.checked_finite_division) + || ((operator.checked_relative_division || operator.checked_finite_division) + && (timing != ExecutionTiming::QueryTime || !is_div)) + { + return Err(ExecutionDataStateError::InvalidCheckedDivision); + } + if timing == ExecutionTiming::IngestionTime { + let plain_float_or_ts = |schema: &Schema| { + schema.fields.iter().all(|field| { + !field.nullable + && (matches!( + field.dtype, + FieldDataType::Plain(DataType::Float64 | DataType::Timestamp) + ) || (field.name + == crate::pre_asap::schema::PROMQL_SERIES_IDENTITY + && field.dtype == FieldDataType::Plain(DataType::Utf8))) + }) + }; + let float_count = node + .schema + .fields + .iter() + .filter(|f| matches!(f.dtype, FieldDataType::Plain(DataType::Float64))) + .count(); + if operator.vector_match.is_some() + || !matches!(operator.kind, BinaryOpKind::Arithmetic(_)) + || lhs.schema != rhs.schema + || lhs.schema != node.schema + || node + .schema + .fields + .iter() + .filter(|f| f.name == crate::pre_asap::schema::PROMQL_SERIES_IDENTITY) + .count() + > 1 + || (node + .schema + .fields + .iter() + .any(|f| f.name == crate::pre_asap::schema::PROMQL_SERIES_IDENTITY) + && per_series_rows(lhs) + .is_none_or(|rows| per_series_rows(rhs) != Some(rows))) + || !plain_float_or_ts(&node.schema) + || float_count != 1 + { + return Err(ExecutionDataStateError::InvalidMaintenanceBinary); + } + } + } + _ => { + for child in op.children() { + check_all_plain(&child.schema)?; + } + } + } + Ok(()) +} + +/// Copy, for one consumer, every sub-DAG that `assignment` would reach with +/// two different timings, so that a workload whose CSE shared a `Scan` +/// between an ingestion-time summary and a query-time computation can still +/// be timed. Only the conflicting sub-DAGs are copied; a sub-DAG reached with +/// one timing stays one `Rc`. Returns the (possibly rewritten) root. +pub fn split_shared_by_phase( + root: &Rc, + assignment: &MaterializationAssignment, +) -> Rc { + // First pass: the set of timings each node is reached with. + let mut reached: HashMap<*const OperatorNode, Vec> = HashMap::new(); + let mut forced = HashMap::new(); + fn collect( + node: &Rc, + consumer: ExecutionTiming, + assignment: &MaterializationAssignment, + reached: &mut HashMap<*const OperatorNode, Vec>, + forced: &mut HashMap<*const OperatorNode, bool>, + ) { + let timing = own_timing(node, consumer, assignment, forced); + let entry = reached.entry(Rc::as_ptr(node)).or_default(); + if entry.contains(&timing) { + return; + } + entry.push(timing); + for child in node.children() { + collect(child, timing, assignment, reached, forced); + } + } + collect( + root, + ExecutionTiming::QueryTime, + assignment, + &mut reached, + &mut forced, + ); + if reached.values().all(|timings| timings.len() <= 1) { + return Rc::clone(root); + } + // Second pass: rebuild, giving each (node, timing) pair its own copy. + let mut copies: HashMap<(*const OperatorNode, ExecutionTiming), Rc> = + HashMap::new(); + fn rebuild( + node: &Rc, + consumer: ExecutionTiming, + assignment: &MaterializationAssignment, + reached: &HashMap<*const OperatorNode, Vec>, + copies: &mut HashMap<(*const OperatorNode, ExecutionTiming), Rc>, + forced: &mut HashMap<*const OperatorNode, bool>, + ) -> Rc { + let timing = own_timing(node, consumer, assignment, forced); + let key = (Rc::as_ptr(node), timing); + if let Some(done) = copies.get(&key) { + return Rc::clone(done); + } + let conflicted = reached + .get(&Rc::as_ptr(node)) + .is_some_and(|timings| timings.len() > 1); + let mut changed = conflicted; + let operator = node.operator.map_children(|child| { + let rebuilt = rebuild(child, timing, assignment, reached, copies, forced); + changed |= !Rc::ptr_eq(&rebuilt, child); + rebuilt + }); + let out = if changed { + Rc::new(OperatorNode { + operator, + result_kind: node.result_kind, + schema: node.schema.clone(), + guarantee: node.guarantee.clone(), + timing: node.timing, + coverage: node.coverage.clone(), + }) + } else { + Rc::clone(node) + }; + copies.insert(key, Rc::clone(&out)); + out + } + rebuild( + root, + ExecutionTiming::QueryTime, + assignment, + &reached, + &mut copies, + &mut forced, + ) +} + +/// Maintenance arithmetic needs the same per-series population on both sides. +fn per_series_rows(node: &OperatorNode) -> Option<&OperatorNode> { + use crate::post_asap::ExactKind; + match &node.operator { + Operator::ASAP(ASAPOp::FinalizeExactAccumulator { child }) => match &child.operator { + Operator::ASAP(ASAPOp::SummaryAgg { + child, + family: FieldDataType::ExactAggregate(ExactKind::Sum | ExactKind::Count, _), + reduction: crate::pre_asap::Reduction::PerEntity, + filter: None, + .. + }) => Some(child), + _ => None, + }, + Operator::NonASAP(NonASAPOp::BinaryOp { lhs, rhs, .. }) => { + let rows = per_series_rows(lhs)?; + (per_series_rows(rhs) == Some(rows)).then_some(rows) + } + _ => None, + } +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::ir::non_asap::NonASAPOp; + use crate::ir::operator_properties::{Reduction, Source}; + use crate::post_asap::sketch::{ + ExactKind, ExactParams, GroupingStrategy, SketchAlgorithm, SketchKind, SketchParams, + SketchStatistic, SummaryUpdate, + }; + use crate::pre_asap::agg_intent::AggIntent; + use crate::pre_asap::expr_ir::ColumnRef; + use crate::pre_asap::schema::Field; + + fn scan_with(fields: Vec) -> Rc { + OperatorNode::new_shared(crate::ir::Operator::NonASAP(NonASAPOp::Scan { + source: Source::TimeSeries { metric: "m".into() }, + predicates: vec![], + schema: Schema::with_time_index(fields, 0, vec![]), + })) + .unwrap() + } + + fn scan() -> Rc { + scan_with(vec![ + Field::plain("ts", DataType::Timestamp, false), + Field::plain("value", DataType::Float64, false), + Field::plain("zone", DataType::Utf8, true), + ]) + } + + fn kll() -> FieldDataType { + FieldDataType::Sketch( + SketchKind::new(SketchAlgorithm::Kll, SketchParams::Kll { k: 200 }), + GroupingStrategy::default(), + ) + } + + fn exact_sum() -> FieldDataType { + FieldDataType::ExactAggregate(ExactKind::Sum, ExactParams::Sum) + } + + fn agg(child: Rc, family: FieldDataType) -> Rc { + std::rc::Rc::new( + OperatorNode::with_schema( + crate::ir::Operator::ASAP(ASAPOp::SummaryAgg { + child, + family: family.clone(), + input: SummaryUpdate::column(ColumnRef::SampleValue), + reduction: Reduction::by(vec![]), + grouping: GroupingStrategy::default(), + filter: None, + }), + Schema::lifted(vec![Field::new("state", family, false)], None), + ) + .with_guarantee(None), + ) + } + + fn estimate(child: Rc) -> Rc { + std::rc::Rc::new( + OperatorNode::with_schema( + crate::ir::Operator::ASAP(ASAPOp::SummaryEstimate { + summary_input: child, + query: SketchStatistic::Quantile { q: 0.99 }, + }), + Schema::lifted( + vec![Field::plain("quantile_0_99", DataType::Float64, false)], + None, + ), + ) + .with_guarantee(None), + ) + } + + fn aggregate(measure: AggIntent, child: Rc) -> Rc { + OperatorNode::new_shared(crate::ir::Operator::NonASAP(NonASAPOp::Aggregate { + reduction: Reduction::by(vec![]), + measures: vec![measure], + output_names: vec![], + filters: vec![], + having: None, + child, + })) + .unwrap() + } + + fn max(child: Rc) -> Rc { + aggregate(AggIntent::Max { col: None }, child) + } + + /// `node` with its timing fixed in advance, as a candidate builder does + /// for an operator that must feed maintenance. + fn placed_at_ingestion(node: Rc) -> Rc { + Rc::new( + (*node) + .clone() + .with_timing(Some(ExecutionTiming::IngestionTime)), + ) + } + + /// Apply with every summary maintained, the placement whose edge rules + /// these tests exercise. + fn apply(root: &Rc) -> Result, ExecutionDataStateError> { + apply_materialization_timings( + root, + &MaterializationAssignment::all_ingestion_time(), + &mut TimingMemo::new(), + ) + } + + fn child(node: &Rc) -> Rc { + Rc::clone(node.children()[0]) + } + + /// Without a materialization decision, a summary and its input run at + /// query time; an explicit per-state choice overrides the default. + #[test] + fn default_assignment_materializes_nothing() { + let summary = agg(scan(), kll()); + let root = apply_materialization_timings( + &summary, + &MaterializationAssignment::default(), + &mut TimingMemo::new(), + ) + .unwrap(); + assert_eq!( + data_state(&root), + Some(ExecutionDataState { + timing: ExecutionTiming::QueryTime, + primitive: DataPrimitive::SummaryState, + }) + ); + assert_eq!( + data_state(&child(&root)), + Some(ExecutionDataState::QUERY_ROWS) + ); + let mut assignment = MaterializationAssignment::all_query_time(); + assignment.set(&summary, ExecutionTiming::IngestionTime); + let root = + apply_materialization_timings(&summary, &assignment, &mut TimingMemo::new()).unwrap(); + assert_eq!( + data_state(&root), + Some(ExecutionDataState::INGESTION_SUMMARY) + ); + } + + #[test] + fn summary_agg_input_runs_at_ingestion_time() { + let root = apply(&agg(scan(), kll())).unwrap(); + assert_eq!( + data_state(&root), + Some(ExecutionDataState::INGESTION_SUMMARY) + ); + assert_eq!( + data_state(&child(&root)), + Some(ExecutionDataState::INGESTION_ROWS) + ); + } + + #[test] + fn exact_accumulator_state_may_feed_another_summary_agg() { + let inner = agg(scan(), exact_sum()); + assert!(apply(&estimate(agg(inner, kll()))).is_ok()); + } + + #[test] + fn evaluation_can_feed_summary_construction_at_query_time() { + let inner = estimate(agg(scan(), kll())); + let root = apply(&estimate(agg(inner, kll()))).unwrap(); + assert_eq!(child(&root).timing, Some(ExecutionTiming::QueryTime)); + } + + /// Any non-ASAP operator over a evaluation runs at query time. + #[test] + fn query_time_operation_over_evaluation_is_legal_and_root_is_evaluation() { + let evaluation = || estimate(agg(scan(), kll())); + let sorted = OperatorNode::new_shared(crate::ir::Operator::NonASAP(NonASAPOp::Sort { + keys: vec![], + partition_by: Default::default(), + child: evaluation(), + })) + .unwrap(); + for root in [max(evaluation()), sorted] { + let root = apply(&root).unwrap(); + assert_eq!(data_state(&root), Some(ExecutionDataState::QUERY_ROWS)); + } + } + + #[test] + fn query_time_values_can_feed_query_time_summary_construction() { + let post = max(estimate(agg(scan(), kll()))); + let root = apply(&estimate(agg(post, kll()))).unwrap(); + assert_eq!(child(&root).timing, Some(ExecutionTiming::QueryTime)); + } + + #[test] + fn function_under_summary_agg_is_legal_but_not_at_root() { + let operation = placed_at_ingestion(max(scan())); + assert_eq!( + apply(&operation).err(), + Some(ExecutionDataStateError::MaintenanceRowsAtRoot) + ); + let root = apply(&estimate(agg(operation, kll()))).unwrap(); + let timed_operation = child(&child(&root)); + assert_eq!( + data_state(&timed_operation), + Some(ExecutionDataState::INGESTION_ROWS) + ); + } + + #[test] + fn function_over_evaluation_is_rejected() { + let operation = placed_at_ingestion(max(estimate(agg(scan(), kll())))); + assert!(matches!( + apply(&estimate(agg(operation, kll()))), + Err(ExecutionDataStateError::IllegalChildDataState { + child: ExecutionDataState::QUERY_ROWS, + .. + }) + )); + } + + /// One shared sub-DAG reached as maintenance input and as query-time + /// input cannot be executed once for both; splitting it by phase first + /// makes the plan timeable. + #[test] + fn a_shared_subtree_reached_at_two_timings_conflicts() { + let shared = scan(); + let root = OperatorNode::new_shared(crate::ir::Operator::NonASAP(NonASAPOp::Concat { + children: vec![ + max(estimate(agg(Rc::clone(&shared), kll()))), + max(Rc::clone(&shared)), + ], + discriminator_unique_key: None, + })) + .unwrap(); + assert_eq!( + apply(&root).err(), + Some(ExecutionDataStateError::ConflictingTiming { + first: ExecutionDataState::INGESTION_ROWS, + second: ExecutionDataState::QUERY_ROWS, + }) + ); + let split = split_shared_by_phase(&root, &MaterializationAssignment::all_ingestion_time()); + assert!(apply(&split).is_ok()); + } + + /// Both paired operands must be plain; an unrelated state column is not + /// an input. + #[test] + fn pearson_corr_checks_both_operand_states() { + let corr_over = |state_column: usize| { + let mut fields = vec![ + Field::plain("ts", DataType::Timestamp, false), + Field::plain("x", DataType::Float64, false), + Field::plain("y", DataType::Float64, false), + Field::plain("unused", DataType::Float64, false), + ]; + fields[state_column].dtype = kll(); + aggregate( + AggIntent::PearsonCorr { left: 1, right: 2 }, + scan_with(fields), + ) + }; + for operand in [1, 2] { + assert!(matches!( + validate_maintained(&corr_over(operand), ExecutionTiming::QueryTime), + Err(ExecutionDataStateError::NonPlainOperand { .. }) + )); + } + validate_maintained(&corr_over(3), ExecutionTiming::QueryTime).unwrap(); + } +} diff --git a/crates/types/src/ir/wire.rs b/crates/types/src/ir/wire.rs new file mode 100644 index 000000000..a36243c3c --- /dev/null +++ b/crates/types/src/ir/wire.rs @@ -0,0 +1,746 @@ +//! Flat operator/scalar payloads shared by logical transport. +use std::rc::Rc; +use std::time::Duration; + +use serde::{Deserialize, Serialize}; + +use super::asap::ASAPOp; +use super::node::{Operator, OperatorNode}; +use super::non_asap::{BinaryOperator, NonASAPOp, TimeRangeKind}; +use super::scalar::{ExprSemantics, Predicate, ProjectItem, ScalarExpr, SortKey}; +use crate::ir::operator_properties::{ + ConcatDiscriminatorKey, GroupKeys, InfoMatcher, JoinKind, Reduction, RelationalSetOpKind, + SampleKind, Source, TimeShift, WindowFrame, WindowFuncKind, +}; +use crate::post_asap::maintained_population::{MaintainedPopulation, PopulationStatistic}; +use crate::post_asap::sketch::{GroupingStrategy, SketchStatistic, SummaryUpdate}; +use crate::pre_asap::agg_intent::AggIntent; +use crate::pre_asap::expr_ir::{ArithmeticOpKind, CompareOpKind, ScalarValue}; +use crate::pre_asap::schema::{ColumnId, DataType, FieldDataType, Schema}; + +#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)] +pub enum EdgeRole { + Input, + Left, + Right, + /// The consumer reads the producer from inside one of its scalar + /// expressions (`scalar(v)`, a scalar subquery, `EXISTS`, `IN`). + ScalarRef, +} + +#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)] +pub enum GroupingEdgeCompatibility { + Identical, + ConsumerCoarsensProducer, + Incompatible, + NotApplicable, +} + +/// Stable identity of a node within one exported logical ASAP DAG. +#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)] +#[serde(transparent)] +pub struct LogicalASAPNodeId(pub u32); + +// ── Wire mirrors of the scalar language ────────────────────────────────── + +/// [`ScalarExpr`] with every operator reference replaced by the id of the +/// exported node (connected to the owner by an [`EdgeRole::ScalarRef`] edge). +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +pub enum WireScalarExpr { + Column(ColumnId), + Literal(ScalarValue), + Negative { + expr: Box, + semantics: ExprSemantics, + }, + Compare { + left: Box, + op: CompareOpKind, + right: Box, + semantics: ExprSemantics, + }, + BoolAnd(Vec), + BoolOr(Vec), + Not(Box), + IsNull(Box), + IsNotNull(Box), + Cast { + expr: Box, + to: DataType, + try_cast: bool, + }, + InList { + expr: Box, + list: Vec, + negated: bool, + }, + FunctionCall { + name: String, + args: Vec, + }, + Arithmetic { + op: ArithmeticOpKind, + left: Box, + right: Box, + semantics: ExprSemantics, + }, + Case { + operand: Option>, + branches: Vec<(WireScalarExpr, WireScalarExpr)>, + else_expr: Option>, + }, + CurrentTimestamp, + EvalTimestamp, + PromqlScalarFromVector(LogicalASAPNodeId), + ScalarSubquery(LogicalASAPNodeId), + Exists { + subquery: LogicalASAPNodeId, + negated: bool, + }, + InSubquery { + expr: Box, + subquery: LogicalASAPNodeId, + negated: bool, + }, +} + +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +pub struct WirePredicate(pub WireScalarExpr); + +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +pub struct WireProjectItem { + pub alias: Option, + pub expr: WireScalarExpr, +} + +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +pub struct WireSortKey { + pub expr: WireScalarExpr, + pub ascending: bool, + pub nulls_first: bool, +} + +impl WireScalarExpr { + /// Explicit producer IDs recursively referenced by this scalar tree. + pub fn operator_refs(&self) -> Vec { + fn collect(expr: &WireScalarExpr, out: &mut Vec) { + use WireScalarExpr::*; + match expr { + PromqlScalarFromVector(id) | ScalarSubquery(id) => out.push(*id), + Exists { subquery, .. } => out.push(*subquery), + InSubquery { expr, subquery, .. } => { + out.push(*subquery); + collect(expr, out); + } + Negative { expr, .. } + | Not(expr) + | IsNull(expr) + | IsNotNull(expr) + | Cast { expr, .. } => collect(expr, out), + Compare { left, right, .. } | Arithmetic { left, right, .. } => { + collect(left, out); + collect(right, out); + } + BoolAnd(args) | BoolOr(args) | FunctionCall { args, .. } => { + for expr in args { + collect(expr, out); + } + } + InList { expr, list, .. } => { + collect(expr, out); + for expr in list { + collect(expr, out); + } + } + Case { + operand, + branches, + else_expr, + } => { + if let Some(expr) = operand { + collect(expr, out); + } + for (when, then) in branches { + collect(when, out); + collect(then, out); + } + if let Some(expr) = else_expr { + collect(expr, out); + } + } + Column(_) | Literal(_) | CurrentTimestamp | EvalTimestamp => {} + } + } + let mut out = Vec::new(); + collect(self, &mut out); + out + } + + /// Mirror `expr`, resolving every operator reference through `id_of`. + pub fn from_expr( + expr: &ScalarExpr, + id_of: &mut impl FnMut(&Rc) -> LogicalASAPNodeId, + ) -> Self { + fn boxed( + e: &ScalarExpr, + id_of: &mut impl FnMut(&Rc) -> LogicalASAPNodeId, + ) -> Box { + Box::new(WireScalarExpr::from_expr(e, id_of)) + } + fn list( + es: &[ScalarExpr], + id_of: &mut impl FnMut(&Rc) -> LogicalASAPNodeId, + ) -> Vec { + es.iter() + .map(|e| WireScalarExpr::from_expr(e, id_of)) + .collect() + } + match expr { + ScalarExpr::Column(id) => WireScalarExpr::Column(*id), + ScalarExpr::Literal(v) => WireScalarExpr::Literal(v.clone()), + ScalarExpr::Negative { expr, semantics } => WireScalarExpr::Negative { + expr: boxed(expr, id_of), + semantics: *semantics, + }, + ScalarExpr::Compare { + left, + op, + right, + semantics, + } => WireScalarExpr::Compare { + left: boxed(left, id_of), + op: op.clone(), + right: boxed(right, id_of), + semantics: *semantics, + }, + ScalarExpr::BoolAnd(parts) => WireScalarExpr::BoolAnd(list(parts, id_of)), + ScalarExpr::BoolOr(parts) => WireScalarExpr::BoolOr(list(parts, id_of)), + ScalarExpr::Not(e) => WireScalarExpr::Not(boxed(e, id_of)), + ScalarExpr::IsNull(e) => WireScalarExpr::IsNull(boxed(e, id_of)), + ScalarExpr::IsNotNull(e) => WireScalarExpr::IsNotNull(boxed(e, id_of)), + ScalarExpr::Cast { expr, to, try_cast } => WireScalarExpr::Cast { + expr: boxed(expr, id_of), + to: to.clone(), + try_cast: *try_cast, + }, + ScalarExpr::InList { + expr, + list: items, + negated, + } => WireScalarExpr::InList { + expr: boxed(expr, id_of), + list: list(items, id_of), + negated: *negated, + }, + ScalarExpr::FunctionCall { name, args } => WireScalarExpr::FunctionCall { + name: name.clone(), + args: list(args, id_of), + }, + ScalarExpr::Arithmetic { + op, + left, + right, + semantics, + } => WireScalarExpr::Arithmetic { + op: op.clone(), + left: boxed(left, id_of), + right: boxed(right, id_of), + semantics: *semantics, + }, + ScalarExpr::Case { + operand, + branches, + else_expr, + } => WireScalarExpr::Case { + operand: operand.as_ref().map(|e| boxed(e, id_of)), + branches: branches + .iter() + .map(|(w, t)| (Self::from_expr(w, id_of), Self::from_expr(t, id_of))) + .collect(), + else_expr: else_expr.as_ref().map(|e| boxed(e, id_of)), + }, + ScalarExpr::CurrentTimestamp => WireScalarExpr::CurrentTimestamp, + ScalarExpr::EvalTimestamp => WireScalarExpr::EvalTimestamp, + ScalarExpr::PromqlScalarFromVector(node) => { + WireScalarExpr::PromqlScalarFromVector(id_of(node)) + } + ScalarExpr::ScalarSubquery(node) => WireScalarExpr::ScalarSubquery(id_of(node)), + ScalarExpr::Exists { subquery, negated } => WireScalarExpr::Exists { + subquery: id_of(subquery), + negated: *negated, + }, + ScalarExpr::InSubquery { + expr, + subquery, + negated, + } => WireScalarExpr::InSubquery { + expr: boxed(expr, id_of), + subquery: id_of(subquery), + negated: *negated, + }, + } + } +} + +impl WirePredicate { + fn from_pred( + p: &Predicate, + id_of: &mut impl FnMut(&Rc) -> LogicalASAPNodeId, + ) -> Self { + WirePredicate(WireScalarExpr::from_expr(&p.0, id_of)) + } +} + +impl WireSortKey { + fn from_keys( + keys: &[SortKey], + id_of: &mut impl FnMut(&Rc) -> LogicalASAPNodeId, + ) -> Vec { + keys.iter() + .map(|k| WireSortKey { + expr: WireScalarExpr::from_expr(&k.expr, id_of), + ascending: k.ascending, + nulls_first: k.nulls_first, + }) + .collect() + } +} + +// ── Wire mirror of the non-ASAP operator vocabulary ────────────────────── + +/// [`NonASAPOp`] without its child fields (children are edges) and with +/// every scalar expression mirrored as [`WireScalarExpr`]. Fields named +/// `kind` in the IR are renamed so they do not collide with the variant tag. +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +#[serde(tag = "kind", rename_all = "snake_case")] +pub enum NonASAPOpKind { + Scan { + source: Source, + #[serde(default)] + predicates: Vec, + schema: Schema, + }, + Values { + rows: Vec>, + schema: Schema, + }, + Filter { + pred: WirePredicate, + }, + Project { + cols: Vec, + #[serde(default)] + qualifier: Option, + }, + Aggregate { + reduction: Reduction, + measures: Vec, + #[serde(default)] + output_names: Vec, + #[serde(default)] + filters: Vec>, + #[serde(default)] + having: Option, + }, + Join { + join_kind: JoinKind, + pred: WirePredicate, + }, + SetOp { + set_kind: RelationalSetOpKind, + all: bool, + }, + Concat { + #[serde(default)] + discriminator_unique_key: Option, + }, + Dedup { + cols: Vec, + }, + Sort { + keys: Vec, + #[serde(default)] + partition_by: GroupKeys, + }, + Limit { + n: Option, + offset: usize, + #[serde(default)] + partition_by: GroupKeys, + }, + BinaryOp { + operator: BinaryOperator, + #[serde(default)] + return_bool: bool, + }, + #[serde(rename = "sql_window_func")] + SQLWindowFunc { + func: WindowFuncKind, + args: Vec, + partition_by: GroupKeys, + order_by: Vec, + #[serde(default)] + frame: Option, + output_name: String, + }, + TimeRange { + range: Duration, + range_kind: TimeRangeKind, + }, + TimeShift { + shift: TimeShift, + }, + PromqlVectorFromScalar { + expr: WireScalarExpr, + }, + PromqlRelabel { + dst: String, + value: WireScalarExpr, + }, + PromqlInfoEnrich { + #[serde(default)] + selector: Vec, + }, + PromqlSeriesSample { + #[serde(default)] + by: GroupKeys, + sample_kind: SampleKind, + }, + PromqlSubquery { + range: Duration, + #[serde(default)] + resolution: Option, + }, +} + +impl NonASAPOpKind { + /// Mirror `op`, resolving every operator node its scalar expressions + /// reference through `id_of`. + pub fn from_op( + op: &NonASAPOp, + id_of: &mut impl FnMut(&Rc) -> LogicalASAPNodeId, + ) -> Self { + use NonASAPOp as Op; + match op { + Op::Scan { + source, + predicates, + schema, + } => NonASAPOpKind::Scan { + source: source.clone(), + predicates: predicates + .iter() + .map(|p| WirePredicate::from_pred(p, id_of)) + .collect(), + schema: schema.clone(), + }, + Op::Values { rows, schema } => NonASAPOpKind::Values { + rows: rows + .iter() + .map(|row| { + row.iter() + .map(|e| WireScalarExpr::from_expr(e, id_of)) + .collect() + }) + .collect(), + schema: schema.clone(), + }, + Op::Filter { pred, .. } => NonASAPOpKind::Filter { + pred: WirePredicate::from_pred(pred, id_of), + }, + Op::Project { + cols, qualifier, .. + } => NonASAPOpKind::Project { + cols: cols + .iter() + .map(|ProjectItem { alias, expr }| WireProjectItem { + alias: alias.clone(), + expr: WireScalarExpr::from_expr(expr, id_of), + }) + .collect(), + qualifier: qualifier.clone(), + }, + Op::Aggregate { + reduction, + measures, + output_names, + filters, + having, + .. + } => NonASAPOpKind::Aggregate { + reduction: reduction.clone(), + measures: measures.clone(), + output_names: output_names.clone(), + filters: filters + .iter() + .map(|p| p.as_ref().map(|p| WirePredicate::from_pred(p, id_of))) + .collect(), + having: having.as_ref().map(|p| WirePredicate::from_pred(p, id_of)), + }, + Op::Join { kind, pred, .. } => NonASAPOpKind::Join { + join_kind: kind.clone(), + pred: WirePredicate::from_pred(pred, id_of), + }, + Op::SetOp { kind, all, .. } => NonASAPOpKind::SetOp { + set_kind: kind.clone(), + all: *all, + }, + Op::Concat { + discriminator_unique_key, + .. + } => NonASAPOpKind::Concat { + discriminator_unique_key: discriminator_unique_key.clone(), + }, + Op::Dedup { cols, .. } => NonASAPOpKind::Dedup { cols: cols.clone() }, + Op::Sort { + keys, partition_by, .. + } => NonASAPOpKind::Sort { + keys: WireSortKey::from_keys(keys, id_of), + partition_by: partition_by.clone(), + }, + Op::Limit { + n, + offset, + partition_by, + .. + } => NonASAPOpKind::Limit { + n: *n, + offset: *offset, + partition_by: partition_by.clone(), + }, + Op::BinaryOp { + operator, + return_bool, + .. + } => NonASAPOpKind::BinaryOp { + operator: operator.clone(), + return_bool: *return_bool, + }, + Op::SQLWindowFunc { + func, + args, + partition_by, + order_by, + frame, + output_name, + .. + } => NonASAPOpKind::SQLWindowFunc { + func: func.clone(), + args: args + .iter() + .map(|e| WireScalarExpr::from_expr(e, id_of)) + .collect(), + partition_by: partition_by.clone(), + order_by: WireSortKey::from_keys(order_by, id_of), + frame: frame.clone(), + output_name: output_name.clone(), + }, + Op::TimeRange { range, kind, .. } => NonASAPOpKind::TimeRange { + range: *range, + range_kind: *kind, + }, + Op::TimeShift { shift, .. } => NonASAPOpKind::TimeShift { shift: *shift }, + Op::PromqlVectorFromScalar(e) => NonASAPOpKind::PromqlVectorFromScalar { + expr: WireScalarExpr::from_expr(e, id_of), + }, + Op::PromqlRelabel { dst, value, .. } => NonASAPOpKind::PromqlRelabel { + dst: dst.clone(), + value: WireScalarExpr::from_expr(value, id_of), + }, + Op::PromqlInfoEnrich { selector, .. } => NonASAPOpKind::PromqlInfoEnrich { + selector: selector.clone(), + }, + Op::PromqlSeriesSample { by, kind, .. } => NonASAPOpKind::PromqlSeriesSample { + by: by.clone(), + sample_kind: *kind, + }, + Op::PromqlSubquery { + range, resolution, .. + } => NonASAPOpKind::PromqlSubquery { + range: *range, + resolution: *resolution, + }, + } + } +} + +// ── The exported DAG ───────────────────────────────────────────────────── + +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +#[serde(tag = "kind", rename_all = "snake_case", deny_unknown_fields)] +pub enum LogicalASAPOperatorPayload { + Relational { + operator: NonASAPOpKind, + }, + SummaryAgg { + family: FieldDataType, + input: SummaryUpdate, + reduction: Reduction, + grouping: GroupingStrategy, + #[serde(default)] + filter: Option, + }, + SummaryEstimate { + query: SketchStatistic, + }, + FinalizeExactAccumulator, + MaintainPopulation { + population: MaintainedPopulation, + }, + EvaluatePopulation { + evaluation: PopulationStatistic, + }, + SummaryMerge, + SummarySubtract, + SummaryDelete { + key: ColumnId, + }, + SummaryJoin { + key: ColumnId, + family: FieldDataType, + }, + Extension { + name: String, + }, +} + +/// The operator's own inputs with their edge roles, in field order. +pub(super) fn input_edges(operator: &Operator) -> Vec<(&Rc, EdgeRole)> { + match operator { + Operator::NonASAP(op) => match op { + NonASAPOp::Join { left, right, .. } + | NonASAPOp::SetOp { left, right, .. } + | NonASAPOp::BinaryOp { + lhs: left, + rhs: right, + .. + } => vec![(left, EdgeRole::Left), (right, EdgeRole::Right)], + NonASAPOp::Concat { children, .. } => { + children.iter().map(|c| (c, EdgeRole::Input)).collect() + } + NonASAPOp::Filter { child, .. } + | NonASAPOp::Project { child, .. } + | NonASAPOp::Aggregate { child, .. } + | NonASAPOp::Dedup { child, .. } + | NonASAPOp::Sort { child, .. } + | NonASAPOp::Limit { child, .. } + | NonASAPOp::SQLWindowFunc { child, .. } + | NonASAPOp::TimeRange { child, .. } + | NonASAPOp::TimeShift { child, .. } + | NonASAPOp::PromqlRelabel { child, .. } + | NonASAPOp::PromqlInfoEnrich { child, .. } + | NonASAPOp::PromqlSeriesSample { child, .. } + | NonASAPOp::PromqlSubquery { child, .. } => vec![(child, EdgeRole::Input)], + NonASAPOp::Scan { .. } + | NonASAPOp::Values { .. } + | NonASAPOp::PromqlVectorFromScalar(_) => vec![], + }, + Operator::ASAP(op) => match op { + ASAPOp::SummarySubtract { left, right } + | ASAPOp::SummaryJoin { + outer: left, + inner: right, + .. + } => vec![(left, EdgeRole::Left), (right, EdgeRole::Right)], + ASAPOp::SummaryMerge { children } => { + children.iter().map(|c| (c, EdgeRole::Input)).collect() + } + ASAPOp::SummaryAgg { child, .. } + | ASAPOp::FinalizeExactAccumulator { child } + | ASAPOp::MaintainPopulation { child, .. } + | ASAPOp::EvaluatePopulation { child, .. } + | ASAPOp::Extension { child, .. } => vec![(child, EdgeRole::Input)], + ASAPOp::SummaryEstimate { summary_input, .. } + | ASAPOp::SummaryDelete { summary_input, .. } => { + vec![(summary_input, EdgeRole::Input)] + } + }, + } +} + +pub(super) fn payload_of( + operator: &Operator, + id_of: &mut impl FnMut(&Rc) -> LogicalASAPNodeId, +) -> LogicalASAPOperatorPayload { + match operator { + Operator::NonASAP(op) => LogicalASAPOperatorPayload::Relational { + operator: NonASAPOpKind::from_op(op, id_of), + }, + Operator::ASAP(op) => match op { + ASAPOp::SummaryAgg { + family, + input, + reduction, + grouping, + filter, + .. + } => LogicalASAPOperatorPayload::SummaryAgg { + family: family.clone(), + input: input.clone(), + reduction: reduction.clone(), + grouping: grouping.clone(), + filter: filter.as_ref().map(|p| WirePredicate::from_pred(p, id_of)), + }, + ASAPOp::SummaryEstimate { query, .. } => LogicalASAPOperatorPayload::SummaryEstimate { + query: query.clone(), + }, + ASAPOp::FinalizeExactAccumulator { .. } => { + LogicalASAPOperatorPayload::FinalizeExactAccumulator + } + ASAPOp::MaintainPopulation { population, .. } => { + LogicalASAPOperatorPayload::MaintainPopulation { + population: population.clone(), + } + } + ASAPOp::EvaluatePopulation { evaluation, .. } => { + LogicalASAPOperatorPayload::EvaluatePopulation { + evaluation: evaluation.clone(), + } + } + ASAPOp::SummaryMerge { .. } => LogicalASAPOperatorPayload::SummaryMerge, + ASAPOp::SummarySubtract { .. } => LogicalASAPOperatorPayload::SummarySubtract, + ASAPOp::SummaryDelete { key, .. } => { + LogicalASAPOperatorPayload::SummaryDelete { key: *key } + } + ASAPOp::SummaryJoin { key, family, .. } => LogicalASAPOperatorPayload::SummaryJoin { + key: *key, + family: family.clone(), + }, + ASAPOp::Extension { name, .. } => { + LogicalASAPOperatorPayload::Extension { name: name.clone() } + } + }, + } +} + +/// Grouping compatibility between two `SummaryAgg`s by their reductions. +pub(super) fn grouping_compatibility( + producer: &Operator, + consumer: &Operator, +) -> GroupingEdgeCompatibility { + let ( + Operator::ASAP(ASAPOp::SummaryAgg { + reduction: producer, + .. + }), + Operator::ASAP(ASAPOp::SummaryAgg { + reduction: consumer, + .. + }), + ) = (producer, consumer) + else { + return GroupingEdgeCompatibility::NotApplicable; + }; + match (producer, consumer) { + (p, c) if p == c => GroupingEdgeCompatibility::Identical, + (Reduction::PerEntity, Reduction::Reduce(_)) => { + GroupingEdgeCompatibility::ConsumerCoarsensProducer + } + (Reduction::Reduce(p), Reduction::Reduce(c)) + if !p.is_without() && !c.is_without() && c.iter().all(|key| p.contains(key)) => + { + GroupingEdgeCompatibility::ConsumerCoarsensProducer + } + _ => GroupingEdgeCompatibility::Incompatible, + } +} diff --git a/crates/types/src/lib.rs b/crates/types/src/lib.rs index 9fc450c7f..9252ac806 100644 --- a/crates/types/src/lib.rs +++ b/crates/types/src/lib.rs @@ -1,26 +1,22 @@ //! `asap-types` — shared vocabulary for the whole workspace. //! -//! Merges the former `asap-ir` crate (the pre-ASAP intent algebra, -//! workload/batch types, and DAG export) with the data-type-only modules of -//! the former `asap-sketch` crate (the post-ASAP sketch-bound IR types, -//! under [`post_asap`]). -//! -//! - [`pre_asap`] / [`types`] / [`workload`] / [`dag_export`] — the -//! pre-ASAP IR: language-agnostic query intent, independent of any -//! sketch decision. -//! - [`post_asap`] — the post-ASAP IR: sketch-bound types -//! ([`post_asap::sketch`], [`post_asap::expr`], [`post_asap::schema`]) -//! that commit to a concrete `SummaryKind`/`SummaryParams` realization. -//! No execution logic lives in this workspace (see issue #190) — a -//! downstream deployment crate is expected to supply that. -//! [`post_asap::query_time`] is the one exception, folder-separated from -//! the rest of `post_asap` on purpose: pure, sketch-object-agnostic -//! posterior error-bound math (issue #239) that a future real sketch -//! runtime's readout path can call directly — see that module's docs -//! for the planning-time/execution-time boundary and why it's unwired -//! today. +//! - [`ir`] — the unified operator IR: one operator language before and +//! after ASAP optimization ([`ir::OperatorNode`]), plus its passes +//! (canonicalize, CSE, timing) and the wire export ([`ir::export`]). +//! - [`pre_asap`] — the shared field vocabulary the IR's operators are +//! built from (grouping keys, reductions, sources, aggregation intents, +//! scalar literal / operator kinds, [`pre_asap::Schema`]). +//! - [`post_asap`] — summary-state types (families, kinds, parameters, +//! grouping strategy), accuracy guarantees, and the execution-timing +//! vocabulary. No execution logic lives in this workspace (issue #190). +//! [`post_asap::query_time`] holds pure posterior error-bound math +//! (issue #239) a future sketch runtime's evaluation path can call; see its +//! docs for why it is unwired today. +//! - [`types`] / [`workload`] / [`parsed_workload`] / [`dag_export`] / +//! [`cost`] / [`resources`] — workload, batch, export and cost types. pub mod cost; pub mod dag_export; +pub mod ir; pub mod parsed_workload; pub mod post_asap; pub mod pre_asap; @@ -28,5 +24,3 @@ pub mod resources; pub mod serde_f64; pub mod types; pub mod workload; - -pub mod ir; diff --git a/crates/types/src/parsed_workload.rs b/crates/types/src/parsed_workload.rs index ff955e6a7..9dcf21b83 100644 --- a/crates/types/src/parsed_workload.rs +++ b/crates/types/src/parsed_workload.rs @@ -1,5 +1,5 @@ //! [`ParsedWorkload`] — a [`PlanningWorkload`] whose queries have been lowered -//! to pre-ASAP IR. +//! to the operator IR. //! //! This is the boundary between the frontend stage and the optimization stage //! (issues #429, #430). Everything downstream of lowering consumes this type @@ -10,7 +10,7 @@ use std::rc::Rc; -use crate::pre_asap::query_expr::QueryExpr; +use crate::ir::{OperatorNode, QueryRoot, ScalarExpr}; use crate::workload::{ DataWorkload, PlanningWorkload, QueryWorkload, QueryWorkloadEntry, WorkloadError, }; @@ -33,7 +33,9 @@ pub enum ParsedWorkloadError { #[derive(Debug, Clone)] pub struct ParsedWorkload { workload: PlanningWorkload, - exprs: Vec>, + exprs: Vec>, + operator_indices: Vec, + scalars: Vec<(usize, ScalarExpr)>, } impl ParsedWorkload { @@ -41,16 +43,43 @@ impl ParsedWorkload { /// `i`-th entry. pub fn new( workload: PlanningWorkload, - exprs: Vec>, + exprs: Vec>, + ) -> Result { + Self::from_roots( + workload, + exprs.into_iter().map(QueryRoot::Operator).collect(), + ) + } + + pub fn from_roots( + workload: PlanningWorkload, + roots: Vec, ) -> Result { let entries = workload.query_workload.entries().count(); - if entries != exprs.len() { + if entries != roots.len() { return Err(ParsedWorkloadError::LengthMismatch { entries, - lowered: exprs.len(), + lowered: roots.len(), }); } - Ok(Self { workload, exprs }) + let mut exprs = Vec::new(); + let mut operator_indices = Vec::new(); + let mut scalars = Vec::new(); + for (index, root) in roots.into_iter().enumerate() { + match root { + QueryRoot::Operator(node) => { + operator_indices.push(index); + exprs.push(node); + } + QueryRoot::Scalar(expr) => scalars.push((index, expr)), + } + } + Ok(Self { + workload, + exprs, + operator_indices, + scalars, + }) } pub fn planning_workload(&self) -> &PlanningWorkload { @@ -65,26 +94,37 @@ impl ParsedWorkload { self.workload.data_workload.as_ref() } - pub fn exprs(&self) -> &[Rc] { + pub fn exprs(&self) -> &[Rc] { &self.exprs } pub fn len(&self) -> usize { - self.exprs.len() + self.exprs.len() + self.scalars.len() } pub fn is_empty(&self) -> bool { - self.exprs.is_empty() + self.len() == 0 } /// Normalized entries paired with their lowered expression. - pub fn entries(&self) -> impl Iterator)> + '_ { + pub fn entries(&self) -> impl Iterator)> + '_ { self.workload .query_workload .entries() + .enumerate() + .filter(|(index, _)| self.operator_indices.binary_search(index).is_ok()) + .map(|(_, entry)| entry) .zip(self.exprs.iter()) } + pub fn operator_indices(&self) -> &[usize] { + &self.operator_indices + } + + pub fn scalar_roots(&self) -> &[(usize, ScalarExpr)] { + &self.scalars + } + /// The retained workload's own validation — entry legality and data-workload /// consistency. The PromQL-specific checks it also runs were already a /// precondition of the lowering that produced `self`. diff --git a/crates/types/src/post_asap/cse.rs b/crates/types/src/post_asap/cse.rs deleted file mode 100644 index 55889008c..000000000 --- a/crates/types/src/post_asap/cse.rs +++ /dev/null @@ -1,442 +0,0 @@ -//! Structural sharing for a selected workload in one execution/data scope. -//! -//! This is not candidate selection or a cross-request cache. Callers opt into -//! common producer execution only after agreeing on lifecycle and data scope. -//! Typed equality includes schemas, guarantees and complete source expressions. - -use std::collections::HashMap; -use std::rc::Rc; - -use super::{SummaryExpr, SummaryNode}; - -/// Numeric PartialEq alone conflates signed zeros. The serialized check is -/// additional evidence, never a replacement for typed equality (JSON maps -/// nonfinite floats to null). Keep this rule local to structural sharing. -fn same_value(left: &T, right: &T) -> bool { - left == right - && match (serde_json::to_string(left), serde_json::to_string(right)) { - (Ok(left), Ok(right)) => left == right, - _ => false, - } -} - -/// Children have already been interned. Comparing their identities avoids -/// recursively expanding a shared DAG once for every path to each descendant. -fn same_node(left: &SummaryNode, right: &SummaryNode) -> bool { - use SummaryExpr::*; - let expression_equal = match (&left.expr, &right.expr) { - (KeepPreAsap(a), KeepPreAsap(b)) => Rc::ptr_eq(a, b) || same_value(a, b), - ( - BinaryOp { - lhs: al, - rhs: ar, - operator: ao, - timing: at, - }, - BinaryOp { - lhs: bl, - rhs: br, - operator: bo, - timing: bt, - }, - ) => Rc::ptr_eq(al, bl) && Rc::ptr_eq(ar, br) && ao == bo && at == bt, - ( - ValueOperation { - child: ac, - operation: ao, - timing: at, - }, - ValueOperation { - child: bc, - operation: bo, - timing: bt, - }, - ) => Rc::ptr_eq(ac, bc) && same_value(ao, bo) && at == bt, - ( - RelationalJoin { - left: al, - right: ar, - kind: ak, - pred: ap, - pruning: ax, - }, - RelationalJoin { - left: bl, - right: br, - kind: bk, - pred: bp, - pruning: bx, - }, - ) => { - Rc::ptr_eq(al, bl) - && Rc::ptr_eq(ar, br) - && ak == bk - && same_value(ap, bp) - && same_value(ax, bx) - } - ( - SummaryAgg { - child: ac, - family: af, - input: ai, - reduction: ar, - grouping: ag, - filter: afl, - }, - SummaryAgg { - child: bc, - family: bf, - input: bi, - reduction: br, - grouping: bg, - filter: bfl, - }, - ) => { - Rc::ptr_eq(ac, bc) - && af == bf - && same_value(ai, bi) - && ar == br - && ag == bg - && same_value(afl, bfl) - } - ( - SummaryJoin { - outer: ao, - inner: ai, - key: ak, - family: af, - }, - SummaryJoin { - outer: bo, - inner: bi, - key: bk, - family: bf, - }, - ) => Rc::ptr_eq(ao, bo) && Rc::ptr_eq(ai, bi) && ak == bk && af == bf, - ( - SummarySubtract { - left: al, - right: ar, - }, - SummarySubtract { - left: bl, - right: br, - }, - ) => Rc::ptr_eq(al, bl) && Rc::ptr_eq(ar, br), - ( - SummaryEstimate { - summary_input: ai, - query: aq, - }, - SummaryEstimate { - summary_input: bi, - query: bq, - }, - ) => Rc::ptr_eq(ai, bi) && same_value(aq, bq), - ( - SummaryDelete { - summary_input: ai, - key: ak, - }, - SummaryDelete { - summary_input: bi, - key: bk, - }, - ) => Rc::ptr_eq(ai, bi) && ak == bk, - ( - SummaryMerge { - children: a, - timing: at, - }, - SummaryMerge { - children: b, - timing: bt, - }, - ) => at == bt && a.len() == b.len() && a.iter().zip(b).all(|(a, b)| Rc::ptr_eq(a, b)), - // Keep this exhaustive on the left: new variants require a sharing rule. - ( - KeepPreAsap(_) - | BinaryOp { .. } - | ValueOperation { .. } - | RelationalJoin { .. } - | SummaryAgg { .. } - | SummaryJoin { .. } - | SummarySubtract { .. } - | SummaryEstimate { .. } - | SummaryDelete { .. } - | SummaryMerge { .. }, - _, - ) => false, - }; - expression_equal && left.schema == right.schema && same_value(&left.guarantee, &right.guarantee) -} - -/// Intern equal selected sub-DAGs across roots while preserving every root ID. -/// -/// Only structural equality is used: no grouping, parameter, accuracy or source -/// coercions are performed. All roots must belong to the same data snapshot or -/// maintenance scope. Downstream realization must still check physical -/// implementation compatibility. Use separate calls for independent executions. -/// -/// When the selected states are identical, this is the planner's -/// summary-capability rule (#509 Pass 2): one summary build node feeds every -/// readout it supports, e.g. one KLL for p50 and p99, or one UnivMon for -/// distinct count, entropy and L2. Candidate generation sizes a variant for -/// the strictest sibling consumer so differing accuracy targets can reach -/// identical states here. -pub fn share_common_summary_sub_dags( - roots: Vec<(Id, Rc)>, -) -> Vec<(Id, Rc)> { - fn visit( - node: &Rc, - seen: &mut HashMap>, - pool: &mut Vec>, - ) -> Rc { - let identity = Rc::as_ptr(node) as usize; - if let Some(node) = seen.get(&identity) { - return Rc::clone(node); - } - let mut result = node.as_ref().clone(); - match &mut result.expr { - SummaryExpr::KeepPreAsap(_) => {} - SummaryExpr::SummaryAgg { child, .. } => *child = visit(child, seen, pool), - SummaryExpr::BinaryOp { lhs, rhs, .. } => { - *lhs = visit(lhs, seen, pool); - *rhs = visit(rhs, seen, pool); - } - - SummaryExpr::ValueOperation { child, .. } => *child = visit(child, seen, pool), - SummaryExpr::RelationalJoin { left, right, .. } => { - *left = visit(left, seen, pool); - *right = visit(right, seen, pool); - } - SummaryExpr::SummaryJoin { outer, inner, .. } => { - *outer = visit(outer, seen, pool); - *inner = visit(inner, seen, pool); - } - SummaryExpr::SummarySubtract { left, right } => { - *left = visit(left, seen, pool); - *right = visit(right, seen, pool); - } - SummaryExpr::SummaryEstimate { summary_input, .. } - | SummaryExpr::SummaryDelete { summary_input, .. } => { - *summary_input = visit(summary_input, seen, pool); - } - SummaryExpr::SummaryMerge { children, .. } => { - for child in children { - *child = visit(child, seen, pool); - } - } - } - let result = match pool.iter().find(|existing| same_node(existing, &result)) { - Some(existing) => Rc::clone(existing), - None => { - let result = Rc::new(result); - pool.push(Rc::clone(&result)); - result - } - }; - seen.insert(identity, Rc::clone(&result)); - result - } - let mut seen = HashMap::new(); - let mut pool = Vec::new(); - roots - .into_iter() - .map(|(id, root)| (id, visit(&root, &mut seen, &mut pool))) - .collect() -} - -#[cfg(test)] -mod tests { - use super::*; - use crate::post_asap::{ResultGuarantee, Schema}; - use crate::pre_asap::{QueryExpr, ScalarValue}; - - fn leaf(value: f64) -> Rc { - Rc::new(SummaryNode { - expr: SummaryExpr::KeepPreAsap(Rc::new(QueryExpr::Literal(ScalarValue::Float64( - value, - )))), - schema: Schema::lifted(vec![], None), - guarantee: Some(ResultGuarantee::exact("fixture")), - }) - } - - // Equal separately constructed roots preserve both IDs but share identity. - #[test] - fn shares_equal_roots_and_preserves_ids() { - let roots = share_common_summary_sub_dags(vec![("a", leaf(1.0)), ("b", leaf(1.0))]); - assert_eq!(roots[0].0, "a"); - assert_eq!(roots[1].0, "b"); - assert!(Rc::ptr_eq(&roots[0].1, &roots[1].1)); - } - - // A diamond is retained across the returned roots, not copied per consumer. - #[test] - fn shares_children_across_distinct_roots() { - let merge = Rc::new(SummaryNode { - expr: SummaryExpr::SummaryMerge { - timing: crate::post_asap::ExecutionTiming::IngestionTime, - children: vec![leaf(1.0), leaf(2.0)], - }, - schema: Schema::lifted(vec![], None), - guarantee: None, - }); - let roots = share_common_summary_sub_dags(vec![(0, leaf(1.0)), (1, merge)]); - let SummaryExpr::SummaryMerge { children, .. } = &roots[1].1.expr else { - panic!() - }; - assert!(Rc::ptr_eq(&roots[0].1, &children[0])); - assert!(!Rc::ptr_eq(&children[0], &children[1])); - } - - // Unknown guarantees must not be replaced by an equal expression's exact guarantee. - #[test] - fn distinct_guarantees_and_values_are_not_shared() { - let mut unknown = leaf(1.0).as_ref().clone(); - unknown.guarantee = None; - let roots = share_common_summary_sub_dags(vec![ - (0, leaf(1.0)), - (1, Rc::new(unknown)), - (2, leaf(2.0)), - ]); - assert!(!Rc::ptr_eq(&roots[0].1, &roots[1].1)); - assert!(!Rc::ptr_eq(&roots[0].1, &roots[2].1)); - assert!(roots[1].1.guarantee.is_none()); - } - - // Sharing must preserve IEEE signed zero, including inside exact expressions. - #[test] - fn signed_zero_is_not_coalesced() { - for values in [[0.0, -0.0], [-0.0, 0.0]] { - let roots = - share_common_summary_sub_dags(vec![(0, leaf(values[0])), (1, leaf(values[1]))]); - assert!(!Rc::ptr_eq(&roots[0].1, &roots[1].1)); - for ((_, root), expected) in roots.iter().zip(values) { - let SummaryExpr::KeepPreAsap(expr) = &root.expr else { - panic!() - }; - let QueryExpr::Literal(ScalarValue::Float64(actual)) = expr.as_ref() else { - panic!() - }; - assert_eq!(actual.to_bits(), expected.to_bits()); - assert_eq!(1.0 / actual, 1.0 / expected); - } - } - } - - // Exact expression wrappers must retain signed zero too; JSON's null - // encoding of nonfinite floats must never become the equality decision. - #[test] - fn nested_values_and_nonfinite_values_remain_distinct() { - let wrapped = |value| { - Rc::new(SummaryNode { - expr: SummaryExpr::KeepPreAsap(Rc::new(QueryExpr::promql_scalar(value))), - ..leaf(1.0).as_ref().clone() - }) - }; - for (a, b) in [ - (0.0, -0.0), - (f64::INFINITY, f64::NEG_INFINITY), - (f64::NAN, f64::NAN), - ] { - let roots = share_common_summary_sub_dags(vec![(0, wrapped(a)), (1, wrapped(b))]); - assert!(!Rc::ptr_eq(&roots[0].1, &roots[1].1)); - } - let roots = share_common_summary_sub_dags(vec![ - (0, wrapped(f64::INFINITY)), - (1, wrapped(f64::INFINITY)), - ]); - assert!(Rc::ptr_eq(&roots[0].1, &roots[1].1)); - } - - // Distinct quantile readouts share only a compatible typed sketch producer. - #[test] - fn quantile_roots_share_producer_but_not_readout_or_parameters() { - use crate::post_asap::{ - FieldDataType, GroupingStrategy, SketchAlgorithm, SketchKind, SketchParams, - SketchStatistic, SummaryUpdate, - }; - use crate::pre_asap::{ColumnRef, Reduction}; - fn readout(q: f64, alpha: f64) -> Rc { - let producer = Rc::new(SummaryNode { - expr: SummaryExpr::SummaryAgg { - child: leaf(1.0), - family: FieldDataType::Sketch( - SketchKind::new( - SketchAlgorithm::DDSketch, - SketchParams::DDSketch { alpha }, - ), - GroupingStrategy::default(), - ), - input: SummaryUpdate::column(ColumnRef::SampleValue), - reduction: Reduction::PerEntity, - grouping: GroupingStrategy::default(), - filter: None, - }, - schema: Schema::lifted(vec![], None), - guarantee: None, - }); - Rc::new(SummaryNode { - expr: SummaryExpr::SummaryEstimate { - summary_input: producer, - query: SketchStatistic::Quantile { q }, - }, - schema: Schema::lifted(vec![], None), - guarantee: None, - }) - } - let roots = share_common_summary_sub_dags(vec![ - ("p95", readout(0.95, 0.01)), - ("p99", readout(0.99, 0.01)), - ("strict", readout(0.95, 0.001)), - ]); - let producer = |root: &Rc| match &root.expr { - SummaryExpr::SummaryEstimate { summary_input, .. } => Rc::clone(summary_input), - _ => panic!(), - }; - assert!(!Rc::ptr_eq(&roots[0].1, &roots[1].1)); - assert!(Rc::ptr_eq(&producer(&roots[0].1), &producer(&roots[1].1))); - assert!(!Rc::ptr_eq(&producer(&roots[0].1), &producer(&roots[2].1))); - } - - // Fifty unique input nodes must not require walking an expanded 2^24 DAG. - // The timeout is a coarse runaway guard, not a performance SLA. - #[test] - fn shared_diamond_does_not_expand_during_comparison() { - let (done, completion) = std::sync::mpsc::channel(); - let worker = std::thread::spawn(move || { - fn diamond() -> Rc { - let mut current = leaf(1.0); - for _ in 0..24 { - current = Rc::new(SummaryNode { - expr: SummaryExpr::BinaryOp { - timing: super::super::ExecutionTiming::QueryTime, - lhs: Rc::clone(¤t), - rhs: current, - operator: super::super::BinaryOperator { - checked_relative_division: false, - checked_finite_division: false, - kind: crate::pre_asap::BinaryOpKind::Arithmetic( - crate::pre_asap::ArithmeticOpKind::Add, - ), - vector_match: None, - }, - }, - schema: super::super::Schema::lifted(vec![], None), - guarantee: None, - }); - } - current - } - let roots = share_common_summary_sub_dags(vec![(0, diamond()), (1, diamond())]); - assert!(Rc::ptr_eq(&roots[0].1, &roots[1].1)); - done.send(()).unwrap(); - }); - completion - .recv_timeout(std::time::Duration::from_secs(5)) - .expect("comparison expanded the shared DAG"); - worker.join().unwrap(); - } -} diff --git a/crates/types/src/post_asap/execution_data_state.rs b/crates/types/src/post_asap/execution_data_state.rs index 91373816b..ad6e28781 100644 --- a/crates/types/src/post_asap/execution_data_state.rs +++ b/crates/types/src/post_asap/execution_data_state.rs @@ -1,56 +1,14 @@ -//! Execution-data-state contract for mixed exact/summary plans (issue #171). +//! Execution timing and data-state vocabulary of the operator IR. //! -//! A post-ASAP DAG mixes two very different moments of execution: the -//! **update/ingest path** (rows arrive, maintained summary state is updated) -//! and **query evaluation** (maintained state is read out and a final result -//! is produced). A plan that places a query-time residual *underneath* a -//! maintained summary is not merely expensive — it is unexecutable, because -//! the maintenance loop has no readout values to feed into that summary. -//! [`SummaryExpr::ValueOperation`] represents such work without inventing a -//! node per function or use case. Its [`ExecutionTiming`] makes placement -//! explicit and independent of the semantic [`ValueOperation`]. -//! -//! [`ExecutionDataState`] is what a node's output *is*, at which data_state; -//! [`validate_execution_data_states`] checks every edge of a DAG against the -//! rules below at plan construction, returning a typed [`ExecutionDataStateError`] rather -//! than deferring to a runtime failure. -//! -//! ## Edge rules -//! -//! | Parent | Accepts from `child` | -//! |---|---| -//! | `SummaryAgg.child` | Rows or exact accumulator state at either phase. The initial construction phase follows the input; deployment assigns final phases. | -//! | `SummaryEstimate.summary_input` | Summary state at either phase (any family). Initial readout produces `QUERY_ROWS`. | -//! | `SummaryJoin.outer/inner` | `INGESTION_ROWS` or `INGESTION_SUMMARY`; never a read-time data_state. | -//! | `SummarySubtract`/`SummaryDelete` | `INGESTION_SUMMARY`. | -//! | `SummaryMerge` | Summary state at its explicit ingestion or read timing. | -//! | `ValueOperation.child` with `IngestionTime` | `INGESTION_ROWS`; explicit `FinalizeExactAccumulator` also accepts exact accumulator state. Produces `INGESTION_ROWS`. | -//! | `ValueOperation.child` with `QueryTime` | `QUERY_ROWS`. Produces `QUERY_ROWS`. | -//! -//! ## `KeepPreAsap` declares its data_state through the derivation -//! -//! A [`SummaryExpr::KeepPreAsap`] leaf is a raw pre-ASAP computation that a -//! runtime can execute at either time: as maintenance input beneath a -//! `SummaryAgg`/maintenance-time `ValueOperation`, or as a query-time fallback -//! beneath a read-time `ValueOperation` (or at the root). It carries no timing -//! field of its own -//! — every existing consumer pattern-matches the one-field shape — so its -//! data_state is *assigned* by [`validate_execution_data_states`] from the edge that -//! reaches it and reported in the returned [`ExecutionDataStateAssignment`]. What it may -//! not do is stay ambiguous inside one mixed plan: the same `Rc` -//! reached once as update input and once as query-time fallback is -//! [`ExecutionDataStateError::AmbiguousKeepPreAsap`], because no single execution of that -//! sub-DAG can serve both roles. - -use std::collections::HashMap; -use std::rc::Rc; +//! [`ExecutionTiming`] says when a node's value is produced (ingestion vs. +//! query time); [`ExecutionDataState`] pairs it with the [`DataPrimitive`] +//! the edge carries (raw values vs. summary state). The rules that assign +//! and check them over a DAG live in [`crate::ir::timing`], which reports +//! violations as [`ExecutionDataStateError`]. use thiserror::Error; -use super::expr::{ExactOperation, SummaryExpr, SummaryNode, ValueOperation}; -use crate::pre_asap::schema::FieldDataType; - -use crate::pre_asap::query_expr::{aggregate_output_schema, Predicate, QueryExprError}; +use crate::ir::SchemaDerivationError; use crate::pre_asap::schema::Schema; /// When a post-ASAP value is produced. @@ -79,7 +37,7 @@ impl ExecutionTiming { /// The primitive representation carried by a post-ASAP edge. #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize)] pub enum DataPrimitive { - /// Directly usable values, including approximate summary readouts. + /// Directly usable values, including approximate summary evaluations. /// This does not imply original input data or an exact guarantee. Raw, SummaryState, @@ -123,55 +81,27 @@ impl std::fmt::Display for ExecutionDataState { } } -/// Which parent/edge a [`ExecutionDataStateError`] is about — the variant name of the -/// parent `SummaryExpr` plus its field, for a message a plan author can act -/// on. -#[derive(Debug, Clone, Copy, PartialEq, Eq)] -pub enum ExecutionDataStateEdge { - SummaryAggChild, - SummaryEstimateInput, - SummaryJoinInput, - SummarySubtractInput, - SummaryDeleteInput, - SummaryMergeInput, - ValueOperationChild, -} - -impl ExecutionDataStateEdge { - fn describe(self) -> &'static str { - match self { - Self::SummaryAggChild => "SummaryAgg.child", - Self::SummaryEstimateInput => "SummaryEstimate.summary_input", - Self::SummaryJoinInput => "SummaryJoin.{outer,inner}", - Self::SummarySubtractInput => "SummarySubtract.{left,right}", - Self::SummaryDeleteInput => "SummaryDelete.summary_input", - Self::SummaryMergeInput => "SummaryMerge.children[]", - Self::ValueOperationChild => "ValueOperation.child", - } - } -} - /// A plan-construction-time data_state violation. Typed (not a string) so a /// strategy can degrade to a conservative fallback on the specific variant /// it expects, and so tests can assert the *reason* a plan was rejected. #[derive(Debug, Clone, PartialEq, Eq, Error)] pub enum ExecutionDataStateError { - #[error("invalid maintained-population maintenance/readout contract")] + #[error("invalid maintained-population maintenance/evaluation contract")] InvalidMaintainedPopulation, - /// A query-time value (`SummaryEstimate` / read-time `ValueOperation` output) + /// A query-time value (a `SummaryEstimate` or query-time operator output) /// placed beneath a maintained summary — the one shape issue #171's /// data_state split exists to make unrepresentable. #[error( - "readout value under maintenance: {edge} received a {child} input, but a maintained \ + "evaluation value under maintenance: {edge} received a {child} input, but a maintained \ summary can only consume update-path values (or exact accumulator state)" )] - ReadoutUnderMaintenance { + EvaluationUnderMaintenance { edge: &'static str, child: ExecutionDataState, }, /// Any other edge whose child data_state the parent does not accept /// (e.g. plain update rows fed straight into a `SummaryEstimate`, or a - /// sketch's opaque state fed into a read-time `ValueOperation`). + /// sketch's opaque state fed into a query-time operator). #[error("{edge} does not accept a {child} input")] IllegalChildDataState { edge: &'static str, @@ -185,13 +115,10 @@ pub enum ExecutionDataStateError { composed into another maintained summary" )] UnsupportedStateComposition { family: String }, - /// One shared `KeepPreAsap` node reached both as update-path raw input - /// and as a query-time fallback — see the module docs. - #[error( - "KeepPreAsap sub-DAG is data_state-ambiguous: reached as {first} and as {second} in the same \ - plan" - )] - AmbiguousKeepPreAsap { + /// One shared node assigned two different execution timings by its + /// consumers; no single execution of it can serve both. + #[error("shared node is assigned conflicting timings: {first} and {second}")] + ConflictingTiming { first: ExecutionDataState, second: ExecutionDataState, }, @@ -203,7 +130,7 @@ pub enum ExecutionDataStateError { InvalidMaintenanceBinary, #[error("checked division requires one valid guard on a read-time division operator")] InvalidCheckedDivision, - /// An `ExactOperation` whose input columns are not all `Plain` at its + /// An exact operator whose input columns are not all `Plain` at its /// declared data_state. #[error("exact operator consumes non-plain column {column:?} ({dtype})")] NonPlainOperand { column: String, dtype: String }, @@ -211,564 +138,12 @@ pub enum ExecutionDataStateError { /// `SummaryDelete`, `SummaryJoin`, `Extension`) in an executable plan. #[error("{operator} is a reserved operator with no execution contract yet")] UnimplementedOperator { operator: &'static str }, -} - -/// The data_state assigned to every node of a validated plan, keyed by -/// `Rc` pointer identity — the explicit per-node "execution_data_state" a -/// runtime or a DAG export reads instead of re-deriving it. For every -/// non-`KeepPreAsap` node this equals [`produced_data_state`]; for a -/// `KeepPreAsap` leaf it is the data_state the reaching edge assigned. -#[derive(Debug, Clone, Default)] -pub struct ExecutionDataStateAssignment { - domains: HashMap<*const SummaryNode, ExecutionDataState>, -} - -impl ExecutionDataStateAssignment { - /// The data_state assigned to `node`, if it was part of the validated plan. - pub fn data_state_of(&self, node: &Rc) -> Option { - self.domains.get(&Rc::as_ptr(node)).copied() - } - - /// The data_state assigned to the node at `ptr` — for callers walking a plan - /// by reference rather than by `Rc`. - pub fn data_state_of_ptr(&self, ptr: *const SummaryNode) -> Option { - self.domains.get(&ptr).copied() - } -} - -/// Initial layout proposed by semantic realization, not a restriction on physical -/// operator placement. `PostAsapDAG::with_execution_phases` assigns the final -/// phase independently of payload kind. Returns `None` for -/// [`SummaryExpr::KeepPreAsap`], whose data_state is assigned by the edge reaching -/// it (see the module docs). -pub fn produced_data_state(expr: &SummaryExpr) -> Option { - Some(match expr { - SummaryExpr::KeepPreAsap(_) => return None, - SummaryExpr::BinaryOp { timing, .. } => ExecutionDataState { - timing: *timing, - primitive: DataPrimitive::Raw, - }, - SummaryExpr::RelationalJoin { .. } => ExecutionDataState::QUERY_ROWS, - SummaryExpr::SummaryAgg { child, .. } => ExecutionDataState { - timing: produced_data_state(&child.expr) - .map_or(ExecutionTiming::IngestionTime, |state| state.timing), - primitive: DataPrimitive::SummaryState, - }, - SummaryExpr::SummaryJoin { .. } - | SummaryExpr::SummarySubtract { .. } - | SummaryExpr::SummaryDelete { .. } => ExecutionDataState::INGESTION_SUMMARY, - SummaryExpr::SummaryMerge { timing, .. } => ExecutionDataState { - timing: *timing, - primitive: DataPrimitive::SummaryState, - }, - SummaryExpr::SummaryEstimate { .. } => ExecutionDataState::QUERY_ROWS, - SummaryExpr::ValueOperation { timing, .. } => match timing { - ExecutionTiming::IngestionTime => ExecutionDataState::INGESTION_ROWS, - ExecutionTiming::QueryTime => ExecutionDataState::QUERY_ROWS, - }, - }) -} - -/// Is `family` the exact-accumulator family whose partial state *is* the -/// value — the one summary state a `SummaryAgg` may re-accumulate? -fn is_exact_accumulator_state(schema: &Schema) -> Result<(), ExecutionDataStateError> { - for field in &schema.fields { - match &field.dtype { - FieldDataType::Plain(_) | FieldDataType::ExactAggregate(..) => {} - other => { - return Err(ExecutionDataStateError::UnsupportedStateComposition { - family: format!("{other:?}"), - }) - } - } - } - Ok(()) -} - -/// Validate every edge of the DAG rooted at `root` against the module-level -/// rules, returning each node's assigned data_state on success. Shared -/// `Rc`s are visited once per reaching edge (the assignment is -/// per node, so a conflict between two edges is what -/// [`ExecutionDataStateError::AmbiguousKeepPreAsap`] detects). -pub fn validate_execution_data_states( - root: &Rc, -) -> Result { - // The root may be a readable value or bare maintained state (a - // deployment may hand an `ExactAggregate` accumulator straight to a - // consumer) — only an update-path-only root is meaningless. - let root_domain = match produced_data_state(&root.expr) { - None => ExecutionDataState::QUERY_ROWS, - Some(ExecutionDataState::INGESTION_ROWS) => { - return Err(ExecutionDataStateError::MaintenanceRowsAtRoot) - } - Some(data_state) => data_state, - }; - validate_execution_data_states_at(root, root_domain) -} - -/// [`validate_execution_data_states`] for a *sub*-plan whose root is known to -/// sit at `data_state` — e.g. a maintenance-time `ValueOperation` about to be placed beneath a -/// `SummaryAgg`, which would be rejected as a whole-plan root but is a -/// legal update-path input. Validates every edge beneath `root` exactly -/// as the whole-plan entry point does. -pub fn validate_execution_data_states_at( - root: &Rc, - data_state: ExecutionDataState, -) -> Result { - let mut assignment = ExecutionDataStateAssignment::default(); - visit(root, data_state, &mut assignment)?; - Ok(assignment) -} - -/// The source rows whose series a maintenance operand has one row for: a -/// finalized per-series Sum or Count of those rows, or aligned arithmetic of -/// operands over the same rows. Each emits exactly the series with a sample. -fn per_series_rows(node: &SummaryNode) -> Option<&crate::pre_asap::QueryExpr> { - use crate::post_asap::ExactKind; - match &node.expr { - SummaryExpr::ValueOperation { - child, - operation: ValueOperation::FinalizeExactAccumulator, - .. - } => match &child.expr { - SummaryExpr::SummaryAgg { - child, - family: FieldDataType::ExactAggregate(ExactKind::Sum | ExactKind::Count, _), - reduction: crate::pre_asap::query_expr::Reduction::PerEntity, - .. - } => match &child.expr { - SummaryExpr::KeepPreAsap(rows) => Some(rows.as_ref()), - _ => None, - }, - _ => None, - }, - SummaryExpr::BinaryOp { - lhs, - rhs, - timing: ExecutionTiming::IngestionTime, - .. - } => { - let rows = per_series_rows(lhs)?; - (per_series_rows(rhs) == Some(rows)).then_some(rows) - } - _ => None, - } -} - -/// Record `data_state` for `node` (detecting a conflicting earlier assignment -/// for a `KeepPreAsap`), then check and recurse into every child edge. -fn visit( - node: &Rc, - data_state: ExecutionDataState, - assignment: &mut ExecutionDataStateAssignment, -) -> Result<(), ExecutionDataStateError> { - let ptr = Rc::as_ptr(node); - if let Some(previous) = assignment.domains.get(&ptr) { - if *previous != data_state { - return Err(ExecutionDataStateError::AmbiguousKeepPreAsap { - first: *previous, - second: data_state, - }); - } - // Already validated through another edge with the same data_state. - return Ok(()); - } - assignment.domains.insert(ptr, data_state); - - match &node.expr { - SummaryExpr::KeepPreAsap(_) => Ok(()), - SummaryExpr::BinaryOp { - lhs, - rhs, - timing, - operator, - } => { - if (operator.checked_relative_division && operator.checked_finite_division) - || (operator.checked_relative_division || operator.checked_finite_division) - && (*timing != ExecutionTiming::QueryTime - || !matches!( - operator.kind, - crate::pre_asap::BinaryOpKind::Arithmetic( - crate::pre_asap::ArithmeticOpKind::Div - ) - )) - { - return Err(ExecutionDataStateError::InvalidCheckedDivision); - } - if *timing == ExecutionTiming::IngestionTime { - use crate::pre_asap::{BinaryOpKind, DataType}; - if operator.vector_match.is_some() - || !matches!(operator.kind, BinaryOpKind::Arithmetic(_)) - || lhs.schema != rhs.schema - || lhs.schema != node.schema - // The opaque identity is a key, not an extra maintenance value. - || node.schema.fields.iter().filter(|field| { - field.name == crate::pre_asap::schema::PROMQL_SERIES_IDENTITY - }).count() > 1 - // Maintenance arithmetic pairs every row by identity, while - // Prometheus drops unmatched series; it is exact only when - // both operands provably produce the same series. - || node.schema.fields.iter().any(|field| { - field.name == crate::pre_asap::schema::PROMQL_SERIES_IDENTITY - }) && per_series_rows(lhs).is_none_or(|rows| per_series_rows(rhs) != Some(rows)) - || !node.schema.fields.iter().all(|field| { - !field.nullable - && if field.name == crate::pre_asap::schema::PROMQL_SERIES_IDENTITY { - field.dtype == FieldDataType::Plain(DataType::Utf8) - } else { - matches!( - field.dtype, - FieldDataType::Plain(DataType::Float64 | DataType::Timestamp) - ) - } - }) - || node - .schema - .fields - .iter() - .filter(|field| { - matches!(field.dtype, FieldDataType::Plain(DataType::Float64)) - }) - .count() - != 1 - { - return Err(ExecutionDataStateError::InvalidMaintenanceBinary); - } - } - let expected = ExecutionDataState { - timing: *timing, - primitive: DataPrimitive::Raw, - }; - for input in [lhs, rhs] { - let state = produced_data_state(&input.expr).unwrap_or(expected); - if state != expected { - return Err(ExecutionDataStateError::IllegalChildDataState { - edge: "BinaryOp operand", - child: state, - }); - } - visit(input, state, assignment)?; - } - Ok(()) - } - - SummaryExpr::RelationalJoin { left, right, .. } => { - for input in [left, right] { - let state = - produced_data_state(&input.expr).unwrap_or(ExecutionDataState::QUERY_ROWS); - if state != ExecutionDataState::QUERY_ROWS { - return Err(ExecutionDataStateError::IllegalChildDataState { - edge: "RelationalJoin input", - child: state, - }); - } - visit(input, state, assignment)?; - } - Ok(()) - } - SummaryExpr::SummaryAgg { child, .. } => { - let child_domain = child_domain( - child, - ExecutionDataStateEdge::SummaryAggChild, - |avail| match avail { - ExecutionDataState::INGESTION_ROWS | ExecutionDataState::QUERY_ROWS => Ok(()), - state if state.primitive == DataPrimitive::SummaryState => { - is_exact_accumulator_state(&child.schema) - } - other => Err(ExecutionDataStateError::ReadoutUnderMaintenance { - edge: ExecutionDataStateEdge::SummaryAggChild.describe(), - child: other, - }), - }, - )?; - visit(child, child_domain, assignment) - } - SummaryExpr::SummaryJoin { outer, inner, .. } => { - for input in [outer, inner] { - let s = child_domain(input, ExecutionDataStateEdge::SummaryJoinInput, |avail| { - match avail { - ExecutionDataState::INGESTION_ROWS - | ExecutionDataState::INGESTION_SUMMARY => Ok(()), - other => Err(ExecutionDataStateError::ReadoutUnderMaintenance { - edge: ExecutionDataStateEdge::SummaryJoinInput.describe(), - child: other, - }), - } - })?; - visit(input, s, assignment)?; - } - Ok(()) - } - SummaryExpr::SummarySubtract { left, right } => { - for input in [left, right] { - let s = state_only(input, ExecutionDataStateEdge::SummarySubtractInput)?; - visit(input, s, assignment)?; - } - Ok(()) - } - SummaryExpr::SummaryDelete { summary_input, .. } => { - let s = state_only(summary_input, ExecutionDataStateEdge::SummaryDeleteInput)?; - visit(summary_input, s, assignment) - } - SummaryExpr::SummaryMerge { children, timing } => { - for input in children { - let s = child_domain(input, ExecutionDataStateEdge::SummaryMergeInput, |state| { - if state.primitive == DataPrimitive::SummaryState - && (*timing == ExecutionTiming::QueryTime || state.timing == *timing) - { - Ok(()) - } else { - Err(ExecutionDataStateError::IllegalChildDataState { - edge: ExecutionDataStateEdge::SummaryMergeInput.describe(), - child: state, - }) - } - })?; - visit(input, s, assignment)?; - } - Ok(()) - } - SummaryExpr::SummaryEstimate { summary_input, .. } => { - let s = state_only(summary_input, ExecutionDataStateEdge::SummaryEstimateInput)?; - visit(summary_input, s, assignment) - } - SummaryExpr::ValueOperation { - child, - operation, - timing, - } => { - // Population timing is a lifecycle decision: a retained population - // is maintained at ingestion time, an ephemeral one is rebuilt - // from raw input per query. Its input and readout contracts are - // structural and hold either way. - let valid_population = match operation { - ValueOperation::MaintainPopulation { population } => { - matches!(&child.expr, SummaryExpr::KeepPreAsap(input) if population.matches_input(input)) - } - ValueOperation::ReadPopulation { readout } => { - *timing == ExecutionTiming::QueryTime - && matches!(&child.expr, SummaryExpr::ValueOperation { operation: ValueOperation::MaintainPopulation { population }, .. } if population.supports(readout)) - } - _ => true, - }; - if !valid_population { - return Err(ExecutionDataStateError::InvalidMaintainedPopulation); - } - let required = match timing { - ExecutionTiming::IngestionTime => ExecutionDataState::INGESTION_ROWS, - ExecutionTiming::QueryTime => ExecutionDataState::QUERY_ROWS, - }; - let s = produced_data_state(&child.expr).unwrap_or(required); - let exact_readout = (*timing == ExecutionTiming::QueryTime - || matches!(operation, ValueOperation::FinalizeExactAccumulator)) - && s.primitive == DataPrimitive::SummaryState - && (*timing == ExecutionTiming::QueryTime || s.timing == *timing) - && is_exact_accumulator_state(&child.schema).is_ok(); - // A query-time readout may read a population retained at ingestion. - let population_readout = matches!(operation, ValueOperation::ReadPopulation { .. }) - && *timing == ExecutionTiming::QueryTime - && matches!( - &child.expr, - SummaryExpr::ValueOperation { - operation: ValueOperation::MaintainPopulation { .. }, - .. - } - ); - if s != required && !exact_readout && !population_readout { - return Err(ExecutionDataStateError::IllegalChildDataState { - edge: ExecutionDataStateEdge::ValueOperationChild.describe(), - child: s, - }); - } - check_plain_operands(operation, &child.schema)?; - visit(child, s, assignment) - } - } -} - -/// The data_state `child` takes as a direct input of `parent`, without -/// validating legality — `child`'s own produced data_state, or for a -/// `KeepPreAsap` leaf the data_state `parent`'s edge assigns it (update-path raw -/// input under maintenance-time operation edges, query-time fallback under a -/// a read-time operation, and — meaninglessly, but for a stable answer — maintenance rows -/// under a state-only edge). For DAG export and other reporting that needs -/// an explicit per-node data_state even on a plan that -/// [`validate_execution_data_states`] would reject. -pub fn assigned_child_data_state(parent: &SummaryExpr, child: &SummaryNode) -> ExecutionDataState { - if let Some(avail) = produced_data_state(&child.expr) { - return avail; - } - match parent { - SummaryExpr::ValueOperation { - timing: ExecutionTiming::QueryTime, - .. - } - | SummaryExpr::BinaryOp { - timing: ExecutionTiming::QueryTime, - .. - } => ExecutionDataState::QUERY_ROWS, - SummaryExpr::KeepPreAsap(_) - | SummaryExpr::BinaryOp { - timing: ExecutionTiming::IngestionTime, - .. - } - | SummaryExpr::RelationalJoin { .. } - | SummaryExpr::SummaryAgg { .. } - | SummaryExpr::SummaryJoin { .. } - | SummaryExpr::SummarySubtract { .. } - | SummaryExpr::SummaryDelete { .. } - | SummaryExpr::SummaryEstimate { .. } - | SummaryExpr::SummaryMerge { .. } - | SummaryExpr::ValueOperation { - timing: ExecutionTiming::IngestionTime, - .. - } => ExecutionDataState::INGESTION_ROWS, - } -} - -/// The data_state `child` takes on `edge`: its own produced data_state -/// (checked via `accept`), or — for a `KeepPreAsap` leaf — the data_state the -/// edge assigns it, derived from what that edge accepts. -fn child_domain( - child: &Rc, - edge: ExecutionDataStateEdge, - accept: impl Fn(ExecutionDataState) -> Result<(), ExecutionDataStateError>, -) -> Result { - match produced_data_state(&child.expr) { - Some(avail) => { - accept(avail)?; - Ok(avail) - } - None => { - // A raw pre-ASAP sub-DAG executes at whichever data_state its consumer - // needs: update-path input for maintenance-time operation edges, - // query-time fallback for a read-time edge. State-only edges - // can't consume plain rows at all. - let assigned = match edge { - ExecutionDataStateEdge::SummaryAggChild - | ExecutionDataStateEdge::SummaryJoinInput - | ExecutionDataStateEdge::ValueOperationChild => ExecutionDataState::INGESTION_ROWS, - ExecutionDataStateEdge::SummaryEstimateInput - | ExecutionDataStateEdge::SummarySubtractInput - | ExecutionDataStateEdge::SummaryDeleteInput - | ExecutionDataStateEdge::SummaryMergeInput => { - return Err(ExecutionDataStateError::IllegalChildDataState { - edge: edge.describe(), - child: ExecutionDataState::INGESTION_ROWS, - }) - } - }; - accept(assigned)?; - Ok(assigned) - } - } -} - -fn state_only( - child: &Rc, - edge: ExecutionDataStateEdge, -) -> Result { - child_domain(child, edge, |avail| match avail { - state - if state.primitive == DataPrimitive::SummaryState - && (state.timing == ExecutionTiming::IngestionTime - || matches!(edge, ExecutionDataStateEdge::SummaryEstimateInput)) => - { - Ok(()) - } - other => Err(ExecutionDataStateError::IllegalChildDataState { - edge: edge.describe(), - child: other, - }), - }) -} - -/// The exact operator must consume only `Plain` columns of its input: for -/// an `Aggregate` payload, every grouping key and every measure's input -/// column. -fn check_plain_operands( - op: &ValueOperation, - input: &Schema, -) -> Result<(), ExecutionDataStateError> { - if matches!( - op, - ValueOperation::Sort { .. } - | ValueOperation::Limit { .. } - | ValueOperation::Project { .. } - | ValueOperation::Filter { .. } - | ValueOperation::FinalizeExactAccumulator - ) { - return check_plain_or_exact_values(input); - } - let ValueOperation::Exact(op) = op else { - return check_all_plain(input); - }; - let ExactOperation::Aggregate { - reduction, - measures, - filters, - .. - } = op; - let mut referenced: Vec = reduction - .group_keys() - .map(|keys| keys.keys().to_vec()) - .unwrap_or_default(); - for m in measures { - referenced.extend(m.input_cols()); - } - for Predicate(f) in filters.iter().flatten() { - referenced.extend(f.columns_referenced().into_iter().copied()); - } - // With no explicit input column (the PromQL sample-value convention) - // the operator reads every non-key column, so all must be plain. - let implicit = measures.iter().any(|m| m.input_cols().is_empty()); - for (i, field) in input.fields.iter().enumerate() { - if !(implicit || referenced.contains(&i)) { - continue; - } - if !matches!(field.dtype, FieldDataType::Plain(_)) { - return Err(ExecutionDataStateError::NonPlainOperand { - column: field.name.clone(), - dtype: format!("{:?}", field.dtype), - }); - } - } - Ok(()) -} - -fn check_plain_or_exact_values(input: &Schema) -> Result<(), ExecutionDataStateError> { - for field in &input.fields { - if !matches!( - field.dtype, - FieldDataType::Plain(_) | FieldDataType::ExactAggregate(..) - ) { - return Err(ExecutionDataStateError::NonPlainOperand { - column: field.name.clone(), - dtype: format!("{:?}", field.dtype), - }); - } - } - Ok(()) -} - -fn check_all_plain(input: &Schema) -> Result<(), ExecutionDataStateError> { - for field in &input.fields { - if !matches!(field.dtype, FieldDataType::Plain(_)) { - return Err(ExecutionDataStateError::NonPlainOperand { - column: field.name.clone(), - dtype: format!("{:?}", field.dtype), - }); - } - } - Ok(()) -} - -/// `schema` with its reuse metadata dropped, or `None` if any field carries -/// summary state — the shape an exact operator reads. -pub fn plain_schema(schema: &Schema) -> Option { - schema - .is_all_plain() - .then(|| Schema::lifted(schema.fields.clone(), schema.time_index)) + /// A node reached by export without a timing: the materialization timing pass + /// was not applied to the DAG first. + #[error( + "{operator} node has no execution timing; apply materialization timings before export" + )] + UntimedNode { operator: &'static str }, } /// `schema` as a summary-planning node output: fields and time axis kept, @@ -777,43 +152,18 @@ pub fn lift_plain(schema: &Schema) -> Schema { Schema::lifted(schema.fields.clone(), schema.time_index) } -/// Output schema of `op` applied to a child whose edge carries `input` — -/// the same canonical derivation the pre-ASAP `Aggregate` node uses, so an -/// exact `ValueOperation` never disagrees with the pre-ASAP -/// target it was lowered from. `Err` when the child carries non-plain -/// state the operator cannot read. -pub fn exact_operation_output_schema( - op: &ExactOperation, - input: &Schema, -) -> Result { - let plain = plain_schema(input).ok_or(ExactOperationSchemaError::NonPlainInput)?; - let ExactOperation::Aggregate { - reduction, - measures, - output_names, - .. - } = op; - let out = aggregate_output_schema(&plain, reduction, measures, output_names)?; - Ok(lift_plain(&out)) -} - -/// Why [`exact_operation_output_schema`] could not derive a schema. +/// Why an exact operator's output schema could not be derived. #[derive(Debug, Error)] pub enum ExactOperationSchemaError { #[error("exact operator input carries summary state, not plain columns")] NonPlainInput, #[error("schema derivation failed: {0}")] - Schema(#[from] QueryExprError), + Schema(#[from] SchemaDerivationError), } #[cfg(test)] mod tests { use super::*; - use crate::post_asap::{ExactKind, ExactParams, GroupingStrategy, SketchStatistic}; - use crate::pre_asap::agg_intent::AggIntent; - use crate::pre_asap::expr_ir::ColumnRef; - use crate::pre_asap::query_expr::{QueryExpr, Reduction, Source}; - use crate::pre_asap::schema::{DataType, Field}; /// Both execution phases use raw values, distinct from maintained state. #[test] @@ -831,347 +181,6 @@ mod tests { assert_eq!(DataPrimitive::SummaryState.as_str(), "summary_state"); } - fn scan() -> Rc { - Rc::new(QueryExpr::Scan { - source: Source::TimeSeries { metric: "m".into() }, - predicates: vec![], - schema: Schema::with_time_index( - vec![ - Field::plain("ts", DataType::Timestamp, false), - Field::plain("value", DataType::Float64, false), - Field::plain("zone", DataType::Utf8, true), - ], - 0, - vec![], - ), - }) - } - - fn keep() -> Rc { - let s = scan(); - let schema = lift_plain(&s.output_schema().unwrap()); - Rc::new(SummaryNode { - expr: SummaryExpr::KeepPreAsap(s), - schema, - guarantee: None, - }) - } - - fn plain(names: &[&str]) -> Schema { - Schema::lifted( - names - .iter() - .map(|n| Field { - name: (*n).into(), - dtype: FieldDataType::Plain(DataType::Float64), - nullable: false, - table: None, - }) - .collect(), - None, - ) - } - - fn agg(child: Rc, family: FieldDataType) -> Rc { - Rc::new(SummaryNode { - expr: SummaryExpr::SummaryAgg { - child, - family: family.clone(), - input: crate::post_asap::SummaryUpdate::column(ColumnRef::SampleValue), - reduction: Reduction::by(vec![]), - grouping: GroupingStrategy::default(), - filter: None, - }, - schema: Schema::lifted( - vec![Field { - name: "state".into(), - dtype: family, - nullable: false, - table: None, - }], - None, - ), - guarantee: None, - }) - } - - fn kll() -> FieldDataType { - use crate::post_asap::{SketchAlgorithm, SketchKind, SketchParams}; - FieldDataType::Sketch( - SketchKind::new(SketchAlgorithm::Kll, SketchParams::Kll { k: 200 }), - GroupingStrategy::default(), - ) - } - - fn estimate(child: Rc) -> Rc { - Rc::new(SummaryNode { - expr: SummaryExpr::SummaryEstimate { - summary_input: child, - query: SketchStatistic::Quantile { q: 0.99 }, - }, - schema: plain(&["quantile_0_99"]), - guarantee: None, - }) - } - - fn max_op() -> ExactOperation { - ExactOperation::Aggregate { - reduction: Reduction::by(vec![]), - measures: vec![AggIntent::Max { col: None }], - output_names: vec![], - having: None, - filters: vec![], - } - } - - #[test] - fn keep_pre_asap_under_summary_agg_is_update_input() { - let leaf = keep(); - let root = agg(Rc::clone(&leaf), kll()); - let assignment = validate_execution_data_states(&root).unwrap(); - assert_eq!( - assignment.data_state_of(&leaf), - Some(ExecutionDataState::INGESTION_ROWS) - ); - assert_eq!( - assignment.data_state_of(&root), - Some(ExecutionDataState::INGESTION_SUMMARY) - ); - } - - // Typed derived updates retain one opaque series identity only when both - // operands cover the same series; arbitrary labels are never admitted. - #[test] - fn maintenance_binary_accepts_only_well_typed_series_identity() { - use crate::pre_asap::{ArithmeticOpKind, BinaryOpKind}; - let identity = crate::pre_asap::schema::PROMQL_SERIES_IDENTITY; - // A finalized per-series Sum of `metric`'s rows. - let operand = |metric: &str, schema: &Schema| { - let rows = Rc::new(QueryExpr::Scan { - source: Source::TimeSeries { - metric: metric.into(), - }, - predicates: vec![], - schema: Schema::with_time_index( - vec![ - Field::plain("ts", DataType::Timestamp, false), - Field::plain("value", DataType::Float64, false), - ], - 0, - vec![], - ), - }); - let mut state = schema.clone(); - state.fields[0].dtype = FieldDataType::ExactAggregate(ExactKind::Sum, ExactParams::Sum); - let sum = Rc::new(SummaryNode { - expr: SummaryExpr::SummaryAgg { - child: Rc::new(SummaryNode { - expr: SummaryExpr::KeepPreAsap(rows), - schema: schema.clone(), - guarantee: None, - }), - family: FieldDataType::ExactAggregate(ExactKind::Sum, ExactParams::Sum), - input: crate::post_asap::SummaryUpdate::column(ColumnRef::SampleValue), - reduction: Reduction::PerEntity, - grouping: GroupingStrategy::default(), - filter: None, - }, - schema: state, - guarantee: None, - }); - Rc::new(SummaryNode { - expr: SummaryExpr::ValueOperation { - child: sum, - operation: ValueOperation::FinalizeExactAccumulator, - timing: ExecutionTiming::IngestionTime, - }, - schema: schema.clone(), - guarantee: None, - }) - }; - let validate = |schema: Schema, rhs: &str| { - let binary = Rc::new(SummaryNode { - expr: SummaryExpr::BinaryOp { - lhs: operand("m", &schema), - rhs: operand(rhs, &schema), - timing: ExecutionTiming::IngestionTime, - operator: crate::post_asap::BinaryOperator { - kind: BinaryOpKind::Arithmetic(ArithmeticOpKind::Add), - vector_match: None, - checked_relative_division: false, - checked_finite_division: false, - }, - }, - schema, - guarantee: None, - }); - validate_execution_data_states(&estimate(agg(binary, kll()))).map(|_| ()) - }; - let mut schema = plain(&["value"]); - schema.fields.push(Field { - table: None, - name: "ts".into(), - dtype: FieldDataType::Plain(DataType::Timestamp), - nullable: false, - }); - schema.time_index = Some(1); - assert!(validate(schema.clone(), "m").is_ok()); - assert!( - validate(schema.clone(), "n").is_ok(), - "no identity to align" - ); - schema.fields.push(Field { - table: None, - name: identity.into(), - dtype: FieldDataType::Plain(DataType::Utf8), - nullable: false, - }); - assert!(validate(schema.clone(), "m").is_ok()); - assert_eq!( - validate(schema.clone(), "n"), - Err(ExecutionDataStateError::InvalidMaintenanceBinary), - "different selectors may cover different series" - ); - for mutation in 0..4 { - let mut invalid = schema.clone(); - match mutation { - 0 => invalid.fields[2].nullable = true, - 1 => invalid.fields[2].dtype = FieldDataType::Plain(DataType::Timestamp), - 2 => invalid.fields.push(invalid.fields[2].clone()), - _ => invalid.fields[2].name = "label".into(), - } - assert_eq!( - validate(invalid, "m"), - Err(ExecutionDataStateError::InvalidMaintenanceBinary) - ); - } - } - - #[test] - fn exact_accumulator_state_may_feed_another_summary_agg() { - let inner = agg( - keep(), - FieldDataType::ExactAggregate(ExactKind::Sum, ExactParams::Sum), - ); - let root = estimate(agg(inner, kll())); - assert!(validate_execution_data_states(&root).is_ok()); - } - - #[test] - fn readout_can_feed_summary_construction_at_query_time() { - let inner = estimate(agg(keep(), kll())); - let summary = agg(inner, kll()); - let root = estimate(summary.clone()); - let assignment = validate_execution_data_states(&root).unwrap(); - assert_eq!( - assignment.data_state_of(&summary).unwrap().timing, - ExecutionTiming::QueryTime - ); - } - - #[test] - fn query_time_operation_over_readout_is_legal_and_root_is_readout() { - let inner = estimate(agg(keep(), kll())); - let root = Rc::new(SummaryNode { - expr: SummaryExpr::ValueOperation { - child: inner, - operation: ValueOperation::Exact(max_op()), - timing: ExecutionTiming::QueryTime, - }, - schema: plain(&["max"]), - guarantee: None, - }); - let assignment = validate_execution_data_states(&root).unwrap(); - assert_eq!( - assignment.data_state_of(&root), - Some(ExecutionDataState::QUERY_ROWS) - ); - } - - #[test] - fn non_exact_operator_uses_the_same_read_domain_contract() { - let inner = estimate(agg(keep(), kll())); - let root = Rc::new(SummaryNode { - expr: SummaryExpr::ValueOperation { - child: inner, - operation: ValueOperation::Extension { - name: "approximate_calibration".into(), - }, - timing: ExecutionTiming::QueryTime, - }, - schema: plain(&["calibrated"]), - guarantee: None, - }); - - let assignment = validate_execution_data_states(&root).unwrap(); - assert_eq!( - assignment.data_state_of(&root), - Some(ExecutionDataState::QUERY_ROWS) - ); - } - - #[test] - fn query_time_values_can_feed_query_time_summary_construction() { - let inner = estimate(agg(keep(), kll())); - let post = Rc::new(SummaryNode { - expr: SummaryExpr::ValueOperation { - child: inner, - operation: ValueOperation::Exact(max_op()), - timing: ExecutionTiming::QueryTime, - }, - schema: plain(&["max"]), - guarantee: None, - }); - let root = agg(post, kll()); - let root = estimate(root); - validate_execution_data_states(&root).unwrap(); - } - - #[test] - fn function_under_summary_agg_is_legal_but_not_at_root() { - let operation = Rc::new(SummaryNode { - expr: SummaryExpr::ValueOperation { - child: keep(), - operation: ValueOperation::Exact(max_op()), - timing: ExecutionTiming::IngestionTime, - }, - schema: plain(&["max"]), - guarantee: None, - }); - assert_eq!( - validate_execution_data_states(&operation).err(), - Some(ExecutionDataStateError::MaintenanceRowsAtRoot) - ); - let root = estimate(agg(Rc::clone(&operation), kll())); - let assignment = validate_execution_data_states(&root).unwrap(); - assert_eq!( - assignment.data_state_of(&operation), - Some(ExecutionDataState::INGESTION_ROWS) - ); - } - - #[test] - fn function_over_readout_is_rejected() { - let inner = estimate(agg(keep(), kll())); - let operation = Rc::new(SummaryNode { - expr: SummaryExpr::ValueOperation { - child: inner, - operation: ValueOperation::Exact(max_op()), - timing: ExecutionTiming::IngestionTime, - }, - schema: plain(&["max"]), - guarantee: None, - }); - let root = agg(operation, kll()); - assert!(matches!( - validate_execution_data_states(&root), - Err(ExecutionDataStateError::IllegalChildDataState { - edge: "ValueOperation.child", - child: ExecutionDataState::QUERY_ROWS - }) - )); - } - #[test] fn execution_phase_wire_names_are_ingestion_and_query_time() { for (phase, name) in [ @@ -1188,154 +197,4 @@ mod tests { assert!(serde_json::from_str::("\"maintenance_time\"").is_err()); assert!(serde_json::from_str::("\"MaintenanceTime\"").is_err()); } - - #[test] - fn summary_merge_runs_at_ingestion_or_query_time() { - for timing in [ExecutionTiming::IngestionTime, ExecutionTiming::QueryTime] { - let input = agg(keep(), kll()); - let merged = Rc::new(SummaryNode { - expr: SummaryExpr::SummaryMerge { - children: vec![input.clone()], - timing, - }, - schema: input.schema.clone(), - guarantee: None, - }); - let root = estimate(merged.clone()); - let assignment = validate_execution_data_states(&root).unwrap(); - assert_eq!( - assignment.data_state_of(&merged), - Some(ExecutionDataState { - timing, - primitive: DataPrimitive::SummaryState, - }) - ); - let exported = crate::post_asap::compile_post_asap_dag(&root).unwrap(); - assert!(exported.nodes.iter().any(|node| matches!(node.payload, - crate::post_asap::PostAsapOperatorPayload::SummaryMerge - if node.output_state.timing == timing))); - } - } - - #[test] - fn ingestion_merge_cannot_depend_on_query_execution() { - let input = agg(keep(), kll()); - let query_merge = Rc::new(SummaryNode { - expr: SummaryExpr::SummaryMerge { - children: vec![input.clone()], - timing: ExecutionTiming::QueryTime, - }, - schema: input.schema.clone(), - guarantee: None, - }); - let ingestion_merge = Rc::new(SummaryNode { - expr: SummaryExpr::SummaryMerge { - children: vec![query_merge], - timing: ExecutionTiming::IngestionTime, - }, - schema: input.schema.clone(), - guarantee: None, - }); - assert!(validate_execution_data_states(&ingestion_merge).is_err()); - } - - #[test] - fn a_shared_keep_pre_asap_reached_in_two_domains_is_ambiguous() { - // One raw sub-DAG used both as update input (under a SummaryAgg) and - // as a query-time fallback (under an ExactRead) — no single - // execution can serve both, so the plan is rejected. - let shared = keep(); - let maintained = estimate(agg(Rc::clone(&shared), kll())); - let post_over_raw = Rc::new(SummaryNode { - expr: SummaryExpr::ValueOperation { - child: Rc::clone(&shared), - operation: ValueOperation::Exact(max_op()), - timing: ExecutionTiming::QueryTime, - }, - schema: plain(&["max"]), - guarantee: None, - }); - let root = Rc::new(SummaryNode { - expr: SummaryExpr::SummaryMerge { - timing: ExecutionTiming::IngestionTime, - children: vec![ - Rc::new(SummaryNode { - expr: SummaryExpr::ValueOperation { - child: maintained, - operation: ValueOperation::Exact(max_op()), - timing: ExecutionTiming::QueryTime, - }, - schema: plain(&["max"]), - guarantee: None, - }), - post_over_raw, - ], - }, - schema: plain(&["max"]), - guarantee: None, - }); - // SummaryMerge only accepts state, so this fails earlier for a - // different reason; probe the ambiguity through a direct visit. - let mut assignment = ExecutionDataStateAssignment::default(); - visit(&shared, ExecutionDataState::INGESTION_ROWS, &mut assignment).unwrap(); - assert_eq!( - visit(&shared, ExecutionDataState::QUERY_ROWS, &mut assignment), - Err(ExecutionDataStateError::AmbiguousKeepPreAsap { - first: ExecutionDataState::INGESTION_ROWS, - second: ExecutionDataState::QUERY_ROWS, - }) - ); - assert!(validate_execution_data_states(&root).is_err()); - } - - // Both paired operands must be plain; an unrelated state column is not an input. - #[test] - fn pearson_corr_checks_both_operand_states() { - let operation = ValueOperation::Exact(ExactOperation::Aggregate { - reduction: Reduction::by(vec![]), - measures: vec![AggIntent::PearsonCorr { left: 0, right: 1 }], - output_names: vec![], - having: None, - filters: vec![], - }); - for operand in [0, 1] { - let mut input = plain(&["x", "y", "unused"]); - input.fields[operand].dtype = kll(); - assert!(matches!( - check_plain_operands(&operation, &input), - Err(ExecutionDataStateError::NonPlainOperand { .. }) - )); - } - let mut input = plain(&["x", "y", "unused"]); - input.fields[2].dtype = kll(); - check_plain_operands(&operation, &input).unwrap(); - } - - #[test] - fn exact_operator_schema_matches_pre_asap_aggregate_derivation() { - let child_schema = lift_plain(&scan().output_schema().unwrap()); - let op = ExactOperation::Aggregate { - reduction: Reduction::by(vec![2]), - measures: vec![AggIntent::Max { col: None }], - output_names: vec![], - having: None, - filters: vec![], - }; - let out = exact_operation_output_schema(&op, &child_schema).unwrap(); - let names: Vec<_> = out.fields.iter().map(|f| f.name.as_str()).collect(); - assert_eq!(names, vec!["zone", "max"]); - assert!(out - .fields - .iter() - .all(|f| matches!(f.dtype, FieldDataType::Plain(_)))); - } - - #[test] - fn exact_operator_rejects_non_plain_input() { - let state = agg(keep(), kll()); - assert!(matches!( - exact_operation_output_schema(&max_op(), &state.schema), - Err(ExactOperationSchemaError::NonPlainInput) - )); - } } diff --git a/crates/types/src/post_asap/expr.rs b/crates/types/src/post_asap/expr.rs deleted file mode 100644 index 7de1e81db..000000000 --- a/crates/types/src/post_asap/expr.rs +++ /dev/null @@ -1,285 +0,0 @@ -use super::ExecutionTiming; -use std::rc::Rc; - -use super::guarantee::ResultGuarantee; -use super::sketch::{GroupingStrategy, SketchStatistic, SummaryUpdate}; -use crate::pre_asap::agg_intent::AggIntent; -use crate::pre_asap::query_expr::Predicate; -use crate::pre_asap::schema::{FieldDataType, Schema}; -use crate::pre_asap::{ - BinaryOpKind, ColumnRef, GroupKeys, JoinKind, ProjectItem, QueryExpr, Reduction, SortKey, - VectorMatch, -}; - -#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] -#[non_exhaustive] -pub enum ExactOperation { - Aggregate { - reduction: Reduction, - measures: Vec, - output_names: Vec, - /// Per-measure row predicates parallel to `measures`, positional - /// against the child's output rows — the same contract as - /// `QueryExpr::Aggregate.filters` (issue #466). - #[serde(default)] - filters: Vec>, - having: Option, - }, -} - -#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] -#[non_exhaustive] -pub enum ValueOperation { - /// Maintain the full declared population, including membership changes, - /// so removing a TopK member can promote another. - MaintainPopulation { - population: super::maintained_population::MaintainedPopulation, - }, - /// Read an aggregate or TopK prefix from the maintained population. - ReadPopulation { - readout: super::maintained_population::PopulationStatistic, - }, - Exact(ExactOperation), - /// Read an exact accumulator's state as its finalized scalar value. - /// - /// Exact accumulators do not need an estimator, but the explicit node - /// marks the maintenance-to-read boundary before query-time operators - /// such as PromQL binary arithmetic, sorting, and limiting. - FinalizeExactAccumulator, - /// Query-time column projection. SQL lowering retains the SELECT list as - /// a `Project` above its aggregate, so the post-ASAP DAG must preserve - /// its expressions, aliases, and optional derived-table qualifier while - /// allowing the aggregate child to be planned independently. - Project { - cols: Vec, - qualifier: Option, - }, - /// Query-time row filtering. The predicate remains positional against - /// the child's output schema and is evaluated only after any summary - /// state below it has been read out to rows. - Filter { - pred: Predicate, - }, - /// Query-time ordering of the child's value rows. This is deliberately - /// distinct from frequency-sketch heavy-hitter readout: PromQL `topk` - /// ranks the values produced by its child at the evaluation timestamp. - Sort { - keys: Vec, - partition_by: GroupKeys, - }, - /// Query-time row selection, normally composed over [`Self::Sort`] for - /// PromQL `topk`/`bottomk` and SQL `ORDER BY … LIMIT`. - Limit { - n: usize, - offset: usize, - /// Apply the offset and limit independently to each group. - partition_by: GroupKeys, - }, - Extension { - name: String, - }, -} - -/// Whether a candidate-membership sidecar is proven to contain every true -/// top-k key or is an explicitly approximate optimization. -#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] -#[serde(tag = "kind", rename_all = "snake_case")] -pub enum CandidateCompleteness { - Certified { guarantee: ResultGuarantee }, - BestEffort { guarantee: Option }, -} - -// ── Post-ASAP DAG node ─────────────────────────────────────────────────────── - -/// A node in the post-ASAP DAG: wraps the expression and its derived output -/// schema so every edge carries a typed schema. `Schema` may contain -/// summary-state-typed columns (`FieldDataType`'s non-`Plain` variants); -/// the pre-ASAP `Schema` cannot. -#[derive(Debug, Clone, PartialEq)] -pub struct SummaryNode { - pub expr: SummaryExpr, - /// Output schema of `expr` — the schema of the data flowing on the edge - /// leading *from* this node to its parent(s). - pub schema: Schema, - /// The machine-readable accuracy guarantee of the *value* this node - /// produces (issue #172) — `Some` on every finalized, caller-visible - /// value: a `SummaryEstimate` readout, an `ExactAggregate`-family - /// `SummaryAgg` (its state *is* the value), or a `KeepPreAsap` sub-DAG - /// (executed exactly). `None` on raw summary state — a sketch-family - /// `SummaryAgg`, `SummaryMerge`, `SummarySubtract`, `SummaryDelete`, - /// `SummaryJoin` — whose guarantee only exists once something reads it - /// out; and `None` on a readout of a family the plugged-in - /// `AccuracyModel` has no local guarantee for (`Sample`/`Wavelet`/ - /// `StatModel`), which a fail-closed consumer must treat as "unknown", - /// never as exact. - pub guarantee: Option, -} - -// ── Post-ASAP sketch-bound IR ──────────────────────────────────────────────── - -/// Sketch-bound IR produced by post-ASAP binding and final selection. Binding -/// rules selectively replace logical aggregates and joins in the pre-ASAP -/// `QueryExpr` with summary-bound counterparts. Final selection can retain -/// supported read-time value operations around independently planned children; -/// other unsupported sub-DAGs pass through as `KeepPreAsap(Rc)`. -/// -/// Traversing from the root node yields a DAG; shared sub-expressions appear -/// as multiple `Rc` references to the same `SummaryNode`. -#[derive(Debug, Clone, PartialEq)] -pub enum SummaryExpr { - /// A pre-ASAP sub-DAG kept as-is because it has no selected implementation - /// or supported residual decomposition. Output schema is the inner node's - /// schema, lifted to `Schema` with all fields as - /// `FieldDataType::Plain`. - KeepPreAsap(Rc), - - /// A PromQL binary operation whose operands were planned independently. - /// This keeps realizable summary/readout leaves visible instead of - /// hiding the complete expression inside `KeepPreAsap`. - BinaryOp { - timing: ExecutionTiming, - lhs: Rc, - rhs: Rc, - operator: BinaryOperator, - }, - - /// Plain-row semantics composed with a post-ASAP child. Timing is an - /// independent physical choice, not part of the operation's identity. - ValueOperation { - child: Rc, - operation: ValueOperation, - timing: super::execution_data_state::ExecutionTiming, - }, - - /// Read-time relational join over two row-producing children. This is - /// distinct from [`SummaryJoin`](Self::SummaryJoin), which combines - /// summary states for join estimation during maintenance. - RelationalJoin { - left: Rc, - right: Rc, - kind: JoinKind, - pred: Predicate, - /// Optional proof for candidate pruning; ranking remains a separate operation. - pruning: Option, - }, - - /// Summary aggregation. Post-ASAP binding chose `family` — which - /// summary family (exact accumulator, sketch, sample, wavelet, or - /// statistical model) and its `(kind, params)` — from the catalog for - /// `AggIntent` under `DeploymentConstraints`. - /// Output schema: grouping columns (verbatim) + one field carrying - /// partial summary state per group, typed `family`. - SummaryAgg { - child: Rc, - /// Which summary family realizes this aggregation, and that - /// family's own `(kind, params)`. Never `FieldDataType::Plain` - /// — this node always produces summary state, not a plain value. - family: FieldDataType, - /// Optional multidimensional item identity and the observation/update - /// weight fed into each state update. Subpopulation semantics remain - /// on `reduction`; physical sharing remains on `grouping`. - input: SummaryUpdate, - /// How this aggregation's output rows relate to `child`'s — the - /// same [`Reduction`] the pre-ASAP `Aggregate` node it was bound - /// from carried (issue #165), reused verbatim rather than - /// flattened to a bare `Vec`. `Reduction::Reduce(by)` - /// with an empty `by` is a genuine full reduction (merge every - /// candidate into one group); `Reduction::PerEntity` has no - /// grouping concept at all (never merge across entities) — the - /// two collapsed to the same ambiguous `by: []` before this field - /// existed (issue #163). - reduction: Reduction, - /// How this aggregation's summary state is physically instantiated - /// across `reduction`'s subpopulations — one independent instance - /// per `by` key (today's only behavior, and this field's default), - /// or one shared Hydra-family structure serving all of them (issue - /// #256). Lives here, next to `reduction`, for planning, and is also - /// encoded in sketch-valued `family`/output-schema state so merges - /// can reject incompatible layouts. `reduction` is the field that - /// carries the `by` keys this axis's legality depends on (a - /// `SharedMultiSubpopulation` choice only makes sense when - /// `reduction` actually has a subpopulation concept — see - /// `asap_aware_mapping::grouping`'s module docs for the legality - /// rules). Every existing producer of a `SummaryAgg` sets this to - /// `GroupingStrategy::PerSubpopulationInstance` (its `Default`), - /// so no existing behavior changes. - grouping: GroupingStrategy, - /// Row predicate gating this summary's updates (issue #466): only - /// rows where it is `TRUE` update the state; grouping keys are - /// still read from every row. Positional against `child`'s output. - /// A field rather than a `Filter` child so summaries that differ - /// only in predicate can still share one child. No binding rule - /// sets it yet — a filtered pre-ASAP measure stays `KeepPreAsap` — - /// so every producer today writes `None`. - filter: Option, - }, - - /// Summary-aware join (KMV / theta for join-cardinality; join-sample for - /// sampling). Emitted only when a `Bind*OnJoin` rule fires. - /// Output schema: one field typed `family`, read by a downstream - /// `SummaryEstimate`. - SummaryJoin { - outer: Rc, - inner: Rc, - key: ColumnRef, - /// Never `FieldDataType::Plain` — see [`SummaryAgg::family`](SummaryExpr::SummaryAgg). - family: FieldDataType, - }, - - /// Subtract one summary from another. Valid only for families with a - /// linear-inverse property (CMS, theta, count-based). Catalog flag - /// `subtractable` must be true for the family. - /// Output schema: one field (same family + params as inputs). - SummarySubtract { - left: Rc, - right: Rc, - }, - - /// Delete a key from a summary (CMS update with −1, deletable Bloom - /// filter). Catalog flag `deletable` must be true. Output schema = - /// input schema unchanged in type (same field type as input). - SummaryDelete { - summary_input: Rc, - key: ColumnRef, - }, - - /// Read out a query result from a built summary. The summary-state field - /// type does *not* propagate downstream of an estimate — the output - /// schema is a regular row-shaped schema (Float64 for quantile, Int64 - /// for count/cardinality, `[(key, count)]` for top-k). - SummaryEstimate { - summary_input: Rc, - query: SketchStatistic, - }, - - /// ⊕ — union of summaries across stages / shards. Distinct from the - /// pre-ASAP `Concat` because summary union has type constraints: all - /// inputs must agree on `family` (kind + params) and the catalog flag - /// `mergeable` must be true. Inserted by a deployment's own stage - /// allocator (not modeled in this crate) on cut edges. - /// Output schema: one field (same family + params as inputs). - SummaryMerge { - children: Vec>, - timing: ExecutionTiming, - }, -} - -/// All semantics owned by a post-ASAP binary operator. -#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] -pub struct BinaryOperator { - /// Execute division only for finite operands, a nonzero divisor, and a - /// normal finite result; otherwise use exact execution. Required by the - /// relative-value division certificate, including floating-point range. - #[serde(default)] - pub checked_relative_division: bool, - /// Conditional exact rewrites (such as temporal average from sum/count) - /// require finite operands and quotient. Zero/subnormal results are valid; - /// overflow must fall back to the original query rather than emit infinity. - #[serde(default)] - pub checked_finite_division: bool, - pub kind: BinaryOpKind, - /// `None` is the only currently supported vector/vector matching mode. - /// The field is retained so execution never has to recover semantics by - /// re-parsing PromQL. - pub vector_match: Option, -} diff --git a/crates/types/src/post_asap/guarantee.rs b/crates/types/src/post_asap/guarantee.rs index cfc6f3f01..68cd7cea9 100644 --- a/crates/types/src/post_asap/guarantee.rs +++ b/crates/types/src/post_asap/guarantee.rs @@ -16,9 +16,9 @@ //! ## What a guarantee says //! //! [`ResultGuarantee`] is attached to a finalized, caller-visible value — -//! [`super::SummaryNode::guarantee`] on a `SummaryEstimate` readout, an +//! [`crate::ir::OperatorNode::guarantee`] on a `SummaryEstimate` evaluation, an //! exact accumulator, or a kept pre-ASAP sub-DAG — never to raw summary -//! state (a `SummaryAgg` sketch node carries `None`; its readout carries the +//! state (a `SummaryAgg` sketch node carries `None`; its evaluation carries the //! guarantee). Its statement is: //! //! ```text @@ -325,13 +325,13 @@ pub enum GuaranteeSource { /// Deterministic exact computation — zero error by construction. Exact { /// What made it exact (e.g. `"ExactAggregate(Sum)"`, - /// `"KeepPreAsap"`). + /// `"RetainedExact"`). reason: String, }, - /// The target this readout's sketch was sized against. + /// The target this evaluation's sketch was sized against. AccuracyTarget { target: AccuracyTarget }, - /// The concrete sketch a readout's local guarantee was derived from. - SketchReadout { + /// The concrete sketch a evaluation's local guarantee was derived from. + SketchEvaluation { algorithm: String, /// Stable estimator/analysis contract used to derive this guarantee. #[serde(default)] @@ -421,8 +421,8 @@ impl ResultGuarantee { self.bound.is_zero() && self.failure_probability.is_zero() } - /// How many approximate sketch readouts contributed to this value — - /// `1` for a plain readout, `0` for an exact value, and the transitive + /// How many approximate sketch evaluations contributed to this value — + /// `1` for a plain evaluation, `0` for an exact value, and the transitive /// count through every [`GuaranteeSource::ChildGuarantee`] for a /// composition. An `AccuracyBudgetAllocator` uses this as the number /// of layers a budget must be split across. @@ -430,7 +430,7 @@ impl ResultGuarantee { self.provenance .iter() .map(|source| match source { - GuaranteeSource::SketchReadout { .. } => 1, + GuaranteeSource::SketchEvaluation { .. } => 1, GuaranteeSource::ChildGuarantee { guarantee, .. } => { guarantee.approximate_layer_count() } diff --git a/crates/types/src/post_asap/maintained_population.rs b/crates/types/src/post_asap/maintained_population.rs index 73ddd38ba..5e64b5436 100644 --- a/crates/types/src/post_asap/maintained_population.rs +++ b/crates/types/src/post_asap/maintained_population.rs @@ -1,4 +1,4 @@ -//! Language-independent maintained populations and their readouts. +//! Language-independent maintained populations and their evaluations. //! Resource limits, ingestion placement and data structures belong to the executor. use serde::{Deserialize, Serialize}; @@ -35,86 +35,10 @@ pub enum PopulationStatistic { Average, } -impl CurrentSeriesInput { - /// Verify the named contract against the canonical maintenance input. - pub fn matches_input(&self, input: &crate::pre_asap::QueryExpr) -> bool { - use crate::pre_asap::{CompareOpKind, DataType, QueryExpr, ScalarValue, Source}; - // PromQL instant selectors carry an ingestion-interval `TimeRange` as - // their input scope. The population must use the same expiry horizon; - // shifted and otherwise transformed inputs still fail below. - let input = match input { - QueryExpr::TimeRange { range, child } - if self.lookback_ms > 0 - && *range == std::time::Duration::from_millis(self.lookback_ms) => - { - child.as_ref() - } - QueryExpr::TimeRange { .. } => return false, - other if self.lookback_ms == 300_000 => other, - _ => return false, - }; - let QueryExpr::Scan { - source: Source::TimeSeries { metric }, - predicates, - schema, - } = input - else { - return false; - }; - if self.metric.is_empty() - || *metric != self.metric - || (schema.closed && !schema.has_promql_series_identity()) - || schema.time_index.is_none() - { - return false; - } - if self.grouping.iter().any(|label| { - !schema - .fields - .iter() - .any(|c| c.name == *label && c.dtype == DataType::Utf8) - }) { - return false; - } - let mut matchers = Vec::new(); - for predicate in predicates { - let QueryExpr::Compare { left, op, right } = predicate.0.as_ref() else { - return false; - }; - let (QueryExpr::Column(col), QueryExpr::Literal(ScalarValue::Utf8(value))) = - (left.as_ref(), right.as_ref()) - else { - return false; - }; - let Some(column) = schema.fields.get(*col) else { - return false; - }; - if column.dtype != DataType::Utf8 { - return false; - } - let operation = match op { - CompareOpKind::Eq => CurrentSeriesMatch::Equal, - CompareOpKind::Ne => CurrentSeriesMatch::NotEqual, - CompareOpKind::Regex => CurrentSeriesMatch::Regex, - CompareOpKind::NotRegex => CurrentSeriesMatch::NotRegex, - _ => return false, - }; - matchers.push(CurrentSeriesMatcher { - label: column.name.clone(), - value: value.clone(), - operation, - }); - } - matchers.sort(); - matchers.dedup(); - self.matchers == matchers && self.grouping.windows(2).all(|w| w[0] < w[1]) - } -} - /// Membership is part of state identity. Table rows must never acquire implicit /// latest-per-series selection, stale markers, or a PromQL lookback. #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] -pub enum PopulationInput { +pub enum PopulationInput { CurrentSeries(CurrentSeriesInput), Rows { input: std::rc::Rc, @@ -124,41 +48,12 @@ pub enum PopulationInput { } #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] -pub struct MaintainedPopulation { +pub struct MaintainedPopulation { pub input: PopulationInput, pub max_k: usize, pub quantiles: bool, } -impl MaintainedPopulation { - pub fn matches_input(&self, input: &crate::pre_asap::QueryExpr) -> bool { - match &self.input { - PopulationInput::CurrentSeries(spec) => spec.matches_input(input), - PopulationInput::Rows { - input: expected, - value_column, - grouping, - } => { - use crate::pre_asap::{DataType, QueryExpr, Source}; - expected.as_ref() == input - && matches!(input, QueryExpr::Scan { source: Source::Table { .. }, schema, .. } - if schema.closed && schema.fields.get(*value_column).is_some_and(|c| c.dtype == DataType::Float64 && !c.nullable) - && !grouping.is_without() && grouping.keys().iter().all(|k| *k < schema.fields.len())) - } - } - } - - pub fn supports(&self, readout: &PopulationStatistic) -> bool { - match readout { - PopulationStatistic::Quantile { q } => self.quantiles && q.is_finite(), - PopulationStatistic::TopK { k } => *k <= self.max_k, - PopulationStatistic::Sum - | PopulationStatistic::Count - | PopulationStatistic::Average => true, - } - } -} - impl CurrentSeriesInput { /// Verify the named contract against the canonical maintenance input. pub fn matches_node(&self, input: &crate::ir::OperatorNode) -> bool { diff --git a/crates/types/src/post_asap/mod.rs b/crates/types/src/post_asap/mod.rs index f71aaca0f..04e3264c2 100644 --- a/crates/types/src/post_asap/mod.rs +++ b/crates/types/src/post_asap/mod.rs @@ -1,66 +1,44 @@ -//! The post-ASAP IR: summary-bound types, distinct from -//! [`crate::pre_asap`]'s pre-ASAP IR. +//! Summary-state types and the execution-timing vocabulary of the operator +//! IR ([`crate::ir`]). //! -//! Where [`crate::pre_asap`] carries *intent* only ("compute a -//! quantile to ε accuracy"), this module is the summary-bound IR: the -//! summary family, kind/algorithm, and parameters are committed (one -//! `(Kind, Params)` pair per family — [`sketch::ExactKind`]/[`sketch::ExactParams`], +//! Where an intent ([`crate::pre_asap::AggIntent`]) says *what* to compute +//! ("a quantile to ε accuracy"), these types say *how* a summary realizes it: +//! the family, kind/algorithm and parameters are committed — one +//! `(Kind, Params)` pair per family ([`sketch::ExactKind`]/[`sketch::ExactParams`], //! [`sketch::SamplingKind`]/[`sketch::SamplingParams`], //! [`sketch::WaveletKind`]/[`sketch::WaveletParams`], -//! [`sketch::StatModelKind`]/[`sketch::StatModelParams`]), and -//! [`expr::SummaryNode`] / [`expr::SummaryExpr`] describe the summary -//! computation. The `Sketch` family is the one exception to that -//! one-pair-per-family shape: it nests a third level, [`sketch::SketchKind`] -//! (quantile/cardinality/frequency/top-k), which itself carries the -//! committed [`sketch::SketchAlgorithm`] and [`sketch::SketchParams`] — -//! `FieldDataType::Sketch(SketchKind, GroupingStrategy)`, not a flat -//! `(kind, params)` pair -//! — because `Sketch` is the one family with more than one algorithm per -//! purpose today; no other family needs that extra level yet. +//! [`sketch::StatModelKind`]/[`sketch::StatModelParams`]). The `Sketch` family +//! nests a third level, [`sketch::SketchKind`] (quantile/cardinality/ +//! frequency/top-k), carrying the committed [`sketch::SketchAlgorithm`] and +//! [`sketch::SketchParams`], because it is the one family with more than one +//! algorithm per purpose. //! -//! A second, orthogonal axis lives here too: [`sketch::GroupingStrategy`] -//! (issue #256) — *how many* physical instances of a chosen family/kind -//! exist across a grouped aggregate's `by` subpopulations -//! (`PerSubpopulationInstance`, today's only behavior, vs. -//! `SharedMultiSubpopulation`/Hydra — see [`sketch::HydraKind`]/ -//! [`sketch::HydraParams`]), carried on [`expr::SummaryExpr::SummaryAgg`] -//! alongside `reduction` and on sketch-valued edge types -//! — see `asap_aware_mapping::grouping`'s module docs for why. +//! [`sketch::GroupingStrategy`] is a second, orthogonal axis: how many +//! physical instances of a summary exist across a grouped aggregate's `by` +//! subpopulations (per-subpopulation vs. one shared Hydra instance — see +//! `asap_aware_mapping::grouping`). It rides on `ASAPOp::SummaryAgg` and on +//! sketch-valued edge types. +//! +//! The rest: accuracy guarantees ([`guarantee`]), maintained populations, +//! summary-window panes, and the execution timing / +//! data-state vocabulary ([`execution_data_state`]). -pub mod cse; pub mod execution_data_state; -pub mod expr; pub mod guarantee; pub mod maintained_population; -pub mod post_asap_dag; pub mod query_time; pub mod sketch; -pub mod summary_maintenance; -pub mod summary_maintenance_lifecycle; pub mod summary_window; pub use crate::pre_asap::schema::{Field, FieldDataType, Schema}; -pub use cse::share_common_summary_sub_dags; pub use execution_data_state::{ - assigned_child_data_state, exact_operation_output_schema, produced_data_state, - validate_execution_data_states, validate_execution_data_states_at, DataPrimitive, - ExactOperationSchemaError, ExecutionDataState, ExecutionDataStateAssignment, + lift_plain, DataPrimitive, ExactOperationSchemaError, ExecutionDataState, ExecutionDataStateError, ExecutionTiming, }; -pub use expr::{ - BinaryOperator, CandidateCompleteness, ExactOperation, SummaryExpr, SummaryNode, ValueOperation, -}; pub use guarantee::{ AccuracyError, BoundExpr, CompositionOperator, ErrorMetric, GuaranteeSource, ProbabilityExpr, ResultGuarantee, }; -pub use post_asap_dag::{ - compile_post_asap_dag, compile_post_asap_dag_with_node_ids, EdgeRole, - GroupingEdgeCompatibility, PostAsapDAG, PostAsapDAGCompilation, PostAsapDAGDocument, - PostAsapDAGEdge, PostAsapDAGNode, PostAsapDAGValidationError, PostAsapNodeId, - PostAsapNodeIdentityMap, PostAsapOperatorPayload, WindowEdgeCompatibility, - POST_ASAP_DAG_WIRE_VERSION, -}; pub use query_time::{ classic_cms_sizing, cms_posterior_error_bound, count_sketch_posterior_error_bound, cu_sketch_posterior_error_bound, traditional_a_priori_bound, @@ -71,12 +49,6 @@ pub use sketch::{ SketchCategory, SketchKind, SketchParams, SketchStatistic, StatModelKind, StatModelParams, SummaryInputExpr, SummaryUpdate, WaveletKind, WaveletParams, WeightDomain, }; -pub use summary_maintenance::SummaryMaintenanceMode; -pub use summary_maintenance_lifecycle::{ - EvaluationSchedule, OutputRepresentation, SummaryMaintenanceLifecycle, - SummaryMaintenanceLifecycleGuarantee, -}; pub use summary_window::{ - plan_pane_phase, validate_pane_coverage, PaneCoverageError, PaneLayout, SummaryWindowFramework, - WindowEdgeCoverage, + plan_pane_phase, validate_pane_coverage, PaneCoverageError, PaneLayout, WindowEdgeCoverage, }; diff --git a/crates/types/src/post_asap/post_asap_dag.rs b/crates/types/src/post_asap/post_asap_dag.rs deleted file mode 100644 index d489c055e..000000000 --- a/crates/types/src/post_asap/post_asap_dag.rs +++ /dev/null @@ -1,867 +0,0 @@ -//! Runtime-neutral post-ASAP DAG contract shared by precompute and query engines. - -use std::collections::HashMap; -use std::rc::Rc; - -use super::{ - validate_execution_data_states, ExecutionDataState, ExecutionDataStateError, ResultGuarantee, - Schema, SummaryExpr, SummaryNode, -}; -use super::{ - BinaryOperator, CandidateCompleteness, ExecutionTiming, FieldDataType, GroupingStrategy, - SketchStatistic, SummaryUpdate, ValueOperation, -}; -use crate::pre_asap::{ColumnRef, JoinKind, Predicate, QueryExpr, Reduction}; -use thiserror::Error; - -pub const POST_ASAP_DAG_WIRE_VERSION: u32 = 6; - -#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)] -pub enum EdgeRole { - Input, - Left, - Right, -} - -#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)] -pub enum GroupingEdgeCompatibility { - Identical, - ConsumerCoarsensProducer, - Incompatible, - NotApplicable, -} - -#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)] -pub enum WindowEdgeCompatibility { - /// Physical lowering must prove equal pane/query phase or install an - /// exact boundary residual. The logical DAG alone cannot make that claim. - #[serde(rename = "RequiresAlignedPanePhaseOrExactBoundaryResidual")] - RequiresAlignedPanePhaseOrExactWindowEdgeResidual, - NotApplicable, -} - -/// Stable identity of a node within one exported post-ASAP semantic DAG. -#[derive( - Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, serde::Serialize, serde::Deserialize, -)] -#[serde(transparent)] -pub struct PostAsapNodeId(pub u32); - -#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] -#[serde(tag = "kind", rename_all = "snake_case", deny_unknown_fields)] -pub enum PostAsapOperatorPayload { - Fallback { - expression: QueryExpr, - }, - Binary { - operator: BinaryOperator, - }, - Value { - operation: ValueOperation, - }, - RelationalJoin { - join_kind: JoinKind, - pred: Predicate, - pruning: Option, - }, - SummaryAgg { - family: FieldDataType, - input: SummaryUpdate, - reduction: Reduction, - grouping: GroupingStrategy, - /// See `SummaryExpr::SummaryAgg::filter`. Wire version 6 added it; - /// a version-5 reader would otherwise take a filtered summary as - /// unfiltered. - filter: Option, - }, - SummaryJoin { - key: ColumnRef, - family: FieldDataType, - }, - SummarySubtract, - SummaryDelete { - key: ColumnRef, - }, - SummaryEstimate { - query: SketchStatistic, - }, - SummaryMerge, -} - -#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] -#[serde(deny_unknown_fields)] -pub struct PostAsapDAGNode { - pub id: PostAsapNodeId, - /// The payload variant is the sole operator identity (`payload.kind` in JSON). - pub payload: PostAsapOperatorPayload, - /// Phase is a placement choice for every operator, independent of payload kind. - pub output_state: ExecutionDataState, - pub output_schema: Schema, - pub guarantee: Option, -} - -#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] -#[serde(deny_unknown_fields)] -pub struct PostAsapDAGEdge { - pub producer: PostAsapNodeId, - pub consumer: PostAsapNodeId, - pub role: EdgeRole, - pub intermediate_schema: Schema, - pub data_state: ExecutionDataState, - pub grouping: GroupingEdgeCompatibility, - pub window: WindowEdgeCompatibility, -} - -#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] -#[serde(deny_unknown_fields)] -pub struct PostAsapDAG { - pub nodes: Vec, - pub edges: Vec, - /// Semantic workload root. Physical query/precompute sinks are selected - /// downstream by the control plane. - pub root: PostAsapNodeId, -} - -/// Versioned transport envelope for a post-ASAP semantic DAG. -/// -/// Process boundaries exchange this envelope and call [`Self::validate`]. -#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] -#[serde(deny_unknown_fields)] -pub struct PostAsapDAGDocument { - pub schema_version: u32, - pub dag: PostAsapDAG, -} - -#[derive(Debug, Clone, PartialEq, Eq, Error)] -pub enum PostAsapDAGValidationError { - #[error("phase assignment must name every DAG node exactly once")] - IncompletePhaseAssignment, - #[error("ingestion node {consumer:?} depends on query node {producer:?}")] - QueryDependencyInIngestion { - producer: PostAsapNodeId, - consumer: PostAsapNodeId, - }, - #[error("unsupported post-ASAP DAG schema version {0}")] - UnsupportedVersion(u32), - #[error("duplicate post-ASAP node id {0:?}")] - DuplicateNodeId(PostAsapNodeId), - #[error("post-ASAP DAG root {0:?} does not name a node")] - MissingRoot(PostAsapNodeId), - #[error("edge endpoint {0:?} does not name a node")] - MissingEdgeEndpoint(PostAsapNodeId), - #[error("edge {producer:?}->{consumer:?} schema differs from producer output")] - EdgeSchemaMismatch { - producer: PostAsapNodeId, - consumer: PostAsapNodeId, - }, - #[error("edge {producer:?}->{consumer:?} data state differs from producer output")] - EdgeDataStateMismatch { - producer: PostAsapNodeId, - consumer: PostAsapNodeId, - }, - #[error("post-ASAP DAG contains a cycle")] - Cycle, - #[error("post-ASAP node {0:?} is not reachable from the root")] - UnreachableNode(PostAsapNodeId), - #[error("summary aggregate node {node:?} output schema does not contain its declared family")] - SummaryFamilySchemaMismatch { node: PostAsapNodeId }, - #[error( - "summary aggregate node {node:?} declares grouping inconsistent with its sketch state" - )] - SummaryGroupingMismatch { node: PostAsapNodeId }, -} - -impl PostAsapDAGDocument { - pub fn new(dag: PostAsapDAG) -> Self { - Self { - schema_version: POST_ASAP_DAG_WIRE_VERSION, - dag, - } - } - - pub fn validate(&self) -> Result<(), PostAsapDAGValidationError> { - if self.schema_version != POST_ASAP_DAG_WIRE_VERSION { - return Err(PostAsapDAGValidationError::UnsupportedVersion( - self.schema_version, - )); - } - self.dag.validate() - } -} - -impl PostAsapDAG { - /// Assign execution phases without changing operator semantics. Phase choices - /// do not prove deployment support: callers must bind concrete implementations - /// and storage boundaries before installing this plan. - pub fn with_execution_phases( - &self, - phases: &std::collections::BTreeMap, - ) -> Result { - self.validate()?; - if phases.len() != self.nodes.len() - || self.nodes.iter().any(|node| !phases.contains_key(&node.id)) - { - return Err(PostAsapDAGValidationError::IncompletePhaseAssignment); - } - let mut dag = self.clone(); - for node in &mut dag.nodes { - node.output_state.timing = phases[&node.id]; - } - let states: HashMap<_, _> = dag.nodes.iter().map(|n| (n.id, n.output_state)).collect(); - for edge in &mut dag.edges { - edge.data_state = states[&edge.producer]; - } - dag.validate()?; - Ok(dag) - } - - pub fn validate(&self) -> Result<(), PostAsapDAGValidationError> { - use std::collections::{HashMap, HashSet}; - let mut nodes = HashMap::new(); - for node in &self.nodes { - if nodes.insert(node.id, node).is_some() { - return Err(PostAsapDAGValidationError::DuplicateNodeId(node.id)); - } - if let PostAsapOperatorPayload::SummaryAgg { - family, grouping, .. - } = &node.payload - { - let mut found_family = false; - for field in &node.output_schema.fields { - if &field.dtype == family { - found_family = true; - } - if let FieldDataType::Sketch(_, schema_grouping) = &field.dtype { - if schema_grouping != grouping { - return Err(PostAsapDAGValidationError::SummaryGroupingMismatch { - node: node.id, - }); - } - } - } - if !found_family { - return Err(PostAsapDAGValidationError::SummaryFamilySchemaMismatch { - node: node.id, - }); - } - } - } - if !nodes.contains_key(&self.root) { - return Err(PostAsapDAGValidationError::MissingRoot(self.root)); - } - let mut children: HashMap> = HashMap::new(); - for edge in &self.edges { - let producer = nodes.get(&edge.producer).ok_or( - PostAsapDAGValidationError::MissingEdgeEndpoint(edge.producer), - )?; - if !nodes.contains_key(&edge.consumer) { - return Err(PostAsapDAGValidationError::MissingEdgeEndpoint( - edge.consumer, - )); - } - if producer.output_state.timing == ExecutionTiming::QueryTime - && nodes[&edge.consumer].output_state.timing == ExecutionTiming::IngestionTime - { - return Err(PostAsapDAGValidationError::QueryDependencyInIngestion { - producer: edge.producer, - consumer: edge.consumer, - }); - } - if edge.intermediate_schema != producer.output_schema { - return Err(PostAsapDAGValidationError::EdgeSchemaMismatch { - producer: edge.producer, - consumer: edge.consumer, - }); - } - if edge.data_state != producer.output_state { - return Err(PostAsapDAGValidationError::EdgeDataStateMismatch { - producer: edge.producer, - consumer: edge.consumer, - }); - } - children - .entry(edge.consumer) - .or_default() - .push(edge.producer); - } - fn visit( - id: PostAsapNodeId, - children: &HashMap>, - visiting: &mut HashSet, - visited: &mut HashSet, - ) -> bool { - if visited.contains(&id) { - return true; - } - if !visiting.insert(id) { - return false; - } - if children - .get(&id) - .into_iter() - .flatten() - .any(|child| !visit(*child, children, visiting, visited)) - { - return false; - } - visiting.remove(&id); - visited.insert(id); - true - } - if !visit( - self.root, - &children, - &mut HashSet::new(), - &mut HashSet::new(), - ) { - return Err(PostAsapDAGValidationError::Cycle); - } - let mut reachable = HashSet::new(); - fn mark( - id: PostAsapNodeId, - children: &HashMap>, - reachable: &mut HashSet, - ) { - if !reachable.insert(id) { - return; - } - for child in children.get(&id).into_iter().flatten() { - mark(*child, children, reachable); - } - } - mark(self.root, &children, &mut reachable); - if let Some(id) = nodes.keys().find(|id| !reachable.contains(id)) { - return Err(PostAsapDAGValidationError::UnreachableNode(*id)); - } - Ok(()) - } -} - -/// Compiler-local identity assignment. It deliberately retains `Rc` handles -/// and is not serialized; deployed artifacts persist the post-ASAP node ID -/// together with their physical materialization/query IDs. -#[derive(Debug, Clone)] -pub struct PostAsapNodeIdentityMap { - nodes_by_id: Vec>, -} - -impl PostAsapNodeIdentityMap { - pub fn node_id(&self, node: &Rc) -> Option { - self.nodes_by_id - .iter() - .position(|candidate| Rc::ptr_eq(candidate, node)) - .map(|id| PostAsapNodeId(id as u32)) - } - - pub fn summary_node(&self, id: PostAsapNodeId) -> Option<&Rc> { - self.nodes_by_id.get(id.0 as usize) - } -} - -#[derive(Debug, Clone)] -pub struct PostAsapDAGCompilation { - pub dag: PostAsapDAG, - pub node_ids: PostAsapNodeIdentityMap, -} - -pub fn compile_post_asap_dag( - root: &Rc, -) -> Result { - Ok(compile_post_asap_dag_with_node_ids(root)?.dag) -} - -pub fn compile_post_asap_dag_with_node_ids( - root: &Rc, -) -> Result { - let assignment = validate_execution_data_states(root)?; - let mut nodes = Vec::new(); - let mut edges = Vec::new(); - let mut ids = HashMap::new(); - let mut nodes_by_id = Vec::new(); - - fn visit( - node: &Rc, - assignment: &super::ExecutionDataStateAssignment, - ids: &mut HashMap<*const SummaryNode, PostAsapNodeId>, - nodes: &mut Vec, - edges: &mut Vec, - nodes_by_id: &mut Vec>, - ) -> PostAsapNodeId { - if let Some(id) = ids.get(&Rc::as_ptr(node)) { - return *id; - } - let children: Vec<(&Rc, EdgeRole)> = match &node.expr { - SummaryExpr::KeepPreAsap(_) => vec![], - SummaryExpr::BinaryOp { lhs, rhs, .. } => { - vec![(lhs, EdgeRole::Left), (rhs, EdgeRole::Right)] - } - - SummaryExpr::ValueOperation { child, .. } | SummaryExpr::SummaryAgg { child, .. } => { - vec![(child, EdgeRole::Input)] - } - SummaryExpr::RelationalJoin { left, right, .. } => { - vec![(left, EdgeRole::Left), (right, EdgeRole::Right)] - } - SummaryExpr::SummaryJoin { outer, inner, .. } => { - vec![(outer, EdgeRole::Left), (inner, EdgeRole::Right)] - } - SummaryExpr::SummarySubtract { left, right } => { - vec![(left, EdgeRole::Left), (right, EdgeRole::Right)] - } - SummaryExpr::SummaryDelete { summary_input, .. } - | SummaryExpr::SummaryEstimate { summary_input, .. } => { - vec![(summary_input, EdgeRole::Input)] - } - SummaryExpr::SummaryMerge { children, .. } => { - children.iter().map(|c| (c, EdgeRole::Input)).collect() - } - }; - let child_ids: Vec<_> = children - .iter() - .map(|(c, r)| (visit(c, assignment, ids, nodes, edges, nodes_by_id), *c, *r)) - .collect(); - let id = PostAsapNodeId(nodes.len() as u32); - let state = assignment - .data_state_of(node) - .expect("validated node has state"); - let payload = match &node.expr { - SummaryExpr::KeepPreAsap(expression) => PostAsapOperatorPayload::Fallback { - expression: (**expression).clone(), - }, - SummaryExpr::BinaryOp { operator, .. } => PostAsapOperatorPayload::Binary { - operator: operator.clone(), - }, - - SummaryExpr::ValueOperation { operation, .. } => PostAsapOperatorPayload::Value { - operation: operation.clone(), - }, - SummaryExpr::RelationalJoin { - kind, - pred, - pruning, - .. - } => PostAsapOperatorPayload::RelationalJoin { - join_kind: kind.clone(), - pred: pred.clone(), - pruning: pruning.clone(), - }, - SummaryExpr::SummaryAgg { - family, - input, - reduction, - grouping, - filter, - .. - } => PostAsapOperatorPayload::SummaryAgg { - family: family.clone(), - input: input.clone(), - reduction: reduction.clone(), - grouping: grouping.clone(), - filter: filter.clone(), - }, - SummaryExpr::SummaryJoin { key, family, .. } => PostAsapOperatorPayload::SummaryJoin { - key: key.clone(), - family: family.clone(), - }, - SummaryExpr::SummarySubtract { .. } => PostAsapOperatorPayload::SummarySubtract, - SummaryExpr::SummaryDelete { key, .. } => { - PostAsapOperatorPayload::SummaryDelete { key: key.clone() } - } - SummaryExpr::SummaryEstimate { query, .. } => { - PostAsapOperatorPayload::SummaryEstimate { - query: query.clone(), - } - } - SummaryExpr::SummaryMerge { .. } => PostAsapOperatorPayload::SummaryMerge, - }; - nodes.push(PostAsapDAGNode { - id, - payload, - output_state: state, - output_schema: node.schema.clone(), - guarantee: node.guarantee.clone(), - }); - nodes_by_id.push(Rc::clone(node)); - ids.insert(Rc::as_ptr(node), id); - for (producer, child, role) in child_ids { - let maintenance_dependency = nodes[producer.0 as usize].output_state.timing - == ExecutionTiming::IngestionTime - && nodes[id.0 as usize].output_state.timing == ExecutionTiming::IngestionTime; - let grouping = match (&child.expr, &node.expr) { - ( - SummaryExpr::SummaryAgg { - reduction: producer, - .. - }, - SummaryExpr::SummaryAgg { - reduction: consumer, - .. - }, - ) if producer == consumer => GroupingEdgeCompatibility::Identical, - ( - SummaryExpr::SummaryAgg { - reduction: crate::pre_asap::Reduction::PerEntity, - .. - }, - SummaryExpr::SummaryAgg { - reduction: crate::pre_asap::Reduction::Reduce(_), - .. - }, - ) => GroupingEdgeCompatibility::ConsumerCoarsensProducer, - ( - SummaryExpr::SummaryAgg { - reduction: crate::pre_asap::Reduction::Reduce(producer), - .. - }, - SummaryExpr::SummaryAgg { - reduction: crate::pre_asap::Reduction::Reduce(consumer), - .. - }, - ) if !producer.is_without() - && !consumer.is_without() - && consumer.iter().all(|key| producer.contains(key)) => - { - GroupingEdgeCompatibility::ConsumerCoarsensProducer - } - (SummaryExpr::SummaryAgg { .. }, SummaryExpr::SummaryAgg { .. }) => { - GroupingEdgeCompatibility::Incompatible - } - _ => GroupingEdgeCompatibility::NotApplicable, - }; - edges.push(PostAsapDAGEdge { - producer, - consumer: id, - role, - intermediate_schema: child.schema.clone(), - // The whole-DAG validator owns contextual state assignment, - // especially for shared KeepPreAsap leaves. Export that - // authoritative result instead of independently deriving the - // edge state a second time. - data_state: assignment - .data_state_of(child) - .expect("validated child has data state"), - grouping, - window: if maintenance_dependency { - WindowEdgeCompatibility::RequiresAlignedPanePhaseOrExactWindowEdgeResidual - } else { - WindowEdgeCompatibility::NotApplicable - }, - }); - } - id - } - - let root = visit( - root, - &assignment, - &mut ids, - &mut nodes, - &mut edges, - &mut nodes_by_id, - ); - let dag = PostAsapDAG { nodes, edges, root }; - dag.validate() - .expect("compiler emits a valid post-ASAP DAG"); - Ok(PostAsapDAGCompilation { - dag, - node_ids: PostAsapNodeIdentityMap { nodes_by_id }, - }) -} - -#[cfg(test)] -mod tests { - use super::*; - use crate::post_asap::{ - ExactKind, ExactParams, ExecutionTiming, FieldDataType, GroupingStrategy, SummaryUpdate, - ValueOperation, - }; - use crate::pre_asap::schema::{Field, Schema}; - use crate::pre_asap::{ColumnRef, DataType, QueryExpr, Reduction, Source}; - use std::collections::BTreeMap; - - #[test] - fn every_physical_payload_can_be_assigned_either_phase() { - use crate::post_asap::DataPrimitive; - use crate::pre_asap::{ArithmeticOpKind, BinaryOpKind, JoinKind, Predicate, ScalarValue}; - let family = FieldDataType::ExactAggregate(ExactKind::Sum, ExactParams::Sum); - let predicate = Predicate(Rc::new(QueryExpr::Literal(ScalarValue::Boolean(true)))); - let payloads = vec![ - PostAsapOperatorPayload::Fallback { - expression: QueryExpr::Literal(ScalarValue::Int64(1)), - }, - PostAsapOperatorPayload::Binary { - operator: BinaryOperator { - checked_relative_division: false, - checked_finite_division: false, - kind: BinaryOpKind::Arithmetic(ArithmeticOpKind::Add), - vector_match: None, - }, - }, - PostAsapOperatorPayload::Value { - operation: ValueOperation::Limit { - n: 1, - offset: 0, - partition_by: Default::default(), - }, - }, - PostAsapOperatorPayload::RelationalJoin { - join_kind: JoinKind::Semi, - pred: predicate, - pruning: None, - }, - PostAsapOperatorPayload::SummaryAgg { - family: family.clone(), - input: SummaryUpdate::column(ColumnRef::SampleValue), - reduction: Reduction::by(vec![]), - grouping: GroupingStrategy::default(), - filter: None, - }, - PostAsapOperatorPayload::SummaryJoin { - key: ColumnRef::SampleValue, - family: family.clone(), - }, - PostAsapOperatorPayload::SummarySubtract, - PostAsapOperatorPayload::SummaryDelete { - key: ColumnRef::SampleValue, - }, - PostAsapOperatorPayload::SummaryEstimate { - query: SketchStatistic::Cardinality, - }, - PostAsapOperatorPayload::SummaryMerge, - ]; - for payload in payloads { - // This checks physical identity and placement, not kernel availability. - let primitive = match &payload { - PostAsapOperatorPayload::Fallback { .. } - | PostAsapOperatorPayload::Binary { .. } - | PostAsapOperatorPayload::Value { .. } - | PostAsapOperatorPayload::RelationalJoin { .. } - | PostAsapOperatorPayload::SummaryEstimate { .. } => DataPrimitive::Raw, - PostAsapOperatorPayload::SummaryAgg { .. } - | PostAsapOperatorPayload::SummaryJoin { .. } - | PostAsapOperatorPayload::SummarySubtract - | PostAsapOperatorPayload::SummaryDelete { .. } - | PostAsapOperatorPayload::SummaryMerge => DataPrimitive::SummaryState, - }; - let dag = PostAsapDAG { - root: PostAsapNodeId(0), - edges: vec![], - nodes: vec![PostAsapDAGNode { - id: PostAsapNodeId(0), - payload: payload.clone(), - output_state: ExecutionDataState { - timing: ExecutionTiming::QueryTime, - primitive, - }, - output_schema: Schema::lifted( - vec![Field { - name: "value".into(), - dtype: family.clone(), - nullable: false, - table: None, - }], - None, - ), - guarantee: None, - }], - }; - for phase in [ExecutionTiming::IngestionTime, ExecutionTiming::QueryTime] { - let placed = dag - .with_execution_phases(&BTreeMap::from([(dag.root, phase)])) - .unwrap(); - assert_eq!(placed.nodes[0].payload, payload); - assert_eq!(placed.nodes[0].output_state.timing, phase); - let wire = serde_json::to_value(&placed).unwrap(); - assert!(wire["nodes"][0]["payload"].get("timing").is_none()); - assert_eq!(serde_json::from_value::(wire).unwrap(), placed); - } - assert!(dag.with_execution_phases(&BTreeMap::new()).is_err()); - } - } - - #[test] - fn phase_assignment_updates_edges_and_rejects_query_dependencies_in_ingestion() { - use crate::pre_asap::ScalarValue; - let schema = Schema::lifted(vec![], None); - let nodes = [0, 1] - .into_iter() - .map(|id| PostAsapDAGNode { - id: PostAsapNodeId(id), - payload: PostAsapOperatorPayload::Fallback { - expression: QueryExpr::Literal(ScalarValue::Int64(1)), - }, - output_state: ExecutionDataState::QUERY_ROWS, - output_schema: schema.clone(), - guarantee: None, - }) - .collect(); - let dag = PostAsapDAG { - nodes, - root: PostAsapNodeId(1), - edges: vec![PostAsapDAGEdge { - producer: PostAsapNodeId(0), - consumer: PostAsapNodeId(1), - role: EdgeRole::Input, - intermediate_schema: schema, - data_state: ExecutionDataState::QUERY_ROWS, - grouping: GroupingEdgeCompatibility::NotApplicable, - window: WindowEdgeCompatibility::NotApplicable, - }], - }; - let placed = dag - .with_execution_phases(&BTreeMap::from([ - (PostAsapNodeId(0), ExecutionTiming::IngestionTime), - (PostAsapNodeId(1), ExecutionTiming::QueryTime), - ])) - .unwrap(); - assert_eq!( - placed.edges[0].data_state.timing, - ExecutionTiming::IngestionTime - ); - assert_eq!(dag.edges[0].data_state.timing, ExecutionTiming::QueryTime); - assert!(matches!( - dag.with_execution_phases(&BTreeMap::from([ - (PostAsapNodeId(0), ExecutionTiming::QueryTime), - (PostAsapNodeId(1), ExecutionTiming::IngestionTime), - ])), - Err(PostAsapDAGValidationError::QueryDependencyInIngestion { .. }) - )); - } - - #[test] - fn exports_summary_over_summary_as_typed_precompute_edges() { - let scan = Rc::new(QueryExpr::Scan { - source: Source::TimeSeries { metric: "m".into() }, - predicates: vec![], - schema: Schema::new(vec![Field::plain("value", DataType::Float64, false)]), - }); - let raw = Rc::new(SummaryNode { - expr: SummaryExpr::KeepPreAsap(scan), - schema: Schema::lifted( - vec![Field { - name: "value".into(), - dtype: FieldDataType::Plain(DataType::Float64), - nullable: false, - table: None, - }], - None, - ), - guarantee: None, - }); - let make_agg = |child: Rc, kind, params| { - let family = FieldDataType::ExactAggregate(kind, params); - Rc::new(SummaryNode { - expr: SummaryExpr::SummaryAgg { - child, - family: family.clone(), - input: SummaryUpdate::column(ColumnRef::SampleValue), - reduction: Reduction::by(vec![]), - grouping: GroupingStrategy::default(), - filter: None, - }, - schema: Schema::lifted( - vec![Field { - name: "value".into(), - dtype: family, - nullable: false, - table: None, - }], - None, - ), - guarantee: None, - }) - }; - let inner = make_agg(raw, ExactKind::Sum, ExactParams::Sum); - let outer = make_agg(Rc::clone(&inner), ExactKind::Sum, ExactParams::Sum); - let root = Rc::new(SummaryNode { - expr: SummaryExpr::ValueOperation { - child: outer, - operation: ValueOperation::FinalizeExactAccumulator, - timing: ExecutionTiming::QueryTime, - }, - schema: Schema::lifted( - vec![Field { - name: "value".into(), - dtype: FieldDataType::Plain(DataType::Float64), - nullable: false, - table: None, - }], - None, - ), - guarantee: None, - }); - - let compiled = compile_post_asap_dag_with_node_ids(&root).unwrap(); - assert_eq!(compiled.node_ids.node_id(&root), Some(PostAsapNodeId(3))); - assert!(Rc::ptr_eq( - compiled.node_ids.summary_node(PostAsapNodeId(1)).unwrap(), - &inner - )); - let dag = compiled.dag; - assert_eq!(dag.root, PostAsapNodeId(3)); - assert_eq!( - dag.nodes[1].output_state, - ExecutionDataState::INGESTION_SUMMARY - ); - assert_eq!( - dag.nodes[2].output_state, - ExecutionDataState::INGESTION_SUMMARY - ); - let dependency = dag - .edges - .iter() - .find(|e| e.producer == PostAsapNodeId(1) && e.consumer == PostAsapNodeId(2)) - .unwrap(); - assert_eq!(dependency.data_state, ExecutionDataState::INGESTION_SUMMARY); - assert_eq!(dependency.grouping, GroupingEdgeCompatibility::Identical); - assert_eq!( - dependency.window, - WindowEdgeCompatibility::RequiresAlignedPanePhaseOrExactWindowEdgeResidual - ); - assert!(matches!( - dependency.intermediate_schema.fields[0].dtype, - FieldDataType::ExactAggregate(ExactKind::Sum, _) - )); - let encoded = serde_json::to_string(&dag).expect("serialize post-ASAP DAG"); - let decoded: PostAsapDAG = - serde_json::from_str(&encoded).expect("deserialize post-ASAP DAG"); - assert_eq!(decoded, dag); - let document = PostAsapDAGDocument::new(decoded); - document.validate().unwrap(); - let mut invalid = serde_json::to_value(&document).unwrap(); - invalid["dag"]["nodes"][0]["operator"] = serde_json::json!("Binary"); - assert!(serde_json::from_value::(invalid).is_err()); - assert!(document.dag.nodes.iter().all(|node| { - let wire = serde_json::to_value(node).unwrap(); - wire.get("operator").is_none() && wire["payload"]["kind"].is_string() - })); - let mut old_version = document.clone(); - old_version.schema_version = 1; - assert_eq!( - old_version.validate(), - Err(PostAsapDAGValidationError::UnsupportedVersion(1)) - ); - let mut unknown = serde_json::to_value(&document).unwrap(); - unknown["unexpected"] = serde_json::json!(true); - assert!(serde_json::from_value::(unknown).is_err()); - assert!(matches!( - dag.nodes[2].payload, - PostAsapOperatorPayload::SummaryAgg { - family: FieldDataType::ExactAggregate(ExactKind::Sum, ExactParams::Sum), - reduction: Reduction::Reduce(_), - .. - } - )); - } - - #[test] - fn post_asap_node_ids_serialize_in_deterministic_binding_order() { - let mut bindings = BTreeMap::new(); - bindings.insert(PostAsapNodeId(10), "materialization-10"); - bindings.insert(PostAsapNodeId(2), "query-2"); - assert_eq!( - serde_json::to_string(&bindings).unwrap(), - r#"{"2":"query-2","10":"materialization-10"}"# - ); - } -} diff --git a/crates/types/src/post_asap/query_time/error_estimation.rs b/crates/types/src/post_asap/query_time/error_estimation.rs index 663d2da12..f2bf229da 100644 --- a/crates/types/src/post_asap/query_time/error_estimation.rs +++ b/crates/types/src/post_asap/query_time/error_estimation.rs @@ -41,7 +41,7 @@ //! //! ## What this is *not* — no runtime sketch exists yet to wire this into //! -//! This issue names two possible integration points: (1) runtime/readout-time +//! This issue names two possible integration points: (1) runtime/evaluation-time //! accuracy reporting from a sketch's *actual* counters, and (2) tighter //! plan-time sizing. As of this module landing, **this repository has no //! vendored CMS/CountSketch/CU-Sketch runtime and no counter-array data @@ -52,12 +52,12 @@ //! planning-time sizing metadata. There is no `A[row][col]` counter matrix //! anywhere in the workspace for these functions to be handed at query //! time. So integration point (1) — reporting an *actual* query's posterior -//! error from real counters at readout — has nothing to wire into today. +//! error from real counters at evaluation — has nothing to wire into today. //! //! The functions here are deliberately **sketch-object-agnostic**: they take //! plain counter slices (`&[u64]` / `&[i64]`) and numeric parameters, not a //! concrete sketch type, specifically so that the moment a real CMS/ -//! Count-Sketch/CU-Sketch runtime lands in this workspace, its readout path +//! Count-Sketch/CU-Sketch runtime lands in this workspace, its evaluation path //! can call these functions directly on its real counter arrays with zero //! changes needed here. That wiring is out of scope for this module — see //! issue #239. @@ -255,8 +255,8 @@ fn posterior_rank(w: usize, rows: u32, delta: f64) -> Option { /// The `k`-th largest value in `values` (1-indexed: `k=1` is the max). /// `select_nth_unstable_by` partitions in O(w) average instead of fully /// sorting in O(w log w) — this only ever needs one rank, not a total -/// order, and both call sites (this module's per-query readout math) are -/// documented as meant to run on a future runtime's hot readout path. +/// order, and both call sites (this module's per-query evaluation math) are +/// documented as meant to run on a future runtime's hot evaluation path. fn kth_largest(values: &[u64], k: usize) -> u64 { let mut buf: Vec = values.to_vec(); let idx = k - 1; diff --git a/crates/types/src/post_asap/sketch.rs b/crates/types/src/post_asap/sketch.rs index a5e1edcc1..65e78d24f 100644 --- a/crates/types/src/post_asap/sketch.rs +++ b/crates/types/src/post_asap/sketch.rs @@ -6,7 +6,7 @@ use crate::pre_asap::ColumnRef; /// An exact, mergeable accumulator family — zero approximation error. The /// partial state built for one of these *is* the answer; no -/// `SummaryEstimate` readout is needed to get a value out of it. +/// `SummaryEstimate` evaluation is needed to get a value out of it. #[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)] pub enum ExactKind { /// Exact sum accumulator (mergeable by addition). @@ -48,7 +48,7 @@ pub enum ExactParams { /// [`SketchKind::new`] is where that classification is made. #[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)] pub enum SketchAlgorithm { - /// Universal frequency-vector summary with shared statistic readouts. + /// Universal frequency-vector summary with shared statistic evaluations. UnivMon, /// KLL quantile sketch (mergeable, ε-accurate rank queries). Kll, @@ -345,7 +345,7 @@ pub enum StatModelParams { /// really the universal-sketch composition (L layers of Count-Sketch plus a /// heavy-hitter heap, Theorems 1+2 combined) estimating entropy/L1-norm/ /// L2-norm/cardinality/frequency-moments as one instance. Standalone UnivMon -/// and its frequency readouts are represented here, but sharing a Hydra +/// and its frequency evaluations are represented here, but sharing a Hydra /// grid across populations still needs its own collision/error contract; /// standalone support does not establish that contract. #[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)] @@ -500,7 +500,7 @@ pub fn default_hydra_params( /// enums themselves, for exactly the reason explained in this section's /// module docs above. /// -/// Carried both on `SummaryExpr::SummaryAgg` (where planning consults it) +/// Carried both on `ASAPOp::SummaryAgg` (where planning consults it) /// and on sketch-valued `FieldDataType` edges (where it prevents /// incompatible shared and independent physical states from type-checking /// as merge-compatible). @@ -590,7 +590,8 @@ pub enum SummaryInputExpr { EntityIdentity(EntityIdentity), } -/// What to extract from a built summary. Carried by `SummaryEstimate`. +/// The statistic computed from summary state by `SummaryEstimate`, for example +/// `Quantile { q: 0.99 }`. This is a result operation, not a workload query. #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] pub enum SketchStatistic { /// sqrt(sum_v frequency(v)^2), not the norm of numeric input values. @@ -605,8 +606,8 @@ pub enum SketchStatistic { /// `value: Some(v)` is a per-item point lookup (e.g. /// `count(cms_metric{item="checkout"})` — `key` is `item`, `value` is /// `"checkout"`). `value` is carried here rather than resolved by the - /// `SummaryExecutor` from a `Filter` predicate because `readout`'s - /// trait signature has no DAG access — see `CostModel::readout_extension`. + /// `SummaryExecutor` from a `Filter` predicate because `evaluation`'s + /// trait signature has no dag access — see `CostModel::evaluation_extension`. PointCount { key: ColumnRef, value: Option, @@ -622,7 +623,7 @@ mod tests { use super::*; #[test] - fn keyed_summary_input_and_topk_readout_round_trip() { + fn keyed_summary_input_and_topk_evaluation_round_trip() { for input in [ SummaryUpdate { item: Some(SummaryInputExpr::EntityIdentity( diff --git a/crates/types/src/post_asap/summary_maintenance.rs b/crates/types/src/post_asap/summary_maintenance.rs deleted file mode 100644 index d1e50d7e5..000000000 --- a/crates/types/src/post_asap/summary_maintenance.rs +++ /dev/null @@ -1,38 +0,0 @@ -//! Planner-level construction mode for a materialized summary. -//! -//! A [`super::SummaryNode`] is a logical summary expression and deliberately -//! does not carry this choice: the same candidate may be built directly for -//! one workload or maintained incrementally for another. Planner search -//! attaches the selected mode to its lifecycle guarantee; downstream physical -//! compilation chooses its concrete implementation. - -/// How a summary deployment obtains its state, independent of implementation. -#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize)] -#[serde(rename_all = "snake_case")] -pub enum SummaryMaintenanceMode { - /// Rebuild the summary from its complete input when the deployment needs - /// a value. No update stream is required. - DirectBuild, - /// Create the state once and apply input changes as they arrive. - Incremental, -} - -impl SummaryMaintenanceMode { - pub const fn as_str(self) -> &'static str { - match self { - Self::DirectBuild => "direct_build", - Self::Incremental => "incremental", - } - } -} - -#[cfg(test)] -mod tests { - use super::*; - - #[test] - fn maintenance_modes_have_stable_export_names() { - assert_eq!(SummaryMaintenanceMode::DirectBuild.as_str(), "direct_build"); - assert_eq!(SummaryMaintenanceMode::Incremental.as_str(), "incremental"); - } -} diff --git a/crates/types/src/post_asap/summary_maintenance_lifecycle.rs b/crates/types/src/post_asap/summary_maintenance_lifecycle.rs deleted file mode 100644 index 798d861f6..000000000 --- a/crates/types/src/post_asap/summary_maintenance_lifecycle.rs +++ /dev/null @@ -1,74 +0,0 @@ -//! Planner-level summary-maintenance lifecycle vocabulary. -//! -//! A **summary-maintenance lifecycle** describes when one materialized summary -//! state is created, retained or shared, updated, and retired. It does not -//! describe the broader data lifecycle (collection, transport, and storage), -//! and it is not implied by a logical `SummaryAgg`. Physical planning compares -//! alternatives using the expected number and timing of reads, the source-data -//! arrival/update rate, state-operation costs, and runtime capabilities. - -use super::SummaryMaintenanceMode; -use crate::workload::{DurationMs, TimestampMs}; - -/// When an operator is evaluated. This is independent of whether it owns -/// state and how long that state is retained. -#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize)] -#[serde(rename_all = "snake_case")] -pub enum EvaluationSchedule { - OneShot, - PerUpdate, - OnRead, -} - -/// The form in which this deployment exposes its result to its consumer. The -/// consumer is the next operator in the execution plan that reads the -/// summary's output; for example, `Estimate` is the consumer in -/// `SummaryAgg -> Estimate`. The exposed result is ordinary rows, reusable -/// summary state, or a finalized value. -#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize)] -#[serde(rename_all = "snake_case")] -pub enum OutputRepresentation { - PlainRows, - SummaryState, - FinalizedValue, -} - -/// Abstract policy for when one materialized summary state is created, -/// retained or shared, updated as data arrives, and retired. -/// -/// This is not the lifecycle of the source data or query. Query recurrence -/// provides the expected number and timing of reads; data arrival provides the -/// expected state-update demand. The planner combines those quantities with -/// costs and runtime capabilities to compare these policies. -#[derive(Debug, Clone, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize)] -#[serde(tag = "kind", rename_all = "snake_case")] -pub enum SummaryMaintenanceLifecycle { - Ephemeral, - Prepared { - #[serde(rename = "activate_at_ms")] - activate_at: TimestampMs, - #[serde(rename = "retire_at_ms")] - retire_at: TimestampMs, - }, - Shared { - #[serde(rename = "retention_ms")] - retention: DurationMs, - }, - ContinuouslyMaintained, -} - -/// The lifecycle commitment emitted for one materialized summary deployment. -/// -/// This names the summary-maintenance promise explicitly so consumers do not -/// confuse it with guarantees about the broader data lifecycle. Accuracy is a -/// separate [`super::ResultGuarantee`]. -#[derive(Debug, Clone, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize)] -#[serde(deny_unknown_fields)] -pub struct SummaryMaintenanceLifecycleGuarantee { - #[serde(rename = "lifecycle")] - pub summary_maintenance_lifecycle: SummaryMaintenanceLifecycle, - #[serde(rename = "maintenance_mode")] - pub summary_maintenance_mode: SummaryMaintenanceMode, - pub evaluation_schedule: EvaluationSchedule, - pub output_representation: OutputRepresentation, -} diff --git a/crates/types/src/post_asap/summary_window.rs b/crates/types/src/post_asap/summary_window.rs index 0e344c1ed..724a8d595 100644 --- a/crates/types/src/post_asap/summary_window.rs +++ b/crates/types/src/post_asap/summary_window.rs @@ -1,29 +1,13 @@ -//! Planner-level summary-window primitives. +//! Planner-level summary-window pane primitives. //! -//! These values identify the abstract window framework selected during -//! candidate search. They do not identify a runtime library, process, -//! placement, shard layout, storage backend, or deployment instance; those -//! choices belong to downstream physical compilation. +//! These values describe pane layout and window-edge coverage. They do not +//! identify a runtime library, process, placement, shard layout, storage +//! backend, or deployment instance; those choices belong to downstream +//! physical compilation. use crate::workload::RepeatedDemand; use serde::{Deserialize, Serialize}; -/// Abstract framework used to organize incrementally maintained summary -/// state over time. -/// -/// The built-in variants name semantics that the planner can compare across -/// implementations with defined planning and accuracy behavior. -#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)] -#[serde(rename_all = "snake_case")] -pub enum SummaryWindowFramework { - /// Disjoint, fixed-width windows. - Tumbling, - /// Overlapping logical windows, commonly realized from reusable panes. - Sliding, - /// Hierarchical buckets with exponentially increasing coverage. - ExponentialHistogram, -} - /// Concrete pane phase recorded in a catalog layout or inventory snapshot. /// Milliseconds are canonical throughout the shared contract. #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] @@ -57,7 +41,7 @@ pub enum PaneCoverageError { }, } -/// Validate that a pane-only readout covers a query exactly. A mismatched +/// Validate that a pane-only evaluation covers a query exactly. A mismatched /// phase is sound only when the physical plan explicitly supplies an exact /// residual for the partial edge panes. pub fn validate_pane_coverage( @@ -123,31 +107,7 @@ mod tests { use super::*; #[test] - fn built_in_frameworks_round_trip() { - for framework in [ - SummaryWindowFramework::Tumbling, - SummaryWindowFramework::Sliding, - SummaryWindowFramework::ExponentialHistogram, - ] { - let encoded = serde_json::to_string(&framework).unwrap(); - assert_eq!( - serde_json::from_str::(&encoded).unwrap(), - framework - ); - } - } - - /// Opaque names cannot enter planning without defined window semantics. - #[test] - fn unimplemented_window_extensions_are_rejected() { - assert!(serde_json::from_value::( - serde_json::json!({"extension": "learned_window"}) - ) - .is_err()); - } - - #[test] - fn pane_only_readout_rejects_source_and_query_phase_mismatch() { + fn pane_only_evaluation_rejects_source_and_query_phase_mismatch() { let layout = PaneLayout { pane_width_ms: 60_000, pane_origin_ms: Some(26_000), diff --git a/crates/types/src/pre_asap/agg_intent.rs b/crates/types/src/pre_asap/agg_intent.rs index c60dd55e3..1e926bd44 100644 --- a/crates/types/src/pre_asap/agg_intent.rs +++ b/crates/types/src/pre_asap/agg_intent.rs @@ -10,28 +10,28 @@ //! heavy-hitter sketch when approximate — is a post-ASAP cost-aware decision, //! not encoded here. The semantic distinction that *is* made at lowering is //! intent vs operator: a heavy-hitter aggregate becomes `TopK`, whereas a -//! generic `ORDER BY value LIMIT k` stays as the `QueryExpr::Sort + Limit` +//! generic `ORDER BY value LIMIT k` stays as the `NonASAPOp::Sort + Limit` //! operator pair. use serde::{Deserialize, Serialize}; -use crate::pre_asap::query_expr::DataModel; +use crate::ir::operator_properties::DataModel; use crate::pre_asap::schema::{ColumnId, DataType, Field, FieldDataType}; use crate::types::AccuracyTarget; /// "What to compute" — the vocabulary the planner pivots on. /// -/// Grouping for `TopK` rides on the enclosing `QueryExpr::Aggregate.by` +/// Grouping for `TopK` rides on the enclosing `NonASAPOp::Aggregate`'s `reduction` /// (positional `ColumnId`s), like every other aggregate; the intent itself /// carries only `k` + the accuracy target. /// /// The single-column reducers (`Sum` / `Min` / `Max` / `Avg` / `StdDev` / /// `Variance` / `Quantile`) carry `col: Option` — the input /// column they reduce, generic over the column-reference state the same way -/// [`QueryExpr`](super::query_expr::QueryExpr) is: positional `ColumnId` once -/// bound (the default, and every existing use of the bare `AggIntent` name), -/// or an unresolved name-based `ColumnRef` for a front end constructing this -/// intent directly, before the [`SchemaResolver`](super::schema_resolver::SchemaResolver) has run. +/// the rest of the vocabulary is: positional `ColumnId` once bound (the +/// default, and every existing use of the bare `AggIntent` name), or an +/// unresolved name-based `ColumnRef` for a front end constructing this +/// intent directly, before name resolution (`asap_frontend_common`) has run. /// `None` is the PromQL convention "the time-series sample value"; SQL /// `SUM(bytes), AVG(latency)` sets distinct `Some(_)`s so a multi-aggregate /// node binds each reducer to the right column, and `plan::bind` knows which @@ -128,7 +128,7 @@ pub enum AggIntent { // ── Time-series streaming derivatives ──────────────────────────────── // Counter-reset adjustment; not equivalent to Sum/Count over a window. - // The temporal range lives on the enclosing `QueryExpr::TimeRange` node, + // The temporal range lives on the enclosing `NonASAPOp::TimeRange` node, // not in the intent — this keeps the intent vocabulary range-agnostic. Rate, /// PromQL `irate(v[w])` — reset-aware rate from the final two samples. @@ -234,7 +234,7 @@ pub enum AggIntent { /// A time / calendar accessor (issue #46) — `timestamp`, `minute`, `hour`, /// `day_of_week`, … over each sample's timestamp (or, for the no-arg forms, /// over the evaluation time). Label-preserving per-series value transform. - /// (`time()` is the evaluation time itself — a `QueryExpr::EvalTimestamp` leaf, + /// (`time()` is the evaluation time itself — a `ScalarExpr::EvalTimestamp` leaf, /// not this.) TimeFn(TimeFunc), @@ -378,9 +378,8 @@ pub enum MathFunc { } // `requires` / `is_per_series` / `output_column` never read `col`'s value — -// only its presence via a `{ .. }` pattern — so, unlike -// `QueryExpr::output_schema` (which genuinely cannot compile for an -// unresolved DAG — see its own doc), nothing stops these from being generic +// only its presence via a `{ .. }` pattern — so, unlike schema derivation +// (which needs bound positions), nothing stops these from being generic // over every `C`. And a front end constructing `AggIntent` // directly (issue #179) does need `is_per_series` pre-binding — it decides // the `PerEntity`/`Reduce` reduction shape right at construction time (see @@ -529,7 +528,7 @@ impl AggIntent { impl AggIntent { /// Output column name + type produced by this intent over `input`. - /// Used by `QueryExpr::Aggregate`'s schema-derivation rule. The PromQL + /// Used by `NonASAPOp::Aggregate`'s schema-derivation rule. The PromQL /// convention names the column after the intent kind so consumers can /// locate it without an alias lookup. pub fn output_column(&self, input: &Field) -> Field { diff --git a/crates/types/src/pre_asap/canonicalize.rs b/crates/types/src/pre_asap/canonicalize.rs deleted file mode 100644 index b9e6a653a..000000000 --- a/crates/types/src/pre_asap/canonicalize.rs +++ /dev/null @@ -1,782 +0,0 @@ -//! Shared post-lowering canonicalization of the resolved [`QueryExpr`]. -//! -//! Both language front ends funnel through [`resolve_root`](super::resolve::resolve_root), -//! which runs this pass over the resolved DAG. Its job is to erase -//! *structural* differences between semantically identical queries so a -//! post-ASAP binding rule matching on the intent algebra sees one canonical -//! spelling regardless of source language (issue #34). -//! -//! ## Heavy-hitter promotion -//! -//! An additive-ranked "order by the aggregate, take the top k" is a -//! heavy-hitter represented by [`AggIntent::TopK`]. Front ends may -//! emit it as an ordinary `Limit { Sort { … Aggregate } }`; this pass promotes -//! that shape to the canonical -//! -//! ```text -//! Aggregate { reduction: Reduce(), measures: [TopK{k}], -//! child: Aggregate { measures: [Count | Sum], … } } -//! ``` -//! -//! Count supplies unit weights and Sum supplies value weights. Because the -//! match is positional, aliases do not affect it. Other ranked expressions -//! retain Sort + Limit. - -use std::rc::Rc; - -use super::agg_intent::{topk, AggIntent}; -use super::expr_ir::{CompareOpKind, ScalarValue}; -use super::query_expr::{Predicate, QueryExpr, Reduction, SortKey, WindowFuncKind}; -use crate::types::AccuracyTarget; - -/// Rewrite `expr` into its canonical form (bottom-up). Idempotent: a DAG that -/// is already canonical is returned unchanged. -pub fn canonicalize(mut expr: QueryExpr) -> QueryExpr { - canon(&mut expr); - expr -} - -fn canon(expr: &mut QueryExpr) { - // A `Concat` asserting a caller-proven `discriminator_unique_key` (issue - // #228) had that key's `ColumnId`s resolved, in `resolve.rs`, against - // exactly the first branch's output schema *as it stood before this - // pass ran*. `try_promote_additive_top_ranking`/`try_rewrite_rownumber_topk` - // below can restructure that branch (anywhere within it — not only at - // its own top level, since the same recursive walk can rewrite a node - // nested under a pass-through wrapper too) into a shape with a - // different output schema, which would leave those `ColumnId`s - // pointing at the wrong column, or out of bounds, of the - // post-canonicalize schema. Snapshot the schema the discriminator key - // was actually resolved against, right here, before recursing into the - // children — this is the exact DAG state `resolve.rs` saw. - let discriminator_branch_schema_before = match expr { - QueryExpr::Concat { - children, - discriminator_unique_key: Some(_), - } => children.first().and_then(|c| c.output_schema().ok()), - _ => None, - }; - - // Bottom-up: canonicalize every child before matching at this node, so an - // inner heavy-hitter is promoted before an enclosing rewrite inspects it. - for child in children_mut(expr) { - canon(child); - } - - // If the first branch's output schema moved out from under the asserted - // key, the key can no longer be trusted — drop it (never re-derive it by - // guessing at name/position: the two rewrites above don't preserve - // column identity in a way that's safe to infer). A wrong `unique_keys` - // claim is a wrong query answer, not a missed optimization — see - // `ConcatDiscriminatorKey`'s soundness doc — so this errs conservatively: - // any difference at all (not just a column-count/type change) drops the - // key, including the schema becoming undecidable in either direction. - if let QueryExpr::Concat { - children, - discriminator_unique_key: key @ Some(_), - } = expr - { - let discriminator_branch_schema_after = - children.first().and_then(|c| c.output_schema().ok()); - if discriminator_branch_schema_before != discriminator_branch_schema_after { - *key = None; - } - } - - // Local rewrites chain: a `ROW_NUMBER()`-partitioned top-k rewrites to a - // `Limit{Sort}`, which the heavy-hitter rule may then promote to an - // `Aggregate([TopK])`. Each rule strictly simplifies the node, so applying - // them to a fixpoint terminates. - while let Some(rewritten) = - try_rewrite_rownumber_topk(expr).or_else(|| try_promote_additive_top_ranking(expr)) - { - *expr = rewritten; - } -} - -/// A `&mut QueryExpr` out of a child `Rc` — clone-on-write via -/// [`Rc::make_mut`]: free (no clone) while `r` is uniquely owned, which is -/// the overwhelmingly common case (a DAG `canonicalize` was just handed by -/// value); falls back to cloning just *this* node (its own fields — the -/// grandchildren stay shared `Rc`s, not deep-copied) only when some other -/// owner still holds the same `Rc`, e.g. a caller that kept its own clone -/// around (`once.clone()` in `is_idempotent` below — `QueryExpr::clone()` is -/// now a cheap `Rc`-bump, not a deep copy, so that clone shares structure -/// with `once` until a rewrite here needs to touch it). `Rc::get_mut` would -/// panic on exactly that case; `make_mut` degrades to a shallow copy instead -/// of requiring sole ownership as a precondition. Once a workload-level CSE -/// pass runs (issue #212, #222) and canonicalize sees an already-shared -/// sub-DAG from a *different* query, this is also the mechanism that keeps -/// canonicalizing one query from silently corrupting another's view of the -/// same shared node. -fn rc_mut(r: &mut Rc) -> &mut QueryExpr { - Rc::make_mut(r) -} - -/// Mutable references to the direct **operator** `QueryExpr` children of a -/// node — `canon`'s own top-down/bottom-up walk only ever visits the -/// relational skeleton, never descending into a scalar position (`Filter.pred`, -/// `ProjectItem.expr`, …): none of the three rewrite rules rewrite anything -/// inside a scalar sub-DAG, so there's nothing to gain by recursing into one, -/// and every scalar variant (issue #205) hits the catch-all below. -fn children_mut(expr: &mut QueryExpr) -> Vec<&mut QueryExpr> { - use QueryExpr::*; - match expr { - // `PromqlScalarBridge`'s child is a scalar-sub-language node (issue - // #220), not the relational skeleton — same "no children to recurse - // into" treatment as the scalar variants below. - Scan { .. } | EvalTimestamp | CurrentTimestamp | PromqlScalarBridge(_) => vec![], - PromqlVectorFromScalar(c) | PromqlScalarFromVector(c) => vec![rc_mut(c)], - PromqlRelabel { child, .. } - | Filter { child, .. } - | Project { child, .. } - | Aggregate { child, .. } - | Dedup { child, .. } - | PromqlSubquery { child, .. } - | TimeRange { child, .. } - | TimeShift { child, .. } - | SQLWindowFunc { child, .. } - | PromqlSeriesSample { child, .. } - | PromqlInfoEnrich { child, .. } - | Sort { child, .. } - | Limit { child, .. } => vec![rc_mut(child)], - Concat { children, .. } => children.iter_mut().collect(), - Join { left, right, .. } | SetOp { left, right, .. } => { - vec![rc_mut(left), rc_mut(right)] - } - BinaryOp { lhs, rhs, .. } => vec![rc_mut(lhs), rc_mut(rhs)], - Column(_) - | Literal(_) - | Compare { .. } - | BoolAnd(_) - | BoolOr(_) - | Not(_) - | IsNull(_) - | IsNotNull(_) - | Cast { .. } - | InList { .. } - | FunctionCall { .. } - | Arithmetic { .. } - | Case { .. } => vec![], - } -} - -/// Recognise an additive-ranked -/// `Limit { Sort { [Project] Aggregate([Count | Sum]) } }` and rewrite it to -/// the canonical heavy-hitter `Aggregate([TopK])` over the explicit inner -/// aggregate. Returns `None` when the shape does not match. -fn try_promote_additive_top_ranking(expr: &QueryExpr) -> Option { - // Limit k, no offset (an OFFSET means "not the top k"). - let QueryExpr::Limit { - n: k, - offset: 0, - child, - } = expr - else { - return None; - }; - // A single ordering key on a column. - let QueryExpr::Sort { - keys, - partition_by, - child: sort_child, - } = child.as_ref() - else { - return None; - }; - let [SortKey { - expr: QueryExpr::Column(sort_col), - ascending, - .. - }] = keys.as_slice() - else { - return None; - }; - - // The ordered relation is an `Aggregate`, optionally behind a passthrough - // projection (a bare-column SELECT list). Map the sort key through the - // projection to the aggregate's own output column. - let (agg_expr, ranked_col) = match sort_child.as_ref() { - QueryExpr::Project { cols, child, .. } => { - let QueryExpr::Column(underlying) = &cols.get(*sort_col)?.expr else { - return None; - }; - (child.as_ref(), *underlying) - } - other => (other, *sort_col), - }; - - // Exactly one aggregate, ranked by *its* output column — the measure sits at - // index `by.len()` (after the group keys). A `PerEntity` reduction has no - // `by` to rank a measure against — this shape can't be heavy-hitter - // promoted, so it's a non-match rather than an error. - let QueryExpr::Aggregate { - reduction, - measures, - filters, - child: aggregate_child, - .. - } = agg_expr - else { - return None; - }; - let Reduction::Reduce(by) = reduction else { - return None; - }; - let [ranked_agg] = measures.as_slice() else { - return None; - }; - // A heavy-hitter sketch ranks the raw update stream; a filtered measure - // only counts part of it, and no binding rule applies the filter (#466). - if filters.iter().any(Option::is_some) { - return None; - } - if ranked_col != by.len() { - return None; - } - // The heavy-hitter decision — descending, over a measure with a realised - // heavy-hitter sketch — is the shared rule both front ends' promotions - // consult (issue #38). So an ascending additive-ranked limit - // (`ORDER BY COUNT(*) ASC LIMIT k` = bottom-k) stays generic, exactly as - // PromQL `bottomk(k, count_over_time(…))` does. - if !topk::Ranking::from_aggregate(ranked_agg).is_supported(!ascending) { - return None; - } - // A direct Sum is a stream of additive observation weights. A Sum over a - // derived child such as Rate/Increase is different: a heavy-hitter sketch - // may propose candidate membership, but PromQL still requires exact - // reset-aware/extrapolated values to rerank those candidates. The current - // post-ASAP IR has no candidate-sidecar + exact-rerank node, so keep that - // shape as Sort + Limit instead of treating a sketch estimate as final. - if matches!(ranked_agg, AggIntent::Sum { .. }) - && matches!(aggregate_child.as_ref(), QueryExpr::Aggregate { .. }) - { - return None; - } - // Count ranks unit updates; a direct Sum ranks weighted updates. - let accuracy = match ranked_agg { - AggIntent::Count { accuracy } => accuracy.clone(), - AggIntent::Sum { .. } => AccuracyTarget::Exact, - _ => unreachable!("additive ranking gate admitted a non-additive measure"), - }; - - // Outer heavy-hitter `TopK`, grouped by the ranking's partition (empty for a - // global `ORDER BY … LIMIT k`; the `by` labels for a partitioned `topk by`), - // over the unchanged inner additive aggregate. - Some(QueryExpr::Aggregate { - reduction: Reduction::by(partition_by.to_vec()), - measures: vec![AggIntent::TopK { k: *k, accuracy }], - output_names: Vec::new(), - filters: Vec::new(), - having: None, - child: Rc::new(agg_expr.clone()), - }) -} - -/// Recognise the SQL partitioned-top-k idiom — `WHERE rn <= k` over a -/// `ROW_NUMBER() OVER (PARTITION BY p ORDER BY o)` — and rewrite it to the -/// generic partitioned top-k `Limit{k} { Sort{ o, partition_by: p } }` (issue -/// #24). The count-ranked case is then promoted to a heavy-hitter `TopK` by -/// [`try_promote_additive_top_ranking`], so a SQL `ROW_NUMBER` top-k and the PromQL -/// `topk by (…)` it mirrors converge on the same canonical shape. -fn try_rewrite_rownumber_topk(expr: &QueryExpr) -> Option { - // Filter { pred: `Column(rn) <= k` }. - let QueryExpr::Filter { pred, child } = expr else { - return None; - }; - let Predicate(pred_expr) = pred; - let QueryExpr::Compare { left, op, right } = pred_expr.as_ref() else { - return None; - }; - // `rn <= k` (top-k). `rn < k` would be off-by-one; require `<=`. - if *op != CompareOpKind::Le { - return None; - } - let (QueryExpr::Column(rn_col), QueryExpr::Literal(ScalarValue::Int64(k))) = - (left.as_ref(), right.as_ref()) - else { - return None; - }; - if *k < 0 { - return None; - } - - // Optionally strip a passthrough projection (the derived table's SELECT that - // re-exposes the aggregate columns + rn), mapping the rn column through it. - let (wf_expr, rn_in_wf) = match child.as_ref() { - QueryExpr::Project { cols, child, .. } => { - let QueryExpr::Column(underlying) = &cols.get(*rn_col)?.expr else { - return None; - }; - (child.as_ref(), *underlying) - } - other => (other, *rn_col), - }; - - // The filtered column must be a `ROW_NUMBER()` window output — the single - // column the SQLWindowFunc appends after its input, i.e. the last one. - let QueryExpr::SQLWindowFunc { - func: WindowFuncKind::RowNumber, - partition_by, - order_by, - child: inner, - .. - } = wf_expr - else { - return None; - }; - if order_by.is_empty() { - return None; - } - let inner_cols = inner.output_schema().ok()?.fields.len(); - if rn_in_wf != inner_cols { - return None; // the predicate ranks some other column, not the row number - } - - // Generic partitioned top-k. The window's ORDER BY keys are relative to its - // input (`inner`), so they transfer directly to a `Sort` over `inner`. - Some(QueryExpr::Limit { - n: *k as usize, - offset: 0, - child: Rc::new(QueryExpr::Sort { - keys: order_by.clone(), - partition_by: partition_by.clone(), - child: Rc::new(inner.as_ref().clone()), - }), - }) -} - -#[cfg(test)] -mod tests { - use super::*; - use crate::pre_asap::query_expr::{ - GroupKeys, ProjectItem, Source, WindowFrame, WindowFrameBound, WindowFrameOffset, - WindowFrameUnits, - }; - use crate::pre_asap::schema::{DataType, Field, Schema}; - use crate::types::AccuracyTarget; - - fn scan() -> QueryExpr { - QueryExpr::Scan { - source: Source::TimeSeries { metric: "m".into() }, - predicates: vec![], - schema: Schema::with_time_index( - vec![ - Field::plain("ts", DataType::Timestamp, false), - Field::plain("service", DataType::Utf8, false), - Field::plain("value", DataType::Float64, false), - ], - 0, - vec![], - ), - } - } - - /// `Aggregate{ by: [1], [Count] }` over the scan — output cols `[service, count]`. - fn count_by_service() -> QueryExpr { - QueryExpr::Aggregate { - reduction: Reduction::by(vec![1]), - measures: vec![AggIntent::Count { - accuracy: AccuracyTarget::Exact, - }], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(scan()), - } - } - - fn desc(col: usize) -> Vec { - vec![SortKey { - expr: QueryExpr::Column(col), - ascending: false, - nulls_first: false, - }] - } - - fn limit(n: usize, offset: usize, child: QueryExpr) -> QueryExpr { - QueryExpr::Limit { - n, - offset, - child: Rc::new(child), - } - } - - fn sort(keys: Vec, child: QueryExpr) -> QueryExpr { - QueryExpr::Sort { - keys, - partition_by: GroupKeys::by(vec![]), - child: Rc::new(child), - } - } - - fn is_topk_over_count(qe: &QueryExpr) -> bool { - matches!(qe, - QueryExpr::Aggregate { measures, child, .. } - if matches!(measures.as_slice(), [AggIntent::TopK { k: 5, .. }]) - && matches!(child.as_ref(), QueryExpr::Aggregate { measures, .. } - if matches!(measures.as_slice(), [AggIntent::Count { .. }]))) - } - - #[test] - fn promotes_count_ranked_limit_sort() { - // Limit 5 { Sort DESC by count-col (1) { Aggregate[Count] by [1] } }. - let q = limit(5, 0, sort(desc(1), count_by_service())); - assert!(is_topk_over_count(&canonicalize(q))); - } - - // A heavy-hitter sketch ranks every row; a count that only counts some - // rows (#466) is not that, so the generic Sort + Limit stays. - #[test] - fn does_not_promote_a_filtered_count_ranking() { - let mut filtered = count_by_service(); - let QueryExpr::Aggregate { filters, .. } = &mut filtered else { - unreachable!() - }; - *filters = vec![Some(Predicate(Rc::new(QueryExpr::Compare { - left: Rc::new(QueryExpr::Column(2)), - op: CompareOpKind::Gt, - right: Rc::new(QueryExpr::Literal(ScalarValue::Float64(1.0))), - })))]; - let q = limit(5, 0, sort(desc(1), filtered)); - let canonical = canonicalize(q.clone()); - assert!(!is_topk_over_count(&canonical)); - assert_eq!(canonical, q); - } - - #[test] - fn promotes_through_a_passthrough_projection() { - // …with a `SELECT service, count` projection between the Sort and the Agg. - let proj = QueryExpr::Project { - cols: vec![ - ProjectItem { - alias: None, - expr: QueryExpr::Column(0), - }, - ProjectItem { - alias: Some("c".into()), - expr: QueryExpr::Column(1), - }, - ], - qualifier: None, - child: Rc::new(count_by_service()), - }; - let q = limit(5, 0, sort(desc(1), proj)); - assert!(is_topk_over_count(&canonicalize(q))); - } - - #[test] - fn is_idempotent() { - let q = limit(5, 0, sort(desc(1), count_by_service())); - let once = canonicalize(q); - let twice = canonicalize(once.clone()); - assert_eq!(once, twice, "canonicalize must be idempotent"); - } - - // ── Concat's discriminator_unique_key vs. canonicalize (issue #228 review) ── - // - // `resolve.rs` resolves `discriminator_unique_key`'s `ColumnId`s against - // the first branch's *pre-canonicalize* output schema. If canonicalize - // then restructures that branch (heavy-hitter promotion, the - // `ROW_NUMBER()` top-k rewrite), those `ColumnId`s can end up pointing at - // the wrong column — or out of bounds — of the new schema. The two tests - // below pin the fix: the key is dropped whenever the branch's schema - // actually changed, and survives untouched otherwise. Never guessed at. - - #[test] - fn concat_discriminator_key_survives_canonicalize_when_first_branch_is_unaffected() { - // A plain `Aggregate` first branch matches neither rewrite trigger, - // so its schema is identical before and after canonicalize. - let q = QueryExpr::concat_with_discriminator( - vec![count_by_service(), count_by_service()], - /* discriminator */ 0, - /* inner_key */ vec![1], - ); - let QueryExpr::Concat { - discriminator_unique_key, - .. - } = canonicalize(q) - else { - panic!("expected Concat"); - }; - assert!( - discriminator_unique_key.is_some(), - "an untouched first branch's discriminator key must survive canonicalize" - ); - } - - #[test] - fn concat_discriminator_key_is_dropped_when_first_branch_gets_rewritten() { - // The first branch is exactly the heavy-hitter promotion trigger — - // `Limit{Sort{Aggregate([Count])}}`, with an empty (global) - // `partition_by` — so canonicalize rewrites it in place to - // `Aggregate{TopK}`, whose own output is a single column, not the - // original two (`[service, count]`). A discriminator key resolved - // against the original 2-column shape (`discriminator` = `service` - // at index 0, `inner_key` = `count` at index 1) must not silently - // survive pointing at the new 1-column schema. - let promotable_branch = limit(5, 0, sort(desc(1), count_by_service())); - let q = QueryExpr::concat_with_discriminator( - vec![promotable_branch, count_by_service()], - /* discriminator */ 0, - /* inner_key */ vec![1], - ); - let QueryExpr::Concat { - children, - discriminator_unique_key, - } = canonicalize(q) - else { - panic!("expected Concat"); - }; - assert!( - is_topk_over_count(&children[0]), - "the first branch is still promoted normally" - ); - assert!( - discriminator_unique_key.is_none(), - "a stale discriminator key must be dropped, never silently kept wrong" - ); - } - - #[test] - fn does_not_promote_ascending_sort() { - // Ascending = bottom-k: the Top-K operator's ranking rule - // rejects it (needs descending), so it stays a generic Sort+Limit — the - // same call PromQL `bottomk` makes (issue #38). - let asc = vec![SortKey { - expr: QueryExpr::Column(1), - ascending: true, - nulls_first: false, - }]; - let q = limit(5, 0, sort(asc, count_by_service())); - assert!(!is_topk_over_count(&canonicalize(q))); - } - - #[test] - fn does_not_promote_with_offset() { - let q = limit(5, 2, sort(desc(1), count_by_service())); - assert!(!is_topk_over_count(&canonicalize(q))); - } - - #[test] - fn does_not_promote_ranking_by_a_group_key() { - // DESC by col 0 (the `service` group key), not the count → not a - // frequency heavy-hitter. - let q = limit(5, 0, sort(desc(0), count_by_service())); - assert!(!is_topk_over_count(&canonicalize(q))); - } - - #[test] - fn promotes_sum_ranked_limit_sort_as_weighted_heavy_hitter() { - let sum = QueryExpr::Aggregate { - reduction: Reduction::by(vec![1]), - measures: vec![AggIntent::Sum { col: None }], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(scan()), - }; - let q = limit(5, 0, sort(desc(1), sum)); - let out = canonicalize(q); - let QueryExpr::Aggregate { - measures, child, .. - } = out - else { - panic!("expected weighted TopK aggregate"); - }; - assert!(matches!( - measures.as_slice(), - [AggIntent::TopK { k: 5, .. }] - )); - assert!( - matches!(child.as_ref(), QueryExpr::Aggregate { measures, .. } - if matches!(measures.as_slice(), [AggIntent::Sum { .. }])) - ); - } - - #[test] - fn keeps_sum_over_counter_reduction_as_exact_value_ranking() { - for counter in [AggIntent::Rate, AggIntent::Increase] { - let derived = QueryExpr::Aggregate { - reduction: Reduction::PerEntity, - measures: vec![counter], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(scan()), - }; - let sum = QueryExpr::Aggregate { - reduction: Reduction::by(vec![1]), - measures: vec![AggIntent::Sum { col: None }], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(derived), - }; - let out = canonicalize(limit(5, 0, sort(desc(1), sum))); - assert!(matches!(out, QueryExpr::Limit { child, .. } - if matches!(child.as_ref(), QueryExpr::Sort { child, .. } - if matches!(child.as_ref(), QueryExpr::Aggregate { measures, child, .. } - if matches!(measures.as_slice(), [AggIntent::Sum { .. }]) - && matches!(child.as_ref(), QueryExpr::Aggregate { .. }))))); - } - } - - // ── ROW_NUMBER() partitioned top-k (issue #24) ────────────────────────── - - /// A scan with `[ts, service, region, value]`. - fn scan4() -> QueryExpr { - QueryExpr::Scan { - source: Source::TimeSeries { metric: "m".into() }, - predicates: vec![], - schema: Schema::with_time_index( - vec![ - Field::plain("ts", DataType::Timestamp, false), - Field::plain("service", DataType::Utf8, false), - Field::plain("region", DataType::Utf8, false), - Field::plain("value", DataType::Float64, false), - ], - 0, - vec![], - ), - } - } - - /// `Aggregate{ by: [1,2] (service, region), [agg] }` — output `[service, - /// region, ]` (3 cols), so a ROW_NUMBER over it appends `rn` at index 3. - fn grouped(agg: AggIntent) -> QueryExpr { - QueryExpr::Aggregate { - reduction: Reduction::by(vec![1, 2]), - measures: vec![agg], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(scan4()), - } - } - - /// `ROW_NUMBER` ignores its frame clause, so the top-k rewrite doesn't care - /// what's in it; any concrete frame works as fixture data. - fn rownumber_frame() -> WindowFrame { - WindowFrame { - units: WindowFrameUnits::Rows, - start_bound: WindowFrameBound::Preceding(WindowFrameOffset::Scalar(ScalarValue::Null)), - end_bound: WindowFrameBound::Following(WindowFrameOffset::Scalar(ScalarValue::Null)), - } - } - - /// `Filter{ rn(3) <= 5 } { SQLWindowFunc{ RowNumber, PARTITION BY region(2), - /// ORDER BY col(2) DESC } { agg } }`. - fn rownumber_topk(agg: QueryExpr) -> QueryExpr { - let wf = QueryExpr::SQLWindowFunc { - func: WindowFuncKind::RowNumber, - args: vec![], - partition_by: GroupKeys::by(vec![2]), // region - order_by: vec![SortKey { - expr: QueryExpr::Column(2), // the aggregate output column - ascending: false, - nulls_first: true, - }], - frame: Some(rownumber_frame()), - output_name: "rn".into(), - child: Rc::new(agg), - }; - QueryExpr::Filter { - pred: Predicate(Rc::new(QueryExpr::Compare { - left: Rc::new(QueryExpr::Column(3)), // rn = the appended window column - op: CompareOpKind::Le, - right: Rc::new(QueryExpr::Literal(ScalarValue::Int64(5))), - })), - child: Rc::new(wf), - } - } - - #[test] - fn rownumber_count_topk_becomes_a_partitioned_heavy_hitter() { - // Count-ranked ROW_NUMBER top-k → outer TopK grouped by the partition - // (region, col 2) over the explicit inner Count. - let q = rownumber_topk(grouped(AggIntent::Count { - accuracy: AccuracyTarget::Exact, - })); - let out = canonicalize(q); - let QueryExpr::Aggregate { - reduction, - measures, - child, - .. - } = &out - else { - panic!("expected outer Aggregate([TopK]), got {out:?}"); - }; - let Reduction::Reduce(by) = reduction else { - panic!("expected a Reduce grouping, got {reduction:?}"); - }; - assert!(matches!( - measures.as_slice(), - [AggIntent::TopK { k: 5, .. }] - )); - assert_eq!(**by, vec![2], "outer TopK partitioned by region"); - assert!( - matches!(child.as_ref(), QueryExpr::Aggregate { measures, .. } - if matches!(measures.as_slice(), [AggIntent::Count { .. }])) - ); - } - - #[test] - fn rownumber_avg_topk_becomes_a_partitioned_sort_limit() { - // Avg-ranked (not a frequency heavy-hitter) → generic partitioned - // top-k: Limit{5}{ Sort{ partition_by: [region] } }. - let q = rownumber_topk(grouped(AggIntent::Avg { col: None })); - let out = canonicalize(q); - let QueryExpr::Limit { n, child, .. } = &out else { - panic!("expected a Limit, got {out:?}"); - }; - assert_eq!(*n, 5); - let QueryExpr::Sort { - partition_by, - child, - .. - } = child.as_ref() - else { - panic!("expected a Sort under the Limit"); - }; - assert_eq!(**partition_by, vec![2], "partitioned by region"); - assert!( - matches!(child.as_ref(), QueryExpr::Aggregate { measures, .. } - if matches!(measures.as_slice(), [AggIntent::Avg { .. }])) - ); - } - - #[test] - fn filter_on_a_non_rownumber_column_is_left_alone() { - // `WHERE service_len <= 5` (col 0, not the rn window column) must not be - // mistaken for a top-k. - let wf = QueryExpr::SQLWindowFunc { - func: WindowFuncKind::RowNumber, - args: vec![], - partition_by: GroupKeys::by(vec![2]), - order_by: vec![SortKey { - expr: QueryExpr::Column(2), - ascending: false, - nulls_first: true, - }], - frame: Some(rownumber_frame()), - output_name: "rn".into(), - child: Rc::new(grouped(AggIntent::Count { - accuracy: AccuracyTarget::Exact, - })), - }; - let q = QueryExpr::Filter { - pred: Predicate(Rc::new(QueryExpr::Compare { - left: Rc::new(QueryExpr::Column(0)), // NOT the rn column (index 3) - op: CompareOpKind::Le, - right: Rc::new(QueryExpr::Literal(ScalarValue::Int64(5))), - })), - child: Rc::new(wf), - }; - assert!( - matches!(canonicalize(q), QueryExpr::Filter { .. }), - "left as a Filter" - ); - } -} diff --git a/crates/types/src/pre_asap/column_resolution.rs b/crates/types/src/pre_asap/column_resolution.rs index cfafbe9e0..e2d8120d6 100644 --- a/crates/types/src/pre_asap/column_resolution.rs +++ b/crates/types/src/pre_asap/column_resolution.rs @@ -1,22 +1,13 @@ //! Schema-driven column resolution. //! -//! Front ends (issue #179) emit `ColumnRef` (name-based, optionally -//! table-qualified); the canonical DAG uses positional [`ColumnId`] resolved -//! against a per-node [`Schema`]. These helpers bridge the two — the -//! [`SchemaResolver`](super::schema_resolver) builds the schema, and [`resolve_column_refs`] -//! turns name-based refs (group keys, dedup columns) into positional ids, -//! qualifier-aware. - -use std::rc::Rc; +//! Front ends emit `ColumnRef` (name-based, optionally table-qualified); the +//! IR uses positional [`ColumnId`] resolved against a per-node [`Schema`]. +//! These helpers turn name-based refs into positional ids, qualifier-aware. +//! Front-end name resolution (`asap_frontend_common::resolve`) calls them. use thiserror::Error; -use super::agg_intent::AggIntent; use super::expr_ir::ColumnRef; -use super::query_expr::{ - aggregate_output_schema, GroupKeys, QueryExpr, QueryExprError, Reduction, ResolvedQueryExpr, - UnresolvedQueryExpr, -}; use super::schema::{ColumnId, DataType, FieldDataType, Schema}; /// Errors returned by the resolution helpers. @@ -115,102 +106,6 @@ pub fn resolve_group_keys_promql( .collect() } -/// Resolve a name-based scalar [`UnresolvedQueryExpr`] (one of `QueryExpr`'s scalar -/// variants, issue #205) into a positional [`ResolvedQueryExpr`] by resolving every -/// column reference against `schema`. Structural otherwise. `expr` must be -/// one of the scalar variants — an operator variant here is a construction -/// bug, not a shape this needs to handle silently. -pub fn resolve_expr( - expr: &UnresolvedQueryExpr, - schema: &Schema, -) -> Result { - let rc = |e: &UnresolvedQueryExpr| -> Result, ResolveError> { - Ok(Rc::new(resolve_expr(e, schema)?)) - }; - let each = |es: &[UnresolvedQueryExpr]| -> Result, ResolveError> { - es.iter().map(|e| resolve_expr(e, schema)).collect() - }; - Ok(match expr { - QueryExpr::Column(c) => QueryExpr::Column(resolve_column_ref(c, schema)?), - QueryExpr::Literal(s) => QueryExpr::Literal(s.clone()), - QueryExpr::EvalTimestamp => QueryExpr::EvalTimestamp, - QueryExpr::CurrentTimestamp => QueryExpr::CurrentTimestamp, - QueryExpr::Compare { left, op, right } => QueryExpr::Compare { - left: rc(left)?, - op: op.clone(), - right: rc(right)?, - }, - QueryExpr::BoolAnd(v) => QueryExpr::BoolAnd(each(v)?), - QueryExpr::BoolOr(v) => QueryExpr::BoolOr(each(v)?), - QueryExpr::Not(e) => QueryExpr::Not(rc(e)?), - QueryExpr::IsNull(e) => QueryExpr::IsNull(rc(e)?), - QueryExpr::IsNotNull(e) => QueryExpr::IsNotNull(rc(e)?), - QueryExpr::Cast { expr, to, try_cast } => QueryExpr::Cast { - expr: rc(expr)?, - to: to.clone(), - try_cast: *try_cast, - }, - QueryExpr::InList { - expr, - list, - negated, - } => QueryExpr::InList { - expr: rc(expr)?, - list: each(list)?, - negated: *negated, - }, - QueryExpr::FunctionCall { name, args } => QueryExpr::FunctionCall { - name: name.clone(), - args: each(args)?, - }, - QueryExpr::Arithmetic { op, left, right } => QueryExpr::Arithmetic { - op: op.clone(), - left: rc(left)?, - right: rc(right)?, - }, - QueryExpr::Case { - operand, - branches, - else_expr, - } => QueryExpr::Case { - operand: operand.as_deref().map(rc).transpose()?, - branches: branches - .iter() - .map(|(w, t)| Ok((resolve_expr(w, schema)?, resolve_expr(t, schema)?))) - .collect::, ResolveError>>()?, - else_expr: else_expr.as_deref().map(rc).transpose()?, - }, - other => unreachable!("resolve_expr called on a non-scalar QueryExpr variant: {other:?}"), - }) -} - -/// Output schema produced by an `Aggregate { by, measures }` over `input`. -/// Mirrors `QueryExpr::output_schema_in`'s `Aggregate` arm; out-of-range `by` -/// ids are silently dropped (callers needing the strict check resolve `by` -/// via [`resolve_column_refs`], which surfaces `NotFound`). -pub fn output_schema_for_aggregate( - input: &Schema, - by: &GroupKeys, - measures: &[AggIntent], - output_names: &[String], -) -> Result { - // Delegate to the single canonical derivation so HAVING resolution can never - // drift from `QueryExpr::output_schema_in` (issue #41). HAVING is SQL-only - // and cross-series (SQL has no `without`), but detect the child-independent - // per-entity case anyway (a lone `rate`/`increase`/`*_over_time` intent) so - // the two agree on every shared input — the range-window child marker the - // canonical arm also keys off is not visible here, and never co-occurs with - // HAVING. - let per_entity = - by.is_empty() && !by.is_without() && measures.len() == 1 && measures[0].is_per_series(); - let reduction = if per_entity { - Reduction::PerEntity - } else { - Reduction::Reduce(by.clone()) - }; - aggregate_output_schema(input, &reduction, measures, output_names) -} - #[cfg(test)] mod tests { use super::*; @@ -326,77 +221,4 @@ mod tests { Err(ResolveError::NotFound { .. }) )); } - - #[test] - fn aggregate_strips_time_and_keeps_unique_keys() { - let mut input = ts_value_schema(); - input - .fields - .push(Field::plain("host", DataType::Utf8, false)); - let out = output_schema_for_aggregate( - &input, - &GroupKeys::by(vec![2]), - &[AggIntent::Sum { col: None }], - &[], - ) - .expect("valid group-by column"); - assert_eq!(out.fields.len(), 2); // host, sum - assert_eq!(out.fields[0].name, "host"); - assert_eq!(out.fields[1].name, "sum"); - assert!(out.time_index.is_none()); - assert_eq!(out.unique_keys, vec![vec![0]]); - } - - #[test] - fn having_schema_agrees_with_canonical_for_a_per_series_reduction() { - // Issue #41: `output_schema_for_aggregate` (HAVING resolution) and the - // canonical `QueryExpr::output_schema_in` must produce identical schemas - // for the same aggregate. Before the dedup this diverged on a per-series - // reduction — the HAVING mirror lacked the per-series branch and would - // collapse `[ts, value]` to a single `rate` column. - use crate::pre_asap::query_expr::Source; - use std::time::Duration; - - let leaf_schema = Schema::with_time_index( - vec![ - Field::plain("ts", DataType::Timestamp, false), - Field::plain("value", DataType::Float64, false), - ], - 0, - vec![], - ); - let scan = QueryExpr::Scan { - source: Source::TimeSeries { metric: "m".into() }, - predicates: vec![], - schema: leaf_schema.clone(), - }; - // Aggregate{ reduction: PerEntity, [Rate], child: TimeRange{ Scan } } — - // a per-series reduction (label-preserving). - let agg = QueryExpr::Aggregate { - reduction: Reduction::PerEntity, - measures: vec![AggIntent::Rate], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(QueryExpr::TimeRange { - range: Duration::from_secs(300), - child: Rc::new(scan), - }), - }; - let canonical = agg.output_schema().expect("canonical schema"); - - // The HAVING-resolution derivation gets only the input schema (the - // TimeRange passes the leaf schema through). - let having_side = - output_schema_for_aggregate(&leaf_schema, &GroupKeys::none(), &[AggIntent::Rate], &[]) - .unwrap(); - - assert_eq!( - canonical, having_side, - "the two aggregate-schema derivations must agree (issue #41)" - ); - // Sanity: it really is the label-preserving per-series shape, not `[rate]`. - assert!(having_side.fields.iter().any(|c| c.name == "value")); - assert!(having_side.time_index.is_some()); - } } diff --git a/crates/types/src/pre_asap/cse.rs b/crates/types/src/pre_asap/cse.rs deleted file mode 100644 index 0a00475e6..000000000 --- a/crates/types/src/pre_asap/cse.rs +++ /dev/null @@ -1,1111 +0,0 @@ -//! Pre-ASAP structural common-subexpression elimination: bottom-up -//! hash-consing over an already-`resolve_root`'d [`QueryExpr`] DAG (issue -//! #212, #222, #223). -//! -//! CSE only runs on an already-bound, already-canonicalized DAG — -//! structural matching is meaningless before canonicalization has converged -//! semantically-equivalent queries onto one shape (`docs/develop_docs/pre-asap-ir.md` -//! design principle 3; `median(latency)` and `approx_percentile_cont(latency, -//! 0.5)` already lower to an identical `AggIntent::Quantile` today, per -//! `sql_lowering.rs`'s `median_is_the_same_intent_as_an_explicit_half_percentile` -//! test). [`share_common_sub_dags`] is the single entry point, run once per -//! workload batch (or once per query — see "Single-query CSE" below) *after* -//! `resolve_root`, *before* the pre-ASAP → post-ASAP replacement/search pass -//! (`asap_aware_mapping::replacement`). -//! -//! ## Algorithm: classic hash-consing / value-numbering -//! -//! Bottom-up: every child is interned before its parent, so a parent's -//! candidacy for sharing naturally incorporates whether its own children were -//! themselves shared — two parents whose children were independently -//! deduplicated down to the same `Rc`s are structurally identical iff their -//! own fields also match, without re-walking the sub-DAGs. -//! -//! Only the **relational skeleton** participates — the same set of "operator" -//! children [`canonicalize`](super::canonicalize)'s `children_mut` walks -//! (`Filter`/`Project`/`Aggregate`/`Concat`/`Join`/`BinaryOp`/…). A scalar -//! subexpression reachable only through a wrapper position (`Predicate`, -//! `ProjectItem.expr`, `Aggregate.having`, `SQLWindowFunc.args`, …) stays -//! embedded as opaque data on its owning operator node, compared by -//! `QueryExpr`'s derived `PartialEq` along with the rest of that node's -//! fields, rather than separately hash-consed — the same scope -//! `canonicalize.rs` settled on ("none of the rewrite rules touch a scalar -//! sub-DAG, so there's nothing to gain by recursing into one"). Widening this -//! to scalar positions is future work, not attempted here. -//! -//! ## Correctness: hash is a filter, `PartialEq` is the decision -//! -//! This is the one non-negotiable rule. A **false positive** here — two -//! sub-DAGs wrongly judged shareable — is a wrong query answer, not a missed -//! optimization: two different queries would read each other's data. -//! [`structural_hash`] (`DefaultHasher`/SipHash over a canonical -//! serialization, no collision-freedom guarantee) may only narrow the -//! candidate set within one bucket; [`InternTable::intern`]'s `PartialEq` -//! check on that bucket is what actually decides sharing, every time, no -//! exceptions for "the hash probably didn't collide." -//! -//! This also means the pass is safe by construction against the case #212 -//! flagged as a real historical bug (issue #115): `AggIntent::Quantile` -//! carries its input column and its `AccuracyTarget`, both `PartialEq` -//! fields, so `Quantile(x, 0.99, ε=0.01)` and `Quantile(x, 0.99, ε=0.001)` — -//! or `Quantile(x, ..)` vs `Quantile(y, ..)` — are never merged. This is -//! intentionally conservative: it only recognizes *exact* structural -//! matches, not "a stricter-accuracy summary could also answer a looser -//! request." That subsumption question already has a documented, -//! deliberately-unfilled home (`asap_aware_mapping::Matcher`) — -//! CSE here does not attempt it. -//! -//! ## Legality: gated by `Schema::unique_keys` -//! -//! Structural equality alone is necessary but not sufficient. Per -//! [`Schema::unique_keys`](super::schema::Schema::unique_keys)'s own doc: "a -//! producer's output can only be safely shared across consumers when its row -//! identity is provably stable across reads." A candidate node with no -//! provable unique key (`Schema::has_unique_key()` false, or `output_schema` -//! not even defined for that node, e.g. a `Concat`/`SetOp` branch whose union -//! drops `unique_keys`, or an ungrouped/global `Aggregate`, whose empty `by` -//! also reports no unique key today) is **never** hoisted, even when it is -//! structurally identical to something already interned — it is always -//! inserted fresh, matching the rule the (now-deleted) prior CSE attempt -//! already encoded and the doc comment on `Aggregate`'s `child` field -//! ("`unique_keys` feeds CSE's producer-sharing legality check"). -//! -//! ## Single-query CSE falls out for free -//! -//! A repeated sub-expression within *one* query (e.g. the same grouped -//! `Aggregate` referenced twice on two `BinaryOp` branches) is deduplicated -//! by the exact same bottom-up interning — a workload of size one still -//! interns bottom-up within that one DAG. No separate mechanism is needed; -//! see the `single_query_shares_its_own_repeated_sub_dag` test below. -//! -//! ## Landing plan (issue #223) -//! -//! This module is stage 1 of a 4-stage plan. Stage 2 -//! (`asap_aware_mapping::replacement::search_workload_with`, which runs -//! [`share_common_sub_dags`] itself before searching) is a real caller, -//! wired at the same time so this never becomes unwired dead code again -//! (the original `asap-plan::cse::dedupe_subtrees` was deleted in #192 for -//! exactly that). Stage 3 — [`dag_export`](crate::dag_export) computing its -//! per-node `hash` by calling this module's [`structural_hash`] directly, -//! instead of a parallel reimplementation — is also done, so -//! `tools/dag-viewer`'s "shared sub-DAG" highlighting now flags exactly the -//! candidate pairs this module's own `InternTable` would bucket together -//! (still only a hash match, not a guarantee of -//! `share_common_sub_dags`-actual sharing — see `dag_export`'s module doc). -//! Stage 4 (issue #237) is implemented in -//! `asap_aware_mapping::cost_model::CostModel::cse_share_decision`, called -//! from `asap_aware_mapping::replacement::CandidateLogicalASAPDAGs::cost_sorted` (via that -//! module's own `cse_preference`) — a real, Volcano/Cascades-style cost -//! comparison over what this module detects, not a fixed rule. See -//! `docs/design_docs/cost-model.md`. This module's own -//! unconditional "share whenever legal" behavior is unchanged: detection -//! stays cost-agnostic by construction (this crate cannot depend on -//! `asap-aware-mapping`'s `CostModel`), and the cost-aware decision is -//! applied downstream, after detection, over what this module finds. - -use std::collections::HashMap; -use std::hash::{Hash, Hasher}; -use std::rc::Rc; - -use super::query_expr::QueryExpr; - -/// Bottom-up hash-consing table: structurally-equal, sharing-legal -/// [`QueryExpr`] nodes collapse onto one `Rc`. -/// -/// `buckets` is keyed by [`structural_hash`] — a coarse candidate filter -/// only (see the module-level "Correctness" section). Every entry within one -/// bucket is a full node kept around for the `PartialEq` comparison that -/// actually decides a match; a hash collision between structurally different -/// nodes just means a (harmless) linear scan of a few extra candidates. -struct InternTable { - buckets: HashMap>>, - /// Memoizes [`structural_hash`] per already-hashed `Rc` pointer, shared - /// across every [`intern`](Self::intern) call for the table's whole - /// lifetime — see [`structural_hash`]'s own doc on why this matters: - /// without it, hashing an `N`-node bottom-up pass costs `O(N)` work - /// *per node* (every already-interned descendant gets re-walked), not - /// `O(1)` amortized. - hash_cache: HashCache, -} - -impl InternTable { - fn new() -> Self { - Self { - buckets: HashMap::new(), - hash_cache: HashMap::new(), - } - } - - /// Intern one already-children-rebuilt node: look it up by - /// [`structural_hash`], confirm with `PartialEq`, and — only when - /// sharing is legal (see "Legality" above) — return the existing `Rc` - /// instead of allocating a new one. - fn intern(&mut self, node: QueryExpr) -> Rc { - let hash = structural_hash(&node, &mut self.hash_cache); - // A node with no provable unique key is never *returned* as a match - // for something else — it may still go on to occupy a fresh slot in - // the bucket (harmless; it just never gets found by a later - // `PartialEq` scan that also requires `reusable`). - let reusable = node - .output_schema() - .is_ok_and(|schema| schema.has_unique_key()); - let bucket = self.buckets.entry(hash).or_default(); - if reusable { - if let Some(existing) = bucket.iter().find(|candidate| candidate.as_ref() == &node) { - return Rc::clone(existing); - } - } - let rc = Rc::new(node); - bucket.push(Rc::clone(&rc)); - rc - } -} - -/// [`structural_hash`]'s memoization cache: maps an already-hashed node's -/// `Rc` pointer to its computed hash. Not tied to any one `QueryExpr` — a -/// fresh, empty cache is correct to start with anywhere; what matters is -/// letting it *persist* across every node in one bottom-up pass (as -/// [`InternTable`] does via its own `hash_cache` field), rather than -/// starting a new one per call. -/// -/// `pub` (not `pub(crate)`) so `asap_aware_mapping`'s workload-search MEMO -/// engine (`replacement::is_duplicate_rewrite`) can reuse this exact -/// candidate-narrowing filter for its own dedup, instead of maintaining a -/// parallel reimplementation — the same "one real hash, reused everywhere -/// it's needed" rationale [`structural_hash`]'s own doc gives for -/// [`dag_export`](crate::dag_export)'s `pub(crate)` reuse. -pub type HashCache = HashMap<*const QueryExpr, u64>; - -/// Coarse structural hash used only to bucket [`InternTable::intern`]'s -/// candidate search — never the actual sharing decision (`PartialEq` is). -/// -/// `QueryExpr` carries `f64`s (`Literal(ScalarValue::Float64)`, `AggIntent::Quantile.q`, …), so it -/// cannot derive `std::hash::Hash`. Serializing to a canonical JSON string -/// and hashing that sidesteps the `f64` problem — but only for `node`'s own -/// tag and non-child fields, *not* its children's full values: each -/// `Rc`-backed child's contribution is its own [`structural_hash`], looked -/// up in `cache` if already computed there (memoized by `Rc` pointer -/// identity) rather than recursed into again. -/// -/// This is the DAG-aware fix a naive "just serialize the whole sub-DAG" -/// hash would get wrong: after [`share_common_sub_dags`] (or even before -/// it — a front end can emit internal `Rc` sharing directly, e.g. a -/// repeated subexpression within one query), `node` generally has internal -/// sharing. A full-sub-DAG serialization re-serializes — re-walks — -/// any descendant `node` already shares internally once per parent that -/// references it; called once per node in a bottom-up pass (as -/// [`InternTable::intern`] and [`dag_export`](crate::dag_export) both do), -/// that costs `O(sub-DAG size)` *per node* instead of `O(1)` amortized — -/// quadratic-or-worse for a deep chain, compounding further with any real -/// internal sharing. Memoizing each child's hash by pointer identity in -/// `cache` (persisted across the whole pass by the caller, not reset per -/// node) makes each node's own contribution `O(1)` beyond its children's -/// already-known hashes, giving `O(N)` total for `N` nodes — matching -/// [`dag_node_count`]'s own shared-node counting fix (issue #212/#223/#237's stage -/// 4) in spirit, applied to hashing instead of counting. -/// -/// `pub` (not private) so [`dag_export`](crate::dag_export) can call -/// this exact function for its exported nodes' `hash` field instead of -/// maintaining its own parallel reimplementation — issue #223 stage 3. That -/// makes `tools/dag-viewer`'s "shared sub-DAG" highlighting reflect this -/// module's real hashing, not a lookalike computed a different way; see the -/// module doc's "Landing plan" section. A NaN/infinite `f64` makes JSON -/// serialization fail; falling back to a fixed hash just puts every such -/// node in one (larger, still `PartialEq`-disambiguated) bucket. Made `pub` -/// (rather than staying `pub(crate)`) for one more reuse across the crate -/// boundary: `asap_aware_mapping`'s workload-search MEMO engine -/// (`replacement::is_duplicate_rewrite`) needs the identical -/// candidate-narrowing filter this module's own [`InternTable::intern`] -/// already uses, so it doesn't have to reinvent (and risk drifting from) it. -/// -/// Exhaustive over every `QueryExpr` variant, matching [`rebuild_children`] -/// in which fields count as an operator child (must stay in sync — a new -/// variant fails to compile in both places until both are extended). -pub fn structural_hash(node: &QueryExpr, cache: &mut HashCache) -> u64 { - use QueryExpr::*; - - fn child_hash(child: &Rc, cache: &mut HashCache) -> u64 { - let ptr = Rc::as_ptr(child); - if let Some(&h) = cache.get(&ptr) { - return h; - } - let h = structural_hash(child, cache); - cache.insert(ptr, h); - h - } - - /// Hash `own_fields` (this node's own tag and non-child scalar - /// fields — anything JSON-serializable and small, i.e. never a - /// `QueryExpr` sub-DAG) via the same canonical-JSON-string trick the - /// whole-sub-DAG version used, just applied to `O(1)` fields instead - /// of `O(sub-DAG size)`. - fn hash_own_fields(hasher: &mut impl Hasher, own_fields: &impl serde::Serialize) { - serde_json::to_string(own_fields) - .unwrap_or_default() - .hash(hasher); - } - - let mut hasher = std::collections::hash_map::DefaultHasher::new(); - match node { - Scan { - source, - predicates, - schema, - } => hash_own_fields(&mut hasher, &("Scan", source, predicates, schema)), - PromqlVectorFromScalar(c) => { - "PromqlVectorFromScalar".hash(&mut hasher); - child_hash(c, cache).hash(&mut hasher); - } - PromqlScalarFromVector(c) => { - "PromqlScalarFromVector".hash(&mut hasher); - child_hash(c, cache).hash(&mut hasher); - } - PromqlRelabel { dst, value, child } => { - hash_own_fields(&mut hasher, &("PromqlRelabel", dst, value)); - child_hash(child, cache).hash(&mut hasher); - } - PromqlInfoEnrich { selector, child } => { - hash_own_fields(&mut hasher, &("PromqlInfoEnrich", selector)); - child_hash(child, cache).hash(&mut hasher); - } - PromqlSeriesSample { by, kind, child } => { - hash_own_fields(&mut hasher, &("PromqlSeriesSample", by, kind)); - child_hash(child, cache).hash(&mut hasher); - } - Filter { pred, child } => { - hash_own_fields(&mut hasher, &("Filter", pred)); - child_hash(child, cache).hash(&mut hasher); - } - Project { - cols, - qualifier, - child, - } => { - hash_own_fields(&mut hasher, &("Project", cols, qualifier)); - child_hash(child, cache).hash(&mut hasher); - } - Aggregate { - reduction, - measures, - output_names, - filters, - having, - child, - } => { - hash_own_fields( - &mut hasher, - &( - "Aggregate", - reduction, - measures, - output_names, - filters, - having, - ), - ); - child_hash(child, cache).hash(&mut hasher); - } - Dedup { cols, child } => { - hash_own_fields(&mut hasher, &("Dedup", cols)); - child_hash(child, cache).hash(&mut hasher); - } - Concat { - children, - discriminator_unique_key, - } => { - hash_own_fields(&mut hasher, &("Concat", discriminator_unique_key)); - for c in children { - // Stored by value, not `Rc` — see `rebuild_children`'s - // `intern_owned` use for this variant — so there's no - // pointer to memoize on here; recurse directly. Any - // `Rc`-typed descendant beneath `c` still gets memoized - // once this call reaches it. - structural_hash(c, cache).hash(&mut hasher); - } - } - Join { - kind, - pred, - left, - right, - } => { - hash_own_fields(&mut hasher, &("Join", kind, pred)); - child_hash(left, cache).hash(&mut hasher); - child_hash(right, cache).hash(&mut hasher); - } - SetOp { - kind, - all, - left, - right, - } => { - hash_own_fields(&mut hasher, &("SetOp", kind, all)); - child_hash(left, cache).hash(&mut hasher); - child_hash(right, cache).hash(&mut hasher); - } - Sort { - keys, - partition_by, - child, - } => { - hash_own_fields(&mut hasher, &("Sort", keys, partition_by)); - child_hash(child, cache).hash(&mut hasher); - } - Limit { n, offset, child } => { - hash_own_fields(&mut hasher, &("Limit", n, offset)); - child_hash(child, cache).hash(&mut hasher); - } - PromqlSubquery { - range, - resolution, - child, - } => { - hash_own_fields(&mut hasher, &("PromqlSubquery", range, resolution)); - child_hash(child, cache).hash(&mut hasher); - } - TimeRange { range, child } => { - hash_own_fields(&mut hasher, &("TimeRange", range)); - child_hash(child, cache).hash(&mut hasher); - } - TimeShift { shift, child } => { - hash_own_fields(&mut hasher, &("TimeShift", shift)); - child_hash(child, cache).hash(&mut hasher); - } - SQLWindowFunc { - func, - args, - partition_by, - order_by, - frame, - output_name, - child, - } => { - hash_own_fields( - &mut hasher, - &( - "SQLWindowFunc", - func, - args, - partition_by, - order_by, - frame, - output_name, - ), - ); - child_hash(child, cache).hash(&mut hasher); - } - BinaryOp { - op, - lhs, - rhs, - vector_match, - } => { - hash_own_fields(&mut hasher, &("BinaryOp", op, vector_match)); - child_hash(lhs, cache).hash(&mut hasher); - child_hash(rhs, cache).hash(&mut hasher); - } - // `EvalTimestamp`, `PromqlScalarBridge`, and the scalar variants - // (issue #205) are all leaves for this traversal's purposes — none - // has an operator child to look up in `cache` — so hashing the - // whole node via `serde_json` in one shot is already `O(node - // size)`, not `O(sub-DAG size)`: exactly the same cost the - // per-variant `hash_own_fields` calls above pay, just without - // needing to spell out each field individually. Matches - // `rebuild_children`'s and `dag_node_count`'s identical scope - // decision for these variants ("never descended into"). - EvalTimestamp - | CurrentTimestamp - | PromqlScalarBridge(_) - | Column(_) - | Literal(_) - | Compare { .. } - | BoolAnd(_) - | BoolOr(_) - | Not(_) - | IsNull(_) - | IsNotNull(_) - | Cast { .. } - | InList { .. } - | FunctionCall { .. } - | Arithmetic { .. } - | Case { .. } => hash_own_fields(&mut hasher, node), - } - hasher.finish() -} - -/// Count of *unique* nodes reachable from `root`, deduplicated by `Rc` -/// pointer identity (`Rc::as_ptr`) — the real size of the DAG rooted at -/// `root`, not a per-path walk count. -/// -/// After [`share_common_sub_dags`] runs (or even before it, for a DAG a -/// front end already built with internal `Rc` sharing — e.g. re-running -/// CSE, or a single-query repeated subexpression), `root` is generally a -/// **DAG** with internal sharing — that is this whole module's premise. Anything that -/// walks `root` as if every reference were a fresh sub-DAG (a naive -/// recursive walk with no identity tracking, or a naive full -/// `serde_json` serialization — `Rc`'s `Serialize` impl serializes the -/// pointee's *value* at every occurrence, it does not dedupe by identity) -/// re-visits/re-counts an already-shared descendant once per parent that -/// references it, over-counting relative to the actual work of holding it -/// in memory or recomputing it once. This function is the DAG-correct -/// alternative: each unique node is counted exactly once, regardless of -/// how many places within `root` reference it. -/// -/// `pub` so cost-aware callers outside this crate (e.g. -/// `asap_aware_mapping::CostModel::cse_recompute_cost`'s default) have a -/// DAG-correct structural-size proxy available, instead of reaching for -/// something per-path like a raw serialization length. -/// -/// Same operator-child traversal scope as [`share_common_sub_dags`] itself -/// (see the module doc's "Algorithm" section, and this module's private -/// `rebuild_children`) — a scalar subexpression embedded in a wrapper -/// position (`Predicate`, `ProjectItem.expr`, `Aggregate.having`, …) is not -/// separately visited, matching this module's own stated scope; it's -/// counted as part of its owning operator node, the same node -/// `rebuild_children` treats as a single opaque leaf for interning -/// purposes. -pub fn dag_node_count(root: &QueryExpr) -> usize { - let mut seen: std::collections::HashSet<*const QueryExpr> = std::collections::HashSet::new(); - count_unique(root, &mut seen) -} - -/// One node's own contribution (`1`) plus each *not-yet-seen* operator -/// child's contribution — exhaustive over every `QueryExpr` variant, -/// enumerating the same fields [`rebuild_children`] does (kept as a -/// separate, read-only traversal rather than threaded through -/// `rebuild_children` itself, since that function consumes and rebuilds -/// its input while this one only ever reads it). -fn count_unique(node: &QueryExpr, seen: &mut std::collections::HashSet<*const QueryExpr>) -> usize { - use QueryExpr::*; - - /// Visit one `Rc`-held child: counts (and recurses into) it only the - /// first time its pointer is seen, `0` on every later occurrence — - /// this is the actual dedup step. - fn visit( - child: &Rc, - seen: &mut std::collections::HashSet<*const QueryExpr>, - ) -> usize { - if seen.insert(Rc::as_ptr(child)) { - count_unique(child, seen) - } else { - 0 - } - } - - 1 + match node { - // `PromqlScalarBridge`'s child is a scalar-sub-language node (issue - // #220), never descended into — same treatment `rebuild_children` - // gives it (see that function's comment on this same variant). - Scan { .. } | PromqlScalarBridge(_) | EvalTimestamp | CurrentTimestamp => 0, - PromqlVectorFromScalar(c) | PromqlScalarFromVector(c) => visit(c, seen), - PromqlRelabel { child, .. } - | PromqlInfoEnrich { child, .. } - | PromqlSeriesSample { child, .. } - | Filter { child, .. } - | Project { child, .. } - | Aggregate { child, .. } - | Dedup { child, .. } - | Sort { child, .. } - | Limit { child, .. } - | PromqlSubquery { child, .. } - | TimeRange { child, .. } - | TimeShift { child, .. } - | SQLWindowFunc { child, .. } => visit(child, seen), - // `Concat`'s branches are stored by value (`Vec`, not - // `Rc` — see `rebuild_children`'s `intern_owned` use for - // this variant), so a branch has no `Rc` identity of its own to - // dedup on at this position; still recurse into each in case an - // `Rc`-shared descendant appears further down. - Concat { children, .. } => children.iter().map(|c| count_unique(c, seen)).sum(), - Join { left, right, .. } | SetOp { left, right, .. } => { - visit(left, seen) + visit(right, seen) - } - BinaryOp { lhs, rhs, .. } => visit(lhs, seen) + visit(rhs, seen), - // Scalar variants (issue #205) — never descended into, matching - // `rebuild_children`'s own scope exactly (see its trailing match - // arm and this module's "Algorithm" section). - Column(_) - | Literal(_) - | Compare { .. } - | BoolAnd(_) - | BoolOr(_) - | Not(_) - | IsNull(_) - | IsNotNull(_) - | Cast { .. } - | InList { .. } - | FunctionCall { .. } - | Arithmetic { .. } - | Case { .. } => 0, - } -} - -/// Recurse into `child`, then intern the result. `Rc::try_unwrap` recovers -/// the owned node without cloning in the overwhelmingly common case — a -/// DAG freshly built by a front end / `resolve_root`, not yet shared by any -/// prior CSE pass, where every `Rc` is uniquely owned. Falls back to cloning -/// this node's own fields (its children stay `Rc`s, not deep-copied) only -/// when `child` is already shared — e.g. re-running CSE over a DAG that -/// went through a previous `share_common_sub_dags` pass; a structural -/// duplicate collapses right back onto `child` itself via `PartialEq`, an -/// already-optimal no-op. -fn intern_child(table: &mut InternTable, child: Rc) -> Rc { - match Rc::try_unwrap(child) { - Ok(owned) => intern_bottom_up(table, owned), - Err(shared) => intern_bottom_up(table, (*shared).clone()), - } -} - -/// Like [`intern_child`], for a `Concat` branch — stored by value -/// (`Vec`, not `Rc`), so this position itself can never -/// alias another parent. Interning it anyway still lets any `Rc`-typed -/// descendant of the branch participate in sharing, and registers the -/// branch's own hash/value in the table for a *different* `Concat` elsewhere -/// with a structurally identical branch (which — being in its own `Vec` -/// slot too — still can't literally share the `Rc`, but this keeps the -/// interning behavior uniform and the table's bucket contents consistent). -fn intern_owned(table: &mut InternTable, expr: QueryExpr) -> QueryExpr { - let rc = intern_bottom_up(table, expr); - Rc::try_unwrap(rc).unwrap_or_else(|shared| (*shared).clone()) -} - -/// Bottom-up: rebuild `expr`'s children (recursively interning each), then -/// intern the rebuilt node itself. -fn intern_bottom_up(table: &mut InternTable, expr: QueryExpr) -> Rc { - let rebuilt = rebuild_children(table, expr); - table.intern(rebuilt) -} - -/// Rebuild `expr` with each **operator** child (see the module doc on scope) -/// replaced by its interned `Rc`. Exhaustive over every `QueryExpr` variant, -/// matching `canonicalize.rs`'s `children_mut` exactly in which fields count -/// as an operator child — new variants fail to compile here until this match -/// is extended. -fn rebuild_children(table: &mut InternTable, expr: QueryExpr) -> QueryExpr { - use QueryExpr::*; - match expr { - Scan { .. } | EvalTimestamp | CurrentTimestamp => expr, - PromqlVectorFromScalar(c) => PromqlVectorFromScalar(intern_child(table, c)), - PromqlScalarFromVector(c) => PromqlScalarFromVector(intern_child(table, c)), - PromqlRelabel { dst, value, child } => PromqlRelabel { - dst, - value, - child: intern_child(table, child), - }, - PromqlInfoEnrich { selector, child } => PromqlInfoEnrich { - selector, - child: intern_child(table, child), - }, - PromqlSeriesSample { by, kind, child } => PromqlSeriesSample { - by, - kind, - child: intern_child(table, child), - }, - Filter { pred, child } => Filter { - pred, - child: intern_child(table, child), - }, - Project { - cols, - qualifier, - child, - } => Project { - cols, - qualifier, - child: intern_child(table, child), - }, - Aggregate { - reduction, - measures, - output_names, - filters, - having, - child, - } => Aggregate { - reduction, - measures, - output_names, - filters, - having, - child: intern_child(table, child), - }, - Dedup { cols, child } => Dedup { - cols, - child: intern_child(table, child), - }, - Concat { - children, - discriminator_unique_key, - } => Concat { - children: children - .into_iter() - .map(|c| intern_owned(table, c)) - .collect(), - discriminator_unique_key, - }, - Join { - kind, - pred, - left, - right, - } => Join { - kind, - pred, - left: intern_child(table, left), - right: intern_child(table, right), - }, - SetOp { - kind, - all, - left, - right, - } => SetOp { - kind, - all, - left: intern_child(table, left), - right: intern_child(table, right), - }, - Sort { - keys, - partition_by, - child, - } => Sort { - keys, - partition_by, - child: intern_child(table, child), - }, - Limit { n, offset, child } => Limit { - n, - offset, - child: intern_child(table, child), - }, - PromqlSubquery { - range, - resolution, - child, - } => PromqlSubquery { - range, - resolution, - child: intern_child(table, child), - }, - TimeRange { range, child } => TimeRange { - range, - child: intern_child(table, child), - }, - TimeShift { shift, child } => TimeShift { - shift, - child: intern_child(table, child), - }, - SQLWindowFunc { - func, - args, - partition_by, - order_by, - frame, - output_name, - child, - } => SQLWindowFunc { - func, - args, - partition_by, - order_by, - frame, - output_name, - child: intern_child(table, child), - }, - BinaryOp { - op, - lhs, - rhs, - vector_match, - } => BinaryOp { - op, - lhs: intern_child(table, lhs), - rhs: intern_child(table, rhs), - vector_match, - }, - // `PromqlScalarBridge`'s child is a scalar-sub-language node (issue - // #220) — same "never descended into" treatment as the scalar - // variants below; the whole bridge node is still interned as a unit - // by the `table.intern(rebuilt)` call in `intern_bottom_up`. - PromqlScalarBridge(_) => expr, - // Scalar variants (issue #205) — never descended into; see the - // module doc's "Algorithm" section on scope. Left byte-for-byte - // unchanged: predicate / project-list / sort-key / window-arg - // expressions stay embedded as opaque leaf data, compared by the - // enclosing operator node's derived `PartialEq`. - Column(_) - | Literal(_) - | Compare { .. } - | BoolAnd(_) - | BoolOr(_) - | Not(_) - | IsNull(_) - | IsNotNull(_) - | Cast { .. } - | InList { .. } - | FunctionCall { .. } - | Arithmetic { .. } - | Case { .. } => expr, - } -} - -/// Share structurally-identical, sharing-legal sub-DAGs across a workload's -/// query roots (or within one query, for `roots.len() == 1` — see the -/// module doc's "Single-query CSE" section). Every root's *value* is -/// unchanged (`PartialEq`-equal to its input) — only its internal `Rc` -/// structure may now alias another root's, or another part of its own DAG. -/// -/// `roots` must already be bound + canonicalized (post-`resolve_root`). -/// `Id` is caller-chosen — a `QueryWorkload` entry's own key, an index, a -/// query name, whatever identifies one root through the pipeline; this -/// module has no opinion on its shape. -pub fn share_common_sub_dags(roots: Vec<(Id, QueryExpr)>) -> Vec<(Id, Rc)> { - let mut table = InternTable::new(); - roots - .into_iter() - .map(|(id, expr)| (id, intern_bottom_up(&mut table, expr))) - .collect() -} - -#[cfg(test)] -mod tests { - use super::*; - use crate::pre_asap::agg_intent::AggIntent; - use crate::pre_asap::expr_ir::{CompareOpKind, ScalarValue}; - use crate::pre_asap::query_expr::{BinaryOpKind, GroupKeys, Predicate, Reduction, Source}; - use crate::pre_asap::schema::{DataType, Field, Schema}; - use crate::types::AccuracyTarget; - - /// `[ts, service, value, latency]`. - fn scan() -> QueryExpr { - QueryExpr::Scan { - source: Source::TimeSeries { metric: "m".into() }, - predicates: vec![], - schema: Schema::with_time_index( - vec![ - Field::plain("ts", DataType::Timestamp, false), - Field::plain("service", DataType::Utf8, false), - Field::plain("value", DataType::Float64, false), - Field::plain("latency", DataType::Float64, false), - ], - 0, - vec![], - ), - } - } - - fn quantile_agg(by: Vec, col: Option, q: f64) -> QueryExpr { - QueryExpr::Aggregate { - reduction: Reduction::by(by), - measures: vec![AggIntent::Quantile { - col, - q, - accuracy: AccuracyTarget::Exact, - }], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(scan()), - } - } - - #[test] - fn distinct_column_quantiles_do_not_merge() { - // Grouped (unique_keys present) so the legality gate isn't what's - // blocking the merge — only the differing `col` is. - let a = quantile_agg(vec![1], Some(2), 0.5); - let b = quantile_agg(vec![1], Some(3), 0.5); - let shared = share_common_sub_dags(vec![("a", a), ("b", b)]); - let [(_, ra), (_, rb)] = shared.as_slice() else { - panic!("expected 2 roots"); - }; - assert!( - !Rc::ptr_eq(ra, rb), - "distinct-column Quantiles must not be shared" - ); - assert_ne!(ra, rb); - } - - // Two aggregates that differ only in one measure's `FILTER` predicate - // compute different values, so structural sharing must keep them apart. - #[test] - fn filtered_and_unfiltered_aggregates_do_not_merge() { - let a = quantile_agg(vec![1], Some(2), 0.5); - let mut b = quantile_agg(vec![1], Some(2), 0.5); - let QueryExpr::Aggregate { filters, .. } = &mut b else { - unreachable!() - }; - *filters = vec![Some(Predicate(Rc::new(QueryExpr::Compare { - left: Rc::new(QueryExpr::Column(3)), - op: CompareOpKind::Gt, - right: Rc::new(QueryExpr::Literal(ScalarValue::Float64(1.0))), - })))]; - let shared = share_common_sub_dags(vec![("a", a), ("b", b)]); - let [(_, ra), (_, rb)] = shared.as_slice() else { - panic!("expected 2 roots"); - }; - assert!(!Rc::ptr_eq(ra, rb), "a filtered measure must not be shared"); - assert_ne!(ra, rb); - } - - #[test] - fn no_unique_keys_means_no_merge_even_when_structurally_identical() { - // Ungrouped (global) aggregate: `by` is empty, so - // `aggregate_output_schema` reports no unique key today — not - // hoistable even though `a` and `b` are structurally identical. - let a = quantile_agg(vec![], Some(2), 0.9); - let b = quantile_agg(vec![], Some(2), 0.9); - assert_eq!(a, b, "fixture sanity: the two DAGs are structurally equal"); - assert!( - !a.output_schema().unwrap().has_unique_key(), - "fixture sanity: an ungrouped aggregate has no provable unique key" - ); - let shared = share_common_sub_dags(vec![("a", a), ("b", b)]); - let [(_, ra), (_, rb)] = shared.as_slice() else { - panic!("expected 2 roots"); - }; - assert!( - !Rc::ptr_eq(ra, rb), - "no unique key ⇒ never hoisted, even for an identical structural match" - ); - } - - #[test] - fn median_and_explicit_half_percentile_merge() { - // Two front-end spellings ("median" and "approx_percentile_cont(., - // 0.5)") already lower to the identical `AggIntent::Quantile { q: - // 0.5, .. }` today (see `sql_lowering.rs`'s - // `median_is_the_same_intent_as_an_explicit_half_percentile`) — here - // built directly (grouped, so a unique key is provable) as two - // independently-constructed but structurally identical DAGs, the - // way two different call sites in a workload would produce them. - let median = quantile_agg(vec![1], Some(2), 0.5); - let approx_percentile_cont_half = quantile_agg(vec![1], Some(2), 0.5); - let shared = share_common_sub_dags(vec![ - ("median", median), - ("percentile", approx_percentile_cont_half), - ]); - let [(_, m), (_, p)] = shared.as_slice() else { - panic!("expected 2 roots"); - }; - assert!( - Rc::ptr_eq(m, p), - "median and an explicit 0.5 percentile must merge onto one Rc" - ); - } - - #[test] - fn single_query_shares_its_own_repeated_sub_dag() { - // One query root referencing the same grouped Aggregate on both - // BinaryOp branches — built as two separately-allocated but - // structurally identical sub-DAGs (`.clone()` into two distinct - // `Rc::new` calls), the shape a front end emitting a repeated - // sub-expression would actually produce (no sharing yet). A - // workload of size 1 still interns bottom-up within this one DAG — - // no separate single-query mechanism needed. - let agg = quantile_agg(vec![1], Some(2), 0.5); - let root = QueryExpr::BinaryOp { - op: BinaryOpKind::Compare(crate::pre_asap::expr_ir::CompareOpKind::Eq), - lhs: Rc::new(agg.clone()), - rhs: Rc::new(agg), - vector_match: None, - }; - let shared = share_common_sub_dags(vec![("q", root)]); - let [(_, root)] = shared.as_slice() else { - panic!("expected 1 root"); - }; - let QueryExpr::BinaryOp { lhs, rhs, .. } = root.as_ref() else { - panic!("expected BinaryOp root, got {root:?}"); - }; - assert!( - Rc::ptr_eq(lhs, rhs), - "the two structurally identical branches must collapse onto one Rc" - ); - } - - // ── structural_hash (DAG-aware memoization) ───────────────────────── - - #[test] - fn structural_hash_is_stable_across_cache_states() { - // The hash of a given *value* must not depend on whether its cache - // started warm or cold — memoization changes how much work is - // redone, never what a node's hash actually is. - let agg = quantile_agg(vec![1], Some(2), 0.5); - let mut cold = HashMap::new(); - let mut warm = HashMap::new(); - // Prime `warm` with an unrelated node first, so it's non-empty but - // holds nothing relevant to `agg`. - structural_hash(&scan(), &mut warm); - assert_eq!( - structural_hash(&agg, &mut cold), - structural_hash(&agg, &mut warm), - "hash must be independent of unrelated cache state" - ); - } - - #[test] - fn structural_hash_of_an_internally_shared_dag_matches_the_unshared_equivalent() { - // The same BinaryOp-with-shared-branches shape as - // `dag_node_count_deduplicates_an_internally_shared_sub_dag` below: - // hashing it (however the memoization internally short-circuits the - // second branch) must produce the exact same value as hashing a - // structurally-identical DAG built with *no* sharing at all — the - // whole point of memoization is not changing the answer, only the - // work needed to reach it. - let agg = quantile_agg(vec![1], Some(2), 0.5); - let shared_root = QueryExpr::BinaryOp { - op: BinaryOpKind::Compare(crate::pre_asap::expr_ir::CompareOpKind::Eq), - lhs: Rc::new(agg.clone()), - rhs: Rc::new(agg.clone()), - vector_match: None, - }; - let unshared_root = QueryExpr::BinaryOp { - op: BinaryOpKind::Compare(crate::pre_asap::expr_ir::CompareOpKind::Eq), - lhs: Rc::new(agg.clone()), - rhs: Rc::new(agg), // a second, independently-allocated Rc with an equal value - vector_match: None, - }; - let mut cache = HashMap::new(); - assert_eq!( - structural_hash(&shared_root, &mut cache), - structural_hash(&unshared_root, &mut HashMap::new()), - ); - } - - #[test] - fn structural_hash_memoizes_a_shared_descendant_exactly_once() { - // Direct proof the cache is actually doing its job: hashing a - // BinaryOp whose two branches are the *same* Rc (2 underlying - // nodes: Scan + Aggregate) should populate the cache with exactly - // 2 entries — the shared branch's nodes, cached once each when - // first reached — not a fresh entry (or a fresh, redundant - // recursive walk) for the second occurrence. - let agg = quantile_agg(vec![1], Some(2), 0.5); - let shared = Rc::new(agg); - let root = QueryExpr::BinaryOp { - op: BinaryOpKind::Compare(crate::pre_asap::expr_ir::CompareOpKind::Eq), - lhs: Rc::clone(&shared), - rhs: Rc::clone(&shared), - vector_match: None, - }; - let mut cache = HashMap::new(); - structural_hash(&root, &mut cache); - assert_eq!( - cache.len(), - 2, - "expected exactly one cache entry per unique node in the shared \ - branch (Aggregate + its Scan child), got {} entries: {:?}", - cache.len(), - cache - ); - } - - // ── dag_node_count ─────────────────────────────────────────────────── - - #[test] - fn dag_node_count_is_the_naive_count_when_nothing_is_shared() { - // scan() alone: 1 node. - assert_eq!(dag_node_count(&scan()), 1); - // quantile_agg's own child is a fresh, unshared scan(): 2 nodes. - assert_eq!(dag_node_count(&quantile_agg(vec![1], Some(2), 0.5)), 2); - } - - #[test] - fn dag_node_count_deduplicates_an_internally_shared_sub_dag() { - // Same shape as `single_query_shares_its_own_repeated_sub_dag`: a - // BinaryOp whose two branches are the *same* Rc after - // `share_common_sub_dags` (2 nodes: Scan + Aggregate) — the root - // itself makes 3 unique nodes total (BinaryOp, Aggregate, Scan), - // not 5 (which a per-path walk / naive serialization, counting the - // shared branch's 2 nodes twice, would report). - let agg = quantile_agg(vec![1], Some(2), 0.5); - let root = QueryExpr::BinaryOp { - op: BinaryOpKind::Compare(crate::pre_asap::expr_ir::CompareOpKind::Eq), - lhs: Rc::new(agg.clone()), - rhs: Rc::new(agg), - vector_match: None, - }; - let shared = share_common_sub_dags(vec![("q", root)]); - let [(_, root)] = shared.as_slice() else { - panic!("expected 1 root"); - }; - assert_eq!( - dag_node_count(root), - 3, - "the shared branch's 2 nodes must be counted once, not once per \ - occurrence — got {} for {root:?}", - dag_node_count(root) - ); - } - - #[test] - fn dag_node_count_deduplicates_across_two_workload_roots() { - // Two workload roots sharing one Aggregate after - // `share_common_sub_dags` (the `duplicate_workload_queries_...` - // shape from `crates/integration-tests/tests/cse.rs`, built - // directly here): each root's own `dag_node_count` must report the - // shared sub-DAG's real size once, not double-count anything — - // there's nothing *to* double-count from a single root's own count - // in this case (no root references the shared node twice), so this - // pins the simpler, more common case that a per-candidate cost - // proxy (`CseCandidate::sub-DAG` in `asap-aware-mapping`) actually - // exercises: counting one occurrence's own reachable DAG size. - let a = quantile_agg(vec![1], Some(2), 0.5); - let b = quantile_agg(vec![1], Some(2), 0.5); - let shared = share_common_sub_dags(vec![("a", a), ("b", b)]); - let [(_, ra), (_, rb)] = shared.as_slice() else { - panic!("expected 2 roots"); - }; - assert!(Rc::ptr_eq(ra, rb), "fixture sanity: the two roots merged"); - assert_eq!(dag_node_count(ra), 2); - assert_eq!(dag_node_count(rb), 2); - } - - #[test] - fn dedup_gates_sharing_the_same_as_aggregate() { - // `Dedup { cols }` adds `cols` as a unique key — so two identical - // `Dedup` sub-DAGs over a keyed column *do* merge, exercising the - // legality gate on a non-`Aggregate` node. - let dedup = |cols: Vec| QueryExpr::Dedup { - cols, - child: Rc::new(scan()), - }; - let a = dedup(vec![1]); - let b = dedup(vec![1]); - let shared = share_common_sub_dags(vec![("a", a), ("b", b)]); - let [(_, ra), (_, rb)] = shared.as_slice() else { - panic!("expected 2 roots"); - }; - assert!( - Rc::ptr_eq(ra, rb), - "Dedup on the same cols has a provable unique key and should merge" - ); - } - - #[test] - fn group_keys_gate_still_prevented_when_partition_by_without_used() { - // Sanity on the module's advertised precedent: a `without(...)` - // grouping stays open (no unique key) even though `by` is - // non-empty-shaped structurally, so two identical `without` groups - // do not merge under the same gate that blocks the ungrouped case. - let without_agg = || QueryExpr::Aggregate { - reduction: Reduction::Reduce(GroupKeys::without(vec![0])), - measures: vec![AggIntent::Count { - accuracy: AccuracyTarget::Exact, - }], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(scan()), - }; - let a = without_agg(); - let b = without_agg(); - assert!(!a.output_schema().unwrap().has_unique_key()); - let shared = share_common_sub_dags(vec![("a", a), ("b", b)]); - let [(_, ra), (_, rb)] = shared.as_slice() else { - panic!("expected 2 roots"); - }; - assert!(!Rc::ptr_eq(ra, rb)); - } -} diff --git a/crates/types/src/pre_asap/expr_ir.rs b/crates/types/src/pre_asap/expr_ir.rs index 21ffe21bf..fe373e58f 100644 --- a/crates/types/src/pre_asap/expr_ir.rs +++ b/crates/types/src/pre_asap/expr_ir.rs @@ -1,29 +1,20 @@ -//! Column-reference and scalar-operator vocabulary shared by the whole -//! canonical [`QueryExpr`](super::query_expr::QueryExpr) DAG. -//! -//! Issue #205: the scalar expression shapes (`Column`/`Literal`/`Compare`/…) -//! used to live in a separate, self-recursive `Expr` DAG here, reachable -//! from `QueryExpr` only through wrapper fields (`Predicate`, `ProjectItem`, -//! `SortKey`). They're variants of `QueryExpr` itself now — one recursive -//! DAG, not two type families joined by wrappers — generic over the same -//! column-reference state `C` the rest of `QueryExpr` already carries -//! (issue #179): [`ColumnRef`] (name-based, front-end-emitted) or -//! [`ColumnId`](super::schema::ColumnId) (positional, once bound). -//! -//! What's left here is the vocabulary those scalar variants are built from — -//! [`ScalarValue`], [`CompareOpKind`], [`ArithmeticOpKind`] — the **union** of what the two +//! Column-reference and scalar-operator vocabulary shared by the IR's scalar +//! expressions ([`crate::ir::ScalarExpr`]) and the front ends' unresolved +//! form: [`ColumnRef`] (name-based, front-end-emitted; positional +//! [`ColumnId`](super::schema::ColumnId) once bound), and [`ScalarValue`], +//! [`CompareOpKind`], [`ArithmeticOpKind`] — the **union** of what the two //! front ends need: PromQL contributes `Regex` / `NotRegex` (`=~` / `!~`); SQL //! contributes arithmetic, `CASE`, `IN`, `CAST`, `IS [NOT] NULL`, scalar //! function calls, and the `LIKE` / `ILIKE` comparison family. use serde::{Deserialize, Serialize}; -/// A name-based column reference — the front-end-emitted, unresolved state of -/// [`QueryExpr::Column`](super::query_expr::QueryExpr::Column) (`C = -/// ColumnRef`); the [`SchemaResolver`](super::schema_resolver::SchemaResolver) resolves it to a -/// positional [`ColumnId`](super::schema::ColumnId). This is a logical reference, -/// not schema metadata or a runtime data array. `SampleValue` names the implicit -/// PromQL sample column; `Wildcard` represents an all-columns/rows request. +/// A name-based column reference — the front-end-emitted, unresolved form of +/// [`ScalarExpr::Column`](crate::ir::ScalarExpr::Column); front-end name +/// resolution turns it into a positional [`ColumnId`](super::schema::ColumnId). +/// This is a logical reference, not schema metadata or a runtime data array. +/// `SampleValue` names the implicit PromQL sample column; `Wildcard` represents +/// an all-columns/rows request. #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)] pub enum ColumnRef { Named(String), diff --git a/crates/types/src/pre_asap/mod.rs b/crates/types/src/pre_asap/mod.rs index f434eb154..c309c7b30 100644 --- a/crates/types/src/pre_asap/mod.rs +++ b/crates/types/src/pre_asap/mod.rs @@ -1,64 +1,34 @@ -//! The canonical pre-ASAP intent algebra IR. +//! Shared vocabulary of the operator IR. The operators themselves live in +//! [`crate::ir`]; this module holds the field types they are built from. //! -//! - [`query_expr`] — the canonical, language- and deployment-independent -//! intent algebra: one recursive [`QueryExpr`] DAG (relational operators -//! *and* scalar expression shapes both, since issue #205) + [`AggIntent`], -//! generic over the column-reference state (positional [`ColumnId`] once -//! bound, name-based [`ColumnRef`] before). -//! - [`agg_intent`] — the aggregation-intent vocabulary. -//! - [`expr_ir`] — the [`ColumnRef`] column-reference type and the scalar -//! operator/literal vocabulary ([`ScalarValue`], [`CompareOpKind`], [`ArithmeticOpKind`]) -//! [`QueryExpr`]'s scalar variants are built from. +//! Operator parameters and schema derivation live in [`crate::ir`]. +//! - [`agg_intent`] — the aggregation-intent vocabulary ([`AggIntent`]). +//! - [`expr_ir`] — [`ColumnRef`] and the scalar literal / operator kinds +//! ([`ScalarValue`], [`CompareOpKind`], [`ArithmeticOpKind`]). //! - [`schema`] — the per-edge [`Schema`] every node carries. -//! - [`schema_resolver`] / [`column_resolution`] — name resolution: turn a `ColumnRef` -//! into a positional `ColumnId` against an in-scope [`Schema`]. -//! - [`resolve`] — binds a whole front-end-emitted [`UnresolvedQueryExpr`] DAG to -//! canonical [`ResolvedQueryExpr`] (issue #179): both front ends -//! (`asap-frontend-promql`, `asap-frontend-sql`) construct `UnresolvedQueryExpr` -//! directly during their own `interpret` step and call -//! [`resolve_root`] on the result — there is no separate per-language -//! relational DAG or converter anymore. -//! - [`canonicalize`] — post-lowering structural normalization of [`QueryExpr`] -//! (issue #34), run by [`resolve_root`]. -//! - [`cse`] — workload-level structural common-subexpression elimination -//! over an already-`resolve_root`'d DAG (issue #212, #222, #223), run -//! *after* `resolve_root` / `canonicalize` and *before* implementation -//! (`asap_aware_mapping::replacement`). -//! -//! Formerly the separate `asap-l2` crate; folded in here since -//! `schema_resolver`/`column_resolution`/`canonicalize`/`resolve` have no -//! front-end-specific logic — they operate directly on this crate's own -//! `QueryExpr`. +//! - [`column_resolution`] — turn a name-based `ColumnRef` into a positional +//! `ColumnId` against a [`Schema`] (used by front-end name resolution). +//! - [`scalar_type_rules`] — shared scalar type and nullability rules. pub mod agg_intent; -pub mod canonicalize; pub mod column_resolution; -pub mod cse; pub mod expr_ir; -pub mod query_expr; -pub mod resolve; pub mod scalar_type_rules; pub mod schema; -pub mod schema_resolver; +pub use crate::ir::operator_properties::{ + AtModifier, BinaryOpKind, ColState, ConcatDiscriminatorKey, DataModel, GroupKeys, GroupSide, + InfoMatcher, JoinKind, PromQLVectorSetOpKind, Reduction, RelationalSetOpKind, SampleKind, + Source, TimeShift, VectorGrouping, VectorMatch, VectorMatchKind, WindowFrame, WindowFrameBound, + WindowFrameOffset, WindowFrameUnits, WindowFuncKind, +}; pub use agg_intent::{ agg_accuracy, agg_is_exact, agg_is_mergeable, default_cardinality, default_quantile, AggIntent, MathFunc, TimeFunc, }; -pub use canonicalize::canonicalize; -pub use column_resolution::{ - output_schema_for_aggregate, resolve_column_ref, resolve_column_refs, resolve_expr, - ResolveError, -}; -pub use cse::share_common_sub_dags; +pub use column_resolution::{resolve_column_ref, resolve_column_refs, ResolveError}; pub use expr_ir::{ArithmeticOpKind, ColumnRef, CompareOpKind, ScalarValue}; -pub use query_expr::{ - aggregate_output_schema, any_measure_filtered, AtModifier, BinaryOpKind, ColState, DataModel, - GroupKeys, GroupSide, InfoMatcher, JoinKind, Predicate, ProjectItem, PromQLVectorSetOpKind, - QueryExpr, QueryExprError, Reduction, RelationalSetOpKind, ResolvedQueryExpr, SampleKind, - SortKey, Source, TimeShift, UnresolvedQueryExpr, VectorGrouping, VectorMatch, VectorMatchKind, - WindowFrame, WindowFrameBound, WindowFrameOffset, WindowFrameUnits, WindowFuncKind, -}; -pub use resolve::{resolve_root, ResolveDAGError}; pub use schema::{ColumnId, DataType, Field, FieldDataType, Schema}; -pub use schema_resolver::{SchemaCatalog, SchemaResolver, UsageDerivedCatalog}; + +pub use crate::ir::aggregate_schema::aggregate_output_schema; +pub use crate::ir::SchemaDerivationError; diff --git a/crates/types/src/pre_asap/query_expr.rs b/crates/types/src/pre_asap/query_expr.rs deleted file mode 100644 index e389f84a2..000000000 --- a/crates/types/src/pre_asap/query_expr.rs +++ /dev/null @@ -1,2774 +0,0 @@ -//! The canonical pre-ASAP intent algebra IR. -//! -//! Language- and deployment-independent. `Rc`-owned DAG — a child field is -//! `Rc>` rather than `Box>` so a structurally -//! identical sub-expression can be shared (the same `Rc`) across more than -//! one parent, within one query or across a `QueryWorkload` batch, instead of -//! being duplicated. Nothing in this module produces that sharing on its -//! own — construction still allocates a fresh `Rc` per node, the same shape -//! as the old `Box` DAG — a separate CSE pass is what turns two -//! independently constructed, structurally-equal sub-DAGs into two -//! references to one `Rc` (issue #212, #222). Field identity is -//! **positional** (`Aggregate.reduction: Reduction`, wrapping `GroupKeys` -//! for the grouped case), resolved by the [`SchemaResolver`](super::schema_resolver) against -//! the self-contained [`Schema`] carried on each `Scan`. - -use std::rc::Rc; -use std::time::Duration; - -use serde::{Deserialize, Serialize}; -use thiserror::Error; - -use super::agg_intent::AggIntent; -use super::expr_ir::{ArithmeticOpKind, ColumnRef, CompareOpKind, ScalarValue}; -use super::schema::{ColumnId, DataType, Field, FieldDataType, Schema}; - -/// The column-reference resolution state a [`QueryExpr`] DAG carries — -/// [`ColumnId`] (the default, and what the bare `QueryExpr` name has always -/// meant) once the [`SchemaResolver`](super::schema_resolver::SchemaResolver) has resolved every -/// reference positionally, or the front-end-emitted, name-based [`ColumnRef`] -/// before binding. The only place the two states differ in *shape* rather -/// than just in which type fills `C` is [`QueryExpr::Scan`]'s `schema` field: -/// a bound DAG's binding schema is always known (the SchemaResolver is total, so -/// [`ScanSchema`](Self::ScanSchema) `= Schema`); an unresolved front-end -/// `Scan` knows its schema only when the front end already has it without -/// binding — a SQL leaf, catalog-backed (`Some`) — `None` (PromQL) defers to -/// the SchemaResolver, so `ScanSchema = Option`. -pub trait ColState: - Clone + std::fmt::Debug + PartialEq + Serialize + for<'de> Deserialize<'de> -{ - /// What [`QueryExpr::Scan`]'s `schema` field holds for a DAG in this state. - type ScanSchema: Clone + std::fmt::Debug + PartialEq + Serialize + for<'de> Deserialize<'de>; -} - -impl ColState for ColumnId { - type ScanSchema = Schema; -} - -impl ColState for ColumnRef { - type ScanSchema = Option; -} - -/// Errors from schema derivation over a canonical DAG. -#[derive(Debug, Error)] -pub enum QueryExprError { - #[error("invalid scalar function signature: {0}")] - InvalidScalarSignature(String), - #[error("by-column id {0} out of range (input has {1} columns)")] - InvalidGroupByColumn(ColumnId, usize), - #[error("Concat requires at least one child")] - EmptyConcat, - /// [`QueryExpr::output_schema`] called on (or reached, while recursing, a - /// child that is) one of the scalar variants (issue #205) — those have no - /// independent row schema of their own; a scalar expression's *type* only - /// makes sense against the schema it's embedded in (see `infer_expr_type`, - /// used by `Project`'s own `output_schema` arm instead). - #[error("a scalar expression has no row schema of its own")] - ScalarHasNoRowSchema, - #[error("invalid per-series sample column: {0}")] - InvalidSampleColumn(String), -} - -// ── Leaf / supporting types ─────────────────────────────────────────────────── - -/// Positional grouping keys, shared by every "operate per group" operator: -/// `Aggregate.by` (reduce per group), `Sort.partition_by` (rank per group — -/// including generic `topk`/`bottomk`), and `SQLWindowFunc.partition_by` (window -/// per group). One spelling so grouping has a single home to evolve. Empty -/// (and `by`) = no grouping (a global operation). -/// -/// Heavy-hitter `AggIntent::TopK` carries its grouping here too, via the -/// enclosing `Aggregate.by` (issue #13) — so reduce, rank, and window groupings -/// all share this one type. -/// -/// ## `by` vs `without` (issue #39) -/// -/// The stored [`keys`](Self::keys) are **kept** labels for `by(...)` and -/// **excluded** labels for `without(...)`. PromQL's `without(labels)` groups by -/// every label *except* those listed; the complement can't be enumerated at -/// lowering time under an open (usage-derived) schema, so it is deferred to the -/// runtime — the excluded positions are stored, the kept set stays open. Only -/// `Aggregate` ever produces the `without` form; `Sort` / `SQLWindowFunc` / -/// `PromqlSeriesSample` groupings are always `by`. -/// -/// Serialises as a bare array for the (overwhelmingly common) `by` case — -/// wire-compatible with the `Vec` this field held before — and as -/// `{"without": [...]}` for the exclusion case. -#[derive(Debug, Clone, PartialEq, Eq, Hash)] -pub struct GroupKeys { - keys: Vec, - without: bool, -} - -// Not `#[derive(Default)]`: derive would add a `C: Default` bound, but an -// empty key set needs nothing from `C` — `ColumnRef` has no meaningful -// default anyway. -impl Default for GroupKeys { - fn default() -> Self { - Self { - keys: Vec::new(), - without: false, - } - } -} - -impl GroupKeys { - /// An empty key set — a global (ungrouped) operation. - pub fn none() -> Self { - Self::default() - } - /// `by(keys)` — group by exactly these columns. - pub fn by(keys: Vec) -> Self { - Self { - keys, - without: false, - } - } - /// `without(keys)` — group by every label *except* these (issue #39). The - /// kept set is runtime-resolved; only the excluded positions are stored. - pub fn without(keys: Vec) -> Self { - Self { - keys, - without: true, - } - } - /// Whether this is a `without(...)` exclusion grouping. - pub fn is_without(&self) -> bool { - self.without - } - /// The named keys — kept labels for `by`, excluded labels for `without`. - pub fn keys(&self) -> &[C] { - &self.keys - } -} - -impl std::ops::Deref for GroupKeys { - type Target = [C]; - fn deref(&self) -> &Self::Target { - &self.keys - } -} - -impl From> for GroupKeys { - fn from(keys: Vec) -> Self { - Self::by(keys) - } -} - -impl FromIterator for GroupKeys { - fn from_iter>(iter: I) -> Self { - Self::by(iter.into_iter().collect()) - } -} - -impl<'a, C> IntoIterator for &'a GroupKeys { - type Item = &'a C; - type IntoIter = std::slice::Iter<'a, C>; - fn into_iter(self) -> Self::IntoIter { - self.keys.iter() - } -} - -/// Compare directly against a `Vec` so call sites and tests can keep -/// writing `keys == vec![..]` / `assert_eq!(keys, &vec![..])`. A `without` -/// grouping never equals a bare `by` list. -impl PartialEq> for GroupKeys { - fn eq(&self, other: &Vec) -> bool { - !self.without && &self.keys == other - } -} - -/// (De)serialise as a bare array for `by`, or `{"without": [...]}` for the -/// exclusion form — keeping the `by` wire format identical to the old newtype. -/// Borrowed for `Serialize` (no `C: Clone` needed to write one out), owned for -/// `Deserialize` (there's nothing to borrow from). -#[derive(Serialize)] -#[serde(untagged)] -enum GroupKeysReprRef<'a, C> { - By(&'a [C]), - Without { without: &'a [C] }, -} - -#[derive(Deserialize)] -#[serde(untagged)] -enum GroupKeysRepr { - By(Vec), - Without { without: Vec }, -} - -impl Serialize for GroupKeys { - fn serialize(&self, serializer: S) -> Result { - if self.without { - GroupKeysReprRef::Without { - without: self.keys.as_slice(), - } - .serialize(serializer) - } else { - GroupKeysReprRef::By(self.keys.as_slice()).serialize(serializer) - } - } -} - -impl<'de, C: Deserialize<'de>> Deserialize<'de> for GroupKeys { - fn deserialize>(deserializer: D) -> Result { - Ok(match GroupKeysRepr::deserialize(deserializer)? { - GroupKeysRepr::By(keys) => Self::by(keys), - GroupKeysRepr::Without { without } => Self::without(without), - }) - } -} - -/// Which data model a `Source` / `AggIntent` operates over. -#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] -pub enum DataModel { - TimeSeries, - Tabular, - Any, -} - -/// The leaf data source of a `Scan`. The schema itself rides on the -/// `Scan.schema` field (SchemaResolver-built); `Source` carries only the leaf's -/// identity. -#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] -pub enum Source { - /// Time-series leaf — PromQL / DC lifecycle. Produces `(ts, value, *labels)`. - TimeSeries { metric: String }, - /// Tabular leaf — asap-fusion / future OLAP. Columns ride on `Scan.schema`. - Table { table_ref: String }, -} - -impl Source { - pub fn data_model(&self) -> DataModel { - match self { - Source::TimeSeries { .. } => DataModel::TimeSeries, - Source::Table { .. } => DataModel::Tabular, - } - } -} - -/// Operator on the query-level `BinaryOp` node. Reuses the scalar IR's -/// [`ArithmeticOpKind`] / [`CompareOpKind`] so every arithmetic/comparison -/// operator has exactly one representation (and one `Display`) across the IR. -#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] -pub enum BinaryOpKind { - /// Arithmetic — `Add/Sub/Mul/Div/Mod` (shared with `QueryExpr::Arithmetic`). - Arithmetic(ArithmeticOpKind), - /// Comparison — `Eq/Ne/Lt/Le/Gt/Ge` + `Like/ILike/Regex` family (shared - /// with `QueryExpr::Compare`). PromQL keeps the matched series whose - /// comparison holds. - Compare(CompareOpKind), - /// PromQL comparison with the `bool` modifier: every matched series - /// yields 1 or 0 and loses its metric name. A separate variant, not a - /// flag, because only comparisons take `bool`. - CompareBool(CompareOpKind), - /// PromQL vector-set operation. - Set(PromQLVectorSetOpKind), -} - -impl std::fmt::Display for BinaryOpKind { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - match self { - BinaryOpKind::Arithmetic(op) => write!(f, "{op}"), - BinaryOpKind::Compare(op) => write!(f, "{op}"), - BinaryOpKind::CompareBool(op) => write!(f, "{op} bool"), - BinaryOpKind::Set(PromQLVectorSetOpKind::And) => f.write_str("AND"), - BinaryOpKind::Set(PromQLVectorSetOpKind::Or) => f.write_str("OR"), - BinaryOpKind::Set(PromQLVectorSetOpKind::Unless) => f.write_str("unless"), - } - } -} - -#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] -pub enum JoinKind { - Inner, - Left, - Right, - Full, - Cross, - /// Left semi-join — each left row that has **at least one** match, once. - /// `WHERE c IN (SELECT …)` / `WHERE EXISTS (…)` (issue #111). - /// - /// Output schema is the **left's alone**; the right side is a filter, not a - /// source of columns. The join predicate still resolves against the - /// concatenated `left ++ right` schema — its scope is deliberately wider - /// than the node's output. - Semi, - /// Left anti-join — each left row with **no** match. `WHERE NOT EXISTS (…)`. - /// Same schema rule as [`JoinKind::Semi`]. - /// - /// Note this is *not* `NOT IN (SELECT …)`: under SQL's three-valued logic a - /// NULL on the right makes `NOT IN` yield no rows at all, where an anti-join - /// yields every left row. The SQL front end rejects `NOT IN (subquery)` - /// rather than lower it here. - Anti, -} - -#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] -pub enum RelationalSetOpKind { - Union, - Intersect, - Except, -} - -/// PromQL vector-set operator used by [`BinaryOpKind::Set`]. -#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] -pub enum PromQLVectorSetOpKind { - And, - Or, - Unless, -} - -/// SQL analytic window function (`fn(...) OVER (…)`). Distinct from a streaming -/// time `Window`: this is an analytic frame over already-materialised rows. -#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] -#[serde(rename_all = "snake_case")] -pub enum WindowFuncKind { - RowNumber, - Rank, - DenseRank, - Lag, - Lead, - /// ClickHouse `lagInFrame`/`leadInFrame`: unlike [`Lag`](Self::Lag)/[`Lead`](Self::Lead), - /// these respect the window frame bounds (NULL/default past the frame edge) - /// rather than reaching arbitrarily far back/forward. Kept as distinct - /// variants so the frame clause is never silently discarded by conflating - /// them with `Lag`/`Lead` (#267). `WindowFuncKind` still has no frame - /// representation, so today these lower and behave exactly like - /// `Lag`/`Lead` — the tag is correct, the frame-respecting behavior isn't - /// implemented yet. See #231 for modeling window frames properly. - LagInFrame, - LeadInFrame, - FirstValue, - LastValue, - /// `NTH_VALUE(expr, n)` — `n` is resolved from the (literal) 2nd argument. - NthValue(Option), - Sum, - Avg, - Count, - Min, - Max, -} - -/// A window's frame-spec (`ROWS`/`RANGE BETWEEN … AND …`) — which rows around -/// the current one an analytic window function reads. `GROUPS` is rejected at -/// lowering time (issue #268): every SQL corpus in this repo uses only `ROWS`, -/// and nothing downstream interprets frame semantics yet, so it isn't worth -/// modelling untested. -/// -/// Meaningless (but harmless) on the rank-only and navigation functions -/// (`ROW_NUMBER`/`RANK`/`DENSE_RANK`/`LAG`/`LEAD`), which ignore the frame per -/// SQL semantics — DataFusion still attaches one, stored here verbatim. -#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] -pub struct WindowFrame { - pub units: WindowFrameUnits, - pub start_bound: WindowFrameBound, - pub end_bound: WindowFrameBound, -} - -/// A finite window-frame displacement. Intervals are normalized to Arrow's -/// month/day/nanosecond representation so SQL `RANGE INTERVAL ...` bounds -/// survive lowering without leaking DataFusion types into the canonical IR. -#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] -#[serde(rename_all = "snake_case")] -pub enum WindowFrameOffset { - Scalar(ScalarValue), - Interval { - months: i32, - days: i32, - nanoseconds: i64, - }, -} - -#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] -#[serde(rename_all = "snake_case")] -pub enum WindowFrameUnits { - /// Boundaries count physical rows: `ROWS BETWEEN 2 PRECEDING AND CURRENT ROW`. - Rows, - /// Boundaries count by value-distance on the (single) `ORDER BY` column: - /// `RANGE BETWEEN INTERVAL '1' HOUR PRECEDING AND CURRENT ROW`. - Range, -} - -#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] -#[serde(rename_all = "snake_case")] -pub enum WindowFrameBound { - /// `UNBOUNDED PRECEDING` is - /// `Preceding(WindowFrameOffset::Scalar(ScalarValue::Null))`. - Preceding(WindowFrameOffset), - CurrentRow, - /// `UNBOUNDED FOLLOWING` is - /// `Following(WindowFrameOffset::Scalar(ScalarValue::Null))`. - Following(WindowFrameOffset), -} - -/// A symbolic label matcher on the **info metric** side of an -/// [`QueryExpr::PromqlInfoEnrich`] (issue #84). Unlike a `Scan` predicate it is not -/// resolved positionally — it references the info metric's labels (`__name__` -/// picks the metric, the rest constrain data labels), which aren't in the input -/// vector's schema; the post-ASAP realization pass applies it against the info metric. -#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] -pub struct InfoMatcher { - pub label: String, - /// One of `Eq` / `Ne` / `Regex` / `NotRegex` (PromQL `=`/`!=`/`=~`/`!~`). - pub op: CompareOpKind, - pub value: String, -} - -/// Series-sampling selection mode (PromQL `limitk` / `limit_ratio`, issue #86). -/// A [`QueryExpr::PromqlSeriesSample`] keeps a *subset of whole series*, unchanged — it does -/// not rank or reduce, so it is distinct from `TopK` and from `Sort → Limit`. -#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)] -#[serde(rename_all = "snake_case")] -pub enum SampleKind { - /// `limitk(k, v)` — up to `k` series per group. Which series survive is - /// deterministic across evaluations but otherwise unspecified (no ordering). - LimitK(usize), - /// `limit_ratio(r, v)` — a deterministic `r`-fraction of series per group. - /// `r ∈ [-1, 1]`; a negative `r` selects the complementary fraction. - LimitRatio(f64), -} - -#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] -#[serde(bound(serialize = "C: ColState", deserialize = "C: ColState"))] -pub struct SortKey { - pub expr: QueryExpr, - pub ascending: bool, - pub nulls_first: bool, -} - -/// PromQL vector-match modifier (`on`/`ignoring` + `group_left`/`group_right`). -#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] -pub struct VectorMatch { - pub kind: VectorMatchKind, - pub labels: Vec, - pub grouping: Option, -} - -/// PromQL `@` modifier — pins a selector's evaluation time to an anchor instead -/// of the query evaluation time (issue #40). -#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)] -pub enum AtModifier { - /// `@ start()` — the query range's start instant. - Start, - /// `@ end()` — the query range's end instant. - End, - /// `@ ` — an absolute instant, milliseconds since the Unix epoch (may be - /// negative). PromQL writes the timestamp in seconds; the front end scales it. - Timestamp(i64), -} - -/// PromQL per-selector **time-shift** modifiers — `offset` and `@` (issue #40). -/// Neither changes a selector's *schema*; both move *when* it is evaluated, so -/// the shift is a pass-through wrapper ([`QueryExpr::TimeShift`]) over the -/// selector rather than a new leaf shape. The runtime resolves the anchor and -/// applies the offset. -#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Serialize, Deserialize)] -pub struct TimeShift { - /// `offset ` as signed milliseconds — a positive value shifts the - /// lookback *back* in time (`offset 5m`), a negative value shifts it - /// *forward* (`offset -5m`). `0` = no offset. - pub offset_ms: i64, - /// `@` anchor; `None` = evaluate at the query time. - pub at: Option, -} - -impl TimeShift { - /// Whether this shift is the identity (no `offset`, no `@`) — the state of - /// every selector that carries neither modifier. - pub fn is_identity(&self) -> bool { - self.offset_ms == 0 && self.at.is_none() - } -} - -#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] -pub enum VectorMatchKind { - On, - Ignoring, -} - -#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] -pub struct VectorGrouping { - pub side: GroupSide, - pub labels: Vec, -} - -#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] -pub enum GroupSide { - Left, - Right, -} - -/// A row-level filter predicate (WHERE clause / PromQL label matcher). -/// Boxed: `Predicate` sits directly (not behind a `Vec`) in -/// `Filter.pred`/`Join.pred`/`Aggregate.having`, and `QueryExpr` is -/// self-recursive without further indirection once the scalar variants are -/// part of it — the box is what makes the recursive type's size finite there. -#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] -#[serde(bound(serialize = "C: ColState", deserialize = "C: ColState"))] -pub struct Predicate(pub Rc>); - -/// Whether any entry of an `Aggregate.filters` vector is set — the shape -/// no binding rule accepts yet (issue #466): a filtered measure stays -/// `KeepPreAsap`, and heavy-hitter promotion skips it. -pub fn any_measure_filtered(filters: &[Option>]) -> bool { - filters.iter().any(Option::is_some) -} - -/// One item in a SELECT projection list. -#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] -#[serde(bound(serialize = "C: ColState", deserialize = "C: ColState"))] -pub struct ProjectItem { - pub alias: Option, - pub expr: QueryExpr, -} - -// ── Intent algebra IR ──────────────────────────────────────────────────────── - -/// What kind of computation an `Aggregate` node performs — orthogonal to -/// *which* columns it groups by (that's still [`GroupKeys`], inside -/// `Reduce`). Explicit, decided once by whichever pass constructs the node -/// (structural, at front-end lowering time), rather than inferred downstream from -/// whether a grouping-key list happens to be empty or from a neighboring -/// node's shape. See design proposal #165. -#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] -pub enum Reduction { - /// Collapses input rows via `by` — `by`/`without` semantics are exactly - /// [`GroupKeys`]'s. May still collapse every row into one (an empty, - /// non-`without` `by`) — that's a genuine reduction with zero grouping - /// columns, not "no grouping concept." - Reduce(GroupKeys), - /// No grouping concept at all: preserves one output row per input - /// entity (e.g. a per-series windowed computation with no `by(...)` - /// clause to begin with, because there's no aggregation operator here - /// for such a clause to attach to). Never merges across entities, and - /// never collapses an entity's own row structure (e.g. a time axis) — - /// unlike `Reduce(GroupKeys::without(vec![]))` ("group by every - /// label"), which is still a genuine reduction and does collapse it. - PerEntity, -} - -impl Reduction { - /// Shorthand for the common case — group by these (possibly empty) - /// keys, kept rather than excluded. - pub fn by(keys: Vec) -> Self { - Self::Reduce(GroupKeys::by(keys)) - } - - /// The grouping keys, if this is a genuine reduction — `None` for - /// `PerEntity`, which has no grouping-keys concept to report. - pub fn group_keys(&self) -> Option<&GroupKeys> { - match self { - Self::Reduce(by) => Some(by), - Self::PerEntity => None, - } - } - - /// The grouping keys, panicking if this is `PerEntity` — for call sites - /// (tests, mostly) that already know, from the shape they built or are - /// asserting on, that this must be a genuine reduction. Prefer - /// [`group_keys`](Self::group_keys) wherever the caller can't assume that. - pub fn expect_reduce(&self) -> &GroupKeys { - match self { - Self::Reduce(by) => by, - Self::PerEntity => panic!("expected Reduction::Reduce, got PerEntity"), - } - } -} - -/// A caller-proven compound unique key for a [`QueryExpr::Concat`] (issue -/// #228) — built only via [`QueryExpr::concat_with_discriminator`] / -/// [`ConcatDiscriminatorKey::new`], never by naming `discriminator` directly -/// in a struct literal (both fields are private): from *other Rust code*, -/// the only way to end up with one of these is to hand over a specific -/// column as the discriminator, by name, at the call site. -/// -/// Caveat: this is a Rust-API-level guarantee, not a data-level one. The -/// derived `Deserialize` impl below builds a `ConcatDiscriminatorKey` -/// directly from field values, bypassing `new()`. Deserialization is therefore -/// equivalent to a caller supplying the assertion directly; it does not prove -/// either fact below. An external boundary accepting `QueryExpr` data must -/// reject this field or validate both obligations before treating it as -/// uniqueness evidence. -/// -/// # Soundness -/// -/// `Concat`'s default (see its own doc) is to drop `unique_keys` -/// unconditionally, because a key unique **within** one branch is not unique -/// **across** the concatenation unless the branches' value sets for that key -/// are provably disjoint — nothing about matching schemas or matching -/// per-branch keys establishes that on its own. Two different branches can -/// trivially emit the same `inner_key` value (e.g. two PromQL -/// `histogram_quantiles` branches keyed on `(host, le)` can both produce a -/// `(host, le)` pair for different φ). -/// -/// Prepending `discriminator` restores a compound key only when two facts -/// hold: `inner_key` uniquely identifies rows **within every branch**, and -/// `discriminator`'s value is **guaranteed to differ between branches** — a -/// literal the producer just tagged the branch with (PromQL φ riding along via -/// [`QueryExpr::PromqlRelabel`], a Postgres-style synthetic `GROUPING()` id -/// for `ROLLUP`/`CUBE`, …), never something inferred structurally from the -/// branches' own data — then `discriminator` alone partitions rows into -/// disjoint sets independent of what the branches actually contain, so -/// `(discriminator, inner_key)` is sound even when otherwise-identical -/// `inner_key` values occur in different branches. Neither fact is verified -/// here; both are part of the caller-proven claim. -/// -/// This is a **caller-proven claim, not something `Concat` can verify**: -/// nothing stops a caller from asserting a discriminator that in fact -/// repeats across branches, in which case the resulting `unique_keys` claim -/// is simply wrong — `output_schema` trusts it without checking. The -/// obligation is on the constructor call site, exactly as it is on -/// [`QueryExpr::Dedup`]'s `cols` or any other unverified `unique_keys` -/// producer in this module. -#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] -#[serde(deny_unknown_fields)] -#[serde(bound(serialize = "C: ColState", deserialize = "C: ColState"))] -pub struct ConcatDiscriminatorKey { - discriminator: C, - inner_key: Vec, -} - -impl ConcatDiscriminatorKey { - /// The only constructor — `discriminator` must be named explicitly by - /// the caller. See the type's doc for the soundness obligation this - /// puts on that caller. - pub fn new(discriminator: C, inner_key: Vec) -> Self { - Self { - discriminator, - inner_key, - } - } - - pub fn discriminator(&self) -> &C { - &self.discriminator - } - - pub fn inner_key(&self) -> &[C] { - &self.inner_key - } -} - -#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] -#[serde(bound(serialize = "C: ColState", deserialize = "C: ColState"))] -pub enum QueryExpr { - /// Outermost leaf. `schema` is the **binding schema** — the resolved column - /// set every positional `ColumnId` in the DAG indexes into, *not* a full - /// description of the runtime row — once bound (`schema: Schema`, always - /// present: the [`SchemaResolver`](super::schema_resolver) is total). Before binding, a - /// front-end-emitted `Scan` (`C = ColumnRef`) knows it only when the front - /// end already has it without binding — a catalog-backed SQL leaf — `None` - /// (PromQL) defers to the SchemaResolver; see [`ColState::ScanSchema`]. Complete - /// when catalog-backed (SQL); for schemaless PromQL the bound schema is - /// usage-derived (the `(ts, value)` floor + the labels the query - /// references), since a metric's label set is open and known only at - /// runtime. That distinction is carried explicitly by - /// [`Schema::closed`](super::schema::Schema::closed) (SQL leaf → `true`, - /// PromQL leaf → `false`). `predicates` are leaf-level row filters (PromQL - /// label matchers, pushed-down `WHERE` conjuncts). - Scan { - source: Source, - #[serde(default)] - predicates: Vec>, - schema: C::ScanSchema, - }, - /// A scalar sub-expression sitting in an **operator-DAG position** — a - /// [`BinaryOp`](Self::BinaryOp) operand for ` op ` - /// thresholds / unit conversions (#35), a - /// [`PromqlVectorFromScalar`](Self::PromqlVectorFromScalar) child, or a - /// whole query's root (a bare PromQL scalar query, e.g. `5`). - /// - /// Formerly its own leaf variant, `PromqlScalar(f64)`. Issue #220: that - /// variant held exactly the same value [`Literal`](Self::Literal) does - /// (every PromQL scalar is `f64`), duplicating it for no reason but - /// *which DAG position* it was allowed to appear in. This wrapper - /// carries that position instead of the value — the inner node is an - /// ordinary scalar sub-language expression (in practice always - /// `Literal(ScalarValue::Float64(_))`, since a front end only ever - /// constructs this fully constant-folded — see - /// [`promql_scalar`](Self::promql_scalar)) — and is what `output_schema`, - /// `canonicalize`, and `resolve` now key off to tell "this operand has - /// its own row schema" from "this is a nested scalar leaf with none," - /// in place of the old `PromqlScalar` vs. `Literal` variant tag. - PromqlScalarBridge(Rc>), - - /// The query **evaluation timestamp** as Unix seconds, exposed by PromQL - /// `time()`. This is not inherently the current wall-clock time: its value - /// is the instant or range-step at which the expression is evaluated. It - /// is also the implicit input of no-argument calendar functions. Issue #46. - EvalTimestamp, - - /// The SQL statement evaluation time (`NOW()` / `CURRENT_TIMESTAMP`) as - /// a SQL [`DataType::Timestamp`]. Kept distinct from [`EvalTimestamp`], - /// whose PromQL `time()` contract is Unix seconds as `Float64`. - CurrentTimestamp, - - /// PromQL `vector(s)` — the scalar→instant-vector bridge. Promotes a - /// scalar-typed child to a single label-less series carrying the scalar's - /// value at every step. Lets a scalar participate where a vector is required - /// (`up or vector(0)` dead-man's-switch). Issue #48. - PromqlVectorFromScalar(Rc>), - - /// PromQL `scalar(v)` — the instant-vector→scalar bridge. Collapses a - /// single-element vector to its value (NaN at runtime if the input is not - /// exactly one series). Lets a vector feed a scalar position (`vector` / - /// aggregation `k` args, thresholds). Issue #48. - PromqlScalarFromVector(Rc>), - - /// ρ — a per-series **label rewrite** (PromQL `label_replace` / - /// `label_join`). Every input row passes through unchanged except for the - /// destination label `dst`, whose new value is computed by `value` — a - /// scalar expression over the child's (source) label columns: - /// `label_replace` → a `label_replace(src, regex, replacement)` function - /// call (regex capture-expansion), `label_join` → a `label_join(sep, srcs…)` - /// concatenation. Sample values and the time axis are untouched. Issue #50. - PromqlRelabel { - /// The label written by this rewrite (PromQL `dst_label`). - dst: String, - value: Rc>, - child: Rc>, - }, - - /// PromQL `info(v, [selector])` — left-join **label enrichment** (#84). Each - /// series in `child` is enriched with labels from the matching info metric(s) - /// (`target_info` by default; `selector`'s `__name__` matchers pick the - /// metric(s), the rest constrain the data labels), joined on their shared - /// identifying labels. Those join keys are the info metric's identifying - /// labels — runtime/metadata-resolved, since an open PromQL schema can't - /// enumerate them — so they are NOT carried here; the post-ASAP realization pass - /// resolves them from the info metric's schema. The output keeps - /// `child`'s (open) schema: the - /// grafted labels appear at runtime. - PromqlInfoEnrich { - #[serde(default)] - selector: Vec, - child: Rc>, - }, - - /// Series-sampling **selection** — PromQL `limitk` / `limit_ratio` (#86). - /// Keeps a subset of whole series per `by` group (empty = global), passing - /// each surviving series through unchanged. Not a ranking (`TopK`) and not a - /// reduction: the output schema equals the child's. - PromqlSeriesSample { - #[serde(default)] - by: GroupKeys, - kind: SampleKind, - child: Rc>, - }, - - /// σ — row-level filter. Output schema = child schema. - Filter { - pred: Predicate, - child: Rc>, - }, - /// π — column projection. - Project { - cols: Vec>, - /// Re-qualifies every output column with this table alias (a derived - /// table / inline view). `None` for an ordinary SELECT list. - #[serde(default)] - qualifier: Option, - child: Rc>, - }, - - /// γ + α — GROUP BY (positional) + aggregate intents. - Aggregate { - reduction: Reduction, - measures: Vec>, - /// Output column names parallel to `measures`. A non-empty entry overrides - /// the synthetic intent-keyed name — SQL threads DataFusion's generated - /// name (e.g. `"sum(metrics.bytes)"`) here so an enclosing `Project` - /// resolves the aggregate output by the name it references. An empty - /// entry (or empty vec) falls back to `AggIntent::output_column`'s name - /// (PromQL's convention). - #[serde(default)] - output_names: Vec, - /// Per-measure row predicates, parallel to `measures` — SQL - /// `FILTER (WHERE …)` semantics (issue #466): only rows where - /// `filters[i]` is `TRUE` update `measures[i]`; groups are still - /// formed from every row. Positional against `child`'s output - /// schema, like `Filter.pred` — not against this node's output like - /// `having`. `None` (or an entry past the end of a shorter vec) is - /// an unfiltered measure, so an empty vec is the pre-#466 shape. - #[serde(default)] - filters: Vec>>, - #[serde(default)] - having: Option>, - child: Rc>, - }, - - /// δ — SQL `DISTINCT` / row deduplication. Positional like every other - /// column reference here; empty = dedup on all columns (`SELECT DISTINCT *`). - Dedup { - cols: Vec, - child: Rc>, - }, - /// ⊕ — exact, n-ary `UNION ALL` of independent branches. Rows are - /// concatenated, never deduplicated; SQL's `UNION`/`INTERSECT`/`EXCEPT` are - /// [`QueryExpr::SetOp`], not this. - /// - /// Used for the branches of one query that a single `Aggregate` cannot - /// express — PromQL `histogram_quantiles` (one branch per φ, issue #109) and - /// SQL `ROLLUP`/`CUBE`/`GROUPING SETS` (one branch per grouping level, issue - /// #118) — as well as for sharded / fan-in plans. - /// - /// **The branches must be union-compatible; nothing here enforces it.** The - /// output schema is the *first* child's, so branches that disagree on a - /// column name or type leave the merged schema silently misdescribing every - /// branch but one. A producer that cannot guarantee compatibility must - /// project the branches into a common shape first. - /// - /// A row may appear in several branches, so no branch's unique key survives - /// the union — `unique_keys` is dropped, as in `SetOp`. **Unless** the - /// constructor asserted `discriminator_unique_key` (issue #228, - /// [`QueryExpr::concat_with_discriminator`]): a caller-proven claim that - /// one column's value is guaranteed distinct per branch, which makes - /// `(discriminator, inner_key)` a sound compound unique key regardless of - /// whether `inner_key` alone repeats across branches. `None` — every - /// ordinary construction path, including the plain struct literal and - /// [`QueryExpr::concat`] — reproduces the old, unconditional-drop - /// behavior exactly; see [`ConcatDiscriminatorKey`]'s doc for the - /// soundness argument and the obligation this puts on whoever asserts it. - /// - /// Empty children is an error ([`QueryExprError::EmptyConcat`]), not an - /// empty relation: there would be no schema to derive. - Concat { - children: Vec>, - /// See the field-level doc above and [`ConcatDiscriminatorKey`]. - #[serde(default)] - discriminator_unique_key: Option>, - }, - - /// Logical join. Post-ASAP binding picks the physical alternative. - Join { - kind: JoinKind, - pred: Predicate, - left: Rc>, - right: Rc>, - }, - SetOp { - kind: RelationalSetOpKind, - all: bool, - left: Rc>, - right: Rc>, - }, - - /// Generic order-by for non-heavy-hitter cases. - /// - /// `partition_by` makes the ordering **per-group**: a non-empty set means - /// "rank within each `partition_by` group" — the semantics behind PromQL - /// `topk by (host) (…)` / SQL `… OVER (PARTITION BY host ORDER BY …)`. It is - /// row-preserving (schema pass-through) and is where the grouping of a - /// generic (non-heavy-hitter) ranking lives, so there is no separate - /// `Partition` node (issue #12: reducing GROUP BY → `Aggregate.by`, per-group - /// ranking → here, parallel sharding → a deployment's own physical - /// stage). Empty = a global order-by. - Sort { - keys: Vec>, - #[serde(default)] - partition_by: GroupKeys, - child: Rc>, - }, - Limit { - n: usize, - offset: usize, - child: Rc>, - }, - - /// PromQL sub-query (`[range:resolution]`). Logical pass-through. - PromqlSubquery { - range: Duration, - #[serde(default)] - resolution: Option, - child: Rc>, - }, - - /// Temporal range selection — "look back `range` of history for this - /// computation." Used for all range-vector functions: `rate`, `increase`, - /// `*_over_time`. The range is distinct from a row-level `Filter`. - /// - /// Structural marker: an `Aggregate` whose direct child is a `TimeRange` - /// is a *per-series* reduction (label-preserving); one whose child is a - /// plain `Scan` or another `Aggregate` is a *cross-series* reduction. - TimeRange { - range: Duration, - child: Rc>, - }, - - /// PromQL `offset` / `@` **time shift** on a selector (issue #40). A - /// pass-through wrapper: it moves *when* `child` is evaluated (the runtime - /// resolves the `@` anchor and applies the offset) but leaves its schema - /// unchanged. Wraps the shifted selector directly — `m offset 1h` → - /// `TimeShift { Scan }`; a ranged selector `m[5m] offset 1h` → - /// `TimeRange { 5m, TimeShift { Scan } }` (the range is taken at the shifted - /// time). A shifted subquery wraps the `PromqlSubquery`, moving its step - /// grid. Never carries the identity shift (the converter emits a bare - /// selector when neither modifier is present). - TimeShift { - shift: TimeShift, - child: Rc>, - }, - - /// SQL analytic window function: `func(args) OVER (PARTITION BY … ORDER BY … - /// ROWS/RANGE BETWEEN …)`. Output schema = child schema + one column named - /// `output_name` (the name the enclosing `Project` references). - SQLWindowFunc { - func: WindowFuncKind, - /// Operand expressions (`LAG(value)` → `[Column(value_id)]`); empty for - /// the rank-only functions (`ROW_NUMBER`/`RANK`/`DENSE_RANK`). - args: Vec>, - partition_by: GroupKeys, - order_by: Vec>, - /// `None` is accepted only for backward compatibility with serialized - /// pre-#268 IR, where the engine's implicit frame was not retained. - /// Newly lowered SQL always carries `Some` with DataFusion's resolved - /// concrete default or explicit frame. - #[serde(default)] - frame: Option, - /// The output column's name — DataFusion's window-expr field name, so a - /// `Project` above resolves it (cf. `Aggregate.output_names`). - output_name: String, - child: Rc>, - }, - - /// Arithmetic / comparison / boolean composition (PromQL binary ops). - BinaryOp { - op: BinaryOpKind, - lhs: Rc>, - rhs: Rc>, - #[serde(default)] - vector_match: Option, - }, - - // ── Scalar expression shapes (issue #205) ─────────────────────────── - // - // Formerly a separate, self-recursive `Expr` DAG, reachable from the - // operator variants above only through wrapper fields (`Predicate`, - // `ProjectItem`, `SortKey`). They're variants of this same DAG now — a - // scalar sub-expression is only ever reachable through one of those same - // wrapper positions (`Filter.pred`, `ProjectItem.expr`, `Aggregate.having`, - // `PromqlRelabel.value`, `SQLWindowFunc.args`, …), which is a *convention* this - // type no longer enforces at compile time the way the old, closed - // `Expr` variant set did — nothing stops constructing, say, a `Scan` - // where a `Compare`'s `left` operand belongs. `output_schema` and every - // scalar-position consumer (`resolve`, `canonicalize`, `infer_expr_type`) - // reject a non-scalar variant found there instead (a `QueryExprError` or - // an `unreachable!`, depending on the call site) — the accepted - // replacement, since the alternative (a marker-trait/sub-enum bound - // restricting which variants are constructible in a scalar position) adds - // real type-level machinery for a distinction every constructor already - // has to get right structurally anyway (a `Filter` is never built with an - // operator sub-DAG as its `pred`). - /// A column reference — unresolved [`ColumnRef`] (front-end-emitted, `C = - /// ColumnRef`) or positional [`ColumnId`] (once bound, `C = ColumnId`). - Column(C), - /// A constant literal value. - Literal(ScalarValue), - /// `left op right` — binary comparison. - Compare { - left: Rc>, - op: CompareOpKind, - right: Rc>, - }, - /// Flat conjunction (logical AND). An empty list is vacuously true. - BoolAnd(Vec>), - /// Flat disjunction (logical OR). An empty list is vacuously false. - BoolOr(Vec>), - /// Logical NOT. - Not(Rc>), - /// `expr IS NULL`. - IsNull(Rc>), - /// `expr IS NOT NULL`. - IsNotNull(Rc>), - /// `CAST(expr AS to)`; `try_cast` for SQL `TRY_CAST` (NULL on failure). - Cast { - expr: Rc>, - to: DataType, - try_cast: bool, - }, - /// `expr [NOT] IN (v1, v2, …)`. - InList { - expr: Rc>, - list: Vec>, - negated: bool, - }, - /// Scalar function call, e.g. `LOWER(col)`, `ABS(x)`. - FunctionCall { - name: String, - args: Vec>, - }, - /// Binary arithmetic: `left op right`. - Arithmetic { - op: ArithmeticOpKind, - left: Rc>, - right: Rc>, - }, - /// SQL `CASE` (both searched and simple forms). `operand` present for the - /// simple form (`CASE expr WHEN …`), absent for searched. - Case { - operand: Option>>, - branches: Vec<(QueryExpr, QueryExpr)>, - else_expr: Option>>, - }, -} - -impl QueryExpr { - /// Construct the [`PromqlScalarBridge`](Self::PromqlScalarBridge) leaf - /// for a bare PromQL numeric literal / folded constant scalar (issue - /// #220) — `Literal(ScalarValue::Float64(v))` at an operator-DAG - /// position. The one constructor every front end / test that used to - /// write `QueryExpr::PromqlScalar(v)` should use instead. - pub fn promql_scalar(v: f64) -> Self { - QueryExpr::PromqlScalarBridge(Rc::new(QueryExpr::Literal(ScalarValue::Float64(v)))) - } - - /// Build an ordinary [`Concat`](Self::Concat) — the ordinary/default - /// construction path every call site should prefer over the bare struct - /// literal: `output_schema` drops `unique_keys` unconditionally, exactly - /// as before issue #228. Use - /// [`concat_with_discriminator`](Self::concat_with_discriminator) instead - /// when the caller can prove branch disjointness via a discriminator - /// column. - pub fn concat(children: Vec>) -> Self { - QueryExpr::Concat { - children, - discriminator_unique_key: None, - } - } - - /// Build a [`Concat`](Self::Concat) whose output schema carries the - /// caller-proven compound unique key `(discriminator, inner_key)` (issue - /// #228). See [`ConcatDiscriminatorKey`]'s doc for the soundness - /// argument and the obligation this puts on the caller — - /// `output_schema` trusts this claim without verifying it: nothing here - /// checks that `inner_key` is unique within every branch or that - /// `discriminator`'s value is distinct between branches. - pub fn concat_with_discriminator( - children: Vec>, - discriminator: C, - inner_key: Vec, - ) -> Self { - QueryExpr::Concat { - children, - discriminator_unique_key: Some(ConcatDiscriminatorKey::new(discriminator, inner_key)), - } - } - - /// The value of a [`PromqlScalarBridge`](Self::PromqlScalarBridge) leaf - /// wrapping a plain `Literal(ScalarValue::Float64(_))` — every one a - /// front end constructs today (see [`promql_scalar`](Self::promql_scalar)). - /// `None` for any other shape, including a `PromqlScalarBridge` wrapping - /// something else (not constructed today, but not precluded by the type). - pub fn as_promql_scalar(&self) -> Option { - match self { - QueryExpr::PromqlScalarBridge(inner) => match inner.as_ref() { - QueryExpr::Literal(ScalarValue::Float64(v)) => Some(*v), - _ => None, - }, - _ => None, - } - } - - /// If this expression is a `BoolAnd`, return its elements; otherwise a - /// single-element slice containing `self`. - pub fn conjuncts(&self) -> &[QueryExpr] { - match self { - QueryExpr::BoolAnd(v) => v.as_slice(), - _ => std::slice::from_ref(self), - } - } - - /// If this expression is a `BoolOr`, return its elements; otherwise a - /// single-element slice containing `self`. - pub fn disjuncts(&self) -> &[QueryExpr] { - match self { - QueryExpr::BoolOr(v) => v.as_slice(), - _ => std::slice::from_ref(self), - } - } - - /// Recursively collect every column reference in a **scalar** sub-DAG — - /// used by the [`SchemaResolver`](super::schema_resolver::SchemaResolver) to seed usage-derived - /// leaf schemas, and available to post-ASAP binding for column-lineage / - /// selectivity. - /// `self` must be one of the scalar variants (see the module doc on - /// [`QueryExpr`]'s scalar shapes) — every caller already only reaches - /// this through a scalar-typed position (`Predicate`, `ProjectItem.expr`, - /// …), so an operator variant here indicates a construction bug, not a - /// shape this needs to handle silently. - pub fn columns_referenced(&self) -> Vec<&C> { - match self { - QueryExpr::Column(c) => vec![c], - QueryExpr::Literal(_) => vec![], - QueryExpr::EvalTimestamp => vec![], - QueryExpr::CurrentTimestamp => vec![], - QueryExpr::Compare { left, right, .. } | QueryExpr::Arithmetic { left, right, .. } => { - let mut v = left.columns_referenced(); - v.extend(right.columns_referenced()); - v - } - QueryExpr::BoolAnd(parts) | QueryExpr::BoolOr(parts) => { - parts.iter().flat_map(|e| e.columns_referenced()).collect() - } - QueryExpr::Not(e) | QueryExpr::IsNull(e) | QueryExpr::IsNotNull(e) => { - e.columns_referenced() - } - QueryExpr::Cast { expr, .. } => expr.columns_referenced(), - QueryExpr::InList { expr, list, .. } => { - let mut v = expr.columns_referenced(); - v.extend(list.iter().flat_map(|e| e.columns_referenced())); - v - } - QueryExpr::FunctionCall { args, .. } => { - args.iter().flat_map(|e| e.columns_referenced()).collect() - } - QueryExpr::Case { - operand, - branches, - else_expr, - } => { - let mut v = vec![]; - if let Some(op) = operand { - v.extend(op.columns_referenced()); - } - for (when, then) in branches { - v.extend(when.columns_referenced()); - v.extend(then.columns_referenced()); - } - if let Some(e) = else_expr { - v.extend(e.columns_referenced()); - } - v - } - other => unreachable!( - "columns_referenced called on a non-scalar QueryExpr variant: {other:?}" - ), - } - } -} - -/// The canonical, positional, resolved DAG — what the bare `QueryExpr` name -/// has always meant (the default `C = ColumnId`). Every existing consumer -/// keeps using `QueryExpr` unparameterized; this alias exists only to name -/// the resolved state explicitly at a use site that also wants to name -/// [`UnresolvedQueryExpr`] nearby. -pub type ResolvedQueryExpr = QueryExpr; - -/// The front-end-emitted, name-based, unresolved DAG — -/// `QueryExpr`: front ends construct this directly during their -/// own `interpret` step (issue #179), and the [`SchemaResolver`](super::schema_resolver) -/// resolves it into [`ResolvedQueryExpr`]. -pub type UnresolvedQueryExpr = QueryExpr; - -// `output_schema` needs a fully bound DAG — it reads `Scan.schema` as a plain -// `Schema` and resolves every scalar `Expr::Column` positionally — so it lives -// only on the resolved instantiation, not `impl QueryExpr`. -// Same reasoning as `AggIntent`'s `output_column`/`requires`/`is_per_series` -// (#205): a schema-shaped property that is only meaningful post-binding. -impl QueryExpr { - /// Infer a scalar expression against its input relation using the same - /// canonical rules as projection schema derivation. - pub fn scalar_type(&self, input: &Schema) -> Result<(DataType, bool), QueryExprError> { - infer_expr_type(self, input) - } - - /// Output schema of the root of a canonical DAG. - pub fn output_schema(&self) -> Result { - match self { - QueryExpr::Scan { schema, .. } => Ok(schema.clone()), - - QueryExpr::Aggregate { - reduction, - measures, - output_names, - child, - .. - } => { - let in_schema = child.output_schema()?; - aggregate_output_schema(&in_schema, reduction, measures, output_names) - } - - QueryExpr::Filter { child, .. } - | QueryExpr::Sort { child, .. } - | QueryExpr::Limit { child, .. } - | QueryExpr::PromqlSubquery { child, .. } - // Series sampling keeps a subset of whole series unchanged, so the - // output schema (and row-uniqueness) is exactly the child's (#86). - | QueryExpr::PromqlSeriesSample { child, .. } - // Info enrichment adds runtime info labels — the statically-known - // schema is the child's (open), so it passes through (#84). - | QueryExpr::PromqlInfoEnrich { child, .. } - | QueryExpr::TimeRange { child, .. } - // A time shift (`offset`/`@`) moves *when* the child is evaluated, - // never its columns — schema passes through (#40). - | QueryExpr::TimeShift { child, .. } => child.output_schema(), - - // ρ — relabel preserves every input column and writes one label - // `dst` (Utf8): overwritten in place if it already exists, else - // appended (nullable — a `label_replace` regex non-match leaves it - // unset). The schema stays open (other labels remain runtime-only). - // A rewrite can collapse two label sets into one, so row-uniqueness - // is no longer provable — drop unique_keys. - QueryExpr::PromqlRelabel { dst, child, .. } => { - let mut out = child.output_schema()?; - if let Some(existing) = out.fields.iter_mut().find(|c| c.name == *dst) { - existing.dtype = FieldDataType::Plain(DataType::Utf8); - existing.nullable = true; - } else { - out.fields.push(Field::plain(dst.clone(), DataType::Utf8, true)); - } - out.unique_keys.clear(); - Ok(out) - } - - // π — one output column per projection item. Each item's type is - // inferred from its expression against the child schema; the name - // is the explicit alias or a derived default. A child unique key - // survives exactly when every one of its columns is passed through - // as a bare `Field` item (possibly reordered or aliased). Derived - // expressions cannot carry key identity. `time_index` is re-found - // by name. - QueryExpr::Project { cols, qualifier, child } => { - let in_schema = child.output_schema()?; - let columns: Vec = cols - .iter() - .enumerate() - .map(|(i, item)| { - let (dtype, nullable) = infer_expr_type(&item.expr, &in_schema)?; - let name = item - .alias - .clone() - .unwrap_or_else(|| default_proj_name(&item.expr, i, &in_schema)); - let c = Field::plain(name, dtype, nullable); - // A derived table re-qualifies its output columns with - // its alias, so `t.col` (and a join over two derived - // tables) resolves to the right relation. - Ok(match qualifier { - Some(q) => c.with_table(q), - None => c, - }) - }) - .collect::, QueryExprError>>()?; - let time_index = columns.iter().position(|c| c.name == "ts"); - let unique_keys = in_schema - .unique_keys - .iter() - .filter_map(|key| { - key.iter() - .map(|input_col| { - cols.iter().position(|item| { - matches!(&item.expr, QueryExpr::Column(col) if col == input_col) - }) - }) - .collect::>>() - }) - .collect(); - Ok(Schema { - fields: columns, - time_index, - unique_keys, - // Projection enumerates exactly its items → closed. - closed: true, - }) - } - - QueryExpr::Dedup { cols, child } => { - let mut out = child.output_schema()?; - // Deduplicating on `cols` makes them a unique key of the result. - if !cols.is_empty() { - out.add_unique_key(cols.clone()); - } - Ok(out) - } - - // ⊕ — the branches are union-compatible by construction, so the - // output shape is the first child's. A row can appear in more than - // one branch, so no key of one branch is a key of the union: drop - // unique_keys, exactly as `SetOp` does — unless the constructor - // asserted `discriminator_unique_key` (issue #228), in which case - // `(discriminator, inner_key)` becomes the sole unique key. That - // assertion is trusted verbatim here, never checked: see - // `ConcatDiscriminatorKey`'s doc for the soundness argument and - // whose obligation it is. - QueryExpr::Concat { - children, - discriminator_unique_key, - } => { - let mut s = children - .first() - .ok_or(QueryExprError::EmptyConcat) - .and_then(|c| c.output_schema())?; - s.unique_keys.clear(); - if let Some(key) = discriminator_unique_key { - let mut compound = vec![*key.discriminator()]; - compound.extend(key.inner_key().iter().copied()); - s.add_unique_key(compound); - } - Ok(s) - } - // Set operations are union-compatible: both sides share the left's - // column shape, so the output schema is the left's. (Row identity - // is not preserved across a UNION, so unique_keys are dropped.) - QueryExpr::SetOp { left, .. } => { - let mut s = left.output_schema()?; - s.unique_keys.clear(); - Ok(s) - } - // ⋈ — output is the concatenation of both inputs' columns. Outer - // joins make the non-preserved side nullable. Post-join row - // identity isn't provable in general, so unique_keys reset. - QueryExpr::Join { - kind, left, right, .. - } => { - let l = left.output_schema()?; - let r = right.output_schema()?; - // Semi / anti joins filter the left side; the right contributes - // no columns, so the output is the left's schema unchanged. Row - // identity *is* preserved (each left row appears at most once), - // but a left row can be dropped, so unique_keys still reset. - if matches!(kind, JoinKind::Semi | JoinKind::Anti) { - return Ok(Schema { - unique_keys: Vec::new(), - ..l - }); - } - let (left_null, right_null) = match kind { - JoinKind::Left => (false, true), - JoinKind::Right => (true, false), - JoinKind::Full => (true, true), - JoinKind::Inner | JoinKind::Cross => (false, false), - JoinKind::Semi | JoinKind::Anti => unreachable!("handled above"), - }; - let l_len = l.fields.len(); - let mut columns = Vec::with_capacity(l_len + r.fields.len()); - columns.extend(l.fields.iter().cloned().map(|mut c| { - c.nullable |= left_null; - c - })); - columns.extend(r.fields.iter().cloned().map(|mut c| { - c.nullable |= right_null; - c - })); - let time_index = l.time_index.or(r.time_index.map(|i| i + l_len)); - Ok(Schema { - fields: columns, - time_index, - unique_keys: Vec::new(), - // The concatenation is complete only if both sides are. - closed: l.closed && r.closed, - }) - } - // ψ-analytic — child schema + one appended window-output column. - QueryExpr::SQLWindowFunc { - func, - args, - output_name, - child, - .. - } => { - let mut out = child.output_schema()?; - // First operand's (dtype, nullable) from the child schema, owned - // so the borrow ends before we append. - let arg = args.first().and_then(|a| match a { - QueryExpr::Column(id) => out.fields.get(*id), - _ => None, - }); - let arg_dtype = || { - arg.and_then(|c| c.plain_dtype().cloned()) - .unwrap_or(DataType::Float64) - }; - let (dtype, nullable) = match func { - WindowFuncKind::RowNumber - | WindowFuncKind::Rank - | WindowFuncKind::DenseRank - | WindowFuncKind::Count => (DataType::Int64, false), - WindowFuncKind::Sum | WindowFuncKind::Avg => (DataType::Float64, true), - // Navigation funcs: arg type, nullable (boundary rows are NULL). - WindowFuncKind::Lag - | WindowFuncKind::Lead - | WindowFuncKind::LagInFrame - | WindowFuncKind::LeadInFrame - | WindowFuncKind::FirstValue - | WindowFuncKind::LastValue - | WindowFuncKind::NthValue(_) => (arg_dtype(), true), - WindowFuncKind::Min | WindowFuncKind::Max => { - (arg_dtype(), arg.is_none_or(|c| c.nullable)) - } - }; - out.fields - .push(Field::plain(output_name.clone(), dtype, nullable)); - Ok(out) - } - - // A scalar bridge has no series — model it as a single `value` - // column so it can sit as a `BinaryOp` operand. Both scalar - // leaves — a bridged scalar sub-expression and the eval time — - // are a single `value` column with no labels. Every - // `PromqlScalarBridge` constructed today wraps a plain - // `Literal(Float64)` (issue #220), so the schema doesn't need to - // inspect the inner node. - QueryExpr::PromqlScalarBridge(_) | QueryExpr::EvalTimestamp => Ok(Schema { - fields: vec![Field::plain("value", DataType::Float64, false)], - time_index: None, - unique_keys: Vec::new(), - closed: true, - }), - - QueryExpr::CurrentTimestamp => Ok(Schema { - fields: vec![Field::plain("value", DataType::Timestamp, false)], - time_index: None, - unique_keys: Vec::new(), - closed: true, - }), - - // `vector(s)` yields a label-less instant vector: the (ts, value) - // floor and nothing else. `closed` — its full label set (empty) is - // known statically (#48). - QueryExpr::PromqlVectorFromScalar(_) => Ok(Schema { - fields: vec![ - Field::plain("ts", DataType::Timestamp, false), - Field::plain("value", DataType::Float64, false), - ], - time_index: Some(0), - unique_keys: Vec::new(), - closed: true, - }), - - // `scalar(v)` collapses to a single `value`, no time index — the same - // scalar shape as a constant or `time()` (#48). - QueryExpr::PromqlScalarFromVector(_) => Ok(Schema { - fields: vec![Field::plain("value", DataType::Float64, false)], - time_index: None, - unique_keys: Vec::new(), - closed: true, - }), - - // The output shape of ` op ` (or ` op - // `) is the vector side's — a scalar operand (a constant or - // `time()`) contributes only its value, no labels. Prefer the - // non-scalar side. - QueryExpr::BinaryOp { lhs, rhs, op, vector_match } => { - fn scalar(expression: &QueryExpr) -> bool { - match expression { - QueryExpr::PromqlScalarBridge(_) | QueryExpr::EvalTimestamp | QueryExpr::PromqlScalarFromVector(_) => true, - QueryExpr::BinaryOp { lhs, rhs, .. } => scalar(lhs) && scalar(rhs), - _ => false, - } - } - let left = lhs.output_schema()?; - let right = rhs.output_schema()?; - if scalar(lhs) { return Ok(right); } - let mut output = left; - let grouping = vector_match.as_ref().and_then(|m| m.grouping.as_ref()); - let right_rows = matches!(op, BinaryOpKind::Set(PromQLVectorSetOpKind::Or)) - || matches!(grouping, Some(g) if g.side == GroupSide::Right); - let mut additions = Vec::new(); - if right_rows { - additions.extend(right.fields.iter().filter(|c| c.dtype == DataType::Utf8).cloned()); - } - if let Some(grouping) = grouping { - additions.extend(grouping.labels.iter().map(|name| Field::plain(name.clone(), DataType::Utf8, true))); - } - for column in additions { - if !output.fields.iter().any(|c| c.name == column.name) { - output.fields.push(column); - } - } - Ok(output) - }, - - // The scalar variants (issue #205) — see `QueryExprError::ScalarHasNoRowSchema`. - QueryExpr::Column(_) - | QueryExpr::Literal(_) - | QueryExpr::Compare { .. } - | QueryExpr::BoolAnd(_) - | QueryExpr::BoolOr(_) - | QueryExpr::Not(_) - | QueryExpr::IsNull(_) - | QueryExpr::IsNotNull(_) - | QueryExpr::Cast { .. } - | QueryExpr::InList { .. } - | QueryExpr::FunctionCall { .. } - | QueryExpr::Arithmetic { .. } - | QueryExpr::Case { .. } => Err(QueryExprError::ScalarHasNoRowSchema), - } - } -} - -/// Output schema of a *per-series* window/range reduction (`rate`/`increase`, -/// or an `*_over_time` reducer under a time `Window`). Such a reduction emits -/// one value per series, so every label column of `input` is preserved and only -/// the sample value is replaced — kept named `value` so the PromQL sample-value -/// convention (and any outer `SampleValue` reference) still resolves it by name. -fn per_series_reduction_schema(input: &Schema, agg: &AggIntent) -> Result { - let vi = if let Some(index) = agg.input_cols().first() { - *index - } else { - super::column_resolution::resolve_column_ref(&ColumnRef::SampleValue, input) - .map_err(|error| QueryExprError::InvalidSampleColumn(error.to_string()))? - }; - if !matches!( - input.fields.get(vi).map(|column| &column.dtype), - Some(FieldDataType::Plain(DataType::Float64 | DataType::Int64)) - ) { - return Err(QueryExprError::InvalidSampleColumn(format!( - "column {vi} is not numeric" - ))); - } - let mut columns = input.fields.clone(); - { - let mut out = agg.output_column(&columns[vi]); - out.name = "value".into(); - // A per-series range reduction produces a PromQL sample value, which is - // always `float64` — override the reducer's own output dtype so - // `count_over_time` (whose `Count` intent types `Int64`) matches every - // other range reducer instead of leaking an `Int64` value column (#69). - out.dtype = FieldDataType::Plain(DataType::Float64); - columns[vi] = out; - } - Ok(Schema { - fields: columns, - time_index: input.time_index, - unique_keys: input.unique_keys.clone(), - // Per-series reduction is label-preserving: it inherits its input's - // completeness (an open scan stays open; a closed one stays closed). - closed: input.closed, - }) -} - -/// The output schema of an `Aggregate { reduction, measures }` over `in_schema` — -/// the **single** canonical derivation shared by -/// [`QueryExpr::output_schema`]'s `Aggregate` arm and the converter's -/// HAVING-resolution path (`column_resolution::output_schema_for_aggregate`), -/// so the two can never drift (issue #41). -/// -/// `Reduction::PerEntity` selects the label-preserving -/// [`per_series_reduction_schema`] (`rate`/`increase`/`*_over_time`) instead -/// of the cross-series `by ++ measures` shape. Which one applies is read directly -/// off `reduction` — decided once, at construction, by whoever built the -/// `Aggregate` node (issue #165) — not re-derived here from `by`/child shape. -pub fn aggregate_output_schema( - in_schema: &Schema, - reduction: &Reduction, - measures: &[AggIntent], - output_names: &[String], -) -> Result { - let by = match reduction { - Reduction::PerEntity => { - debug_assert_eq!( - measures.len(), - 1, - "a per-entity reduction is single-aggregate" - ); - return per_series_reduction_schema(in_schema, &measures[0]); - } - Reduction::Reduce(by) => by, - }; - - // `without(excluded)` groups by every label *except* those listed: the kept - // labels are the input's label columns minus the excluded positions (and the - // ts / sample-value columns), and the schema stays **open** because the full - // runtime label set isn't known. The `by(...)` path instead enumerates its - // kept columns and freezes to closed (issue #39). - if by.is_without() { - return without_output_schema(in_schema, by.keys(), measures, output_names); - } - - let mut out_cols: Vec = Vec::with_capacity(by.len() + measures.len()); - for &id in by.keys() { - let c = in_schema - .fields - .get(id) - .ok_or(QueryExprError::InvalidGroupByColumn( - id, - in_schema.fields.len(), - ))?; - out_cols.push(c.clone()); - } - let value_col_idx = - super::column_resolution::resolve_column_ref(&ColumnRef::SampleValue, in_schema) - .ok() - .or_else(|| (0..in_schema.fields.len()).find(|i| !by.contains(i))); - let probe = value_col_idx - .and_then(|i| in_schema.fields.get(i)) - .cloned() - .unwrap_or_else(|| Field::plain("value", DataType::Float64, false)); - // Each reducer types off its own input column (`SUM(bytes)` vs `AVG(latency)` - // in one node); `None` falls back to the sample-value probe (PromQL's - // single-column convention). A non-empty `output_names[i]` overrides the - // synthetic output column name. - for (i, intent) in measures.iter().enumerate() { - // `count_values("l", v)` emits TWO columns: the synthesized `Utf8` label - // `l` (the stringified sample value it groups by) and the per-value - // count. If `l` collides with a group-by key of the same name, PromQL's - // synthesized label takes precedence — emit a single column, never a - // duplicate. - if let AggIntent::CountValues { label } = intent { - if !out_cols.iter().any(|c| c.name == *label) { - out_cols.push(Field::plain(label.clone(), DataType::Utf8, false)); - } - let mut cnt = intent.output_column(&probe); - if let Some(name) = output_names.get(i).filter(|s| !s.is_empty()) { - cnt.name = name.clone(); - } - out_cols.push(cnt); - continue; - } - // Only the output *type* is read from here, so the leading column is - // enough for the multi-column intents: `Cardinality` and `PearsonCorr` - // both have a fixed output type that ignores it. - let in_col = intent - .input_cols() - .first() - .and_then(|id| in_schema.fields.get(*id)) - .unwrap_or(&probe); - let mut out = intent.output_column(in_col); - // A global extremum emits NULL for an empty input, even if its input - // column is non-nullable. Grouped extrema only emit existing groups. - if by.is_empty() && matches!(intent, AggIntent::Min { .. } | AggIntent::Max { .. }) { - out.nullable = true; - } - if let Some((arg, _)) = intent - .arg_selector_columns(in_schema) - .map_err(QueryExprError::InvalidScalarSignature)? - { - out.dtype = in_schema.fields[arg].dtype.clone(); - out.nullable = in_schema.fields[arg].nullable; - } - if let Some(name) = output_names.get(i).filter(|s| !s.is_empty()) { - out.name = name.clone(); - } - out_cols.push(out); - } - // `count_values` groups by (by-keys ∪ the synthesized value label), so the - // by-keys alone are not a unique key — be conservative and claim none. - let has_count_values = measures - .iter() - .any(|a| matches!(a, AggIntent::CountValues { .. })); - let unique_keys = if by.is_empty() || has_count_values { - Vec::new() - } else { - vec![(0..by.len()).collect()] - }; - Ok(Schema { - fields: out_cols, - time_index: None, - unique_keys, - // A cross-series aggregate enumerates exactly `by ++ measures`, so its output - // is closed even over an open input — this is where an open schema - // freezes to closed. - closed: true, - }) -} - -/// Output schema of a `without(excluded)` aggregate: the kept labels (every -/// input label column except the `excluded` positions, the time axis, and the -/// sample-value column) followed by the aggregate output column(s). Unlike the -/// `by` path this stays **open** — the excluded set is enumerable but the kept -/// set is not (the runtime carries labels the usage-derived schema never saw), -/// so the schema can't freeze to closed and claims no unique key (issue #39). -fn without_output_schema( - in_schema: &Schema, - excluded: &[ColumnId], - measures: &[AggIntent], - output_names: &[String], -) -> Result { - for &id in excluded { - if id >= in_schema.fields.len() { - return Err(QueryExprError::InvalidGroupByColumn( - id, - in_schema.fields.len(), - )); - } - } - // A nested aggregate renames the sample value (`sum by (le) (…)` → `sum`); - // it is still the value, not a kept label. - let value = - super::column_resolution::resolve_column_ref(&ColumnRef::SampleValue, in_schema).ok(); - let mut out_cols: Vec = Vec::new(); - for (i, col) in in_schema.fields.iter().enumerate() { - let is_time = in_schema.time_index == Some(i); - if !is_time && value != Some(i) && !excluded.contains(&i) { - out_cols.push(col.clone()); - } - } - let probe = value - .and_then(|i| in_schema.fields.get(i)) - .cloned() - .unwrap_or_else(|| Field::plain("value", DataType::Float64, false)); - for (i, intent) in measures.iter().enumerate() { - // Only the output *type* is read from here, so the leading column is - // enough for the multi-column intents: `Cardinality` and `PearsonCorr` - // both have a fixed output type that ignores it. - let in_col = intent - .input_cols() - .first() - .and_then(|id| in_schema.fields.get(*id)) - .unwrap_or(&probe); - let mut out = intent.output_column(in_col); - if let Some((arg, _)) = intent - .arg_selector_columns(in_schema) - .map_err(QueryExprError::InvalidScalarSignature)? - { - out.dtype = in_schema.fields[arg].dtype.clone(); - out.nullable = in_schema.fields[arg].nullable; - } - if let Some(name) = output_names.get(i).filter(|s| !s.is_empty()) { - out.name = name.clone(); - } - out_cols.push(out); - } - Ok(Schema { - fields: out_cols, - time_index: None, - unique_keys: Vec::new(), - // The kept label set is runtime-only, so — unlike `by` — this does not - // freeze the open schema to closed. - closed: false, - }) -} - -/// Infer the `(DataType, nullable)` a scalar [`QueryExpr`] produces against an -/// input [`Schema`]. Used by `Project` schema derivation. Approximate here: -/// unknown columns and bare `FunctionCall`s fall back to a permissive default -/// (post-ASAP binding refines with a real function/type registry). `expr` -/// must be one of the scalar variants (issue #205) — an operator variant here -/// is a construction bug, not a shape this needs to handle silently. -fn infer_expr_type( - expr: &QueryExpr, - schema: &Schema, -) -> Result<(DataType, bool), QueryExprError> { - Ok(match expr { - QueryExpr::CurrentTimestamp => (DataType::Timestamp, false), - QueryExpr::Column(id) => match schema.fields.get(*id) { - Some(c) => match c.plain_dtype() { - Some(dtype) => (dtype.clone(), c.nullable), - // Summary state is not a scalar value: it has to be read - // out (estimated / finalized) before an expression can use it. - None => { - return Err(QueryExprError::InvalidScalarSignature(format!( - "column `{}` carries summary state and cannot be read as a value", - c.name - ))) - } - }, - None => (DataType::Float64, true), - }, - QueryExpr::Literal(s) => match s { - ScalarValue::Int64(_) => (DataType::Int64, false), - ScalarValue::Float64(_) => (DataType::Float64, false), - ScalarValue::Utf8(_) => (DataType::Utf8, false), - ScalarValue::Boolean(_) => (DataType::Bool, false), - ScalarValue::Null => (DataType::Null, true), - ScalarValue::Interval { .. } => (DataType::Interval, false), - }, - // Boolean-valued expressions (SQL three-valued logic → nullable). - QueryExpr::Compare { .. } - | QueryExpr::BoolAnd(_) - | QueryExpr::BoolOr(_) - | QueryExpr::Not(_) - | QueryExpr::IsNull(_) - | QueryExpr::IsNotNull(_) - | QueryExpr::InList { .. } => (DataType::Bool, true), - QueryExpr::Arithmetic { op, left, right } => { - let (lt, ln) = infer_expr_type(left, schema)?; - let (rt, rn) = infer_expr_type(right, schema)?; - // Temporal subtraction yields a fixed duration with a unit, not a - // calendar interval or a floating-point number. Until the IR can - // preserve that unit, fail instead of publishing a numeric schema. - if matches!(op, ArithmeticOpKind::Sub) - && matches!(lt, DataType::Date | DataType::Timestamp) - && matches!(rt, DataType::Date | DataType::Timestamp) - { - return Err(QueryExprError::InvalidScalarSignature( - "temporal subtraction produces an unsupported duration type".into(), - )); - } - - // Operand order is not checked: the orders that are not valid SQL - // (`Interval - Timestamp`) are rejected by the planner upstream, so - // a pair rule stays as small as the numeric one it sits beside. - let dtype = match (<, &rt) { - // SQL unary minus lowers to -1 * expression, including intervals. - (DataType::Int64, DataType::Interval) | (DataType::Interval, DataType::Int64) - if matches!(op, ArithmeticOpKind::Mul) => - { - DataType::Interval - } - (DataType::Timestamp, DataType::Interval) - | (DataType::Interval, DataType::Timestamp) => DataType::Timestamp, - (DataType::Date, DataType::Interval) | (DataType::Interval, DataType::Date) => { - DataType::Date - } - (DataType::Interval, DataType::Interval) => DataType::Interval, - (DataType::Int64, DataType::Int64) => DataType::Int64, - _ => DataType::Float64, - }; - (dtype, ln || rn) - } - QueryExpr::Cast { to, try_cast, expr } => { - let (_, nullable) = infer_expr_type(expr, schema)?; - (to.clone(), *try_cast || nullable) - } - QueryExpr::FunctionCall { name, args } => { - if name == "asap_element_access" { - super::scalar_type_rules::element_access_type(args, schema) - .map_err(QueryExprError::InvalidScalarSignature)? - } else if name == "asap_struct_field" { - super::scalar_type_rules::struct_field_type(args, schema) - .map_err(QueryExprError::InvalidScalarSignature)? - } else if let Some(function) = - super::scalar_type_rules::MapScalarFunction::from_name(name) - { - let arguments = args - .iter() - .map(|arg| infer_expr_type(arg, schema)) - .collect::, _>>()?; - function - .output_type(&arguments) - .map_err(QueryExprError::InvalidScalarSignature)? - } else { - // Legacy unknown functions retain their existing policy. - (DataType::Float64, true) - } - } - QueryExpr::Case { - branches, - else_expr, - .. - } => { - if let Some((_, then)) = branches.first() { - (infer_expr_type(then, schema)?.0, true) - } else if let Some(other) = else_expr { - infer_expr_type(other, schema)? - } else { - (DataType::Null, true) - } - } - other => { - unreachable!("infer_expr_type called on a non-scalar QueryExpr variant: {other:?}") - } - }) -} - -/// Default output-column name for a projection item with no explicit alias: -/// a bare column keeps its (schema) name; anything else gets `col_{i}`. -fn default_proj_name(expr: &QueryExpr, idx: usize, schema: &Schema) -> String { - match expr { - QueryExpr::Column(id) => schema - .fields - .get(*id) - .map(|c| c.name.clone()) - .unwrap_or_else(|| format!("col_{idx}")), - _ => format!("col_{idx}"), - } -} - -#[cfg(test)] -mod tests { - use super::*; - use crate::pre_asap::expr_ir::{ArithmeticOpKind, CompareOpKind}; - use crate::types::AccuracyTarget; - - fn col(name: &str, dtype: DataType, nullable: bool) -> Field { - Field::plain(name, dtype, nullable) - } - - /// Shifting an instant by a duration stays an instant, and shifting a date - /// stays a date — neither falls through to the numeric default, which is - /// what `l_shipdate + INTERVAL '30' DAY` would otherwise be typed as. - #[test] - fn interval_arithmetic_keeps_the_temporal_type() { - let schema = Schema::new(vec![ - col("ts", DataType::Timestamp, false), - col("d", DataType::Date, false), - ]); - let thirty_days = || { - Rc::new(QueryExpr::Literal(ScalarValue::Interval { - months: 0, - days: 30, - nanos: 0, - })) - }; - let shift = |column, op| QueryExpr::Arithmetic { - op, - left: Rc::new(QueryExpr::Column(column)), - right: thirty_days(), - }; - - assert_eq!( - shift(0, ArithmeticOpKind::Add) - .scalar_type(&schema) - .unwrap() - .0, - DataType::Timestamp - ); - assert_eq!( - shift(1, ArithmeticOpKind::Sub) - .scalar_type(&schema) - .unwrap() - .0, - DataType::Date - ); - assert_eq!( - QueryExpr::Arithmetic { - op: ArithmeticOpKind::Add, - left: thirty_days(), - right: thirty_days(), - } - .scalar_type(&schema) - .unwrap() - .0, - DataType::Interval - ); - } - - fn scan( - columns: Vec, - time_index: Option, - uk: Vec>, - ) -> QueryExpr { - QueryExpr::Scan { - source: Source::Table { - table_ref: "t".into(), - }, - predicates: vec![], - schema: Schema { - fields: columns, - time_index, - unique_keys: uk, - closed: true, - }, - } - } - - #[test] - fn project_preserves_unique_keys_that_are_passed_through() { - let input = Rc::new(scan( - vec![ - col("tenant", DataType::Utf8, false), - col("region", DataType::Utf8, false), - col("value", DataType::Int64, false), - ], - None, - vec![vec![0, 1]], - )); - let projected = QueryExpr::Project { - cols: vec![ - ProjectItem { - alias: Some("r".into()), - expr: QueryExpr::Column(1), - }, - ProjectItem { - alias: Some("t".into()), - expr: QueryExpr::Column(0), - }, - ProjectItem { - alias: None, - expr: QueryExpr::Arithmetic { - op: ArithmeticOpKind::Add, - left: Rc::new(QueryExpr::Column(2)), - right: Rc::new(QueryExpr::Literal(ScalarValue::Int64(1))), - }, - }, - ], - qualifier: None, - child: input, - }; - - assert_eq!( - projected.output_schema().unwrap().unique_keys, - vec![vec![1, 0]] - ); - } - - #[test] - fn project_drops_a_unique_key_when_a_key_column_is_omitted() { - let input = Rc::new(scan( - vec![ - col("tenant", DataType::Utf8, false), - col("region", DataType::Utf8, false), - ], - None, - vec![vec![0, 1]], - )); - let projected = QueryExpr::Project { - cols: vec![ProjectItem { - alias: None, - expr: QueryExpr::Column(0), - }], - qualifier: None, - child: input, - }; - - assert!(projected.output_schema().unwrap().unique_keys.is_empty()); - } - - #[test] - fn legacy_window_json_without_frame_deserializes_as_unspecified() { - let window = QueryExpr::SQLWindowFunc { - func: WindowFuncKind::RowNumber, - args: vec![], - partition_by: GroupKeys::by(vec![]), - order_by: vec![], - frame: Some(WindowFrame { - units: WindowFrameUnits::Range, - start_bound: WindowFrameBound::Preceding(WindowFrameOffset::Scalar( - ScalarValue::Null, - )), - end_bound: WindowFrameBound::CurrentRow, - }), - output_name: "row_number".into(), - child: Rc::new(scan(vec![col("v", DataType::Int64, false)], None, vec![])), - }; - let mut json = serde_json::to_value(window).unwrap(); - json.get_mut("SQLWindowFunc") - .and_then(serde_json::Value::as_object_mut) - .unwrap() - .remove("frame"); - - let decoded: QueryExpr = serde_json::from_value(json).unwrap(); - assert!(matches!( - decoded, - QueryExpr::SQLWindowFunc { frame: None, .. } - )); - } - - /// A row can appear in more than one branch, so no branch's unique key is a - /// key of the union. `Concat` took the first child's schema verbatim, which - /// let a `Dedup`'s key leak out and claim a uniqueness the merged rows do - /// not have — `unique_keys` feeds CSE's producer-sharing legality check. - #[test] - fn merge_drops_the_branches_unique_keys() { - let branch = || QueryExpr::Dedup { - cols: vec![0], - child: Rc::new(scan( - vec![ - col("k", DataType::Utf8, false), - col("v", DataType::Int64, false), - ], - None, - vec![], - )), - }; - assert_eq!( - branch().output_schema().unwrap().unique_keys, - vec![vec![0]], - "a Dedup branch does have a unique key on its own" - ); - - let merged = QueryExpr::concat(vec![branch(), branch()]); - let schema = merged.output_schema().unwrap(); - assert!( - schema.unique_keys.is_empty(), - "the union of two deduplicated branches is not deduplicated" - ); - // The column shape is still the first branch's. - assert_eq!(schema.fields.len(), 2); - } - - /// Same rule as `SetOp`, which already dropped them. - #[test] - fn merge_and_setop_agree_on_unique_keys() { - let branch = || QueryExpr::Dedup { - cols: vec![0], - child: Rc::new(scan(vec![col("k", DataType::Utf8, false)], None, vec![])), - }; - let merged = QueryExpr::concat(vec![branch(), branch()]); - let setop = QueryExpr::SetOp { - kind: RelationalSetOpKind::Union, - all: true, - left: Rc::new(branch()), - right: Rc::new(branch()), - }; - assert_eq!( - merged.output_schema().unwrap().unique_keys, - setop.output_schema().unwrap().unique_keys, - ); - } - - #[test] - fn an_empty_merge_has_no_schema() { - assert!(matches!( - QueryExpr::concat(vec![]).output_schema(), - Err(QueryExprError::EmptyConcat) - )); - } - - /// Issue #228: a `Concat` built via `concat_with_discriminator` gets a - /// sound compound `(discriminator, inner_key)` unique key, even though - /// each branch's own `inner_key` alone repeats across branches (exactly - /// the shape `merge_drops_the_branches_unique_keys` shows is unsafe - /// *without* a discriminator). - #[test] - fn discriminator_override_produces_a_compound_unique_key() { - // Two branches, each individually deduplicated on column 0 (`k`) — - // but, per `merge_drops_the_branches_unique_keys`, that alone proves - // nothing about the union. Field 1 (`branch_id`) stands in for a - // discriminator the constructor has separately proven distinct per - // branch (PromQL φ, a synthetic `GROUPING()` id, ...) — this - // schema-level test only checks the shape `output_schema` derives - // from asserting one, not how a real caller proves distinctness. - let branch = || QueryExpr::Dedup { - cols: vec![0], - child: Rc::new(scan( - vec![ - col("k", DataType::Utf8, false), - col("branch_id", DataType::Int64, false), - ], - None, - vec![], - )), - }; - let merged = QueryExpr::concat_with_discriminator( - vec![branch(), branch()], - /* discriminator */ 1, - /* inner_key */ vec![0], - ); - let schema = merged.output_schema().unwrap(); - assert_eq!( - schema.unique_keys, - vec![vec![1, 0]], - "(discriminator, inner_key) is the sole asserted unique key" - ); - assert_eq!( - schema.fields.len(), - 2, - "column shape is still the first branch's" - ); - } - - #[test] - fn discriminator_assertion_rejects_unknown_wire_fields() { - let json = r#"{"discriminator":1,"inner_key":[0],"unverified":true}"#; - assert!(serde_json::from_str::(json).is_err()); - } - - /// The override is opt-in: building a `Concat` without asserting a - /// discriminator — via the plain struct literal, exactly like every call - /// site before issue #228 — still drops `unique_keys` by default, - /// unchanged. - #[test] - fn ordinary_concat_struct_literal_still_drops_unique_keys_by_default() { - let branch = || QueryExpr::Dedup { - cols: vec![0], - child: Rc::new(scan(vec![col("k", DataType::Utf8, false)], None, vec![])), - }; - let merged = QueryExpr::Concat { - children: vec![branch(), branch()], - discriminator_unique_key: None, - }; - assert!(merged.output_schema().unwrap().unique_keys.is_empty()); - } - - /// Misuse check (issue #228): there is no way to end up with a - /// discriminator-backed unique key without a call site literally naming - /// a column as the discriminator. Neither the ordinary `concat` - /// constructor nor a bare struct literal with `discriminator_unique_key: - /// None` can be coaxed into fabricating one — the only path that - /// produces `Some` is `concat_with_discriminator` / - /// `ConcatDiscriminatorKey::new`, both of which require `discriminator` - /// as an explicit, named argument. - #[test] - fn no_way_to_fabricate_a_unique_key_without_naming_a_discriminator() { - let branch = || QueryExpr::Dedup { - cols: vec![0], - child: Rc::new(scan(vec![col("k", DataType::Utf8, false)], None, vec![])), - }; - // The ordinary builder. - assert_eq!( - QueryExpr::concat(vec![branch(), branch()]) - .output_schema() - .unwrap() - .unique_keys, - Vec::>::new() - ); - // The bare struct literal, explicitly opting out. - assert_eq!( - QueryExpr::Concat { - children: vec![branch(), branch()], - discriminator_unique_key: None, - } - .output_schema() - .unwrap() - .unique_keys, - Vec::>::new() - ); - } - - #[test] - fn project_retypes_and_renames_per_item() { - let child = scan( - vec![ - col("ts", DataType::Timestamp, false), - col("host", DataType::Utf8, false), - col("value", DataType::Float64, false), - ], - Some(0), - vec![vec![0, 1]], - ); - let q = QueryExpr::Project { - qualifier: None, - cols: vec![ - // bare column passthrough keeps its (schema) name + type: host=col 1 - ProjectItem { - alias: None, - expr: QueryExpr::Column(1), - }, - // arithmetic over value (col 2) → Float64 - ProjectItem { - alias: Some("dbl".into()), - expr: QueryExpr::Arithmetic { - op: ArithmeticOpKind::Add, - left: Rc::new(QueryExpr::Column(2)), - right: Rc::new(QueryExpr::Column(2)), - }, - }, - // comparison → Bool (nullable under 3-valued logic) - ProjectItem { - alias: Some("flag".into()), - expr: QueryExpr::Compare { - left: Rc::new(QueryExpr::Column(2)), - op: CompareOpKind::Gt, - right: Rc::new(QueryExpr::Literal(ScalarValue::Float64(0.0))), - }, - }, - ], - child: Rc::new(child), - }; - let s = q.output_schema().unwrap(); - assert_eq!(s.fields.len(), 3); - assert_eq!(s.fields[0], col("host", DataType::Utf8, false)); - assert_eq!(s.fields[1], col("dbl", DataType::Float64, false)); - assert_eq!(s.fields[2], col("flag", DataType::Bool, true)); - // projection drops the time axis + unique keys (ts not retained) - assert!(s.time_index.is_none()); - assert!(s.unique_keys.is_empty()); - } - - #[test] - fn group_keys_by_vs_without_semantics() { - let by = GroupKeys::by(vec![1, 2]); - let without = GroupKeys::without(vec![1, 2]); - assert!(!by.is_without()); - assert!(without.is_without()); - // Deref / iteration expose the stored keys regardless of mode. - assert_eq!(by.len(), 2); - assert_eq!(without.keys(), &[1, 2]); - // A `by` compares equal to its bare vec; a `without` never does. - assert_eq!(by, vec![1, 2]); - assert_ne!(without, vec![1, 2]); - assert_ne!(by, without); - } - - #[test] - fn group_keys_serde_by_is_bare_array_without_is_tagged() { - // `by` keeps the pre-#39 bare-array wire format; `without` uses an object. - let by = serde_json::to_string(&GroupKeys::by(vec![2, 3])).unwrap(); - assert_eq!(by, "[2,3]"); - let without = serde_json::to_string(&GroupKeys::without(vec![2])).unwrap(); - assert_eq!(without, r#"{"without":[2]}"#); - // Round-trip both. - for g in [GroupKeys::by(vec![2, 3]), GroupKeys::without(vec![2])] { - let json = serde_json::to_string(&g).unwrap(); - let back: GroupKeys = serde_json::from_str(&json).unwrap(); - assert_eq!(back, g); - } - } - - #[test] - fn without_aggregate_keeps_open_schema_minus_excluded() { - // `sum without (instance) (m)` over `[ts, value, instance, job]`: the - // kept labels are the input labels minus the excluded `instance` (and ts - // / value), followed by the `sum` column, and the schema stays OPEN - // (issue #39). `job` survives; `instance` is dropped. - let scan_node = QueryExpr::Scan { - source: Source::TimeSeries { metric: "m".into() }, - predicates: vec![], - schema: Schema::with_time_index( - vec![ - col("ts", DataType::Timestamp, false), - col("value", DataType::Float64, false), - col("instance", DataType::Utf8, true), - col("job", DataType::Utf8, true), - ], - 0, - vec![], - ), - }; - let agg = QueryExpr::Aggregate { - reduction: Reduction::Reduce(GroupKeys::without(vec![2])), // exclude `instance` - measures: vec![AggIntent::Sum { col: None }], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(scan_node), - }; - let s = agg.output_schema().unwrap(); - let names: Vec<_> = s.fields.iter().map(|c| c.name.as_str()).collect(); - assert_eq!(names, vec!["job", "sum"], "kept `job`, dropped `instance`"); - assert!(!s.closed, "a `without` result stays open"); - assert!(s.time_index.is_none()); - assert!(s.unique_keys.is_empty(), "kept set unknown → no unique key"); - } - - // A nested aggregate's renamed sample value is not a kept label. - #[test] - fn without_aggregate_drops_a_renamed_sample_value() { - // `sum without (inst) (sum by (inst, job) (m))` over `[inst, job, sum]`. - let inner = QueryExpr::Scan { - source: Source::TimeSeries { metric: "m".into() }, - predicates: vec![], - schema: Schema::new(vec![ - col("inst", DataType::Utf8, true), - col("job", DataType::Utf8, true), - col("sum", DataType::Float64, false), - ]), - }; - let agg = QueryExpr::Aggregate { - reduction: Reduction::Reduce(GroupKeys::without(vec![0])), - measures: vec![AggIntent::Sum { col: None }], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(inner), - }; - let s = agg.output_schema().unwrap(); - let names: Vec<_> = s.fields.iter().map(|c| c.name.as_str()).collect(); - assert_eq!(names, vec!["job", "sum"]); - } - - #[test] - fn time_shift_is_schema_pass_through() { - // `offset`/`@` move *when* a selector is evaluated, never its columns — - // a `TimeShift` output schema equals its child's (issue #40). - let scan_node = scan( - vec![ - col("ts", DataType::Timestamp, false), - col("value", DataType::Float64, false), - col("job", DataType::Utf8, true), - ], - Some(0), - vec![], - ); - let shifted = QueryExpr::TimeShift { - shift: TimeShift { - offset_ms: 3_600_000, - at: Some(AtModifier::Timestamp(1_609_746_000_000)), - }, - child: Rc::new(scan_node.clone()), - }; - assert_eq!( - shifted.output_schema().unwrap(), - scan_node.output_schema().unwrap(), - ); - } - - #[test] - fn time_shift_identity_and_serde() { - let offset_only = TimeShift { - offset_ms: 1, - at: None, - }; - let at_only = TimeShift { - offset_ms: 0, - at: Some(AtModifier::End), - }; - assert!(TimeShift::default().is_identity()); - assert!(!offset_only.is_identity()); - assert!(!at_only.is_identity()); - // Round-trip the shift + anchor. - let s = TimeShift { - offset_ms: -300_000, - at: Some(AtModifier::Timestamp(60_000)), - }; - let back: TimeShift = serde_json::from_str(&serde_json::to_string(&s).unwrap()).unwrap(); - assert_eq!(back, s); - } - - // Nested temporal aggregation must replace the sample, never the grouping label. - #[test] - fn temporal_reduction_of_grouped_sum_preserves_job() { - let input = Schema::new(vec![ - col("job", DataType::Utf8, true), - col("sum", DataType::Float64, false), - ]); - for aggregate in [ - AggIntent::Avg { col: None }, - AggIntent::Avg { col: Some(1) }, - AggIntent::Rate, - ] { - let output = - aggregate_output_schema(&input, &Reduction::PerEntity, &[aggregate], &[]).unwrap(); - assert_eq!(output.fields[0], input.fields[0]); - assert_eq!(output.fields[1].name, "value"); - assert_eq!(output.fields[1].dtype, DataType::Float64); - } - } - - #[test] - fn per_series_rate_preserves_labels() { - // A per-series range reduction (`rate`) is label-preserving: it produces - // one value per series, so every label survives and only the sample - // value is replaced (kept named `value`). The TimeRange child is the - // structural marker; the outer Aggregate carries the Rate intent. - let scan_node = scan( - vec![ - col("ts", DataType::Timestamp, false), - col("value", DataType::Float64, false), - col("job", DataType::Utf8, true), - ], - Some(0), - vec![], - ); - let rate = QueryExpr::Aggregate { - reduction: Reduction::PerEntity, - measures: vec![AggIntent::Rate], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(QueryExpr::TimeRange { - range: Duration::from_secs(300), - child: Rc::new(scan_node), - }), - }; - let s = rate.output_schema().unwrap(); - assert_eq!( - s.fields.iter().map(|c| c.name.as_str()).collect::>(), - vec!["ts", "value", "job"], - "rate preserves all labels; only the sample value is replaced" - ); - assert_eq!(s.time_index, Some(0)); - assert!(s.column_id("job").is_some(), "label survives the reduction"); - } - - #[test] - fn over_time_reduction_preserves_labels() { - // `*_over_time` lowers to `Aggregate { by:[], [reducer], TimeRange { Scan } }`: - // a per-series time-range reduction. The TimeRange child confers per-series - // semantics on otherwise cross-series intents like `Avg`, so an outer - // `sum by(job)(avg_over_time(...))` resolves its key positionally. - let scan_node = scan( - vec![ - col("ts", DataType::Timestamp, false), - col("value", DataType::Float64, false), - col("job", DataType::Utf8, true), - ], - Some(0), - vec![], - ); - let avg_over_time = QueryExpr::Aggregate { - reduction: Reduction::PerEntity, - measures: vec![AggIntent::Avg { col: None }], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(QueryExpr::TimeRange { - range: Duration::from_secs(300), - child: Rc::new(scan_node), - }), - }; - let s = avg_over_time.output_schema().unwrap(); - assert_eq!( - s.fields.iter().map(|c| c.name.as_str()).collect::>(), - vec!["ts", "value", "job"], - "TimeRange-child marks per-series: labels preserved, value renamed" - ); - assert!( - s.column_id("job").is_some(), - "outer Aggregate.by can resolve it" - ); - } - - #[test] - fn completeness_open_leaf_freezes_to_closed_at_cross_series_aggregate() { - // A schemaless (PromQL-style) leaf is *open*; it stays open through a - // per-series reduction (`rate`), then is **frozen to closed** by a - // cross-series aggregate (which enumerates exactly its output columns). - let open_leaf = QueryExpr::Scan { - source: Source::TimeSeries { metric: "m".into() }, - predicates: vec![], - // `with_time_index` defaults to `closed: false` (open). - schema: Schema::with_time_index( - vec![ - col("ts", DataType::Timestamp, false), - col("value", DataType::Float64, false), - col("job", DataType::Utf8, true), - ], - 0, - vec![], - ), - }; - assert!( - !open_leaf.output_schema().unwrap().closed, - "schemaless leaf is open" - ); - - let rate = QueryExpr::Aggregate { - reduction: Reduction::PerEntity, - measures: vec![AggIntent::Rate], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(open_leaf), - }; - assert!( - !rate.output_schema().unwrap().closed, - "per-series rate is label-preserving → stays open" - ); - - let sum_by_job = QueryExpr::Aggregate { - reduction: Reduction::by(vec![2]), // `job` - measures: vec![AggIntent::Sum { col: None }], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(rate), - }; - assert!( - sum_by_job.output_schema().unwrap().closed, - "cross-series aggregate enumerates `by ++ measures` → frozen to closed" - ); - } - - #[test] - fn project_keeps_time_index_when_ts_passed_through() { - let child = scan( - vec![ - col("ts", DataType::Timestamp, false), - col("value", DataType::Float64, false), - ], - Some(0), - vec![], - ); - let q = QueryExpr::Project { - qualifier: None, - cols: vec![ - // value=col 1, ts=col 0 - ProjectItem { - alias: None, - expr: QueryExpr::Column(1), - }, - ProjectItem { - alias: None, - expr: QueryExpr::Column(0), - }, - ], - child: Rc::new(child), - }; - let s = q.output_schema().unwrap(); - assert_eq!(s.fields[0].name, "value"); - assert_eq!(s.fields[1].name, "ts"); - assert_eq!(s.time_index, Some(1)); - } - - fn join(kind: JoinKind) -> QueryExpr { - let left = scan(vec![col("a", DataType::Int64, false)], None, vec![vec![0]]); - let right = scan(vec![col("b", DataType::Utf8, false)], None, vec![]); - QueryExpr::Join { - kind, - pred: Predicate(Rc::new(QueryExpr::Literal(ScalarValue::Boolean(true)))), - left: Rc::new(left), - right: Rc::new(right), - } - } - - #[test] - fn inner_join_concatenates_both_sides() { - let s = join(JoinKind::Inner).output_schema().unwrap(); - assert_eq!(s.fields.len(), 2); - assert_eq!(s.fields[0], col("a", DataType::Int64, false)); - assert_eq!(s.fields[1], col("b", DataType::Utf8, false)); - // post-join row identity not provable → no unique keys - assert!(s.unique_keys.is_empty()); - } - - #[test] - fn left_join_makes_right_side_nullable() { - let s = join(JoinKind::Left).output_schema().unwrap(); - assert!(!s.fields[0].nullable, "preserved left side stays non-null"); - assert!(s.fields[1].nullable, "right side nullable under LEFT JOIN"); - } - - #[test] - fn full_join_makes_both_sides_nullable() { - let s = join(JoinKind::Full).output_schema().unwrap(); - assert!(s.fields[0].nullable); - assert!(s.fields[1].nullable); - } - - #[test] - fn setop_takes_left_shape_and_drops_unique_keys() { - let left = scan( - vec![ - col("k", DataType::Utf8, false), - col("v", DataType::Int64, false), - ], - None, - vec![vec![0]], - ); - let right = scan( - vec![ - col("k", DataType::Utf8, false), - col("v", DataType::Int64, false), - ], - None, - vec![vec![0]], - ); - let q = QueryExpr::SetOp { - kind: RelationalSetOpKind::Union, - all: false, - left: Rc::new(left), - right: Rc::new(right), - }; - let s = q.output_schema().unwrap(); - assert_eq!(s.fields.len(), 2); - assert_eq!(s.fields[0].name, "k"); - assert!( - s.unique_keys.is_empty(), - "UNION does not preserve row identity" - ); - } - - // ── PromqlScalarBridge / Literal dedup (issue #220) ───────────────────── - - /// `QueryExpr::promql_scalar(v)` — what every front end now constructs in - /// place of the old `PromqlScalar(v)` leaf — wraps exactly - /// `Literal(ScalarValue::Float64(v))`: the same value a SQL-emitted typed - /// float literal in a scalar-sub-language position would carry, just at a - /// different DAG position. `as_promql_scalar` is the round-trip inverse. - #[test] - fn promql_scalar_bridges_a_literal_float_at_an_operator_position() { - let bridge = QueryExpr::::promql_scalar(2.5); - assert_eq!( - bridge, - QueryExpr::PromqlScalarBridge(Rc::new(QueryExpr::Literal(ScalarValue::Float64(2.5)))) - ); - assert_eq!(bridge.as_promql_scalar(), Some(2.5)); - - // The same value a SQL `Compare`/`Arithmetic` operand would carry, in - // its native (unwrapped, no row schema) scalar-sub-language position — - // no longer a different variant, just not bridged to this DAG - // position. - let sql_literal = QueryExpr::::Literal(ScalarValue::Float64(2.5)); - assert_eq!(bridge.as_promql_scalar(), Some(2.5)); - assert_ne!( - bridge, sql_literal, - "bridge and bare literal are distinct nodes" - ); - // Not every shape is a scalar bridge: neither a bare `Literal` nor an - // operator node reports a value. - assert_eq!(sql_literal.as_promql_scalar(), None); - assert_eq!(scan(vec![], None, vec![]).as_promql_scalar(), None); - } - - /// Pins the DAG-position distinction issue #220 asks for: the very same - /// `Literal(ScalarValue::Float64(_))` value has a row schema when it sits - /// at the operator-DAG position (wrapped in `PromqlScalarBridge` — a - /// `BinaryOp` operand, `PromqlVectorFromScalar` child, or a query root), - /// and has none when it sits bare, in a scalar-sub-language position - /// (`Compare`/`Arithmetic`/… operand) — no longer decided by which of two - /// duplicate variants was used, only by whether the wrapper is present. - #[test] - fn row_schema_rides_on_the_bridge_wrapper_not_the_literal_variant() { - let bridged = QueryExpr::::promql_scalar(42.0); - let schema = bridged.output_schema().expect("bridge has a row schema"); - assert_eq!(schema.fields.len(), 1); - assert_eq!(schema.fields[0].name, "value"); - assert_eq!(schema.fields[0].dtype, DataType::Float64); - assert!(schema.time_index.is_none()); - - // The identical value, unwrapped (the scalar-sub-language position a - // `Compare`/`Arithmetic` operand would occupy) has no row schema of - // its own — it's a construction bug to call `output_schema` on it - // directly, caught as `ScalarHasNoRowSchema` rather than panicking. - let bare = QueryExpr::::Literal(ScalarValue::Float64(42.0)); - assert!(matches!( - bare.output_schema(), - Err(QueryExprError::ScalarHasNoRowSchema) - )); - } - - /// `BinaryOp`'s schema derivation follows the non-scalar (vector) side - /// when the other operand is a `PromqlScalarBridge`, and a `VectorMatch` - /// modifier survives unchanged alongside it — the relational binary-op - /// path (issue #220's Instance 2, left as follow-up) is untouched by the - /// Instance-1 `PromqlScalar` → `PromqlScalarBridge` collapse. - // `filters` (#466) round-trips, and an `Aggregate` serialized before the - // field existed still deserializes as unfiltered. - #[test] - fn aggregate_filters_serde_round_trip_and_default() { - let child = Rc::new(scan( - vec![ - col("service", DataType::Utf8, false), - col("latency", DataType::Float64, false), - ], - None, - vec![], - )); - let filtered = QueryExpr::Aggregate { - reduction: Reduction::by(vec![0]), - measures: vec![ - AggIntent::Count { - accuracy: AccuracyTarget::Exact, - }, - AggIntent::Sum { col: Some(1) }, - ], - output_names: vec![], - filters: vec![ - Some(Predicate(Rc::new(QueryExpr::Compare { - left: Rc::new(QueryExpr::Column(1)), - op: CompareOpKind::Gt, - right: Rc::new(QueryExpr::Literal(ScalarValue::Float64(1.0))), - }))), - None, - ], - having: None, - child: Rc::clone(&child), - }; - let json = serde_json::to_value(&filtered).unwrap(); - assert_eq!( - serde_json::from_value::(json.clone()).unwrap(), - filtered - ); - - let mut legacy = json; - legacy["Aggregate"] - .as_object_mut() - .unwrap() - .remove("filters") - .expect("fixture sanity: filters was serialized"); - let decoded: QueryExpr = serde_json::from_value(legacy).unwrap(); - let QueryExpr::Aggregate { filters, .. } = &decoded else { - unreachable!() - }; - assert!(filters.is_empty()); - } - - #[test] - fn binary_op_schema_follows_the_vector_side_over_a_scalar_bridge_with_vector_match_intact() { - let vector = scan( - vec![ - col("host", DataType::Utf8, false), - col("value", DataType::Float64, false), - ], - None, - vec![], - ); - let vm = VectorMatch { - kind: VectorMatchKind::On, - labels: vec!["host".into()], - grouping: None, - }; - let op = QueryExpr::BinaryOp { - op: BinaryOpKind::Compare(CompareOpKind::Gt), - lhs: Rc::new(vector.clone()), - rhs: Rc::new(QueryExpr::promql_scalar(1.0)), - vector_match: Some(vm.clone()), - }; - assert_eq!(op.output_schema().unwrap(), vector.output_schema().unwrap()); - let QueryExpr::BinaryOp { vector_match, .. } = &op else { - unreachable!() - }; - assert_eq!(vector_match.as_ref(), Some(&vm)); - } -} diff --git a/crates/types/src/pre_asap/resolve.rs b/crates/types/src/pre_asap/resolve.rs deleted file mode 100644 index b4a5c87a6..000000000 --- a/crates/types/src/pre_asap/resolve.rs +++ /dev/null @@ -1,857 +0,0 @@ -//! Resolve a front-end-emitted, unresolved [`UnresolvedQueryExpr`] (`QueryExpr`) -//! into the canonical, positional [`ResolvedQueryExpr`] (`QueryExpr`). -//! -//! Both front ends (`asap-frontend-promql`, `asap-frontend-sql`) construct -//! canonical `QueryExpr` shapes directly during their own `interpret` step -//! (issue #179) — heavy-hitter `topk` recognition, the window-over-aggregate -//! fold, the `PerEntity`/`Reduce` reduction choice, and every other -//! *structural* decision happen right there, since a front end already knows -//! the answer at parse time. What's left for [`resolve_root`] is exactly the -//! "mechanical, schema-dependent substitution" #179 describes: a single -//! generic, shape-preserving walk — every [`UnresolvedQueryExpr`] variant maps to the -//! identical [`ResolvedQueryExpr`] variant — that resolves every [`ColumnRef`] to -//! the [`SchemaResolver`](super::schema_resolver::SchemaResolver)-computed positional [`ColumnId`]. -//! -//! ## Why positional `ColumnId`, not just carrying names all the way through (issue #216) -//! -//! A mature query engine can legitimately choose either design — DataFusion's -//! own logical plan (what `asap-frontend-sql` walks to build its `QueryExpr`) -//! and Calcite both keep names, with an optional table qualifier, all the way -//! through logical optimization, only going positional once they lower to a -//! physical plan. Resolving once, immediately after each front end's own -//! `interpret` step, is the better trade for *this* codebase's shape — one -//! front-end-facing DAG feeding several independent downstream passes -//! (`canonicalize`, the cost model, `dag_export`, schema/type inference, -//! `asap-aware-mapping`'s summary binding) — for three concrete reasons: -//! -//! 1. **Names collide across joins.** Not hypothetical: `join_predicate_disambiguates_shared_column_name` -//! (`crates/frontend-sql/tests/sql_lowering.rs`) exists specifically because -//! `metrics.service` and `hosts.service` are both just `"service"` once their -//! schemas are concatenated. A bare name is ambiguous the moment two sources -//! share one; `ColumnId` is what makes "the second `service`, position 4, not -//! the first" a fact recorded once, instead of a lookup redone at every use site. -//! 2. **A name's meaning changes going up the DAG.** `Project` renames/aliases, -//! `Aggregate` collapses columns and introduces synthetic ones, `Join` -//! concatenates two schemas — a name valid at a `Scan` leaf isn't -//! automatically the right binding three nodes up; it has to be reinterpreted -//! against whatever schema is in scope at that node. Resolving bottom-up -//! pins each reference to "this exact column of this exact node's -//! already-derived output schema," so nothing downstream re-derives that scope. -//! 3. **It concentrates scoping logic in one place instead of ~6.** Every -//! downstream pass just compares/indexes `ColumnId`s — O(1), unambiguous. If -//! they worked on names instead, each would need its own qualifier-aware, -//! join-collision-aware name resolver, or risk silently binding to the wrong -//! `"service"`. -//! -//! Removing this resolution step and carrying `ColumnRef` everywhere would -//! therefore be a real regression for this repo's shape, not just a rename — -//! every one of those downstream passes would have to reimplement the scoping -//! this module already centralizes. - -use std::rc::Rc; - -use thiserror::Error; - -use super::agg_intent::AggIntent; -use super::column_resolution::{ - resolve_column_ref, resolve_column_refs, resolve_expr, resolve_group_keys_promql, ResolveError, -}; -use super::expr_ir::ColumnRef; -use super::query_expr::{ - aggregate_output_schema, any_measure_filtered, ConcatDiscriminatorKey, GroupKeys, Predicate, - ProjectItem, QueryExprError, Reduction, ResolvedQueryExpr, SortKey, UnresolvedQueryExpr, -}; -use super::schema::{ColumnId, Schema}; -use super::schema_resolver::SchemaResolver; - -/// Errors from resolving a canonical, unresolved [`UnresolvedQueryExpr`] DAG. -#[derive(Debug, Error)] -pub enum ResolveDAGError { - /// A column reference did not resolve against its in-scope schema. - #[error("column resolution failed: {0}")] - Resolve(#[from] ResolveError), - /// Deriving the schema of an already-resolved child failed (needed to - /// resolve positional column references against it). - #[error("schema derivation failed: {0}")] - Schema(#[from] QueryExprError), -} - -/// Resolve a whole [`UnresolvedQueryExpr`] DAG rooted at `dag` into canonical -/// [`ResolvedQueryExpr`]: binds every `ColumnRef` to a `ColumnId` via the -/// [`SchemaResolver`], then [`canonicalize`](super::canonicalize::canonicalize)s the -/// result. -pub fn resolve_root(dag: &UnresolvedQueryExpr) -> Result { - resolve_root_with_inherited(dag, &[]) -} - -/// [`resolve_root`] with label names inherited from an enclosing scope seeded -/// into the leaf schema, used when re-binding a `BinaryOp` side (issue #52). -fn resolve_root_with_inherited( - dag: &UnresolvedQueryExpr, - inherited: &[String], -) -> Result { - let fallback = SchemaResolver::new().resolve_schema_with_inherited(dag, inherited); - let l3 = resolve(dag, &fallback)?; - Ok(super::canonicalize::canonicalize(l3)) -} - -/// The generic substitution walk: converts children first (bottom-up), then -/// resolves this node's own `ColumnRef`s against the *converted child's* -/// derived output schema — so a `JOIN`'s concatenated schema and a cross- -/// series aggregate's frozen-closed output bind to the right positions. -fn resolve( - dag: &UnresolvedQueryExpr, - fallback: &Schema, -) -> Result { - use super::query_expr::QueryExpr as QE; - Ok(match dag { - QE::Scan { - source, - predicates, - schema, - } => { - let schema = schema.clone().unwrap_or_else(|| fallback.clone()); - let predicates = predicates - .iter() - .map(|Predicate(e)| Ok(Predicate(Rc::new(resolve_expr(e, &schema)?)))) - .collect::, ResolveError>>()?; - QE::Scan { - source: source.clone(), - predicates, - schema, - } - } - - // `PromqlScalarBridge`'s child is a scalar-sub-language node (issue - // #220) sitting at this operator-DAG position — resolved through - // `resolve_expr`, same as every other scalar position (`Predicate`, - // `ProjectItem.expr`, …), not the operator walk. In practice it's - // always a `Literal`, which has no `ColumnRef` to resolve, so - // `fallback` is never actually consulted here. - QE::PromqlScalarBridge(inner) => { - QE::PromqlScalarBridge(Rc::new(resolve_expr(inner, fallback)?)) - } - QE::EvalTimestamp => QE::EvalTimestamp, - QE::CurrentTimestamp => QE::CurrentTimestamp, - - QE::PromqlVectorFromScalar(child) => { - QE::PromqlVectorFromScalar(Rc::new(resolve(child, fallback)?)) - } - QE::PromqlScalarFromVector(child) => { - QE::PromqlScalarFromVector(Rc::new(resolve(child, fallback)?)) - } - - QE::PromqlRelabel { dst, value, child } => { - let child = resolve(child, fallback)?; - let child_schema = child.output_schema()?; - QE::PromqlRelabel { - dst: dst.clone(), - value: Rc::new(resolve_expr(value, &child_schema)?), - child: Rc::new(child), - } - } - - QE::PromqlInfoEnrich { selector, child } => QE::PromqlInfoEnrich { - selector: selector.clone(), - child: Rc::new(resolve(child, fallback)?), - }, - - QE::PromqlSeriesSample { by, kind, child } => { - let child = resolve(child, fallback)?; - let child_schema = child.output_schema()?; - QE::PromqlSeriesSample { - by: resolve_group_keys(by, &child_schema)?, - kind: *kind, - child: Rc::new(child), - } - } - - QE::Filter { pred, child } => { - let child = resolve(child, fallback)?; - let child_schema = child.output_schema()?; - QE::Filter { - pred: Predicate(Rc::new(resolve_expr(&pred.0, &child_schema)?)), - child: Rc::new(child), - } - } - - QE::Project { - cols, - qualifier, - child, - } => { - let child = resolve(child, fallback)?; - let child_schema = child.output_schema()?; - let cols = cols - .iter() - .map(|item| -> Result { - Ok(ProjectItem { - alias: item.alias.clone(), - expr: resolve_expr(&item.expr, &child_schema)?, - }) - }) - .collect::, _>>()?; - QE::Project { - cols, - qualifier: qualifier.clone(), - child: Rc::new(child), - } - } - - QE::Aggregate { - reduction, - measures, - output_names, - filters, - having, - child, - } => { - let child = resolve(child, fallback)?; - let child_schema = child.output_schema()?; - let reduction = resolve_reduction(reduction, &child_schema)?; - let measures = measures - .iter() - .map(|m| resolve_agg_intent(m, &child_schema)) - .collect::, ResolveError>>()?; - // A measure filter reads the rows being aggregated, so it binds - // against the child's schema, not the aggregate's output. - let filters = filters - .iter() - .map(|f| { - f.as_ref() - .map(|Predicate(p)| Ok(Predicate(Rc::new(resolve_expr(p, &child_schema)?)))) - .transpose() - }) - .collect::, ResolveError>>()?; - // One canonical spelling of "unfiltered" (empty), so structural - // equality and CSE never split on `[]` versus `[None, None]`. - let filters = if any_measure_filtered(&filters) { - filters - } else { - Vec::new() - }; - let having = having - .as_ref() - .map(|Predicate(h)| -> Result { - let out_schema = aggregate_output_schema( - &child_schema, - &reduction, - &measures, - output_names, - )?; - Ok(Predicate(Rc::new(resolve_expr(h, &out_schema)?))) - }) - .transpose()?; - QE::Aggregate { - reduction, - measures, - output_names: output_names.clone(), - filters, - having, - child: Rc::new(child), - } - } - - QE::Dedup { cols, child } => { - let child = resolve(child, fallback)?; - let child_schema = child.output_schema()?; - QE::Dedup { - cols: resolve_column_refs(cols, &child_schema)?, - child: Rc::new(child), - } - } - - QE::Concat { - children, - discriminator_unique_key, - } => { - let children: Vec<_> = children - .iter() - .map(|c| resolve(c, fallback)) - .collect::, _>>()?; - // No front end asserts this today (issue #228 shipped the - // extension point ahead of a wired call site) — resolved here - // regardless, against the first resolved branch's own output - // schema, exactly the schema `output_schema`'s `Concat` arm - // derives the merged schema from, so a future direct - // `concat_with_discriminator` caller upstream of `resolve_root` - // gets a correctly positional `ConcatDiscriminatorKey` out the - // other side. - let discriminator_unique_key = discriminator_unique_key - .as_ref() - .map(|key| -> Result<_, ResolveDAGError> { - let schema = children - .first() - .ok_or(QueryExprError::EmptyConcat)? - .output_schema()?; - Ok(ConcatDiscriminatorKey::new( - resolve_column_ref(key.discriminator(), &schema)?, - resolve_column_refs(key.inner_key(), &schema)?, - )) - }) - .transpose()?; - QE::Concat { - children, - discriminator_unique_key, - } - } - - QE::Join { - kind, - pred, - left, - right, - } => { - // Each branch is bound independently, same reasoning as `BinaryOp` - // below — different leaves / label sets. - let left = resolve_root_with_inherited(left, &[])?; - let right = resolve_root_with_inherited(right, &[])?; - let mut concat = left.output_schema()?; - concat.fields.extend(right.output_schema()?.fields); - let pred = Predicate(Rc::new(resolve_expr(&pred.0, &concat)?)); - QE::Join { - kind: kind.clone(), - pred, - left: Rc::new(left), - right: Rc::new(right), - } - } - - QE::SetOp { - kind, - all, - left, - right, - } => QE::SetOp { - kind: kind.clone(), - all: *all, - left: Rc::new(resolve_root_with_inherited(left, &[])?), - right: Rc::new(resolve_root_with_inherited(right, &[])?), - }, - - QE::Sort { - keys, - partition_by, - child, - } => { - let child = resolve(child, fallback)?; - let child_schema = child.output_schema()?; - let keys = keys - .iter() - .map(|k| -> Result { - Ok(SortKey { - expr: resolve_expr(&k.expr, &child_schema)?, - ascending: k.ascending, - nulls_first: k.nulls_first, - }) - }) - .collect::, _>>()?; - let partition_by = resolve_group_keys(partition_by, &child_schema)?; - QE::Sort { - keys, - partition_by, - child: Rc::new(child), - } - } - - QE::Limit { n, offset, child } => QE::Limit { - n: *n, - offset: *offset, - child: Rc::new(resolve(child, fallback)?), - }, - - QE::PromqlSubquery { - range, - resolution, - child, - } => QE::PromqlSubquery { - range: *range, - resolution: *resolution, - child: Rc::new(resolve(child, fallback)?), - }, - - QE::TimeRange { range, child } => QE::TimeRange { - range: *range, - child: Rc::new(resolve(child, fallback)?), - }, - - QE::TimeShift { shift, child } => QE::TimeShift { - shift: *shift, - child: Rc::new(resolve(child, fallback)?), - }, - - QE::SQLWindowFunc { - func, - args, - partition_by, - order_by, - frame, - output_name, - child, - } => { - let child = resolve(child, fallback)?; - let child_schema = child.output_schema()?; - let args = args - .iter() - .map(|a| resolve_expr(a, &child_schema)) - .collect::, _>>()?; - let partition_by = resolve_group_keys(partition_by, &child_schema)?; - let order_by = order_by - .iter() - .map(|k| -> Result { - Ok(SortKey { - expr: resolve_expr(&k.expr, &child_schema)?, - ascending: k.ascending, - nulls_first: k.nulls_first, - }) - }) - .collect::, _>>()?; - QE::SQLWindowFunc { - func: func.clone(), - args, - partition_by, - order_by, - frame: frame.clone(), - output_name: output_name.clone(), - child: Rc::new(child), - } - } - - QE::BinaryOp { - op, - lhs, - rhs, - vector_match, - } => { - // A binary op's two sides may scan different metrics with - // different label sets, so each branch resolves against its OWN - // bound schema; but an independently-bound side still has to see - // label names an *enclosing* node references (issue #52). - let own = super::schema_resolver::collect_referenced_columns(dag); - let inherited: Vec = inherited_names(fallback) - .into_iter() - .filter(|n| !own.contains(n)) - .collect(); - QE::BinaryOp { - op: op.clone(), - lhs: Rc::new(resolve_root_with_inherited(lhs, &inherited)?), - rhs: Rc::new(resolve_root_with_inherited(rhs, &inherited)?), - vector_match: vector_match.clone(), - } - } - - // The scalar variants (issue #205) are never reached here directly — - // `resolve` only ever recurses into `child`/operator positions; - // every scalar position (`Predicate`, `ProjectItem.expr`, …) goes - // through `resolve_expr` instead, at the operator arm that owns it. - other @ (QE::Column(_) - | QE::Literal(_) - | QE::Compare { .. } - | QE::BoolAnd(_) - | QE::BoolOr(_) - | QE::Not(_) - | QE::IsNull(_) - | QE::IsNotNull(_) - | QE::Cast { .. } - | QE::InList { .. } - | QE::FunctionCall { .. } - | QE::Arithmetic { .. } - | QE::Case { .. }) => { - unreachable!("resolve reached a scalar QueryExpr variant directly: {other:?}") - } - }) -} - -/// The label names an enclosing scope's schema carries beyond the `(ts, -/// value)` floor. -fn inherited_names(schema: &Schema) -> Vec { - schema - .fields - .iter() - .filter(|c| c.name != "ts" && c.name != "value") - .map(|c| c.name.clone()) - .collect() -} - -/// Resolve a name-based [`GroupKeys`] into positional -/// [`GroupKeys`], preserving its `by`/`without` mode. -fn resolve_group_keys( - keys: &GroupKeys, - schema: &Schema, -) -> Result, ResolveError> { - let ids = resolve_column_refs(keys.keys(), schema)?; - Ok(if keys.is_without() { - GroupKeys::without(ids) - } else { - GroupKeys::by(ids) - }) -} - -/// Resolve a name-based [`Reduction`] into positional -/// [`Reduction`]. -/// -/// Uses [`resolve_group_keys_promql`] rather than the strict -/// [`resolve_group_keys`], unlike every other group-key site in `resolve` -/// (`PromqlSeriesSample.by`, `Sort.partition_by`, `SQLWindowFunc.partition_by`): a key -/// absent from a **closed** schema (e.g. the output of a nested cross-series -/// aggregate that collapsed the label) is provably absent from every row, so -/// PromQL drops it from the grouping rather than rejecting the query (issue -/// #53) — `sum(sum by (group) (m)) by (job)` is the canonical case, `job` -/// absent from the inner aggregate's closed `[group, sum]` output. Applied -/// uniformly to every `Aggregate`, not just PromQL's: SQL's `GROUP BY` keys -/// are always genuinely present (DataFusion validates the plan), so the -/// "drop instead of reject" branch is simply never exercised there — the -/// lenient resolver is a no-op difference for a SQL DAG, not a behavior -/// change. -fn resolve_reduction( - reduction: &Reduction, - schema: &Schema, -) -> Result, ResolveError> { - Ok(match reduction { - Reduction::Reduce(by) => { - let ids = resolve_group_keys_promql(by.keys(), schema)?; - Reduction::Reduce(if by.is_without() { - GroupKeys::without(ids) - } else { - GroupKeys::by(ids) - }) - } - Reduction::PerEntity => Reduction::PerEntity, - }) -} - -/// Resolve a name-based [`AggIntent`] into positional -/// [`AggIntent`] — every `col: Option` resolves to -/// `Option` (`None` stays `None`, the sample-value convention); -/// every other field carries straight through unchanged. -fn resolve_agg_intent( - intent: &AggIntent, - schema: &Schema, -) -> Result, ResolveError> { - let col = |c: &Option| -> Result, ResolveError> { - c.as_ref() - .map(|r| resolve_column_ref(r, schema)) - .transpose() - }; - Ok(match intent { - AggIntent::Count { accuracy } => AggIntent::Count { - accuracy: accuracy.clone(), - }, - AggIntent::PearsonCorr { left, right } => AggIntent::PearsonCorr { - left: resolve_column_ref(left, schema)?, - right: resolve_column_ref(right, schema)?, - }, - AggIntent::Sum { col: c } => AggIntent::Sum { col: col(c)? }, - AggIntent::Min { col: c } => AggIntent::Min { col: col(c)? }, - AggIntent::Max { col: c } => AggIntent::Max { col: col(c)? }, - AggIntent::Avg { col: c } => AggIntent::Avg { col: col(c)? }, - AggIntent::StdDev { col: c, population } => AggIntent::StdDev { - col: col(c)?, - population: *population, - }, - AggIntent::Variance { col: c, population } => AggIntent::Variance { - col: col(c)?, - population: *population, - }, - AggIntent::Quantile { - col: c, - q, - accuracy, - } => AggIntent::Quantile { - col: col(c)?, - q: *q, - accuracy: accuracy.clone(), - }, - AggIntent::TopK { k, accuracy } => AggIntent::TopK { - k: *k, - accuracy: accuracy.clone(), - }, - AggIntent::Cardinality { cols, accuracy } => AggIntent::Cardinality { - cols: cols - .iter() - .map(|c| resolve_column_ref(c, schema)) - .collect::>()?, - accuracy: accuracy.clone(), - }, - AggIntent::FrequencyL2 { col: c, accuracy } => AggIntent::FrequencyL2 { - col: col(c)?, - accuracy: accuracy.clone(), - }, - AggIntent::FrequencyEntropy { col: c, accuracy } => AggIntent::FrequencyEntropy { - col: col(c)?, - accuracy: accuracy.clone(), - }, - AggIntent::Rate => AggIntent::Rate, - AggIntent::IRate => AggIntent::IRate, - AggIntent::Increase => AggIntent::Increase, - AggIntent::Changes => AggIntent::Changes, - AggIntent::Delta => AggIntent::Delta, - AggIntent::IDelta => AggIntent::IDelta, - AggIntent::Deriv => AggIntent::Deriv, - AggIntent::Resets => AggIntent::Resets, - AggIntent::PredictLinear { seconds } => AggIntent::PredictLinear { seconds: *seconds }, - AggIntent::DoubleExpSmoothing { smoothing, trend } => AggIntent::DoubleExpSmoothing { - smoothing: *smoothing, - trend: *trend, - }, - AggIntent::HistogramCount => AggIntent::HistogramCount, - AggIntent::HistogramSum => AggIntent::HistogramSum, - AggIntent::HistogramAvg => AggIntent::HistogramAvg, - AggIntent::HistogramStdDev => AggIntent::HistogramStdDev, - AggIntent::HistogramStdVar => AggIntent::HistogramStdVar, - AggIntent::HistogramFraction { lower, upper } => AggIntent::HistogramFraction { - lower: *lower, - upper: *upper, - }, - AggIntent::HistogramQuantile { q, le } => AggIntent::HistogramQuantile { - q: *q, - le: resolve_column_ref(le, schema)?, - }, - AggIntent::Math(f) => AggIntent::Math(f.clone()), - AggIntent::Absent => AggIntent::Absent, - AggIntent::AbsentOverTime => AggIntent::AbsentOverTime, - AggIntent::PresentOverTime => AggIntent::PresentOverTime, - AggIntent::TimeFn(f) => AggIntent::TimeFn(*f), - AggIntent::Group => AggIntent::Group, - AggIntent::CountValues { label } => AggIntent::CountValues { - label: label.clone(), - }, - AggIntent::LastOverTime => AggIntent::LastOverTime, - AggIntent::FirstOverTime => AggIntent::FirstOverTime, - AggIntent::MadOverTime => AggIntent::MadOverTime, - AggIntent::TsOfMinOverTime => AggIntent::TsOfMinOverTime, - AggIntent::TsOfMaxOverTime => AggIntent::TsOfMaxOverTime, - AggIntent::TsOfFirstOverTime => AggIntent::TsOfFirstOverTime, - AggIntent::TsOfLastOverTime => AggIntent::TsOfLastOverTime, - AggIntent::Extension { ext_kind, payload } => AggIntent::Extension { - ext_kind: ext_kind.clone(), - payload: payload.clone(), - }, - }) -} - -#[cfg(test)] -mod tests { - use super::*; - use crate::pre_asap::expr_ir::CompareOpKind; - use crate::pre_asap::query_expr::{ - BinaryOpKind, QueryExpr, Source, VectorMatch, VectorMatchKind, - }; - - // A measure filter (#466) binds positionally against the aggregate's - // input, and a vector with no set entry collapses to the empty spelling. - #[test] - fn resolve_measure_filters_against_the_child_schema() { - use crate::pre_asap::expr_ir::ScalarValue; - use crate::pre_asap::query_expr::Predicate; - use crate::pre_asap::{DataType, Field, GroupKeys}; - use crate::types::AccuracyTarget; - let scan = || UnresolvedQueryExpr::Scan { - source: Source::Table { - table_ref: "metrics".into(), - }, - predicates: vec![], - schema: Some(Schema::new(vec![ - Field::plain("service", DataType::Utf8, false), - Field::plain("latency", DataType::Float64, false), - Field::plain("bytes", DataType::Int64, false), - ])), - }; - let aggregate = |filters| UnresolvedQueryExpr::Aggregate { - reduction: Reduction::Reduce(GroupKeys::by(vec![ColumnRef::Named("service".into())])), - measures: vec![ - AggIntent::Count { - accuracy: AccuracyTarget::Exact, - }, - AggIntent::Sum { - col: Some(ColumnRef::Named("bytes".into())), - }, - ], - output_names: vec![], - filters, - having: None, - child: Rc::new(scan()), - }; - let latency_gt_one = Predicate(Rc::new(UnresolvedQueryExpr::Compare { - left: Rc::new(UnresolvedQueryExpr::Column(ColumnRef::Named( - "latency".into(), - ))), - op: CompareOpKind::Gt, - right: Rc::new(UnresolvedQueryExpr::Literal(ScalarValue::Float64(1.0))), - })); - - let resolved = resolve_root(&aggregate(vec![Some(latency_gt_one), None])).unwrap(); - let QueryExpr::Aggregate { filters, .. } = &resolved else { - unreachable!() - }; - let [Some(Predicate(first)), None] = filters.as_slice() else { - panic!("expected one filtered and one unfiltered measure, got {filters:?}"); - }; - assert!( - matches!(first.as_ref(), QueryExpr::Compare { left, .. } - if matches!(left.as_ref(), QueryExpr::Column(1))), - "latency is input column 1, got {first:?}" - ); - - let resolved = resolve_root(&aggregate(vec![None, None])).unwrap(); - let QueryExpr::Aggregate { filters, .. } = &resolved else { - unreachable!() - }; - assert!(filters.is_empty()); - } - - // Both sides resolve with qualifiers; an unknown right input is an error. - #[test] - fn resolve_pearson_corr_inputs() { - use crate::pre_asap::{DataType, Field}; - let schema = Schema::new(vec![ - Field::plain("x", DataType::Float64, true).with_table("a"), - Field::plain("x", DataType::Float64, true).with_table("b"), - ]); - let intent = AggIntent::PearsonCorr { - left: ColumnRef::Qualified { - table: "a".into(), - name: "x".into(), - }, - right: ColumnRef::Qualified { - table: "b".into(), - name: "x".into(), - }, - }; - assert_eq!( - resolve_agg_intent(&intent, &schema).unwrap(), - AggIntent::PearsonCorr { left: 0, right: 1 } - ); - let missing = AggIntent::PearsonCorr { - left: ColumnRef::Qualified { - table: "a".into(), - name: "x".into(), - }, - right: ColumnRef::Named("missing".into()), - }; - assert!(resolve_agg_intent(&missing, &schema).is_err()); - } - - // Every leg resolves independently, qualifiers included; one unknown leg - // fails rather than silently shortening the tuple. - #[test] - fn resolve_distinct_tuple_columns() { - use crate::pre_asap::{DataType, Field}; - use crate::types::AccuracyTarget; - let schema = Schema::new(vec![ - Field::plain("k", DataType::Int64, true).with_table("a"), - Field::plain("k", DataType::Int64, true).with_table("b"), - ]); - let qualified = |table: &str| ColumnRef::Qualified { - table: table.into(), - name: "k".into(), - }; - let intent = AggIntent::Cardinality { - cols: vec![qualified("b"), qualified("a")], - accuracy: AccuracyTarget::Exact, - }; - assert_eq!( - resolve_agg_intent(&intent, &schema).unwrap(), - AggIntent::Cardinality { - cols: vec![1, 0], - accuracy: AccuracyTarget::Exact, - } - ); - let missing = AggIntent::Cardinality { - cols: vec![qualified("a"), ColumnRef::Named("missing".into())], - accuracy: AccuracyTarget::Exact, - }; - assert!(resolve_agg_intent(&missing, &schema).is_err()); - } - - /// `resolve_root` over a `BinaryOp { , PromqlScalarBridge, vector_match }` - /// (issue #220): the bridged scalar operand resolves through the same - /// generic walk as every other node (its `Literal` child has no - /// `ColumnRef` to resolve, so it comes through unchanged), the vector - /// side's `ColumnRef`s resolve positionally, and the `VectorMatch` - /// modifier on the relational binary-op path survives resolution - /// untouched — Instance 2 of #220 (`BinaryOp` vs `Compare`/`Arithmetic`) - /// is out of scope for this change, so this pins that its behavior is - /// unaffected by the Instance-1 collapse. - #[test] - fn resolve_root_threads_a_scalar_bridge_operand_and_preserves_vector_match() { - let vm = VectorMatch { - kind: VectorMatchKind::Ignoring, - labels: vec!["job".into()], - grouping: None, - }; - let unresolved: UnresolvedQueryExpr = QueryExpr::BinaryOp { - op: BinaryOpKind::Compare(CompareOpKind::Gt), - lhs: Rc::new(UnresolvedQueryExpr::Scan { - source: Source::TimeSeries { - metric: "up".into(), - }, - predicates: vec![], - schema: None, - }), - rhs: Rc::new(UnresolvedQueryExpr::promql_scalar(1.0)), - vector_match: Some(vm.clone()), - }; - - let resolved = resolve_root(&unresolved).expect("resolves"); - let QueryExpr::BinaryOp { - lhs, - rhs, - vector_match, - .. - } = &resolved - else { - panic!("expected a resolved BinaryOp, got {resolved:?}"); - }; - assert!(matches!(lhs.as_ref(), QueryExpr::Scan { .. })); - assert_eq!(rhs.as_promql_scalar(), Some(1.0)); - assert_eq!(vector_match.as_ref(), Some(&vm)); - - // Schema derivation still follows the vector side post-resolution. - assert_eq!( - resolved.output_schema().unwrap(), - lhs.output_schema().unwrap() - ); - } - - /// Issue #228 review, end-to-end: `resolve_root` over a `Concat` whose - /// discriminator column is referenced *nowhere else* in the DAG, with a - /// schema-less (usage-derived) leaf `Scan` in the first branch — exactly - /// the scenario the review flagged. Before the `schema_resolver.rs` fix, the - /// SchemaResolver's fallback schema wouldn't contain `phi` at all, and this - /// `resolve_column_ref` call would fail `NotFound` for a column the - /// caller correctly named. It must resolve cleanly, and the resolved - /// `ConcatDiscriminatorKey` must carry the *positional* `ColumnId`s of - /// the branch's own (usage-derived) schema. - #[test] - fn resolve_root_seeds_and_resolves_an_otherwise_unreferenced_discriminator_column() { - let branch = || UnresolvedQueryExpr::Scan { - source: Source::TimeSeries { metric: "m".into() }, - predicates: vec![], - schema: None, - }; - let unresolved = UnresolvedQueryExpr::concat_with_discriminator( - vec![branch(), branch()], - ColumnRef::Named("phi".into()), - vec![ColumnRef::Named("host".into())], - ); - - let resolved = resolve_root(&unresolved).expect("resolves"); - let QueryExpr::Concat { - children, - discriminator_unique_key, - } = &resolved - else { - panic!("expected a resolved Concat, got {resolved:?}"); - }; - let schema = children[0].output_schema().unwrap(); - let key = discriminator_unique_key - .as_ref() - .expect("discriminator key survives resolution"); - assert_eq!(*key.discriminator(), schema.column_id("phi").unwrap()); - assert_eq!( - key.inner_key().to_vec(), - vec![schema.column_id("host").unwrap()] - ); - } -} diff --git a/crates/types/src/pre_asap/scalar_type_rules.rs b/crates/types/src/pre_asap/scalar_type_rules.rs index 44eaa250c..3efad3f7e 100644 --- a/crates/types/src/pre_asap/scalar_type_rules.rs +++ b/crates/types/src/pre_asap/scalar_type_rules.rs @@ -1,5 +1,5 @@ -//! Shared type rules for structural map scalar expressions. -//! Execution must separately implement the documented ordering/default semantics. +//! Shared type and nullability rules used to validate scalar expressions. +//! These rules do not evaluate expressions or define physical representations. use super::schema::DataType; /// Names are resolved once against this closed builtin set; unknown functions @@ -123,6 +123,21 @@ fn common_type(left: &DataType, right: &DataType) -> Result { )) } +/// Closed, namespaced contracts for PromQL pointwise float functions. +/// Date functions consume Unix seconds; `timestamp` remains a sample-selection +/// operation because its operand is a sample timestamp rather than its value. +pub fn promql_function_arity(name: &str) -> Option { + Some(match name.strip_prefix("promql_")? { + "abs" | "ceil" | "floor" | "exp" | "ln" | "log2" | "log10" | "sqrt" | "sgn" | "sin" + | "cos" | "tan" | "asin" | "acos" | "atan" | "sinh" | "cosh" | "tanh" | "asinh" + | "acosh" | "atanh" | "deg" | "rad" | "minute" | "hour" | "day_of_week" + | "day_of_month" | "day_of_year" | "month" | "year" | "days_in_month" => 1, + "round" | "clamp_min" | "clamp_max" => 2, + "clamp" => 3, + _ => return None, + }) +} + #[cfg(test)] mod tests { use super::*; @@ -196,324 +211,3 @@ mod tests { .is_err()); } } - -#[cfg(test)] -mod projection_tests { - use super::*; - use crate::pre_asap::{Field, ProjectItem, QueryExpr, ScalarValue, Schema, Source}; - use std::rc::Rc; - fn project(expr: QueryExpr) -> QueryExpr { - QueryExpr::Project { - cols: vec![ProjectItem { - alias: Some("result".into()), - expr, - }], - qualifier: None, - child: Rc::new(QueryExpr::Scan { - source: Source::Table { - table_ref: "t".into(), - }, - predicates: vec![], - schema: Schema::new(vec![ - Field::plain("k", DataType::Utf8, false), - Field::plain("v", DataType::Int64, true), - ]), - }), - } - } - #[test] - fn canonical_projection_uses_map_signature_and_rejects_invalid_arity() { - let map = QueryExpr::FunctionCall { - name: "map".into(), - args: vec![QueryExpr::Column(0), QueryExpr::Column(1)], - }; - let schema = project(map.clone()).output_schema().unwrap(); - assert_eq!( - schema.fields[0].dtype, - DataType::Map { - key: Box::new(DataType::Utf8), - value: Box::new(DataType::Int64), - value_nullable: true - } - ); - assert!(!schema.fields[0].nullable); - let lookup = QueryExpr::FunctionCall { - name: "asap_map_access".into(), - args: vec![map, QueryExpr::Literal(ScalarValue::Utf8("missing".into()))], - }; - assert_eq!( - project(lookup).output_schema().unwrap().fields[0], - Field::plain("result", DataType::Int64, true) - ); - assert!(project(QueryExpr::FunctionCall { - name: "map".into(), - args: vec![QueryExpr::Column(0)] - }) - .output_schema() - .is_err()); - } -} - -/// Resolve the bounded canonical `asap_struct_field(struct, selector)` operation. -/// Selectors are positive 1-based literal ordinals or exact literal field names. -/// The existing Struct fields remain the sole authority for type/nullability. -/// Dynamic/negative/defaulted selectors and nullable containers are intentionally -/// unsupported here; this is not a claim of complete native tupleElement support. -pub fn struct_field_type( - args: &[super::QueryExpr], - schema: &super::Schema, -) -> Result<(DataType, bool), String> { - use super::{QueryExpr, ScalarValue}; - let [input, selector] = args else { - return Err("struct field access requires a struct and constant selector".into()); - }; - let (dtype, nullable) = input - .scalar_type(schema) - .map_err(|error| error.to_string())?; - if nullable { - return Err("nullable struct container access is unsupported".into()); - } - let DataType::Struct { fields } = dtype else { - return Err("struct field access requires a Struct input".into()); - }; - let field = match selector { - QueryExpr::Literal(ScalarValue::Int64(index)) if *index > 0 => usize::try_from(*index - 1) - .ok() - .and_then(|index| fields.get(index)) - .ok_or("struct field ordinal is out of bounds")?, - QueryExpr::Literal(ScalarValue::Utf8(name)) => { - let mut matches = fields.iter().filter(|field| field.name == *name); - let field = matches.next().ok_or("struct field name does not exist")?; - if matches.next().is_some() { - return Err("struct field name is ambiguous".into()); - } - field - } - _ => { - return Err( - "struct field selector must be a positive ordinal or field-name literal".into(), - ) - } - }; - Ok((field.dtype.clone(), field.nullable)) -} - -#[cfg(test)] -mod struct_field_tests { - use super::*; - use crate::pre_asap::{Field, FieldDataType, QueryExpr, ScalarValue, Schema}; - fn schema() -> Schema { - Schema::new(vec![Field::plain( - "record", - DataType::Struct { - fields: vec![ - Field::new("ts", DataType::Int64, false), - Field::new( - "values", - DataType::List { - element: Box::new(Field::new("item", DataType::Float64, true)), - }, - true, - ), - ], - }, - false, - )]) - } - fn access(selector: QueryExpr) -> QueryExpr { - QueryExpr::FunctionCall { - name: "asap_struct_field".into(), - args: vec![QueryExpr::Column(0), selector], - } - } - #[test] - fn field_access_reuses_nested_field_type_and_nullability() { - let schema = schema(); - assert_eq!( - access(QueryExpr::Literal(ScalarValue::Int64(1))) - .scalar_type(&schema) - .unwrap(), - (DataType::Int64, false) - ); - let named = access(QueryExpr::Literal(ScalarValue::Utf8("values".into()))); - let ordinal = access(QueryExpr::Literal(ScalarValue::Int64(2))); - assert_eq!( - named.scalar_type(&schema).unwrap(), - ordinal.scalar_type(&schema).unwrap() - ); - assert_eq!( - named.scalar_type(&schema).unwrap(), - ( - DataType::List { - element: Box::new(Field::new("item", DataType::Float64, true)) - }, - true - ) - ); - let roundtrip: QueryExpr = - serde_json::from_str(&serde_json::to_string(&named).unwrap()).unwrap(); - assert_eq!(roundtrip, named); - } - #[test] - fn unsupported_field_access_is_an_error_not_placeholder_typing() { - for selector in [ - QueryExpr::Column(0), - QueryExpr::Literal(ScalarValue::Int64(0)), - QueryExpr::Literal(ScalarValue::Int64(-1)), - QueryExpr::Literal(ScalarValue::Int64(3)), - QueryExpr::Literal(ScalarValue::Utf8("missing".into())), - ] { - assert!(access(selector).scalar_type(&schema()).is_err()); - } - let mut ambiguous = schema(); - if let FieldDataType::Plain(DataType::Struct { fields }) = &mut ambiguous.fields[0].dtype { - fields.push(Field::new("ts", DataType::Utf8, false)); - } - assert!(access(QueryExpr::Literal(ScalarValue::Utf8("ts".into()))) - .scalar_type(&ambiguous) - .is_err()); - let mut nullable = schema(); - nullable.fields[0].nullable = true; - assert!(access(QueryExpr::Literal(ScalarValue::Int64(1))) - .scalar_type(&nullable) - .is_err()); - } -} - -/// Canonical element lookup over a declared Map or List. Map lookup retains its -/// existing key/default contract. List lookup is one-based, supports negative -/// indices, and returns the declared element default when a dynamic index is -/// out of range. Literal zero is conservatively rejected because native array -/// behavior depends on whether the input array is constant. Nullable containers -/// are unsupported; nullable indices produce nullable results. -pub fn element_access_type( - args: &[super::QueryExpr], - schema: &super::Schema, -) -> Result<(DataType, bool), String> { - use super::{QueryExpr, ScalarValue}; - let [input, index] = args else { - return Err("element access requires a collection and index".into()); - }; - let source = input.scalar_type(schema).map_err(|e| e.to_string())?; - let key = index.scalar_type(schema).map_err(|e| e.to_string())?; - match &source.0 { - DataType::Map { .. } => MapScalarFunction::Access.output_type(&[source, key]), - DataType::List { element } => { - if source.1 { - return Err("nullable List container access is unsupported".into()); - } - if !matches!(key.0, DataType::Int64 | DataType::Null) { - return Err("List index must have integer type".into()); - } - if matches!(index, QueryExpr::Literal(ScalarValue::Int64(0))) { - return Err( - "literal zero List index is unsupported without constant-array proof".into(), - ); - } - Ok(( - element.dtype.clone(), - element.nullable || key.1 || key.0 == DataType::Null, - )) - } - _ => Err("element access requires a Map or List".into()), - } -} - -#[cfg(test)] -mod element_access_tests { - use super::*; - use crate::pre_asap::{Field, QueryExpr, ScalarValue, Schema}; - fn access(index: QueryExpr) -> QueryExpr { - QueryExpr::FunctionCall { - name: "asap_element_access".into(), - args: vec![QueryExpr::Column(0), index], - } - } - #[test] - fn list_index_preserves_nested_element_metadata() { - let element = DataType::Struct { - fields: vec![ - Field::new("ts", DataType::Int64, false), - Field::new("value", DataType::Float64, true), - ], - }; - let schema = Schema::new(vec![ - Field::plain( - "samples", - DataType::List { - element: Box::new(Field::new("item", element.clone(), false)), - }, - false, - ), - Field::plain("i", DataType::Int64, true), - ]); - for index in [1, -1, 100] { - assert_eq!( - access(QueryExpr::Literal(ScalarValue::Int64(index))) - .scalar_type(&schema) - .unwrap(), - (element.clone(), false) - ); - } - assert_eq!( - access(QueryExpr::Column(1)).scalar_type(&schema).unwrap(), - (element.clone(), true) - ); - assert!(access(QueryExpr::Literal(ScalarValue::Int64(0))) - .scalar_type(&schema) - .is_err()); - assert!(access(QueryExpr::Literal(ScalarValue::Float64(1.0))) - .scalar_type(&schema) - .is_err()); - let nested = QueryExpr::FunctionCall { - name: "asap_struct_field".into(), - args: vec![ - access(QueryExpr::Literal(ScalarValue::Int64(1))), - QueryExpr::Literal(ScalarValue::Int64(2)), - ], - }; - assert_eq!( - nested.scalar_type(&schema).unwrap(), - (DataType::Float64, true) - ); - let roundtrip: QueryExpr = - serde_json::from_value(serde_json::to_value(&nested).unwrap()).unwrap(); - assert_eq!(roundtrip, nested); - } - #[test] - fn generic_map_lookup_reuses_legacy_signature() { - let schema = Schema::new(vec![Field::plain( - "m", - DataType::Map { - key: Box::new(DataType::Utf8), - value: Box::new(DataType::Int64), - value_nullable: false, - }, - false, - )]); - let key = QueryExpr::Literal(ScalarValue::Utf8("k".into())); - let legacy = QueryExpr::FunctionCall { - name: "asap_map_access".into(), - args: vec![QueryExpr::Column(0), key.clone()], - }; - assert_eq!( - access(key).scalar_type(&schema).unwrap(), - legacy.scalar_type(&schema).unwrap() - ); - } -} - -/// Closed, namespaced contracts for PromQL pointwise float functions. -/// Date functions consume Unix seconds; `timestamp` remains a sample-selection -/// operation because its operand is a sample timestamp rather than its value. -pub fn promql_function_arity(name: &str) -> Option { - Some(match name.strip_prefix("promql_")? { - "abs" | "ceil" | "floor" | "exp" | "ln" | "log2" | "log10" | "sqrt" | "sgn" | "sin" - | "cos" | "tan" | "asin" | "acos" | "atan" | "sinh" | "cosh" | "tanh" | "asinh" - | "acosh" | "atanh" | "deg" | "rad" | "minute" | "hour" | "day_of_week" - | "day_of_month" | "day_of_year" | "month" | "year" | "days_in_month" => 1, - "round" | "clamp_min" | "clamp_max" => 2, - "clamp" => 3, - _ => return None, - }) -} diff --git a/crates/types/src/pre_asap/schema.rs b/crates/types/src/pre_asap/schema.rs index 77c8ebe92..7eec788b7 100644 --- a/crates/types/src/pre_asap/schema.rs +++ b/crates/types/src/pre_asap/schema.rs @@ -325,82 +325,6 @@ impl TryFrom for Schema { /// label map. `$` cannot occur in a user PromQL label name. pub const PROMQL_SERIES_IDENTITY: &str = "$promql_series_identity"; -/// Resolve a PromQL root to rows carrying [`PROMQL_SERIES_IDENTITY`] before -/// candidate search. `closed` describes physical columns here: the final -/// column contains every dynamic source label. It does not assert that the -/// query's projected labels are the full label set. -/// -/// This realization supports explicit `by` grouping and per-series computation. -/// Operators that rewrite or implicitly match dynamic label sets require their -/// own realization; they must not accidentally treat the opaque identity as a -/// user label or silently discard it. -pub fn with_promql_series_identity(root: &super::QueryExpr) -> Result { - use super::{QueryExpr, Source}; - use std::rc::Rc; - let mut root = root.clone(); - fn visit(node: &mut QueryExpr) -> Result<(), String> { - match node { - QueryExpr::Scan { - source: Source::TimeSeries { .. }, - schema, - .. - } => { - if schema - .fields - .iter() - .any(|column| column.name == PROMQL_SERIES_IDENTITY) - { - return Err("source already contains a physical series identity".into()); - } - if schema.closed { - return Err("dynamic series identity requires an open PromQL source".into()); - } - schema - .fields - .push(Field::plain(PROMQL_SERIES_IDENTITY, DataType::Utf8, false)); - schema.closed = true; - Ok(()) - } - QueryExpr::TimeRange { child, .. } - | QueryExpr::Limit { child, .. } - | QueryExpr::TimeShift { child, .. } - | QueryExpr::PromqlSubquery { child, .. } - | QueryExpr::PromqlScalarFromVector(child) - | QueryExpr::PromqlRelabel { child, .. } => visit(Rc::make_mut(child)), - // Constants read no series. - QueryExpr::PromqlScalarBridge(_) - | QueryExpr::EvalTimestamp - | QueryExpr::Literal(super::ScalarValue::Float64(_)) => Ok(()), - QueryExpr::PromqlVectorFromScalar(child) => visit(Rc::make_mut(child)), - QueryExpr::BinaryOp { lhs, rhs, .. } => { - visit(Rc::make_mut(lhs))?; - visit(Rc::make_mut(rhs)) - } - QueryExpr::Concat { children, .. } => { - for child in children { - visit(child)?; - } - Ok(()) - } - QueryExpr::Aggregate { child, .. } => visit(Rc::make_mut(child)), - QueryExpr::Sort { - child, - partition_by, - .. - } => { - if partition_by.is_without() { - return Err("dynamic without ranking requires label-set projection".into()); - } - visit(Rc::make_mut(child)) - } - _ => Err("operator has no dynamic series-identity realization".into()), - } - } - visit(&mut root)?; - root.output_schema().map_err(|error| error.to_string())?; - Ok(root) -} - impl Schema { pub fn has_promql_series_identity(&self) -> bool { self.closed @@ -605,12 +529,4 @@ mod tests { assert_eq!(back, c); assert_eq!(back.table.as_deref(), Some("hosts")); } - // Direct scalar literals remain valid vector inputs when series typing runs. - #[test] - fn series_identity_accepts_direct_vector_literal() { - let root = super::super::QueryExpr::PromqlVectorFromScalar(std::rc::Rc::new( - super::super::QueryExpr::Literal(super::super::ScalarValue::Float64(1.0)), - )); - assert!(with_promql_series_identity(&root).is_ok()); - } } diff --git a/crates/types/src/pre_asap/schema_resolver.rs b/crates/types/src/pre_asap/schema_resolver.rs deleted file mode 100644 index a9afff2cb..000000000 --- a/crates/types/src/pre_asap/schema_resolver.rs +++ /dev/null @@ -1,492 +0,0 @@ -//! The **SchemaResolver** — name resolution as an explicit pass. -//! -//! [`SchemaResolver::resolve_schema`] produces the complete, self-contained [`Schema`] every -//! `ColumnId` in the canonical DAG indexes into. [`resolve`](super::resolve) -//! then becomes purely structural: it threads the SchemaResolver's schema and -//! positional resolution downstream is **total**. -//! -//! The default [`UsageDerivedCatalog`] knows nothing — every schema is derived -//! purely from the query's own usage. That is the honest state for the -//! observability domain (metric label sets are open-ended). A registry-backed -//! `SchemaCatalog` is future work; the `SchemaResolver` pass does not change when it -//! lands, only the catalog impl swaps. - -use super::expr_ir::ColumnRef; -use super::query_expr::UnresolvedQueryExpr; -use super::schema::{DataType, Field, Schema}; - -/// The DB / source-schema metadata source — resolves a source (metric / -/// table) name to its known columns. -/// Source of truth for a source's columns — the "catalog". `SqlCatalog` backs -/// it for SQL; PromQL uses [`UsageDerivedCatalog`] (returns `None`) until a -/// registry-backed impl (returning a metric's known label set) drops in here. -/// Distinct from `Scan.schema`, which is the *resolved* binding schema this -/// feeds — the catalog is the input, the schema is the result. Even a -/// registry-backed PromQL catalog yields an **open** schema -/// ([`Schema::closed`] `= false`): a metric's -/// labels are per-series and time-varying, so the registry is a superset hint, -/// not a per-row contract. -pub trait SchemaCatalog { - /// Columns known for `source`. `None` when unknown — the [`SchemaResolver`] then - /// falls back to a usage-derived column set. - fn columns_for(&self, source: &str) -> Option>; -} - -/// The default catalog: knows nothing. Every schema the [`SchemaResolver`] produces -/// is derived purely from the query's own usage. -pub struct UsageDerivedCatalog; - -impl SchemaCatalog for UsageDerivedCatalog { - fn columns_for(&self, _source: &str) -> Option> { - None - } -} - -/// The explicit name-resolution pass. -pub struct SchemaResolver { - catalog: C, -} - -impl Default for SchemaResolver { - fn default() -> Self { - Self::new() - } -} - -impl SchemaResolver { - pub fn new() -> Self { - Self { - catalog: UsageDerivedCatalog, - } - } -} - -impl SchemaResolver { - pub fn with_catalog(catalog: C) -> Self { - Self { catalog } - } - - /// Resolve the complete [`Schema`] in scope for a query rooted at `dag`. - /// - /// Contains the time axis, the synthetic `value` column, and one column - /// per distinct name referenced anywhere in the DAG — so positional - /// `ColumnId` resolution downstream is total. - pub fn resolve_schema(&self, dag: &UnresolvedQueryExpr) -> Schema { - self.resolve_schema_with_inherited(dag, &[]) - } - - /// Like [`resolve_schema`](Self::resolve_schema), but also seeds `inherited` label names that are - /// referenced by an **enclosing** scope rather than by `dag` itself. This is - /// how an independently-bound `BinaryOp` side (each side re-binds against its - /// own sub-DAG) still sees an outer aggregate's group keys — e.g. the - /// `__name__` / `job` in `sum by (__name__)(a or b)`, which appear in neither - /// side's own matchers (issue #52). - pub fn resolve_schema_with_inherited( - &self, - dag: &UnresolvedQueryExpr, - inherited: &[String], - ) -> Schema { - let mut columns: Vec = leftmost_scan_name(dag) - .and_then(|name| self.catalog.columns_for(name)) - .unwrap_or_else(default_leaf_columns); - - // Ensure the (ts, value) floor is present. - for floor in default_leaf_columns() { - if !columns.iter().any(|c| c.name == floor.name) { - columns.push(floor); - } - } - - // Append one column per referenced-but-unknown name (group keys etc.), - // plus any inherited-from-enclosing-scope names. - let referenced = collect_referenced_columns(dag); - for name in referenced.iter().chain(inherited) { - if !columns.iter().any(|c| c.name == *name) { - columns.push(Field::plain(name.clone(), DataType::Utf8, true)); - } - } - - let time_index = columns.iter().position(|c| c.name == "ts"); - Schema { - fields: columns, - time_index, - unique_keys: Vec::new(), - // Usage-derived (schemaless PromQL): the metric's full label set is - // open and runtime-only, so this lists only what the query references. - closed: false, - } - } -} - -/// The conventional PromQL leaf shape: `(ts: Timestamp, value: Float64)`. -fn default_leaf_columns() -> Vec { - vec![ - Field::plain("ts", DataType::Timestamp, false), - Field::plain("value", DataType::Float64, false), - ] -} - -/// Push a `ColumnRef`'s bare name (the schema-seedable identifier). `Qualified` -/// collapses to its `name`; `SampleValue`/`Wildcard` carry no name. -fn push_ref_name(c: &ColumnRef, out: &mut Vec) { - match c { - ColumnRef::Named(n) => out.push(n.clone()), - ColumnRef::Qualified { name, .. } => out.push(name.clone()), - ColumnRef::SampleValue | ColumnRef::Wildcard => {} - } -} - -/// The leftmost `Scan`'s source name in a canonical (`UnresolvedQueryExpr`) DAG — -/// the [`collect_referenced_columns`] counterpart to what a dedicated -/// `Source` leaf type would carry as a method; the canonical DAG's `Scan` -/// leaf needs this walk written out instead. -fn leftmost_scan_name(dag: &UnresolvedQueryExpr) -> Option<&str> { - use UnresolvedQueryExpr as QE; - match dag { - QE::Scan { source, .. } => Some(match source { - super::query_expr::Source::TimeSeries { metric } => metric.as_str(), - super::query_expr::Source::Table { table_ref } => table_ref.as_str(), - }), - // A scalar bridge's child is a scalar-sub-language leaf (in practice - // always a `Literal`, issue #220) — never a `Scan`, same as - // `EvalTimestamp`. - QE::PromqlScalarBridge(_) | QE::EvalTimestamp | QE::CurrentTimestamp => None, - QE::PromqlVectorFromScalar(child) | QE::PromqlScalarFromVector(child) => { - leftmost_scan_name(child) - } - QE::PromqlRelabel { child, .. } - | QE::PromqlInfoEnrich { child, .. } - | QE::PromqlSeriesSample { child, .. } - | QE::Filter { child, .. } - | QE::Project { child, .. } - | QE::Aggregate { child, .. } - | QE::Dedup { child, .. } - | QE::Sort { child, .. } - | QE::Limit { child, .. } - | QE::PromqlSubquery { child, .. } - | QE::TimeRange { child, .. } - | QE::TimeShift { child, .. } - | QE::SQLWindowFunc { child, .. } => leftmost_scan_name(child), - QE::Concat { children, .. } => children.first().and_then(leftmost_scan_name), - QE::Join { left, .. } | QE::SetOp { left, .. } | QE::BinaryOp { lhs: left, .. } => { - leftmost_scan_name(left) - } - // The scalar variants (issue #205) never appear as a direct - // `leftmost_scan_name` target — every reachable one sits behind a - // wrapper field (`Predicate`, `ProjectItem`, …) this walk never - // descends into; it only follows the relational skeleton. - QE::Column(_) - | QE::Literal(_) - | QE::Compare { .. } - | QE::BoolAnd(_) - | QE::BoolOr(_) - | QE::Not(_) - | QE::IsNull(_) - | QE::IsNotNull(_) - | QE::Cast { .. } - | QE::InList { .. } - | QE::FunctionCall { .. } - | QE::Arithmetic { .. } - | QE::Case { .. } => None, - } -} - -/// Collect every distinct column name referenced anywhere in `dag` that -/// resolves positionally — every place a front end constructing -/// [`QueryExpr`](super::query_expr::QueryExpr) directly (issue -/// #179) puts a name-based reference: `Scan.predicates`, `Aggregate`'s -/// `reduction`/`having`/per-measure `col`, `Dedup.cols`, `PromqlSeriesSample.by`, -/// `Filter.pred`, `Project.cols`, `Sort.keys`/`partition_by`, -/// `SQLWindowFunc.args`/`partition_by`/`order_by`, `Join.pred`, `PromqlRelabel.value`. -/// The SchemaResolver seeds these into the usage-derived leaf so positional -/// resolution downstream is total. -pub(crate) fn collect_referenced_columns(dag: &UnresolvedQueryExpr) -> Vec { - use UnresolvedQueryExpr as QE; - fn named(expr: &UnresolvedQueryExpr, out: &mut Vec) { - for c in expr.columns_referenced() { - push_ref_name(c, out); - } - } - fn group_keys(g: &super::query_expr::GroupKeys, out: &mut Vec) { - g.keys().iter().for_each(|k| push_ref_name(k, out)); - } - fn measure_cols(measures: &[super::agg_intent::AggIntent], out: &mut Vec) { - for m in measures { - for c in m.input_cols() { - push_ref_name(&c, out); - } - } - } - fn walk(node: &UnresolvedQueryExpr, out: &mut Vec) { - match node { - QE::Scan { predicates, .. } => { - for super::query_expr::Predicate(p) in predicates { - named(p, out); - } - } - QE::Aggregate { - reduction, - measures, - filters, - having, - child, - .. - } => { - if let super::query_expr::Reduction::Reduce(by) = reduction { - group_keys(by, out); - } - measure_cols(measures, out); - for super::query_expr::Predicate(f) in filters.iter().flatten() { - named(f, out); - } - if let Some(super::query_expr::Predicate(h)) = having { - named(h, out); - } - walk(child, out); - } - QE::Dedup { cols, child } => { - cols.iter().for_each(|c| push_ref_name(c, out)); - walk(child, out); - } - QE::PromqlSeriesSample { by, child, .. } => { - group_keys(by, out); - walk(child, out); - } - QE::Filter { pred, child } => { - named(&pred.0, out); - walk(child, out); - } - QE::Project { cols, child, .. } => { - for item in cols { - named(&item.expr, out); - } - walk(child, out); - } - QE::Sort { - keys, - partition_by, - child, - } => { - for k in keys { - named(&k.expr, out); - } - group_keys(partition_by, out); - walk(child, out); - } - QE::SQLWindowFunc { - args, - partition_by, - order_by, - child, - .. - } => { - for a in args { - named(a, out); - } - group_keys(partition_by, out); - for k in order_by { - named(&k.expr, out); - } - walk(child, out); - } - QE::PromqlRelabel { value, child, .. } => { - named(value, out); - walk(child, out); - } - QE::Join { - pred, left, right, .. - } => { - named(&pred.0, out); - walk(left, out); - walk(right, out); - } - QE::EvalTimestamp | QE::CurrentTimestamp => {} - // The bridged child is a genuine scalar-sub-language position now - // (issue #220) — peel its column refs off with `named`, same as - // every other scalar-typed field (`Scan.predicates`, - // `Filter.pred`, …). In practice it's always a `Literal`, which - // references no columns, so this is a no-op today. - QE::PromqlScalarBridge(inner) => named(inner, out), - QE::PromqlVectorFromScalar(child) | QE::PromqlScalarFromVector(child) => { - walk(child, out) - } - QE::PromqlInfoEnrich { child, .. } - | QE::Limit { child, .. } - | QE::PromqlSubquery { child, .. } - | QE::TimeRange { child, .. } - | QE::TimeShift { child, .. } => walk(child, out), - QE::Concat { - children, - discriminator_unique_key, - } => { - // Same treatment as `Dedup.cols` above: an own-field - // `ColumnRef` must be seeded here too, or a discriminator - // column that isn't otherwise referenced anywhere else in - // the DAG (plausible — a raw usage-derived label, not one a - // `Project`/relabel freshly created) is absent from the - // SchemaResolver's usage-derived fallback schema, and - // `resolve.rs`'s later `resolve_column_ref` call fails with - // `NotFound` for a column the caller correctly named. - if let Some(key) = discriminator_unique_key { - push_ref_name(key.discriminator(), out); - key.inner_key().iter().for_each(|c| push_ref_name(c, out)); - } - children.iter().for_each(|c| walk(c, out)); - } - QE::SetOp { left, right, .. } => { - walk(left, out); - walk(right, out); - } - QE::BinaryOp { lhs, rhs, .. } => { - walk(lhs, out); - walk(rhs, out); - } - // The scalar variants (issue #205) never appear as a direct - // `walk` target — every reachable one is peeled off first by - // `named` at whichever operator field holds it (`Scan.predicates`, - // `Filter.pred`, `Project.cols`, …). - QE::Column(_) - | QE::Literal(_) - | QE::Compare { .. } - | QE::BoolAnd(_) - | QE::BoolOr(_) - | QE::Not(_) - | QE::IsNull(_) - | QE::IsNotNull(_) - | QE::Cast { .. } - | QE::InList { .. } - | QE::FunctionCall { .. } - | QE::Arithmetic { .. } - | QE::Case { .. } => { - unreachable!("walk reached a scalar QueryExpr variant directly: {node:?}") - } - } - } - let mut out: Vec = Vec::new(); - walk(dag, &mut out); - out.sort(); - out.dedup(); - out -} - -#[cfg(test)] -mod tests { - use std::rc::Rc; - - use super::super::query_expr::{GroupKeys, Source}; - use super::*; - - fn src(name: &str) -> UnresolvedQueryExpr { - UnresolvedQueryExpr::Scan { - source: Source::TimeSeries { - metric: name.into(), - }, - predicates: vec![], - schema: None, - } - } - - // Both correlation inputs must seed a usage-derived schema before positional resolution. - #[test] - fn pearson_corr_inputs_seed_usage_derived_schema() { - use crate::pre_asap::{AggIntent, Reduction}; - let dag = UnresolvedQueryExpr::Aggregate { - reduction: Reduction::by(vec![]), - measures: vec![AggIntent::PearsonCorr { - left: ColumnRef::Named("x".into()), - right: ColumnRef::Named("y".into()), - }], - output_names: vec![], - filters: vec![], - having: None, - child: Rc::new(src("m")), - }; - assert_eq!(collect_referenced_columns(&dag), vec!["x", "y"]); - let schema = SchemaResolver::new().resolve_schema(&dag); - assert!(schema.column_id("x").is_some()); - assert!(schema.column_id("y").is_some()); - } - - #[test] - fn bare_source_yields_ts_value_floor() { - let schema = SchemaResolver::new().resolve_schema(&src("m")); - assert_eq!(schema.fields.len(), 2); - assert_eq!(schema.fields[0].name, "ts"); - assert_eq!(schema.fields[1].name, "value"); - assert_eq!(schema.time_index, Some(0)); - } - - #[test] - fn sort_partition_keys_land_in_schema() { - // Per-group ranking keys (`topk by (host)` → `Sort.partition_by`) must be - // seeded into the usage-derived leaf so they resolve positionally. - let dag = UnresolvedQueryExpr::Sort { - keys: vec![super::super::query_expr::SortKey { - expr: UnresolvedQueryExpr::Column(ColumnRef::SampleValue), - ascending: false, - nulls_first: false, - }], - partition_by: GroupKeys::by(vec![ColumnRef::Named("host".into())]), - child: Rc::new(src("hits")), - }; - let schema = SchemaResolver::new().resolve_schema(&dag); - assert!(schema.column_id("host").is_some()); - } - - /// Issue #228 review: a `Concat`'s `discriminator_unique_key` columns — - /// even one referenced nowhere else in the DAG — must be seeded into - /// the usage-derived fallback schema, exactly like `Dedup.cols`, or - /// `resolve.rs`'s later `resolve_column_ref` fails `NotFound` for a - /// column the caller correctly named. - #[test] - fn concat_discriminator_key_is_seeded_into_the_resolver_schema() { - let dag = UnresolvedQueryExpr::concat_with_discriminator( - vec![src("m")], - ColumnRef::Named("phi".into()), - vec![ColumnRef::Named("host".into())], - ); - let schema = SchemaResolver::new().resolve_schema(&dag); - assert!( - schema.column_id("phi").is_some(), - "discriminator column must be seeded" - ); - assert!( - schema.column_id("host").is_some(), - "inner_key column must be seeded" - ); - } - - #[test] - fn inherited_names_are_seeded_alongside_referenced() { - // A `BinaryOp` side re-binds against its own sub-DAG, but must still see - // an enclosing aggregate's group key (`__name__` / `job`) that appears in - // neither side's own matchers (issue #52). `resolve_schema_with_inherited` seeds it. - let schema = - SchemaResolver::new().resolve_schema_with_inherited(&src("m"), &["__name__".into()]); - assert!(schema.column_id("__name__").is_some()); - // `resolve_schema` (no inheritance) does not conjure it. - let plain = SchemaResolver::new().resolve_schema(&src("m")); - assert!(plain.column_id("__name__").is_none()); - } - - #[test] - fn custom_catalog_supplies_base_columns() { - struct FixedCatalog; - impl SchemaCatalog for FixedCatalog { - fn columns_for(&self, source: &str) -> Option> { - (source == "known").then(|| { - vec![ - Field::plain("ts", DataType::Timestamp, false), - Field::plain("value", DataType::Float64, false), - Field::plain("datacenter", DataType::Utf8, false), - ] - }) - } - } - let schema = SchemaResolver::with_catalog(FixedCatalog).resolve_schema(&src("known")); - let dc = schema - .column_id("datacenter") - .and_then(|id| schema.fields.get(id)); - assert!(matches!(dc, Some(c) if !c.nullable)); - } -} diff --git a/crates/types/tests/logical_export.rs b/crates/types/tests/logical_export.rs new file mode 100644 index 000000000..95c812cec --- /dev/null +++ b/crates/types/tests/logical_export.rs @@ -0,0 +1,239 @@ +//! Logical transport must accept plans with no execution timing assigned, before materialization. +use asap_types::{ + ir::{NonASAPOp, Operator, OperatorNode}, + pre_asap::Schema, +}; + +#[test] +fn logical_export_accepts_unassigned_timing() { + let root = OperatorNode::new_shared(Operator::NonASAP(NonASAPOp::Values { + rows: vec![vec![]], + schema: Schema::lifted(vec![], None), + })) + .unwrap(); + assert!(root.timing.is_none()); + assert!(asap_types::ir::export::compile_logical_asap_dag(&root).is_ok()); +} + +use asap_types::{ + ir::export::{ + compile_logical_asap_dag_with_node_ids, EdgeRole, LogicalASAPDAGDocument, + LogicalASAPDAGValidationError, LogicalASAPNodeId, LogicalASAPOperatorPayload, + }, + ir::operator_properties::Reduction, + ir::{ASAPOp, OperatorResultKind, ProjectItem, ScalarExpr}, + post_asap::{GroupingStrategy, SketchAlgorithm, SketchKind, SketchParams, SummaryUpdate}, + pre_asap::{ColumnRef, DataType, Field, FieldDataType, ScalarValue, Source}, +}; +use std::rc::Rc; + +fn values() -> Rc { + OperatorNode::new_shared(Operator::NonASAP(NonASAPOp::Values { + rows: vec![vec![ScalarExpr::Literal(ScalarValue::Float64(1.0))]], + schema: Schema::lifted(vec![Field::plain("value", DataType::Float64, false)], None), + })) + .unwrap() +} + +/// Scalar subqueries contribute real edges; repeated references export one producer. +#[test] +fn scalar_dependencies_share_one_exported_producer() { + let child = values(); + let root = OperatorNode::new_shared(Operator::NonASAP(NonASAPOp::Project { + cols: vec![ProjectItem { + alias: Some("result".into()), + expr: ScalarExpr::ScalarSubquery(child.clone()), + }], + qualifier: None, + child: child.clone(), + })) + .unwrap(); + let compiled = compile_logical_asap_dag_with_node_ids(&root).unwrap(); + compiled.dag.validate().unwrap(); + assert_eq!(compiled.dag.nodes.len(), 2); + assert_eq!(compiled.dag.edges.len(), 2); + assert!(compiled + .dag + .edges + .iter() + .any(|edge| edge.role == EdgeRole::ScalarRef)); + let id = compiled.node_ids.node_id(&child).unwrap(); + assert!(Rc::ptr_eq( + compiled.node_ids.operator_node(id).unwrap(), + &child + )); + let document = LogicalASAPDAGDocument::new(compiled.dag); + let json = serde_json::to_string(&document).unwrap(); + for physical_metadata in [ + "output_state", + "data_state", + "timing", + "retention", + "window", + ] { + assert!( + !json.contains(physical_metadata), + "logical JSON contains {physical_metadata}" + ); + } + let decoded: LogicalASAPDAGDocument = serde_json::from_str(&json).unwrap(); + assert_eq!(document, decoded); + decoded.validate().unwrap(); +} + +/// Summary state identity survives logical merge export without a phase assignment. +#[test] +fn merged_summary_preserves_typed_state() { + let state = OperatorNode::new_shared(Operator::ASAP(ASAPOp::SummaryAgg { + child: values(), + family: FieldDataType::Sketch( + SketchKind::new(SketchAlgorithm::Kll, SketchParams::Kll { k: 200 }), + GroupingStrategy::default(), + ), + input: SummaryUpdate::column(ColumnRef::Named("value".into())), + reduction: Reduction::by(vec![]), + grouping: GroupingStrategy::default(), + filter: None, + })) + .unwrap(); + let root = OperatorNode::new_shared(Operator::ASAP(ASAPOp::SummaryMerge { + children: (0..2) + .map(|start| { + let coverage = asap_types::ir::summary_coverage::SummaryCoverage { + source: Source::Table { + table_ref: "values".into(), + }, + regions: vec![asap_types::ir::summary_coverage::CoverageRegion { + time_ms: Some(start..start + 1), + population: Default::default(), + }], + }; + std::rc::Rc::new((*state).clone().with_coverage(coverage).unwrap()) + }) + .collect(), + })) + .unwrap(); + let dag = asap_types::ir::export::compile_logical_asap_dag(&root).unwrap(); + dag.validate().unwrap(); + assert_eq!(dag.nodes.len(), 4); + let root_id = dag.roots[0].operator_refs()[0]; + let merged = &dag.nodes[root_id.0 as usize]; + assert_eq!(merged.result_kind, OperatorResultKind::State); + assert_eq!(merged.output_schema, root.schema); + assert_eq!(merged.coverage, root.coverage); + assert!(matches!( + merged.payload, + LogicalASAPOperatorPayload::SummaryMerge + )); + // Transport rejects a summary producer whose required coverage was dropped. + let mut stripped = dag.clone(); + let producer = stripped + .nodes + .iter_mut() + .find(|node| matches!(node.payload, LogicalASAPOperatorPayload::SummaryAgg { .. })) + .unwrap(); + producer.coverage = None; + let id = producer.id; + assert!(matches!( + stripped.validate(), + Err(LogicalASAPDAGValidationError::InvalidCoverage(bad)) if bad == id + )); +} + +/// Malformed wire graphs fail transport integrity checks rather than reaching execution. +#[test] +fn malformed_transport_is_rejected() { + let dag = asap_types::ir::export::compile_logical_asap_dag(&values()).unwrap(); + let mut document = LogicalASAPDAGDocument::new(dag.clone()); + document.schema_version = 99; + assert!(matches!( + document.validate(), + Err(LogicalASAPDAGValidationError::UnsupportedVersion(99)) + )); + let mut duplicate = dag.clone(); + duplicate.nodes.push(dag.nodes[0].clone()); + assert!(matches!( + duplicate.validate(), + Err(LogicalASAPDAGValidationError::DuplicateNode(_)) + )); + let mut missing = dag.clone(); + missing.roots = vec![asap_types::ir::export::LogicalASAPQueryRoot::Operator( + LogicalASAPNodeId(9), + )]; + assert!(matches!( + missing.validate(), + Err(LogicalASAPDAGValidationError::MissingNode(_)) + )); + let mut unreachable = dag.clone(); + let mut extra = dag.nodes[0].clone(); + extra.id = LogicalASAPNodeId(1); + unreachable.nodes.push(extra); + assert!(matches!( + unreachable.validate(), + Err(LogicalASAPDAGValidationError::UnreachableNode(_)) + )); + let mut json = serde_json::to_value(LogicalASAPDAGDocument::new(dag)).unwrap(); + json["dag"]["nodes"][0]["output_state"] = serde_json::json!({"timing":"ingestion_time"}); + assert!(serde_json::from_value::(json).is_err()); +} + +/// Standalone constants need no fake relation, while scalar subqueries retain their producer DAG. +#[test] +fn standalone_scalar_roots_roundtrip_without_synthetic_operators() { + use asap_types::ir::{export::compile_logical_asap_query, QueryRoot}; + for root in [ + QueryRoot::Scalar(ScalarExpr::literal_f64(42.0)), + QueryRoot::Scalar(ScalarExpr::ScalarSubquery(values())), + ] { + let expected = root.as_operator().is_some(); + assert!(!expected); + let dag = compile_logical_asap_query(&root).unwrap(); + dag.validate().unwrap(); + let expected_nodes = match root { + QueryRoot::Scalar(ScalarExpr::ScalarSubquery(_)) => 1, + _ => 0, + }; + assert_eq!(dag.nodes.len(), expected_nodes); + let document = LogicalASAPDAGDocument::new(dag); + let decoded: LogicalASAPDAGDocument = + serde_json::from_str(&serde_json::to_string(&document).unwrap()).unwrap(); + decoded.validate().unwrap(); + assert_eq!(document, decoded); + } +} + +/// A batch exports as one DAG: one root per query, shared producers exported once. +#[test] +fn batch_exports_one_root_per_query_and_shares_producers() { + use asap_types::ir::{export::compile_logical_asap_workload, QueryRoot}; + let shared = values(); + let project = |alias: &str| { + OperatorNode::new_shared(Operator::NonASAP(NonASAPOp::Project { + child: shared.clone(), + cols: vec![ProjectItem { + alias: Some(alias.into()), + expr: ScalarExpr::Column(0), + }], + qualifier: None, + })) + .unwrap() + }; + let dag = compile_logical_asap_workload(&[ + QueryRoot::Operator(project("a")), + QueryRoot::Operator(project("b")), + ]) + .unwrap(); + dag.validate().unwrap(); + assert_eq!(dag.roots.len(), 2); + assert_eq!( + dag.nodes.len(), + 3, + "the shared Values node is exported once" + ); + let mut empty = dag.clone(); + empty.roots.clear(); + assert!(matches!( + empty.validate(), + Err(LogicalASAPDAGValidationError::NoRoots) + )); +} diff --git a/crates/types/tests/physical_export.rs b/crates/types/tests/physical_export.rs new file mode 100644 index 000000000..f69cc5c9b --- /dev/null +++ b/crates/types/tests/physical_export.rs @@ -0,0 +1,124 @@ +//! A timed plan exports as a PhysicalASAPDAG that keeps timing and coverage. +use asap_types::ir::export::{ + compile_physical_asap_dag, PhysicalASAPDAGDocument, PhysicalASAPDAGValidationError, +}; +use asap_types::ir::summary_coverage::{CoverageRegion, SummaryCoverage}; +use asap_types::ir::{ + apply_materialization_timings, ASAPOp, MaterializationAssignment, NonASAPOp, Operator, + OperatorNode, TimingMemo, +}; +use asap_types::post_asap::{ExactKind, ExactParams, ExecutionTiming, SummaryUpdate}; +use asap_types::pre_asap::{ColumnRef, DataType, Field, FieldDataType, Reduction, Schema, Source}; +use std::rc::Rc; + +/// Scan(t) → SummaryAgg(sum by key) → FinalizeExactAccumulator, untimed. +fn plan() -> Rc { + let source = Source::Table { + table_ref: "t".into(), + }; + let scan = OperatorNode::new_shared(Operator::NonASAP(NonASAPOp::Scan { + source: source.clone(), + predicates: vec![], + schema: Schema::new(vec![ + Field::plain("key", DataType::Utf8, false), + Field::plain("value", DataType::Float64, false), + ]), + })) + .unwrap(); + let state = OperatorNode::new(Operator::ASAP(ASAPOp::SummaryAgg { + child: scan, + family: FieldDataType::ExactAggregate(ExactKind::Sum, ExactParams::Sum), + input: SummaryUpdate::column(ColumnRef::Named("value".into())), + reduction: Reduction::by(vec![0]), + grouping: Default::default(), + filter: None, + })) + .unwrap() + .with_coverage(SummaryCoverage { + source, + regions: vec![CoverageRegion { + time_ms: Some(0..60_000), + population: Default::default(), + }], + }) + .unwrap(); + OperatorNode::new_shared(Operator::ASAP(ASAPOp::FinalizeExactAccumulator { + child: Rc::new(state), + })) + .unwrap() +} + +/// A summary maintained at ingestion time is read at query time. +#[test] +fn timed_plan_exports_with_timing_and_coverage() { + let timed = apply_materialization_timings( + &plan(), + &MaterializationAssignment::all_ingestion_time(), + &mut TimingMemo::new(), + ) + .unwrap(); + let dag = compile_physical_asap_dag(&timed).unwrap(); + let document = PhysicalASAPDAGDocument::new(dag.clone()); + document.validate().unwrap(); + + let timings: Vec<_> = dag.nodes.iter().map(|n| n.output_state.timing).collect(); + assert_eq!( + timings, + vec![ + ExecutionTiming::IngestionTime, + ExecutionTiming::IngestionTime, + ExecutionTiming::QueryTime + ] + ); + assert!(dag.nodes[1].coverage.is_some()); + + let decoded: PhysicalASAPDAGDocument = + serde_json::from_str(&serde_json::to_string(&document).unwrap()).unwrap(); + assert_eq!(decoded, document); +} + +/// A query-time producer cannot feed an ingestion-time consumer. +#[test] +fn query_time_input_to_ingestion_is_rejected() { + let timed = apply_materialization_timings( + &plan(), + &MaterializationAssignment::all_ingestion_time(), + &mut TimingMemo::new(), + ) + .unwrap(); + let mut dag = compile_physical_asap_dag(&timed).unwrap(); + dag.nodes[0].output_state.timing = ExecutionTiming::QueryTime; + dag.edges[0].data_state = dag.nodes[0].output_state; + assert!(matches!( + dag.validate(), + Err(PhysicalASAPDAGValidationError::QueryDependencyInIngestion { .. }) + )); +} + +/// Untimed plans cannot be exported as physical plans. +#[test] +fn untimed_plan_is_rejected() { + assert!(compile_physical_asap_dag(&plan()).is_err()); +} + +/// Two queries reading one summary state export once, with one root per query. +#[test] +fn batch_shares_the_summary_and_keeps_one_root_per_query() { + use asap_types::ir::export::compile_physical_asap_workload; + let first = plan(); + let state = first.children()[0].clone(); + let second = OperatorNode::new_shared(Operator::ASAP(ASAPOp::FinalizeExactAccumulator { + child: state, + })) + .unwrap(); + let assignment = MaterializationAssignment::all_query_time(); + let mut memo = TimingMemo::new(); + let timed: Vec<_> = [first, second] + .iter() + .map(|root| apply_materialization_timings(root, &assignment, &mut memo).unwrap()) + .collect(); + let dag = compile_physical_asap_workload(&timed).unwrap(); + dag.validate().unwrap(); + assert_eq!(dag.roots.len(), 2); + assert_eq!(dag.nodes.len(), 4, "scan and summary are exported once"); +} diff --git a/crates/types/tests/planner_vocabulary.rs b/crates/types/tests/planner_vocabulary.rs index f14a56ee8..2ba817861 100644 --- a/crates/types/tests/planner_vocabulary.rs +++ b/crates/types/tests/planner_vocabulary.rs @@ -1,7 +1,5 @@ -use asap_types::post_asap::{ - validate_pane_coverage, PaneLayout, WindowEdgeCompatibility, WindowEdgeCoverage, -}; -use asap_types::pre_asap::{SchemaResolver, Source, UnresolvedQueryExpr}; +use asap_types::ir::export::WindowEdgeCompatibility; +use asap_types::post_asap::{validate_pane_coverage, PaneLayout, WindowEdgeCoverage}; use asap_types::resources::{PhysicalHandoffBytes, PhysicalHandoffKind}; // Renamed pane APIs still read and emit the deployed wire contract. @@ -30,18 +28,11 @@ fn window_edge_names_preserve_wire_values() { ); } -// External consumers can use the new resolver and resource names without changing behavior. +// External consumers can use the new resource names without changing behavior. +// (The schema-resolver half moved with the resolver to `asap-frontend-common`; +// `schema_resolver::tests::bare_source_yields_ts_value_floor` covers it.) #[test] -fn renamed_schema_and_handoff_apis_are_public() { - let dag = UnresolvedQueryExpr::Scan { - source: Source::TimeSeries { - metric: "requests".into(), - }, - predicates: vec![], - schema: None, - }; - let schema = SchemaResolver::new().resolve_schema(&dag); - assert!(schema.column_id("value").is_some()); +fn renamed_handoff_apis_are_public() { let bytes = PhysicalHandoffBytes { network_bytes: 12, materialization_bytes: 4, diff --git a/crates/types/tests/schema_rebuilding.rs b/crates/types/tests/schema_rebuilding.rs index 1f1b57dbc..fc7a3f145 100644 --- a/crates/types/tests/schema_rebuilding.rs +++ b/crates/types/tests/schema_rebuilding.rs @@ -1,3 +1,4 @@ +use asap_types::ir::summary_coverage::{CoverageRegion, SummaryCoverage}; use asap_types::ir::{ASAPOp, NonASAPOp, Operator, OperatorNode}; use asap_types::post_asap::{ ExactKind, ExactParams, ExecutionTiming, GroupingStrategy, ResultGuarantee, SummaryUpdate, @@ -7,6 +8,27 @@ use asap_types::pre_asap::{ }; use std::rc::Rc; +fn coverage() -> SummaryCoverage { + SummaryCoverage { + source: Source::Table { + table_ref: "t".into(), + }, + regions: vec![CoverageRegion { + time_ms: None, + population: Default::default(), + }], + } +} +/// Rewrites clear coverage; a rewriter must declare it again for summary nodes. +fn redeclare(node: OperatorNode) -> Rc { + let node = Rc::new(node); + if !node.requires_coverage() { + return node; + } + assert!(node.validate_structure().is_err()); + Rc::new((*node).clone().with_coverage(coverage()).unwrap()) +} + fn scan(key_type: DataType, name: &str) -> Rc { OperatorNode::new_shared(Operator::NonASAP(NonASAPOp::Scan { source: Source::Table { @@ -40,7 +62,12 @@ fn aggregate(child: Rc, asap: bool) -> Rc { having: None, }) }; - OperatorNode::new_shared(operator).unwrap() + let node = OperatorNode::new(operator).unwrap(); + Rc::new(if asap { + node.with_coverage(coverage()).unwrap() + } else { + node + }) } /// Rewrites follow changed input types and inherited names for either category. @@ -50,7 +77,7 @@ fn rebuilding_rederives_schema_for_both_categories() { let original = aggregate(scan(DataType::Int64, "key"), asap); original.validate_structure().unwrap(); let replacement = scan(DataType::Utf8, "new_key"); - let rebuilt = Rc::new(original.map_children(|_| replacement.clone()).unwrap()); + let rebuilt = redeclare(original.map_children(|_| replacement.clone()).unwrap()); assert_eq!(rebuilt.schema, rebuilt.operator.output_schema().unwrap()); rebuilt.validate_structure().unwrap(); } @@ -64,14 +91,14 @@ fn rebuilding_preserves_only_explicit_naming_overrides() { let mut schema = original.schema.clone(); schema.fields[0].name = "alias".into(); schema.fields[0].table = Some("result".into()); - let original = Rc::new( - OperatorNode::with_schema(original.operator.clone(), schema) - .with_guarantee(Some(ResultGuarantee::exact("fixture"))) - .with_timing(Some(ExecutionTiming::QueryTime)), - ); + let mut renamed = OperatorNode::with_schema(original.operator.clone(), schema) + .with_guarantee(Some(ResultGuarantee::exact("fixture"))) + .with_timing(Some(ExecutionTiming::QueryTime)); + renamed.coverage = original.coverage.clone(); + let original = Rc::new(renamed); original.validate_structure().unwrap(); let replacement = scan(DataType::Utf8, "new_key"); - let rebuilt = Rc::new(original.map_children(|_| replacement.clone()).unwrap()); + let rebuilt = redeclare(original.map_children(|_| replacement.clone()).unwrap()); assert_eq!(rebuilt.schema.fields[0].name, "alias"); assert_eq!(rebuilt.schema.fields[0].table.as_deref(), Some("result")); assert_eq!( @@ -110,7 +137,9 @@ fn validation_rejects_structural_overrides_for_both_categories() { schema.fields.pop(); invalid.push(schema); for schema in invalid { - let forged = Rc::new(OperatorNode::with_schema(original.operator.clone(), schema)); + let mut forged = OperatorNode::with_schema(original.operator.clone(), schema); + forged.coverage = original.coverage.clone(); + let forged = Rc::new(forged); assert!( forged.validate_structure().is_err(), "accepted structural override: {:?}", diff --git a/crates/types/tests/structure_contract.rs b/crates/types/tests/structure_contract.rs index d4e164f71..bebdadb18 100644 --- a/crates/types/tests/structure_contract.rs +++ b/crates/types/tests/structure_contract.rs @@ -13,6 +13,19 @@ fn scan() -> Rc { })) .unwrap() } +/// Tabular coverage for a whole-table summary. +fn whole_table() -> asap_types::ir::summary_coverage::SummaryCoverage { + use asap_types::ir::summary_coverage::{CoverageRegion, SummaryCoverage}; + SummaryCoverage { + source: Source::Table { + table_ref: "t".into(), + }, + regions: vec![CoverageRegion { + time_ms: None, + population: Default::default(), + }], + } +} /// Resolved filters cannot hide invalid scalar types or out-of-scope columns. #[test] fn invalid_predicates_are_rejected() { @@ -52,7 +65,7 @@ fn values_contract_is_checked() { } /// Scalar typing validates every branch and never assigns placeholder types. #[test] -fn scalar_type_ruless_fail_closed() { +fn scalar_type_rules_fail_closed() { for expr in [ ScalarExpr::Column(99), ScalarExpr::FunctionCall { @@ -103,6 +116,8 @@ fn state_evaluations_and_passthrough_keep_their_contracts() { grouping: GroupingStrategy::default(), filter: None, })) + .unwrap() + .with_coverage(whole_table()) .unwrap(), ); state.validate_structure().unwrap(); @@ -173,15 +188,19 @@ fn shared_construction_derives_both_operator_categories() { use asap_types::pre_asap::{ColumnRef, FieldDataType, Reduction}; let input = scan(); - let state = OperatorNode::new_shared(Operator::ASAP(ASAPOp::SummaryAgg { - child: input.clone(), - family: FieldDataType::ExactAggregate(ExactKind::Sum, ExactParams::Sum), - input: SummaryUpdate::column(ColumnRef::Named("x".into())), - reduction: Reduction::by(vec![]), - grouping: GroupingStrategy::default(), - filter: None, - })) - .unwrap(); + let state = Rc::new( + OperatorNode::new(Operator::ASAP(ASAPOp::SummaryAgg { + child: input.clone(), + family: FieldDataType::ExactAggregate(ExactKind::Sum, ExactParams::Sum), + input: SummaryUpdate::column(ColumnRef::Named("x".into())), + reduction: Reduction::by(vec![]), + grouping: GroupingStrategy::default(), + filter: None, + })) + .unwrap() + .with_coverage(whole_table()) + .unwrap(), + ); assert_eq!(state.result_kind, OperatorResultKind::State); assert!(!state.schema.fields.last().unwrap().is_plain()); assert!(state.guarantee.is_none()); diff --git a/crates/types/tests/summary_coverage.rs b/crates/types/tests/summary_coverage.rs new file mode 100644 index 000000000..3b99e9bba --- /dev/null +++ b/crates/types/tests/summary_coverage.rs @@ -0,0 +1,150 @@ +//! Coverage composition preserves gaps and rejects duplicate observations. +use asap_types::{ + ir::operator_properties::Reduction, + ir::summary_coverage::*, + post_asap::SummaryUpdate, + pre_asap::{ColumnRef, Source}, +}; +fn table(name: &str) -> Source { + Source::Table { + table_ref: name.into(), + } +} +fn coverage(start: i64, end: i64, population: &[(&str, &str)]) -> SummaryCoverage { + SummaryCoverage { + source: table("flows"), + regions: vec![CoverageRegion { + time_ms: Some(start..end), + population: population + .iter() + .map(|(k, v)| (k.to_string(), v.to_string())) + .collect(), + }], + } +} +/// Adjacent panes coalesce; gaps remain disconnected rather than becoming a hull. +#[test] +fn time_union_preserves_gaps() { + let merged = + SummaryCoverage::merge_disjoint(&[coverage(0, 1, &[]), coverage(1, 2, &[])]).unwrap(); + assert_eq!(merged.regions[0].time_ms, Some(0..2)); + assert_eq!(merged.regions.len(), 1); + let gapped = + SummaryCoverage::merge_disjoint(&[coverage(0, 1, &[]), coverage(2, 3, &[])]).unwrap(); + assert_eq!(gapped.regions.len(), 2); +} +/// Population partitions can overlap in time without sharing observations. +#[test] +fn population_and_joint_union() { + let merged = SummaryCoverage::merge_disjoint(&[ + coverage(0, 2, &[("region", "us")]), + coverage(0, 2, &[("region", "eu")]), + ]) + .unwrap(); + assert_eq!(merged.regions.len(), 2); + let joint = SummaryCoverage::merge_disjoint(&[ + coverage(0, 1, &[("region", "us")]), + coverage(1, 2, &[("region", "eu")]), + ]) + .unwrap(); + assert_eq!(joint.regions.len(), 2); + let decoded: SummaryCoverage = + serde_json::from_str(&serde_json::to_string(&joint).unwrap()).unwrap(); + assert_eq!(decoded, joint); +} +/// Intersecting predicates and windows cannot authorize once-per-observation merge. +#[test] +fn overlap_and_identity_fail_closed() { + assert_eq!( + SummaryCoverage::merge_disjoint(&[coverage(0, 2, &[]), coverage(1, 3, &[])]), + Err(CoverageError::PossibleOverlap) + ); + assert_eq!( + SummaryCoverage::merge_disjoint(&[ + coverage(0, 2, &[("region", "us")]), + coverage(0, 2, &[("tier", "premium")]) + ]), + Err(CoverageError::PossibleOverlap) + ); + assert_eq!( + SummaryCoverage::merge_disjoint(&[ + coverage(0, 2, &[("region", "us")]), + coverage(0, 2, &[("region", "us")]) + ]), + Err(CoverageError::PossibleOverlap) + ); + let mut other = coverage(1, 2, &[]); + other.source = table("other-flows"); + assert_eq!( + SummaryCoverage::merge_disjoint(&[coverage(0, 1, &[]), other]), + Err(CoverageError::SourceMismatch) + ); + assert_eq!( + coverage(2, 1, &[]).validate(), + Err(CoverageError::InvalidInterval) + ); +} + +/// Coverage is logical state metadata, and input rewrites invalidate its proof. +#[test] +fn node_coverage_is_required_checked_and_cleared_by_rewrites() { + use asap_types::{ + ir::{ASAPOp, NonASAPOp, Operator, OperatorNode}, + post_asap::{SketchAlgorithm, SketchKind, SketchParams}, + pre_asap::{DataType, Field, FieldDataType, Schema}, + }; + let raw = OperatorNode::new_shared(Operator::NonASAP(NonASAPOp::Scan { + source: table("flows"), + predicates: vec![], + schema: Schema::new(vec![Field::plain("latency", DataType::Float64, false)]), + })) + .unwrap(); + let declared = coverage(0, 1, &[]); + assert!((*raw).clone().with_coverage(declared.clone()).is_err()); + let state = OperatorNode::new(Operator::ASAP(ASAPOp::SummaryAgg { + child: raw, + family: FieldDataType::Sketch( + SketchKind::new(SketchAlgorithm::Kll, SketchParams::Kll { k: 200 }), + Default::default(), + ), + input: SummaryUpdate::column(ColumnRef::Named("latency".into())), + reduction: Reduction::by(vec![]), + grouping: Default::default(), + filter: None, + })) + .unwrap(); + // Summary nodes cannot validate without coverage. + assert!(matches!( + std::rc::Rc::new(state.clone()).validate_structure(), + Err(asap_types::ir::SchemaDerivationError::Coverage( + CoverageError::Missing + )) + )); + let state = state.with_coverage(declared.clone()).unwrap(); + std::rc::Rc::new(state.clone()) + .validate_structure() + .unwrap(); + let rebuilt = state.map_children(Clone::clone).unwrap(); + assert!(rebuilt.coverage.is_none()); +} + +/// Sources without a time column declare no time bounds; such a region overlaps +/// any region it is not population-disjoint from. +#[test] +fn regions_without_time_bounds() { + let mut tabular = coverage(0, 1, &[("region", "us")]); + tabular.regions[0].time_ms = None; + let mut other = coverage(0, 1, &[("region", "eu")]); + other.regions[0].time_ms = None; + assert_eq!( + SummaryCoverage::merge_disjoint(&[tabular.clone(), other]) + .unwrap() + .regions + .len(), + 2 + ); + assert_eq!( + SummaryCoverage::merge_disjoint(&[tabular, coverage(5, 6, &[("region", "us")])]), + Err(CoverageError::PossibleOverlap) + ); +} diff --git a/crates/types/tests/summary_coverage_examples.rs b/crates/types/tests/summary_coverage_examples.rs new file mode 100644 index 000000000..bfaa28483 --- /dev/null +++ b/crates/types/tests/summary_coverage_examples.rs @@ -0,0 +1,264 @@ +//! The examples in docs/design_docs/proposals/asap-primitive-schema.md, built as real +//! SummaryAgg -> SummaryMerge plans. Every input has the same schema +//! `(job: Utf8, state: KLL{k=200})`; only coverage differs. +use asap_types::ir::summary_coverage::{CoverageError, CoverageRegion, SummaryCoverage}; +use asap_types::ir::{ + ASAPOp, ExprSemantics, NonASAPOp, Operator, OperatorNode, Predicate, ScalarExpr, + SchemaDerivationError, +}; +use asap_types::post_asap::{ + GroupingStrategy, SketchAlgorithm, SketchKind, SketchParams, SummaryUpdate, +}; +use asap_types::pre_asap::{ + ColumnRef, CompareOpKind, DataType, Field, FieldDataType, Reduction, ScalarValue, Schema, + Source, +}; +use std::rc::Rc; + +const MIN: i64 = 60_000; + +fn requests() -> Source { + Source::Table { + table_ref: "requests".into(), + } +} + +fn scan() -> Rc { + OperatorNode::new_shared(Operator::NonASAP(NonASAPOp::Scan { + source: requests(), + predicates: vec![], + schema: Schema::new(vec![ + Field::plain("job", DataType::Utf8, false), + Field::plain("region", DataType::Utf8, false), + Field::plain("tier", DataType::Utf8, false), + Field::plain("latency", DataType::Float64, false), + Field::plain("size", DataType::Float64, false), + ]), + })) + .unwrap() +} + +/// `region = value`, evaluated on the scan schema. +fn region_is(value: &str) -> Predicate { + Predicate(ScalarExpr::Compare { + left: Box::new(ScalarExpr::Column(1)), + op: CompareOpKind::Eq, + right: Box::new(ScalarExpr::Literal(ScalarValue::Utf8(value.into()))), + semantics: ExprSemantics::Sql, + }) +} + +fn region(time_ms: Option>, population: &[(&str, &str)]) -> CoverageRegion { + CoverageRegion { + time_ms, + population: population + .iter() + .map(|(k, v)| (k.to_string(), v.to_string())) + .collect(), + } +} + +/// p99-ready KLL over `column`, grouped by job, with declared coverage. +fn kll_over( + column: &str, + filter: Option, + coverage: SummaryCoverage, +) -> Rc { + let node = OperatorNode::new(Operator::ASAP(ASAPOp::SummaryAgg { + child: scan(), + family: FieldDataType::Sketch( + SketchKind::new(SketchAlgorithm::Kll, SketchParams::Kll { k: 200 }), + GroupingStrategy::default(), + ), + input: SummaryUpdate::column(ColumnRef::Named(column.into())), + reduction: Reduction::by(vec![0]), + grouping: GroupingStrategy::default(), + filter, + })) + .unwrap(); + Rc::new(node.with_coverage(coverage).unwrap()) +} + +fn kll(time_ms: Option>, population: &[(&str, &str)]) -> Rc { + kll_over( + "latency", + None, + SummaryCoverage { + source: requests(), + regions: vec![region(time_ms, population)], + }, + ) +} + +fn merge(children: Vec>) -> Result, SchemaDerivationError> { + let schema = children[0].schema.clone(); + let merged = OperatorNode::new_shared(Operator::ASAP(ASAPOp::SummaryMerge { children }))?; + merged.validate_structure()?; + // Schema never changes; only coverage does. + assert_eq!(merged.schema, schema); + Ok(merged) +} + +fn regions(node: &OperatorNode) -> Vec { + node.coverage.as_ref().unwrap().regions.clone() +} + +fn rejected(result: Result, SchemaDerivationError>, expected: CoverageError) { + match result { + Err(SchemaDerivationError::Coverage(actual)) => assert_eq!(actual, expected), + other => panic!("expected {expected:?}, got {other:?}"), + } +} + +/// Example 1: adjacent panes coalesce, gaps stay, overlapping windows are rejected. +#[test] +fn example_1_time() { + let adjacent = merge(vec![kll(Some(0..MIN), &[]), kll(Some(MIN..2 * MIN), &[])]).unwrap(); + assert_eq!(regions(&adjacent), vec![region(Some(0..2 * MIN), &[])]); + + let gapped = merge(vec![ + kll(Some(0..MIN), &[]), + kll(Some(2 * MIN..3 * MIN), &[]), + ]) + .unwrap(); + assert_eq!( + regions(&gapped), + vec![ + region(Some(0..MIN), &[]), + region(Some(2 * MIN..3 * MIN), &[]) + ] + ); + + rejected( + merge(vec![ + kll(Some(0..2 * MIN), &[]), + kll(Some(MIN..3 * MIN), &[]), + ]), + CoverageError::PossibleOverlap, + ); +} + +/// Example 2: disjoint label values merge; different labels or equal values are rejected. +#[test] +fn example_2_population() { + let t = Some(0..MIN); + let us_eu = merge(vec![ + kll(t.clone(), &[("region", "us")]), + kll(t.clone(), &[("region", "eu")]), + ]) + .unwrap(); + assert_eq!( + regions(&us_eu), + vec![ + region(t.clone(), &[("region", "eu")]), + region(t.clone(), &[("region", "us")]), + ] + ); + for other in [("tier", "premium"), ("region", "us")] { + rejected( + merge(vec![ + kll(t.clone(), &[("region", "us")]), + kll(t.clone(), &[other]), + ]), + CoverageError::PossibleOverlap, + ); + } +} + +/// Example 3: time and population stay paired; never widened to {us,eu} × [0,2). +#[test] +fn example_3_joint_regions() { + let joint = merge(vec![ + kll(Some(0..MIN), &[("region", "us")]), + kll(Some(MIN..2 * MIN), &[("region", "eu")]), + ]) + .unwrap(); + assert_eq!( + regions(&joint), + vec![ + region(Some(MIN..2 * MIN), &[("region", "eu")]), + region(Some(0..MIN), &[("region", "us")]), + ] + ); +} + +/// A table without a time column declares no time bounds. +#[test] +fn tabular_source_without_time_bounds() { + let by_region = merge(vec![ + kll(None, &[("region", "us")]), + kll(None, &[("region", "eu")]), + ]) + .unwrap(); + assert_eq!(regions(&by_region).len(), 2); + rejected( + merge(vec![ + kll(None, &[("region", "us")]), + kll(Some(0..MIN), &[("region", "us")]), + ]), + CoverageError::PossibleOverlap, + ); +} + +/// Inputs must read the same source and share the producer's update and reduction. +#[test] +fn incompatible_inputs() { + let other_source = kll_over( + "latency", + None, + SummaryCoverage { + source: Source::Table { + table_ref: "other".into(), + }, + regions: vec![region(Some(MIN..2 * MIN), &[])], + }, + ); + rejected( + merge(vec![kll(Some(0..MIN), &[]), other_source]), + CoverageError::SourceMismatch, + ); + + // Same schema (both Float64 columns), different update expression. + let size = kll_over( + "size", + None, + SummaryCoverage { + source: requests(), + regions: vec![region(Some(MIN..2 * MIN), &[])], + }, + ); + assert!(matches!( + merge(vec![kll(Some(0..MIN), &[]), size]), + Err(SchemaDerivationError::InvalidScalarSignature(message)) + if message.contains("update expression and reduction") + )); +} + +/// Summary nodes must carry coverage, and merges reject inputs without it. +#[test] +fn coverage_is_required() { + let mut missing = (*kll(Some(MIN..2 * MIN), &[])).clone(); + missing.coverage = None; + let missing = Rc::new(missing); + assert!(matches!( + missing.validate_structure(), + Err(SchemaDerivationError::Coverage(CoverageError::Missing)) + )); + rejected( + merge(vec![kll(Some(0..MIN), &[]), missing]), + CoverageError::UnknownInput, + ); +} + +/// Trusted declarations: population is not checked against the filter (#570). +/// Both states hold US data, yet the wrong declaration lets them merge. +#[test] +fn wrong_population_declaration_is_accepted_until_570() { + let declared = |value: &str| SummaryCoverage { + source: requests(), + regions: vec![region(Some(0..MIN), &[("region", value)])], + }; + let a = kll_over("latency", Some(region_is("us")), declared("eu")); + let b = kll_over("latency", Some(region_is("us")), declared("us")); + assert!(merge(vec![a, b]).is_ok()); +} diff --git a/crates/types/tests/summary_merge_structure.rs b/crates/types/tests/summary_merge_structure.rs new file mode 100644 index 000000000..383b2bfbd --- /dev/null +++ b/crates/types/tests/summary_merge_structure.rs @@ -0,0 +1,104 @@ +//! Window composition merges compatible summary states without consuming raw rows. +use asap_types::{ + ir::operator_properties::{Reduction, Source}, + ir::{ASAPOp, NonASAPOp, Operator, OperatorNode}, + post_asap::{GroupingStrategy, SketchAlgorithm, SketchKind, SketchParams, SummaryUpdate}, + pre_asap::{ColumnRef, DataType, Field, FieldDataType, Schema}, +}; +use std::rc::Rc; +fn state(k: u32) -> Rc { + let scan = OperatorNode::new_shared(Operator::NonASAP(NonASAPOp::Scan { + source: Source::Table { + table_ref: "latencies".into(), + }, + predicates: vec![], + schema: Schema::new(vec![Field::plain("value", DataType::Float64, false)]), + })) + .unwrap(); + let summary = OperatorNode::new(Operator::ASAP(ASAPOp::SummaryAgg { + child: scan, + family: FieldDataType::Sketch( + SketchKind::new(SketchAlgorithm::Kll, SketchParams::Kll { k }), + Default::default(), + ), + input: SummaryUpdate::column(ColumnRef::SampleValue), + reduction: Reduction::by(vec![]), + grouping: GroupingStrategy::default(), + filter: None, + })) + .unwrap(); + std::rc::Rc::new( + summary + .with_coverage(asap_types::ir::summary_coverage::SummaryCoverage { + source: Source::Table { + table_ref: "latencies".into(), + }, + regions: vec![asap_types::ir::summary_coverage::CoverageRegion { + time_ms: Some(0..1), + population: Default::default(), + }], + }) + .unwrap(), + ) +} +/// Two KLL panes compose into one typed logical state without timing assignment. +#[test] +fn compatible_panes_merge_structurally() { + let root = OperatorNode::new_shared(Operator::ASAP(ASAPOp::SummaryMerge { + children: vec![state(200), shifted_state(200, 1, 2)], + })) + .unwrap(); + root.validate_structure().unwrap(); + assert_eq!(root.schema.fields.len(), 1); + assert_eq!( + root.coverage.as_ref().unwrap().regions[0].time_ms, + Some(0..2) + ); +} +/// An empty merge, raw rows and differently sized state cannot masquerade as compatible panes. +#[test] +fn incompatible_merge_inputs_fail() { + for children in [ + vec![], + vec![state(200), state(300)], + vec![state(200).children()[0].clone()], + ] { + assert!( + OperatorNode::new_shared(Operator::ASAP(ASAPOp::SummaryMerge { children })).is_err() + ); + } +} + +fn shifted_state(k: u32, start: i64, end: i64) -> Rc { + let mut node = (*state(k)).clone(); + let region = &mut node.coverage.as_mut().unwrap().regions[0]; + region.time_ms = Some(start..end); + Rc::new(node) +} +/// Schema equality cannot authorize overlapping or unknown observation coverage. +#[test] +fn unsafe_coverage_merge_is_rejected() { + let mut unknown = (*state(200)).clone(); + unknown.coverage = None; + for children in [ + vec![state(200), state(200)], + vec![state(200), Rc::new(unknown)], + ] { + assert!( + OperatorNode::new_shared(Operator::ASAP(ASAPOp::SummaryMerge { children })).is_err() + ); + } +} + +/// Gapped time coverage remains disconnected, and forged output metadata is rejected. +#[test] +fn merge_derives_coverage_and_validates_retained_metadata() { + let root = OperatorNode::new_shared(Operator::ASAP(ASAPOp::SummaryMerge { + children: vec![state(200), shifted_state(200, 2, 3)], + })) + .unwrap(); + assert_eq!(root.coverage.as_ref().unwrap().regions.len(), 2); + let mut forged = (*root).clone(); + forged.coverage.as_mut().unwrap().regions[0].time_ms = Some(0..2); + assert!(Rc::new(forged).validate_structure().is_err()); +} diff --git a/docs/README.md b/docs/README.md index 9f802e094..c9abe1177 100644 --- a/docs/README.md +++ b/docs/README.md @@ -19,8 +19,7 @@ Start with [ASAPPlanner input, output, and workflows](design_docs/architecture/i for the integration boundary, nested inputs, and choice of planning workflow. Use [Public library functions and examples](develop_docs/library-api.md) for -frontend lowering, workload search, ranking, optional selection and lifecycle -integration. +frontend lowering, workload search, ranking, selection and DAG assembly. ## Extend the planner diff --git a/docs/design_docs/architecture/README.md b/docs/design_docs/architecture/README.md index 8b936eafe..d0cc61026 100644 --- a/docs/design_docs/architecture/README.md +++ b/docs/design_docs/architecture/README.md @@ -8,7 +8,7 @@ deployment-level decision, and run the selected contract. For the integration workflow, start with [ASAPPlanner input, output, and workflows](input-output-workflow.md). It defines inputs, `CandidateLogicalASAPDAGs`, selection -and summary-maintenance lifecycle workflows, and future replanning support. +and assembly workflows, and future replanning support. ## Planner component flow @@ -17,16 +17,12 @@ flowchart TD W["PlanningWorkload: query demand + optional data facts"] F["Frontend dependencies: SQL catalog or PromQL time"] E["Strategy, accuracy model, and applicable evidence"] - PRE["Frontend lowering → canonical Pre-ASAP QueryExpr roots"] + PRE["Frontend lowering → canonical Pre-ASAP OperatorNode roots"] SEARCH["Whole-workload candidate search: sharing, legality, accuracy"] SPACE["CandidateLogicalASAPDAGs: compact logical candidate DAG space"] RANK["Optional cost_sorted: ranked inspection view"] SELECT["Optional global_selection + assemble_selected_dag"] DAG["Selected logical Post-ASAP DAG"] - LINPUT["Optional lifecycle inputs: horizon, rates, capabilities, costs"] - LIFE["global_selection_with_summary_maintenance_lifecycles"] - LMAT["assemble_selected_dag_with_summary_maintenance_lifecycles"] - LPLAN["SummaryMaintenanceLifecyclePlan: DAG root + lifecycle decisions"] BACKEND["Downstream: bind physical alternatives, decide deployment, compile and execute"] W --> PRE F --> PRE @@ -35,19 +31,15 @@ flowchart TD SEARCH --> SPACE SPACE --> RANK --> BACKEND SPACE --> SELECT --> DAG --> BACKEND - SPACE --> LIFE - LINPUT --> LIFE --> LMAT --> LPLAN --> BACKEND ``` `CandidateLogicalASAPDAGs` is the output of logical candidate search. Each target's candidate set holds -alternatives and rejection reasons, but no selected maintenance lifecycle. -Choose among the three branches: inspect candidates (optionally ranked), select -and assemble logical DAGs, or select and assemble with summary-maintenance -lifecycle decisions. Use the last branch when Planner owns the maintenance -decision; otherwise the backend owns it. Its first -call returns a `GlobalSelection`; the second returns a -`SummaryMaintenanceLifecyclePlan` with an assembled DAG root and lifecycle -decisions. No branch by itself deploys or executes a physical plan. +alternatives and rejection reasons, but no materialization decision. +Choose between two branches: inspect candidates (optionally ranked), or select +and assemble logical DAGs. Stage 2 materialization (#509) will decide per +sub-DAG whether to materialize and whether at ingestion or query time; until +then every summary runs at query time. No branch by itself deploys or executes +a physical plan. Known-invalid evidence rejects a logical candidate. Missing accuracy evidence leaves a constructible candidate visible in `CandidateLogicalASAPDAGs` but uncertified; default selection does not commit it without the required guarantee. Cost evidence can @@ -58,9 +50,10 @@ an unsupported physical alternative into a deployable plan. | Area | Main crate or module | Responsibility | |---|---|---| -| Shared IR | `asap-types` | Pre-ASAP and Post-ASAP expressions, schemas, workloads, guarantees, and exported plan data | +| Shared IR | `asap-types` | The unified operator IR (`ir`: one `OperatorNode` before and after ASAP optimization), schemas, workloads, guarantees, and exported plan data | +| Front-end common | `frontend-common` | Name-based `UnresolvedOp` tree shared by the front ends, and `resolve_root` into the operator IR | | Query frontends | `frontend-sql`, `frontend-promql`, `frontend-metricsql` | Parse source languages and produce canonical Pre-ASAP queries | -| ASAP-aware mapping | `asap-aware-mapping` | Candidate generation, CSE, legality, accuracy propagation, lifecycle expansion, costing, and ranking | +| ASAP-aware mapping | `asap-aware-mapping` | Candidate generation, CSE, legality, accuracy propagation, costing, and ranking | | Developer inspection | `devtools` | Expose planner DAGs, alternatives, decisions, and explanations for inspection | | End-to-end validation | `integration-tests` | Verify behavior across frontends, mapping, and output IR | @@ -76,8 +69,7 @@ The primary output is `CandidateLogicalASAPDAGs`; `cost_sorted` derives an optio view with index-aligned costs. Downstream may inspect compatible choices across targets rather than assuming the first candidate is a feasible physical workload plan. Candidates carry logical summary algorithms, -parameters, and guarantees; selected maintenance lifecycle decisions appear -only after a summary-maintenance-lifecycle-aware helper runs. Rejection reasons +parameters, and guarantees, but no materialization decision. Rejection reasons are retained in the candidate space. ASAPQuery-backend and other downstream applications translate the candidates @@ -89,10 +81,8 @@ must not silently change Planner-owned semantics. `CandidateLogicalASAPDAGs::global_selection` optionally coordinates structural choices across targets; `GlobalSelection::assemble_selected_dag` constructs a selected semantic DAG. -Those plain APIs do not establish physical feasibility or a -maintenance-versus-recompute decision. The lifecycle-aware selection call uses -additional workload and evidence inputs; its DAG assembly call returns a -plan with both a root and lifecycle decisions. See the [library guide](../../develop_docs/library-api.md#optional-whole-plan-selection-and-dag-assembly) +Those APIs do not establish physical feasibility or a +materialization decision. See the [library guide](../../develop_docs/library-api.md#optional-whole-plan-selection-and-dag-assembly) for the distinction. Downstream may consume candidates directly and retains responsibility for physical commitment. @@ -103,7 +93,6 @@ responsibility for physical commitment. - [Post-ASAP IR](../concepts/post-asap-ir.md) - [ASAP-aware mapping](asap-aware-mapping.md) - [Accuracy guarantees](../proposals/asap-aware-mapping/end-to-end-accuracy-guarantees.md) -- [Workload demand and summary lifecycle](../proposals/asap-aware-mapping/workload-demand-and-summary-lifecycle.md) - [Physical-plan integration](physical-plan-integration.md) - [Analytical resource cost](../proposals/asap-aware-mapping/analytical-resource-cost.md) - [Searching over plans](asap-aware-plan-search.md) diff --git a/docs/design_docs/architecture/asap-aware-mapping.md b/docs/design_docs/architecture/asap-aware-mapping.md index 2600fc42d..c04fa530a 100644 --- a/docs/design_docs/architecture/asap-aware-mapping.md +++ b/docs/design_docs/architecture/asap-aware-mapping.md @@ -8,7 +8,7 @@ Given a logical query plan, the mapping layer explores alternative plans that ma Candidate search takes canonical **Pre-ASAP query roots** and produces `CandidateLogicalASAPDAGs`, a compact set of **candidate Post-ASAP DAGs**. Ranking, selection, -and summary-maintenance lifecycle decisions are subsequent operations over it; +and DAG assembly are subsequent operations over it; see [input, output, and workflows](input-output-workflow.md). For example, a percentile query might be answered by: @@ -44,7 +44,7 @@ budgets; deployment belongs to a later stage. - **Replacement Sub-DAG**: A candidate post-ASAP sub-DAG to replace a target sub-DAG. For example, a quantile aggregation may have KLL, DDSketch, and exact aggregation as alternatives. - **ReplacementStrategy**: A rule to recognize a target Sub-DAG and produces one or more valid replacement Sub-DAGs. - **Candidate Plan**: A complete post-ASAP plan formed by choosing compatible replacement alternatives across the plan. -- **Maintained population**: A multiset of qualifying records retained across evaluations and updated as members enter, change, leave or expire; multiple readouts can share this state. +- **Maintained population**: A multiset of qualifying records retained across evaluations and updated as members enter, change, leave or expire; multiple evaluations can share this state. - **Cost Model**: A model used to compare valid candidate plans according to criteria such as storage, update cost, query latency, and accuracy. The distinction between **ReplacementStrategy** and **Candidate Plan** is important. A ReplacementStrategy generates alternatives at a decision point, while a candidate plan is a complete plan that combines choices across all relevant decision points. @@ -75,7 +75,6 @@ CandidateLogicalASAPDAGs: compact candidate Post-ASAP DAGs | +--> inspect / rank +--> select and assemble logical DAGs - +--> select and assemble with summary-maintenance lifecycle decisions ``` --- @@ -104,9 +103,6 @@ The design is split into focused documents: - [ASAPPlanner planner-runtime contract](planner-runtime-contract.md) separates planner-owned search and selection from downstream physical implementation, deployment, and execution. -- [Query workloads, data workloads, and summary lifecycle maintenance](../proposals/asap-aware-mapping/workload-demand-and-summary-lifecycle.md) separates - query-workload properties from data-workload properties and defines ephemeral, prepared, - shared, and continuously maintained summary-state alternatives. - [Explainability](../../develop_docs/replacement-explanations.md) describes how the planner reports available replacements using the same candidate space it optimizes. diff --git a/docs/design_docs/architecture/asap-aware-plan-search.md b/docs/design_docs/architecture/asap-aware-plan-search.md index fbc5982bc..e612740b6 100644 --- a/docs/design_docs/architecture/asap-aware-plan-search.md +++ b/docs/design_docs/architecture/asap-aware-plan-search.md @@ -84,10 +84,10 @@ sets. This avoids copying every full plan when most structure is shared. Cartesian product. `cost_sorted` returns a `RankedTargetSubDAGCandidates` view for each target. `global_selection` coordinates supported sharing and composition choices; `assemble_selected_dag(root)` assembles one selected DAG -per query root. This does not prove global physical optimality or select a -summary-maintenance lifecycle. The -[workflow design](input-output-workflow.md#workflows) explains when to use the -ordinary or summary-maintenance-lifecycle-aware path. +per query root. This does not prove global physical optimality or decide +which summaries are materialized; Stage 2 materialization (#509) will own that. +The [workflow design](input-output-workflow.md#workflows) describes the call +order. The [code architecture](../../develop_docs/asap-aware-mapping-architecture.md) describes current discovery and registry behavior; the diff --git a/docs/design_docs/architecture/evidence-dependent-candidates.md b/docs/design_docs/architecture/evidence-dependent-candidates.md index abdfbdb90..437cfe4b0 100644 --- a/docs/design_docs/architecture/evidence-dependent-candidates.md +++ b/docs/design_docs/architecture/evidence-dependent-candidates.md @@ -15,7 +15,7 @@ target)` returns `true`. **Uncertified** means Planner cannot make that claim: the guarantee is absent, contains unknown terms, or is known not to meet the target. An uncertified summary may still be a well-formed logical candidate; this label says nothing about whether the backend can physically execute it. -The exact `KeepPreAsap` path has an exact guarantee. +The exact path (the pre-ASAP sub-DAG kept by `retain_exact`) has an exact guarantee. | State | Planner representation | Consequence / next step | |---|---|---| @@ -58,12 +58,10 @@ not emit a `RejectedCandidate` for that case. | HLL confidence | Symbolic failure probability | Reject a fully known unmet root target. | | Relative-value composition | Symbolic bound when input sign is unknown | Reject known signed input for this rule. | | Exact sum/average/extremum | Symbolic row-count probability term | Reject unsupported metric combinations. | -| Cost/rate/physical evidence | `None` cost or missing workload rate; candidate remains in `CandidateLogicalASAPDAGs` | Physical/lifecycle evaluation reports unavailable or rejected evidence. | +| Cost/rate/physical evidence | `None` cost or missing workload rate; candidate remains in `CandidateLogicalASAPDAGs` | Physical evaluation reports unavailable or rejected evidence. | | Mixed exact/summary operator | Unknown runtime support; candidate remains in `CandidateLogicalASAPDAGs` | `Some(false)` prevents construction. | -Lifecycle deployment choices are a separate output from `CandidateLogicalASAPDAGs`; their -capability/cost rejections do not erase the logical summary candidate. The -backend must still check ordinary summary family, window, and state-operation +The backend must still check summary family, window, and state-operation capabilities before deployment. - Accuracy/domain: `AccuracyEvidenceProvider` supplies quantile domains and @@ -88,7 +86,7 @@ The default `global_selection()` skips summaries that `has_missing_accuracy_evidence()` identifies as uncertified. Its `GlobalSelection::assemble_selected_dag()` result is a selected logical plan, not an instruction to deploy every candidate in `CandidateLogicalASAPDAGs`. If no alternative -is chosen at a site, DAG assembly retains the exact `KeepPreAsap` path. The +is chosen at a site, DAG assembly retains the exact pre-ASAP sub-DAG. The backend can inspect alternatives, apply its own evidence and policy, then choose a physically supported one; it must not equate candidate presence with approval. Models may explicitly opt into qualitative candidate ranking when no @@ -109,7 +107,7 @@ backend. | PromQL input | Before this PR | After this PR | |---|---|---| | `count by(job)(up)` with an ε/δ target | Hydra's shared CMS/CountSketch alternatives are absent: missing shared-grid bounds make the strategy decline the target. | Both Hydra alternatives remain in `CandidateLogicalASAPDAGs` with symbolic unknown bound/probability terms. `has_missing_accuracy_evidence()` is true; default `global_selection()` does not choose either as a certified answer. | -| `entropy_over_time(m[5m])` with an ε target | The uncalibrated frequency readout has no `SummaryEstimate` candidate. | Its `SummaryEstimate` remains inspectable with `guarantee: None`. Default selection still skips it, so candidate visibility is not an accuracy certificate. | +| `entropy_over_time(m[5m])` with an ε target | The uncalibrated frequency evaluation has no `SummaryEstimate` candidate. | Its `SummaryEstimate` remains inspectable with `guarantee: None`. Default selection still skips it, so candidate visibility is not an accuracy certificate. | | `quantile_over_time(0.9,data[5m]) / quantile_over_time(0.5,data[5m])` with an ε target | The uncertified direct DDSketch ratio is **already** visible because of #449. | Still visible with `guarantee: None`, and still skipped by default selection. This is a regression/control example, not a new candidate introduced by this PR. | For the first two rows, the observable change is the alternative set delivered @@ -121,7 +119,7 @@ evidence (for example a failure probability of `1.5`) instead produces a The corresponding reproducible checks are `cargo test -p asap-frontend-promql grouped_count_keeps_uncertified_hydra_candidates_for_backend_review`, -`cargo test -p asap-frontend-promql uncalibrated_frequency_readouts_do_not_bypass_accuracy_targets`, +`cargo test -p asap-frontend-promql uncalibrated_frequency_evaluations_do_not_bypass_accuracy_targets`, and `cargo test -p asap-integration-tests ddsketch_ratio_without_domain_proof_is_uncertified`. All three start from PromQL text and exercise frontend lowering and planning. None runs a deployed query. diff --git a/docs/design_docs/architecture/input-output-workflow.md b/docs/design_docs/architecture/input-output-workflow.md index 65ee43141..18221035e 100644 --- a/docs/design_docs/architecture/input-output-workflow.md +++ b/docs/design_docs/architecture/input-output-workflow.md @@ -18,7 +18,7 @@ Post-ASAP alternatives for the workload. | `PlanningWorkload.data_workload` | Data arrival and optional evidence about ingestion, cardinality, and distribution | No implicit default. Set `None` when unavailable for non-PromQL workloads; PromQL requires `Some(DataWorkload)` with a nonzero ingestion interval. | | Frontend-specific dependencies (outside `PlanningWorkload`) | `SqlCatalog` for SQL; `now_ms` and, when needed, `HistogramCatalog` for PromQL | `SqlCatalog` is required for SQL lowering; `now_ms` is required for PromQL lowering | | Planning models | Candidate cost/ranking and accuracy composition/checking | Used by the relevant APIs; built-in `DefaultCostModel` and `DefaultAccuracyModel` are available | -| External evidence and capabilities | Domain facts, measured costs, workload statistics, and runtime support | Supply when available and when the chosen optimization or lifecycle decision depends on them; absence is not proof | +| External evidence and capabilities | Domain facts, measured costs, workload statistics, and runtime support | Supply when available and when the chosen optimization depends on them; absence is not proof | Frontend lowering and candidate search are stages within this workflow, not additional end-to-end inputs. See [Inputs](#inputs) for the nested workload @@ -30,13 +30,14 @@ fields and [frontend dependencies](#frontend-specific-dependencies). |---|---|---| | `CandidateLogicalASAPDAGs` | The legal candidate Post-ASAP DAGs for the workload, represented compactly as canonical roots, one candidate set per target sub-DAG, and cross-target composition information | The ASAPPlanner output | -[Ranking](#ranked-view), [selection and -DAG assembly](#selection-and-dag-assembly), and -[summary-maintenance lifecycle](#summary-maintenance-lifecycle-aware-helper) APIs operate on this `CandidateLogicalASAPDAGs`. +[Ranking](#ranked-view) and [selection and +DAG assembly](#selection-and-dag-assembly) APIs operate on this `CandidateLogicalASAPDAGs`. These are alternative uses of the candidate space, not mandatory sequential -stages. `CandidateLogicalASAPDAGs` itself has no selected summary-maintenance lifecycle, and -its candidates do not choose precompute versus query-time placement: a chosen -lifecycle assignment sets each node's execution timing. +stages. Its candidates do not choose ingestion-time versus query-time +placement: a `MaterializationAssignment` sets each node's execution timing. +Stage 2 materialization (#509) will decide per sub-DAG whether to materialize +and whether at ingestion or query time; until then every summary runs at query +time. The candidate DAGs are logical planning artifacts. ASAPPlanner does **not** produce a deployed executable plan; downstream systems bind physical operators, @@ -58,7 +59,7 @@ PlanningWorkload + frontend dependencies + planning models/evidence Suppose a dashboard evaluates `count_over_time(up[5m])` once a minute, and `up` receives a sample every 15 seconds. This diagram traces the concrete -inputs and the three possible uses of the same candidate space: +inputs and the two possible uses of the same candidate space: ```mermaid flowchart TD @@ -66,16 +67,12 @@ flowchart TD D["data_workload: continuous arrival; declared ingestion interval 15 s"] T["Frontend argument: now_ms"] F["PromQL lowering"] - R["One canonical QueryExpr root"] + R["One canonical OperatorNode root"] S["Candidate search"] P["CandidateLogicalASAPDAGs: logical choices for this root"] I["cost_sorted: inspect choices"] G["global_selection + assemble_selected_dag(root)"] - L["One selected Post-ASAP DAG; exact KeepPreAsap if no optimization is selected"] - X["Extra lifecycle inputs: horizon; update rate; capabilities; comparable summary/raw costs"] - H["Summary-maintenance-lifecycle-aware selection"] - HM["Assemble one selected DAG and decide summary maintenance"] - O["SummaryMaintenanceLifecyclePlan: assembled DAG root + maintenance/recompute decision"] + L["One selected Post-ASAP DAG; the exact pre-ASAP sub-DAG if no optimization is selected"] B["Backend: bind physical operators, deploy, and execute"] Q --> F D --> F @@ -83,16 +80,13 @@ flowchart TD F --> R --> S --> P P --> I P --> G --> L --> B - P --> H - X --> H --> HM --> O --> B ``` “Predictable” says the query is known in advance; it is independent of its one-minute recurrence. The `CandidateLogicalASAPDAGs` may contain an exact count-summary -realization, but it is not a deployed query. Without the extra lifecycle -inputs, the caller can still inspect candidates or obtain a logical DAG; it -cannot conclude that maintaining a summary is cheaper than recomputing raw -results. +realization, but it is not a deployed query. The caller can inspect candidates +or obtain a logical DAG; deciding whether maintaining a summary is cheaper than +recomputing raw results belongs to Stage 2 materialization (#509). For contrast, a one-time SQL query needs a catalog but need not supply data arrival evidence merely to inspect logical alternatives: @@ -102,7 +96,7 @@ flowchart LR Q["query_batch: SELECT COUNT(*) FROM metrics; invocations 1; AdHoc"] C["SqlCatalog: resolves metrics and its columns"] F["SQL lowering"] - R["One QueryExpr root"] + R["One OperatorNode root"] P["Candidate search → CandidateLogicalASAPDAGs"] Q --> F C --> F @@ -110,8 +104,7 @@ flowchart LR ``` In this SQL example, `data_workload` can be `None` if the chosen lowering and -search rules do not consume it. The lifecycle helper is not needed merely to -inspect the `CandidateLogicalASAPDAGs`. +search rules do not consume it. --- @@ -175,9 +168,9 @@ struct BatchEntry { |---|---:|---|---| | `query` | Yes | Raw query text in `QueryWorkload.language`. | `count(up)` determines the expression to lower and plan. | | `requirements` | Yes | Accuracy and response-latency requirements. Defaults mean exact accuracy and unspecified latency. | An explicit ε target permits approximate candidates; the exact default does not. | -| `predictability` | Yes as a field; `Unknown` is allowed | Whether the query is ad hoc, known in advance, or unknown. `known_at` records when a predictable query became known. | A report known at 10:00 and scheduled for 11:00 may use a `Prepared` summary before execution. `AdHoc` or `Unknown` does not establish that eligibility. | +| `predictability` | Yes as a field; `Unknown` is allowed | Whether the query is ad hoc, known in advance, or unknown. `known_at` records when a predictable query became known. | A report known at 10:00 and scheduled for 11:00 could have its summary prepared before execution. `AdHoc` or `Unknown` does not establish that eligibility. | | `invocations` | Yes, nonzero | Number of executions in this finite batch. | Ten executions can amortize one summary build differently from one execution. | -| `execute_at` | Optional | Known execution time. | The `Prepared` case above also needs an execution time; without it Planner cannot establish a preparation window. | +| `execute_at` | Optional | Known execution time. | The prepared case above also needs an execution time; without it no preparation window can be established. | | `time_selection` | Yes | Whether the query follows current data or a historical interval, its lookback, and any fixed upper bound. | A moving five-minute window can require deletion/window support that a fixed historical interval does not. | ##### `repeating_queries: Option>` @@ -197,7 +190,7 @@ struct RepeatingEntry { | `query` | Yes | Raw query text in `QueryWorkload.language`. | `rate(up[5m])` determines the expression to lower and plan. | | `demand` | Yes | A nonzero fixed interval, fixed interval with evaluation phase, nonempty explicit schedule, or evidence-backed estimated rate. | A query every minute produces more expected reads over a horizon than one every hour. | | `requirements` | Yes | Accuracy and response-latency requirements. | An exact dashboard query cannot use an approximate summary solely because it is cheaper. | -| `predictability` | Yes as a field; `Unknown` is allowed | Records whether future executions are known in advance; independent of recurrence. | Current lifecycle code does not use this field for repeating entries; set `Unknown` if no predictability claim is available. | +| `predictability` | Yes as a field; `Unknown` is allowed | Records whether future executions are known in advance; independent of recurrence. | Current planner code does not use this field for repeating entries; set `Unknown` if no predictability claim is available. | | `time_selection` | Yes | Event-time scope, optional lookback, and optional fixed `as_of` time. | A live five-minute lookback differs from a fixed historical range when checking maintenance capabilities. | ##### Shared entry fields @@ -214,9 +207,9 @@ fields expand as follows: | `TimeSelection` | `lookback` | Optional event-time duration selected before the upper bound. | | `TimeSelection` | `as_of` | Optional fixed upper-bound timestamp; `None` means planning/evaluation time. | -Frontend lowering produces one Pre-ASAP `QueryExpr` root for each normalized +Frontend lowering produces one Pre-ASAP `Rc` root for each normalized query entry. The caller must retain each root's association with its workload -entry for later recurrence and lifecycle planning. +entry for later recurrence and materialization planning. #### `data_workload: Option` @@ -285,8 +278,8 @@ latter cannot be fabricated by one. | Accuracy model | Target-aware search takes an `AccuracyModel`; `DefaultAccuracyModel` is available. Default strategies also use it for candidate construction. | Composes candidate guarantees and checks them against requested accuracy. The model does not itself provide missing data-domain facts. | | Cost model | Candidate strategies and `cost_sorted`/`global_selection` use a `CostModel`; `DefaultCostModel` is available. | Ranks or selects candidates. The built-in model is not a measured deployment cost for every physical implementation. | | Accuracy/domain evidence | `AccuracyEvidenceProvider`; default strategies use `NoAccuracyEvidence` when no provider is supplied. | Input ranges, nonempty populations, Top-K intervals, and similar facts can certify or rule out particular approximations. Missing facts remain unknown. | -| Measured cost evidence | Supplied through a deployment-specific cost model or physical-evidence provider when cost-based physical/lifecycle comparison is needed. | CPU, memory, and I/O estimates must be comparable before claiming a summary beats raw recomputation. | -| Runtime/lifecycle capabilities | Passed to lifecycle APIs or checked by deployment-specific providers; `SummaryMaintenanceLifecycleCapabilities::default()` enables all four lifecycle shapes, so it is not proof of actual backend support. | Prevents choosing a maintenance/window operation the intended executor cannot implement. | +| Measured cost evidence | Supplied through a deployment-specific cost model or physical-evidence provider when cost-based physical comparison is needed. | CPU, memory, and I/O estimates must be comparable before claiming a summary beats raw recomputation. | +| Runtime capabilities | Checked by deployment-specific providers. | Prevents choosing a maintenance/window operation the intended executor cannot implement. | For example, the query `quantile_over_time(0.9, data[5m]) / quantile_over_time(0.5, data[5m])` does not tell Planner whether the windows @@ -305,9 +298,6 @@ domain evidence is missing; automatic `global_selection` does not choose it. See the [candidate-search reference](../../develop_docs/library-api.md#generate-and-rank-candidates) for this backend-selection path. -Additional inputs for a Planner-owned maintenance decision are listed with the -[summary-maintenance-lifecycle-aware helper](#summary-maintenance-lifecycle-aware-helper). - --- ## Output @@ -334,7 +324,7 @@ below. A future higher-level API could hide `CandidateLogicalASAPDAGs` behind th the current interface lets an integrator own them. DAG assembly connects choices after selection and does not replace this candidate interface. -Here, a **root** is the top-level `Rc` for a workload query. A +Here, a **root** is the top-level `Rc` for a workload query. A **target** is any discovered sub-DAG that may be replaced, including roots. For `count(up) + 1`, the addition is a root and `count(up)` can be an inner target. `TargetSubDAGCandidates` holds the alternatives for one such target. @@ -361,7 +351,7 @@ All paths start by lowering the workload and searching for candidates: ```text PlanningWorkload + frontend dependencies + planning models/evidence - -> frontend lowering: one QueryExpr root per normalized query entry + -> frontend lowering: one OperatorNode root per normalized query entry -> search_workload_with_targets -> CandidateLogicalASAPDAGs ``` @@ -375,8 +365,7 @@ Then choose the operation matching the caller's responsibility: | Purpose | Operation | Result | |---|---|---| | Inspect candidates or let the backend choose | [Ranked view](#ranked-view), if ranking is useful | Per-target candidate lists and costs | -| Ask Planner to choose logical computations; backend owns summary maintenance | [Selection and DAG assembly](#selection-and-dag-assembly) | One selected Post-ASAP DAG root per query | -| Ask Planner to also decide summary maintenance versus raw recomputation | [Summary-maintenance-lifecycle-aware helper](#summary-maintenance-lifecycle-aware-helper) | One plan containing a DAG root and maintenance decisions per query | +| Ask Planner to choose logical computations | [Selection and DAG assembly](#selection-and-dag-assembly) | One selected Post-ASAP DAG root per query | ### Ranked view @@ -390,7 +379,7 @@ The return type is `Vec>`; each element has thi ```rust struct RankedTargetSubDAGCandidates<'a> { - target: &'a Rc, + target: &'a Rc, consumer_count: usize, candidates: Vec<&'a ReplacementSubDAG>, costs: Vec, // costs[i] describes candidates[i] @@ -430,71 +419,13 @@ the result for one query root. | **Output:** one selected logical [Post-ASAP DAG](../concepts/post-asap-ir.md) per query root | Each output DAG specifies the chosen operators, parameters, and accuracy -guarantees. Its root is represented by `Rc`; the +guarantees. Its root is an `Rc` (the same IR as the input, +with some nodes now ASAP operators) and carries no execution timing yet; the [API reference](../../develop_docs/library-api.md#api-definition-and-example) describes the function signatures and return handling. -This path selects how to compute the query, not how to maintain summary state. - -### Summary-maintenance-lifecycle-aware helper - -This workflow performs both candidate selection and DAG assembly, incorporating -summary-maintenance lifecycle costs. Use it when ASAPPlanner owns the decision -to maintain summaries versus recompute raw data. It is not needed for candidate -inspection or when the downstream backend owns that decision. - -Starting from an existing `CandidateLogicalASAPDAGs`, call these two public helpers in order; -there is no need to run the ordinary selection/assembly workflow first: - -1. `global_selection_with_summary_maintenance_lifecycles` uses the workload - binding, lifecycle capabilities, and comparable costs to choose compatible - candidates across target sub-DAGs. It returns `GlobalSelection`, not a DAG or a - deployment plan. -2. For each wanted query root, `assemble_selected_dag_with_summary_maintenance_lifecycles` - takes that selection and root, constructs a Post-ASAP DAG, compares the - selected summary's maintenance cost with raw recomputation, and returns - `Result, SummaryMaintenanceLifecycleAssemblyError>`. - When a summary does not beat a - known raw cost, or a required comparable cost is unavailable, the result - retains the exact `KeepPreAsap` root and no summary deployments. - -As in ordinary selection, one selection call serves the workload and assembly -is per root. The second helper calls `assemble_selected_dag` internally; callers -do not need a separate assembly call. Neither helper creates a materialized view -or deploys runtime state. -The output is a selected logical DAG with lifecycle decisions, not an executable -deployment plan. Any claim of optimization is relative to the supplied cost -model, evidence, and available candidates. -See the [library guide's lifecycle and capabilities section](../../develop_docs/library-api.md#lifecycle-and-capabilities) -for an API example and the capability contract. - -Across the two calls, the caller supplies these parameters: - -| Helper parameter | Source | Required | -|---|---|---:| -| `CandidateLogicalASAPDAGs` | Canonical ASAPPlanner output; passed to selection | Yes | -| `GlobalSelection` and one root | Selection result and a root in that `CandidateLogicalASAPDAGs`; passed to DAG assembly | Yes for each assembled root | -| Workload binding | `QueryWorkload` plus the workload-entry indices associated with each root | Yes | -| Planning time (`now_ms`) | Caller clock in Unix milliseconds | Yes | -| Planning horizon | Caller policy | Conditional: required for finite totals over recurring demand | -| Data arrival and update rate | `DataWorkload` evidence | Conditional: required to cost continuous maintenance | -| Lifecycle capabilities | Deployment/runtime provider | Yes for checking deployable lifecycle alternatives | -| Summary and raw cost information | Cost model and physical-evidence provider | Yes for a cost-based maintenance-versus-recompute decision | - -Recurrence and time selection are already fields of the bound `QueryWorkload`; -they are not duplicated as separate top-level inputs. Similarly, data arrival -and update rate are read from the optional `DataWorkload`. Missing required -facts remain unknown rather than being treated as zero. - -The per-query output, `SummaryMaintenanceLifecyclePlan`, **contains** the -Post-ASAP DAG rather than being a parallel representation. It records: - -* the assembled Post-ASAP DAG root (`Rc`); -* lifecycle choices for summary state; -* planning horizon and expected reads/updates; -* selected window implementation and guarantees; -* comparable summary and raw-recomputation costs; and -* whether raw recomputation was selected. +This path selects how to compute the query, not whether summary state is +materialized. --- diff --git a/docs/design_docs/architecture/metricsql-frontend.md b/docs/design_docs/architecture/metricsql-frontend.md index ddc463239..ffb45b728 100644 --- a/docs/design_docs/architecture/metricsql-frontend.md +++ b/docs/design_docs/architecture/metricsql-frontend.md @@ -9,16 +9,17 @@ on VictoriaMetrics and models MetricsQL syntax directly, including `WITH`, rollup expressions, step-relative durations, MetricsQL binary operators, aggregate limits, or-delimited matchers, and `keep_metric_names`. -The frontend walks that AST directly and emits the existing canonical -`QueryExpr`. It does not add MetricsQL fields to `QueryExpr`, SDS descriptors, -or the physical summary DAG. +The frontend walks that AST directly into the shared name-based `UnresolvedOp` +tree (`asap-frontend-common`) and calls `resolve_root`, which returns the +canonical `Rc` DAG. It does not add MetricsQL fields to the +operator IR, SDS descriptors, or the physical summary DAG. ```text MetricsQL source | MetricsqlExpr (extension semantics retained) | -canonical QueryExpr +UnresolvedOp tree --resolve_root--> canonical OperatorNode DAG | existing ASAP-aware mapping and physical Summary DAG ``` @@ -33,8 +34,8 @@ existing ASAP-aware mapping and physical Summary DAG | Common rollups: rate/increase/derivatives and statistical `*_over_time` | Existing per-entity canonical intents over the lowered range. | | PromQL arithmetic, comparison, and set binary operators without modifiers | Existing canonical `BinaryOp`. | | `default_rollup(selector[range])` | Lower to `Aggregate(LastOverTime)` over the explicit `TimeRange`. | -| `default_rollup(selector)` | Reject for exact fallback because the implicit lookbehind window depends on the runtime evaluation step, which is not a property of canonical `QueryExpr`. | -| `expr keep_metric_names` | Parsed natively, then rejected for exact fallback because canonical `QueryExpr` does not carry metric-name lineage. | +| `default_rollup(selector)` | Reject for exact fallback because the implicit lookbehind window depends on the runtime evaluation step, which is not a property of the canonical operator IR. | +| `expr keep_metric_names` | Parsed natively, then rejected for exact fallback because the canonical operator IR does not carry metric-name lineage. | | `if`, `ifnot`, `default`, aggregate `limit`, or-delimited matchers, binary match modifiers | Parsed natively and rejected until the canonical executor has the exact semantics. | | `WITH` | Expanded by the native parser; the expanded expression lowers when every resulting node is supported. | diff --git a/docs/design_docs/architecture/physical-plan-integration.md b/docs/design_docs/architecture/physical-plan-integration.md index 7fffc9fdf..2fb056412 100644 --- a/docs/design_docs/architecture/physical-plan-integration.md +++ b/docs/design_docs/architecture/physical-plan-integration.md @@ -5,14 +5,13 @@ This document defines the boundary between ASAPPlanner's logical plans, physical lowering, statistics resolution, and analytical resource estimation. It answers which representation is authoritative at each stage and prevents -the cost model from being coupled directly to either logical IR. +the cost model from being coupled directly to the logical IR. The integration pipeline is: ```text -pre-ASAP QueryExpr ─┐ - ├─ physical lowering ─> PhysicalOperator DAG -post-ASAP SummaryExpr┘ │ +logical OperatorNode DAG ─ physical lowering ─> PhysicalOperator DAG +(NonASAPOp + ASAPOp nodes) │ v OperatorStatistics │ @@ -30,8 +29,8 @@ Each representation is authoritative for a different concern: | Representation | Authoritative concern | |---|---| -| `QueryExpr` | Original exact query semantics: sources, predicates, relational and PromQL operations, and output shape. | -| `SummaryExpr` | Logical summary semantics: selected family, grouping strategy, summary composition, and summary readout. | +| `NonASAPOp` nodes | Exact query semantics: sources, predicates, relational and PromQL operations, and output shape. | +| `ASAPOp` nodes | Logical summary semantics: selected family, grouping strategy, summary composition, and summary evaluation. | | `PhysicalOperator` DAG | Selected executable algorithms, their configuration, physical identity, edges, and execution multiplicity. | | `OperatorStatistics` | Workload-dependent evidence required by each selected physical operator's resource formula. | | `ResourceEstimate` | Estimated CPU operations, peak live memory, and physical source/disk reads over one comparison scope. | @@ -39,7 +38,7 @@ Each representation is authoritative for a different concern: `PhysicalOperator` is therefore the source of truth for the operator vocabulary consumed by analytical costing. `OperatorStatistics` corresponds one-to-one with that vocabulary. It must not independently invent operator kinds or copy -all variants from either logical IR. +all variants from the logical IR. The canonical physical-plan types should live at a neutral boundary shared by lowering, costing, explanation, and downstream compilation. Their conceptual @@ -51,7 +50,7 @@ being established. One logical operation may choose between algorithms or expand into a physical sub-DAG. Conversely, one physical operator may implement nodes originating -from either logical IR. +from either operator category (`NonASAPOp` or `ASAPOp`). Examples include: @@ -61,21 +60,21 @@ Examples include: supported join algorithm. - `SummaryAgg` may lower to an exact accumulator build, CMS build, KLL build, or another physical summary algorithm selected by the candidate. -- `SummaryEstimate` must lower to a readout operator compatible with the +- `SummaryEstimate` must lower to a evaluation operator compatible with the concrete summary state it consumes. - shared logical sub-DAGs become shared physical nodes only when they refer to the same physical identity and compatible evidence. -For this reason, aligning `OperatorStatistics` directly with `QueryExpr` would -lose post-ASAP summary implementations, while aligning it directly with -`SummaryExpr` would lose raw query operators and physical algorithm choices. +For this reason, aligning `OperatorStatistics` directly with the logical +operators would lose physical algorithm choices, and with only one category +would lose either summary implementations or raw query operators. ## Lowering obligations Physical lowering is complete only when it recursively lowers the entire selected candidate DAG. It must: -1. preserve the semantics and source coverage of the logical candidate; +1. preserve the semantics and scan selection of the logical candidate; 2. select an explicit physical algorithm for every logical operation; 3. carry algorithm configuration on the physical operator rather than in a generic statistics record; @@ -91,14 +90,16 @@ its modeled descendants is invalid because it undercounts the candidate. ### Pre-ASAP lowering -`KeepPreAsap` recursively lowers its contained `QueryExpr`. Typical physical +Every `NonASAPOp` node lowers recursively, whether it is in a raw query or +kept exact inside a post-ASAP plan. Typical physical operators include scans, filters, projections, hash aggregates, joins, ordering, bounded Top-K, limits, and PromQL-specific operators. The selected physical algorithm, rather than the logical spelling, determines the formula. ### Post-ASAP lowering -Every `SummaryExpr` operation also needs explicit physical realization: +Every `ASAPOp` node, and every exact operator composed with one, also needs +explicit physical realization: | Logical summary operation | Required physical realization | |---|---| @@ -107,38 +108,24 @@ Every `SummaryExpr` operation also needs explicit physical realization: | `SummaryMerge` | merge operator over compatible concrete summary states | | `SummarySubtract` | subtract operator supported by the selected state representation | | `SummaryDelete` | physical deletion/update operator supported by the selected representation | -| `SummaryEstimate` | family- and query-specific readout operator | -| `KeepPreAsap` | recursive lowering of the contained `QueryExpr` | -| `BinaryOp` | binary evaluation preserving operand order, execution timing and any typed finite/relative-division guard | -| `ValueOperation` | concrete realization of the value operation with its required execution timing and data state | -| `RelationalJoin` | concrete row-join algorithm preserving join kind and predicate | -| `RelationalJoin` with `JoinKind::Semi` | retain left rows matching explicit right-side keys; candidate pruning carries completeness evidence and ordinary TopK ranks the result | +| `SummaryEstimate` | family- and query-specific evaluation operator | +| `FinalizeExactAccumulator` | exact-state finalization before value consumers | +| `MaintainPopulation` / `EvaluatePopulation` | maintained-population update and its aggregate or TopK-prefix evaluation | +| retained `NonASAPOp` sub-DAG | recursive lowering of the exact operators (see above) | +| `BinaryOp` | binary evaluation preserving operand order, the node's execution timing and any typed finite/relative-division guard | +| `Project` / `Filter` / `Sort` / `Limit` / `Aggregate` over a evaluation | concrete realization at the node's execution timing and data state | +| `Join` | concrete row-join algorithm preserving join kind and predicate | +| `Join` with `JoinKind::Semi` | retain left rows matching explicit right-side keys; candidate pruning carries completeness evidence and ordinary TopK ranks the result | This table is a completeness requirement, not a claim that every realization already exists. Until lowering introduces an explicit physical operator, statistics contract, validation rule, and resource formula for an operation, a candidate containing it is unavailable. -The streaming integration can consume a complete binding through -`SummaryNodeEvidence`. That binding is keyed to exact `SummaryNode` -identities and uses structured evidence for aggregate state, join, merge, -subtract, delete, readout, and retained pre-ASAP work. It is a physical -evidence boundary, not automatic physical lowering: a deployment must still -select each concrete implementation and provide all edges, resource facts, -multiplicities, source ownership, and stable physical identities. The planner -fails closed when any reachable `SummaryExpr` node lacks that binding. - -The raw/query portion of a streaming comparison remains a `PhysicalDAG` using -the canonical `PhysicalOperator` and `OperatorStatistics` pairing. Summary -evidence is kept separate only where lifecycle-driven update, retention, and -expiration multiplicities require facts beyond the query-DAG -`Once`/`PerEvaluation` schedule. It must not redefine workload, lifecycle, or -summary-family semantics. - -Lifecycle choice affects the physical DAG but does not replace it. Ephemeral, -prepared, shared, and continuously maintained alternatives determine when -build, update, readout, merge, subtract, or delete nodes execute. The physical -operators still determine how each execution consumes CPU, memory, and I/O. +Materialization choice (Stage 2, #509) affects the physical DAG but does not +replace it: it determines when build, update, evaluation, merge, subtract, or +delete nodes execute. The physical operators still determine how each execution +consumes CPU, memory, and I/O. ## Statistics contract @@ -427,7 +414,7 @@ recovering average semantics from query text. ### Candidate pruning is a sub-DAG -Candidate-based TopK uses a summary key readout, a general semi-join over +Candidate-based TopK uses a summary key evaluation, a general semi-join over explicit matching key columns, grouped Sort by the authoritative score, and grouped Limit. Sort and Limit carry the same partition keys. The join preserves authoritative left-side values and does not rank or limit @@ -440,10 +427,12 @@ fields. The phase assignment API updates producer edge states and rejects an ingestion computation that depends on query-time work. Deployment capability, storage readiness, schemas and approximation guarantees remain separate checks. -Post-ASAP DAG wire version 4 removes the special membership operator, its edge +Post-ASAP DAG wire version 4 removed the special membership operator, its edge roles and the duplicate operator phase fields without compatibility aliases. +Version 6 (current) exports one node per operator: retained exact operators are +`Relational` nodes, not embedded sub-DAGs. -Post-ASAP DAG wire version 6 adds a per-measure row predicate to the aggregate +Post-ASAP DAG wire version 7 adds a per-measure row predicate to the aggregate operators (#466): `filters` on the exact aggregate value operation, parallel to its measures, and `filter` on `SummaryAgg`, gating which rows update the summary state. The version bump makes an older reader fail loudly instead of @@ -465,38 +454,8 @@ a numeric entity key is not a score. Exact accumulator inputs are explicitly finalized before row operators consume them. None of these operations proves candidate completeness; that evidence belongs to the semi-join's pruning step. -The semantic `SummaryExpr` constructors still propose an initial execution -layout. Uniform phase assignment applies to the exported post-ASAP DAG; +The logical DAG carries no execution layout: `apply_materialization_timings` +writes each node's timing from a `MaterializationAssignment` before export (all +query time by default). Uniform phase +assignment applies to the exported post-ASAP DAG; it is not a claim that every deployment has implemented every placement. - - -## Summary cost evidence across data-arrival modes - -`SummaryMaintenanceCostModel` binds `SummaryNodeEvidence` and -`SummaryOperatorEvidence` independently of data-arrival mode. `ComparisonScope` -and the canonical `DataWorkload` determine arrival semantics; individual operator -resource records do not define another workload model. - -`SummaryMaintenanceInputs::from_workload` requires fresh snapshot cardinality. -For `AtRest`, it derives zero arrivals without requiring ingestion-rate evidence; -a fresh nonzero or invalid rate contradicts that declaration and is rejected. -For `ContinuouslyIngesting`, fresh, finite, nonnegative rate evidence remains -mandatory. Missing continuous rate evidence is never treated as zero. -Raw and summary evidence supplied directly by a provider obey the same arrival -invariant. Their source lineage, horizon, evaluation count, and snapshot dimensions -must still match. The existing lifecycle planner selects direct builds for a fixed -snapshot and charges bootstrap work, result evaluation, and retention; it charges -no arrival updates. This does not add computation-placement policy. - -`Mixed` and `Unknown` remain unsupported for analytical comparisons: the current -workload schema cannot identify separate backlog and arrival populations. The -adapter fails explicitly rather than guessing a split. The estimator version is -`summary-maintenance-resource-v2`; evidence type names drop the `Streaming` prefix -(`SummaryMaintenanceInputs`, `SummaryPhysicalInputEvidence`, `SummaryAggregateEvidence`, -`RetainedSubDAGEvidence`, `RawInputEvidence`, and the summary window/alternative -types). Update source imports; no legacy-name aliases are provided. - -Regressions cover a fixed snapshot with no rate evidence, contradictory arrival -rates, scope mismatches, missing continuous-rate/cardinality evidence, and actual -lifecycle selection of a completely costed at-rest summary against its raw scan. -The existing continuous-ingestion and mixed-arrival rejection tests remain. diff --git a/docs/design_docs/architecture/planner-runtime-contract.md b/docs/design_docs/architecture/planner-runtime-contract.md index 2d071e654..0077252ca 100644 --- a/docs/design_docs/architecture/planner-runtime-contract.md +++ b/docs/design_docs/architecture/planner-runtime-contract.md @@ -4,33 +4,27 @@ ASAPPlanner produces `CandidateLogicalASAPDAGs`, a compact logical candidate space. Integrators may select candidates downstream or ask Planner's helpers to select and assemble -DAGs. Summary-maintenance lifecycle decisions belong to Planner only when the -integration uses its lifecycle-aware workflow; physical deployment and execution -remain downstream. The [input/output/workflow design](input-output-workflow.md) -defines this boundary. - -A downstream provider can report implementation alternatives and their cost and -accuracy evidence for a Planner-owned comparison. The resulting -`SummaryMaintenanceLifecyclePlan` contains a Post-ASAP DAG root and maintenance -decisions; it is not an executable plan. Repeated provider calls do not constitute -an implemented end-to-end replanning or deployment-transition protocol. +DAGs. Stage 2 materialization (#509) will decide per sub-DAG whether to +materialize and whether at ingestion or query time; until then every summary +runs at query time. Physical deployment and execution remain downstream. The +[input/output/workflow design](input-output-workflow.md) defines this boundary. ## Three decision layers | Layer | Owner | Examples | |---|---|---| | Logical candidate semantics | ASAPPlanner | Query rewrite; summary family and parameters; grouping; accuracy guarantees when established. | -| Summary maintenance and realization selection | Planner helpers when delegated to Planner; otherwise downstream | `Ephemeral`, `Prepared`, `Shared`, `ContinuouslyMaintained`; `DirectBuild` or `Incremental`; window implementations compared using provider evidence. | +| Summary materialization and realization selection | Stage 2 materialization (#509); downstream until then | Ingestion-time maintenance or query-time computation per summary state; direct build or incremental update; window implementations compared using provider evidence. | | Concrete implementation and deployment | ASAPQuery-backend and its workload optimizer | Library and data-structure implementation, exact pane layout, placement, sharding, storage, transmission, materialization IDs, executor configuration, and workload-wide assignment. | ASAPCollector and the ASAPQuery data plane execute the compiled downstream plans. They validate capabilities and plan identities, maintain or read the specified state, and report runtime observations. They do not silently choose -a different summary, lifecycle, or realization framework. +a different summary, materialization, or realization framework. ## Incremental-maintenance example -When the integration delegates summary-maintenance decisions to Planner, +Once Stage 2 materialization (#509) owns summary-maintenance decisions, ASAPPlanner may decide that a logical summary should be incrementally maintained: new data updates existing summary state. It may also select the planner-visible window realization—such as tumbling, sliding/panes, or an @@ -43,7 +37,7 @@ pane representation, runtime operator implementation, placement, sharding, watermark behavior, and materialization identifiers. ASAPCollector maintains the compiled panes and summary state. -Thus `Incremental` describes the state-update lifecycle, while tumbling, +Thus incremental update describes how state is maintained, while tumbling, sliding, and exponential-histogram describe realization algorithms. They are distinct axes, but both can participate in ASAPPlanner's candidate space. The backend still owns how the selected algorithms are physically realized. @@ -53,7 +47,7 @@ backend still owns how the selected algorithms are physically realized. The same contract applies when ASAPPlanner selects a summary algorithm. Planner can choose KLL rather than DDSketch, while downstream chooses the concrete KLL implementation and runtime configuration that satisfies the selected parameter -and accuracy contract. Empirical KLL error, update work, state size, and readout +and accuracy contract. Empirical KLL error, update work, state size, and evaluation work observed on a particular workload can be fed back as evidence for later Planner comparisons. @@ -64,24 +58,23 @@ selected algorithm's semantics or guarantees. ## Iterative planning protocol (future integration) The sequence below is an intended integration design, not one shipped public -API or a required path for every caller. Current provider and lifecycle helpers -support a bounded planning decision; cross-run identity, migration, activation, -and rollback are not an end-to-end Planner protocol. +API or a required path for every caller. Cross-run identity, migration, +activation, and rollback are not an end-to-end Planner protocol. -1. ASAPPlanner enumerates semantically valid logical summaries, lifecycle +1. ASAPPlanner enumerates semantically valid logical summaries, materialization alternatives, and registered realization strategies. 2. A physical-plan provider maps those candidates to executor-feasible complete alternatives. Unsupported candidates are omitted or explicitly rejected. 3. The provider binds a stable alternative identity and complete evidence: - source coverage, input/output edges, operation counts, update and bootstrap + scan selection, input/output edges, operation counts, update and bootstrap fanout, retained state, CPU, memory, I/O, and accuracy facts. 4. ASAPPlanner keeps constructible candidates with missing evidence visible - in `CandidateLogicalASAPDAGs` but does not certify unknown accuracy. The - summary-maintenance-lifecycle-aware workflow compares supported alternatives - over the same workload horizon. Missing or incomparable costs do not establish + in `CandidateLogicalASAPDAGs` but does not certify unknown accuracy. + Materialization compares supported alternatives over the same workload + horizon. Missing or incomparable costs do not establish that maintaining a summary beats raw recomputation; structural scores and optimistic zeroes are not substitutes. -5. ASAPPlanner outputs the selected Post-ASAP semantics, lifecycle guarantees, +5. ASAPPlanner outputs the selected Post-ASAP semantics, materialization choices, realization contract, and chosen provider identity. 6. ASAPQuery-backend compiles that result into consistent `CollectorPlan`, `BackendPlan`, and `QueryPlan` projections and performs deployment-level and @@ -106,11 +99,8 @@ such as cache behavior, serialization overhead, compression, spill I/O, or data-distribution-dependent sketch error. Provenance and version information must accompany those facts so stale observations fail closed. -`SummaryPhysicalPlanAlternative` is the current integration point for a -complete provider-enumerated implementation. Its identity is returned with the -winning lifecycle combination. More structured planner-owned realization -contracts can refine the candidate space without moving executor -implementation into ASAPPlanner. +More structured planner-owned realization contracts can refine the candidate +space without moving executor implementation into ASAPPlanner. ## Workload-wide optimization @@ -124,7 +114,7 @@ The ASAPQuery configuration and MIP formulations can supply physical alternatives and coefficients. Their general principles also inform Planner costing: arrival rate scales ingestion work, overlapping active windows multiply update work and live state, retained windows consume memory, and -merge/subtract/readout work scales with query recurrence. Disagreement between +merge/subtract/evaluation work scales with query recurrence. Disagreement between formulations must become distinct explicit alternatives, not hidden assumptions in one cost formula. @@ -146,7 +136,7 @@ in one cost formula. automatically selected. - Shared logical nodes remain shared across the planner-runtime contract; physical sharing additionally requires compatible filters, grouping, windows, parameters, - lifecycle, and guarantees. + materialization, and guarantees. - Collector, backend, and query plans are projections of one compiled decision and cannot be optimized independently into inconsistent semantics. @@ -155,7 +145,6 @@ in one cost formula. - [Post-ASAP IR](../concepts/post-asap-ir.md) - [Physical plan integration](physical-plan-integration.md) - [Analytical resource cost](../proposals/asap-aware-mapping/analytical-resource-cost.md) -- [Workload demand and summary lifecycle](../proposals/asap-aware-mapping/workload-demand-and-summary-lifecycle.md) - [ASAPCollector physical compilation](https://github.com/ProjectASAP/ASAPCollector/blob/87684f4b61514382d8b087724694f93187bfc19c/docs/design_docs/control-plane/post-asap-physical-compilation.md) - [ASAPQuery configuration formulation](https://github.com/ProjectASAP/ASAPQuery/blob/main/.design_docs/sketch-config-optimization-formulation.md) - [ASAPQuery optimizer MIP formulation](https://github.com/ProjectASAP/ASAPQuery/blob/main/.design_docs/optimizer-mip-formulation.md) diff --git a/docs/design_docs/architecture/updated_interface_with_pluggable_optimization.md b/docs/design_docs/architecture/updated_interface_with_pluggable_optimization.md index 72e626a2e..682055b0a 100644 --- a/docs/design_docs/architecture/updated_interface_with_pluggable_optimization.md +++ b/docs/design_docs/architecture/updated_interface_with_pluggable_optimization.md @@ -9,8 +9,8 @@ What that buys: * One call in place of six across three stages. `CandidateLogicalASAPDAGs` and `GlobalSelection` no longer appear in user code. -* The root-to-entry bindings a caller used to build by hand are derived, and - their ordering contract is checked rather than assumed. +* The root-to-entry binding a caller used to build by hand is derived, and + its ordering contract is checked rather than assumed. * A new optimization algorithm can be freely implemented as a trait implementation, rather than a rule disguised to fit a two-phase pipeline it does not share. @@ -20,7 +20,6 @@ Unchanged: `CandidateLogicalASAPDAGs`, `cost_sorted`, `global_selection`, and th ```text PlanningWorkload ──lowering──▶ ParsedWorkload ──OptimizationPass──▶ PlanOutput + frontend deps + models - + lifecycle input ``` --- @@ -64,7 +63,6 @@ Details of these types are provided below. | `workload` | `&PlanningWorkload` | | `frontend_specific` | `Sql { catalog }` / `Promql { now_ms, histograms }` / `Metricsql`; fixed by `query_workload.language` | | `models` | Cost model, accuracy model, evidence provider; `PlanningModels::builtin()` for the defaults | -| `lifecycle` | Planning clock and runtime capabilities for the maintenance-versus-recompute decision every plan carries | | `pass` | `None` uses `MajorPass` | ### `OptimizationInput` @@ -73,7 +71,6 @@ Details of these types are provided below. pub struct OptimizationInput<'a> { pub workload: &'a ParsedWorkload, pub models: PlanningModels<'a>, // same type UserInput uses - pub lifecycle: LifecycleInput, // same type UserInput uses } ``` @@ -83,19 +80,18 @@ pub struct OptimizationInput<'a> { ```rust pub struct PlanOutput { - pub plans: Vec, // one per workload entry, in entries() order + pub plans: Vec, // one per workload entry, in entries() order } -pub struct QueryLifecyclePlan { - pub entry_index: usize, // index into QueryWorkload::entries() - pub plan: SummaryMaintenanceLifecyclePlan, // its `root` is the DAG +pub struct QueryPlan { + pub entry_index: usize, // index into QueryWorkload::entries() + pub root: Rc, // selected post-ASAP DAG; shared nodes are the same Rc } ``` -Every plan carries the maintenance decisions, so the pass always runs -lifecycle-aware selection. A cost model that cannot price lifecycles -(`DefaultCostModel` today) makes that selection fall back to raw recompute for -every summary target; supply a model with the lifecycle cost hooks. +Plans carry no materialization decision. `PlanOutput::execution_timed_dag()` +times every summary at query time until Stage 2 materialization (#509) decides +per sub-DAG whether to materialize and whether at ingestion or query time. --- @@ -112,8 +108,9 @@ The `MajorPass` described below will be used by default, which corresponds to th |---|---| | Build roots | `Id` is the entry's position in `entries()`; the accuracy target comes from its `requirements` | | Candidate search | `search_workload_with_targets` with `default_strategies_with_evidence` | -| Select | `global_selection`, or `global_selection_with_summary_maintenance_lifecycles` with a `WorkloadDemand` derived from the `ParsedWorkload` | -| Assemble, per root | `assemble_selected_dag`, or its lifecycle-aware counterpart | +| Select | `CandidateLogicalASAPDAGs::global_selection` | +| Assemble, per root | `GlobalSelection::assemble_selected_dag` | +| Share | `asap_types::ir::cse::share_common_sub_dags` across the assembled roots | Moving it behind the trait changes one thing for existing developers: **`ReplacementStrategy` is now a concept of `MajorPass`, not of the optimization @@ -159,70 +156,60 @@ for name in registry.names() { `PassRegistry` is caller-owned, not a link-time global, so two tests in one binary cannot see each other's registrations. -### 3.3 The three existing workflows, in this shape +### 3.3 The existing workflows, in this shape -[Input, output, and workflows](input-output-workflow.md) describes three ways to -use the candidate space. Only the last is what a pass produces; the other two -stay on the old interfaces. +[Input, output, and workflows](input-output-workflow.md) describes two ways to +use the candidate space. The second is what a pass produces; the first stays +on the old interfaces. | Workflow there | Here | |---|---| | Ranked view (`cost_sorted`) | Not covered by this design, you should handle it with old interfaces | -| Selection and DAG assembly | Not covered either: `search_workload_with_targets` + `global_selection` + `assemble_selected_dag` | -| Summary-maintenance-lifecycle-aware helper | `PlanOutput` | +| Selection and DAG assembly | `PlanOutput` | -The third is no longer a call sequence the caller drives. +Selection and assembly are no longer a call sequence the caller drives. Following is an example of how the old workflow maps to the new interface. ```rust -// Before — from a PlanningWorkload and a catalog, with lifecycle decisions. +// Before — from a PlanningWorkload and a catalog. // 1. Lower every normalized entry, and record which entry each root came from. // Not lower_sql_batch: it walks query_batch alone and drops repeating entries. let mut roots = Vec::new(); -let mut entry_indices = Vec::new(); for (index, entry) in workload.query_workload.entries().enumerate() { let accuracy = entry.requirements.accuracy.target(); let expr = lower_sql_dialect(&entry.query.0, &catalog, dialect.clone(), accuracy.clone()) .await?; - roots.push((index, Rc::new(expr), Some(accuracy))); - entry_indices.push(index); + roots.push((index, expr, Some(accuracy))); } // 2. Search for candidates. let strategies = default_strategies_with_evidence(&cost_model, &evidence); let space = search_workload_with_targets(roots, &strategies, &accuracy_model); -// 3. Select once for the whole workload, re-binding roots to workload entries. -let demand = WorkloadDemand { - workload: &workload.query_workload, - data_workload: workload.data_workload.as_ref(), - entry_indices: &entry_indices, -}; -let selection = global_selection_with_summary_maintenance_lifecycles( - &space, demand, now_ms, horizon, capabilities, &cost_model)?; - -// 4. Assemble once per root. -let mut plans = Vec::new(); +// 3. Select once for the whole workload. +let selection = space.global_selection(&cost_model); + +// 4. Assemble once per root, then share common sub-DAGs across roots. +let mut assembled = Vec::new(); for (index, root) in &space.roots { - let plan = assemble_selected_dag_with_summary_maintenance_lifecycles( - &selection, root, demand, now_ms, horizon, capabilities, &cost_model)?; - plans.push((*index, plan)); + if let Some(dag) = selection.assemble_selected_dag(root)? { + assembled.push((*index, dag)); + } } +let plans = share_common_sub_dags(assembled); ``` ```rust // After. let output = e2e_plan( UserInput::new(&workload, FrontendInput::Sql { catalog: &catalog }, - PlanningModels::builtin(), - LifecycleInput::new(now_ms, capabilities).with_horizon(horizon)) + PlanningModels::builtin()) ).await?; ``` -Steps 1 and 3 are where the two bindings lived: the `Id` carried through the -roots tuple, and the `&[usize]` rebuilt for `WorkloadDemand`. Both had to agree -with `entries()` order, and nothing checked that they did. `MajorPass` still +Step 1 is where the binding lived: the `Id` carried through the roots tuple had +to agree with `entries()` order, and nothing checked that it did. `MajorPass` still runs all four steps; another pass need not run any of them. ## 4. Code layout @@ -230,7 +217,7 @@ runs all four steps; another pass need not run any of them. | Crate | What it holds | |---|---| | `asap-types` | `ParsedWorkload` | -| `asap-aware-mapping` | `OptimizationPass`, `OptimizationInput`, `PlanOutput`, `PlanningModels`, `LifecycleInput`, `optimize`, `PassRegistry`, `MajorPass` | +| `asap-aware-mapping` | `OptimizationPass`, `OptimizationInput`, `PlanOutput`, `PlanningModels`, `optimize`, `PassRegistry`, `MajorPass` | | `asap-planner` *(new)* | `e2e_plan`, `UserInput`, `FrontendInput`, lowering dispatch | ```text @@ -242,9 +229,9 @@ asap-planner ──┬──> asap-frontend-{sql, promql, metricsql} `asap-planner` is separate because it is the only crate depending on every frontend; before it, the sole facade re-exporting more than one was -`asap-devtools`, a developer-tools crate. `PlanningModels` and `LifecycleInput` -live in `asap-aware-mapping` because both inputs use them, and `asap-planner` -re-exports them. +`asap-devtools`, a developer-tools crate. `PlanningModels` lives in +`asap-aware-mapping` because both inputs use it, and `asap-planner` re-exports +it. --- diff --git a/docs/design_docs/concepts/accuracy-models.md b/docs/design_docs/concepts/accuracy-models.md index 5353ef9ef..baeadbe9e 100644 --- a/docs/design_docs/concepts/accuracy-models.md +++ b/docs/design_docs/concepts/accuracy-models.md @@ -69,7 +69,7 @@ query text or cost estimates. flowchart TD Request[Query semantics and accuracy target] --> Generate[Generate candidates and size parameters] Evidence[Scoped source contracts and evidence] --> Generate - Generate --> Local[Derive local readout guarantees] + Generate --> Local[Derive local evaluation guarantees] Evidence --> Local Local --> Compose[Propagate guarantees through the DAG] Evidence --> Compose @@ -100,7 +100,7 @@ is ready, or that a complete deployment cost is available. ## Local estimator models and parameter sizing -A local model describes a specific readout of a specific estimator with +A local model describes a specific evaluation of a specific estimator with committed parameters and applicable assumptions. A family name or a parameter such as HLL precision is not, by itself, a confidence certificate. @@ -121,8 +121,8 @@ The built-in models currently include: | CMS | L1-normalized frequency bound from width and depth; does not by itself certify TopK membership | | CountSketch | L2-normalized frequency bound and median concentration bound, requiring valid odd depth | | KMV / Theta | Parameter-derived cardinality bounds using the registered variance/Chebyshev model at 99% confidence | -| UnivMon | Exact unit-update total for the supported readout; no universal guarantee for all its statistics | -| Other families/readouts | No default certificate where no accuracy model is registered | +| UnivMon | Exact unit-update total for the supported evaluation; no universal guarantee for all its statistics | +| Other families/evaluations | No default certificate where no accuracy model is registered | This table describes Planner's registered contracts, not independent mathematical verification of every estimator or permission to substitute @@ -214,7 +214,7 @@ an observation into a guarantee. A deployment supplies `EstimatorContract::ClassicHll` for the complete aggregate expression. It asserts the classic estimator, independent uniform bucket -hashing and an enforced maximum distinct population per readout, including +hashing and an enforced maximum distinct population per evaluation, including all merged panes. Planner combines this contract with the query or allocated local target, selects a supported precision, derives the guarantee and uses the normal propagation and selection checks. @@ -290,7 +290,7 @@ accuracy/ ├── allocation.rs # End-to-end budget allocation ├── reconciliation.rs # Accuracy coordination across consumers └── estimators/ - ├── mod.rs # Family/readout dispatch and source-contract integration + ├── mod.rs # Family/evaluation dispatch and source-contract integration ├── kll.rs ├── ddsketch.rs ├── hll.rs # Generic HLL and bounded Classic HLL @@ -308,7 +308,7 @@ share the same contract. Adding an estimator or composition requires: -1. A precisely defined error metric, estimator/readout semantics and assumptions. +1. A precisely defined error metric, estimator/evaluation semantics and assumptions. 2. Sizing behavior and a guarantee derived from the committed parameters, including unsupported parameter domains. 3. Explicit evidence requirements, population scope and provenance. 4. Propagation rules where supported; rejection or retained unknowns elsewhere. diff --git a/docs/design_docs/concepts/planner-pipeline.md b/docs/design_docs/concepts/planner-pipeline.md index 7401ae0da..c07d17775 100644 --- a/docs/design_docs/concepts/planner-pipeline.md +++ b/docs/design_docs/concepts/planner-pipeline.md @@ -14,12 +14,11 @@ over that output, not mandatory stages of candidate search. | +--> inspect candidates, optionally using cost_sorted +--> select and assemble logical DAGs - +--> select and assemble with summary-maintenance lifecycle decisions -The last two branches are alternatives: use the summary-maintenance-lifecycle-aware -workflow when Planner owns maintenance-versus-recomputation decisions; otherwise -the backend owns them. All physical binding, deployment, and execution remain -downstream responsibilities. +Stage 2 materialization (#509) will decide per sub-DAG whether to materialize +and whether at ingestion or query time; until then every summary runs at query +time. All physical binding, deployment, and execution remain downstream +responsibilities. The [input, output, and workflows](../architecture/input-output-workflow.md) document defines the public boundary and helper call order. diff --git a/docs/design_docs/concepts/post-asap-ir.md b/docs/design_docs/concepts/post-asap-ir.md index 6c9aa1461..207ad227e 100644 --- a/docs/design_docs/concepts/post-asap-ir.md +++ b/docs/design_docs/concepts/post-asap-ir.md @@ -1,22 +1,53 @@ # Post-ASAP IR The goal of the post-ASAP IR is to represent operations using ASAP primitives -such as sketches, exact summaries, samples and wavelets. Post-ASAP IR also -retains exact Pre-ASAP sub-DAGs and supports operations over summary readouts, -since only some query operations can be satisfied using summaries. - -The lists below cover every current variant of -[`SummaryExpr`](../../../crates/types/src/post_asap/expr.rs). A node's presence -in the IR does not imply that every summary family, cost model or downstream -runtime supports it. - -## ASAP-specific nodes operated over a summary structure, not raw data - -- `SummaryAgg`: produce summary state from input data using the selected family, - parameters, update input, reduction and grouping layout. -- `SummaryEstimate`: read the requested statistic from summary state and return - query values. Exact accumulators can expose results without a separate sketch - readout. +such as sketches, exact summaries, samples and wavelets, while retaining the +exact query operators that no summary replaces, and supporting operations over +summary evaluations. + +ASAPPlanner has one operator IR before and after ASAP optimization +([`crates/types/src/ir/`](../../../crates/types/src/ir/)). A post-ASAP plan is +the same `Rc` DAG a front end produced, in which some nodes now +carry `Operator::ASAP(ASAPOp)` instead of `Operator::NonASAP(NonASAPOp)`. There +is no wrapper around retained exact work: an unreplaced `Filter`, `Join` or +`Aggregate` is the same node it was before, and either category can consume +the other's output. The node structure, the `Schema`, scalar expressions and +the catalog of non-ASAP operators are described once in the +[Pre-ASAP IR reference](../../develop_docs/pre-asap-ir.md); this document covers +what optimization adds: the ASAP operators, the accuracy guarantee, execution +timing, and the exported DAG. + +A node's presence in the IR does not imply that every summary family, cost +model or downstream runtime supports it. + +## ASAP operators + +Every variant of [`ASAPOp`](../../../crates/types/src/ir/asap.rs) operates +over summary state rather than raw data. The summary family, kind/algorithm and +parameters are committed in the node; the state itself is typed by the +`FieldDataType` of the output field that carries it (`ExactAggregate`, +`Sketch`, `Sample`, `Wavelet`, `StatModel`). + +Implemented: + +- `SummaryAgg { child, family, input, reduction, grouping }`: produce summary + state from input rows using the selected family, parameters, update input, + reduction and grouping layout. Output: the grouping columns plus one `state` + field typed `family`; result kind `State`. +- `SummaryEstimate { summary_input, query }`: read the requested statistic + (`SketchStatistic`) from summary state and return query values in a row-shaped + schema. +- `FinalizeExactAccumulator { child }`: read an exact accumulator's state as + its finalized value — the maintenance-to-read boundary before query-time + operators consume it. +- `MaintainPopulation { child, population }`: maintain the full declared + population, including membership changes. +- `EvaluatePopulation { child, evaluation }`: read an aggregate or TopK prefix from a + maintained population. + +Reserved (migrated but unimplemented; schema derivation, timing and export +reject them with `UNIMPLEMENTED_ASAP_OP`): + - `SummaryMerge`: merge compatible summary states when the family supports merging. - `SummarySubtract`: subtract one summary state from another when supported by the selected representation. @@ -24,62 +55,114 @@ runtime supports it. deletion. - `SummaryJoin`: combine summary states for join estimation; this is distinct from joining ordinary rows. +- `Extension`: a deployment-defined operator. The earlier draft listed `SummaryCreate` and `SummaryInsert`. These are not -separate variants in the current IR. `SummaryAgg` describes the state-producing -computation and its update input. The -[summary-maintenance lifecycle](../proposals/asap-aware-mapping/workload-demand-and-summary-lifecycle.md) -separately describes when state is created, retained, shared, updated and retired. -Physical binding and runtime execution implement the actual build and update -operations. This is not a one-to-one rename of the old nodes, and not every -summary family supports incremental maintenance. - -## Exact work and composition nodes - -- `KeepPreAsap`: retain an exact Pre-ASAP sub-DAG when it is not rewritten. -- `BinaryOp`: combine independently planned operands with the specified binary - semantics and execution timing. -- `ValueOperation`: apply aggregate, exact-function, population, projection, - filter, sort, limit or extension semantics with explicit execution timing. -- `RelationalJoin`: join row-producing children using the specified join kind - and predicate. -- Candidate pruning uses `RelationalJoin` with `JoinKind::Semi` and an explicit +separate variants. `SummaryAgg` describes the state-producing +computation and its update input. Stage 2 materialization (#509) will decide +whether and when that state is maintained. Physical binding and runtime +execution implement the actual build and update operations. Not every summary family supports incremental maintenance. + +## Exact work and composition + +Exact work is represented by the ordinary operators, unchanged: + +- A sub-DAG the planner does not rewrite keeps its `NonASAPOp` nodes. Plan + assembly marks such a sub-DAG with an exact `ResultGuarantee` + (`asap_aware_mapping::replacement::retain_exact`); a sub-DAG with no ASAP + operator and no guarantee is a logical rewrite candidate that has not been + assessed yet (`is_logical_rewrite`). +- `BinaryOp` combines independently planned operands. Summary planning may set + its typed division guards (`checked_finite_division`, + `checked_relative_division`); the operator's timing comes from the + materialization assignment, not from the operator. +- Aggregate, projection, filter, sort and limit over a evaluation are the ordinary + `Aggregate`, `Project`, `Filter`, `Sort` and `Limit` operators reading an ASAP + node. Exact-accumulator state may pass through the projection-like + operators unchanged; a value consumer needs a `FinalizeExactAccumulator` + boundary first. +- Candidate pruning uses `Join` with `JoinKind::Semi` and an explicit equality predicate on key columns. The left input supplies authoritative - values; the right input supplies keys. Grouped Sort followed by grouped Limit ranks - and selects the joined rows. Completeness evidence belongs to pruning, not ranking. + values; the right input supplies keys. Grouped `Sort` followed by grouped + `Limit` (both with the same `partition_by`) ranks and selects the joined + rows. Completeness evidence belongs to pruning, not ranking. -A `SummaryNode` carries its expression, schema and optional result guarantee. +Every `OperatorNode` carries its schema and an optional `ResultGuarantee`. State and query values have different contracts. Exact operations over -approximate readouts still require composed accuracy guarantees. See the +approximate evaluations still require composed accuracy guarantees. See the [accuracy implementation companion](../../develop_docs/end-to-end-accuracy-guarantees.md) and [physical-plan integration](../architecture/physical-plan-integration.md) for the corresponding correctness and realization requirements. -## In-memory and exported DAG forms - -The Pre-ASAP DAG and the Post-ASAP DAG are both logical: they describe what is -computed, not which physical operators execute it. The Post-ASAP DAG has two -forms of the same content. Planning builds and shares `SummaryNode` DAGs. -`compile_post_asap_dag` converts a selected DAG into a -[`PostAsapDAG`](../../../crates/types/src/post_asap/post_asap_dag.rs) with -stable node IDs and typed edges; `PostAsapDAGDocument` is its versioned wire -envelope. Physical compilation consumes `PostAsapDAG` and produces a separate -physical DAG. - -## Execution phase +## Execution timing An operator defines what computation happens. The plan decides when it happens: **ingestion time** or **query time**. Operator identity must not imply one of these phases. Backend capability restrictions are implementation gaps, not definitions of the operator. -Every post-ASAP operator payload supports both phase assignments. Phase is -stored on the `PostAsapDAG` node, independently of its operator payload. -`PostAsapDAG::with_execution_phases` assigns a phase to every node and updates -its edges. Ingestion work cannot depend on a future query result. Default -semantic realization still proposes an initial layout; it does not restrict -which phase an operator may use. Deployments must separately check that -they have an implementation and a valid data source for the chosen placement. +The logical DAG carries no timing: `OperatorNode::timing` is `None` on every +front-end node and every candidate, and `map_children` clears it. Summary +materialization chooses a timing per summary state and records it in a +[`MaterializationAssignment`](../../../crates/types/src/ir/timing.rs) (ingestion-time +maintenance or query-time computation per `SummaryAgg`). The default is +`all_query_time()`; until Stage 2 materialization (#509) decides otherwise, the +planner times every `SummaryAgg` at query time. +`apply_materialization_timings(root, &assignment, &mut TimingMemo)` then writes a +timing into every node, top-down: + +- a node of fixed kind takes its kind's timing — `SummaryEstimate` and + `EvaluatePopulation` run at query time, `MaintainPopulation` at ingestion time; +- a `SummaryAgg` takes the assignment's timing, unless something below it can + only exist at query time (a evaluation); +- every other node runs when its consumer runs: everything that feeds a + maintained state runs at ingestion time, everything above a evaluation at + query time. + +The pass then validates every edge (rows or exact-accumulator state into a +`SummaryAgg`, state into a evaluation, an ingestion-time `MaintainPopulation` under +a `EvaluatePopulation`, no ingestion work reading a query-time value) and rejects a +node reached from two consumers that need different timings; +`split_shared_by_phase` copies such a sub-DAG for one side before the +assignment is applied. `validate_maintained` and `planned_data_state` answer the +same questions for a candidate at planning time, assuming every summary is +maintained at ingestion time, without keeping anything. + +## Exported DAG + +The pre-ASAP DAG and the post-ASAP DAG are both logical: they describe what is +computed, not which physical operators execute it. Planning builds and shares +`OperatorNode` trees; +[`asap_types::ir::export::compile_post_asap_dag`](../../../crates/types/src/ir/export.rs) +converts a selected, timed tree into a `PostAsapDAG` with stable node IDs and +typed edges, and `PostAsapDAGDocument` is its versioned wire envelope +(`schema_version` = `POST_ASAP_DAG_WIRE_VERSION`, currently 6). Physical +compilation consumes `PostAsapDAG` and produces a separate physical DAG. + +Wire version 7 emits **one node per operator** — relational operators +included — with children as edges and no embedded sub-DAGs: + +- A non-ASAP node is a `Relational { operator: NonASAPOpKind }` payload: + the operator's own fields with scalar expressions mirrored as + `WireScalarExpr`, children removed. An ASAP node's payload is its variant + (`SummaryAgg`, `SummaryEstimate`, `FinalizeExactAccumulator`, + `MaintainPopulation`, `EvaluatePopulation`, …). +- Edges carry a role: `Input`, `Left`/`Right` for the two sides of a `Join`, + `SetOp`, `BinaryOp`, `SummarySubtract` or `SummaryJoin`, and `ScalarRef` + when the consumer reads the producer from inside one of its scalar + expressions (`scalar(v)`). Every edge records the intermediate schema, the + producer's data state and grouping/window compatibility. +- Each node records `output_state` (timing plus `Raw` or `SummaryState`), + `output_schema` and `guarantee`. Export reads the timing written by + `apply_materialization_timings` and rejects an untimed node + (`ExecutionDataStateError::UntimedNode`); it does not re-run data-state + validation. + +Phase is stored on the `PostAsapDAG` node, independently of its payload. +`PostAsapDAG::with_execution_phases` reassigns a phase to every node and +updates its edges; ingestion work cannot depend on a future query result. +Deployments must separately check that they have an implementation and a +valid data source for the chosen placement. ## Weighted grouped TopK @@ -90,19 +173,19 @@ the update weight is the series rate. Summing updates for one item implements the logical grouped sum without first constructing all exact grouped sums. The DAG is per-series rate → finalized values → partitioned summary construction -→ typed candidate/score readout → output projection → grouped Sort → grouped +→ typed candidate/score evaluation → output projection → grouped Sort → grouped Limit. The output count is two per job. The candidate capacity is a separate parameter, provisionally `max(k, ceil(1 / epsilon))`; this sizing choice is not a membership theorem. Missing evidence retains a logical candidate with symbolic unknown guarantees; default selection does not certify or choose it. -The row readout restores job and service identities and returns estimated sums. +The row evaluation restores job and service identities and returns estimated sums. There is no mandatory exact scoring branch or candidate semi-join in this path. The old raw counter-delta update expression is removed rather than retained as a compatibility option: counter increments are not complete windowed rate results. -The direct readout represents both score error and membership. A source provider +The direct evaluation represents both score error and membership. A source provider supplies an enforced upper bound on distinct partition/item identities for the -complete readout. Planner uses this bound to size confidence and union-bound +complete evaluation. Planner uses this bound to size confidence and union-bound score errors over adaptively selected items. Membership evidence is evaluated for the query's output count, not the candidate capacity. Score and membership failure probabilities are combined, and the score guarantee remains in the @@ -110,8 +193,8 @@ membership guarantee's child provenance. An exact request does not accept this approximate output path merely because its selected identities are certified. Deployment chooses ingestion time or query time for these operators. The -semantic constructor proposes a layout; `with_execution_phases` assigns the -placement. Either deployment must give each evaluation a complete +materialization assignment writes the placement; `with_execution_phases` can +reassign it on the exported DAG. Either deployment must give each evaluation a complete rate window and an isolated summary state, or maintain an equivalent replacement strategy. Appending successive rate snapshots to one cumulative state is invalid. An ingestion execution can compute a window before the query and store its state; diff --git a/docs/design_docs/concepts/pre-asap-ir.md b/docs/design_docs/concepts/pre-asap-ir.md index 735f522f3..0b12766b1 100644 --- a/docs/design_docs/concepts/pre-asap-ir.md +++ b/docs/design_docs/concepts/pre-asap-ir.md @@ -12,16 +12,18 @@ Only semantics that affect correctness, summary applicability, or cost become fi ### Time -- TimeRange — a PromQL range-vector lookback such as [5m]. +- TimeRange — PromQL sample selection: an instant selector's lookback, or a range selector such as [5m]. - TimeShift — moves when a selector is evaluated (offset or @). - PromqlSubquery — re-evaluates an instant-vector expression over a range. ### Relational - Scan — identifies a logical data source. +- Values — literal rows; one empty row is the input of a `SELECT` without `FROM`. +- ScalarBridge — a scalar expression at an operator position: a bare scalar query, or the scalar operand of ` op `. - Filter — restricts rows using a predicate. - Project — selects or derives output columns. -- BinaryOp — composes two inputs with arithmetic, comparison, or boolean logic. +- BinaryOp — composes two inputs with arithmetic, comparison, or boolean logic. A PromQL `bool` comparison returns 0/1 instead of filtering. - Sort — orders rows without expressing a heavy-hitter intent. - Limit — caps a row count, optionally after an offset. - Dedup — removes duplicate rows. @@ -31,10 +33,7 @@ Only semantics that affect correctness, summary applicability, or cost become fi ### PromQL-specific -- PromqlScalarBridge — holds a scalar sub-expression at an operator-DAG position. -- EvalTimestamp — provides the evaluation timestamp as a scalar. -- PromqlVectorFromScalar — promotes a scalar to a label-less instant vector. -- PromqlScalarFromVector — collapses a single-series vector to a scalar. +- PromqlVectorFromScalar — promotes a scalar to a label-less instant vector. Its inverse, PromQL `scalar(v)`, is a scalar expression that reads `v`. - PromqlRelabel — rewrites labels on each series. - PromqlInfoEnrich — enriches labels from an info metric. - PromqlSeriesSample — selects whole series without reducing them. diff --git a/docs/design_docs/physical-planning-and-deployment.md b/docs/design_docs/physical-planning-and-deployment.md index 274e4974c..6f6d7f207 100644 --- a/docs/design_docs/physical-planning-and-deployment.md +++ b/docs/design_docs/physical-planning-and-deployment.md @@ -7,11 +7,11 @@ A Post-ASAP computation is progressively realized through four layers: ```mermaid flowchart LR L["Logical Post-ASAP DAG
What computation?"] - M["Summary Maintenance Lifecycle
How is state maintained?"] + M["Materialization
How is state maintained?"] P["Physical DAG(s)
How is it executed?"] D["Deployment Plan / DAG
How is it instantiated?"] - L -->|"Summary Maintenance
Candidate Generation"| M + L -->|"Stage 2
Materialization (#509)"| M M -->|"Physical Plan
Compiler"| P P -->|"Deployment Plan
Compiler"| D ``` @@ -19,47 +19,44 @@ flowchart LR | Layer | Defines | | --- | --- | | **Logical Post-ASAP DAG** | Computation semantics | -| **Summary Maintenance Lifecycle** | Build, retention, reuse, and window strategy | +| **Materialization** | Build, retention, reuse, and window strategy | | **Physical DAG(s)** | Supported physical candidates, executable operators and typed input boundaries | | **Deployment Plan / DAG** | Selected candidate, concrete data/state bindings and operational lifecycle | ASAPPlanner owns the first three layers and the shared physical operator implementation library. Deployment systems such as ASAPQuery and asap-fusion -own deployment compilation and operation. The lifecycle is a planning contract +own deployment compilation and operation. Materialization is a planning contract associated with the logical DAG, not a separate computation IR. -The Logical Post-ASAP DAG is preceded by the Pre-ASAP DAG (`QueryExpr`), the +> **Status:** Stage 2 materialization (#509) will decide per sub-DAG whether to +> materialize and whether at ingestion or query time. It is not implemented yet; +> until then the planner times every summary at query time. Sections 2 and 3 +> describe the intended contract. + +The Logical Post-ASAP DAG is preceded by the Pre-ASAP DAG, the language-independent query semantics before summary selection. Both are -logical. Planning builds Post-ASAP `SummaryNode` DAGs; `compile_post_asap_dag` +logical `OperatorNode` DAGs; `compile_post_asap_dag` exports the selected DAG as a `PostAsapDAG`, which is the Physical Plan Compiler's input. Its per-node execution phase (ingestion or query time) is -decided by the selected summary maintenance lifecycle, as the layer contract -below states. +decided by a `MaterializationAssignment`, as the layer contract below states. ### Layer contract 1. **Logical Post-ASAP** (`CandidateLogicalASAPDAGs`) decides what to compute: summary families, readouts and sharing. It does not decide placement; timing that a realization strategy writes while building a candidate is provisional. -2. **Summary maintenance lifecycle** (Planner) lists the lifecycle choices for - each unique retained state: every summary state (`SummaryAgg`) and every - maintained population that does not feed a summary state. - A chosen assignment determines every node's - `ExecutionTiming`, plus window framework and retention. - `SummaryMaintenanceLifecyclePlan::execution_timed_dag` applies it: a retained - (non-`Ephemeral`) state and all of its inputs run at ingestion time; - readouts, other consumers, and `Ephemeral` states not consumed by retained - state run at query time. A population that feeds a summary state is one of - that state's inputs and follows its timing. +2. **Materialization** (Stage 2, #509) chooses ingestion or query time for each + summary state (`SummaryAgg`) and records it in a `MaterializationAssignment`. + `apply_materialization_timings` writes every node's `ExecutionTiming`: an + ingestion-time state and all of its inputs run at ingestion time; readouts, + other consumers, and query-time states run at query time. + `MaintainPopulation` always runs at ingestion time. The default assignment + is all query time, which `PlanOutput::execution_timed_dag` applies. 3. **Physical compile** (Planner) reads timing: ingestion-time nodes form the precompute DAG and the rest form the query DAG, joined by typed outputs. It does not see raw ingestion, panes, storage or stored-state readout. -4. **Backend** chooses the lifecycle assignment with its own `CostModel`: - precompute CPU (`maintenance_cost_per_update`), sketch/summary store cost - (`retention_cost_rate`), query reads (`summary_read_cost`) and per-query - builds (`build_cost`, for `Ephemeral`), counting shared state once. - `Ephemeral` requires the deployment to supply the state's raw input as a - query-time source. +4. **Backend** binds and executes the timed DAG. A query-time summary requires + the deployment to supply the state's raw input as a query-time source. ### Candidate generation and deployment selection @@ -69,7 +66,7 @@ because a deployment-independent cost estimate prefers another candidate. Logical candidates are an internal search stage, not the deployment handoff. ```text -Query semantics + accuracy and lifecycle requirements +Query semantics + accuracy and freshness requirements ↓ Planner Supported Physical DAG candidates + typed inputs/outputs + requirements ↓ backend @@ -93,9 +90,9 @@ and a feasible candidate that loses on cost. Absence is not a cost comparison. For `sum by(job)(rate(m[1m]))`, Rate remains per series before grouped Sum. `CandidateLogicalASAPDAGs` offers one such candidate, with a per-series Rate state and a grouped -Sum state. Its lifecycle assignment places it: a retained Sum state finalizes -Rate and builds Sum within a bounded precompute run; an `Ephemeral` Sum over a -retained Rate state leaves the Rate readout and Sum in the query DAG. Storing a +Sum state. Its materialization assignment places it: an ingestion-time Sum state +finalizes Rate and builds Sum within a bounded precompute run; a query-time Sum +over an ingestion-time Rate state leaves the Rate readout and Sum in the query DAG. Storing a value requires its exact evaluation window, revision, readiness and serving cadence to match the query contract. @@ -109,7 +106,7 @@ Planner's candidate space decides what to compute, not placement. For an instant-vector PromQL TopK, Planner resolves rows that carry the complete series identity and lists the current-series heap realizations per root with the other candidates, unranked. Precompute or query-time placement of Rate and grouped Sum -is not a separate Planner candidate: the summary maintenance lifecycle assigns +is not a separate Planner candidate: the materialization assignment sets each node's timing, and the physical compiler reads it. This is the target ownership contract. A backend path that still reconstructs @@ -182,10 +179,10 @@ KLLMerge p50 p99 │ - │ Summary Maintenance Candidate Generation + │ Stage 2 Materialization (#509) ▼ -2. Summary Maintenance Lifecycle +2. Materialization KLLBuild(k=200) strategy = continuously maintain @@ -239,7 +236,7 @@ Each stage adds a different class of decision while preserving the preceding contracts. Here, continuous maintenance means recurring production of pane state; the bounded build DAG does not itself implement an unbounded streaming window. -## 2. Logical Post-ASAP DAG → Summary Maintenance Lifecycle +## 2. Logical Post-ASAP DAG → Materialization The **Logical Post-ASAP DAG** defines computation semantics: @@ -257,33 +254,13 @@ Quantile(.5) Quantile(.99) It establishes that KLL with `k=200` is used and that the merge is shared by the two readouts. It does not determine when KLL states are built or retained. -**Summary Maintenance Candidate Generation** enumerates legal lifecycle choices -using workload demand, window/freshness requirements and supported physical -implementations. Backend selection uses runtime feasibility and cost after -physical compilation. The following example follows one candidate. - -Candidate generation and selection are separate steps. For every unique retained -state, enumeration reports each lifecycle (ephemeral, prepared, shared, -continuously maintained) as legal, with a Planner cost or explicitly unknown -cost, or as rejected with a reason. Planner does not remove a legal alternative -because its own estimate prefers another. A deployment prices the legal -alternatives over the whole workload, counting shared state once, and binds one -lifecycle per state. Binding checks that the choice is legal and that states on -one maintenance path share an evaluation schedule. An alternative whose cost is -unknown can be bound only when the deployment's cost model is authoritative for -complete-candidate cost; unknown cost is never treated as zero. It then yields the same -lifecycle guarantee and window framework the physical compiler consumes when -Planner selects. Planner's own cheapest-alternative selection remains available -for callers without deployment pricing. The window framework is decided for the -complete combination, not for one alternative in isolation. - -A maintained population (for example, the current series of `topk by(job)(1, m)`) -is retained state like a summary. Retaining it maintains the latest sample per -series at ingestion and leaves only the readout at query time. Choosing -`Ephemeral` rebuilds that snapshot from raw samples for each query, so the -deployment must supply the raw source at query time. The caller's `CostModel` -prices both through the same lifecycle hooks; a model without population -evidence leaves them unknown, and they are not selected. +**Stage 2 Materialization (#509)** will choose when states are built and how +long they are retained, using workload demand, window/freshness requirements +and supported physical implementations. Backend selection uses runtime +feasibility and cost after physical compilation. Retained state includes +maintained populations (for example, the current series of +`topk by(job)(1, m)`), which keep the latest sample per series at ingestion and +leave only the readout at query time. For the running example, assume it selects: @@ -303,24 +280,24 @@ reuse: one merged state serves p50 and p99 ``` -This produces the **Summary Maintenance Lifecycle**. +This is the running example's **Materialization**. -The lifecycle specifies how the selected logical summary should be maintained, +It specifies how the selected logical summary should be maintained, but not its concrete operator implementation or storage location. Physical feasibility may feed back into selection. For example, if the required -pane-based maintenance cannot be implemented, this lifecycle candidate cannot be +pane-based maintenance cannot be implemented, this materialization cannot be selected. One-minute panes alone also cannot cover an arbitrarily phased query window; that requires supported boundary handling or a different candidate. -## 3. Summary Maintenance Lifecycle → Physical DAG +## 3. Materialization → Physical DAG The **Physical Plan Compiler** consumes both computation semantics and maintenance requirements: ```text Logical Post-ASAP DAG (PostAsapDAG) -+ Summary Maintenance Lifecycle ++ Materialization + physical capabilities ↓ Physical Plan Compiler @@ -328,14 +305,13 @@ Physical Plan Compiler Physical DAG(s) ``` -For the running example, the lifecycle creates two execution boundaries. +For the running example, materialization creates two execution boundaries. These two halves are named as `PhysicalASAPDAG` names them, `precompute` -and `query`. *Maintenance* stays the lifecycle's word (section 2): it covers +and `query`. *Maintenance* stays materialization's word (section 2): it covers how state is built, retained, reused and scheduled. A precompute DAG is the -physical object that a maintenance lifecycle compiles to, so reusing -*maintenance* for it collapses two layers that the crates keep apart: -`asap-aware-mapping::summary_maintenance_*` owns the lifecycle, and +physical object that maintenance compiles to, so reusing *maintenance* for it +collapses two layers: Stage 2 materialization (#509) owns maintenance, and `asap-physical-operators::physical_planner` owns the DAGs. ### Precompute Physical DAG @@ -397,17 +373,17 @@ DAG. If the required behavior cannot be realized, physical compilation fails. Materialization frontiers are Planner decisions. A candidate records both the precompute Physical DAG and the query Physical DAG, with typed outputs connecting them. The deployment compiler binds those outputs; it does not move operators. -Lifecycle timing gives the frontier: ingestion-time nodes read by query-time -nodes. For `sum by(job)(rate(m[1m]))`, the two lifecycle choices of the single +Execution timing gives the frontier: ingestion-time nodes read by query-time +nodes. For `sum by(job)(rate(m[1m]))`, two materialization choices for the single logical candidate give: ```text -Candidate A (Rate state retained, Sum Ephemeral): +Candidate A (Rate state at ingestion time, Sum at query time): precompute: counter samples → per-series Rate state materialized output: per-series Rate states for window/evaluation/revision query: stored Rate states → Rate readout → grouped Sum → result -Candidate B (Rate and Sum states retained): +Candidate B (Rate and Sum states at ingestion time): precompute: counter samples → per-series Rate → grouped Sum state materialized output: grouped Sum states for window/evaluation/revision query: stored grouped Sum states → Sum readout → result @@ -430,9 +406,9 @@ feasibility is rejected before pricing. The optimizer supplies candidate frontiers and cost evidence, including updates, retention, recurrence and sharing. `enumerate_frontiers` constructs bounded, reachable antichain frontiers above explicit input boundaries, including query-only and fully precomputed results. It fails explicitly when the candidate budget is exceeded. Maintenance selection must still reject frontiers that violate window, freshness, or reuse requirements; deployment feasibility is checked before pricing. -The lifecycle layer decides timing; physical compilation reads it. Lowering a +Materialization decides timing; physical compilation reads it. Lowering a node does not depend on the frontier, so each query DAG is lowered once and -different lifecycle assignments are different cuts of that lowering. +different materialization assignments are different cuts of that lowering. `compile(dag, inputs, roots)` yields the complete `CompiledPhysicalDAG`. `frontier_from_timing(&timed_dag)` reads an assignment's timed DAG (from `execution_timed_dag`) and returns its frontier: ingestion-time nodes read by @@ -448,7 +424,7 @@ pane candidates remain a separate lowering. Physical compilation opens no readers. Bounded precompute outputs become typed query inputs. Their source, filters, grouping, build window, evaluation time, readiness and -revision contracts must accompany the selected lifecycle and be checked during +revision contracts must accompany the selected materialization and be checked during deployment binding. Type compatibility alone does not establish reuse legality. The Planner integration test executes both candidates through the shared runtime @@ -463,7 +439,7 @@ The **Deployment Plan Compiler** binds the Physical DAGs to the concrete deploym ```text Physical DAGs -+ Summary Maintenance Lifecycle ++ Materialization + deployment catalog/state + sources/materializations + operational policy @@ -507,7 +483,7 @@ InputSlot[5 panes] ``` The Deployment Plan Compiler establishes bindings and checks that their contracts -satisfy the physical inputs and selected lifecycle, including KLL parameters, +satisfy the physical inputs and selected materialization, including KLL parameters, source, filters, grouping, window coverage and revision scope. The deployment engine resolves request-specific states and checks their actual coverage, revisions and readiness at execution time. A compiled plan cannot establish future readiness. @@ -523,8 +499,8 @@ The complete example makes the ownership boundary explicit: | Stage | KLL example decision | | --- | --- | | **Logical Post-ASAP DAG** | Use `KLL(k=200)` with shared merge for p50/p99 | -| **Summary Maintenance Candidate Generation** | Maintain 1-minute panes and reuse them for aligned five-minute queries | -| **Summary Maintenance Lifecycle** | Record pane/window/freshness/reuse requirements and each node's execution timing | +| **Stage 2 Materialization (#509)** | Maintain 1-minute panes and reuse them for aligned five-minute queries | +| **Materialization** | Record pane/window/freshness/reuse requirements and each node's execution timing | | **Physical Plan Compiler** | Lower to native KLL build, merge, and readout operators | | **Physical DAG** | Define precompute and query DAGs with typed input/output boundaries | | **Deployment Plan Compiler** | Bind raw input and KLL state slots to concrete sources/materializations | @@ -534,7 +510,7 @@ The complete example makes the ownership boundary explicit: Logical: "Use KLL for p50/p99." -Lifecycle: +Materialization: "Maintain reusable 1-minute KLL panes." Physical: @@ -564,17 +540,11 @@ snapshots as separate inputs. ## 6. Executable acceptance coverage -The tests cover optimizer-selected lifecycle execution alongside independent +The tests cover physical candidate execution alongside independent operator/runtime fixtures: | Test | Contract exercised | | --- | --- | -| `summary_maintenance_lifecycle_e2e::continuous_lifecycle_compiles_and_executes_spatial_kll` | PromQL workload → selected continuous lifecycle → logical DAG → compiled precompute/query candidate → results in independent revisions; an unbounded candidate fails before pricing, and a bounded request candidate summarizes the same input samples | -| `summary_maintenance_lifecycle_e2e::chosen_lifecycle_timing_decides_precompute_contents` | PromQL workload → enumerated lifecycles → explicit choice → timed DAG → compiled candidate; ContinuouslyMaintained stores the state in precompute, Ephemeral leaves precompute empty and reads the raw source at query time; both return the same p99 | -| `summary_maintenance_lifecycle_e2e::lifecycle_timing_cuts_one_compilation` | KLL quantile and grouped Rate→Sum: one compilation cut by the ContinuouslyMaintained and Ephemeral timed DAGs equals `compile_candidate` for each; the frontier is the retained state or empty | - -| `summary_maintenance_lifecycle_e2e::chosen_population_lifecycle_decides_precompute_contents` | PromQL `topk by(job)` over a maintained population → explicit choice → timed DAG → compiled candidate; ContinuouslyMaintained stores the population in precompute, Ephemeral rebuilds it from raw samples at query time; both rank alike | -| `summary_maintenance_lifecycle_e2e::planner_lifecycle_selection_reproduces_strategy_timing` | For PromQL summary fixtures, the timed DAG from Planner's retained selection equals the DAG realization strategies produce | | `kll_pane_execution::five_panes_roundtrip_and_shared_merge_runs_once` | Explicit one-minute precompute DAGs → real MessagePack state bytes → five required query inputs → shared native merge → p50/p99; counts every sample once, checks adjacent aligned windows and instruments one merge start per run | | `kll_pane_execution::restored_panes_reject_corruption_parameters_schema_and_missing_binding` | Corrupt bytes, parameter relabelling, incompatible schemas and absent bindings fail explicitly | | `precompute_candidates::grouped_rate_can_be_materialized_before_or_after_grouped_sum` | Cost changes select different legal precompute frontiers; both selected candidates execute with the same reset-sensitive result; uncompilable candidates are not priced | diff --git a/docs/design_docs/proposals/asap-aware-mapping/README.md b/docs/design_docs/proposals/asap-aware-mapping/README.md index a58d3b5dd..814d50134 100644 --- a/docs/design_docs/proposals/asap-aware-mapping/README.md +++ b/docs/design_docs/proposals/asap-aware-mapping/README.md @@ -9,4 +9,3 @@ extensions. Each status note identifies the implemented scope and remaining work - [Shared maintained populations](maintained-populations.md) - [Optimization dimensions](optimizations.md) - [Summary properties](summary-properties.md) -- [Workload demand and summary lifecycle](workload-demand-and-summary-lifecycle.md) diff --git a/docs/design_docs/proposals/asap-aware-mapping/analytical-resource-cost.md b/docs/design_docs/proposals/asap-aware-mapping/analytical-resource-cost.md index 520501731..6e270159e 100644 --- a/docs/design_docs/proposals/asap-aware-mapping/analytical-resource-cost.md +++ b/docs/design_docs/proposals/asap-aware-mapping/analytical-resource-cost.md @@ -2,7 +2,7 @@ > Status: implemented model with explicit support limits. The > [analytical estimator](../../../../crates/asap-aware-mapping/src/analytical_cost.rs) -> and physical/streaming adapters implement supported evidenced comparisons. +> and physical-plan adapter implement supported evidenced comparisons. > Unsupported operators, arrival modes and missing evidence remain unavailable; > proposed extensions are not implied by the implemented formulas. @@ -17,23 +17,19 @@ plans. These are separate concerns: evidence to estimate CPU work, peak memory, and source/disk I/O. The physical-resource estimator itself is independent of the arrival mode. -Two planner adapters currently lower work into it. `PhysicalPlanCostModel` -compares complete at-rest plans. `SummaryMaintenanceCostModel` resolves -`DataArrival::ContinuouslyIngesting` over a finite horizon, including -bootstrap, arriving updates, retained state, and query readout. Evidence from -one arrival mode must not be reused for the other. `Mixed` and `Unknown` -remain unavailable until their distinct data regions are modeled. - -Both entry points replace dimensionless plan-node counts with estimates +One planner adapter currently lowers work into it: `PhysicalPlanCostModel` +compares complete at-rest plans. Continuously-ingesting, `Mixed` and `Unknown` +comparisons are unavailable; costing summary maintenance over arriving data +belongs to Stage 2 materialization (#509). Evidence from one arrival mode must +not be reused for another. + +The adapter replaces dimensionless plan-node counts with estimates derived from operator complexity, cardinality, row width, and concrete summary parameters. The estimates are predictions; they are not measurements reported by a physical executor. The model does not decide semantic legality. Ordinary summary guarantees are -composed before costing. A window framework that itself introduces error must, -however, carry a typed composed guarantee in the same complete evidence bundle; -the streaming adapter checks that guarantee against every bound workload -accuracy target before the candidate can be ranked. Missing evidence produces +composed before costing. Missing evidence produces an unavailable estimate, never an assumed zero or a structural-cost fallback. The implementation keeps five layers distinct: @@ -64,21 +60,12 @@ physical_operator_statistics.rs ──────┤ physical evidence contract ▼ analytical_cost.rs ─────────── operator formulas and CPU/memory/I/O composition │ - ├──────────────► physical_plan_cost_model.rs - │ at-rest raw/rewrite/summary comparison adapter - │ - └──────────────► summary_maintenance_cost/ - evidence.rs authoritative summary evidence - estimator.rs complete maintenance-DAG resources - window.rs window assignment and accuracy - model.rs lifecycle/alternative ranking adapter + └──────────────► physical_plan_cost_model.rs + at-rest raw/rewrite/summary comparison adapter ``` -Raw query plans and incrementally maintained summary plans share -`EvidenceBackedPhysicalDAG`; there is no streaming-only duplicate of the -physical DAG or operator-statistics contract. Summary-maintenance modules add -only the evidence and scheduling semantics that do not exist for an ordinary -query plan. +Raw query plans and summary plans share `EvidenceBackedPhysicalDAG`; there is +no separate physical DAG or operator-statistics contract for summaries. An estimate has physical dimensions: @@ -236,14 +223,14 @@ normalized workload, lowered query IR, and freshness-aware statistics: `DataWorkload` does define whether input is streaming: its `arrival` field is `AtRest`, `ContinuouslyIngesting`, `Mixed`, or `Unknown`, and a continuous arrival rate comes from fresh `ingestion_rate` evidence. These facts describe -how source data arrives. They do not choose a lifecycle or a window framework: +how source data arrives. They do not choose materialization or a window framework: `Incremental` describes how a selected summary state is updated, while tumbling, sliding, and exponential histogram describe how that state is organized over time. Evidence is read through `Evidence::value_at(planning_time)`. Stale, future, or improperly time-bounded evidence remains unknown. Costing follows -the same freshness rule as accuracy and lifecycle planning. +the same freshness rule as accuracy checking. The current workload schema does not yet contain every physical statistic. The missing facts have explicit ownership: @@ -306,7 +293,7 @@ physical operators and matching statistics variants. Until then, a candidate containing such an unlowered operation is unavailable rather than partially costed. -## Workload horizon and lifecycle +## Workload horizon Every alternative must cover the same source data and query horizon. The `DataArrival::AtRest` physical-DAG comparison is build-once, read-many: @@ -327,9 +314,7 @@ incremental updates are a one-time snapshot build. The at-rest summary alternative scans the selected source snapshot once and retains state. Its raw alternative recomputes from that snapshot for every -query read. The continuously-ingesting entry point separately charges -bootstrap, updates, summary operations, retained state, and raw evaluations; -its lifecycle rules are defined below. +query read. ### Comparable source and workload scope @@ -365,11 +350,11 @@ coverage set must equal the scope source set: a Scan query with an empty scope, or a source-free query with a non-empty scope, fails closed. Empty snapshot identifiers, invalid recurrence, or a zero horizon also fail closed. -Every reachable physical `Scan` carries one exact `SourceCoverage` copied from +Every reachable physical `Scan` carries one exact `ScanSelection` copied from this scope. That coverage includes the existing `Source`, its provider-owned snapshot ID, and canonical ordinary predicates or info-metric matchers. A scan with no coverage, or coverage not present in `ComparisonScope.sources`, makes the plan unavailable. Other -operators cannot declare source coverage. This prevents a DAG over source B +operators cannot declare scan selection. This prevents a DAG over source B from being estimated under source A's comparison scope. ## General DAG costing @@ -554,7 +539,7 @@ counts, releases transient output after its last consumer, and keeps retained state live. Consequently a shared scan is charged once per execution and a fan-out's memory includes the outputs that really coexist. -Each estimate independently requires the semantic set of source coverages on +Each estimate independently requires the semantic set of scan selections on its reachable Scan nodes to equal `ComparisonScope.sources`. Multiple physical Scans may repeat one coverage, but no scope source may be omitted and no Scan may add another coverage. This invariant is enforced by the estimator itself, @@ -596,7 +581,7 @@ It consumes the existing query and physical-operator enums; it does not introduce a parallel logical operator vocabulary. For every occurrence, the lowerer sends a `PhysicalNodeRequest` containing the logical node, selected existing `PhysicalOperator`, occurrence and synthetic-role metadata, already-lowered -child physical IDs, and any source coverage to a +child physical IDs, and any scan selection to a `PhysicalNodeEvidenceProvider`. The provider atomically returns its own stable `physical_id`, the authoritative `OperatorStatistics`, and explicit `output_buffer_bytes`; logical edge bytes are never substituted for an @@ -604,14 +589,14 @@ allocation. Missing evidence makes the entire query unavailable. The returned `EvidenceBackedPhysicalDAG` snapshots this evidence so costing does not re-read a live catalog after lowering. -Each lowered Scan is bound to exactly one `SourceCoverage` in the comparison +Each lowered Scan is bound to exactly one `ScanSelection` in the comparison scope by the existing source and canonical predicate values. The bound value therefore also supplies the provider-owned snapshot ID. Zero matches fail as outside scope; multiple matching coverages fail as ambiguous rather than choosing an arbitrary snapshot. When a predicate-bearing logical Scan expands to Scan → Filter, the synthetic Scan has its own physical ID, statistics, and buffer evidence and carries that exact coverage; the Filter has separate -evidence and no source coverage. +evidence and no scan selection. `ComparisonScope.sources` is an order-independent set of semantic coverages; duplicates are invalid. After lowering, every reachable physical Scan must use a member of that set and every member must be used by at least one Scan. @@ -733,157 +718,14 @@ input. ## Summary operator formulas -### Incremental single-summary foundation - -For `DataArrival::ContinuouslyIngesting`, the incremental estimator accepts -one selected lifecycle and one unique logical `SummaryAgg`. This deliberately -narrow contract prevents one flat evidence record from being reused across -several summary nodes with different input cardinalities, algorithms, or state -sizes. Complete multi-node streaming alternatives require per-node physical -evidence. - -The canonical workload supplies fresh bootstrap cardinality, ingestion rate, -query recurrence, planning time, and a finite horizon. Physical evidence adds -logical/bootstrap bytes, physical bootstrap scan bytes, active and retained -window counts, the number of concrete summary-state instances per window, and -bytes per state instance. Names use `summary`, not `sketch`, because an exact -aggregate or another non-sketch state is equally valid. - -For bootstrap rows `B`, arrivals `U`, simultaneously updated windows `A`, -query evaluations `Q`, physical summary instances `P`, and state bytes `S`: - -```text -insert invocations = (B + U) × A -retained memory = (A + retained_windows) × P × S -``` - -Each input row is routed to its matching summary instance; it is not inserted -into every group. Merge, subtract, and readout work may operate over all `P` -instances. Delete work follows the same routed window updates rather than -multiplying every update by every possible group. - -An empty bootstrap is valid and has zero logical bytes and zero source reads. -A non-empty bootstrap requires positive logical and physical source bytes. -Active window count, summary-instance count, state width, horizon, and query -evaluation count must be positive; retained-window count may be zero for a new -stream. Required per-operation CPU evidence must be finite and positive. - -Lifecycle retention and the planning horizon are different quantities. A -short retained window may be maintained throughout a much longer planning -horizon, so the estimator does not require `retention >= horizon`. Lifecycle -legality and query time-coverage checks establish whether the retained window -can answer the query. - -### Comparing single-summary lifecycle alternatives - -For one logical `SummaryAgg`, the analytical lifecycle adapter converts the -same physical evidence into the existing lifecycle planner's five cost terms: - -| Lifecycle term | Resource basis | -|---|---| -| Initial build | Bootstrap rows routed to every bootstrap-active window, plus the bootstrap source read. | -| Maintenance per update | One arriving row routed to every currently active window. | -| Summary read | Readout of every physical summary instance needed by one query evaluation. | -| Retention rate | All active and retained state bytes calibrated over the finite comparison horizon. | -| Retirement | Zero only for releasing modeled memory; an actual delete, expiration, or rebuild requires explicit operation evidence. | - -The existing lifecycle model—not this adapter—enumerates `Ephemeral`, -`Prepared`, `Shared`, and `ContinuouslyMaintained`, checks workload and runtime -legality, and multiplies per-update and per-read terms by the normalized -workload rates. Missing any required term leaves that alternative unavailable. - -`Ephemeral` is a direct build, not incremental maintenance. For every query -evaluation, it rebuilds from the snapshot visible at that evaluation, charges -that evaluation's complete source read, and releases its state afterward. -Its state contributes to peak transient memory but not persistent retention. - -The raw side is supplied as a complete `ResourceEstimate` for one execution of -the raw physical DAG. The lifecycle planner applies the same recurrence and -horizon. This deliberately avoids reconstructing raw work with a special-case -`input_rows × cpu_per_row` formula that would omit joins, windows, sorts, or -other operators. - -Flat single-summary evidence is bound to the exact `SummaryNode` and raw -`QueryExpr` identities for which it was produced. It cannot be reused for a -structurally similar node or for multiple summary states. A complete -multi-summary `SummaryExpr` DAG requires per-node physical evidence and -physical-identity deduplication. - -### Complete bound streaming summary DAGs - -The multi-node streaming path accepts a complete, already-bound -`SummaryExpr` DAG. It does not guess physical implementations. The provider must -provide evidence for every reachable node: - -| Logical node | Required physical evidence | -|---|---| -| `KeepPreAsap` | One retained preprocessing operator with output edge, horizon CPU, workspace, and output buffer. | -| `SummaryAgg` | Input/output edges, insert CPU, concrete state count and width, bootstrap/update window fanout, and explicit source-read ownership. | -| `SummaryMerge` | Typed merge evidence with total CPU, workspace, output buffer, I/O, and execution multiplicity. | -| `SummarySubtract` | Typed subtract evidence with the same resource dimensions. | -| `SummaryDelete` | Typed delete evidence plus expiration/retraction rate, routing fanout, and the exact state owner. | -| `SummaryEstimate` | Typed readout evidence with total resource use per execution. | -| `SummaryJoin` | Ordered input/output edges and total physical join CPU, workspace, output buffer, I/O, and multiplicity. | - -The merge/subtract/delete/readout evidence is an enum structured by operation -kind. Delete-only rate and routing fields therefore cannot be attached to a -merge or readout. Join CPU is the total build, probe, match-production, and -output work of the selected algorithm; matched output pairs alone are not a -valid join cost. - -Every parent input edge must equal the corresponding child output edge. -Provider-owned `physical_id` values deduplicate a shared operator only when -its complete evidence and physical child identities also agree. The cost model -holds owning `Rc` references for bound target and summary roots, so pointer -keys cannot become stale and alias a later allocation. - -A `SummaryAgg` that reads storage declares `source_coverage_index = Some(i)`, -a non-empty bootstrap-read identity, and positive physical source bytes. An -aggregate over an already-materialized summary edge declares `None`, an empty -read identity, and zero source bytes. Its logical input rows and bytes remain -positive when the intermediate is non-empty. This prevents nested aggregates -from charging the original source scan repeatedly. - -For streaming raw recomputation, `planning_time_input_rows`, -`planning_time_input_bytes`, and `planning_time_source_scan_bytes` describe the -initial snapshot. Logical bytes per arriving row and physical source bytes per -arriving row are separate. The recurrence determines every evaluation offset; -the provider supplies one once-counted physical DAG whose statistics aggregate -those evolving evaluations over the complete horizon. Marking its nodes -`PerEvaluation` would multiply the already-aggregated evidence again and is -rejected. Validation follows only nodes reachable from the physical root. If -the raw algorithm intentionally reads the same semantic source more than once, -each reachable scan carries the same evolved source statistics and is charged -separately; equal source coverage does not deduplicate physical I/O. - -This raw-evolution contract currently supports exactly one distinct source -coverage. A multi-source streaming target is unavailable until per-source -arrival rates and widths are supplied. Target lineage includes ordinary -predicates and PromQL info selectors; extra, missing, or mismatched source -coverage makes both sides incomparable. - -Lifecycle enumeration considers only alternatives legal for the canonical -workload and runtime. A `Prepared` state must cover every scheduled evaluation -it serves. `Shared.retention` describes data/window coverage, not the planning -horizon, so a shorter retention value is not rejected merely because the -optimizer horizon is longer. Missing node evidence, zero required CPU, -unknown I/O, inconsistent edges, or an unsupported lifecycle combination -makes the complete candidate unavailable; partial per-state costs are never -used as a fallback. +Costing incremental maintenance of continuously-ingested summaries was removed +with the summary maintenance lifecycle; Stage 2 materialization (#509) will +define it. The formulas below give per-operation work and state size. ### Ranking complete physical implementations A logical summary candidate can be bound to more than one complete physical -implementation. Each alternative has a non-empty, provider-owned identity and -a complete `StreamingNodeEvidence` bundle. The planner evaluates every legal -lifecycle combination against every bound physical implementation over the -same `ComparisonScope`, excludes alternatives whose evidence is incomplete or -invalid, and returns both the least calibrated cost and its physical-plan -identity. Duplicate identities are rejected because they would make the -selection result ambiguous. If no explicit alternatives are registered, the -candidate's single canonical evidence bundle is used. - -Physical evidence is alternative-specific: window fanout, retained state, +implementation. Physical evidence is alternative-specific: window fanout, retained state, operation costs, and source reads must describe that implementation as a whole. The planner does not mix individual nodes from different alternatives. @@ -903,7 +745,7 @@ cpu_ops = bootstrap_rows × bootstrap_window_count × insert_ops(params) scan_bytes = source_read_bytes for the build ``` -Merge, subtract, and delete add their own invocation counts described above; +Merge, subtract, and delete add their own invocation counts; they are never folded into the simple formula implicitly. Concrete accuracy-sized parameters determine state and work: @@ -927,7 +769,7 @@ from logical group count alone. Summary merge, subtract, delete, and readout are separate physical operators. Their CPU and memory use the concrete summary state size and number of input states. A plan using one of these operations is unavailable until the -corresponding formula and required lifecycle evidence are present. +corresponding formula and required evidence are present. Summary construction uses physical-input realization rules before it emits a `SummaryAgg`. The default rule consumes the logical aggregate's immediate @@ -962,14 +804,14 @@ bound physical DAG for a `SummaryExpr` candidate. The deployment implements `PlannerPhysicalPlanProvider`: query-node evidence is consumed atomically by the generic query lowerer, while summary binding returns a complete `EvidenceBackedPhysicalDAG`, including embedded raw work, build/read operators, retained -state, execution multiplicity, and source coverage. The adapter calls +state, execution multiplicity, and scan selection. The adapter calls `estimate_physical_dag_comparison`; it never calls `DefaultCostModel` or a structural-node-count fallback for final cost. A candidate is exposed to global selection only when both complete DAGs are valid and its calibrated cost is strictly below the raw baseline. Missing or stale evidence, an unknown physical algorithm, invalid edges, incomplete -source coverage, or a candidate that is not cheaper yields `None`. When no +scan selection, or a candidate that is not cheaper yields `None`. When no candidate remains, `chosen = None` preserves the raw pre-ASAP target. Logical CSE share/recompute rewrites are not complete physical alternatives: @@ -988,9 +830,7 @@ mismatches and arithmetic overflow also fail closed. ### Downstream physical-planning boundary This cost model consumes resource evidence for a physical implementation, but -ASAPPlanner does not own or select that implementation. It does select the -abstract per-summary `SummaryWindowFramework` assignment by comparing complete -`StreamingWindowFrameworkCandidate` evidence bundles. Component ownership, +ASAPPlanner does not own or select that implementation. Component ownership, including the distinction between a window primitive and its concrete runtime implementation, is defined in [ASAPPlanner planner-runtime contract](../../architecture/planner-runtime-contract.md). @@ -1064,7 +904,7 @@ candidate. The intended end-to-end selection pipeline is: 1. enumerates semantically valid alternatives; -2. checks end-to-end accuracy and lifecycle legality; +2. checks end-to-end accuracy; 3. derives fresh workload and operator statistics; 4. sizes physical summary parameters; 5. estimates the complete candidate DAG; @@ -1075,31 +915,8 @@ listed above. `PhysicalPlanCostModel` executes this pipeline for every candidate supplied to `CandidateLogicalASAPDAGs::global_selection`. Logical rewrites are lowered recursively. Summary candidates participate only after the deployment has bound their complete `SummaryExpr` DAG; there is no optimistic generic -summary fallback. The streaming adapter connects raw recomputation and -primitive summary lifecycle costs to the existing global lifecycle-selection -hooks. -The lifecycle planner enumerates compatible lifecycle combinations for the -unique `SummaryAgg` deployments and invokes -`complete_summary_candidate_estimate` -for each combination before selecting the minimum. The hook receives explicit -node-to-guarantee bindings plus the horizon and expected reads. Each logical -occurrence is looked up by exact `Rc` identity, while every -evidence record also carries a provider-owned physical identity. Equal physical -identities deduplicate work and retained state only when their logical summary, -selected window framework, operator facts, edge statistics, lifecycle -guarantee, and physical child identities agree; -conflicts make the candidate unavailable. Thus heterogeneous states are costed -independently and genuinely shared deployments once. Merge, subtract, delete, -readout, and join participate in automatic -candidate ranking. Exhaustive whole-root scoring is capped at 4,096 lifecycle -combinations because an arbitrary whole-candidate hook cannot be soundly -pruned by primitive costs; a larger space is unavailable rather than consuming -exponential planner time. If the root needs unavailable operation evidence, the -hook returns unavailable. Global selection then excludes that summary and -materialization retains the raw expression. A missing raw estimate also forces -raw fallback, because no public selection/materialization path may publish an -uncompared summary. The planner never falls back to the partial `SummaryAgg` -sum. +summary fallback. Choosing between a maintained summary and raw recomputation +belongs to Stage 2 materialization (#509). Before applying the following arithmetic, callers validate exact equality of the raw and selected alternative's `ComparisonScope`, and use the same diff --git a/docs/design_docs/proposals/asap-aware-mapping/ddsketch-quantile-ratios.md b/docs/design_docs/proposals/asap-aware-mapping/ddsketch-quantile-ratios.md index f71dde2ea..8bb452783 100644 --- a/docs/design_docs/proposals/asap-aware-mapping/ddsketch-quantile-ratios.md +++ b/docs/design_docs/proposals/asap-aware-mapping/ddsketch-quantile-ratios.md @@ -14,7 +14,7 @@ The final guarantee records both input ranges and their contract identifiers. Th ## Candidate generation without evidence -The default `SketchAlgorithmStrategy` permits a direct DDSketch quantile-ratio +The default `ASAPStrategies` permits a direct DDSketch quantile-ratio candidate when domain evidence is absent, but leaves the root guarantee unset. This is useful for the v1 integration path; it does not turn missing evidence into evidence. Other approximate divisions still require their own composition diff --git a/docs/design_docs/proposals/asap-aware-mapping/maintained-populations.md b/docs/design_docs/proposals/asap-aware-mapping/maintained-populations.md index 005670db8..c2b05588e 100644 --- a/docs/design_docs/proposals/asap-aware-mapping/maintained-populations.md +++ b/docs/design_docs/proposals/asap-aware-mapping/maintained-populations.md @@ -70,7 +70,7 @@ columns and multi-measure aggregates need additional rules. ```text KeepPreAsap(input) - -> MaintainPopulation { input, max_k, quantiles } [lifecycle-timed] + -> MaintainPopulation { input, max_k, quantiles } [ingestion time] -> ReadPopulation { Quantile(q1) } [read] -> ReadPopulation { Quantile(q2) } [read] -> ReadPopulation { TopK(k1) } [read] @@ -116,8 +116,7 @@ because their source names or numeric values happen to agree. ## Validation, selection and execution responsibilities Planner validates the declared input, the query-time readout and readout -compatibility; the population's lifecycle decides whether it is maintained at -ingestion or rebuilt per query. Its intended guarantee is exact membership and exact readout; +compatibility; `MaintainPopulation` always runs at ingestion time. Its intended guarantee is exact membership and exact readout; a physical implementation still must preserve the language's numeric and empty-input semantics. In particular, SQL global COUNT over an empty population returns a row with zero, while PromQL COUNT over an empty vector returns an empty vector. diff --git a/docs/design_docs/proposals/asap-aware-mapping/workload-demand-and-summary-lifecycle.md b/docs/design_docs/proposals/asap-aware-mapping/workload-demand-and-summary-lifecycle.md deleted file mode 100644 index 483e04503..000000000 --- a/docs/design_docs/proposals/asap-aware-mapping/workload-demand-and-summary-lifecycle.md +++ /dev/null @@ -1,758 +0,0 @@ -# Design: Query Workloads, Data Workloads, and Summary Lifecycle Maintenance - -> Status: partially implemented design. Workload types and -> [lifecycle planning APIs](../../../../crates/asap-aware-mapping/src/summary_maintenance_lifecycle.rs) -> implement the bounded planning path described below. The current-support and -> future-work sections distinguish available behavior from broader search, -> forecast integration and runtime deployment work. - -## Audience and context - -This document is for ASAPPlanner designers, architects, researchers, and -developers working on workload-aware plan selection. It defines how the -planner should describe query workload, data workload, and the lifecycle of -summary state. It is a design contract, not a description of the current -public Rust API. - -The terminology follows the ProjectASAP -[glossary](https://github.com/ProjectASAP/internal-docs/blob/03e1c70f5af3ae9221471898541067eee7f86338/glossary.md). -That glossary is authoritative for the meanings of data workload, query -workload, ad-hoc and predictable queries, one-time and repeated queries, -real-time and longitudinal queries, output cardinality, and lookback window. -This document maps those concepts into planner responsibilities and records -where the current model is incomplete. - -This design is orthogonal to -[end-to-end accuracy guarantees](end-to-end-accuracy-guarantees.md). Accuracy -decides whether a candidate is correct enough. Workload demand and state -lifecycle decide whether building, maintaining, sharing, or recomputing that -candidate is worthwhile. Neither decision may override the other. - -## Problem and why now - -A summary operator does not imply one execution lifecycle. The same exact or -approximate summary can be: - -- built once from data at rest and discarded after one query; -- prepared before a known future query and retired afterward; -- shared across a bounded set of requests; or -- maintained incrementally as data continues to arrive. - -Likewise, an exact stateless operator may run once over a batch, once per -update in an incremental pipeline, or once per readout. Operator statefulness, -execution schedule, and output representation are separate properties. - -The query expression alone cannot determine those properties. The same query -may arrive unexpectedly during exploration, run once at a scheduled time, or -repeat every ten seconds on a dashboard. Planning summary state from syntax -alone either misses reuse or invents reuse that the workload does not justify. - -The current `PlanningWorkload` separates query demand from data arrival. -Query entries include predictability, recurrence or invocation count, accuracy, -and time selection; `DataWorkload` contains arrival and empirical facts. -These fields do not themselves select a summary-maintenance lifecycle. -The [input/output/workflow design](../../architecture/input-output-workflow.md) -is authoritative for current fields, defaults, and public call sequences. - -## Inputs, outputs, and end-to-end behavior - -For the broader lifecycle design, four categories of information matter -(these are not four current top-level Rust fields): - -1. logical queries, which define query semantics; -2. query workload, including per-query accuracy and latency requirements, - predictability, recurrence, and queried time scope; -3. data-workload characteristics, including arrival, volume, cardinality, and - distribution; -4. existing summaries and the lifecycle actions available to the deployment. - -Candidate search outputs `CandidateLogicalASAPDAGs`. The implemented lifecycle-aware workflow -then returns a `SummaryMaintenanceLifecyclePlan` per query root, containing the -Post-ASAP DAG and maintenance decisions. It can choose exact raw recomputation -when summary maintenance does not beat raw cost or comparable costs are missing. A -state deployment states whether a summary is ephemeral, prepared, shared for a -bounded period, or continuously maintained. It retains costs, assumptions, and -structured rejection reasons. Exporting full input provenance remains a later -integration. - -```text - logical queries ---+ - query workload -----+ - data workload ---+--> candidate plans - available summaries ---+ -> semantic and accuracy legality - -> lifecycle alternatives - -> horizon-normalized cost - -> selected plan + deployments -``` - -For an unpredictable one-time query, the planner may read an existing summary, -build an ephemeral summary, or recompute from raw data. It must not assume -future reuse. For a predictable one-time query, it may additionally compare -preparing state in advance with building or recomputing at execution time. For -repeated queries, it may amortize build and maintenance cost across reads over -an explicit horizon. - -### End-to-end decision order - -```text -normalize query and data workloads - -> derive recurrence, time-scope, and data evidence - -> enumerate semantic plan alternatives - -> enumerate legal execution contracts and state lifecycles - -> validate summary capabilities and phase constraints - -> derive and check accuracy guarantees - -> normalize one-time and rate costs over an explicit horizon - -> rank legal alternatives and compare the selected summary deployment - with raw recomputation - -> emit plan, deployments, assumptions, and rejected alternatives -``` - -## Goals and non-goals - -### Goals - -- Represent glossary-defined query-workload and data-workload concepts without - collapsing independent axes into one enum. -- Separate an operator's statefulness from its execution schedule and the - lifecycle of the state it produces. -- Make unknown demand explicit and fail closed rather than treating it as zero - or infinite reuse. -- Compare one-time and rate-valued costs only through an explicit horizon. -- Explain why a selected plan builds, reuses, maintains, or avoids summary - state. -- Preserve a minimal path from the current batch/repeating workload and - recurrence profile to the proposed model. - -### Non-goals - -- Scheduling jobs, assigning machines, admission control, or executing queries. -- Predicting future query text inside ASAPPlanner. -- Defining a sketch runtime or state-storage protocol. -- Choosing a concrete forecasting algorithm for uncertain demand. -- Changing accuracy targets or guarantee algebra. - -## Heilmeier questions - -- **What are we trying to do?** Choose whether summary state should be built, - maintained, shared, reused, or avoided for different query workloads - and data workload. -- **How is it done today, and what are the limits?** The planner distinguishes - one-shot counts, fixed repeating intervals, and an ingest-rate proxy. It - cannot distinguish an unexpected exploratory query from a scheduled one-time - report, or data at rest from continuous ingestion as an explicit mode. -- **What is new, and why will it succeed?** Orthogonal workload axes and an - explicit state lifecycle let the existing recurrence formulas compare the - same summary under different deployment choices without changing query - semantics. -- **Who cares?** Users need predictable latency and cost; operators need to - know what state will exist and for how long; planner developers need demand - assumptions to be auditable. -- **What are the risks and costs?** More inputs can make planning harder to - configure, forecasts may be stale, and a large lifecycle search space can - increase planning cost. -- **What are the checks for success?** The acceptance cases below must produce - different lifecycle alternatives and cost terms for identical query syntax - under different workload contracts. - -## Proposed design - -### Authoritative concepts and ownership - -| Concept | Authoritative layer | Reason | -| --- | --- | --- | -| Query meaning | Pre-ASAP query IR | Workload metadata must not change semantics | -| Accuracy requirement | Query workload (per-query) | The required result fidelity may be explicit or supplied by the normalization default | -| Response-latency requirement | Query workload (per-query) | The optional end-to-end response-time bound belongs to one query execution | -| Query workload | Workload input | Arrival and recurrence are not inferable from syntax | -| Data workload | Workload input | Ingestion and distribution describe the data, not query workload | -| Summary capability | Summary properties | Merge, delete, and update support constrain legal lifecycles | -| State lifecycle | Physical planning decision | Lifecycle is selected, not declared by `SummaryAgg` | -| Cost | Cost model and explanation | Cost consumes all inputs but does not define their meaning | - -### Query workload - -Accuracy and latency are separate per-query requirements within the query -workload. They constrain different planner decisions and must not be collapsed -into one SLA value: - -```rust -enum AccuracyRequirement { - /// The caller supplied the required result fidelity. - Explicit(AccuracyTarget), - /// The source omitted accuracy; normalization applies the exact default. - ImplicitExact, -} - -enum LatencyRequirement { - /// Maximum permitted end-to-end latency for one query execution. - ExplicitMax(Duration), - /// The caller supplied no latency bound. - Unspecified, -} - -struct QueryRequirements { - accuracy: AccuracyRequirement, - response_latency: LatencyRequirement, -} -``` - -An omitted accuracy field is not an unknown accuracy target and does not permit -arbitrary approximation: the current normalization policy makes it -`ImplicitExact`. Keeping that variant distinct from `Explicit(Exact)` preserves -whether the caller chose exactness or inherited the default. An unspecified -response-latency requirement imposes no response-time constraint; it is not a -zero-duration bound or evidence that every latency is acceptable. Accuracy is -checked as a legality constraint. The normalized model preserves response -latency, but the current planner does not yet reject plans against that bound. - -#### Classification axes - -The glossary classifications must be modeled independently. - -##### Predictability - -```rust -enum Predictability { - /// The query shape is not known before arrival. - AdHoc, - /// The query or parameterized template is known before execution. - Predictable { - known_at: Option, - }, - /// The caller supplied no reliable classification. - Unknown, -} -``` - -`AdHoc` does not mean repeated or one-time. It means the query shape was not -known in advance. The glossary currently places exploratory/ad-hoc queries in -the one-time category, so the MVP should accept `AdHoc + OneTime` and reserve -other combinations until a concrete use case establishes their semantics. - -##### Recurrence - -```rust -enum QueryRecurrence { - OneTime { - invocations: u64, - execute_at: Option, - }, - Repeated { - demand: RepeatedDemand, - }, - Unknown, -} - -enum RepeatedDemand { - FixedInterval(Duration), - Scheduled(Vec), - EstimatedRate(DemandEstimate), -} - -struct DemandEstimate { - /// Time range over which the demand was measured or forecast. - observation_window: ObservationWindow, - /// Expected demand, expressed in exactly one form. - expected: ExpectedDemand, - /// Highest expected invocation rate within the observation window. - peak_rate: Option, - /// Highest expected number of simultaneously executing invocations. - max_concurrency: Option, - /// Confidence in this estimate, in the inclusive range [0.0, 1.0]. - confidence: Confidence, - source: EvidenceSource, - observed_at: Option, - valid_for: Option, -} - -enum ExpectedDemand { - /// Expected total invocations over `observation_window`. - InvocationCount(u64), - /// Expected average invocations per second over `observation_window`. - AverageRate(Rate), -} - -struct ObservationWindow { - start: Timestamp, - end: Timestamp, -} - -struct Confidence(f64); -``` - -One-time means no recurrence is expected for that workload entry. Several -one-time consumers may still share a subplan within a submitted workload. -Repeated means the same query expression over its selected data is evaluated -over time, matching the glossary. Parameterized templates require an explicit -equivalence policy before their executions count as the same query. - -Query-workload volume is more than an average rate. Cost and latency can differ -for the same total request count when requests arrive in bursts or concurrently. -`ExpectedDemand` makes invocation count and average rate alternative -representations, preventing conflicting values in one estimate. The observation -window must be non-empty, rates must be finite and non-negative, and -`Confidence` must be between zero and one. Fixed intervals and explicit -schedules are declarations rather than estimates and do not need fabricated -confidence. The MVP may cost only invocation count and evaluation rate, but it -must preserve unsupported volume characteristics for explanation rather than -silently discarding them. - -##### Queried time scope - -```rust -enum QueryTimeScope { - RealTime, - Longitudinal, - Mixed, - Unknown, -} -``` - -`QueryTimeScope` is not a response-latency requirement. It classifies the event -time of the data selected by the query; `LatencyRequirement` constrains the -wall-clock time allowed to produce the result. They are independent: a -longitudinal query over archived data may require a 100 ms response, while a -real-time query over the latest data may permit a 30 second response. - -This classification is not derived only from a numeric lookback. A five-minute -lookback over recent data is real-time; the same duration over archived data is -not. Planning input should therefore carry the classification and the concrete -time selection separately: - -```rust -struct TimeSelection { - scope: QueryTimeScope, - lookback: Option, - as_of: Option, -} -``` - -For example, the same five-minute lookback has a different scope depending on -whether it is anchored at the current planning time or at a historical time: - -```rust -// The last five minutes: real-time. -TimeSelection { - scope: QueryTimeScope::RealTime, - lookback: Some(Duration::minutes(5)), - as_of: None, -} - -// A five-minute interval from archived data: longitudinal. -TimeSelection { - scope: QueryTimeScope::Longitudinal, - lookback: Some(Duration::minutes(5)), - as_of: Some(timestamp!("2024-01-01T12:05:00Z")), -} -``` - -`lookback` is a query property already represented by temporal query nodes in -some frontends. The normalized workload should reference or derive it rather -than introduce a second conflicting value. - -### Data workload is separate from query workload - -```rust -enum DataArrival { - AtRest, - ContinuouslyIngesting, - Mixed, - Unknown, -} - -/// Statistical distribution of keys in the input data. -enum DataDistribution { - /// A small number of keys account for most observations. - Zipf, - /// Keys are approximately equally likely. - Uniform, - /// Observations arrive in bursts with a temporarily concentrated key set. - Bursty, -} - -struct DataWorkload { - arrival: DataArrival, - ingestion_volume: Evidence, - ingestion_rate: Evidence, - input_cardinality: Evidence, - distribution: Evidence, -} -``` - -`DataDistribution` reuses the existing ASAPPlanner classification. It describes -the key-frequency shape used by summary accuracy and cost models, not whether -data arrives continuously. An unavailable or unsupported distribution is -represented by `Evidence.value = None` rather than by assuming the default -distribution. - -The former `DataCharacteristics` was a stale, continuous-ingestion-specific -case built around series count and samples per second. `DataWorkload` replaces -it as the normalized input rather than embedding that special case in the -general model. Data at rest may have row count and scan statistics without a -nonzero ingestion rate. Unknown arrival must not be interpreted as continuously -ingesting or at rest. - -Every empirical value uses an evidence wrapper conceptually containing: - -```rust -struct Evidence { - value: Option, - source: EvidenceSource, - observed_at: Option, - valid_for: Option, -} -``` - -This reuses the provenance and freshness principles from empirical summary -parameter configuration. Missing, stale, or future-dated evidence remains -unknown. - -### Output cardinality is a derived or evidenced cost input - -Output cardinality depends on input cardinality and grouping columns. The -planner may derive it analytically, accept a catalog estimate, or leave it -unknown. The source and freshness metadata must be preserved because output -cardinality affects summary size, read cost, post-processing cost, and network -cost. It is not a query correctness requirement. - -### Separate operator state, schedule, and output - -The physical design must not use `SummaryAgg` as shorthand for incremental -maintenance. - -```rust -enum OperatorState { - Stateless, - Stateful { - mergeable: bool, - deletable: bool, - }, -} - -enum EvaluationSchedule { - OneShot, - PerUpdate, - OnRead, -} - -enum OutputRepresentation { - PlainRows, - SummaryState, - FinalizedValue, -} -``` - -A one-shot sketch builder is stateful while it consumes its input, but it does -not imply long-lived incremental maintenance. A stateless transform can run -`PerUpdate` before a downstream maintained summary. These types describe an -execution contract; they do not replace semantic operators in the post-ASAP IR. - -### State lifecycle is a plan alternative - -```rust -enum StateLifecycle { - Ephemeral, - Prepared { - activate_at: Timestamp, - retire_at: Timestamp, - }, - Shared { - retention: Duration, - }, - ContinuouslyMaintained, -} -``` - -- `Ephemeral` builds state for one submitted workload and discards it afterward. -- `Prepared` builds or begins maintaining state before a predictable query and - retires it after the known need ends. -- `Shared` retains state for multiple consumers over a bounded lifetime. -- `ContinuouslyMaintained` applies data updates until an explicit later - deployment decision retires the state. - -The summary family and its properties constrain which lifecycles are legal. -For example, an append-only sketch may support continuous inserts but not a -sliding-window lifecycle requiring deletion. Lifecycle legality is checked -before cost ranking, like accuracy legality. Deployments provide these -per-summary properties through `summary_lifecycle_capabilities`; moving -real-time windows require deletion support as well as incremental updates. - -### Existing summaries are planning input - -An ad-hoc query cannot justify creating permanent state from unknown future -demand, but it may use compatible state that already exists. The planning -problem therefore needs a state catalog describing identity, parameters, -coverage, freshness, accuracy guarantee, lifecycle, and ownership. Catalog -integration is a separate implementation increment; this design only requires -that "reuse existing" and "create new" remain distinguishable alternatives. - -### Cost over a horizon - -`H` is the optimization horizon: the future wall-clock duration over which the -planner compares one-time and recurring costs. The existing cost model -represents it in seconds: - -```rust -/// A finite, strictly positive optimization duration, in seconds. -struct Horizon(f64); -``` - -The horizon is not the query lookback, the queried time scope, or the response -latency bound. It answers only "over how much future execution time should -these alternatives be costed?" All alternatives in one decision must use the -same `H`. `reads(H)` is the number of query evaluations expected or scheduled -within that horizon; for a fixed evaluation rate it is -`H * evaluation_rate`, plus any separately modeled one-time invocations. -Who supplies `H`, and whether a deployment may default it, remains an explicit -architecture decision below. If no horizon is available, the planner must not -compare a one-time cost with a rate-valued cost. - -For a stateful incremental alternative over horizon `H`: - -```text -total(H) = build_cost - + H * update_rate * maintenance_cost_per_update - + reads(H) * summary_read_cost - + H * retention_cost_rate - + retirement_cost -``` - -For repeated raw recomputation: - -```text -total(H) = reads(H) * raw_recompute_cost -``` - -The current lifecycle-aware materialization sums the selected summary -deployments and can replace that plan with raw recomputation when the raw cost -is lower or the summary lifecycle is uncostable. Jointly reconsidering every -sibling semantic candidate under lifecycle costs remains a later optimizer -integration; this document does not claim that broader search is implemented. - -For an ephemeral summary: - -```text -total = invocations * (build_cost + summary_read_cost + retirement_cost) -``` - -`retirement_cost` consistently means the one-time cost of ending a summary -state lifecycle, including deallocation or other cleanup. For ephemeral state, -retirement happens immediately after each invocation; for prepared, shared, or -continuously maintained state, it happens when that deployment is retired. - -For prepared state, update and retention terms apply only between activation -and retirement. Existing state does not pay a new build cost, but its catalog -provenance must establish that assumption. - -The existing `Cost`, `CostRate`, `EvaluationRate`, `UpdateRate`, `Horizon`, and -`total_cost` types are the minimum viable foundation. The implementation should -extend their explanations and lifecycle coverage instead of creating a second -recurrence cost system. - -### Unknown and uncertain demand - -Unknown demand is not zero demand and is not evidence of future reuse. The MVP -policy is: - -- do not select newly created long-lived state solely on unknown future reuse; -- allow raw recomputation, ephemeral build, and reuse of already available - compatible state; -- retain an explicit explanation of the missing demand evidence; and -- require an explicit planning objective before using an estimated demand - distribution. - -Future uncertain-demand support may add expected-cost, percentile-cost, -worst-case, or regret objectives. Those policies must consume a typed estimate -with confidence and provenance; they are not implicit behavior of -`Predictability::Unknown`. - -## Review against the ProjectASAP glossary - -The glossary review found the following required coverage and current gaps. - -| Glossary concept | Current ASAPPlanner representation | Missing design support | -| --- | --- | --- | -| Data at rest vs continuously ingesting | `DataArrival` is explicit | Runtime/catalog-specific arrival discovery remains external | -| Ingestion volume | `DataWorkload::ingestion_volume` carries evidence | A concrete time basis for volume remains deployment-specific | -| Ingestion rate | Evidenced independently from query evaluation rate | Preserve richer unit/provenance metadata when integrations require it | -| Input cardinality | Evidenced workload-level cardinality feeds accuracy | Per-dataset/metric/column scoping remains future work | -| Data distribution | Evidenced built-in enum | Permit deployment-specific distributions later | -| Ad-hoc vs predictable | `Predictability` is independent from recurrence | Parameterized-template equivalence remains open | -| One-time vs repeated | One-time, fixed, scheduled, estimated, and unknown recurrence | Forecast-policy integration remains future work | -| Query volume and characteristics | Estimates preserve average/count, peak, concurrency, confidence, and freshness | Peak and concurrency are not yet consumed by cost or latency models | -| Real-time vs longitudinal | `TimeSelection` carries scope, lookback, and `as_of` | Conflict policy with temporal IR remains open | -| Output cardinality | May be inferred locally; no common evidenced input | Add derived/evidenced value and provenance for costing | -| Lookback window | Represented in temporal query shapes/frontends | Establish query IR as authority and expose it to workload costing | -| CTSA pipeline | Not explicitly modeled | Keep as architectural context; planner consumes collect/store/analyze facts but does not model transmission topology in the MVP | -| CSP(F) | Cost and fidelity partly modeled | Treat scale/performance/fidelity as objectives and constraints; do not collapse fidelity into cost | - -Two terminology constraints apply: - -1. A repeated query is not inherently a streaming-data workload. It may - repeatedly query data at rest. -2. A one-time query is not inherently stateless. A predictable one-time query - may justify prepared state, while an ephemeral summary is stateful during - its one execution. - -## Minimal complexity - -The minimum input model is determined by the downstream applications selected -for integration, not by a context-free notion of the fewest possible fields. -Each supported use case must contribute the workload facts that can change -plan legality, accuracy, lifecycle, or cost: - -- Time-series metric queries require queried time scope and lookback. -- Repeated dashboard queries, including an ASAPQuery integration, require - recurrence and evaluation frequency so the planner can cost reuse and - maintenance across executions. -- Batch queries over data at rest require an explicit at-rest arrival mode and - must not be assigned a fabricated ingestion rate. -- Summary techniques whose accuracy depends on the input distribution require - evidenced distribution characteristics; omitting them must produce unknown - accuracy or a conservative fallback rather than a favorable assumption. - -The initial implementation should include the union of fields required by its -committed integrations. Additional workload dimensions should be added when a -new downstream use case demonstrates that they affect a planning decision. - -The simplest alternative is to extend `BatchEntry` with optional schedule and -classification fields and extend `RepeatingEntry` with time scope. That is a -reasonable serialization migration, but it is not a sufficient conceptual -model: it continues to make predictability and recurrence mutually exclusive -container choices, and it has no place for data arrival or state lifecycle. - -The minimum new conceptual layers are therefore: - -1. orthogonal query-demand metadata, required because glossary categories are - not one taxonomy; -2. data-workload metadata, required because ingestion does not describe query - recurrence; -3. state lifecycle as a physical alternative, required because one summary - operator can be deployed ephemerally or incrementally. - -No separate scheduler, forecasting framework, or replacement cost model is -introduced. Existing query IR, summary properties, accuracy model, and -recurrence cost types remain authoritative in their domains. - -## Alternatives and decisions - -### Encode workload class as one enum - -Rejected. Variants such as `AdHoc`, `OneShot`, and `Repeated` overlap: -predictability and recurrence are different facts, and time scope is a third. - -### Infer demand from query syntax or submitted root count - -Rejected. Syntax contains no evidence of future arrival, and several roots in -one request establish only current structural sharing. - -### Treat every summary as continuously maintained - -Rejected. It excludes ephemeral construction over data at rest and overcharges -one-time plans. It also hides deployment lifetime from explanations. - -### Treat every one-time query as raw recomputation - -Rejected. An ephemeral summary may reduce memory or network cost during one -execution, an existing summary may already answer the query, and a predictable -future query may justify preparation. - -### Fold fidelity into a scalar cost - -Rejected. Accuracy and semantic correctness are constraints checked before -ranking. A cheaper plan cannot purchase permission to violate fidelity. - -### Extend the existing recurrence profile only - -Partially accepted for implementation reuse, rejected as the whole model. -`RecurrenceProfile` is an aggregated cost context for a target. It should remain -the derived input to cost decisions, while normalized workload metadata retains -predictability, time scope, provenance, and lifecycle information needed before -and after aggregation. - -## Quality attributes and evidence - -- **Understandability:** explanations use glossary terms and show each axis - separately. Proxy: reviewers can distinguish repeated queries from continuous - ingestion in exported plan evidence. -- **Debuggability:** selected and rejected lifecycle alternatives record costs, - horizon-derived decisions, assumptions, and typed rejection reasons. Full - demand/data provenance in exported explanations remains future work. -- **Maintainability:** current recurrence types remain the cost authority; - normalized workload types remain the source authority. No duplicate formula - system is introduced. -- **Extensibility:** scheduled and estimated recurrence fit without changing - query semantics. Forecasting policies remain pluggable planning objectives. -- **Performance:** lifecycle enumeration expands the candidate space. The MVP - should generate only capability-compatible alternatives and deduplicate - equivalent deployments before ranking. -- **Operability:** every long-lived state has activation, retention or retirement - semantics and ownership in output. Concrete runtime APIs are future work. -- **Security and privacy:** query logs and empirical distributions may be - sensitive. Provenance must identify a source without requiring raw query-log - contents to be embedded in exported plans. - -## Acceptance and test design - -Realization acceptance is defined by identical logical queries producing -different legal lifecycle choices under different workload contracts: - -1. **Unpredictable one-time query:** offers raw recomputation, compatible - existing state, and ephemeral build; does not justify new continuous state. -2. **Predictable scheduled one-time query:** may offer prepared state with a - bounded activation and retirement period. -3. **Repeated query over continuously ingesting data:** compares incremental - maintenance and repeated recomputation using distinct update and evaluation - rates over an explicit horizon. -4. **Repeated query over data at rest:** uses evaluation rate without inventing - maintenance updates. -5. **Real-time and longitudinal queries with the same expression:** preserve - different time selections and may receive different scan, retention, and - summary alternatives. -6. **Unknown demand:** remains unknown in explanation and cannot make a newly - created long-lived state win through assumed reuse. -7. **Mixed one-time and repeated consumers:** requires an explicit horizon and - accounts for shared build cost once. -8. **Accuracy failure:** rejects a lifecycle regardless of favorable workload - cost. - -Focused unit tests should cover normalization, invalid combinations, evidence -freshness, lifecycle capability checks, and dimensional cost arithmetic. -End-to-end tests should cover cases 1–8 through candidate selection and exported -explanations. A reviewer who did not implement the workload types should design -or review at least the unknown-demand and mixed-consumer cases; that independent -review has not occurred for this design document. - -## Risks, rollout, and exit criteria - -The implementation should roll out additively: - -1. add normalized metadata and explanations while preserving current - batch/repeating behavior; -2. derive the existing `RecurrenceProfile` from the richer model; -3. add ephemeral and existing-state alternatives; -4. add prepared and continuously maintained lifecycle selection; -5. integrate empirical demand and state catalogs only when provenance and - freshness contracts are available. - -Compatibility requires old workloads to normalize without changing their -current decisions when no new metadata is supplied. Unknown new fields must -take the documented conservative path rather than acquire optimistic defaults. - -Open decisions requiring architecture or product input: - -- whether predictable parameterized query templates count as the same repeated - query and under which equivalence relation; -- who supplies the optimization horizon and whether a deployment may define a - default for purely repeated workloads; -- which planning objective governs uncertain demand; -- how state ownership, quota, and retirement requests cross the planner/runtime - boundary; -- whether real-time versus longitudinal is supplied by the caller, derived by a - policy using `as_of` and lookback, or both with conflict diagnostics; and -- the minimum evidence freshness required before empirical workload data may - affect selection. - -The design exits draft status when these decisions have owners, the normalized -input has a compatibility plan, and acceptance cases 1–8 can be expressed in -fixtures without runtime-specific assumptions. diff --git a/docs/design_docs/proposals/asapquery-rule-coverage.md b/docs/design_docs/proposals/asapquery-rule-coverage.md index e496c9fe9..9ba999292 100644 --- a/docs/design_docs/proposals/asapquery-rule-coverage.md +++ b/docs/design_docs/proposals/asapquery-rule-coverage.md @@ -21,11 +21,11 @@ cost, and selection rules under `optimizer/`. The reviewed source is | Temporal aggregate functions | Lowering covered; realization varies | `Aggregate(PerEntity)` over `TimeRange` represents the full family. Sum, count, min, max, quantile, rate, and increase have summary realizations; `avg_over_time` is currently exact `PassThrough`, matching ASAPQuery's exact-only multi-stat fallback rather than claiming a maintained summary. | | Spatial aggregate functions | Lowering covered; realization varies | `Aggregate(Reduce(GroupKeys))` is shared by SQL and PromQL. Supported single accumulators and ordinary `by(...)` avg rewrites generate candidates; shapes such as `avg without(...)` retain the same exact raw fallback that ASAPQuery uses for multi-stat AQEs. | | Collapsible temporal + spatial aggregates | Semantic-equivalent rewriting | The existing rewrite strategy uses accumulator algebra: sum∘sum, sum∘count, min∘min, and max∘max. It rejects all other pairs and requires identical output schemas. | -| Sketch alternatives and exact fallback | Covered more generally | `SketchAlgorithmStrategy` enumerates legal summary realizations. The enclosing memo group always retains the original raw expression as the exact fallback; the strategy does not falsely label an approximate sketch as exact. | +| Sketch alternatives and exact fallback | Covered more generally | `ASAPStrategies` enumerates legal summary realizations. The enclosing memo group always retains the original raw expression as the exact fallback; the strategy does not falsely label an approximate sketch as exact. | | Subpopulation label placement | Covered more generally | `HydraGroupingStrategy` and `GroupingStrategy` express per-subpopulation and shared multi-subpopulation realizations. | | Shared computation | Covered more generally | workload-wide CSE and `SharedSubDAGStrategy` operate on physical DAG identity rather than AQE names. | | Average decomposition | Semantic-equivalent rewriting | The same rewrite strategy exposes independently optimizable sum/count accumulators when null semantics and schema permit it. | -| Merge/delete legality | Covered | Summary-family capabilities and lifecycle validation determine which maintenance operations are legal. | +| Merge/delete legality | Covered | Summary-family capabilities determine which maintenance operations are legal. | | Window-framework selection | Separate physical-planning work | Window selection must compare an extensible set of implementations, including tumbling, sliding, PromSketch-style exponential-histogram windows, and other window frameworks. This audit does not introduce a closed window enum or choose among them. | | Retention/cleanup scheduling | Outside planner scope | The audit deliberately does not import ASAPQuery's Arroyo-specific cleanup thresholds, timers, or failure workarounds. The planner may declare a selected summary's required retention horizon and cost it, but the runtime/storage layer owns when and how expired physical state is reclaimed. | | Empirical per-sketch atomic costs | Covered through evidence | Analytical statistics and deployment profiles provide cost evidence; benchmark tables should be ingested as calibrated evidence rather than compiled into matching rules. | @@ -38,22 +38,22 @@ does not create a new strategy category. | Decision | Existing owner | |---|---| -| Which summary algorithm can implement one aggregate intent | `SketchAlgorithmStrategy` | +| Which summary algorithm can implement one aggregate intent | `ASAPStrategies` | | How grouping/subpopulation state is laid out | `HydraGroupingStrategy` | | Whether an equivalent logical expression exposes better accumulators | `SemanticEquivalentRewriteStrategy` (the broadened existing avg rewrite; `AvgToSumOverCountStrategy` remains a compatibility name) | | Whether identical physical work is shared | `SharedSubDAGStrategy` | | Whether a finer grouping can answer a coarser grouping | `RollupStrategy` | | Whether tighter accuracy can answer a looser request | `AccuracyReconciliationStrategy` | | Whether a larger Top-K result can answer a smaller limit | `TopKLimitReuseStrategy` | -| Which maintenance lifecycle is legal | the summary-maintenance lifecycle planner | +| Whether and when a summary is materialized | Stage 2 materialization (#509) | | Which window framework implements a range | the physical deployment/window-selection planner | | How expired physical state is cleaned up | runtime/storage lifecycle management, not a planner strategy | Accordingly, ASAPQuery's four collapsible temporal/spatial patterns extend the existing semantic-rewrite owner. Temporal and spatial function recognition is already front-end lowering into `AggIntent`; sketch compatibility remains in -`SketchAlgorithmStrategy`; labels remain in `HydraGroupingStrategy`; and -maintenance lifecycle legality remains in the lifecycle planner. Window +`ASAPStrategies`; labels remain in `HydraGroupingStrategy`; and +materialization decisions belong to Stage 2 materialization (#509). Window framework selection is separate physical-planning work. None of these become a parallel syntax-oriented `PatternStrategy`. @@ -69,7 +69,7 @@ planner. Rules match typed operators and declared capabilities, never parser spellings. A rule that composes operators states the algebraic law it relies on and preserves the original output schema. Unknown pairs, missing statistics, or -unsupported lifecycle operations produce no candidate; they never silently +unsupported maintenance operations produce no candidate; they never silently fall back to an optimistic estimate. Window choices should follow the same principle without assuming that every diff --git a/docs/design_docs/proposals/planner-layering.md b/docs/design_docs/proposals/planner-layering.md index 5273bfb3f..aad13359a 100644 --- a/docs/design_docs/proposals/planner-layering.md +++ b/docs/design_docs/proposals/planner-layering.md @@ -254,7 +254,7 @@ A summary-based candidate uses three kinds of summary nodes: summaries into a coarser one. * A **summary estimation node** computes an answer from a summary, for example the p99 estimate from a KLL, or the entropy estimate from a UnivMon. -* **summary subtract node** and **summary delete node** design is TODO. +* **summary subtract node** and **summary delete node** design is TODO. One summary build node can feed several estimation nodes, which is what Pass 2 exploits. diff --git a/docs/develop_docs/asap-aware-mapping-architecture.md b/docs/develop_docs/asap-aware-mapping-architecture.md index aee8fe53a..eaf3d879a 100644 --- a/docs/develop_docs/asap-aware-mapping-architecture.md +++ b/docs/develop_docs/asap-aware-mapping-architecture.md @@ -55,18 +55,20 @@ The diagram below follows a workload of one or more query roots through target d Terminology used in the diagram: - A **workload** is the set of named queries planned together. A **query root** - is the top-level `QueryExpr` (the logical query-expression type) for one of - those queries. **Pre-ASAP** means this logical input form, before the planner - realizes an operation as a concrete ASAP realization; **post-ASAP** means - the resulting realization form. + is the top-level `Rc` (the unified operator IR) for one of + those queries. **Pre-ASAP** means a DAG that contains only ordinary + `NonASAPOp` operators, before the planner realizes an operation with ASAP + primitives; **post-ASAP** means the same IR after some nodes became `ASAPOp` + summary operators. - A **DAG** (directed acyclic graph) represents query operators whose sub-DAGs may be shared. See [sub-DAG sharing and ASAP-aware CSE](../design_docs/proposals/planner-layering.md#pass-2-asap-aware-common-subexpression-elimination) for the sharing rules. Rust's `Rc` (reference-counted pointer) records shared node identity. - A **target** is one replaceable site. A **candidate** is one valid alternative - for it. `Replacement::Summary` is a constructed post-ASAP summary—maintained state - such as an exact accumulator or an approximate sketch—while - `Replacement::Rewrite` is another pre-ASAP logical expression. + for it. `Replacement::SubDAG` is a replacement sub-DAG: either a constructed + post-ASAP summary (it contains an `ASAPOp`, e.g. an exact accumulator or an + approximate sketch) or a logical rewrite with no ASAP operator + (`is_logical_rewrite` tells them apart). `Replacement::ExactComposition` refers to a child target whose realization must remain undecided until compatible selection. A **sketch** is a compact data structure that trades exactness for bounded error. A @@ -86,15 +88,15 @@ flowchart TB classDef report fill:#f2eafe,stroke:#7950b3,color:#34204f subgraph DISCOVERY[1. Discover every replaceable site] - WL["Input workload
one or more named pre-ASAP QueryExpr roots"]:::input + WL["Input workload
one or more named pre-ASAP OperatorNode roots"]:::input SEARCH["search_workload_with
run CSE once, then visit every node in every root DAG"]:::generate - TARGET["TargetSubDAG
one candidate site plus the number of workload locations
that reference the same Rc<QueryExpr>"]:::generate + TARGET["TargetSubDAG
one candidate site plus the number of workload locations
that reference the same Rc<OperatorNode>"]:::generate WL -->|"roots"| SEARCH -->|"one target per distinct node"| TARGET end subgraph GENERATION[2. Generate all legal alternatives at each site] STRATEGY["ReplacementStrategy
when a target matches, enumerate every legal replacement;
implementations generate but do not choose"]:::generate - CAND["ReplacementSubDAG candidates
each contains a Summary, Rewrite or ExactComposition
plus typed provenance and rationale;
no alternative is removed solely on cost"]:::store + CAND["ReplacementSubDAG candidates
each contains a Subtree (summary or logical rewrite) or ExactComposition
plus typed provenance and rationale;
no alternative is removed solely on cost"]:::store TARGET -->|"try every registered strategy"| STRATEGY --> CAND CM(["CostModel
orders candidates and supplies
deployment-specific parameters"]):::choose CM -. "rank and parameterize; accuracy checks remain required" .-> STRATEGY @@ -157,7 +159,7 @@ flowchart LR classDef workload fill:#e7f7ef,stroke:#31835e,color:#173f2d classDef common fill:#fff6dd,stroke:#b78922,color:#513d0c - ROOTS["Input
one or more named QueryExpr roots"]:::workload + ROOTS["Input
one or more named OperatorNode roots"]:::workload ROOTS --> CSE["Canonicalize sharing
merge structurally identical, legally shareable sub-DAGs"]:::workload CSE --> WALK["Discover sites
walk the complete DAG, including nodes below unshared parents"]:::workload WALK --> T["Build TargetSubDAG
retain the sub-DAG's Rc identity and measured consumer_count"]:::workload @@ -199,8 +201,8 @@ cost. The default context-free registry contains five `ReplacementStrategy` implementations: -- `SketchAlgorithmStrategy` matches supported aggregate and binary shapes. Its - `replacements(target)` method constructs every legal post-ASAP `SummaryNode`, +- `ASAPStrategies` matches supported aggregate and binary shapes. Its + `replacements(target)` method constructs every legal post-ASAP summary sub-DAG, including applicable sketch, exact-accumulator, and pass-through realizations. Candidates are sized and ordered for the target's accuracy requirement; candidates without a sufficient guarantee are rejected before @@ -255,8 +257,8 @@ contract consistent and preserves the full choice set for other callers. `CandidateLogicalASAPDAGs::global_selection` optionally coordinates cross-target sharing and composition choices. `GlobalSelection::assemble_selected_dag` constructs the selected -semantic DAG. These plain APIs do not establish lifecycle or physical deployment -feasibility. Recurrence and lifecycle-aware variants require the corresponding +semantic DAG. These APIs do not decide materialization or establish physical +deployment feasibility. Recurrence-aware variants require the corresponding workload and evidence inputs; downstream owns physical commitment and execution. See the [library workflow](library-api.md#optional-whole-plan-selection-and-dag-assembly). diff --git a/docs/develop_docs/asap-aware-mapping-contracts.md b/docs/develop_docs/asap-aware-mapping-contracts.md index 447cb3823..1980dafd0 100644 --- a/docs/develop_docs/asap-aware-mapping-contracts.md +++ b/docs/develop_docs/asap-aware-mapping-contracts.md @@ -10,25 +10,25 @@ first; use the [extension guide](extend-asap-aware-mapping.md) when changing one ### `TargetSubDAG` -A pre-ASAP `QueryExpr` node that a strategy may replace. +A pre-ASAP `OperatorNode` that a strategy may replace. ```rust pub struct TargetSubDAG<'a> { - pub root: &'a Rc, + pub root: &'a Rc, pub consumer_count: usize, } ``` -`root` is the actual `Rc` from the workload. +`root` is the actual `Rc` from the workload. -`consumer_count` counts structural references, not runtime executions. It is the number of places in the workload DAG that point to this exact `Rc` node. +`consumer_count` counts structural references, not runtime executions. It is the number of places in the workload DAG that point to this exact `Rc` node. For example, consider two top-level queries: - `sum by (service) (rate(m[5m]))` - `avg by (service) (rate(m[5m]))` -After `share_common_sub_dags` merges their identical `rate(m[5m])` sub-DAGs, both query DAGs point to the same `Rc`. That node's `consumer_count` is `2`, regardless of how often either query executes. +After `share_common_sub_dags` merges their identical `rate(m[5m])` sub-DAGs, both query trees point to the same `Rc`. That node's `consumer_count` is `2`, regardless of how often either query executes. Use: @@ -54,19 +54,24 @@ when the caller already knows the real number of consumers. The actual object that substitutes the target. -There are currently three forms: +There are currently two forms: ```rust pub enum Replacement { - Summary(Rc), - Rewrite(Rc), + SubDAG(Rc), ExactComposition(ExactComposition), } ``` -Use `Replacement::Summary` when the alternative is a constructed post-ASAP summary plan. +Use `Replacement::SubDAG` for a replacement sub-DAG. It is one of: -Use `Replacement::Rewrite` when the alternative is still a logical pre-ASAP `QueryExpr`. +- a constructed post-ASAP summary plan: the sub-DAG contains an `ASAPOp` + (`SummaryAgg`, `SummaryEstimate`, ...); +- a logical rewrite: only `NonASAPOp` nodes and no guarantee yet. + +`is_logical_rewrite(&node)` tells the two apart. A kept pre-ASAP sub-DAG +(`retain_exact`) has no ASAP operator but carries an exact guarantee, so it +counts as a bound decision, not a rewrite. Use `Replacement::ExactComposition` when an exact operation refers to a child target whose realization must remain undecided. Selection coordinates the @@ -77,10 +82,10 @@ Examples: ```text Quantile(...) - -> KLL SummaryNode + -> SummaryEstimate(SummaryAgg(KLL)) ``` -is a `Summary`; KLL (Karnin–Lang–Liberty) is a quantile-sketch algorithm. +is a summary `Subtree`; KLL (Karnin–Lang–Liberty) is a quantile-sketch algorithm. ```text compute independently @@ -88,7 +93,7 @@ compute independently reuse an already shared logical sub-DAG ``` -is represented as a `Rewrite`. +is represented as two logical-rewrite `Subtree`s. --- @@ -157,7 +162,7 @@ aggregation must compute without committing to a physical summary algorithm. A realization may be an approximate sketch, an exact mergeable accumulator, or a pass-through that keeps the original operation instead of building a summary. `realizations_for_intent` enumerates these concrete -realizations; `SketchAlgorithmStrategy::replacements()` constructs each one as +realizations; `ASAPStrategies::replacements()` constructs each one as a `ReplacementSubDAG`. It returns all candidates in preferred order without selecting a winner. At workload scale, `search_workload`/`search_workload_with` preserve all supported legal alternatives @@ -170,8 +175,8 @@ This guide uses the Cascades/Volcano terminology: realization. For example, a quantile `AggIntent` may have KLL and DDSketch `Realization` values. - A **transformation rule** maps a logical operation to another logical - operation. In this crate, that kind of candidate is represented by - `Replacement::Rewrite`. + operation. In this crate, that kind of candidate is a logical-rewrite + `Replacement::SubDAG`. - A **replacement candidate** packages either kind of result as a `ReplacementSubDAG` for search. `CandidateLogicalASAPDAGs` stores and ranks these candidates. - **Physical commitment and placement** happen downstream. An `Realization` @@ -183,7 +188,7 @@ The concrete flow is: ```text AggIntent -> realizations_for_intent(): enumerate Realization values - -> SketchAlgorithmStrategy: construct ReplacementSubDAG candidates + -> ASAPStrategies: construct ReplacementSubDAG candidates -> CandidateLogicalASAPDAGs: store and rank candidates -> downstream deployment: select and place a final choice ``` @@ -206,7 +211,7 @@ bounds, but does not execute workloads or own deployment measurements. Most hook | `rank_candidates` | Order valid sketch algorithms | No | | `size_params` | Convert an accuracy target into sketch parameters | Yes | | `realize_extension` | Map a custom intent to a realization | Yes | -| `readout_extension` | Query a custom extension summary | Panics until paired with a custom realization | +| `evaluation_extension` | Query a custom extension summary | Panics until paired with a custom realization | | `cse_recompute_cost` | Estimate independent recomputation | Yes | | `cse_shared_maintenance_cost` | Estimate shared maintenance | Yes | | `cse_share_decision` | Choose sharing or recomputation | Yes | @@ -247,10 +252,10 @@ bounds, but does not execute workloads or own deployment measurements. Most hook fn realize_extension(&self, ext_kind: &str, payload: &serde_json::Value) -> Realization; ``` -- **`readout_extension`** — define how queries read an extension summary that `realize_extension` mapped to a `Sketch`. The two hooks are a pair: realization defines what is maintained; readout defines how it is queried. Override both for the same `ext_kind`. The default readout panics to prevent a silent wrong answer. +- **`evaluation_extension`** — define how queries read an extension summary that `realize_extension` mapped to a `Sketch`. The two hooks are a pair: realization defines what is maintained; evaluation defines how it is queried. Override both for the same `ext_kind`. The default evaluation panics to prevent a silent wrong answer. ```rust - fn readout_extension(&self, ext_kind: &str, payload: &serde_json::Value, col: &ColumnRef) -> SketchStatistic; + fn evaluation_extension(&self, ext_kind: &str, payload: &serde_json::Value, col: &ColumnRef) -> SketchStatistic; ``` - **`cse_recompute_cost`** — estimate the one-time cost of recomputing a CSE candidate's sub-DAG independently at a single consumer. Default: `default_cse_recompute_cost`, a structural-size proxy. @@ -297,14 +302,14 @@ A custom cost model does not necessarily need to override every hook. The curren // One TargetSubDAGCandidates per distinct TargetSubDAG in the whole workload — // never a flat list of fully assembled plans. pub struct TargetSubDAGCandidates { - pub target: Rc, + pub target: Rc, pub consumer_count: usize, pub candidates: Vec, // accepted alternatives, unranked pub rejected: Vec, // failed accuracy checks } pub struct RankedTargetSubDAGCandidates<'a> { - pub target: &'a Rc, + pub target: &'a Rc, pub consumer_count: usize, pub candidates: Vec<&'a ReplacementSubDAG>, // same candidates, ranked pub costs: Vec, // costs[i] <-> candidates[i] @@ -313,7 +318,7 @@ pub struct RankedTargetSubDAGCandidates<'a> { `search_workload(roots)` runs the shared-sub-DAG pass once, discovers every target across every root's whole DAG (not just root-level sharing — a `SharedSubDAGStrategy` candidate three levels under an unshared `Filter` is exactly as real a site as a shared whole root), and asks every registered strategy to a fixpoint. Two logically different candidates at two different targets are never copied into two separate plans — they're two entries in two different `TargetSubDAGCandidates`s, sharing every other node in the workload by construction. -`CandidateLogicalASAPDAGs::cost_sorted(cost_model)` is the one ranking step: for each candidate set, it dispatches by candidate shape — a same-shape `Rewrite` pair (a `SharedSubDAGStrategy` share/recompute choice) goes through `CostModel::cse_share_decision`; a same-shape run of `Summary` candidates realizing sketches (a `SketchAlgorithmStrategy` choice) goes through `CostModel::rank_candidates`; and a mixed candidate set is ordered by each candidate's `CostModel::estimate_cost`. Every candidate gets a numeric cost aligned index-for-index in `costs`. Count in, count out—nothing is dropped to produce a ranking. Legality checks +`CandidateLogicalASAPDAGs::cost_sorted(cost_model)` is the one ranking step: for each candidate set, it dispatches by candidate shape — the `SharedSubDAGStrategy` share/recompute pair (recognized by `ReplacementProvenance::CseShare`/`CseRecompute`) goes through `CostModel::cse_share_decision`; a set with a Hydra shared-grid alternative goes through `CostModel::grouping_state_cost`; a set whose candidates all realize sketches (a `ASAPStrategies` choice) goes through `CostModel::rank_candidates`; and any other mixed set is ordered by `CostModel::candidate_cost`. Every candidate gets a numeric cost aligned index-for-index in `costs`. Count in, count out—nothing is dropped to produce a ranking. Legality checks may already have removed proposals before this boundary. In particular, `search_workload_with_targets` checks explicit per-root targets, while retaining direct DDSketch ratios with missing domain evidence and no root guarantee for @@ -329,7 +334,7 @@ Sketches separate their query category from the concrete algorithm and its param | Level | Type | Example | | --- | --- | --- | -| **family** | `SummaryFamilyType` | `Sketch`, `Sample`, `Wavelet`, `StatModel`, `ExactAggregate` | +| **family** | `FieldDataType` (non-`Plain` variants) | `Sketch`, `Sample`, `Wavelet`, `StatModel`, `ExactAggregate` | | **category** | `SketchCategory` | `Quantile`, `Cardinality`, `Frequency`, `TopK` | | **algorithm** | `SketchAlgorithm` | `Kll` / `DDSketch` (both quantile); `Hll` (HyperLogLog) / `Theta` / `Kmv` (K-Minimum Values), all cardinality | | **committed choice** | `SketchKind` | one validated category + algorithm + parameter combination | @@ -340,7 +345,7 @@ to the selected algorithm and classifies the pair into its category. The public `.category()`, `.algorithm()`, and `.params()` accessors expose the committed values without permitting an invalid combination. -Where this matters in practice: `CostModel::rank_candidates`, `CostModel::size_params`, and `SketchAlgorithmStrategy::replacements` operate at the **algorithm** level. `summary_candidates(intent)` returns a list of `SketchAlgorithm`s (`[Kll, DDSketch]` for a `Quantile` intent), never a bare `SketchKind` with nothing chosen underneath it. `SketchKind` appears after an algorithm has been selected and sized—on `Realization::Sketch(SketchKind)` and `SummaryFamilyType::Sketch(SketchKind)`. +Where this matters in practice: `CostModel::rank_candidates`, `CostModel::size_params`, and `ASAPStrategies::replacements` operate at the **algorithm** level. `summary_candidates(intent)` returns a list of `SketchAlgorithm`s (`[Kll, DDSketch]` for a `Quantile` intent), never a bare `SketchKind` with nothing chosen underneath it. `SketchKind` appears after an algorithm has been selected and sized—on `Realization::Sketch(SketchKind)` and `FieldDataType::Sketch(SketchKind, GroupingStrategy)`. `Sample`, `Wavelet`, and `StatModel` each use a flat `(Kind, Params)` pair. `Sketch` needs the additional algorithm level because multiple algorithms can serve the same purpose—for example, KLL and DDSketch both answer quantile queries. @@ -378,15 +383,15 @@ The crate provides no default `Matcher` implementation because the answer depend Concretely, `explanation.rs` reports three candidate kinds from each `TargetSubDAGCandidates`: -- `ExplanationKind::SketchApproximation` — the set contains a `Replacement::Summary` that realizes `SummaryFamilyType::Sketch(..)`, not just an exact/pass-through candidate. -- `ExplanationKind::CommonSubexpressionReuse` — `consumer_count >= 2` and the set contains `SharedSubDAGStrategy`'s "build once and share" candidate (the `Replacement::Rewrite` whose `Rc` is the set's `target`). +- `ExplanationKind::SketchApproximation` — the set contains a summary `Replacement::SubDAG` that realizes `FieldDataType::Sketch(..)`, not just an exact/pass-through candidate. +- `ExplanationKind::CommonSubexpressionReuse` — `consumer_count >= 2` and the set contains `SharedSubDAGStrategy`'s "build once and share" candidate (the `Replacement::SubDAG` whose `Rc` is the set's `target`). - `ExplanationKind::ExactComposition` — the candidate set contains an exact operation composed with a child target whose realization remains a coordinated choice. Each `ReplacementExplanation::reason` is copied verbatim from the matching candidate's own `ReplacementSubDAG::rationale`. Nothing in `explanation.rs` re-explains why a candidate is valid; that explanation already exists exactly once, on the candidate itself. -`ReplacementExplanation` carries both `node_hash` and `target`. A downstream consumer first compares `node_hash` with an exported `DAGNode::hash` to narrow the search, then compares the exact target expression with the node's in-process source expression. This preserves the hash's role as a fast filter while making the final association collision-safe; `location` remains human-readable presentation text rather than a machine identifier. +`ReplacementExplanation` carries both `node_hash` and `target`. A downstream consumer first compares `node_hash` with an exported `DAGNode::hash` to narrow the search, then compares the exact `target` node with the exported node's in-process `DAGNode::source_node`. This preserves the hash's role as a fast filter while making the final association collision-safe; `location` remains human-readable presentation text rather than a machine identifier. ### Why there is no `ExplanationRule` trait @@ -394,6 +399,6 @@ Explanations are derived from candidates already present in `CandidateLogicalASA ### How it derives `location` text -`CandidateLogicalASAPDAGs`/`TargetSubDAGCandidates` track `Rc` pointer identity, not human-readable breadcrumbs. `ReplacementExplanation::location` provides prose such as `root "dash_a" > lhs` so reporting consumers can identify the relevant part of the query without interpreting pointer identity. Location derivation does not make replacement or costing decisions. +`CandidateLogicalASAPDAGs`/`TargetSubDAGCandidates` track `Rc` pointer identity, not human-readable breadcrumbs. `ReplacementExplanation::location` provides prose such as `root "dash_a" > lhs` so reporting consumers can identify the relevant part of the query without interpreting pointer identity. Location derivation does not make replacement or costing decisions. --- diff --git a/docs/develop_docs/extend-asap-aware-mapping.md b/docs/develop_docs/extend-asap-aware-mapping.md index 5a5e069a8..b9a830140 100644 --- a/docs/develop_docs/extend-asap-aware-mapping.md +++ b/docs/develop_docs/extend-asap-aware-mapping.md @@ -44,7 +44,7 @@ There are four decisions to make. `matches` should contain the minimum structural and semantic checks needed to determine whether the strategy applies. -For example, the aggregate path in `SketchAlgorithmStrategy` requires a +For example, the aggregate path in `ASAPStrategies` requires a supported shape: - the node is an `Aggregate`, @@ -112,23 +112,20 @@ and let costing decide later. --- -### Choose `Summary` vs. `Rewrite` +### Summary sub-DAG vs. logical rewrite -Return: +Both are returned as: ```rust -Replacement::Summary(...) +Replacement::SubDAG(node) ``` -when the candidate is a fully constructed post-ASAP summary. +- A fully constructed post-ASAP summary: `node` contains an `ASAPOp`. +- A logical pre-ASAP rewrite: `node` has only `NonASAPOp` nodes and no + guarantee. `is_logical_rewrite(&node)` checks this. -Return: - -```rust -Replacement::Rewrite(...) -``` - -when the candidate is a logical pre-ASAP rewrite. +Set `provenance` to say which one it is (`ReplacementProvenance::SummaryRealization`, +`LogicalRewrite`, ...); selection reads provenance, not the sub-DAG's shape. Use `Replacement::ExactComposition` when a candidate depends on a child target whose implementation must be selected compatibly later. Do not bind it to the @@ -204,7 +201,7 @@ how to realize it, wrap that logic. Do not create a second implementation of the same semantics inside the strategy. -The existing `SketchAlgorithmStrategy` is the model to follow: it reuses +The existing `ASAPStrategies` is the model to follow: it reuses `replacement.rs`'s existing candidate list and summary-construction path. --- @@ -229,23 +226,23 @@ If your transformation requires context not currently represented in `TargetSubD --- -### Example: current `SketchAlgorithmStrategy` +### Example: current `ASAPStrategies` -`SketchAlgorithmStrategy` is the reference implementation for a strategy that +`ASAPStrategies` is the reference implementation for a strategy that produces constructed post-ASAP summaries. Construction: ```rust let strategy = - SketchAlgorithmStrategy::default_cost_model(); + ASAPStrategies::default_cost_model(); ``` or with a custom cost model: ```rust let model = MyCostModel; // illustrative -let strategy = SketchAlgorithmStrategy::new(&model); +let strategy = ASAPStrategies::new(&model); ``` The strategy matches supported aggregate nodes. @@ -254,10 +251,10 @@ At a high level: ```mermaid flowchart LR - A["Input TargetSubDAG
root is a supported Aggregate"] --> B["SketchAlgorithmStrategy::matches
check whether the target shape can produce summaries"] - B -->|"true"| C["SketchAlgorithmStrategy::replacements
use CostModel preferences and sizing while preserving
every semantically valid realization"] + A["Input TargetSubDAG
root is a supported Aggregate"] --> B["ASAPStrategies::matches
check whether the target shape can produce summaries"] + B -->|"true"| C["ASAPStrategies::replacements
use CostModel preferences and sizing while preserving
every semantically valid realization"] B -->|"false"| NONE["Empty candidate list"] - C --> F["Output Vec<ReplacementSubDAG>
each entry contains a constructed SummaryNode and rationale;
all candidates retained in preferred order"] + C --> F["Output Vec<ReplacementSubDAG>
each entry contains a constructed summary sub-DAG and rationale;
all candidates retained in preferred order"] ``` For an approximate quantile, both KLL and DDSketch remain candidates when @@ -271,16 +268,17 @@ even if the cost model prefers one. When only one realization is legal, such as Call the public strategy interface and inspect every returned candidate: ```rust -let strategy = SketchAlgorithmStrategy::new(&cost_model); +let strategy = ASAPStrategies::new(&cost_model); let candidates = strategy.replacements(&target); for candidate in candidates { match candidate.replacement { - Replacement::Summary(summary) => { - // Inspect or execute this constructed SummaryNode. + Replacement::SubDAG(node) => { + // A constructed summary sub-DAG (`node.is_asap()`), or a kept + // pre-ASAP sub-DAG with an exact guarantee for pass-through. } - Replacement::Rewrite(_) => unreachable!( - "SketchAlgorithmStrategy produces summary candidates" + Replacement::ExactComposition(_) => unreachable!( + "ASAPStrategies produces sub-DAG candidates" ), } } @@ -310,16 +308,16 @@ and returns two alternatives: 2. Build independently for each consumer. ``` -The shared candidate reuses the same `Rc`: +The shared candidate reuses the same `Rc`: ```rust -Replacement::Rewrite(Rc::clone(target.root)) +Replacement::SubDAG(Rc::clone(target.root)) ``` The independent candidate creates a structurally equal but separately allocated node: ```rust -Replacement::Rewrite( +Replacement::SubDAG( Rc::new((**target.root).clone()) ) ``` @@ -353,7 +351,7 @@ The basic calling pattern is: ```rust let target = TargetSubDAG::new(&root); let strategy = - SketchAlgorithmStrategy::default_cost_model(); + ASAPStrategies::default_cost_model(); if strategy.matches(&target) { let candidates = @@ -546,13 +544,13 @@ Then inject it into code that accepts a `&dyn CostModel`: let model = PreferDDSketch; let strategy = - SketchAlgorithmStrategy::new(&model); + ASAPStrategies::new(&model); let replacements = strategy.replacements(&target); ``` -Important: changing `rank_candidates` changes the preferred ordering, but `SketchAlgorithmStrategy` still enumerates every valid sketch candidate. +Important: changing `rank_candidates` changes the preferred ordering, but `ASAPStrategies` still enumerates every valid sketch candidate. A custom cost model should not change which alternatives are semantically legal. @@ -641,12 +639,12 @@ Use it for implementation families that are intentionally outside the built-in e --- -#### `readout_extension` +#### `evaluation_extension` -Use when an extension-defined summary also needs custom query/readout behavior. +Use when an extension-defined summary also needs custom query/evaluation behavior. ```rust -fn readout_extension( +fn evaluation_extension( &self, ext_kind: &str, payload: &serde_json::Value, @@ -654,7 +652,7 @@ fn readout_extension( ) -> SketchStatistic; ``` -This complements `realize_extension`: realization defines what gets maintained; readout defines how it is queried (see the [CostModel reference](asap-aware-mapping-contracts.md#costmodel)). +This complements `realize_extension`: realization defines what gets maintained; evaluation defines how it is queried (see the [CostModel reference](asap-aware-mapping-contracts.md#costmodel)). --- @@ -741,7 +739,7 @@ For example: ```rust let strategy = - SketchAlgorithmStrategy::new(&model); + ASAPStrategies::new(&model); let replacements = strategy.replacements(&target); @@ -770,7 +768,7 @@ Declare built-in sketch applicability through the public candidate registry: summary_candidates(intent) ``` -`SketchAlgorithmStrategy` consumes this registry through its public `replacements` method. +`ASAPStrategies` consumes this registry through its public `replacements` method. Therefore, when adding a new built-in sketch algorithm, the intended flow is: @@ -778,9 +776,9 @@ Therefore, when adding a new built-in sketch algorithm, the intended flow is: flowchart LR MAP["1. Declare legality
add the algorithm to summary_candidates
for each AggIntent it can answer"] MAP --> MODEL["2. Define costing
rank it, derive its SketchParams,
and provide a comparable numeric cost"] - MODEL --> BUILD["3. Define realization behavior
ensure the public strategy output contains a valid SummaryNode
with the correct maintained state and readout"] + MODEL --> BUILD["3. Define realization behavior
ensure the public strategy output contains a valid summary sub-DAG
with the correct maintained state and evaluation"] BUILD --> ACC["4. Certify accuracy
derive from committed parameters;
propagate and check the final target"] - ACC --> ENUM["5. Verify integration
SketchAlgorithmStrategy includes it automatically;
tests confirm enumeration, ordering, sizing, and cost"] + ACC --> ENUM["5. Verify integration
ASAPStrategies includes it automatically;
tests confirm enumeration, ordering, sizing, and cost"] ``` This keeps one source of truth for sketch applicability. Applicability alone @@ -793,9 +791,9 @@ ranking; preserve exact fallback and structured rejection information. See the [accuracy implementation companion](end-to-end-accuracy-guarantees.md) for formulas and evidence requirements. For a new algorithm, also update its -parameter, readout, schema and serialization definitions in `asap-types`. +parameter, evaluation, schema and serialization definitions in `asap-types`. -Do not special-case the new sketch inside `SketchAlgorithmStrategy` unless the strategy itself needs fundamentally new behavior. +Do not special-case the new sketch inside `ASAPStrategies` unless the strategy itself needs fundamentally new behavior. ### Verifying a new sketch algorithm @@ -804,7 +802,7 @@ or malformed evidence, incompatible metrics and unsupported composition. Test root-target checking before cost ranking, exact fallback, and exported rejection or guarantee data. A cheaper estimate must never admit an accuracy-illegal plan. -After wiring the new algorithm into `summary_candidates` and giving the cost model a real `rank_candidates`/`size_params` opinion about it, check two things. First, that `SketchAlgorithmStrategy::replacements()` for a matching `TargetSubDAG` actually includes a candidate realizing the new algorithm — extend a test shaped like `replacement.rs`'s own test-module coverage-matrix tests (e.g. `agg_intent_to_summary_kind_coverage_matrix`) to cover the new algorithm's `AggIntent`. Second, that `cost_sorted`/`estimate_cost` produce sane, comparable numbers for the new candidate rather than a `NaN` placeholder or an outlier that swamps every other candidate. +After wiring the new algorithm into `summary_candidates` and giving the cost model a real `rank_candidates`/`size_params` opinion about it, check two things. First, that `ASAPStrategies::replacements()` for a matching `TargetSubDAG` actually includes a candidate realizing the new algorithm — extend a test shaped like `replacement.rs`'s own test-module coverage-matrix tests (e.g. `agg_intent_to_summary_kind_coverage_matrix`) to cover the new algorithm's `AggIntent`. Second, that `cost_sorted`/`estimate_cost` produce sane, comparable numbers for the new candidate rather than a `NaN` placeholder or an outlier that swamps every other candidate. --- @@ -895,10 +893,11 @@ silently disagree. ### Mistake: reimplementing summary construction inside a strategy -If the candidate should produce a normal `SummaryNode`, use the existing +If the candidate should produce a normal summary sub-DAG (`SummaryAgg` / +`SummaryEstimate`), use the existing summary-construction path. -A strategy should steer or wrap that path when necessary, not recreate schema derivation, column resolution, readout construction, or parameter sizing. +A strategy should steer or wrap that path when necessary, not recreate schema derivation, column resolution, evaluation construction, or parameter sizing. --- @@ -922,7 +921,7 @@ Workload-wide target discovery, deduplication, and consumer counting are separat For CSE-style decisions, pointer identity can encode actual sharing. -Two `Rc` values can be structurally equal but deliberately represent independent computation. +Two `Rc` values can be structurally equal but deliberately represent independent computation. Use the distinction intentionally. @@ -937,8 +936,8 @@ When adding a new strategy: - [ ] Implement `ReplacementStrategy::replacements`. - [ ] Return every semantically valid replacement. - [ ] Return an empty vector for non-matching targets. -- [ ] Use `Replacement::Summary` for constructed post-ASAP output. -- [ ] Use `Replacement::Rewrite` for logical pre-ASAP alternatives. +- [ ] Return `Replacement::SubDAG` for both constructed post-ASAP output and + logical pre-ASAP alternatives, with the matching `provenance`. - [ ] Add a useful rationale to every candidate. - [ ] Reuse existing legality and implementation logic instead of duplicating it. - [ ] Keep ranking and cost-based pruning out of the strategy. @@ -953,11 +952,11 @@ When adding a new cost model: - [ ] Keep semantic applicability outside the cost model. - [ ] Use `rank_candidates` for algorithm preference; return every input candidate exactly once. - [ ] Use `size_params` for accuracy-to-parameter mapping. -- [ ] Use extension hooks for extension-defined implementations/readouts. +- [ ] Use extension hooks for extension-defined implementations/evaluations. - [ ] Use CSE hooks for recompute-vs.-sharing costs. - [ ] Override `estimate_cost` if consumers require numeric costs instead of `NaN`. - [ ] Test the hook directly. -- [ ] Test integration through a consumer such as `SketchAlgorithmStrategy`. +- [ ] Test integration through a consumer such as `ASAPStrategies`. - [ ] Verify that changing cost preferences does not silently remove valid replacement candidates. --- @@ -975,12 +974,12 @@ Use this table to find the right place for a change. | Prefer one sketch algorithm over another | `CostModel::rank_candidates` | | Change sketch sizing for an accuracy target | `CostModel::size_params` | | Add extension-defined implementation behavior | `CostModel::realize_extension` | -| Add extension-defined readout behavior | `CostModel::readout_extension` | +| Add extension-defined evaluation behavior | `CostModel::evaluation_extension` | | Change CSE recomputation cost | `CostModel::cse_recompute_cost` | | Change shared-maintenance cost | `CostModel::cse_shared_maintenance_cost` | | Change current share/recompute choice | `CostModel::cse_share_decision` | | Decide whether an available implementation satisfies a required one | `impl Matcher` | -| Produce a normal (ranked-first) post-ASAP summary for one target | `SketchAlgorithmStrategy::replacements(...).into_iter().next()` | +| Produce a normal (ranked-first) post-ASAP summary for one target | `ASAPStrategies::replacements(...).into_iter().next()` | | Search a whole workload for supported legal candidates | `search_workload`/`search_workload_with` | | Enforce per-root result accuracy requirements | `search_workload_with_targets` | | Coordinate compatible choices across groups | `CandidateLogicalASAPDAGs::global_selection` | diff --git a/docs/develop_docs/library-api.md b/docs/develop_docs/library-api.md index 719de6ba2..7e8b2768d 100644 --- a/docs/develop_docs/library-api.md +++ b/docs/develop_docs/library-api.md @@ -15,7 +15,6 @@ do not deploy a plan, and a serializable DAG is not evidence of runtime readines | Pre-ASAP IR | Frontend `lower_*` | [Lower a query](#lower-a-query-into-pre-asap-ir) | | All ranked candidates | `search_workload_with_targets` -> `cost_sorted` | [Generate and rank](#generate-and-rank-candidates) | | Custom optimization set | Construct `Vec>`, then search | [Strategies and models](#choose-strategies-and-models) | -| Summary-maintenance lifecycle comparison | Lifecycle-aware selection -> DAG assembly with maintenance decisions | [Lifecycle recipe](#lifecycle-and-capabilities) | | Selected semantic DAG / export | `global_selection` -> `assemble_selected_dag` -> export | [Selection example](#optional-whole-plan-selection-and-dag-assembly) | Each recipe ends at a different artifact. Use only the stages needed for that @@ -38,14 +37,16 @@ asap-types = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "e7fdb2 | Public function | Required input | Output | | --- | --- | --- | -| `asap_frontend_promql::lower_promql_workload` | PromQL `PlanningWorkload` with a nonzero `data_ingestion_interval` | All-or-nothing `Result, PromqlError>` for normalized batch and repeating entries | -| `asap_frontend_metricsql::lower_metricsql` | Query string, `AccuracyTarget` | `Result` | -| `asap_frontend_sql::lower_sql` | Query string, `SqlCatalog`, accuracy | Async `Result`; default SQL dialect is DataFusionSQL | +| `asap_frontend_promql::lower_promql_workload` | PromQL `PlanningWorkload` with a nonzero `data_ingestion_interval` | All-or-nothing `Result>, PromqlError>` for normalized batch and repeating entries | +| `asap_frontend_metricsql::lower_metricsql` | Query string, `AccuracyTarget` | `Result, MetricsqlError>` | +| `asap_frontend_sql::lower_sql` | Query string, `SqlCatalog`, accuracy | Async `Result, SqlError>`; default SQL dialect is DataFusionSQL | | `asap_frontend_sql::lower_sql_dialect` | Same inputs plus `SqlDialect` | Async resolved Pre-ASAP query or error | | `asap_frontend_sql::lower_sql_batch` | `QueryWorkload` and catalog | Per-query results for `query_batch`; does not iterate `repeating_queries` | Lowering resolves the supported source language into the canonical query -representation. It does not enumerate Post-ASAP alternatives. A frontend may +representation: an `asap_types::ir::OperatorNode` DAG containing only +`NonASAPOp` operators, with no timing (see the +[Pre-ASAP IR reference](pre-asap-ir.md)). It does not enumerate Post-ASAP alternatives. A frontend may reject unsupported syntax or semantics; a declared language/dialect enum does not imply complete support. PromQL workload lowering uses normalized `PlanningWorkload::query_workload.entries()` order, preserving entry-to-root associations for later @@ -58,12 +59,12 @@ PromQL's public signature (types are imported from their respective crates): ```text lower_promql_workload(workload: &PlanningWorkload, now_ms: u64) - -> Result, PromqlError> + -> Result>, PromqlError> ``` `DataWorkload.data_ingestion_interval` must contain a nonzero `Evidence`. Pass the actual planning time as `now_ms` (Unix milliseconds), consistently with -downstream lifecycle planning. Expired or future cadence evidence is rejected, +downstream planning. Expired or future cadence evidence is rejected, as is expiring evidence without an observation timestamp. The histogram variant takes the same timestamp after its histogram catalog argument. The examples use `0` only because their explicitly supplied cadence is timeless. @@ -125,9 +126,9 @@ For SQL, the corresponding signatures are: ```text async lower_sql(query: &str, catalog: &SqlCatalog, accuracy: AccuracyTarget) - -> Result + -> Result, SqlError> async lower_sql_dialect(query: &str, catalog: &SqlCatalog, - dialect: SqlDialect, accuracy: AccuracyTarget) -> Result + dialect: SqlDialect, accuracy: AccuracyTarget) -> Result, SqlError> ``` | `SqlDialect` value | Current behavior | @@ -162,7 +163,7 @@ It keeps the alternatives available; it does not select an entire workload plan. ```text search_workload_with_targets<'s, Id>( - roots: Vec<(Id, Rc, Option)>, + roots: Vec<(Id, Rc, Option)>, strategies: &[Box], accuracy_model: &dyn AccuracyModel, ) -> CandidateLogicalASAPDAGs @@ -197,7 +198,6 @@ accuracy target, and prints every ranked candidate instead of selecting a winner The default cost model is suitable for inspection, not deployment calibration. ```rust -use std::rc::Rc; use asap_frontend_promql::lower_promql_workload; use asap_types::workload::{ AccuracyRequirement, BatchEntry, DataWorkload, DurationMs, Evidence, Query, @@ -235,7 +235,7 @@ fn main() -> Result<(), Box> { ..Default::default() }), }; - let root = Rc::new(lower_promql_workload(&workload, 0)?.remove(0)); + let root = lower_promql_workload(&workload, 0)?.remove(0); let cost_model = DefaultCostModel; let strategies = default_strategies_with(&cost_model); let space = search_workload_with_targets( @@ -254,12 +254,12 @@ fn main() -> Result<(), Box> { | API (`asap_aware_mapping`, unless qualified) | Inputs | Output and limits | | --- | --- | --- | -| `search_workload` | `(query_id, Rc)` roots | `CandidateLogicalASAPDAGs` with built-in strategies/model; no explicit per-root target argument | +| `search_workload` | `(query_id, Rc)` roots | `CandidateLogicalASAPDAGs` with built-in strategies/model; no explicit per-root target argument | | `search_workload_with` | Roots, strategy slice | `CandidateLogicalASAPDAGs`; callers choose context-free replacement strategies | | `search_workload_with_targets` | Roots with optional end-to-end targets, strategies, accuracy model | Candidate space with supplied root-target checks; `None` does not supply a root-level requirement; uncertified direct DDSketch ratios remain available for backend selection | | `CandidateLogicalASAPDAGs::cost_sorted` | Cost model | `Vec`; retains alternatives and pairs `candidates[i]` with `costs[i]` | | `CandidateLogicalASAPDAGs::cost_sorted_with_recurrence` | Cost model, recurrence profiles, optional horizon | Ranked per-target candidate sets or `RecurrenceError`; uses recurrence for applicable share/recompute comparisons | -| `SketchAlgorithmStrategy::replacements` through `ReplacementStrategy` | One `TargetSubDAG` | Alternatives at that target; not whole-workload search | +| `ASAPStrategies::replacements` through `ReplacementStrategy` | One `TargetSubDAG` | Alternatives at that target; not whole-workload search | `cost_sorted` is a ranking view, not a request to discard all but the first candidate. Display costs follow model hooks and may be unavailable/non-finite; @@ -279,15 +279,16 @@ choices are not multiplied in. Exceeding `expansion_limit` is an error, never a partial inventory. For PromQL roots that carry a target, `search_workload_with_targets` also asks -each strategy's `ReplacementStrategy::propose_for_root`. `SketchAlgorithmStrategy` +each strategy's `ReplacementStrategy::propose_for_root`. `ASAPStrategies` answers an instant-vector TopK with current-series heap realizations over rows carrying the complete series identity (`$promql_series_identity`). They are finalized, deduplicated, and marked `ReplacementProvenance::RootPhysicalRealization`. Callers do not apply `with_series_identity` themselves. Compile each with -`promql_rows::compile_current_series_readout`; other queries keep their previous +`promql_rows::compile_current_series_evaluation`; other queries keep their previous inventory. `global_selection` never commits these candidates; the backend compiles and prices them. CandidateLogicalASAPDAGs lists no placement variants: node timing -comes from the summary maintenance lifecycle. +comes from a `MaterializationAssignment` (all query time until Stage 2 +materialization, #509, decides otherwise). ## Choose strategies and models @@ -300,11 +301,11 @@ pass. An omitted strategy contributes no proposals of its own. | Value to put inside `Box::new(...)` | Meaning | In default factories? | | --- | --- | --- | -| `SketchAlgorithmStrategy::new(&model)` | Enumerates supported exact/sketch implementations and parameter choices for aggregate targets | Yes | +| `ASAPStrategies::new(&model)` | Enumerates supported exact/sketch implementations and parameter choices for aggregate targets | Yes | | `HydraGroupingStrategy::new(&model)` | Considers a shared multi-subpopulation structure for supported grouped sketch families, subject to accuracy evidence | Yes | | `SharedSubDAGStrategy` | Proposes sharing versus independent recomputation at reused sub-DAGs | Yes | | `SemanticEquivalentRewriteStrategy` | Proposes supported equivalent aggregate rewrites, including decomposing average into sum/count | Yes | -| `ExactCompositionStrategy::new(&model)` | Proposes supported exact operations around summary readouts or in maintenance | Yes | +| `ExactCompositionStrategy::new(&model)` | Proposes supported exact operations around summary evaluations or in maintenance | Yes | | Your `ReplacementStrategy` implementation | Adds domain-specific legal replacement proposals | No | `AvgToSumOverCountStrategy` is an alias for `SemanticEquivalentRewriteStrategy` @@ -345,7 +346,6 @@ replacement::default_strategies_with_evidence<'a>( ### Example: supply two strategies and run search ```rust -use std::rc::Rc; use asap_frontend_promql::lower_promql_workload; use asap_types::workload::{ AccuracyRequirement, BatchEntry, DataWorkload, DurationMs, Evidence, Query, @@ -353,7 +353,7 @@ use asap_types::workload::{ }; use asap_aware_mapping::{ search_workload_with_targets, DefaultAccuracyModel, DefaultCostModel, - ReplacementStrategy, SketchAlgorithmStrategy, SharedSubDAGStrategy, + ReplacementStrategy, ASAPStrategies, SharedSubDAGStrategy, }; use asap_types::types::AccuracyTarget; @@ -383,10 +383,10 @@ fn main() -> Result<(), Box> { ..Default::default() }), }; - let root = Rc::new(lower_promql_workload(&workload, 0)?.remove(0)); + let root = lower_promql_workload(&workload, 0)?.remove(0); let model = DefaultCostModel; let strategies: Vec> = vec![ - Box::new(SketchAlgorithmStrategy::new(&model)), + Box::new(ASAPStrategies::new(&model)), Box::new(SharedSubDAGStrategy), ]; let space = search_workload_with_targets( @@ -409,7 +409,7 @@ Module-qualified paths below are relative to `asap_aware_mapping`. | Parameter | Available value / constructor | Meaning | | --- | --- | --- | | `&dyn CostModel` | `DefaultCostModel` | Built-in ordering/sizing and structural estimates; no measured deployment guarantee | -| `&dyn CostModel` | `empirical_cost::EmpiricalCostModel::new(provider)` | Offline sketch-benchmark model: ranks algorithms using matching offline measurements and supplies partial lifecycle costs | +| `&dyn CostModel` | `empirical_cost::EmpiricalCostModel::new(provider)` | Offline sketch-benchmark model: ranks algorithms using matching offline measurements | | `&dyn CostModel` | `physical_plan_cost_model::PhysicalPlanCostModel::new(&provider, calibration)?` | Deployment-specific physical-plan model: compares complete physical alternatives using provider evidence and resource calibration; evidence may be offline or online | | `&dyn AccuracyModel` | `DefaultAccuracyModel` | Built-in guarantee rules and satisfaction checks | | `&dyn AccuracyBudgetAllocator` | `EqualSplitAllocator` | Built-in allocation of composition accuracy budgets | @@ -423,7 +423,7 @@ These models differ in scope, not simply in whether they are offline or online. | Model | Evidence and comparison | Missing evidence / limits | | --- | --- | --- | -| `EmpiricalCostModel` | Offline sketch benchmarks matched to exact parameters, distribution, environment and validity interval; current algorithm ranking uses measured update CPU nanoseconds | If the measurements required for ranking are incomplete, preserves the incoming algorithm order. Supplies partial build/update lifecycle costs; `estimate_cost()` still uses `DefaultCostModel` structural scores | +| `EmpiricalCostModel` | Offline sketch benchmarks matched to exact parameters, distribution, environment and validity interval; current algorithm ranking uses measured update CPU nanoseconds | If the measurements required for ranking are incomplete, preserves the incoming algorithm order. `estimate_cost()` still uses `DefaultCostModel` structural scores | | `PhysicalPlanCostModel` | A downstream provider supplies a consistent evidence snapshot and complete physical alternatives; calibration converts modeled resource quantities into comparable costs | A candidate with incomplete evidence is unavailable, without structural-cost fallback. Current candidate admission also requires it to cost less than the raw alternative | `PhysicalPlanCostModel` does not collect online telemetry itself. Its provider @@ -442,7 +442,7 @@ accuracy guarantees. ```rust use asap_aware_mapping::{ DefaultAccuracyModel, DefaultCostModel, EqualSplitAllocator, - NoAccuracyEvidence, ReplacementStrategy, SketchAlgorithmStrategy, + NoAccuracyEvidence, ReplacementStrategy, ASAPStrategies, }; fn main() { @@ -451,7 +451,7 @@ fn main() { let allocation = EqualSplitAllocator; let evidence = NoAccuracyEvidence; let strategies: Vec> = vec![Box::new( - SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence( + ASAPStrategies::new_with_planning_inputs_and_evidence( &cost, &accuracy, &allocation, &evidence, ), )]; @@ -463,22 +463,22 @@ fn main() { Constructor definition: ```text -SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence( +ASAPStrategies::new_with_planning_inputs_and_evidence( cost_model: &dyn CostModel, accuracy_model: &dyn AccuracyModel, allocator: &dyn AccuracyBudgetAllocator, evidence: &dyn AccuracyEvidenceProvider, -) -> SketchAlgorithmStrategy +) -> ASAPStrategies ``` All provider arguments are required for this constructor. They must outlive the -strategy vector. `SketchAlgorithmStrategy::new(&cost_model)` is the shorter +strategy vector. `ASAPStrategies::new(&cost_model)` is the shorter constructor using default accuracy/allocation and no extra evidence. | Extension point | What it controls | What it cannot establish alone | | --- | --- | --- | | `ReplacementStrategy` | Proposed semantic alternatives | Permission to violate query semantics or downstream support | -| `CostModel` | Candidate ordering/sizing hooks, recurrence/lifecycle and complete-cost evidence hooks | Correctness, measured costs without evidence, or installed runtime support | +| `CostModel` | Candidate ordering/sizing hooks and recurrence cost hooks | Correctness, measured costs without evidence, or installed runtime support | | `AccuracyModel` | Derivation, propagation and satisfaction of guarantees | A meaningful guarantee without its required assumptions/evidence | | `AccuracyBudgetAllocator` | Local accuracy requirements proposed within composition | End-to-end correctness without subsequent validation | | `AccuracyEvidenceProvider` | Planning-time statistics used by supported strategies | Authority to change query requirements | @@ -488,7 +488,7 @@ with the intended model/evidence; replacing only the final sorting model does no regenerate parameter choices. For evidence-aware defaults, use `asap_aware_mapping::replacement::default_strategies_with_evidence`. For custom accuracy/allocation/evidence on sketches, -`SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence` exposes these providers. +`ASAPStrategies::new_with_planning_inputs_and_evidence` exposes these providers. Keep each provider's evidence scope and freshness valid for the query population. ## Workload inputs and defaults @@ -497,12 +497,9 @@ Keep each provider's evidence scope and freshness valid for the query population inputs. `QueryWorkload` contains the language and optional batch/repeating entries. Entries carry requirements, predictability, recurrence and time selection. These facts are separate: repeated queries can read data at rest. -`WorkloadDemand` associates a target with the relevant workload entry indices -and explicitly includes or omits the parallel data evidence. -Both recurrence and lifecycle planning validate this independent data evidence: -ingestion rates must be finite and nonnegative, and data at rest cannot have a -positive ingestion rate. `DataWorkload::validate()` shares these checks with -`PlanningWorkload::validate()`. +`DataWorkload::validate()` checks the independent data evidence: ingestion +rates must be finite and nonnegative, and data at rest cannot have a positive +ingestion rate. `PlanningWorkload::validate()` shares these checks. | Type/input | Current behavior | Caller responsibility | | --- | --- | --- | @@ -510,188 +507,11 @@ positive ingestion rate. `DataWorkload::validate()` shares these checks with | `DataWorkload::default()` | Unknown arrival, unknown evidence | Supply facts needed for the requested comparisons | | `Evidence::default()` | No value, unknown source | Unknown/stale evidence is not zero; provide scoped valid observations | | `DefaultCostModel` | Built-in ordering/sizing and structural cost hooks | Supply deployment evidence for calibrated comparisons | -| `SummaryMaintenanceLifecycleCostInputs::default()` | All primitive costs unknown | Implement the required lifecycle cost hooks; structural defaults are insufficient | -| `horizon: None` in lifecycle planning | Horizon-dependent alternatives are unselectable | Supply a positive horizon when comparing rates/amortized reuse | -| Lifecycle capabilities default | All four modes enabled | Override with the actual runtime support | -| Per-summary maintenance capabilities default | Incremental update, merge, delete all false | Advertise supported operations for the concrete state representation | `Default` is a Rust constructor contract, not a general serde omission rule. Several workload fields require explicit serialized values. A struct field being optional also does not guarantee every planning operation can succeed without it. -## Lifecycle and capabilities - -Use this workflow when Planner owns summary-maintenance lifecycle decisions; -otherwise the backend may make them from logical candidates. It includes both -selection and DAG assembly, so callers do not first run the ordinary workflow. -The first helper returns one `GlobalSelection`; the second is called per root -and returns a plan containing `root: Rc` plus maintenance decisions. -See the [workflow design](../design_docs/architecture/input-output-workflow.md#summary-maintenance-lifecycle-aware-helper). - -Two capabilities are distinct: the runtime can orchestrate a lifecycle, and the -chosen summary representation supports the required state operations. Both must -hold. Workload legality and known cost evidence can further restrict alternatives. - -### API definition and options - -```text -global_selection_with_summary_maintenance_lifecycles<'a, Id>( - space: &'a CandidateLogicalASAPDAGs, demand: WorkloadDemand<'_>, - now_ms: u64, horizon: Option, - capabilities: SummaryMaintenanceLifecycleCapabilities, cost_model: &dyn CostModel, -) -> Result, SummaryMaintenanceLifecycleSelectionError> - -assemble_selected_dag_with_summary_maintenance_lifecycles( - selection: &GlobalSelection<'_>, target: &Rc, - demand: WorkloadDemand<'_>, now_ms: u64, horizon: Option, - capabilities: SummaryMaintenanceLifecycleCapabilities, cost_model: &dyn CostModel, -) -> Result, SummaryMaintenanceLifecycleAssemblyError> -``` - -| Argument | Values / requirements | -| --- | --- | -| `space`, `demand` | Actual candidate space plus query demand, optional data evidence, and one normalized workload entry index for each `space.roots` entry | -| `target` | A root from `space.roots`, after canonical sharing | -| `demand` | `WorkloadDemand::new_with_data(...)` when data evidence is available; use `new_without_data(...)` only when its absence is intentional | -| `now_ms` | Actual planning time in Unix milliseconds for evidence freshness | -| `horizon` | `Some(Horizon(seconds))` with positive finite seconds, or `None` when horizon-dependent comparisons are unavailable | -| `capabilities` | Explicit Boolean fields below; several may be true | -| `cost_model` | A model supplying required lifecycle and raw-comparison evidence; default structural estimates are not enough | - -| Capability field | `true` permits consideration of… | `false` means… | -| --- | --- | --- | -| `supports_ephemeral` | Fresh build per invocation, retired afterward | Exclude that lifecycle | -| `supports_prepared` | Build before a predictable execution and retain until it | Exclude that lifecycle | -| `supports_shared` | Retain state for multiple reads | Exclude that lifecycle | -| `supports_continuously_maintained` | Keep state current as updates arrive | Exclude that lifecycle | - -All flags default to true; integrations should pass real support. Enabling a -flag does not override workload, algorithm-operation or evidence checks. - -### Example: lifecycle-aware planning for a batch-only runtime - -This helper takes the real workload and cost provider from your application. -It supports one searched root mapped to one workload entry, and returns a typed -plan/error rather than making up costs. For a shared root consumed by several -entries, construct demand using all applicable indices. - -```rust -use asap_aware_mapping::{ - global_selection_with_summary_maintenance_lifecycles, - assemble_selected_dag_with_summary_maintenance_lifecycles, CostModel, Horizon, CandidateLogicalASAPDAGs, - SummaryMaintenanceLifecycleCapabilities, SummaryMaintenanceLifecyclePlan, - WorkloadDemand, -}; -use asap_types::workload::PlanningWorkload; - -fn plan_batch_root( - space: &CandidateLogicalASAPDAGs<&str>, - workload: &PlanningWorkload, - entry_index: usize, - now_ms: u64, - horizon: Option, - model: &dyn CostModel, -) -> Result, Box> { - if space.roots.len() != 1 { - return Err("this example requires exactly one root".into()); - } - let capabilities = SummaryMaintenanceLifecycleCapabilities { - supports_ephemeral: true, - supports_prepared: false, - supports_shared: false, - supports_continuously_maintained: false, - }; - let indices = [entry_index]; - let demand = WorkloadDemand { - workload: &workload.query_workload, - data_workload: workload.data_workload.as_ref(), - entry_indices: &indices, - }; - let selection = global_selection_with_summary_maintenance_lifecycles( - space, demand, now_ms, horizon, capabilities, model, - )?; - let plan = assemble_selected_dag_with_summary_maintenance_lifecycles( - &selection, &space.roots[0].1, demand, - now_ms, horizon, capabilities, model, - )?; - if let Some(plan) = &plan { - println!("raw_recompute={}, deployments={:#?}", - plan.selected_raw_recompute, plan.deployments); - } - Ok(plan) -} -``` - -Use this helper with the `space` built by the search example and the corresponding -workload/provider. No incremental lifecycle is permitted, but unknown evidence -can still prevent choosing summary state. If only one legal alternative remains, -recording it is a complete lifecycle decision. Data-at-rest alone does not imply -that prepared or retained shared state is supported. - -| Function | Inputs | Output / promise | -| --- | --- | --- | -| `plan_summary_maintenance_lifecycles` | Assembled logical DAG root, `WorkloadDemand`, `now_ms`, optional horizon, runtime capabilities, cost model | `Result` for that fixed root; does not revisit all semantic candidates | -| `global_selection_with_summary_maintenance_lifecycles` | `CandidateLogicalASAPDAGs`, workload/root-entry associations, time, horizon, capabilities, cost model | Lifecycle-aware compatible selection/error, using eligible cost evidence | -| `assemble_selected_dag_with_summary_maintenance_lifecycles` | Selection, target root and lifecycle context | Optional lifecycle plan/error; attaches state deployment decisions | -| `enumerate_summary_maintenance_lifecycles` | Same inputs as `plan_summary_maintenance_lifecycles` | `SummaryMaintenanceLifecycleCandidates`: per unique retained state, every alternative with its cost or rejection; nothing selected. `guarantee(&lifecycle)` gives the mode/schedule that alternative would carry | -| `SummaryMaintenanceLifecycleCandidates::select(choices)` | One `(PostAsapNodeId, SummaryMaintenanceLifecycle)` per state, copied from `deployments()` | The same `SummaryMaintenanceLifecyclePlan` Planner selection would produce for that combination, or `SummaryMaintenanceLifecycleChoiceError` when a choice is unknown, missing, duplicated, rejected, schedule-incompatible, or not completely estimable | - -Inspect `deployments`, their selected lifecycle/alternatives/rejections, -`selected_raw_recompute`, and optional summary/raw costs. Success of a function -call alone is not a certificate that every desired summary was selected or fully -costed. A raw alternative remains a downstream execution obligation. - -Lifecycle feasibility and costs must affect final deployment comparison. Running -lifecycle analysis after structural selection can evaluate the selected root, -but does not make the earlier selection lifecycle-optimal. An application may -consume ranked candidates and perform this comparison downstream instead. - -A deployment that prices lifecycles itself calls -`enumerate_summary_maintenance_lifecycles`, prices the alternatives, and binds -its choice with `select`. A choice is accepted only if Planner could select it: -an alternative with `MissingCostEvidence` is accepted only when the cost model's -complete-candidate hook covers lifecycle costs. Window frameworks and totals come -from that hook, as in Planner selection. - -A lifecycle choice then fixes each physical placement through timing: a -continuously maintained state and its inputs run at ingestion time, while an -ephemeral one stays at query time. Compile each query's `PostAsapDAG` once and -cut every chosen assignment from that result: - -```rust -use asap_physical_operators::physical_planner::{ - compile, cut_candidate, frontier_from_timing, -}; - -let compiled = compile(&dag, inputs, &roots)?; // each node lowered once -for plan in lifecycle_plans { - let frontier = frontier_from_timing(&plan.execution_timed_dag()?)?; - // Precompute/query DAGs split at `frontier`; no logical lowering. - let candidate = cut_candidate(&compiled, &frontier)?; - // Check feasibility and price `candidate`; bind the selected one as is. -} -``` - -The frontier is the set of ingestion-time nodes read by query-time nodes (or an -ingestion-time root). `frontier_from_timing` rejects a query-time node feeding -an ingestion-time node. `cut_candidate` returns exactly what -`compile_candidate(&dag, inputs, &roots, &frontier)` returns and rejects the -same invalid frontiers. If the DAG has an ingestion-time `Binary`, compile with -the same timing for that node, because it lowers differently. Temporal pane -candidates are a different lowering and still use -`compile_temporal_pane_candidate`. - -Retained states are `SummaryAgg` nodes and `MaintainPopulation` nodes that do -not feed a `SummaryAgg`; a population that does feed one is part of that -state's input. The lifecycle cost hooks (`summary_maintenance_capabilities`, -`summary_maintenance_lifecycle_cost_inputs_for_horizon`) and the complete-candidate -hook therefore also receive `MaintainPopulation` nodes. A model that does not -recognize one should return unknown costs, which keep its alternatives -unselected; a model that prices every node uniformly now also prices -populations, so population candidates can win lifecycle-aware selection. `SummaryMaintenanceLifecyclePlan::execution_timed_dag` times a -population as it times a summary state: retained at ingestion, `Ephemeral` at -query time from the raw source. - ## Optional whole-plan selection and DAG assembly ### What does global selection mean? @@ -727,15 +547,15 @@ constructs the selected semantic DAG while preserving shared nodes. | `cost_sorted()` | How are the alternatives ranked for each subexpression? | Ranked alternatives per target | | `global_selection()` | Which compatible choices should be used together, accounting for sharing and dependencies? | A coordinated selection across targets under the supplied model | -Plain `global_selection()` does not automatically perform lifecycle planning or -establish physical deployment feasibility. Use the corresponding evidence-aware -workflow for those decisions. Downstream still owns physical commitment. +Plain `global_selection()` does not decide materialization or establish +physical deployment feasibility. Stage 2 materialization (#509) will own +materialization; downstream still owns physical commitment. | Method on `CandidateLogicalASAPDAGs` / `GlobalSelection` | Behavior | | --- | --- | -| `CandidateLogicalASAPDAGs::global_selection(&model)` | Compatible structural selection across targets; no recurrence or lifecycle planning implied | -| `CandidateLogicalASAPDAGs::global_selection_with_recurrence(...)` | Compatible selection using supplied recurrence profiles/horizon; no lifecycle commitments implied | -| `GlobalSelection::assemble_selected_dag(&target)` | `Result>, RealizationError>`; constructs semantic IR, not stored summary data | +| `CandidateLogicalASAPDAGs::global_selection(&model)` | Compatible structural selection across targets; no recurrence or materialization planning implied | +| `CandidateLogicalASAPDAGs::global_selection_with_recurrence(...)` | Compatible selection using supplied recurrence profiles/horizon; no materialization commitments implied | +| `GlobalSelection::assemble_selected_dag(&target)` | `Result>, RealizationError>`; constructs untimed semantic IR, not stored summary data | Use a target associated with the searched space; DAG assembly can return `None` when that target is absent. A downstream integration can use these convenience @@ -747,16 +567,15 @@ for checking complete physical alternatives and deployment constraints. ```text CandidateLogicalASAPDAGs::global_selection(&self, cost_model: &dyn CostModel) -> GlobalSelection<'_> -GlobalSelection::assemble_selected_dag(&self, target: &Rc) - -> Result>, RealizationError> +GlobalSelection::assemble_selected_dag(&self, target: &Rc) + -> Result>, RealizationError> ``` For structural inspection only, this complete example selects a semantic root -and exports its inspection DAG. It performs no lifecycle or deployment planning. -Use lifecycle-aware selection above when the comparison needs those decisions. +and exports its inspection DAG. It performs no materialization or deployment +planning. ```rust -use std::rc::Rc; use asap_frontend_promql::lower_promql_workload; use asap_types::workload::{ AccuracyRequirement, BatchEntry, DataWorkload, DurationMs, Evidence, Query, @@ -790,7 +609,7 @@ fn main() -> Result<(), Box> { ..Default::default() }), }; - let root = Rc::new(lower_promql_workload(&workload, 0)?.remove(0)); + let root = lower_promql_workload(&workload, 0)?.remove(0); let space = search_workload(vec![("q1", root)]); let selection = space.global_selection(&DefaultCostModel); // Search may canonicalize roots; use the root returned by CandidateLogicalASAPDAGs. @@ -806,15 +625,15 @@ fn main() -> Result<(), Box> { | Function/type | Purpose | | --- | --- | -| `asap_types::dag_export::export(&query)` | Pre-ASAP inspection DAG | -| `asap_types::dag_export::export_summary(&summary)` | Post-ASAP inspection DAG | -| `asap_types::post_asap::compile_post_asap_dag(&root)` | Compile a semantic DAG with execution-data-state validation; not a physical plan | +| `asap_types::dag_export::export(&query)` | Pre-ASAP inspection dag | +| `asap_types::dag_export::export_summary(&summary)` | Post-ASAP inspection dag | +| `asap_types::ir::apply_materialization_timings(&root, &assignment, &mut TimingMemo::new())` | Write execution timing into every node from a `MaterializationAssignment` (default: all query time) and validate the data-state edges; `PlanOutput::execution_timed_dag()` applies the default to a planned workload | +| `asap_types::ir::export::compile_post_asap_dag(&timed_root)` | Export a timed DAG as a `PostAsapDAG` (wire version 7); rejects an untimed node; not a physical plan | | `PostAsapDAGDocument::new(dag)` and `.validate()` | Versioned semantic envelope and explicit validation; constructing it alone does not validate | -| `asap_aware_mapping::export_summary_maintenance_plan(&plan)` | DAG plus lifecycle deployments, alternatives and available cost/guarantee information | | `explain_replacements` / `explain_replacements_with` | Findings from default/custom-strategy search; not a complete physical feasibility report | Choose the export matching your intended handoff: an inspection DAG is not -interchangeable with a versioned execution contract. Preserve lifecycle and +interchangeable with a versioned execution contract. Preserve cost/guarantee evidence needed downstream instead of exporting only a bare DAG. For public symbol details, build local API documentation with: @@ -827,6 +646,5 @@ cargo doc -p asap-aware-mapping -p asap-types --no-deps - [Frontend PromQL](../../crates/frontend-promql/src/lib.rs), [SQL](../../crates/frontend-sql/src/lib.rs), [MetricsQL](../../crates/frontend-metricsql/src/lib.rs) - [Search, ranking and selection](../../crates/asap-aware-mapping/src/replacement.rs) - [Cost models](../../crates/asap-aware-mapping/src/cost_model.rs) -- [Lifecycle APIs](../../crates/asap-aware-mapping/src/summary_maintenance_lifecycle.rs) - [Workload types](../../crates/types/src/workload.rs) - [Planner-runtime contract](../design_docs/architecture/planner-runtime-contract.md) diff --git a/docs/develop_docs/local-logical-candidates.md b/docs/develop_docs/local-logical-candidates.md new file mode 100644 index 000000000..b27e9b2d2 --- /dev/null +++ b/docs/develop_docs/local-logical-candidates.md @@ -0,0 +1,39 @@ +# Local logical alternatives (Pass 1) + +`asap_aware_mapping::logical_candidates` enumerates local realization choices over +unified `OperatorNode` and `QueryRoot` inputs. It is the first part of logical +ASAP optimization in [planner layering](../design_docs/proposals/planner-layering.md). + +`enumerate_local_logical_candidates(roots)` returns a `LocalLogicalCandidates` +inventory containing the original named roots and one `LocalLogicalTarget` per +reachable single-measure aggregate. Discovery includes operator producers read by +scalar roots and expressions. Pointer identity prevents repeated discovery of one +shared producer. Inputs with assigned execution timing are rejected. + +Each target retains its original operator, including grouping, filter and input +context, and has an unranked list of existing `Realization` descriptors: + +- Exact execution of the original sub-DAG is always retained as `PassThrough`. +- Mergeable exact intents also offer their exact accumulator kind and parameters. +- Approximate-capable intents offer all declared specialized/universal sketch + algorithms with nominal dimensions from the built-in sizing contracts. +- Exact accuracy requests do not acquire approximate alternatives. Distinct-tuple + counts do not acquire single-value UnivMon alternatives. + +For example, an approximate single-column distinct count offers exact execution, +HLL, Theta, KMV and UnivMon. These are candidate choices, not assessed accuracy +certificates. Catalog order is stable and has no cost/preference meaning. + +The API accepts no empirical cost or accuracy model, runtime capabilities, storage +policy or materialization assignment. It does not rank, select, construct runtime +state or claim physical feasibility. Pass 2 must compose and structurally validate +replacement sub-DAGs and retain independent/shared alternatives before physical +planning and complete workload selection. The descriptors are not executable +plans, and callers must not execute the first choice as a selection policy. + +Multi-measure aggregates remain intact in the roots until an explicit semantic +split is supported. Opaque deployment extensions retain exact execution here; +additional local alternatives require an explicit logical rule rather than a cost +model making a generation decision. The legacy ranked search remains available +for the existing pipeline until its later cutover; this module supplies the new +logical-only entry point without changing production selection prematurely. diff --git a/docs/develop_docs/logical-asap-dag.md b/docs/develop_docs/logical-asap-dag.md new file mode 100644 index 000000000..99696b175 --- /dev/null +++ b/docs/develop_docs/logical-asap-dag.md @@ -0,0 +1,50 @@ +# Logical ASAP DAG transport + +This interface exports the unified operator/scalar IR at the logical stage of +[planner layering](../design_docs/proposals/planner-layering.md). It describes +what to compute, including committed summary families, before physical planning +chooses implementations and materialization. + +## Interface + +`asap_types::ir::export` exposes: + +- `compile_logical_asap_dag(&Rc)` for a flat `LogicalASAPDAG`. +- `compile_logical_asap_query(&QueryRoot)` for operator or standalone scalar roots. +- `compile_logical_asap_dag_with_node_ids(...)` for that DAG and a compiler-local + `LogicalASAPNodeIdentityMap` with `node_id` and `operator_node` lookups. +- `LogicalASAPDAGDocument::new(dag)` and `validate()` for the versioned transport + envelope. Logical wire version 1 is distinct from the older phase-assigned + post-ASAP format. + +The compiler first checks the in-memory DAG's structural contracts. Untimed +ordinary plans and summary plans are valid inputs. Export does not assess +accuracy against request requirements or select a physical plan. + +Each `LogicalASAPDAGNode` contains an ID, operator payload, result kind, output +schema and optional accuracy guarantee. Each `LogicalASAPDAGEdge` contains +producer/consumer IDs, input role, intermediate schema and grouping compatibility. +The DAG has one semantic operator or scalar root. A standalone scalar constant +needs no synthetic operator node. IDs are local to one export. + +Scalar expressions remain owned by their operators. Their wire representations +replace explicit operator references with IDs. `ScalarRef` edges record those +producer dependencies. A shared operator is exported once even when ordinary +inputs and scalar expressions both reference it. + +## Physical boundary + +Logical nodes and edges contain no execution state, assigned timing, storage tier, +retention or pane-alignment assertion. Physical planning chooses, for each eligible +sub-DAG, no materialization, query-time materialization, or ingestion-time +materialization. Execution timing follows that choice and its dependencies. + +The optional `OperatorNode.timing` field belongs to the common IR and may later +record a physical assignment; it is not part of logical transport. There is no +intermediate timed-DAG stage. Physical planning owns phase validation and any +splitting needed when shared consumers require incompatible execution contexts. + +Transport validation checks graph identity, connectivity, acyclicity, edge schemas +and declared summary family/grouping metadata. Full scalar/operator typing remains +an in-memory structural validation responsibility. Neither check proves runtime +capability, cost, response latency or accuracy feasibility. diff --git a/docs/develop_docs/metrics-observability-corpora.md b/docs/develop_docs/metrics-observability-corpora.md index d127e92ce..129ea0af1 100644 --- a/docs/develop_docs/metrics-observability-corpora.md +++ b/docs/develop_docs/metrics-observability-corpora.md @@ -49,19 +49,19 @@ o11y-bench, and awesome-prometheus-alerts. They are not duplicated here. The test prints totals, parse errors, lowering errors, pre-ASAP successes, post-ASAP candidates, unchanged queries, and post-ASAP errors. `Pre-ASAP` means -that parsing and lowering produced a `QueryExpr`. `Post-ASAP candidate` means -the isolated `SketchAlgorithmStrategy` produced a non-`KeepPreAsap` summary -candidate. `Unchanged` is a successful pre-ASAP query for which that strategy -returned only the pre-ASAP fallback. +that parsing and lowering produced an `OperatorNode` DAG. `Post-ASAP candidate` +means the isolated `ASAPStrategies` produced a candidate that contains +an ASAP operator (`contains_asap()`). `Unchanged` is a successful pre-ASAP query +for which that strategy returned only the kept pre-ASAP sub-DAG (`retain_exact`). ## Strategies The corpus measurement deliberately uses only -`SketchAlgorithmStrategy::default_cost_model().replacements(...)` on each +`ASAPStrategies::default_cost_model().replacements(...)` on each query root. It does not measure workload-wide search or the other default strategies. -The default workload search currently registers `SketchAlgorithmStrategy`, +The default workload search currently registers `ASAPStrategies`, `HydraGroupingStrategy`, `SharedSubDAGStrategy`, and `AvgToSumOverCountStrategy`. Workload context can additionally contribute `RollupStrategy` and `AccuracyReconciliationStrategy`. This baseline is diff --git a/docs/develop_docs/native-promql-inputs.md b/docs/develop_docs/native-promql-inputs.md index d263b7825..d2c10f535 100644 --- a/docs/develop_docs/native-promql-inputs.md +++ b/docs/develop_docs/native-promql-inputs.md @@ -23,7 +23,7 @@ operator's metric-name/result-label rules. Source selection, complete window coverage and revision admission remain deployment responsibilities. Planner's maintained-population candidate recognizes this explicit identity -representation. Its TopK readout compiles automatically to `CurrentSeries`, +representation. Its TopK evaluation compiles automatically to `CurrentSeries`, `Sort`, and `Limit`; deployment supplies the raw boundary or an already maintained population boundary. Compilation does not open either source. diff --git a/docs/develop_docs/offline-sketch-evidence.md b/docs/develop_docs/offline-sketch-evidence.md index cd331e57d..4a6d0c2ca 100644 --- a/docs/develop_docs/offline-sketch-evidence.md +++ b/docs/develop_docs/offline-sketch-evidence.md @@ -60,8 +60,7 @@ distribution or machine; the provider does not interpolate between datasets. Each measured resource is an optional `Measurement` with `value`, optional `stddev`, `samples`, and optional `method`. CPU fields are process CPU nanoseconds per operation; `build_cpu_ns` measures empty construction. Building an ingested -snapshot additionally requires `sample_count × update_cpu_ns`; the lifecycle -helper returns that sum only when both measurements exist. Memory and disk +snapshot additionally requires `sample_count × update_cpu_ns`. Memory and disk fields are bytes; `scan_bytes` records bytes read by scans, not storage occupancy. Producer methods must state what was measured and how normalization was performed. `retained_bytes` is distinct @@ -87,12 +86,10 @@ scores as CPU or measured savings. Deployment cost models can own the provider and call `lookup` with their own parameter sizing. This preserves the deployment's other cost and capability -hooks. The provider's lifecycle helper returns available build/update CPU costs -for a single independently instantiated state. It deliberately leaves retention, -retirement and read costs unknown. In particular, a point-frequency benchmark -read does not price a total-count read, even when both use CMS. A deployment must -match readout semantics and supply the missing lifecycle and raw-query evidence -before selecting and pricing a complete physical plan. Never combine these +hooks. A point-frequency benchmark read does not price a total-count read, even +when both use CMS. A deployment must match evaluation semantics and supply +retention, retirement, read and raw-query evidence before selecting and pricing +a complete physical plan. Never combine these nanosecond costs with CPU operation counts without explicit calibration. `error` contains offline observed statistics and a query descriptor. Its metric @@ -116,7 +113,7 @@ not be passed as these disjoint phase measurements. `MeasurementQueryBinding` is the producer's explicit assertion identifying the read/error probe population. The consumer checks that binding and the error -record's readout kind/value type; it cannot recover or certify the original +record's evaluation kind/value type; it cannot recover or certify the original probe set from an aggregate error number alone. The supported workload is an immutable i64 point-frequency snapshot, fully @@ -131,7 +128,7 @@ post-merge error and an exact merge baseline exist. The caller supplies an `EmpiricalAccuracyRequirement`: the exact observed error metric, maximum accepted mean, and minimum number of offline trials. This is -separate from `AccuracyTarget`. Every candidate must match the readout descriptor, +separate from `AccuracyTarget`. Every candidate must match the evaluation descriptor, error metric, trial count and all ordinary distribution/configuration/environment checks. A zero observed error is neither proof of exactness nor a per-key bound. diff --git a/docs/develop_docs/physical-compile-coverage.md b/docs/develop_docs/physical-compile-coverage.md index 5d048d7f7..720767696 100644 --- a/docs/develop_docs/physical-compile-coverage.md +++ b/docs/develop_docs/physical-compile-coverage.md @@ -5,10 +5,11 @@ Audience: developers moving computation from ASAPQuery-backend into ## Contract -Logical selection decides what to compute. The maintenance lifecycle sets node -timing. `physical_planner::compile` turns a timed `PostAsapDAG` into physical +Logical selection decides what to compute. A `MaterializationAssignment` sets +node timing (all query time until Stage 2 materialization, #509, decides +otherwise). `physical_planner::compile` turns a timed `PostAsapDAG` into physical operator DAGs. The backend owns ingestion, panes, storage, stored-state -readout, external exact engines, pricing/selection, and execution scheduling. +evaluation, external exact engines, pricing/selection, and execution scheduling. A backend lowering is *covered* when `compile` accepts the corresponding `PostAsapDAG` node and produces operators with the same result. The backend @@ -29,7 +30,7 @@ Status values: | # | Backend site | Computation | Planner node | Status at #475 | Notes | |---|---|---|---|---|---| -| 1 | `query_time.rs` `Lower::lower`, `compile_logical` | PromQL AST → `QueryTimeOperator` DAG for a native query | `Fallback { QueryExpr }` sub-DAGs plus value payloads | Missing | `compile` lowers `Fallback` only as a raw `Scan` source. | +| 1 | `query_time.rs` `Lower::lower`, `compile_logical` | PromQL AST → `QueryTimeOperator` dag for a native query | `Fallback { QueryExpr }` sub-DAGs plus value payloads | Missing | `compile` lowers `Fallback` only as a raw `Scan` source. | | 2 | `QueryTimeOperator::Aggregate` (sum/min/max/avg/count) | Grouped value aggregation | `Value::Exact(Aggregate)`; `SummaryAgg{ExactAggregate, Reduce}` over finalized values | Supported | Also `promql_values::compile_aggregate`. | | 3 | `QueryTimeOperator::Sort`, `Limit` (topk, sort, sort_desc) | Ordering and per-group limits | `Value::Sort`, `Value::Limit` | Supported | | | 4 | `QueryTimeOperator::Binary`, `QueryPlanNode::Binary` (vector ⊗ scalar) | Arithmetic with a scalar operand | `Binary` whose operand is `Fallback{PromqlScalarBridge(Literal)}` | Missing | Query-time `Binary` accepts only label-map vector schemas. The literal node has no native binding. | @@ -43,15 +44,15 @@ Status values: | 12 | `logical_dag.rs` `Subquery`, `subquery_grid`, `expanded_inputs` | Re-evaluate the child on a step grid and assemble a matrix | `Fallback{PromqlSubquery}` | Missing | No Planner operator. | | 13 | `QueryPlanNode::Scalar`, `DAGCompiler::lower` scalar literal | Scalar constant | `Fallback{PromqlScalarBridge(Literal)}` | Missing | Only `promql_values::compile_scalar`. | | 14 | `DAGCompiler::lower` `ReduceSum`; `physical_values.rs` PerEntity projection | Sum over finalized values; per-entity identity | `SummaryAgg{ExactAggregate(Sum)}` | Supported | The backend builds an identity `Operator::project` itself for PerEntity. | -| 15 | `DAGCompiler::lower` `ExactReadout`; `post_asap_readout.rs` ExactReadout | Finalize exact state (sum/count/min/max/rate/increase) | `Value::FinalizeExactAccumulator` | Partial | Count yields Int64 against a declared Float64 PromQL value. `compile` rejects it. | -| 16 | `post_asap_readout.rs` SummaryEstimate (`readout_bound`, `expand_item_rows`) | Sketch estimate per group; TopK item expansion | `SummaryEstimate` | Partial | The backend's label-map state layout and MetricsQL `__name__` rules have no Planner equivalent. `compile_exact_readout` has no sketch counterpart. | -| 17 | `post_asap_readout.rs` SummaryMerge (`merge_bound_states`) | Merge states by group | `SummaryMerge` | Supported | Union plus `summary_merge`. | -| 18 | `post_asap_readout.rs` counter range parameters | Counter lookback for rate/increase | `TimeRange` ancestor of finalization | Supported | Applied through `with_counter_lookback`. | -| 19 | `post_asap_readout.rs` `execute_value_fragment` | Per-timestamp binding of a value fragment | n/a | Backend | Evaluation scheduling. | +| 15 | `DAGCompiler::lower` `ExactEvaluation`; `post_asap_evaluation.rs` ExactEvaluation | Finalize exact state (sum/count/min/max/rate/increase) | `Value::FinalizeExactAccumulator` | Partial | Count yields Int64 against a declared Float64 PromQL value. `compile` rejects it. | +| 16 | `post_asap_evaluation.rs` SummaryEstimate (`evaluation_bound`, `expand_item_rows`) | Sketch estimate per group; TopK item expansion | `SummaryEstimate` | Partial | The backend's label-map state layout and MetricsQL `__name__` rules have no Planner equivalent. `compile_exact_evaluation` has no sketch counterpart. | +| 17 | `post_asap_evaluation.rs` SummaryMerge (`merge_bound_states`) | Merge states by group | `SummaryMerge` | Supported | Union plus `summary_merge`. | +| 18 | `post_asap_evaluation.rs` counter range parameters | Counter lookback for rate/increase | `TimeRange` ancestor of finalization | Supported | Applied through `with_counter_lookback`. | +| 19 | `post_asap_evaluation.rs` `execute_value_fragment` | Per-timestamp binding of a value fragment | n/a | Backend | Evaluation scheduling. | | 20 | `DAGCompiler::lower` SummaryJoin / Subtract / Delete | Summary algebra | `SummaryJoin`, `SummarySubtract`, `SummaryDelete` | Missing | The backend also rejects these (`ExactFallback`). | -| 21 | `current_series.rs` Snapshot + TopK | Current-series ranking | `ReadPopulation{TopK}` | Supported | | -| 22 | `current_series.rs` Sum / Count / Average | Current-series aggregates | `ReadPopulation{Sum,Count,Average}` | Missing | `compile` accepts only TopK. | -| 23 | `current_series.rs` Quantile | Current-series quantile | `ReadPopulation{Quantile}` | Missing | No exact quantile reduction. | +| 21 | `current_series.rs` Snapshot + TopK | Current-series ranking | `EvaluatePopulation{TopK}` | Supported | | +| 22 | `current_series.rs` Sum / Count / Average | Current-series aggregates | `EvaluatePopulation{Sum,Count,Average}` | Missing | `compile` accepts only TopK. | +| 23 | `current_series.rs` Quantile | Current-series quantile | `EvaluatePopulation{Quantile}` | Missing | No exact quantile reduction. | | 24 | `raw_dag.rs` weight `Column` | Summary update from a sample/projected value | `SummaryAgg` | Supported | | | 25 | `raw_dag.rs` weight `Constant` | Unit/constant-weight update | `SummaryAgg` | Missing | `compile_node` requires a column weight. | | 26 | `raw_dag.rs` item `Column` / `Tuple` | Keyed update item | `SummaryAgg{item}` | Supported | `keyed_summary_build`. | @@ -70,7 +71,7 @@ Totals at #475: 11 Supported, 4 Partial, 14 Missing, 2 Backend. | 4, 8, 13 | Query-time `Binary` folds a scalar-literal operand into a projection over grouped value rows. | | 5 | Query-time `Binary` over grouped value rows performs an inner equi-join on equal label columns, then applies the operator. Per-series rows remain Partial. | | 15 | Count finalization converts exactly to the declared Float64 value. | -| 22, 23 | `ReadPopulation` Sum/Count/Average/Quantile compile to grouped aggregation. `Reduction::Quantile` implements PromQL interpolation. | +| 22, 23 | `EvaluatePopulation` Sum/Count/Average/Quantile compile to grouped aggregation. `Reduction::Quantile` implements PromQL interpolation. | Totals after this change: 17 Supported, 4 Partial, 8 Missing, 2 Backend. @@ -124,10 +125,10 @@ Totals are unchanged: 19 Supported, 5 Partial, 5 Missing, 2 Backend. | Row | Change | |---|---| -| 5 | Query-time `Binary` over rows with a series identity, such as per-series readouts of stored state, uses the Fallback's `series_labels` and `series_binary`. Examples: `avg_over_time` as stored sum/count, and `rate(a) / rate(b)`. Matching drops `__name__` and honors `on`/`ignoring` when the payload carries them. Only one-to-one arithmetic is covered; `group_left`/`group_right` stay rejected and comparisons are row 7. Now Supported. | +| 5 | Query-time `Binary` over rows with a series identity, such as per-series evaluations of stored state, uses the Fallback's `series_labels` and `series_binary`. Examples: `avg_over_time` as stored sum/count, and `rate(a) / rate(b)`. Matching drops `__name__` and honors `on`/`ignoring` when the payload carries them. Only one-to-one arithmetic is covered; `group_left`/`group_right` stay rejected and comparisons are row 7. Now Supported. | | 4, 8 | A literal operand also applies to per-series rows and drops `__name__`, in the Fallback too. Series whose label sets become equal are an error, as in Prometheus. | -Grouped `sum`/`avg`, current-series `Sum`/`Average` readouts, and +Grouped `sum`/`avg`, current-series `Sum`/`Average` evaluations, and `sum_over_time`/`avg_over_time` use Prometheus' Kahan-Neumaier summation. An average switches to an incremental mean once the running sum would overflow. The grouped path also serves SQL `SUM`/`AVG` over Float64, which are now @@ -175,7 +176,7 @@ and `group_left`, including a right-side series identity when needed. Thus |---|---| | 1 | Comparisons, `bool`, set operators, `group_left`/`group_right`, `scalar()` operands, and literals over aggregates whose value has another name, such as `sum by (job) (a) * 2`. Still Partial. | | 5 | Grouped `Binary` rows use the same operator instead of a relational join. A duplicate match group is now an error instead of a cross product. | -| 7 | Fallback, grouped `Binary`, and per-series comparisons and sets. Temporal stored readouts drop `__name__` before matching, including exact Count conversion, and reject duplicate output identities. | +| 7 | Fallback, grouped `Binary`, and per-series comparisons and sets. Temporal stored evaluations drop `__name__` before matching, including exact Count conversion, and reject duplicate output identities. | Totals after this change: 20 Supported, 5 Partial, 4 Missing, 2 Backend. @@ -188,7 +189,7 @@ Totals after this change: 20 Supported, 5 Partial, 4 Missing, 2 Backend. An argument whose output provably lacks `le`, such as `sum by (job) (rate(x_bucket[5m]))`, is rejected at lowering. Prometheus returns an empty vector for it. Candidate search keeps the classic form as one -exact `KeepPreAsap` sub-DAG for every accuracy target; it has no sketch +retained exact ordinary sub-DAG for every accuracy target; it has no sketch candidate. `histogram_quantiles` lowers each branch the same way; the Fallback compiler accepts its `Concat` of relabeled branches and rejects duplicate output label sets. Nested aggregation, such as @@ -208,8 +209,8 @@ In order of backend usage: After these shapes are covered, the backend can delete rows 28 and 30. 2. Rows 25 and 27: constant weights and `EntityIdentity` items for precompute `SummaryAgg`. -3. Row 16: a label-map sketch-state readout, the counterpart of - `compile_exact_readout`, and MetricsQL `__name__` retention rules. +3. Row 16: a label-map sketch-state evaluation, the counterpart of + `compile_exact_evaluation`, and MetricsQL `__name__` retention rules. 4. Row 20: summary join, subtract, and delete. `fill`, `fill_left`, and `fill_right` matching modifiers are rejected by the diff --git a/docs/develop_docs/physical-handoff-costs.md b/docs/develop_docs/physical-handoff-costs.md index 29525f2c5..dcd95e747 100644 --- a/docs/develop_docs/physical-handoff-costs.md +++ b/docs/develop_docs/physical-handoff-costs.md @@ -88,8 +88,8 @@ traffic is inferred from logical edges, operator buffers, or scan bytes. Unknown endpoints, mismatched payloads, absent node evidence, duplicate IDs, stale evidence, invalid coefficients, and integer overflow return typed errors; ranking/export report the comparison as unavailable. This extends the physical -plan adapter; lifecycle-specific summary-maintenance costing and caching are -separate follow-up integration points. +plan adapter; summary-maintenance costing for Stage 2 materialization (#509) is +a separate follow-up integration point. Verification: diff --git a/docs/develop_docs/planner-vocabulary-migration.md b/docs/develop_docs/planner-vocabulary-migration.md index ea46e992c..d4b29fecd 100644 --- a/docs/develop_docs/planner-vocabulary-migration.md +++ b/docs/develop_docs/planner-vocabulary-migration.md @@ -32,8 +32,8 @@ names. | Physical evidence/comparison `boundaries` fields | `handoffs` | | `BoundaryEstimate::per_boundary` | `PhysicalHandoffEstimate::per_handoff` | | Internal `Models` | `CandidatePlanningInputs` | -| `SketchAlgorithmStrategy::with_models` | `SketchAlgorithmStrategy::new_with_planning_inputs` | -| `SketchAlgorithmStrategy::with_models_and_evidence` | `SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence` | +| `ASAPStrategies::with_models` | `ASAPStrategies::new_with_planning_inputs` | +| `ASAPStrategies::with_models_and_evidence` | `ASAPStrategies::new_with_planning_inputs_and_evidence` | | `HydraGroupingStrategy::with_models_and_evidence` | `HydraGroupingStrategy::new_with_planning_inputs_and_evidence` | For example, `Binder::new().bind(&dag)` becomes diff --git a/docs/develop_docs/pre-asap-ir.md b/docs/develop_docs/pre-asap-ir.md index abf5dc50b..04f71b15a 100644 --- a/docs/develop_docs/pre-asap-ir.md +++ b/docs/develop_docs/pre-asap-ir.md @@ -2,7 +2,15 @@ This is the detailed node reference. Start with the [Pre-ASAP IR concept](../design_docs/concepts/pre-asap-ir.md) for purpose and the compact catalog. -The goal of the pre-ASAP IR is represent operations from different query languages in a single representation, and make it easier to analyze how/where ASAP primitives can be used. +ASAPPlanner has **one operator IR before and after ASAP optimization**, defined in +`crates/types/src/ir/`. "Pre-ASAP" is not a separate type: it is this IR as a front end +emits it, before any ASAP operator has been introduced. This document covers what every +plan shares — the node, the schema, scalar expressions, how front ends produce the DAG, and +the catalog of ordinary (`NonASAPOp`) operators. The ASAP operators, execution timing and +the exported wire form are described in the [Post-ASAP IR](../design_docs/concepts/post-asap-ir.md) +document; the two do not repeat each other. + +The goal of the pre-ASAP form is to represent operations from different query languages in a single representation, and make it easier to analyze how/where ASAP primitives can be used. Only operations that are semantically relevant to answering the query and selecting an ASAP primitive need to become first-class nodes here. ## Design principles @@ -13,7 +21,135 @@ Only operations that are semantically relevant to answering the query and select > Notes: **SQL and PromQL use different schema models**. SQL typically uses a closed schema, where tables, columns, and types are predefined, while PromQL uses an open (schemaless) schema, where metrics and labels can evolve without a fixed table schema. Closed schemas provide stronger structure and validation; open schemas provide greater flexibility and makes it easier to evolve or ingest diverse data, but can require more care around naming conventions, label cardinality, and query consistency. -The pre-ASAP IR is defined using the `QueryExpr` enum. We discuss some of important enum types below. +## The node + +A plan is a DAG of `Rc` (`crates/types/src/ir/node.rs`). Nodes are immutable +and shared through `Rc`: a structurally identical sub-DAG referenced from several parents is +one node, and that pointer identity is what CSE, target discovery and plan assembly key on. + +```rust +pub struct OperatorNode { + pub operator: Operator, // NonASAP(NonASAPOp) | ASAP(ASAPOp) + pub result_kind: OperatorResultKind, // Relation | InstantVector | RangeVector | State | Scalar + pub schema: Schema, // output schema, derived at construction + pub guarantee: Option, // None until accuracy assessment establishes one + pub timing: Option, // None until a materialization assignment is applied +} +``` + +- `operator` is the operation. A front-end DAG contains only `Operator::NonASAP` nodes; + `OperatorNode::expect_non_asap()` relies on that. +- `result_kind` is the output category, derived from the operator and its inputs. Matching + column schemas do not make categories interchangeable (a range vector is not an instant + vector). +- `schema` is derived by `OperatorNode::new(operator)`; it fails when the schema cannot be + derived (a column reference out of range, a reserved ASAP operator). ASAP planning may + retain a more specific schema through `OperatorNode::with_schema`. +- `guarantee` is `None` until accuracy assessment establishes one; `None` never means exact. +- `timing` is `None` in every front-end DAG and every candidate. It is written by + `ir::timing::apply_materialization_timings` (see the Post-ASAP IR document); export rejects an + untimed node. + +`OperatorNode::children()` returns the operator's inputs in field order followed by the +operator nodes its scalar expressions read (see "Scalar expressions"). Every DAG traversal — +`map_children`, `reachable`, `contains_asap`, CSE, export — follows that same list. +`OperatorNode::validate_structure()` checks every operator's input contract, scalar typing +against the owning operator's input schema, and that each retained schema agrees with the +derived one. + +## Schema + +One `Schema` type (`crates/types/src/pre_asap/schema.rs`) describes every edge, whether it +carries rows or summary state: + +```rust +pub struct Schema { + pub fields: Vec, // positional; every ColumnId indexes into this + pub time_index: Option, // the time axis, if any (PromQL leaves always have one) + pub unique_keys: Vec>, + pub closed: bool, // true: these are all the columns; false: open (schemaless) superset +} + +pub struct Field { + pub name: String, + pub dtype: FieldDataType, // Plain(DataType) | ExactAggregate(..) | Sketch(..) | Sample(..) | Wavelet(..) | StatModel(..) + pub nullable: bool, + pub table: Option, // SQL table/alias qualifier; None for PromQL labels +} +``` + +A pre-ASAP field is always `FieldDataType::Plain(DataType)`. The other variants carry summary +state and only appear below an ASAP operator; a scalar expression that reads such a field is a +typing error (`ScalarExpr::scalar_type`), because state must be read out before a value can use +it. Column references are positional `ColumnId`s (indexes into the input schema), never names. + +`Schema::has_unique_key()` is the legality gate CSE uses: a non-ASAP producer is only shared +across consumers when its row identity is provable. + +## Scalar expressions + +Value computation lives in `ScalarExpr` (`crates/types/src/ir/scalar.rs`), owned **by value** +by an operator field: `Scan.predicates`, `Filter.pred`, `Join.pred`, `Project.cols[i].expr`, +`Aggregate.having`, `Sort.keys[i].expr`, `SQLWindowFunc.args`/`order_by`, `PromqlRelabel.value`, +`Values.rows`, and `QueryRoot::Scalar` and `PromqlVectorFromScalar`. A scalar expression never +produces a table and is never a node of the DAG; it is evaluated against the input schema of +the operator that owns it. + +Variants: `Column(ColumnId)`, `Literal(ScalarValue)`, `Negative` (unary minus), `Compare`, +`BoolAnd` / `BoolOr` (flat conjunction/disjunction), `Not`, `IsNull` / `IsNotNull`, `Cast` +(with `try_cast`), `InList`, `FunctionCall { name, args }`, `Arithmetic`, `Case`, +`CurrentTimestamp` (SQL `NOW()`), `EvalTimestamp` (PromQL `time()`), and four +**plan-reading** variants that reference an operator node: + +| Variant | Meaning | +|---|---| +| `PromqlScalarFromVector(Rc)` | PromQL `scalar(v)`: the single sample of an instant vector, NaN otherwise | +| `ScalarSubquery(Rc)` | Uncorrelated SQL scalar subquery: one column; zero rows is NULL, more than one row is an error | +| `Exists { subquery, negated }` | SQL `[NOT] EXISTS (subquery)` | +| `InSubquery { expr, subquery, negated }` | SQL `expr [NOT] IN (subquery)` over a one-column relation | + +These are the **only** operator references inside a scalar tree. `ScalarExpr::operator_refs()` +lists them, `NonASAPOp::children()` appends them after the operator's own inputs, and +canonicalization lowers the three SQL subquery forms to joins (see below), so a canonical SQL +DAG contains none of them. `PromqlScalarFromVector` survives canonicalization: its referenced +vector is a real plan dependency, exported as a `ScalarRef` edge. + +`Compare`, `Arithmetic` and `Negative` carry an `ExprSemantics` (`Sql` or `Promql`): both +languages use `Float64`, so the result type alone does not preserve NaN, ordering or error +rules, and the executing engine needs to know which language's rules apply. + +Wrapper types: `Predicate(ScalarExpr)`, `ProjectItem { alias, expr }`, +`SortKey { expr, ascending, nulls_first }`. + +## How a front end produces the DAG + +A front end never constructs `OperatorNode`s directly. It builds a name-based tree in +`crates/frontend-common` — `UnresolvedOp` / `UnresolvedScalar`, a mirror of `NonASAPOp` / +`ScalarExpr` in which every column reference is a `ColumnRef` and a PromQL `Scan` has no schema +yet — and calls `asap_frontend_common::resolve_root`, which does three things in order: + +1. **Resolution** — a bottom-up walk that binds every `ColumnRef` to a positional `ColumnId` + against the derived schema of the already-resolved child. A schemaless (PromQL) leaf gets + its binding schema from `SchemaResolver`, built from the names the query references. + `Join` / `SetOp` sides and the operators referenced from scalar positions are each bound as + a root in their own scope; a `BinaryOp` side additionally inherits the label names its + enclosing scope references. +2. **Schema derivation** — each `OperatorNode::new` derives the node's output schema and + result kind from the operator and its children. +3. **Canonicalization** — `asap_types::ir::canonicalize::canonicalize` erases structural + differences between semantically identical queries: it promotes an additive + `Limit { Sort { Aggregate } }` ranking to the `AggIntent::TopK` heavy-hitter shape, and + lowers `EXISTS` / `NOT EXISTS` / `IN (subquery)` predicates to `Join { Semi | Anti }` and a + scalar subquery to a `Join { Cross }` plus column reference. The pass is idempotent and + keeps the pointer identity of every untouched sub-DAG. + +The result is `Rc`. `lower_promql_workload`, `lower_sql` / `lower_sql_dialect` / +`lower_sql_batch` and `lower_metricsql` all return it. + +Workload search then runs structural CSE (`asap_types::ir::cse::share_common_sub_dags`) once +across every root: bottom-up hash-consing where the structural hash is only a filter and the +typed `PartialEq` decides sharing, following scalar references like any other input, and +gated by `Schema::has_unique_key()` for non-ASAP producers. ## Fields and column references @@ -47,27 +183,28 @@ to one source language. - [`Aggregate`](#aggregate) — collapses input rows into fewer output rows via a reduction and aggregate intents. **[Time-related nodes](#time-related-nodes)** -- [`TimeRange`](#timerange) — a range-vector lookback over the time axis (PromQL `[5m]`). +- [`TimeRange`](#timerange) — temporal selection over a time-series input (PromQL instant lookback or `[5m]` range selector). - [`TimeShift`](#timeshift) — shifts *when* a selector is evaluated (PromQL `offset`/`@`). - [`PromqlSubquery`](#promqlsubquery) — re-evaluates an instant-vector expression over a range at a given step. **[Relational nodes](#relational-nodes)** — common to both SQL and PromQL - [`Scan`](#scan) — identifies the logical data source. +- [`Values`](#values) — SQL `VALUES` rows, or the one empty row of a `SELECT` without `FROM`. - [`Filter`](#filter) — restricts rows using a predicate. - [`Project`](#project) — column projection (SQL `SELECT` list). -- [`BinaryOp`](#binaryop) — arithmetic / comparison / boolean composition of two inputs. +- [`BinaryOp`](#binaryop) — arithmetic / comparison / set composition of two inputs. - [`Sort`](#sort) — generic (non-heavy-hitter) order-by, optionally per-group. -- [`Limit`](#limit) — caps the row count, with an offset. +- [`Limit`](#limit) — caps the row count, with an offset, optionally per-group. - [`Dedup`](#dedup) — row-level deduplication. - [`Join`](#join) — logical join of two inputs. - [`SetOp`](#setop) — SQL's typed set operations (`UNION`/`INTERSECT`/`EXCEPT`). - [`Concat`](#concat) — exact, untyped `UNION ALL` of union-compatible branches. -**[PromQL-specific nodes](#promql-specific-nodes)** -- [`PromqlScalarBridge`](#promqlscalarbridge) — a scalar sub-expression at an operator-DAG position. -- [`EvalTimestamp`](#evaltimestamp) — the query evaluation time as a scalar (PromQL `time()`). +**[Scalar-position nodes](#scalar-position-nodes)** +- `QueryRoot::Scalar` — a standalone scalar expression, without an operator node. - [`PromqlVectorFromScalar`](#promqlvectorfromscalar) — promotes a scalar to a label-less instant vector. -- [`PromqlScalarFromVector`](#promqlscalarfromvector) — collapses a single-series vector to a scalar. + +**[PromQL-specific nodes](#promql-specific-nodes)** - [`PromqlRelabel`](#promqlrelabel) — per-series label rewrite (PromQL `label_replace`/`label_join`). - [`PromqlInfoEnrich`](#promqlinfoenrich) — left-join label enrichment from an info metric. - [`PromqlSeriesSample`](#promqlseriessample) — keeps a subset of whole series, not a reduction. @@ -75,6 +212,9 @@ to one source language. **[SQL-specific nodes](#sql-specific-nodes)** - [`SQLWindowFunc`](#sqlwindowfunc) — SQL analytic window function (`OVER (...)`). +PromQL `time()` and `scalar(v)` are scalar expressions (`ScalarExpr::EvalTimestamp`, +`ScalarExpr::PromqlScalarFromVector`), not nodes. + ## Aggregation-related nodes ### Aggregate @@ -109,7 +249,7 @@ list of aggregate intents (`measures`). value is still recomputed by the agg intent, e.g. `Rate`), for a computation with no `by(...)` clause to attach to. `PerEntity` is different from `by` for all columns, because in PromQL, it is schemaless and you don't know all columns beforehand. E.g. PromQL `rate(http_requests_total[5m])`, which has one rate value - per input series: + per input series: ```text Aggregate( @@ -117,7 +257,7 @@ list of aggregate intents (`measures`). measures = [Rate], output_names = [], having = None, - child = TimeRange(range = 5m, child = Scan("http_requests_total")) + child = TimeRange(range = 5m, kind = Range, child = Scan("http_requests_total")) ) ``` @@ -224,7 +364,7 @@ Example for `filters`: `count(CASE WHEN p THEN x END)` (`p`, plus `x IS NOT NULL` when `x` is nullable), and from `count(expr)` over any other nullable `expr` (`expr IS NOT NULL`), because canonical `Count` counts rows and never consults its argument. A filtered measure has no summary binding yet: - `asap-aware-mapping` keeps such an `Aggregate` as `KeepPreAsap`, and canonicalization does + `asap-aware-mapping` retains such an `Aggregate` as an ordinary exact sub-DAG, and canonicalization does not promote a filtered count ranking to a heavy-hitter `TopK`. Example for `having`: @@ -248,8 +388,8 @@ Example for `having`: **Rules/Invariants**: A filtering predicate will be passed to at the lowest node (closer to the leaves) in the AST/DAG that can express it — `Scan.predicates`, then `Aggregate.having`, then `Filter` as the fallback — so its constraint is visible at - the node it actually applies to, not behind an opaque wrapper, once pre-ASAP IR translates - to post-ASAP IR with summary binding. The upper nodes (closer to the root) in the AST/DAG can still have a `Filter` node with the same condition. This intentional duplication is for Summary related translation and optimizations. + the node it actually applies to, not behind an opaque wrapper, once summary binding reads it. + The upper nodes (closer to the root) in the AST/DAG can still have a `Filter` node with the same condition. This intentional duplication is for Summary related translation and optimizations. For example, `SELECT srcip, COUNT(*) AS cnt FROM packets GROUP BY srcip HAVING COUNT(*) > 10` pins `cnt > 10` to the lowest node that can express it, `Aggregate.having`: @@ -282,7 +422,7 @@ Example for `having`: Both are valid at once, and neither is derived from the other: `having` is the canonical spot a summary-aware pass reads to decide whether `Aggregate` can bind to a summary, while the outer `Filter` is what a plain logical evaluator runs without knowing `having` exists. The duplication is forward-looking groundwork for - once HAVING-aware summary binding (pre-ASAP-IR to post-ASAP-IR translation) lands. + once HAVING-aware summary binding lands. Neither direction of that push-down is enforced yet: the SQL front end doesn't populate `having` from a real `HAVING` clause (#201), and canonicalization doesn't fold an existing @@ -294,14 +434,21 @@ Example for `having`: ### TimeRange -Represents a range of time. Kept different from `Filter` to treat time as an explicit concern. +Temporal selection over a time-series input. Kept different from `Filter` to treat time as an +explicit concern. `kind` records which samples a PromQL selector reads: + +- `TimeRangeKind::Instant` — an instant selector: `range` is the lookback horizon and the + latest eligible sample per series is selected (the planner injects the declared + `data_ingestion_interval` around a bare selector). +- `TimeRangeKind::Range` — a range selector (`m[5m]`): every sample in the window. ```promql rate(http_requests_total[5m]) ``` **Fields:** -- `range` — how far back to look (the PromQL `[5m]` duration). +- `range` — how far back to look (the PromQL `[5m]` duration, or the instant lookback). +- `kind` — `Instant` or `Range`. - `child` — the input the range applies to. ### TimeShift @@ -350,9 +497,19 @@ the same logical data domain. **Fields:** - `source` — the logical data source (a table name or PromQL metric selector). - `predicates` — row-level filters pushed all the way down to this scan (Rules/Invariants - rule 1); enforced structurally at lowering time — a `Filter` directly over a `Scan` never - survives. -- `schema` — the binding schema every positional column reference in the DAG resolves against. + rule 1): PromQL label matchers and pushed-down `WHERE` conjuncts. +- `schema` — the binding schema every positional column reference in the tree resolves against. + A catalog-backed SQL leaf carries its catalog schema; a PromQL leaf carries the usage-derived + schema `SchemaResolver` built from the labels the query references. + +### Values + +SQL `VALUES` rows, or the one empty row of a `SELECT` without `FROM` +(`SELECT 1 + 1`). Row expressions have no input-column scope. + +**Fields:** +- `rows` — one `Vec` per row. +- `schema` — the output schema of the rows. ### Filter @@ -386,6 +543,10 @@ that's neither a base scan column nor an aggregate output: SELECT * FROM (SELECT srcip, bytes_in + bytes_out AS total FROM packets) t WHERE total > 500 ``` +A `Filter` whose predicate contains `EXISTS` / `NOT EXISTS` / `IN (subquery)` does not +survive canonicalization: the conjunct becomes a `Join { Semi | Anti }` under the remaining +predicate. + **Fields:** - `pred` — the row-level predicate to apply. - `child` — the input being filtered. @@ -406,18 +567,21 @@ SELECT srcip, dstip FROM packets ### BinaryOp -Arithmetic / comparison / boolean composition. PromQL binary operators between two vectors, -a vector and a scalar, or two scalars. +Arithmetic / comparison / set composition of two operands. PromQL binary operators between two vectors, +two vectors. Mixed vector/scalar arithmetic uses `Project`; non-bool comparison uses `Filter`. Standalone scalar expressions are `QueryRoot::Scalar`. ```promql up > 1 ``` **Fields:** -- `op` — the arithmetic/comparison/boolean operator. +- `operator` — a `BinaryOperator { kind, vector_match, checked_relative_division, checked_finite_division }`: + - `kind` — `BinaryOpKind::Arithmetic(..)`, `Compare(..)` or `Set(..)` (PromQL `and`/`or`/`unless`). + - `vector_match` — PromQL vector-matching modifiers (`on`/`ignoring`, `group_left`/`group_right`); `None` outside PromQL and the only supported value today. + - `checked_relative_division` / `checked_finite_division` — typed division guards set by summary planning, never by a front end (see [physical-plan integration](../design_docs/architecture/physical-plan-integration.md#conditional-temporal-average-lowering)). +- `return_bool` — the PromQL `bool` modifier: a comparison returns `0`/`1` instead of filtering. Valid only for comparison operators. - `lhs` — the left operand. - `rhs` — the right operand. -- `vector_match` — PromQL vector-matching modifiers (`on`/`ignoring`, `group_left`/`group_right`); `None` outside PromQL. ### Sort @@ -429,7 +593,7 @@ sort_desc(up) ``` **Fields:** -- `keys` — the ordering columns/expressions and direction. +- `keys` — the ordering expressions and direction (`SortKey`). - `partition_by` — grouping keys that make the ordering per-group instead of global; empty = a single global order. - `child` — the input being ordered. @@ -443,8 +607,9 @@ topk(3, up) ``` **Fields:** -- `n` — the maximum number of rows to keep. +- `n` — the maximum number of rows to keep; `None` is offset-only. - `offset` — how many leading rows to skip first. +- `partition_by` — applies the limit per group (PromQL `topk by (..)`); empty = global. - `child` — the input being capped. ### Dedup @@ -463,14 +628,16 @@ SELECT DISTINCT srcip, dstip FROM packets ### Join -Logical join; the physical strategy (hash/merge/broadcast) is picked in the post-ASAP IR. SQL `JOIN`. +Logical join; the physical strategy (hash/merge/broadcast) is picked downstream of the planner. SQL `JOIN`, +and the shape canonicalization lowers subqueries to. ```sql SELECT u.prefix FROM bgp_updates u JOIN bgp_rib_state r ON u.prefix = r.prefix ``` **Fields:** -- `kind` — the join type (inner/left/right/full/semi/anti). +- `kind` — the join type (`Inner`/`Left`/`Right`/`Full`/`Cross`/`Semi`/`Anti`). A semi/anti join + outputs the left input's columns alone, but its predicate resolves against `left ++ right`. - `pred` — the join condition. - `left` — the left input. - `right` — the right input. @@ -496,7 +663,7 @@ SELECT srcip FROM packets UNION ALL SELECT dstip FROM packets never dedup. Used when a single `Aggregate` can't express the shape — the canonical case is PromQL `histogram_quantiles` (one branch per φ, each its own `HistogramQuantile` reduction relabeled with its `le` value) — and SQL `ROLLUP`/`CUBE`/`GROUPING SETS` (one branch per -grouping level). +grouping level). The output schema is the first child's. ```promql histogram_quantiles(rate(http_request_duration_seconds_bucket[5m]), "le", 0.5, 0.9) @@ -504,39 +671,32 @@ histogram_quantiles(rate(http_request_duration_seconds_bucket[5m]), "le", 0.5, 0 **Fields:** - `children` — the union-compatible branches to concatenate; must be non-empty. +- `discriminator_unique_key` — an optional caller-proven compound unique key + `(discriminator, inner_key)` over the output; nothing verifies the claim. -## PromQL-specific nodes - -### PromqlScalarBridge +## Scalar-position nodes -A scalar sub-expression (issue #220: in practice always `Literal(ScalarValue::Float64(_))` — -a PromQL number literal, or a folded constant scalar expression) sitting at an **operator-DAG -position** — a `BinaryOp` operand for ` op ` thresholds and unit conversions, -a `PromqlVectorFromScalar` child, or a whole query's root. This wrapper is what marks the -position; it no longer duplicates `Literal`'s value the way the old `PromqlScalar(f64)` variant -did. - -```promql -up > 1 -``` +### Scalar query roots -**Fields:** a single unnamed child `QueryExpr` — the wrapped scalar sub-expression. +`QueryRoot` distinguishes an operator result from an owned `ScalarExpr`. It is +an API root discriminator, not an operator. `2`, `time()`, and +`scalar(sum(up)) + 1` therefore introduce no constant-wrapper nodes. -### EvalTimestamp +Use `lower_promql_query_workload` for mixed scalar/vector workloads. The +operator-only convenience API rejects standalone scalar roots. `ParsedWorkload` +retains each scalar's workload index; `PlanOutput::roots()` returns all results +in workload order. Scalar plan reads remain exact and retain their operator +references; summary selection currently operates on operator roots. -The query **evaluation timestamp** as Unix seconds — PromQL `time()` — and the implicit -input of the no-argument calendar functions (`hour()`, `day_of_week()`, ...). It is the -instant or range-step at which the expression is evaluated, not inherently the current -wall-clock time. The Prometheus instant-query HTTP API separately defaults an omitted -`time` request parameter to the server's current time. - -```promql -time() -``` +`up * 2` projects the sample expression while retaining time and full series +identity, removing the metric name. `up > 0` and `0 < up` filter the vector and +retain its sample and name. `up > bool 0` projects a zero-or-one `Case`. +Open label schemas acquire a full runtime series-identity field before this +lowering. The runtime must populate that field with all labels. ### PromqlVectorFromScalar -The scalar→instant-vector bridge — PromQL `vector(s)`. Promotes a scalar-typed child to a +The scalar→instant-vector bridge — PromQL `vector(s)`. Promotes a scalar expression to a single label-less series carrying that value at every step, e.g. for dead-man's-switch patterns (`up or vector(0)`). @@ -544,18 +704,9 @@ patterns (`up or vector(0)`). vector(1) ``` -**Fields:** a single unnamed child `QueryExpr` — the scalar-typed expression being promoted to a vector. - -### PromqlScalarFromVector +**Fields:** a single unnamed `ScalarExpr` — the scalar being promoted to a vector. -The instant-vector→scalar bridge — PromQL `scalar(v)`. Collapses a single-element vector to -its value (NaN at runtime if the input isn't exactly one series). - -```promql -scalar(up) -``` - -**Fields:** a single unnamed child `QueryExpr` — the single-series vector being collapsed to a scalar. +## PromQL-specific nodes ### PromqlRelabel @@ -616,5 +767,6 @@ SELECT srcip, LAG(time) OVER (PARTITION BY srcip ORDER BY time) FROM packets - `args` — the function's operand expressions; empty for rank-only functions. - `partition_by` — grouping keys the window is computed within. - `order_by` — the ordering the window function reads. +- `frame` — the optional window frame. - `output_name` — the name of the new output column. - `child` — the input the window function is computed over. diff --git a/docs/develop_docs/storage-operation-costs.md b/docs/develop_docs/storage-operation-costs.md index 1a8dacdbd..999b79103 100644 --- a/docs/develop_docs/storage-operation-costs.md +++ b/docs/develop_docs/storage-operation-costs.md @@ -71,8 +71,7 @@ estimate and storage request estimate remain independently inspectable. Missing entries, expired/future evidence, incompatible node snapshots, zero request sizes, invalid calibration, and overflow return typed analytical errors. When used by plan ranking/export they make that comparison unavailable. -This profile extends the physical-plan adapter; the separate summary-maintenance -lifecycle estimator retains its existing dimensions. Combined physical-plan +This profile extends the physical-plan adapter. Combined physical-plan ranking currently supports storage profiles only with an explicit `NoCache` profile. `CacheProfile::Evidence` together with storage evidence makes the comparison unavailable: aggregate cache hit ratios cannot identify which diff --git a/docs/develop_docs/target-candidate-api-migration.md b/docs/develop_docs/target-candidate-api-migration.md index a5b081a61..4619be2a8 100644 --- a/docs/develop_docs/target-candidate-api-migration.md +++ b/docs/develop_docs/target-candidate-api-migration.md @@ -13,7 +13,7 @@ are unchanged. #453 separately defines the integration API surface. | `MaterializeSummaryMaintenanceLifecycleError` | `SummaryMaintenanceLifecycleAssemblyError` | Failure assembling a DAG or deriving maintenance decisions | | Error variant `Materialize` | `AssembleDAG` | Wrap an underlying `RealizationError` from DAG assembly | | Internal `materialize_inner` / `materialize_residual` | `assemble_target` / `assemble_residual` | Assemble selected nodes, not runtime materialized views | -| Internal assembly cache `materialized` | `assembled_nodes` | Preserve shared `Rc` identity | +| Internal assembly cache `materialized` | `assembled_nodes` | Preserve shared node identity (now `Rc`, see below) | Update imports and calls together; old public names are not retained as aliases. Downstream Rust integrations using these symbols must migrate. No serialized @@ -24,5 +24,28 @@ The earlier #445 renames (`TargetSubDAGCandidates`, counterpart) are prerequisites, not additional changes here. The workflow remains one selection call per workload followed by one assembly -call per query root. `SummaryMaintenanceLifecyclePlan` contains the assembled -Post-ASAP DAG root plus maintenance decisions; it is not an executable plan. +call per query root. The summary-maintenance lifecycle API named above was later +removed; Stage 2 materialization (#509) will own maintenance decisions. + +## Later: unified operator IR (operator flattening) + +The pre-ASAP and post-ASAP trees became one IR in `asap_types::ir`. Every +node is an `Rc` whose `operator` is `Operator::NonASAP(NonASAPOp)` +or `Operator::ASAP(ASAPOp)`. Old public names are not kept as aliases. + +| Old | New | +|---|---| +| `Rc` (pre-ASAP) | `Rc` holding `Operator::NonASAP(NonASAPOp)` | +| `Rc` / `SummaryExpr` (post-ASAP) | The same `Rc`; summary steps are `Operator::ASAP(ASAPOp)` | +| `SummaryExpr::KeepPreAsap(q)` | The non-ASAP sub-DAG itself; `retain_exact` only adds an exact `guarantee` | +| `SummaryExpr::ValueOperation { .. }` over a evaluation | An ordinary `NonASAPOp` (`Project`, `Filter`, `Sort`, `Limit`, `Aggregate`) reading an ASAP node; `FinalizeExactAccumulator`, `MaintainPopulation`, `EvaluatePopulation` are `ASAPOp` variants | +| `Replacement::Summary(..)` / `Replacement::Rewrite(..)` | `Replacement::SubDAG(Rc)`; `is_logical_rewrite` tells them apart | +| `SummaryFamilyType` | `FieldDataType` (its non-`Plain` variants) | +| Timing stored on post-ASAP nodes | `OperatorNode::timing`, `None` until `ir::timing::apply_materialization_timings` writes it from a `MaterializationAssignment` (default: all query time) | +| `UnresolvedQueryExpr` + `asap_types::pre_asap::resolve_root` | `UnresolvedOp` / `UnresolvedScalar` + `asap_frontend_common::resolve_root` | +| `pre_asap::canonicalize`, `pre_asap::cse::share_common_sub_dags` | `ir::canonicalize::canonicalize`, `ir::cse::share_common_sub_dags` | +| `asap_types::post_asap::compile_post_asap_dag` (wire version 5, `Fallback`/`Binary`/`Value` payloads) | `asap_types::ir::export::compile_post_asap_dag` (wire version 7: one node per operator, `Relational` payloads, `ScalarRef` edges); input must be timed | +| Exported schema JSON `columns` | `fields` | + +Field and schema details: [Pre-ASAP IR](pre-asap-ir.md) and +[Post-ASAP IR](../design_docs/concepts/post-asap-ir.md). diff --git a/docs/user_guide_docs/run-a-query.md b/docs/user_guide_docs/run-a-query.md index 3f5825c29..c6f52aa61 100644 --- a/docs/user_guide_docs/run-a-query.md +++ b/docs/user_guide_docs/run-a-query.md @@ -6,7 +6,7 @@ corpus coverage. These commands do not deploy or execute a physical plan. To develop an application using the Rust library, start with [Library API: definitions, options, and examples](../develop_docs/library-api.md). That guide explains how to choose strategies and models, rank candidates, and -work with lifecycle capabilities. +assemble selected DAGs. ## Choose a command @@ -96,7 +96,7 @@ cargo run -p asap-devtools --bin show_post_asap_ir -- --data-ingestion-interval- available binding from the sketch strategy for each query, numbered in cost-model order. If no candidate is available, it prints the pre-ASAP fallback as candidate 1. It does not show the complete ranked workload candidate set or choose a -deployment lifecycle. Its SQL examples use a fixed demonstration catalog, not +deployment. Its SQL examples use a fixed demonstration catalog, not your database schema. Use the [library workflow](../develop_docs/library-api.md) to retain workload alternatives and provide your own models. @@ -109,8 +109,10 @@ whether to select them using its own evidence. Planner's automatic `global_selection` skips them; their presence alone does not show that they meet the requested target. -Each input line is followed by its debug IR or an `ERR:` message. Post-ASAP -output may contain summary state, readouts or exact `KeepPreAsap` work. An +Each input line is followed by its debug IR or an `ERR:` message. Pre-ASAP and +Post-ASAP output use the same node format: Post-ASAP output adds summary nodes +(state, readouts) and keeps the original exact operators wherever no summary +replaces them. An approximate target permits approximation; it does not guarantee a legal or certified sketch. The tool prints plans, not query results. diff --git a/tools/dag-viewer/README.md b/tools/dag-viewer/README.md index b90aae272..182c0f94c 100644 --- a/tools/dag-viewer/README.md +++ b/tools/dag-viewer/README.md @@ -69,7 +69,8 @@ cargo run -p asap-devtools --bin dag_export -- \ Load the JSON with the page's file picker. `--planner-cost-json` is a complete physical-evidence document: an immutable `evidence_version`, calibration, and -target records containing the exact target `QueryExpr` and comparison scope. +target records containing the exact target node (a serialized pre-ASAP +`OperatorNode`) and comparison scope. Each exact replacement candidate owns its complete logical-node `PhysicalNodeEvidence`; summary candidates additionally own their bound `PhysicalDAG`. Candidate-local evidence prevents statistics for one physical @@ -101,15 +102,6 @@ to calibrate against, and `--planner-cost-json` once there is. Without either flag, `--post-asap` exports the raw DAG only. -The viewer also accepts the JSON produced by -`export_summary_maintenance_plan`. It renders the materialized summary DAG as -a single lifecycle-plan lane. Selecting a `SummaryAgg` shows the chosen -lifecycle and maintenance mode together with every alternative's cost, -assumptions, and rejection reason. The selected-node panel also shows the -plan-level summary-versus-raw decision, costs, horizon, expected reads, and -evaluation/update rates. Raw-recomputation plans retain that decision summary -even though they have no deployed `SummaryAgg` to annotate. - ## Standalone HTML ```sh @@ -129,7 +121,7 @@ a selected replacement directly contains: { "decision": { "id": 7, - "strategy": "SketchAlgorithmStrategy", + "strategy": "ASAPStrategies", "rationale": "count realizes as a Cms sketch", "rank": 0, "cost": 1.14001088, @@ -147,8 +139,13 @@ The exporter assigns `workload_node_id`; union rendering reads that mapping directly. Node boxes use concrete IR fields: aggregate measures/grouping, sort keys, -filter predicates, projections, sources, summary families, and readout -queries. Category icons are deliberately omitted so they cannot be confused +filter predicates, projections, sources, summary families, and evaluation +queries. A node's `kind` is the operator variant name (`Operator::kind_name`): +a `NonASAPOp` such as `Aggregate` or `Values`, or an `ASAPOp` such as +`SummaryAgg` or `EvaluatePopulation`. `node-style.js` maps each kind to a color +category. Scalar expressions are not nodes; an operator a scalar expression +reads (`scalar(v)`, `EXISTS (subquery)`) is a child node, shown in `detail` +as `{"scalar_ref": }`. Schemas list their entries under `fields`. Category icons are deliberately omitted so they cannot be confused with IR text. ### Cost/benefit annotations (issue #286) diff --git a/tools/dag-viewer/dag.example.json b/tools/dag-viewer/dag.example.json index 85c0e97b6..5249bb412 100644 --- a/tools/dag-viewer/dag.example.json +++ b/tools/dag-viewer/dag.example.json @@ -210,7 +210,7 @@ { "decision_id": 0, "target_pre_id": 1, - "strategy": "SketchAlgorithmStrategy", + "strategy": "ASAPStrategies", "rationale": "count realizes as a Cms sketch", "rank": 0, "cost": 1.14001088, @@ -363,108 +363,7 @@ "kind": "Summary", "dag": { "nodes": [ - { - "id": 0, - "kind": "KeepPreAsap", - "label": "KeepPreAsap(Scan)", - "detail": { - "pre_asap_sub_dag": { - "nodes": [ - { - "children": [], - "detail": { - "predicates": [], - "schema": { - "closed": true, - "columns": [ - { - "dtype": "timestamp", - "name": "ts", - "nullable": false, - "table": "metrics" - }, - { - "dtype": "utf8", - "name": "service", - "nullable": false, - "table": "metrics" - }, - { - "dtype": "utf8", - "name": "region", - "nullable": false, - "table": "metrics" - }, - { - "dtype": "float64", - "name": "latency", - "nullable": false, - "table": "metrics" - }, - { - "dtype": "int64", - "name": "bytes", - "nullable": false, - "table": "metrics" - } - ], - "time_index": 0, - "unique_keys": [] - }, - "source": { - "Table": { - "table_ref": "metrics" - } - } - }, - "hash": 2606922452740434172, - "id": 0, - "kind": "Scan", - "label": "Scan(metrics)", - "schema": { - "closed": true, - "columns": [ - { - "dtype": "timestamp", - "name": "ts", - "nullable": false, - "table": "metrics" - }, - { - "dtype": "utf8", - "name": "service", - "nullable": false, - "table": "metrics" - }, - { - "dtype": "utf8", - "name": "region", - "nullable": false, - "table": "metrics" - }, - { - "dtype": "float64", - "name": "latency", - "nullable": false, - "table": "metrics" - }, - { - "dtype": "int64", - "name": "bytes", - "nullable": false, - "table": "metrics" - } - ], - "time_index": 0, - "unique_keys": [] - } - } - ], - "root": 0 - } - }, - "children": [] - }, + {"id": 0, "kind": "Scan", "label": "Scan(metrics)", "detail": {"predicates": [], "schema": {"closed": true, "columns": [{"dtype": "timestamp", "name": "ts", "nullable": false, "table": "metrics"}, {"dtype": "utf8", "name": "service", "nullable": false, "table": "metrics"}, {"dtype": "utf8", "name": "region", "nullable": false, "table": "metrics"}, {"dtype": "float64", "name": "latency", "nullable": false, "table": "metrics"}, {"dtype": "int64", "name": "bytes", "nullable": false, "table": "metrics"}], "time_index": 0, "unique_keys": []}, "source": {"Table": {"table_ref": "metrics"}}}, "children": []}, { "id": 1, "kind": "SummaryAgg", @@ -657,7 +556,7 @@ "hash": 2606922452740434172, "decision": { "id": 0, - "strategy": "SketchAlgorithmStrategy", + "strategy": "ASAPStrategies", "rationale": "count realizes as a Cms sketch", "rank": 0, "cost": 1.14001088, @@ -763,7 +662,7 @@ "workload_node_id": 1, "decision": { "id": 0, - "strategy": "SketchAlgorithmStrategy", + "strategy": "ASAPStrategies", "rationale": "count realizes as a Cms sketch", "rank": 0, "cost": 1.14001088, @@ -862,7 +761,7 @@ "workload_node_id": 2, "decision": { "id": 0, - "strategy": "SketchAlgorithmStrategy", + "strategy": "ASAPStrategies", "rationale": "count realizes as a Cms sketch", "rank": 0, "cost": 1.14001088, diff --git a/tools/dag-viewer/generate-sample.sh b/tools/dag-viewer/generate-sample.sh index e916cba5f..66921d8c7 100755 --- a/tools/dag-viewer/generate-sample.sh +++ b/tools/dag-viewer/generate-sample.sh @@ -6,7 +6,7 @@ set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")/../.." # --epsilon asks for an approximate accuracy target instead of the default -# Exact, so SketchAlgorithmStrategy actually has a sketch alternative to +# Exact, so ASAPStrategies actually has a sketch alternative to # report — without it, no query below would ever pick up a `notes` badge # (see crates/devtools/src/bin/dag_export.rs's own `--epsilon` doc comment). cargo run -p asap-devtools --bin dag_export -- \ diff --git a/tools/dag-viewer/lifecycle-summary-maintenance.png b/tools/dag-viewer/lifecycle-summary-maintenance.png deleted file mode 100644 index e873ffd9f..000000000 Binary files a/tools/dag-viewer/lifecycle-summary-maintenance.png and /dev/null differ diff --git a/tools/dag-viewer/node-style.js b/tools/dag-viewer/node-style.js index a957817c2..fee49586e 100644 --- a/tools/dag-viewer/node-style.js +++ b/tools/dag-viewer/node-style.js @@ -1,20 +1,17 @@ -// Logical QueryExpr/SummaryExpr kinds exported by +// Operator kinds (`Operator::kind_name`) exported by // crates/types/src/dag_export.rs. Categories describe the visible logical DAG // shape. They do not model hidden physical inputs: for example, // PromqlInfoEnrich is a one-child enrichment here even if physical costing // later accounts for an auxiliary source scan. const KIND_CATEGORY_JSON = `{ "Scan": "data", - "PromqlScalarBridge": "data", - "EvalTimestamp": "data", - "CurrentTimestamp": "data", + "Values": "data", "Filter": "filter", "PromqlSeriesSample": "sample", "Project": "derive", "PromqlRelabel": "derive", "PromqlInfoEnrich": "derive", "PromqlVectorFromScalar": "derive", - "PromqlScalarFromVector": "derive", "BinaryOp": "derive", "Aggregate": "aggregate", "TimeRange": "window", @@ -22,21 +19,21 @@ const KIND_CATEGORY_JSON = `{ "TimeShift": "window", "SQLWindowFunc": "window", "Join": "join", - "RelationalJoin": "join", "Dedup": "set", "SetOp": "set", "Concat": "combine", "Sort": "sort", "Limit": "sort", - "KeepPreAsap": "summary", "SummaryAgg": "summary", "SummaryJoin": "summary", "SummarySubtract": "summary", - "SummaryBinaryOp": "summary", - "ValueOperation": "summary", "SummaryDelete": "summary", "SummaryEstimate": "summary", - "SummaryMerge": "summary" + "SummaryMerge": "summary", + "FinalizeExactAccumulator": "summary", + "MaintainPopulation": "summary", + "EvaluatePopulation": "summary", + "Extension": "summary" }`; const KIND_CATEGORY = Object.freeze(JSON.parse(KIND_CATEGORY_JSON)); @@ -44,7 +41,7 @@ const KIND_CATEGORY = Object.freeze(JSON.parse(KIND_CATEGORY_JSON)); const CATEGORIES = { data: { label: 'Data', - description: 'Scan, PromqlScalarBridge, EvalTimestamp, CurrentTimestamp — leaves that introduce a value', + description: 'Scan and Values — data sources', light: { bg: '#eef5fd', border: '#0369a1' }, dark: { bg: '#0c2438', border: '#38bdf8' }, }, @@ -62,7 +59,7 @@ const CATEGORIES = { }, derive: { label: 'Derive', - description: 'Project, PromqlRelabel, PromqlInfoEnrich, PromqlVectorFromScalar, PromqlScalarFromVector, BinaryOp — transforms or enriches columns on otherwise-unchanged rows', + description: 'Project, PromqlRelabel, PromqlInfoEnrich, PromqlVectorFromScalar, BinaryOp — transforms or enriches columns on otherwise-unchanged rows', light: { bg: '#f5f0fd', border: '#6d28d9' }, dark: { bg: '#241a3d', border: '#a78bfa' }, }, @@ -102,10 +99,10 @@ const CATEGORIES = { light: { bg: '#eef4fd', border: '#1d4ed8' }, dark: { bg: '#12233d', border: '#60a5fa' }, }, - // Post-ASAP nodes use a neutral palette; KeepPreAsap has a muted override. + // ASAP operators use a neutral palette. summary: { label: 'Summary', - description: 'KeepPreAsap, SummaryBinaryOp, ValueOperation, SummaryAgg, SummaryJoin, SummarySubtract, SummaryDelete, SummaryEstimate, SummaryMerge — post-ASAP materialized structures', + description: 'SummaryAgg, SummaryEstimate, FinalizeExactAccumulator, MaintainPopulation, EvaluatePopulation, SummaryJoin, SummarySubtract, SummaryDelete, SummaryMerge, Extension — summary state and its evaluations', light: { bg: '#f1f2f4', border: '#4b5563' }, dark: { bg: '#20242b', border: '#9ca3af' }, }, diff --git a/tools/dag-viewer/post_asap_fixture.json b/tools/dag-viewer/post_asap_fixture.json index ea2de185f..e616e80e2 100644 --- a/tools/dag-viewer/post_asap_fixture.json +++ b/tools/dag-viewer/post_asap_fixture.json @@ -14,9 +14,9 @@ }, "post_dag": { "nodes": [ - { "id": 0, "kind": "KeepPreAsap", "label": "KeepPreAsap(Scan)", "detail": {"pre_asap_sub_dag": {"nodes": [{"id": 0, "kind": "Scan", "label": "Scan(netflow_table)", "detail": {}, "children": []}], "root": 0}}, "children": [] }, + {"id": 0, "kind": "Scan", "label": "Scan(netflow_table)", "detail": {}, "children": []}, { "id": 1, "kind": "SummaryAgg", "label": "SummaryAgg(Kll)", "detail": {"family": {"Sketch": ["Kll", {"k": 200}]}, "col": {"Column": 6}, "reduction": {"Reduce": [1]}, "grouping": "PerSubpopulationInstance"}, "children": [0], "origin_pre_id": 1 }, - { "id": 2, "kind": "KeepPreAsap", "label": "KeepPreAsap(Project)", "detail": {"pre_asap_sub_dag": {"nodes": [{"id": 0, "kind": "Project", "label": "Project(2 cols)", "detail": {}, "children": []}], "root": 0}}, "children": [1] } + {"id": 2, "kind": "Project", "label": "Project(2 cols)", "detail": {}, "children": [1]} ], "root": 2 }, @@ -39,7 +39,7 @@ "kind": "Summary", "dag": { "nodes": [ - { "id": 0, "kind": "KeepPreAsap", "label": "KeepPreAsap(Scan)", "detail": {"pre_asap_sub_dag": {"nodes": [{"id": 0, "kind": "Scan", "label": "Scan(netflow_table)", "detail": {}, "children": [], "hash": 111}], "root": 0}}, "children": [] }, + {"id": 0, "kind": "Scan", "label": "Scan(netflow_table)", "detail": {}, "children": []}, { "id": 1, "kind": "SummaryAgg", "label": "SummaryAgg(Kll)", "detail": {"family": {"Sketch": ["Kll", {"k": 200}]}, "col": {"Column": 6}, "reduction": {"Reduce": [1]}, "grouping": "PerSubpopulationInstance"}, "children": [0], "origin_pre_id": 1 } ], "root": 1 @@ -64,7 +64,7 @@ "kind": "Summary", "dag": { "nodes": [ - { "id": 0, "kind": "KeepPreAsap", "label": "KeepPreAsap(Scan)", "detail": {}, "children": [] }, + {"id": 0, "kind": "Scan", "label": "Scan", "detail": {}, "children": []}, { "id": 1, "kind": "SummaryAgg", "label": "SummaryAgg(HydraKll)", "detail": {"family": {"Sketch": ["Kll", {"k": 200}]}, "grouping": {"SharedMultiSubpopulation": {"params": {}}}}, "children": [0], "origin_pre_id": 1 } ], "root": 1 diff --git a/tools/dag-viewer/render.py b/tools/dag-viewer/render.py index fbdaca97a..7b16796da 100755 --- a/tools/dag-viewer/render.py +++ b/tools/dag-viewer/render.py @@ -17,7 +17,7 @@ This does not add anything index.html doesn't already do — it shares viewer.js and node-style.js with it verbatim (see viewer.js's header comment) and only differs in packaging: one query's worth of exported -`QueryExpr` detail *is* its plan (see the side panel on node click), and +`OperatorNode` detail *is* its plan (see the side panel on node click), and shared-hash highlighting *is* what this repo has for CSE today — both a hash-based proxy, not real CSE output; see README.md's "Shared-sub-DAG highlighting is a proxy" section. Structured cost/benefit annotations @@ -72,7 +72,7 @@ def _compact(value: object) -> str: if not isinstance(value, dict): return str(value) - # Common serde enum/newtype shapes in QueryExpr detail. + # Common serde enum/newtype shapes in OperatorNode detail. if set(value) == {"Column"}: return f"col[{_compact(value['Column'])}]" if set(value) == {"Table"} and isinstance(value["Table"], dict): @@ -269,23 +269,6 @@ def load_workload(paths: list[Path]) -> dict: for path in paths: data = json.loads(path.read_text()) incoming = data.get("queries", []) - if not incoming and isinstance(data.get("dag"), dict) and isinstance(data.get("deployments"), list): - incoming = [{ - "name": path.stem or "Summary maintenance plan", - "dag": data["dag"], - "post_dag": data["dag"], - "lifecycle_plan": True, - "lifecycle_summary": { - "selected_raw_recompute": data.get("selected_raw_recompute", False), - "summary_total_cost": data.get("summary_total_cost"), - "raw_recompute_total_cost": data.get("raw_recompute_total_cost"), - "horizon_seconds": data.get("horizon_seconds"), - "evaluation_rate_per_second": data.get("evaluation_rate_per_second"), - "update_rate_per_second": data.get("update_rate_per_second"), - "expected_reads": data.get("expected_reads"), - "deployment_count": len(data["deployments"]), - }, - }] for q in incoming: name = q["name"] if name in seen_names: diff --git a/tools/dag-viewer/test_render.py b/tools/dag-viewer/test_render.py index 20ccb64cd..e78e978f0 100644 --- a/tools/dag-viewer/test_render.py +++ b/tools/dag-viewer/test_render.py @@ -79,43 +79,6 @@ def test_boundary_terms_and_provenance_survive_standalone_export(self): self.assertIn(annotation["model_version"], html) self.assertIn(annotation["evidence_version"], html) - def test_loads_summary_maintenance_export_as_a_lifecycle_plan(self): - dag = named_dag("unused")["dag"] - summary = { - "selected_raw_recompute": True, - "summary_total_cost": None, - "raw_recompute_total_cost": 7.5, - "horizon_seconds": 60.0, - "evaluation_rate_per_second": 2.0, - "update_rate_per_second": 3.0, - "expected_reads": 120.0, - } - with tempfile.TemporaryDirectory() as d: - path = Path(d) / "lifecycle.json" - path.write_text(json.dumps({"dag": dag, "deployments": [], **summary})) - workload = load_workload([path]) - - query = workload["queries"][0] - self.assertEqual(query["name"], "lifecycle") - self.assertTrue(query["lifecycle_plan"]) - self.assertEqual(query["post_dag"], dag) - self.assertEqual( - query["lifecycle_summary"], - {**summary, "deployment_count": 0}, - ) - - def test_preserves_summary_plan_deployment_count(self): - dag = named_dag("unused")["dag"] - with tempfile.TemporaryDirectory() as d: - path = Path(d) / "lifecycle.json" - path.write_text(json.dumps({"dag": dag, "deployments": [{}, {}]})) - workload = load_workload([path]) - - self.assertEqual( - workload["queries"][0]["lifecycle_summary"]["deployment_count"], - 2, - ) - def test_merges_queries_across_files_in_order(self): with tempfile.TemporaryDirectory() as d: f1 = Path(d) / "a.json" diff --git a/tools/dag-viewer/viewer.js b/tools/dag-viewer/viewer.js index 6e4c696ee..d8191dc1a 100644 --- a/tools/dag-viewer/viewer.js +++ b/tools/dag-viewer/viewer.js @@ -18,7 +18,7 @@ cytoscape.use(window.cytoscapeDagre); // --post-asap whole-query merged post-ASAP DAG (same flattened // `{nodes, root}` shape as `dag`, but nodes may be post-ASAP-only kinds // like "SummaryAgg" mixed in, and any such node has no `hash` — there's no -// corresponding QueryExpr to hash) — left `undefined` when absent (omitted +// corresponding OperatorNode to hash) — left `undefined` when absent (omitted // whenever --post-asap wasn't set, or this query had zero replacements), // unlike `replacements` which always defaults to an array. `workload_cost` // is the optional per-query `NamedDAG.workload_cost` (issue #286), also @@ -122,13 +122,7 @@ function loadFiles(fileList) { reader.onload = () => { try { const parsed = JSON.parse(reader.result); - const incoming = parsed.queries || (parsed.dag && parsed.deployments ? [{ - name: file.name.replace(/\.json$/i, '') || 'Summary maintenance plan', - dag: parsed.dag, - post_dag: parsed.dag, - lifecycle_plan: true, - lifecycle_summary: lifecyclePlanSummary(parsed), - }] : []); + const incoming = parsed.queries || []; const existingNames = new Set(queries.map((q) => q.name)); // One batch id per *file* — every query this one dag_export // invocation produced shares its decision.id numbering. @@ -137,7 +131,7 @@ function loadFiles(fileList) { let name = q.name; if (existingNames.has(name)) name = `${q.name} (${file.name})`; existingNames.add(name); - queries.push({ name, dag: q.dag, source: q.source, replacements: q.replacements || [], post_dag: q.post_dag, workload_cost: q.workload_cost, lifecycle_plan: q.lifecycle_plan, lifecycle_summary: q.lifecycle_summary, sourceBatch }); + queries.push({ name, dag: q.dag, source: q.source, replacements: q.replacements || [], post_dag: q.post_dag, workload_cost: q.workload_cost, sourceBatch }); }); } catch (err) { alert(`Failed to parse ${file.name}: ${err.message}`); @@ -154,19 +148,6 @@ function loadFiles(fileList) { fileInput.value = ''; } -function lifecyclePlanSummary(plan) { - return { - selected_raw_recompute: Boolean(plan.selected_raw_recompute), - summary_total_cost: plan.summary_total_cost ?? null, - raw_recompute_total_cost: plan.raw_recompute_total_cost ?? null, - horizon_seconds: plan.horizon_seconds ?? null, - evaluation_rate_per_second: plan.evaluation_rate_per_second ?? null, - update_rate_per_second: plan.update_rate_per_second ?? null, - expected_reads: plan.expected_reads ?? null, - deployment_count: Array.isArray(plan.deployments) ? plan.deployments.length : 0, - }; -} - function getParticipants() { return Array.from(participants) .filter((i) => i >= 0 && i < queries.length) @@ -290,22 +271,6 @@ function buildCyStyle() { selector: 'node[category = "unknown"]', style: { 'border-style': 'dashed', 'border-width': 3 }, }, - { - // KeepPreAsap (post-ASAP lane only) is post-ASAP-only - // as a *kind*, but represents literally unchanged pre-ASAP content — - // override the 'summary' category's color/icon with the same neutral - // panel/muted/dashed treatment the rest of the chrome uses for "nothing - // to see here", so a glance at the After lane separates "the planner - // did something" (solid, colored) from "left alone" (dashed, muted). - // See node-style.js's CATEGORIES.summary comment for the category-level - // color choice this overrides. - selector: 'node[kind = "KeepPreAsap"]', - style: { - 'background-color': panelColor, - 'border-color': borderColor, - 'border-style': 'dashed', - }, - }, { selector: 'node.root', style: { 'border-width': 2.5 }, @@ -497,28 +462,6 @@ function renderPrePostAsap() { return; } hideModeHint(); - if (selected.length === 1 && selected[0].lifecycle_plan) { - viewTitleEl.textContent = `Summary maintenance: ${selected[0].name}`; - const elements = laneElements( - 'summary-maintenance', - `${selected[0].name} · lifecycle plan`, - selected[0].post_dag, - selected[0], - 'post', - ); - buildCy(elements); - finalizeDAGInteractions(); - applyHighlighting(); - const initial = cy.nodes().filter((node) => !node.data('isLane') && node.data('root')).first(); - if (initial && initial.length) { - initial.select(); - showPrePostDetail(initial.data()); - } else { - clearDetail(); - } - fitAndSyncZoom(); - return; - } viewTitleEl.textContent = selected.length === 1 ? `Pre/Post-ASAP: ${selected[0].name}` : `Pre/Post-ASAP workload union: ${selected.length} queries`; @@ -663,10 +606,7 @@ function laneElements(laneId, laneLabel, dag, query, stage, laneCost) { // exactly the plain IR label. label: node.label + nodeCostBadgeSuffix(node), node, - // Flat (not nested under `node`) so buildCyStyle's - // `node[kind = "KeepPreAsap"]` selector can actually match it — - // cytoscape selectors can't reach into a data field that's itself an - // object. + // Cytoscape selectors read flat data fields. kind: node.kind, category: categoryOf(node.kind), root: node.id === dag.root, @@ -674,7 +614,6 @@ function laneElements(laneId, laneLabel, dag, query, stage, laneCost) { laneId, stage, queryName: query.name, - lifecycleSummary: query.lifecycle_summary, translations: translationsForNode(query, node, stage), }, classes: node.decision && typeof node.decision.benefit?.value === 'number' @@ -1028,33 +967,6 @@ function showPrePostDetail(data) { : ''; const decisions = data.translations || []; - const planSummary = data.lifecycleSummary; - let planSummaryHtml = ''; - if (planSummary) { - const value = (item) => item === null || item === undefined ? 'unknown' : String(item); - const selected = planSummary.selected_raw_recompute - ? 'Raw recomputation' - : 'Summary maintenance'; - planSummaryHtml = `

Lifecycle plan decision

-
Selected: ${escapeHtml(selected)}
-
summary cost: ${escapeHtml(value(planSummary.summary_total_cost))} · raw recompute cost: ${escapeHtml(value(planSummary.raw_recompute_total_cost))} · deployments: ${escapeHtml(value(planSummary.deployment_count))}
-
horizon: ${escapeHtml(value(planSummary.horizon_seconds))} s · expected reads: ${escapeHtml(value(planSummary.expected_reads))} · evaluation rate: ${escapeHtml(value(planSummary.evaluation_rate_per_second))}/s · update rate: ${escapeHtml(value(planSummary.update_rate_per_second))}/s
-
`; - } - const lifecycle = node.detail && node.detail.summary_maintenance; - let lifecycleHtml = ''; - if (lifecycle) { - const selected = lifecycle.selected; - const selectedText = selected - ? `${selected.lifecycle.kind} · ${selected.maintenance_mode} · ${selected.evaluation_schedule} · ${selected.output_representation}` - : 'No lifecycle selected'; - const alternatives = (lifecycle.alternatives || []).map((alternative) => { - const status = alternative.rejection ? `rejected: ${alternative.rejection}` : `cost: ${alternative.total_cost}`; - const assumptions = (alternative.assumptions || []).join('; ') || 'none'; - return `
${escapeHtml(alternative.lifecycle.kind)}
${escapeHtml(status)}
assumptions: ${escapeHtml(assumptions)}
`; - }).join(''); - lifecycleHtml = `

Summary maintenance lifecycle

Selected: ${escapeHtml(selectedText)}
${alternatives}
`; - } let translationHtml = ''; if (decisions.length > 0) { const cards = decisions.map((entry) => ` @@ -1076,9 +988,7 @@ function showPrePostDetail(data) { ${escapeHtml(chipLabel)}
${escapeHtml(node.label)}
${rootHtml} - ${planSummaryHtml} ${translationHtml} - ${lifecycleHtml}

IR node content

${escapeHtml(JSON.stringify(node.detail, null, 2))}
`; @@ -1172,10 +1082,6 @@ function renderLegend() { Shared workload nodeExplicitly identified by the exporter as shared across selected queries`); rows.push(`
Query root${escapeHtml(ROOT_BADGE.description)}
`); - const panelBg = getComputedStyle(document.documentElement).getPropertyValue('--panel2').trim() || '#f0f2f5'; - const mutedColor = getComputedStyle(document.documentElement).getPropertyValue('--muted').trim() || '#6b7280'; - rows.push(`
- Pass-through (KeepPreAsap)Unchanged pre-ASAP sub-DAG carried into the Summary DAG as-is
`); legendList.innerHTML = rows.join(''); } @@ -1204,7 +1110,7 @@ function loadWorkload(parsed) { const incoming = (parsed && parsed.queries) || []; // One batch id for this whole document — see `sourceBatch`'s own doc above. const sourceBatch = nextSourceBatch++; - incoming.forEach((q) => queries.push({ name: q.name, dag: q.dag, source: q.source, replacements: q.replacements || [], post_dag: q.post_dag, workload_cost: q.workload_cost, lifecycle_plan: q.lifecycle_plan, lifecycle_summary: q.lifecycle_summary, sourceBatch })); + incoming.forEach((q) => queries.push({ name: q.name, dag: q.dag, source: q.source, replacements: q.replacements || [], post_dag: q.post_dag, workload_cost: q.workload_cost, sourceBatch })); if (activeIndex === -1 && queries.length > 0) activeIndex = 0; if (participants.size === 0 && activeIndex >= 0) participants.add(activeIndex); }