[R4R] rm duplicate update/delete on tire #1001
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
core/state/state_object.go
Outdated
| @@ -412,12 +412,10 @@ func (s *StateObject) updateTrie(db Database) Trie { | |||
| s.originStorage[key] = value | |||
| var v []byte | |||
| if (value == common.Hash{}) { | |||
| s.setError(tr.TryDelete(key[:])) | |||
| s.db.StorageDeleted += 1 | |||
There was a problem hiding this comment.
StorageDeleted & StorageUpdated were added for storage metrics, but seems no longer used and can be deleted?
There was a problem hiding this comment.
duplicate update/delete should cause by error merge action since it has already removed by this pr
https://github.com/bnb-chain/bsc/pull/924/commits
There was a problem hiding this comment.
seems that some commit might not merged well.
unclezoro
previously approved these changes
Jul 19, 2022
qinglin89
dismissed stale reviews from unclezoro and brilliant-lx
The base branch was changed.
flywukong
previously approved these changes
Jul 20, 2022
unclezoro
previously approved these changes
Jul 20, 2022
flywukong
previously approved these changes
Jul 20, 2022
qinglin89
dismissed stale reviews from flywukong, unclezoro, and brilliant-lx
via
af5aaf2
forcodedancing
approved these changes
Jul 26, 2022
unclezoro
approved these changes
Jul 26, 2022
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
trie.update/trie.deletehad been done twice which is redundantLockcould just be used to protect concurrent access onstatedb.snapStorage, not thestorageitself.Rationale
N/A
Example
N/A
Changes
Notable changes:
Unlockearlier.