Revert "mpt: do not allocate new buffer when updating dirty node"

This reverts commit 168ba7960c.

It seems, there are some problems with it:
`2020-12-25T18:13:07.476+0300    WARN    blockQueue: failed adding block into the blockchain     {"error": "error while trying to apply MPT changes: unexpected EOF", "blockHeight": 9729, "nextIndex": 9730}`
This commit is contained in:
Evgenii Stratonikov 2020-12-25 18:13:41 +03:00
parent 756785acd3
commit c2f70a179b
3 changed files with 10 additions and 15 deletions

View file

@ -63,7 +63,7 @@ func (b *BaseNode) updateHash(n Node) {
// updateCache updates hash and bytes fields for this BaseNode.
func (b *BaseNode) updateBytes(n Node) {
buf := io.NewBufBinWriterPreAlloc(b.bytes)
buf := io.NewBufBinWriter()
encodeNodeWithType(n, buf.BinWriter)
b.bytes = buf.Bytes()
b.bytesValid = true

View file

@ -418,29 +418,31 @@ func (t *Trie) updateRefCount(h util.Uint256) int32 {
func (t *Trie) addRef(h util.Uint256, bs []byte) {
node := t.refcount[h]
if node == nil {
data := make([]byte, len(bs))
copy(data, bs)
t.refcount[h] = &cachedNode{
refcount: 1,
bytes: data,
bytes: bs,
}
return
}
node.refcount++
if node.bytes == nil {
node.bytes = bs
}
}
func (t *Trie) removeRef(h util.Uint256, bs []byte) {
node := t.refcount[h]
if node == nil {
data := make([]byte, len(bs))
copy(data, bs)
t.refcount[h] = &cachedNode{
refcount: -1,
bytes: data,
bytes: bs,
}
return
}
node.refcount--
if node.bytes == nil {
node.bytes = bs
}
}
func (t *Trie) getFromStore(h util.Uint256) (Node, error) {
@ -460,8 +462,7 @@ func (t *Trie) getFromStore(h util.Uint256) (Node, error) {
data = data[:len(data)-4]
node := t.refcount[h]
if node != nil {
node.bytes = make([]byte, len(data))
copy(node.bytes, data)
node.bytes = data
node.initial = int32(r.ReadU32LE())
}
}

View file

@ -19,12 +19,6 @@ func NewBufBinWriter() *BufBinWriter {
return &BufBinWriter{BinWriter: NewBinWriterFromIO(b), buf: b}
}
// NewBufBinWriterPreAlloc makes a BufBinWriter using preallocated buffer.
func NewBufBinWriterPreAlloc(buf []byte) *BufBinWriter {
b := bytes.NewBuffer(buf[:0])
return &BufBinWriter{BinWriter: NewBinWriterFromIO(b), buf: b}
}
// Len returns the number of bytes of the unread portion of the buffer.
func (bw *BufBinWriter) Len() int {
return bw.buf.Len()