Improve dictionary key migration #3386
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
Cadence Benchstat comparisonThis branch with compared with the base branch onflow:master commit 7b7abe9 Collapsed results for better readability
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
…rating dictionary values" This reverts commit 943b9b3.
ensure dictionary keys with legacy representation are always re-stored even if migration is not necessary or migration failed, ensure the key is restored, so the key-value pair stays accessible, and inlining atree mutating iterator does not fail
turbolent
force-pushed
the
bastian/improve-dictionary-key-migration
branch
from
496bc15 to
887c682
Compare
turbolent
commented
Jun 3, 2024
turbolent
commented
Jun 3, 2024
dsainati1
approved these changes
Jun 3, 2024
fxamacker
approved these changes
Jun 3, 2024
turbolent
added a commit
to onflow/flow-go
that referenced
this pull request
Jun 4, 2024
issue got resolved by onflow/cadence#3386
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.
Work towards #3366
Description
Context: https://discord.com/channels/613813861610684416/1108479699732152503/1245434532572958791
Revert part of #3381. This approach does not work: When a new migration runs that does not migrate, after a previous migration that did migrate, then we can't just use the legacy key as a lookup – the key has not been migrated in the current migration, but it is in migrated form.
Improve the migration of dictionary keys that have a legacy representation: Introduce a new migration,
TypeKeyMigration, that re-storesTypevalues as-is, if they appear as dictionary keys. This migration is meant to be run after the existing migrations that updateTypevalues, i.e. the static type migration and entitlements migration. The migration ensures that type values used as dictionary keys are stored under their new hash, even if a prior migration failed to do so. That way the key-value pair stays accessible, and the mutating iterator of the inlining-version of atree does not fail when iterating over the migrated dictionary.I tested this will also work on
feature/atree-register-inlining-v1.0and in flow-gomaster.masterbranchFiles changedin the Github PR explorer