-
Notifications
You must be signed in to change notification settings - Fork 139
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Improve dictionary value migration #3381
Merged
Merged
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
…ictionary values avoid re-iterating, as e.g. the iteration using the inlining version of atree will fail for old keys
SupunS
approved these changes
May 29, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👏
Cadence Benchstat comparisonThis branch with compared with the base branch onflow:master commit 415d30d Collapsed results for better readability
|
This was referenced May 30, 2024
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.
Description
#3316 improved the migration of dictionaries to work around the limitation of the mutating iterator in the inlining atree, which re-hashes keys while iterating and thus fails to load old / unmigrated values, by splitting the migration of dictionaries into two phases, one for keys, one for values.
This fixed the problem in the first phase, migrating the keys in
StorageMigration.migrateDictionaryKeys()
, by using a read-only iterator, which doesn't have the re-hasing problem that the mutating iterator in the inlining version of atree has.However, we still have the problem in the second phase, migrating the values in
StorageMigration.migrateDictionaryValues()
, where we use a mutating iterator to re-iterate over the dictionary.Gather all keys in the first phase and use them in the second phase, instead of re-iterating.
This doesn't fix anything on
master
, but will fix the iteration problem in the atree register inlining feature branch. Having the same code onmaster
avoids unnecessary drift.Thanks to @SupunS for the great idea in https://discord.com/channels/613813861610684416/1108479699732152503/1245434532572958791 🙏
master
branchFiles changed
in the Github PR explorer