refactor(types): arrange asap-types modules by #511 section (#572 B1)

crates/asap-aware-mapping/src/accuracy/composition.rs

@@ -705,7 +705,7 @@ pub(super) fn propagate(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use asap_types::pre_asap::AggIntent;
+    use asap_types::ir::operator::AggIntent;
     fn abs(bound: f64, delta: f64) -> ResultGuarantee {
         ResultGuarantee {
             metric: ErrorMetric::AbsoluteValue,
@@ -1030,7 +1030,7 @@ mod tests {
     #[test]
     fn counter_functions_have_distinct_definition_rules() {
         let operation = |intent| ExactOperation::Aggregate {
-            reduction: asap_types::pre_asap::Reduction::PerEntity,
+            reduction: asap_types::ir::operator::Reduction::PerEntity,
             measures: vec![intent],
             output_names: vec![],
             filters: vec![],

crates/asap-aware-mapping/src/accuracy/estimators/cms.rs

@@ -42,8 +42,8 @@ mod tests {
     #[test]
     fn local_guarantee_inverts_frequency_sizing() {
         use crate::replacement::default_size_params;
-        use asap_types::post_asap::{GroupingStrategy, SketchKind};
-        let c = asap_types::pre_asap::agg_intent::default_cardinality();
+        use asap_types::ir::schema::{GroupingStrategy, SketchKind};
+        let c = asap_types::ir::operator::agg_intent::default_cardinality();
         let params = default_size_params(SketchAlgorithm::Cms, &c, 0.01, 0.001);
         let g = DefaultAccuracyModel
             .local_guarantee(
@@ -66,7 +66,7 @@ mod tests {
 
     #[test]
     fn heap_evaluation_retains_frequency_metric() {
-        use asap_types::post_asap::{GroupingStrategy, SketchKind};
+        use asap_types::ir::schema::{GroupingStrategy, SketchKind};
         let cms_heap = SketchParams::CmsWithHeap {
             width: 272,
             depth: 5,

crates/asap-aware-mapping/src/accuracy/estimators/count_sketch.rs

@@ -56,8 +56,8 @@ mod tests {
     #[test]
     fn count_sketch_uses_an_l2_guarantee() {
         use crate::replacement::default_size_params;
-        use asap_types::post_asap::{GroupingStrategy, SketchKind};
-        use asap_types::pre_asap::agg_intent::default_cardinality;
+        use asap_types::ir::operator::agg_intent::default_cardinality;
+        use asap_types::ir::schema::{GroupingStrategy, SketchKind};
         let intent = default_cardinality();
         let count_sketch = default_size_params(SketchAlgorithm::CountSketch, &intent, 0.01, 0.01);
         let guarantee = DefaultAccuracyModel
@@ -67,7 +67,7 @@ mod tests {
                     GroupingStrategy::default(),
                 ),
                 &SketchStatistic::PointCount {
-                    key: asap_types::pre_asap::expr_ir::ColumnRef::SampleValue,
+                    key: asap_types::ir::scalar::ColumnRef::SampleValue,
                     value: None,
                 },
             )

crates/asap-aware-mapping/src/accuracy/estimators/hll.rs

@@ -231,8 +231,8 @@ mod tests {
     #[test]
     fn generic_rse_sizing_does_not_certify_confidence() {
         use crate::replacement::default_size_params;
-        use asap_types::post_asap::{GroupingStrategy, SketchKind};
-        use asap_types::pre_asap::agg_intent::default_cardinality;
+        use asap_types::ir::operator::agg_intent::default_cardinality;
+        use asap_types::ir::schema::{GroupingStrategy, SketchKind};
         let c = default_cardinality();
         let params = default_size_params(SketchAlgorithm::Hll, &c, 0.01, 0.01);
         let g = DefaultAccuracyModel

crates/asap-aware-mapping/src/accuracy/estimators/kll.rs

@@ -43,8 +43,8 @@ mod tests {
     #[test]
     fn local_guarantee_inverts_rank_sizing() {
         use crate::replacement::default_size_params;
-        use asap_types::post_asap::{GroupingStrategy, SketchKind};
-        use asap_types::pre_asap::agg_intent::default_quantile;
+        use asap_types::ir::operator::agg_intent::default_quantile;
+        use asap_types::ir::schema::{GroupingStrategy, SketchKind};
         let q = default_quantile(0.99);
         let params = default_size_params(SketchAlgorithm::Kll, &q, 0.01, 0.01);
         let g = DefaultAccuracyModel

crates/asap-aware-mapping/src/accuracy/estimators/mod.rs

@@ -1,7 +1,7 @@
 //! Dispatch committed estimator parameters to their accuracy models.
 use super::*;
-use asap_types::post_asap::GroupingStrategy;
-use asap_types::pre_asap::AggIntent;
+use asap_types::ir::operator::AggIntent;
+use asap_types::ir::schema::GroupingStrategy;
 
 pub mod cardinality;
 pub mod cms;

crates/asap-aware-mapping/src/accuracy/evidence.rs

@@ -172,8 +172,8 @@ mod tests {
         let fresh = provider.propagation_stats(
             &CompositionOperator::ExactSum,
             &FieldDataType::ExactAggregate(
-                asap_types::post_asap::ExactKind::Sum,
-                asap_types::post_asap::ExactParams::Sum,
+                asap_types::ir::schema::ExactKind::Sum,
+                asap_types::ir::schema::ExactParams::Sum,
             ),
             None,
         );
@@ -187,8 +187,8 @@ mod tests {
         .propagation_stats(
             &CompositionOperator::ExactSum,
             &FieldDataType::ExactAggregate(
-                asap_types::post_asap::ExactKind::Sum,
-                asap_types::post_asap::ExactParams::Sum,
+                asap_types::ir::schema::ExactKind::Sum,
+                asap_types::ir::schema::ExactParams::Sum,
             ),
             None,
         );

crates/asap-aware-mapping/src/accuracy/mod.rs

@@ -20,11 +20,12 @@ pub use evidence::{
     QuantileInputDomain, WorkloadAccuracyEvidence,
 };
 
-use asap_types::ir::OperatorNode;
-use asap_types::post_asap::{
-    AccuracyError, BoundExpr, CompositionOperator, ErrorMetric, FieldDataType, GuaranteeSource,
-    ProbabilityExpr, ResultGuarantee, SketchAlgorithm, SketchParams, SketchStatistic,
+use asap_types::ir::properties::{
+    AccuracyError, BoundExpr, CompositionOperator, ErrorMetric, GuaranteeSource, ProbabilityExpr,
+    ResultGuarantee,
 };
+use asap_types::ir::schema::{FieldDataType, SketchAlgorithm, SketchParams, SketchStatistic};
+use asap_types::ir::OperatorNode;
 use asap_types::types::AccuracyTarget;
 
 use crate::exact_composition::ExactOperation;

crates/asap-aware-mapping/src/accuracy/reconciliation.rs

@@ -149,13 +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 asap_types::ir::operator::non_asap::any_measure_filtered;
 use std::cmp::Ordering;
 use std::rc::Rc;
 
-use asap_types::ir::operator_properties::Reduction;
+use asap_types::ir::operator::agg_intent::AggIntent;
+use asap_types::ir::operator::operator_properties::Reduction;
 use asap_types::ir::{NonASAPOp, OperatorNode};
-use asap_types::pre_asap::agg_intent::AggIntent;
 use asap_types::types::AccuracyTarget;
 
 use crate::replacement::{
@@ -392,9 +392,9 @@ 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::schema::{ColumnId, DataType, Field, Schema};
+    use asap_types::ir::operator::operator_properties::{GroupKeys, Source};
+    use asap_types::ir::schema::SketchAlgorithm;
+    use asap_types::ir::schema::{ColumnId, DataType, Field, Schema};
 
     /// `[ts(0), value(1), job(2)]`.
     /// A unique-keyed scan (`[ts]`) so `share_common_sub_dags` is actually

crates/asap-aware-mapping/src/analytical_cost.rs

@@ -7,8 +7,10 @@
 
 use std::collections::{HashMap, HashSet};
 
-use asap_types::post_asap::{SketchAlgorithm, SketchParams};
-pub use asap_types::resources::{CacheCapacityEvidence, CacheEvidence, CacheProfile, ModeledCpu};
+use asap_types::ir::schema::{SketchAlgorithm, SketchParams};
+pub use asap_types::workload::resources::{
+    CacheCapacityEvidence, CacheEvidence, CacheProfile, ModeledCpu,
+};
 use asap_types::workload::DataArrival;
 use serde::{Deserialize, Serialize};
 
@@ -185,7 +187,7 @@ impl ResourceCalibration {
 #[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
 #[serde(from = "ResourceEstimateWire", into = "ResourceEstimateWire")]
 pub struct ResourceEstimate {
-    resources: asap_types::resources::PhysicalResources<ModeledCpu, u64>,
+    resources: asap_types::workload::resources::PhysicalResources<ModeledCpu, u64>,
 }
 
 // Keep the established three-field JSON format. Required fields make a missing
@@ -216,7 +218,7 @@ impl From<ResourceEstimate> for ResourceEstimateWire {
 impl ResourceEstimate {
     pub const fn new(cpu_ops: f64, peak_memory_bytes: u64, scan_bytes: u64) -> Self {
         Self {
-            resources: asap_types::resources::PhysicalResources {
+            resources: asap_types::workload::resources::PhysicalResources {
                 cpu: ModeledCpu { cpu_ops },
                 peak_memory_bytes: Some(peak_memory_bytes),
                 retained_memory_bytes: None,
@@ -243,7 +245,9 @@ impl ResourceEstimate {
             .expect("analytical scan bytes are required by construction")
     }
 
-    pub fn resources(&self) -> &asap_types::resources::PhysicalResources<ModeledCpu, u64> {
+    pub fn resources(
+        &self,
+    ) -> &asap_types::workload::resources::PhysicalResources<ModeledCpu, u64> {
         &self.resources
     }
 }
@@ -2244,7 +2248,7 @@ mod tests {
         assert_eq!(estimate.cpu_ops(), 12.5);
         assert_eq!(estimate.peak_memory_bytes(), u64::MAX);
         assert_eq!(estimate.scan_bytes(), 0);
-        let shared: &asap_types::resources::PhysicalResources<ModeledCpu, u64> =
+        let shared: &asap_types::workload::resources::PhysicalResources<ModeledCpu, u64> =
             estimate.resources();
         assert_eq!(shared.cpu.cpu_ops, 12.5);
         assert_eq!(shared.peak_memory_bytes, Some(u64::MAX));
@@ -2968,7 +2972,7 @@ mod tests {
     }
 
     fn comparison_scope() -> ComparisonScope {
-        use asap_types::ir::operator_properties::Source;
+        use asap_types::ir::operator::operator_properties::Source;
         use asap_types::workload::{
             DurationMs, QueryRecurrence, QueryTimeScope, RepeatedDemand, RepetitionInterval,
             TimeSelection, TimestampMs,
@@ -3243,7 +3247,7 @@ mod tests {
             operator: PhysicalOperator::Scan,
             children: vec![],
             scan_selection: Some(ScanSelection {
-                source: asap_types::ir::operator_properties::Source::Table {
+                source: asap_types::ir::operator::operator_properties::Source::Table {
                     table_ref: "other_metrics".into(),
                 },
                 source_snapshot_id: "catalog-version-42".into(),
@@ -3308,7 +3312,7 @@ mod tests {
         let mut scope = comparison_scope();
         let coverage = scope.sources[0].clone();
         scope.sources.push(ScanSelection {
-            source: asap_types::ir::operator_properties::Source::Table {
+            source: asap_types::ir::operator::operator_properties::Source::Table {
                 table_ref: "auxiliary".into(),
             },
             source_snapshot_id: "catalog-version-42".into(),
@@ -3672,10 +3676,10 @@ mod tests {
     // Legacy mapping imports are aliases of the shared schema, not a second type.
     #[test]
     fn shared_cache_types_work_through_legacy_mapping_imports() {
-        let central: asap_types::resources::CacheProfile = cache_profile(100, 50);
+        let central: asap_types::workload::resources::CacheProfile = cache_profile(100, 50);
         let legacy: CacheProfile =
             serde_json::from_value(serde_json::to_value(&central).unwrap()).unwrap();
-        fn accepts_shared(_: &asap_types::resources::CacheProfile) {}
+        fn accepts_shared(_: &asap_types::workload::resources::CacheProfile) {}
         accepts_shared(&legacy);
         assert_eq!(central, legacy);
         assert_eq!(