feat(control_plane): Phase 2 step 2 -- add expr_ir.rs - #394
Merged
zzylol merged 1 commit intoJul 18, 2026
Merged
Conversation
…ext step) New file, re-exported from asap_ir::intent_algebra::expr_ir. Per the D2 decision in ASAPController's intent-algebra-reconciliation.md: one generic Expr<C> scalar IR shared across L2 (Expr<ColumnRef>) and L3 (Expr<ColumnId>), replacing control_plane's separate ad hoc Predicate (query_expr.rs) and ScalarExpr (relational.rs) types. Deliberately not re-exported into the crate::intent_algebra::* top-level surface yet -- query_expr::ColumnRef already claims that name, and nothing constructs Expr<C> until the query_expr.rs/relational.rs merge (next step) retargets Predicate/ScalarExpr onto L3Expr/L2Expr. This step only makes the type available; verified inert (cargo build clean, full test suite unchanged, 820 passed).
Base automatically changed from
phase2/schema-rs-merge
to
phase1b/real-asap-ir-dependency
July 18, 2026 17:15
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Stacked on #393. Adds
expr_ir.rsper Phase 2 step 2 of the migrationplan -- the D2-decision scalar IR (
Expr<C>, generic over column-reftype:
L2Expr = Expr<ColumnRef>for the front-end-emitted tree,L3Expr = Expr<ColumnId>for the canonical positional tree).Deliberately inert: not re-exported into
crate::intent_algebra::*yet(
query_expr::ColumnRefalready claims that name), and nothingconstructs
Expr<C>until thequery_expr.rs/relational.rsmergeretargets
Predicate/ScalarExpronto it. That's next, and it's a muchbigger step than this one or #393 -- see the follow-up comment.
Verification
cargo build -p control_plane-- clean, zero new warnings beyondpre-existing ones
cargo test -p control_plane --lib-- 820 passed, unchanged (same 1pre-existing failure as feat(control_plane): Phase 1b -- depend on asap-ir for real, not a copy #392/feat(control_plane): Phase 2 step 1 -- merge schema.rs onto asap-ir #393)
Test plan
cargo build -p control_planecargo test -p control_plane --lib🤖 Generated with Claude Code