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

core/blockchain: write the batch

Browse source
This commit is contained in:
Martin Holst Swende 2019-05-22 15:04:11 +02:00
parent 8ce07de0e6
commit 93780e45df
No known key found for this signature in database
GPG key ID: 683B438C05A5DDF0
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/blockchain.go
View file

@ -1040,7 +1040,9 @@ func (bc *BlockChain) InsertReceiptChain(blockChain types.Blocks, receiptChain [
if time.Since(logged) > 8*time.Second { if time.Since(logged) > 8*time.Second {
log.Info("Migrating ancient blocks", "count", count, "elapsed", common.PrettyDuration(time.Since(start))) log.Info("Migrating ancient blocks", "count", count, "elapsed", common.PrettyDuration(time.Since(start)))
logged = time.Now() logged = time.Now()
// Don't collect too much in-memory }
// Don't collect too much in-memory, write it out every 100K blocks
if len(deleted) > 100000 {
// Sync the ancient store explicitly to ensure all data has been flushed to disk. // Sync the ancient store explicitly to ensure all data has been flushed to disk.
if err := bc.db.Sync(); err != nil { if err := bc.db.Sync(); err != nil {
@ -1051,12 +1053,20 @@ func (bc *BlockChain) InsertReceiptChain(blockChain types.Blocks, receiptChain [
rawdb.DeleteBlockWithoutNumber(batch, nh.hash, nh.number) rawdb.DeleteBlockWithoutNumber(batch, nh.hash, nh.number)
rawdb.DeleteCanonicalHash(batch, nh.number) rawdb.DeleteCanonicalHash(batch, nh.number)
} }
if err := batch.Write(); err != nil {
return 0, err
}
batch.Reset()
// Wipe out side chain too. // Wipe out side chain too.
for _, nh := range deleted { for _, nh := range deleted {
for _, hash := range rawdb.ReadAllHashes(bc.db, nh.number) { for _, hash := range rawdb.ReadAllHashes(bc.db, nh.number) {
rawdb.DeleteBlock(batch, hash, nh.number) rawdb.DeleteBlock(batch, hash, nh.number)
} }
} }
if err := batch.Write(); err != nil {
return 0, err
}
batch.Reset()
deleted = deleted[0:] deleted = deleted[0:]
} }
} }
@ -1087,12 +1097,9 @@ func (bc *BlockChain) InsertReceiptChain(blockChain types.Blocks, receiptChain [
// Wipe out canonical block data. // Wipe out canonical block data.
for _, nh := range deleted { for _, nh := range deleted {
// Always keep genesis block in active database.
if nh.number != 0 {
rawdb.DeleteBlockWithoutNumber(batch, nh.hash, nh.number) rawdb.DeleteBlockWithoutNumber(batch, nh.hash, nh.number)
rawdb.DeleteCanonicalHash(batch, nh.number) rawdb.DeleteCanonicalHash(batch, nh.number)
} }
}
for _, block := range blockChain { for _, block := range blockChain {
// Always keep genesis block in active database. // Always keep genesis block in active database.
if block.NumberU64() != 0 { if block.NumberU64() != 0 {
@ -1107,13 +1114,10 @@ func (bc *BlockChain) InsertReceiptChain(blockChain types.Blocks, receiptChain [
// Wipe out side chain too. // Wipe out side chain too.
for _, nh := range deleted { for _, nh := range deleted {
// Always keep genesis block in active database.
if nh.number != 0 {
for _, hash := range rawdb.ReadAllHashes(bc.db, nh.number) { for _, hash := range rawdb.ReadAllHashes(bc.db, nh.number) {
rawdb.DeleteBlock(batch, hash, nh.number) rawdb.DeleteBlock(batch, hash, nh.number)
} }
} }
}
for _, block := range blockChain { for _, block := range blockChain {
// Always keep genesis block in active database. // Always keep genesis block in active database.
if block.NumberU64() != 0 { if block.NumberU64() != 0 {