TrueCloudLab/frostfs-node
20
1
Fork 28
Code Issues 107 Pull requests 4 Projects Releases 2 Packages 4 Activity Actions

[#1377] oid, cid: Upgrade SDK package

Browse source 
Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2022-05-12 19:37:46 +03:00 • committed by LeL
parent f65898a354
commit f15e6e888f
118 changed files with 1455 additions and 886 deletions
Download patch file Download diff file Expand all files Collapse all files

28
pkg/local_object_storage/metabase/delete.go
View file

@ -153,12 +153,16 @@ func (db *DB) deleteObject(
// parentLength returns amount of available children from parentid index.
func parentLength(tx *bbolt.Tx, addr *addressSDK.Address) int {
bkt := tx.Bucket(parentBucketName(addr.ContainerID()))
cnr, _ := addr.ContainerID()
bkt := tx.Bucket(parentBucketName(&cnr))
if bkt == nil {
return 0
}
lst, err := decodeList(bkt.Get(objectKey(addr.ObjectID())))
obj, _ := addr.ObjectID()
lst, err := decodeList(bkt.Get(objectKey(&obj)))
if err != nil {
return 0
}
@ -227,8 +231,12 @@ func delListIndexItem(tx *bbolt.Tx, item namedBucketItem) error {
func delUniqueIndexes(tx *bbolt.Tx, obj *objectSDK.Object, isParent bool) error {
addr := object.AddressOf(obj)
objKey := objectKey(addr.ObjectID())
id, _ := addr.ObjectID()
objKey := objectKey(&id)
addrKey := addressKey(addr)
cnr, _ := addr.ContainerID()
// add value to primary unique bucket
if !isParent {
@ -236,13 +244,13 @@ func delUniqueIndexes(tx *bbolt.Tx, obj *objectSDK.Object, isParent bool) error
switch obj.Type() {
case objectSDK.TypeRegular:
bucketName = primaryBucketName(addr.ContainerID())
bucketName = primaryBucketName(&cnr)
case objectSDK.TypeTombstone:
bucketName = tombstoneBucketName(addr.ContainerID())
bucketName = tombstoneBucketName(&cnr)
case objectSDK.TypeStorageGroup:
bucketName = storageGroupBucketName(addr.ContainerID())
bucketName = storageGroupBucketName(&cnr)
case objectSDK.TypeLock:
bucketName = bucketNameLockers(*addr.ContainerID())
bucketName = bucketNameLockers(cnr)
default:
return ErrUnknownObjectType
}
@ -253,17 +261,17 @@ func delUniqueIndexes(tx *bbolt.Tx, obj *objectSDK.Object, isParent bool) error
})
} else {
delUniqueIndexItem(tx, namedBucketItem{
name: parentBucketName(obj.ContainerID()),
name: parentBucketName(&cnr),
key: objKey,
})
}
delUniqueIndexItem(tx, namedBucketItem{ // remove from small blobovnicza id index
name: smallBucketName(addr.ContainerID()),
name: smallBucketName(&cnr),
key: objKey,
})
delUniqueIndexItem(tx, namedBucketItem{ // remove from root index
name: rootBucketName(addr.ContainerID()),
name: rootBucketName(&cnr),
key: objKey,
})
delUniqueIndexItem(tx, namedBucketItem{ // remove from ToMoveIt index