Merge remote-tracking branch 'upstream/master' into lperkins/docs-restructuring-v2

This commit is contained in:
lucperkins 2020-01-22 13:08:46 -08:00
commit f806c3aee4

View File

@ -498,7 +498,7 @@ func defragdb(odb, tmpdb *bolt.DB, limit int) error {
}
tmpb.FillPercent = 0.9 // for seq write in for each
if pErr := b.ForEach(func(k, v []byte) error {
if err = b.ForEach(func(k, v []byte) error {
count++
if count > limit {
err = tmptx.Commit()
@ -515,8 +515,8 @@ func defragdb(odb, tmpdb *bolt.DB, limit int) error {
count = 0
}
return tmpb.Put(k, v)
}); pErr != nil {
return pErr
}); err != nil {
return err
}
}