Skip to content

refactor(workload): separate query demand from data evidence #442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zzylol merged 1 commit into from
Sep 18, 2026
Merged

refactor(workload): separate query demand from data evidence #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions crates/asap-aware-mapping/src/replacement.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ use asap_types::pre_asap::query_expr::{
};
use asap_types::pre_asap::schema::{ColumnId, Schema};
use asap_types::types::AccuracyTarget;
use asap_types::workload::{QueryRecurrence, QueryWorkload, RepeatedDemand};
use asap_types::workload::{DataWorkload, QueryRecurrence, QueryWorkload, RepeatedDemand};
use std::rc::Rc;
use thiserror::Error;

Expand Down Expand Up @@ -3647,13 +3647,17 @@ impl<Id> PlanSpace<Id> {
pub fn recurrence_profiles_from_workload(
&self,
workload: &QueryWorkload,
data_workload: Option<&DataWorkload>,
// For each `PlanSpace::roots[i]`, the explicit index of its
// corresponding normalized workload entry.
root_workload_entries: &[usize],
now_ms: u64,
horizon: Option<Horizon>,
) -> Result<RecurrenceProfileMap, crate::recurrence::RecurrenceError> {
workload.validate()?;
if let Some(data) = data_workload {
data.validate()?;
}
if let Some(horizon) = horizon {
if !horizon.0.is_finite() || horizon.0 <= 0.0 {
return Err(crate::recurrence::RecurrenceError::InvalidHorizon(horizon));
Expand Down Expand Up @@ -3708,9 +3712,7 @@ impl<Id> PlanSpace<Id> {
};
recurrences.push(recurrence);
}
let update_rate = workload
.data_workload
.as_ref()
let update_rate = data_workload
.and_then(|data| data.ingestion_rate.value_at(now_ms))
.map(|rate| UpdateRate(rate.0));
self.recurrence_profiles(&recurrences, update_rate)
Expand Down
107 changes: 54 additions & 53 deletions crates/asap-aware-mapping/src/summary_maintenance_cost/model.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1150,23 +1150,13 @@ mod tests {
predictability: Predictability::Predictable { known_at: None },
time_selection: TimeSelection::default(),
}]),
data_workload: Some(DataWorkload {
arrival: DataArrival::ContinuouslyIngesting,
ingestion_rate: Evidence {
value: Some(Rate(2.0)),
source: EvidenceSource::Declared,
observed_at_ms: None,
valid_for_ms: None,
},
..DataWorkload::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(&workload, &[0]),
WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]),
0,
Some(Horizon(5.0)),
SummaryMaintenanceLifecycleCapabilities::ALL,
Expand Down Expand Up @@ -1206,7 +1196,7 @@ mod tests {

let plan = plan_summary_maintenance_lifecycles(
root,
WorkloadDemand::new(&workload, &[0]),
WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]),
0,
Some(Horizon(5.0)),
SummaryMaintenanceLifecycleCapabilities {
Expand Down Expand Up @@ -1268,7 +1258,7 @@ mod tests {

let plan = plan_summary_maintenance_lifecycles(
root,
WorkloadDemand::new(&workload, &[0]),
WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]),
0,
Some(Horizon(5.0)),
SummaryMaintenanceLifecycleCapabilities {
Expand Down Expand Up @@ -1314,8 +1304,7 @@ mod tests {
}
let selection = global_selection_with_summary_maintenance_lifecycles(
&space,
&workload,
&[0],
WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]),
0,
Some(Horizon(5.0)),
SummaryMaintenanceLifecycleCapabilities::ALL,
Expand All @@ -1325,7 +1314,7 @@ mod tests {
let plan = materialize_with_summary_maintenance_lifecycles(
&selection,
&space.roots[0].1,
WorkloadDemand::new(&workload, &[0]),
WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]),
0,
Some(Horizon(5.0)),
SummaryMaintenanceLifecycleCapabilities::ALL,
Expand All @@ -1347,8 +1336,7 @@ mod tests {
.clear();
let unavailable = global_selection_with_summary_maintenance_lifecycles(
&space,
&workload,
&[0],
WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]),
0,
Some(Horizon(5.0)),
SummaryMaintenanceLifecycleCapabilities::ALL,
Expand All @@ -1367,8 +1355,7 @@ mod tests {
}
let cheap_selection = global_selection_with_summary_maintenance_lifecycles(
&space,
&workload,
&[0],
WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]),
0,
Some(Horizon(5.0)),
SummaryMaintenanceLifecycleCapabilities::ALL,
Expand All @@ -1383,7 +1370,7 @@ mod tests {
let cheap_plan = materialize_with_summary_maintenance_lifecycles(
&cheap_selection,
&space.roots[0].1,
WorkloadDemand::new(&workload, &[0]),
WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]),
0,
Some(Horizon(5.0)),
SummaryMaintenanceLifecycleCapabilities::ALL,
Expand Down Expand Up @@ -1625,7 +1612,7 @@ mod tests {

let plan = plan_summary_maintenance_lifecycles(
Rc::clone(&root),
WorkloadDemand::new(&workload, &[0]),
WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]),
0,
Some(Horizon(5.0)),
SummaryMaintenanceLifecycleCapabilities::ALL,
Expand Down Expand Up @@ -1664,7 +1651,7 @@ mod tests {
);
let bad_edge = plan_summary_maintenance_lifecycles(
Rc::clone(&root),
WorkloadDemand::new(&workload, &[0]),
WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]),
0,
Some(Horizon(5.0)),
SummaryMaintenanceLifecycleCapabilities::ALL,
Expand All @@ -1688,7 +1675,7 @@ mod tests {
.io_bytes_per_execution = None;
let missing_io = plan_summary_maintenance_lifecycles(
root,
WorkloadDemand::new(&workload, &[0]),
WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]),
0,
Some(Horizon(5.0)),
SummaryMaintenanceLifecycleCapabilities::ALL,
Expand Down Expand Up @@ -1742,7 +1729,7 @@ mod tests {
);
let bad_edge = plan_summary_maintenance_lifecycles(
Rc::clone(&root),
WorkloadDemand::new(&workload, &[0]),
WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]),
0,
Some(Horizon(5.0)),
SummaryMaintenanceLifecycleCapabilities::ALL,
Expand All @@ -1766,7 +1753,7 @@ mod tests {
.io_bytes_per_execution = None;
let missing_io = plan_summary_maintenance_lifecycles(
root,
WorkloadDemand::new(&workload, &[0]),
WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]),
0,
Some(Horizon(5.0)),
SummaryMaintenanceLifecycleCapabilities::ALL,
Expand Down Expand Up @@ -1843,7 +1830,7 @@ mod tests {

let plan = plan_summary_maintenance_lifecycles(
root,
WorkloadDemand::new(&workload, &[0]),
WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]),
0,
Some(Horizon(5.0)),
SummaryMaintenanceLifecycleCapabilities::ALL,
Expand All @@ -1868,7 +1855,7 @@ mod tests {
);
let plan = plan_summary_maintenance_lifecycles(
Rc::clone(&root),
WorkloadDemand::new(&workload, &[0]),
WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]),
0,
Some(Horizon(5.0)),
SummaryMaintenanceLifecycleCapabilities::ALL,
Expand All @@ -1895,7 +1882,7 @@ mod tests {
);
let costed_plan = plan_summary_maintenance_lifecycles(
root,
WorkloadDemand::new(&workload, &[0]),
WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]),
0,
Some(Horizon(5.0)),
SummaryMaintenanceLifecycleCapabilities::ALL,
Expand Down Expand Up @@ -1927,7 +1914,7 @@ mod tests {
);
let incomplete = plan_summary_maintenance_lifecycles(
Rc::clone(&root),
WorkloadDemand::new(&workload, &[0]),
WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]),
0,
Some(Horizon(5.0)),
SummaryMaintenanceLifecycleCapabilities::ALL,
Expand Down Expand Up @@ -1980,7 +1967,7 @@ mod tests {
);
let complete = plan_summary_maintenance_lifecycles(
Rc::clone(&root),
WorkloadDemand::new(&workload, &[0]),
WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]),
0,
Some(Horizon(5.0)),
SummaryMaintenanceLifecycleCapabilities::ALL,
Expand All @@ -1998,7 +1985,7 @@ mod tests {
.working_memory_bytes = 128;
let larger_workspace = plan_summary_maintenance_lifecycles(
Rc::clone(&root),
WorkloadDemand::new(&workload, &[0]),
WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]),
0,
Some(Horizon(5.0)),
SummaryMaintenanceLifecycleCapabilities::ALL,
Expand All @@ -2021,7 +2008,7 @@ mod tests {
}
let shared = plan_summary_maintenance_lifecycles(
root,
WorkloadDemand::new(&workload, &[0]),
WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]),
0,
Some(Horizon(5.0)),
SummaryMaintenanceLifecycleCapabilities::ALL,
Expand Down Expand Up @@ -2120,7 +2107,7 @@ mod tests {

let plan = plan_summary_maintenance_lifecycles(
Rc::clone(&root),
WorkloadDemand::new(&workload, &[0]),
WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]),
0,
Some(Horizon(5.0)),
SummaryMaintenanceLifecycleCapabilities {
Expand Down Expand Up @@ -2165,7 +2152,7 @@ mod tests {
asap_types::workload::AccuracyRequirement::Explicit(AccuracyTarget::Epsilon(0.01));
let stricter = plan_summary_maintenance_lifecycles(
root,
WorkloadDemand::new(&workload, &[0]),
WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]),
0,
Some(Horizon(5.0)),
SummaryMaintenanceLifecycleCapabilities {
Expand Down Expand Up @@ -2313,7 +2300,7 @@ mod tests {

let plan = plan_summary_maintenance_lifecycles(
root,
WorkloadDemand::new(&workload, &[0]),
WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]),
0,
Some(Horizon(5.0)),
SummaryMaintenanceLifecycleCapabilities::ALL,
Expand Down Expand Up @@ -2438,7 +2425,7 @@ mod tests {

let plan = plan_summary_maintenance_lifecycles(
root,
WorkloadDemand::new(&workload, &[0]),
WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]),
0,
Some(Horizon(5.0)),
SummaryMaintenanceLifecycleCapabilities::ALL,
Expand All @@ -2464,7 +2451,7 @@ mod tests {
model.node_evidence.retained_queries.clear();
let missing_retained = plan_summary_maintenance_lifecycles(
Rc::clone(&root),
WorkloadDemand::new(&workload, &[0]),
WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]),
0,
Some(Horizon(5.0)),
SummaryMaintenanceLifecycleCapabilities::ALL,
Expand All @@ -2485,7 +2472,7 @@ mod tests {
};
let false_lineage = plan_summary_maintenance_lifecycles(
root,
WorkloadDemand::new(&workload, &[0]),
WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]),
0,
Some(Horizon(5.0)),
SummaryMaintenanceLifecycleCapabilities::ALL,
Expand Down Expand Up @@ -2516,7 +2503,7 @@ mod tests {
);
let state_plan = plan_summary_maintenance_lifecycles(
state_only,
WorkloadDemand::new(&workload, &[0]),
WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]),
0,
Some(Horizon(5.0)),
SummaryMaintenanceLifecycleCapabilities::ALL,
Expand Down Expand Up @@ -2564,7 +2551,7 @@ mod tests {
});
let nested_plan = plan_summary_maintenance_lifecycles(
nested,
WorkloadDemand::new(&workload, &[0]),
WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]),
0,
Some(Horizon(5.0)),
SummaryMaintenanceLifecycleCapabilities::ALL,
Expand Down Expand Up @@ -3040,7 +3027,7 @@ mod tests {

let plan = plan_summary_maintenance_lifecycles(
root,
WorkloadDemand::new(&workload, &[0]),
WorkloadDemand::new_with_data(&workload, &streaming_data_workload(), &[0]),
0,
Some(Horizon(5.0)),
SummaryMaintenanceLifecycleCapabilities {
Expand Down Expand Up @@ -3090,16 +3077,20 @@ mod tests {
predictability: Predictability::Predictable { known_at: None },
time_selection: TimeSelection::default(),
}]),
data_workload: Some(DataWorkload {
arrival: DataArrival::ContinuouslyIngesting,
ingestion_rate: Evidence {
value: Some(Rate(2.0)),
source: EvidenceSource::Declared,
observed_at_ms: None,
valid_for_ms: None,
},
..DataWorkload::default()
}),
}
}

fn streaming_data_workload() -> DataWorkload {
DataWorkload {
arrival: DataArrival::ContinuouslyIngesting,

ingestion_rate: Evidence {
value: Some(Rate(2.0)),
source: EvidenceSource::Declared,
observed_at_ms: None,
valid_for_ms: None,
},
..Default::default()
}
}

Expand Down Expand Up @@ -3498,7 +3489,17 @@ mod tests {
let workload = streaming_workload();
let entry = workload.entries().next().unwrap();
ComparisonScope::from_workload(
workload.data_workload.as_ref().unwrap(),
&DataWorkload {
arrival: DataArrival::ContinuouslyIngesting,

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),
Expand Down
Loading
Loading