ale64bit/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#1621] pilorama: Improve memory allocation

Browse source 
Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
Signed-off-by: Evgenii Stratonikov <evgeniy@morphbits.ru>
This commit is contained in:
Evgenii Stratonikov 2022-07-22 12:49:28 +03:00 committed by Anton Nikiforov
parent 2539d466a6
commit 1044adbe94
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
pkg/local_object_storage/pilorama/boltdb.go
View file

@ -371,7 +371,7 @@ func (t *boltForest) do(lb *bbolt.Bucket, b *bbolt.Bucket, key []byte, op *LogMo
return err return err
} }
if t.isAncestor(b, key, op.Child, op.Parent) || op.Child == op.Parent { if op.Child == op.Parent || t.isAncestor(b, op.Child, op.Parent) {
return nil return nil
} }
@ -384,15 +384,12 @@ func (t *boltForest) do(lb *bbolt.Bucket, b *bbolt.Bucket, key []byte, op *LogMo
if err := b.Delete(childrenKey(key, op.Child, parent)); err != nil { if err := b.Delete(childrenKey(key, op.Child, parent)); err != nil {
return err return err
} }
var meta Meta for i := range op.Old.Meta.Items {
var k = metaKey(key, op.Child) if isAttributeInternal(op.Old.Meta.Items[i].Key) {
if err := meta.FromBytes(b.Get(k)); err == nil { key = internalKey(key, op.Old.Meta.Items[i].Key, string(op.Old.Meta.Items[i].Value), parent, op.Child)
for i := range meta.Items { err := b.Delete(key)
if isAttributeInternal(meta.Items[i].Key) { if err != nil {
err := b.Delete(internalKey(nil, meta.Items[i].Key, string(meta.Items[i].Value), parent, op.Child)) return err
if err != nil {
return err
}
} }
} }
} }
@ -467,15 +464,16 @@ func (t *boltForest) undo(m *Move, lm *LogMove, b *bbolt.Bucket, key []byte) err
return t.addNode(b, key, m.Child, lm.Old.Parent, lm.Old.Meta) return t.addNode(b, key, m.Child, lm.Old.Parent, lm.Old.Meta)
} }
func (t *boltForest) isAncestor(b *bbolt.Bucket, key []byte, parent, child Node) bool { func (t *boltForest) isAncestor(b *bbolt.Bucket, parent, child Node) bool {
key := make([]byte, 9)
key[0] = 'p' key[0] = 'p'
for c := child; c != parent; { for node := child; node != parent; {
binary.LittleEndian.PutUint64(key[1:], c) binary.LittleEndian.PutUint64(key[1:], node)
rawParent := b.Get(key[:9]) rawParent := b.Get(key)
if len(rawParent) != 8 { if len(rawParent) != 8 {
return false return false
} }
c = binary.LittleEndian.Uint64(rawParent) node = binary.LittleEndian.Uint64(rawParent)
} }
return true return true
} }