Rework ExprPrepStyle to trait #34415
Open
Conversation
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
antiguru
force-pushed
the
expr_prep_style
branch
from
749a780 to
458a032
Compare
There was a problem hiding this comment.
Pull request overview
This PR refactors ExprPrepStyle from an enum into a trait-based design with specific implementations. The refactoring separates the different expression preparation behaviors into distinct types (ExprPrepStyleMaintained, ExprPrepStyleOneShot, ExprPrepStyleWebhookValidation, and NoopExprPrepStyle), eliminating the need for pattern matching in the preparation logic. This change improves code organization and makes it easier to extend expression preparation behaviors in the future.
Key changes:
- Converted
ExprPrepStylefrom an enum to a trait withprep_relation_exprandprep_scalar_exprmethods - Created four concrete implementations of the trait for different preparation contexts
- Updated all call sites to use the new trait-based API by calling methods on style instances rather than passing styles as parameters
Reviewed changes
Copilot reviewed 14 out of 14 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| src/adapter/src/optimize/dataflows.rs | Core refactoring: defines the ExprPrepStyle trait and implements it for four specific styles |
| src/adapter/src/optimize/view.rs | Updates Optimizer to be generic over ExprPrepStyle implementations |
| src/adapter/src/webhook.rs | Updates webhook validation to use ExprPrepStyleWebhookValidation |
| src/adapter/src/optimize/peek.rs | Switches peek optimization to use ExprPrepStyleOneShot |
| src/adapter/src/optimize/subscribe.rs | Updates subscribe optimization to use ExprPrepStyleMaintained |
| src/adapter/src/optimize/materialized_view.rs | Updates materialized view optimization to use ExprPrepStyleMaintained |
| src/adapter/src/optimize/index.rs | Updates index optimization to use ExprPrepStyleMaintained |
| src/adapter/src/optimize/copy_to.rs | Updates copy_to optimization to use ExprPrepStyleOneShot |
| src/adapter/src/coord/sequencer/inner/secret.rs | Updates secret handling to use ExprPrepStyleOneShot |
| src/adapter/src/coord/sequencer/inner/copy_from.rs | Updates copy_from handling to use ExprPrepStyleOneShot |
| src/adapter/src/coord/sequencer/inner.rs | Updates transaction handling to use ExprPrepStyleOneShot |
| src/adapter/src/coord/sequencer.rs | Updates URI evaluation to use ExprPrepStyleOneShot |
| src/adapter/src/client.rs | Updates client code to use ExprPrepStyleOneShot |
| src/adapter/src/catalog.rs | Updates catalog tests to use ExprPrepStyleOneShot |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
teskje
reviewed
Dec 15, 2025
Changes the `ExprPrepStyle` enum to a trait with specific implementations. This cleans up the implementation, and would allow for easier sharing of optimizer calls in the future. Signed-off-by: Moritz Hoffmann <[email protected]>
Co-authored-by: Copilot <[email protected]>
Signed-off-by: Moritz Hoffmann <[email protected]>
antiguru
force-pushed
the
expr_prep_style
branch
from
c28a010 to
3a012fa
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Changes the
ExprPrepStyleenum to a trait with specific implementations. This cleans up the implementation, and would allow for easier sharing of optimizer calls in the future. Otherwise, there are not behavior changes.