fix trie prefetch issue after rebase

sunny2022da · Oct 8, 2024 · b2082a0 · b2082a0
1 parent 536d5d9
commit b2082a0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/core/state/parallel_statedb.go b/core/state/parallel_statedb.go
@@ -1800,7 +1800,9 @@ func (s *ParallelStateDB) FinaliseForParallel(deleteEmptyObjects bool, mainDB *S
 	}
 
 	if mainDB.prefetcher != nil && len(addressesToPrefetch) > 0 {
+		mainDB.trieParallelLock.Lock()
 		mainDB.prefetcher.prefetch(common.Hash{}, s.originalRoot, common.Address{}, addressesToPrefetch)
+		mainDB.trieParallelLock.Unlock()
 	}
 	// Invalidate journal because reverting across transactions is not allowed.
 	s.clearJournalAndRefund()

diff --git a/core/state/statedb.go b/core/state/statedb.go
@@ -2461,14 +2461,18 @@ func (s *StateDB) AddrPrefetch(slotDb *ParallelStateDB) {
 		})
 		obj.storageRecordsLock.RUnlock()
 		if s.prefetcher != nil && len(slotsToPrefetch) > 0 {
+			s.trieParallelLock.Lock()
 			s.prefetcher.prefetch(obj.addrHash, obj.data.Root, obj.address, slotsToPrefetch)
+			s.trieParallelLock.Unlock()
 		}
 	}
 
 	if s.prefetcher != nil && len(addressesToPrefetch) > 0 {
 		// log.Info("AddrPrefetch", "slotDb.TxIndex", slotDb.TxIndex(),
 		//	"len(addressesToPrefetch)", len(slotDb.parallel.addressesToPrefetch))
+		s.trieParallelLock.Lock()
 		s.prefetcher.prefetch(common.Hash{}, s.originalRoot, emptyAddr, addressesToPrefetch)
+		s.trieParallelLock.Unlock()
 	}
 }
 
@@ -2645,7 +2649,9 @@ func (s *StateDB) MergeSlotDB(slotDb *ParallelStateDB, slotReceipt *types.Receip
 	}
 
 	if s.prefetcher != nil && len(addressesToPrefetch) > 0 {
+		s.trieParallelLock.Lock()
 		s.prefetcher.prefetch(common.Hash{}, s.originalRoot, emptyAddr, addressesToPrefetch) // prefetch for trie node of account
+		s.trieParallelLock.Unlock()
 	}
 
 	for addr := range slotDb.stateObjectsPending {