tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core, trie: speed up some tests with quadratic processing flaw (#21987)

Browse Source 
This commit fixes a flaw in two testcases, and brings down the exec-time from ~40s to ~8s for trie/TestIncompleteSync.

The checkConsistency was performed over and over again on the complete set of nodes, not just the recently added, turning it into a quadratic runtime.
This commit is contained in:
Martin Holst Swende 2020-12-10 14:48:32 +01:00 committed by GitHub
parent 9f6bb492bb
commit b44f24e3e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/state/sync_test.go
View File

@ -62,7 +62,8 @@ func makeTestState() (Database, common.Hash, []*testAccount) {
}
if i%5 == 0 {
for j := byte(0); j < 5; j++ {
obj.SetState(db, crypto.Keccak256Hash([]byte{i, i, i, i, i, j, j}), crypto.Keccak256Hash([]byte{i, i, i, i, i, j, j}))
hash := crypto.Keccak256Hash([]byte{i, i, i, i, i, j, j})
obj.SetState(db, hash, hash)
}
}
state.updateStateObject(obj)
@ -401,15 +402,14 @@ func TestIncompleteStateSync(t *testing.T) {
// Create a random state to copy
srcDb, srcRoot, srcAccounts := makeTestState()
// isCode reports whether the hash is contract code hash.
isCode := func(hash common.Hash) bool {
// isCodeLookup to save some hashing
var isCode = make(map[common.Hash]struct{})
for _, acc := range srcAccounts {
if hash == crypto.Keccak256Hash(acc.code) {
return true
if len(acc.code) > 0 {
isCode[crypto.Keccak256Hash(acc.code)] = struct{}{}
}
}
return false
}
isCode[common.BytesToHash(emptyCodeHash)] = struct{}{}
checkTrieConsistency(srcDb.TrieDB().DiskDB().(ethdb.Database), srcRoot)
// Create a destination state and sync with the scheduler
@ -447,15 +447,13 @@ func TestIncompleteStateSync(t *testing.T) {
batch.Write()
for _, result := range results {
added = append(added, result.Hash)
}
// Check that all known sub-tries added so far are complete or missing entirely.
for _, hash := range added {
if isCode(hash) {
if _, ok := isCode[result.Hash]; ok {
continue
}
// Can't use checkStateConsistency here because subtrie keys may have odd
// length and crash in LeafKey.
if err := checkTrieConsistency(dstDb, hash); err != nil {
if err := checkTrieConsistency(dstDb, result.Hash); err != nil {
t.Fatalf("state inconsistent: %v", err)
}
}
@ -467,7 +465,7 @@ func TestIncompleteStateSync(t *testing.T) {
for _, node := range added[1:] {
var (
key = node.Bytes()
code = isCode(node)
_, code = isCode[node]
val []byte
)
if code {

5
trie/sync_test.go
View File

@ -377,7 +377,6 @@ func TestIncompleteSync(t *testing.T) {
nodes, _, codes := sched.Missing(1)
queue := append(append([]common.Hash{}, nodes...), codes...)
for len(queue) > 0 {
// Fetch a batch of trie nodes
results := make([]SyncResult, len(queue))
@ -401,10 +400,8 @@ func TestIncompleteSync(t *testing.T) {
batch.Write()
for _, result := range results {
added = append(added, result.Hash)
}
// Check that all known sub-tries in the synced trie are complete
for _, root := range added {
if err := checkTrieConsistency(triedb, root); err != nil {
if err := checkTrieConsistency(triedb, result.Hash); err != nil {
t.Fatalf("trie inconsistent: %v", err)
}
}