change(state): Refactor format upgrades into trait #9263
+466
−299
Conversation
This file contains 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
arya2
added
C-cleanup
arya2
commented
Feb 18, 2025
| fn description(&self) -> &'static str; | ||
|
|
||
| /// Runs disk format upgrade. | ||
| fn run( |
There was a problem hiding this comment.
run_migration() may be a better name for this method.
arya2
commented
Feb 18, 2025
Comment on lines
+55
to
+58
| /// | ||
| /// # Panics | ||
| /// | ||
| /// If the state has not been upgraded to this format correctly. |
There was a problem hiding this comment.
Suggested change
| /// | |
| /// # Panics | |
| /// | |
| /// If the state has not been upgraded to this format correctly. |
…uct, `PruneTrees`, and moves the logic for tree deduplication to the trait impl
…des to use new trait
arya2
force-pushed
the
db-format-upgrade-trait
branch
from
199059a to
59c0b24
Compare
conradoplg
reviewed
Feb 24, 2025
| } | ||
|
|
||
| fn format_upgrades() -> Vec<Box<dyn DiskFormatUpgrade>> { | ||
| // Note: Disk format upgrades must be run in order. |
There was a problem hiding this comment.
I think it would be good to check if they upgrades are really in order and panic if they're not
Suggested change
| // Note: Disk format upgrades must be run in order. | |
| // Note: Disk format upgrades must be run in order of database version. |
|
|
||
| use super::{CancelFormatChange, DiskFormatUpgrade}; | ||
|
|
||
| /// Implements [`DiskFormatUpgrade`] for pruning duplicate Sapling and Orchard note commitment trees from database |
Comment on lines
+536
to
+540
| if older_disk_version >= &upgrade.version() { | ||
| upgrade | ||
| .validate(db, cancel_receiver)? | ||
| .expect("failed to validate db format"); | ||
| continue; |
There was a problem hiding this comment.
I'm a bit confused about this. The original code does not seem to do validate if the disk version >= upgrade version. Is this required or just good to have? What is the performance impact?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation
This PR organizes Zebra's disk format upgrades into trait implementations to make them more maintainable as more upgrades are gradually added.
Closes #7932
Solution
DiskFormatUpgradetraitTests
This change should be covered by existing tests for applying db format upgrades.
Follow-up Work
The bundle of db format changes needed to match zcashd's RPC outputs.
PR Author's Checklist
PR Reviewer's Checklist