forked from ethereum/go-ethereum
-
Notifications
You must be signed in to change notification settings - Fork 71
feat(core): create global hasher pool #31769 #2314
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
Open
gzliudan
wants to merge
3
commits into
XinFinOrg:dev-upgrade
Choose a base branch
from
gzliudan:hash-pool
base: dev-upgrade
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,11 +18,9 @@ package rawdb | |
|
|
||
| import ( | ||
| "fmt" | ||
| "sync" | ||
|
|
||
| "github.com/XinFinOrg/XDPoSChain/common" | ||
| "github.com/XinFinOrg/XDPoSChain/crypto" | ||
| "github.com/XinFinOrg/XDPoSChain/crypto/keccak" | ||
| "github.com/XinFinOrg/XDPoSChain/ethdb" | ||
| "github.com/XinFinOrg/XDPoSChain/log" | ||
| ) | ||
|
|
@@ -46,45 +44,20 @@ const HashScheme = "hashScheme" | |
| // on extra state diffs to survive deep reorg. | ||
| const PathScheme = "pathScheme" | ||
|
|
||
| // nodeHasher used to derive the hash of trie node. | ||
| type nodeHasher struct{ sha crypto.KeccakState } | ||
|
|
||
| var hasherPool = sync.Pool{ | ||
| New: func() interface{} { return &nodeHasher{sha: keccak.NewLegacyKeccak256().(crypto.KeccakState)} }, | ||
| } | ||
|
|
||
| func newNodeHasher() *nodeHasher { return hasherPool.Get().(*nodeHasher) } | ||
| func returnHasherToPool(h *nodeHasher) { hasherPool.Put(h) } | ||
|
|
||
| func (h *nodeHasher) hashData(data []byte) (n common.Hash) { | ||
| h.sha.Reset() | ||
| h.sha.Write(data) | ||
| h.sha.Read(n[:]) | ||
| return n | ||
| } | ||
|
|
||
| // ReadAccountTrieNode retrieves the account trie node and the associated node | ||
| // hash with the specified node path. | ||
| func ReadAccountTrieNode(db ethdb.KeyValueReader, path []byte) ([]byte, common.Hash) { | ||
| data, err := db.Get(accountTrieNodeKey(path)) | ||
| if err != nil { | ||
| return nil, common.Hash{} | ||
| } | ||
| hasher := newNodeHasher() | ||
| defer returnHasherToPool(hasher) | ||
| return data, hasher.hashData(data) | ||
| // ReadAccountTrieNode retrieves the account trie node with the specified node path. | ||
| func ReadAccountTrieNode(db ethdb.KeyValueReader, path []byte) []byte { | ||
| data, _ := db.Get(accountTrieNodeKey(path)) | ||
| return data | ||
| } | ||
|
|
||
| // HasAccountTrieNode checks the account trie node presence with the specified | ||
| // node path and the associated node hash. | ||
| func HasAccountTrieNode(db ethdb.KeyValueReader, path []byte, hash common.Hash) bool { | ||
| data, err := db.Get(accountTrieNodeKey(path)) | ||
| // HasAccountTrieNode checks the presence of the account trie node with the | ||
| // specified node path, regardless of the node hash. | ||
| func HasAccountTrieNode(db ethdb.KeyValueReader, path []byte) bool { | ||
| has, err := db.Has(accountTrieNodeKey(path)) | ||
| if err != nil { | ||
| return false | ||
| } | ||
| hasher := newNodeHasher() | ||
| defer returnHasherToPool(hasher) | ||
| return hasher.hashData(data) == hash | ||
| return has | ||
| } | ||
|
|
||
| // WriteAccountTrieNode writes the provided account trie node into database. | ||
|
|
@@ -101,28 +74,20 @@ func DeleteAccountTrieNode(db ethdb.KeyValueWriter, path []byte) { | |
| } | ||
| } | ||
|
|
||
| // ReadStorageTrieNode retrieves the storage trie node and the associated node | ||
| // hash with the specified node path. | ||
| func ReadStorageTrieNode(db ethdb.KeyValueReader, accountHash common.Hash, path []byte) ([]byte, common.Hash) { | ||
| data, err := db.Get(storageTrieNodeKey(accountHash, path)) | ||
| if err != nil { | ||
| return nil, common.Hash{} | ||
| } | ||
| hasher := newNodeHasher() | ||
| defer returnHasherToPool(hasher) | ||
| return data, hasher.hashData(data) | ||
| // ReadStorageTrieNode retrieves the storage trie node with the specified node path. | ||
| func ReadStorageTrieNode(db ethdb.KeyValueReader, accountHash common.Hash, path []byte) []byte { | ||
| data, _ := db.Get(storageTrieNodeKey(accountHash, path)) | ||
| return data | ||
| } | ||
|
|
||
| // HasStorageTrieNode checks the storage trie node presence with the provided | ||
| // node path and the associated node hash. | ||
| func HasStorageTrieNode(db ethdb.KeyValueReader, accountHash common.Hash, path []byte, hash common.Hash) bool { | ||
| data, err := db.Get(storageTrieNodeKey(accountHash, path)) | ||
| // HasStorageTrieNode checks the presence of the storage trie node with the | ||
| // specified account hash and node path, regardless of the node hash. | ||
| func HasStorageTrieNode(db ethdb.KeyValueReader, accountHash common.Hash, path []byte) bool { | ||
| has, err := db.Has(storageTrieNodeKey(accountHash, path)) | ||
| if err != nil { | ||
| return false | ||
| } | ||
| hasher := newNodeHasher() | ||
| defer returnHasherToPool(hasher) | ||
| return hasher.hashData(data) == hash | ||
| return has | ||
| } | ||
|
|
||
| // WriteStorageTrieNode writes the provided storage trie node into database. | ||
|
|
@@ -176,54 +141,50 @@ func HasTrieNode(db ethdb.KeyValueReader, owner common.Hash, path []byte, hash c | |
| case HashScheme: | ||
| return HasLegacyTrieNode(db, hash) | ||
| case PathScheme: | ||
| var blob []byte | ||
| if owner == (common.Hash{}) { | ||
| return HasAccountTrieNode(db, path, hash) | ||
| blob = ReadAccountTrieNode(db, path) | ||
| } else { | ||
| blob = ReadStorageTrieNode(db, owner, path) | ||
| } | ||
| if len(blob) == 0 { | ||
| return false | ||
| } | ||
| return HasStorageTrieNode(db, owner, path, hash) | ||
| return crypto.Keccak256Hash(blob) == hash // exist and match | ||
|
Comment on lines
+144
to
+153
|
||
| default: | ||
| panic(fmt.Sprintf("Unknown scheme %v", scheme)) | ||
| } | ||
| } | ||
|
|
||
| // ReadTrieNode retrieves the trie node from database with the provided node info | ||
| // and associated node hash. | ||
| // hashScheme-based lookup requires the following: | ||
| // - hash | ||
| // | ||
| // pathScheme-based lookup requires the following: | ||
| // - owner | ||
| // - path | ||
| func ReadTrieNode(db ethdb.KeyValueReader, owner common.Hash, path []byte, hash common.Hash, scheme string) []byte { | ||
| switch scheme { | ||
| case HashScheme: | ||
| return ReadLegacyTrieNode(db, hash) | ||
| case PathScheme: | ||
| var ( | ||
| blob []byte | ||
| nHash common.Hash | ||
| ) | ||
| var blob []byte | ||
| if owner == (common.Hash{}) { | ||
| blob, nHash = ReadAccountTrieNode(db, path) | ||
| blob = ReadAccountTrieNode(db, path) | ||
| } else { | ||
| blob, nHash = ReadStorageTrieNode(db, owner, path) | ||
| blob = ReadStorageTrieNode(db, owner, path) | ||
| } | ||
| if nHash != hash { | ||
| if len(blob) == 0 { | ||
| return nil | ||
| } | ||
| if crypto.Keccak256Hash(blob) != hash { | ||
| return nil // exist but not match | ||
|
Comment on lines
+166
to
+176
|
||
| } | ||
| return blob | ||
| default: | ||
| panic(fmt.Sprintf("Unknown scheme %v", scheme)) | ||
| } | ||
| } | ||
|
|
||
| // WriteTrieNode writes the trie node into database with the provided node info | ||
| // and associated node hash. | ||
| // hashScheme-based lookup requires the following: | ||
| // - hash | ||
| // WriteTrieNode writes the trie node into database with the provided node info. | ||
| // | ||
| // pathScheme-based lookup requires the following: | ||
| // - owner | ||
| // - path | ||
| // hash-scheme requires the node hash as the identifier. | ||
| // path-scheme requires the node owner and path as the identifier. | ||
| func WriteTrieNode(db ethdb.KeyValueWriter, owner common.Hash, path []byte, hash common.Hash, node []byte, scheme string) { | ||
| switch scheme { | ||
| case HashScheme: | ||
|
|
@@ -239,14 +200,10 @@ func WriteTrieNode(db ethdb.KeyValueWriter, owner common.Hash, path []byte, hash | |
| } | ||
| } | ||
|
|
||
| // DeleteTrieNode deletes the trie node from database with the provided node info | ||
| // and associated node hash. | ||
| // hashScheme-based lookup requires the following: | ||
| // - hash | ||
| // DeleteTrieNode deletes the trie node from database with the provided node info. | ||
| // | ||
| // pathScheme-based lookup requires the following: | ||
| // - owner | ||
| // - path | ||
| // hash-scheme requires the node hash as the identifier. | ||
| // path-scheme requires the node owner and path as the identifier. | ||
| func DeleteTrieNode(db ethdb.KeyValueWriter, owner common.Hash, path []byte, hash common.Hash, scheme string) { | ||
| switch scheme { | ||
| case HashScheme: | ||
|
|
||
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
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.
These are exported helpers in
rawdband this PR changes their signatures/semantics (e.g.,ReadAccountTrieNodeno longer returns the node hash;HasAccountTrieNodeno longer verifies a provided hash). If any external packages consume these APIs, this will be a breaking change—consider keeping backward-compatible wrappers or deprecating first.