Repository navigation
Remove dead Pass 2 / choice candidate metadata and labels #997
Description
Production planning (memo/joint search) always builds LogicalCandidate with choice: Vec::new() and pass2: None (plan-selection/src/search/pipeline.rs:281, route.rs:939,952). Only the test helper explicit_assignment_plans (integration-tests/src/lib.rs) populates them, and its sole caller (memo_covers_whole_workload_pass2.rs) never reads them. Everything below is therefore dead or test-only. (Found by grep at b318df5.)
Dead structs / fields
LogicalCandidate.choice,LogicalCandidate.pass2(plan-selection/src/search/pipeline.rs)Pass2Candidateand all its fields (logical-asap-optimization/src/workload_candidates.rs)Stage1Candidate.choice,Stage1Candidate.pass2— onlyrootsis read (query_pruning.rs:325)pub use ...::Pass2Candidatere-export (devtools/src/planning_stages.rs:7)
Dead code paths
choice_candidates(.., from, ..):fromis always0; fold intostage1_candidates_of_choicedevtools/src/candidate_labels.rs:candidate_labels: thechoice_label(...)branch and theif let Some(pass2)blockchoice_label,pass2_label- helpers likely only used by those two:
for_queries,readers_in,readers,same_computation,is_pane_chain_of,same_pane_chain,state_name,duration_name(verify each when deleting)
Not dead (keep)
Pass2/Pass2List/pass2_candidates: still used viaalone_violationinquery_pruning.rs*Pass2Candidatestructs inasap_aware_cse.rs: consumed bypass2_candidates
Proposed cleanup
- Make
stage1_candidates_of_choicereturn the roots only. - Remove the fields and functions listed above.
- Update the
LogicalCandidateconstructors:count_planning.rs,promql_numeric_regressions.rs,precompute_candidates.rs,pipeline.rs,route.rs, andexplicit_assignment_plans.
Activity
milindsrivastava1997 commentedon Oct 28, 2026
@zzylol can you check if this makes sense?
zzylol commentedon Oct 28, 2026
Checked against
mainat93c90aca. The finding holds: production search builds everyLogicalCandidatewithchoice: Vec::new()andpass2: None(nowpipeline.rs:301,route.rs:1002,1015), and onlyexplicit_assignment_plansfills them. The "Not dead (keep)" section is right too:alone_violation(query_pruning.rs:325) reads onlyroots.Corrections before deleting:
for_queries,duration_nameandquery_names.physical_labelcalls them (candidate_labels.rs:559,563), and production still uses it. The helpers that are only used bychoice_label/pass2_labelarereaders_in,readers,same_computation,is_pane_chain_of,same_pane_chainandstate_name.candidate_labels.rs(#[cfg(test)]from line 659) andworkload_candidates.rs(line 507 assertscandidate.pass2), plus thefrom_pass1_positionassignment inintegration-tests/src/lib.rs:597.pass2_candidates/Pass2List) will then have one production user, thealone_violationpruning check, alongside the memo Pass 2. That is the "Pass 2 exists twice" item in Stage 1 Pass 2 review: ASAP-aware CSE rules over memo groups and summary-state groups #1013. This issue can stay a pure deletion, and movingalone_violationonto the memo Pass 2 is tracked there.Linked as a sub-issue of #1013.
refactor: remove dead Pass 2 / choice candidate metadata and labels (#…
docs: drop Pass2Candidate references from the developer docs (#997)
review: state the rollup-over-panes expectation independently (#997)
refactor: remove dead Pass 2 / choice candidate metadata and labels (#…