forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 02:42:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Force trie.Database.Commit() to write everything out in a single batch

Browse source 
Iteration order over db.preimages is not deterministic, sorting the
batch contents when the batch is written can be used to work around
this. However, when multiple batches are written out the contents of
each batch will differ every time, therefore sorting the contents of
each batch is not sufficient to ensure deterministic in-order writes to
the underlying store. These changes ensure the trie.Database.Commit()
writes everything out in a single batch to avoid that particular
problem.
This commit is contained in:
Vadim Macagon 2019-01-30 13:45:18 +07:00
parent c4f3537b02
commit efd5bfcded
1 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
trie/database.go
View file

@ -622,12 +622,6 @@ func (db *Database) Commit(node common.Hash, report bool) error {
db.lock.RUnlock() db.lock.RUnlock()
return err return err
} }
if batch.ValueSize() > ethdb.IdealBatchSize {
if err := batch.Write(); err != nil {
return err
}
batch.Reset()
}
} }
// Move the trie itself into the batch, flushing if enough data is accumulated // Move the trie itself into the batch, flushing if enough data is accumulated
nodes, storage := len(db.nodes), db.nodesSize nodes, storage := len(db.nodes), db.nodesSize
@ -686,13 +680,6 @@ func (db *Database) commit(hash common.Hash, batch ethdb.Batch) error {
if err := batch.Put(hash[:], node.rlp()); err != nil { if err := batch.Put(hash[:], node.rlp()); err != nil {
return err return err
} }
// If we've reached an optimal batch size, commit and start over
if batch.ValueSize() >= ethdb.IdealBatchSize {
if err := batch.Write(); err != nil {
return err
}
batch.Reset()
}
return nil return nil
} }