Skip to content

Commit faf5cb9

Browse files
committed
Merge branch 'impl/sds-stack-728' into fix/cost-evidence-dataset
2 parents ee66bd8 + 32c5de3 commit faf5cb9

1 file changed

Lines changed: 14 additions & 23 deletions

File tree

‎control_plane/src/physical/compiler.rs‎

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7073,35 +7073,26 @@ pub(crate) mod tests {
70737073
Query("sum_over_time(n[1m])".into());
70747074
let (mut request, env) = snapshot.into_physical_compilation_request().unwrap();
70757075
let (right, _) = right.into_physical_compilation_request().unwrap();
7076-
let left = request.queries[0].selected_plan_root.clone();
7077-
let right = right.queries[0].selected_plan_root.clone();
7078-
request.queries[0].selected_plan_root = Rc::new(SummaryNode {
7079-
expr: SummaryExpr::BinaryOp {
7080-
timing: planner_types::post_asap::ExecutionTiming::QueryTime,
7081-
lhs: left.clone(),
7082-
rhs: right,
7083-
operator: planner_types::post_asap::BinaryOperator {
7084-
checked_relative_division: false,
7085-
checked_finite_division: false,
7086-
kind: planner_types::pre_asap::BinaryOpKind::Arithmetic(
7087-
planner_types::pre_asap::ArithmeticOpKind::Add,
7088-
),
7089-
vector_match: None,
7090-
},
7091-
},
7092-
schema: left.schema.clone(),
7093-
guarantee: None,
7094-
});
7095-
let text = "quantile(0.9, sum_over_time(m[1m])) + sum_over_time(n[1m])";
7096-
request.queries[0].query_string = text.into();
7076+
// These are independent query outputs. Adding an approximate quantile
7077+
// to an exact sum would require a separate composed accuracy proof.
7078+
let mut raw_query = right.queries[0].clone();
7079+
raw_query.query_id = "raw-query".into();
7080+
request.queries.push(raw_query);
70977081
request
70987082
.query_workload
70997083
.as_mut()
71007084
.unwrap()
71017085
.repeating_queries
71027086
.as_mut()
7103-
.unwrap()[0]
7104-
.query = Query(text.into());
7087+
.unwrap()
7088+
.push(
7089+
right
7090+
.query_workload
7091+
.unwrap()
7092+
.repeating_queries
7093+
.unwrap()
7094+
.remove(0),
7095+
);
71057096
prepare_window_implementations(&mut request.queries[0], &model, env.target, 0).unwrap();
71067097
request.queries[0]
71077098
.window_realization_candidates

0 commit comments

Comments
 (0)