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

[#1418] blobstor: Do not use pointers as parameters

Browse source 
Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
This commit is contained in:
Pavel Karpy 2022-05-23 17:15:16 +03:00 committed by Pavel Karpy
parent 14366bbd89
commit b0c7b7851a
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/local_object_storage/blobovnicza/get.go
View file

@ -24,7 +24,7 @@ func (p *GetPrm) SetAddress(addr oid.Address) {
} }
// Object returns binary representation of the requested object. // Object returns binary representation of the requested object.
func (p *GetRes) Object() []byte { func (p GetRes) Object() []byte {
return p.obj return p.obj
} }

18
pkg/local_object_storage/blobstor/blobovnicza.go
View file

@ -212,7 +212,7 @@ func (b *blobovniczas) get(prm GetSmallPrm) (res *GetSmallRes, err error) {
if prm.blobovniczaID != nil { if prm.blobovniczaID != nil {
blz, err := b.openBlobovnicza(prm.blobovniczaID.String()) blz, err := b.openBlobovnicza(prm.blobovniczaID.String())
if err != nil { if err != nil {
return nil, err return res, err
} }
return b.getObject(blz, bPrm) return b.getObject(blz, bPrm)
@ -245,7 +245,7 @@ func (b *blobovniczas) get(prm GetSmallPrm) (res *GetSmallRes, err error) {
// not found in any blobovnicza // not found in any blobovnicza
var errNotFound apistatus.ObjectNotFound var errNotFound apistatus.ObjectNotFound
return nil, errNotFound return res, errNotFound
} }
return return
@ -262,13 +262,14 @@ func (b *blobovniczas) delete(prm DeleteSmallPrm) (res *DeleteSmallRes, err erro
if prm.blobovniczaID != nil { if prm.blobovniczaID != nil {
blz, err := b.openBlobovnicza(prm.blobovniczaID.String()) blz, err := b.openBlobovnicza(prm.blobovniczaID.String())
if err != nil { if err != nil {
return nil, err return res, err
} }
return b.deleteObject(blz, bPrm, prm) return b.deleteObject(blz, bPrm, prm)
} }
activeCache := make(map[string]struct{}) activeCache := make(map[string]struct{})
objectFound := false
err = b.iterateSortedLeaves(&prm.addr, func(p string) (bool, error) { err = b.iterateSortedLeaves(&prm.addr, func(p string) (bool, error) {
dirPath := filepath.Dir(p) dirPath := filepath.Dir(p)
@ -289,14 +290,14 @@ func (b *blobovniczas) delete(prm DeleteSmallPrm) (res *DeleteSmallRes, err erro
activeCache[dirPath] = struct{}{} activeCache[dirPath] = struct{}{}
if err == nil { if err == nil {
res = new(DeleteSmallRes) objectFound = true
} }
// abort iterator if found, otherwise process all blobovniczas // abort iterator if found, otherwise process all blobovniczas
return err == nil, nil return err == nil, nil
}) })
if err == nil && res == nil { if err == nil && !objectFound {
// not found in any blobovnicza // not found in any blobovnicza
var errNotFound apistatus.ObjectNotFound var errNotFound apistatus.ObjectNotFound
@ -321,6 +322,7 @@ func (b *blobovniczas) getRange(prm GetRangeSmallPrm) (res *GetRangeSmallRes, er
} }
activeCache := make(map[string]struct{}) activeCache := make(map[string]struct{})
objectFound := false
err = b.iterateSortedLeaves(&prm.addr, func(p string) (bool, error) { err = b.iterateSortedLeaves(&prm.addr, func(p string) (bool, error) {
dirPath := filepath.Dir(p) dirPath := filepath.Dir(p)
@ -343,11 +345,13 @@ func (b *blobovniczas) getRange(prm GetRangeSmallPrm) (res *GetRangeSmallRes, er
activeCache[dirPath] = struct{}{} activeCache[dirPath] = struct{}{}
objectFound = err == nil
// abort iterator if found, otherwise process all blobovniczas // abort iterator if found, otherwise process all blobovniczas
return err == nil, nil return err == nil, nil
}) })
if err == nil && res == nil { if err == nil && !objectFound {
// not found in any blobovnicza // not found in any blobovnicza
var errNotFound apistatus.ObjectNotFound var errNotFound apistatus.ObjectNotFound
@ -566,7 +570,7 @@ func (b *blobovniczas) deleteObject(blz *blobovnicza.Blobovnicza, prm blobovnicz
zap.Stringer("blobovnicza ID", dp.blobovniczaID), zap.Stringer("blobovnicza ID", dp.blobovniczaID),
) )
return new(DeleteSmallRes), nil return nil, nil
} }
// reads object from blobovnicza and returns GetSmallRes. // reads object from blobovnicza and returns GetSmallRes.

1
pkg/local_object_storage/shard/put.go
View file

@ -55,7 +55,6 @@ func (s *Shard) Put(prm PutPrm) (*PutRes, error) {
res *blobstor.PutRes res *blobstor.PutRes
) )
// res == nil if there is no writeCache or writeCache.Put has been failed
if res, err = s.blobStor.Put(putPrm); err != nil { if res, err = s.blobStor.Put(putPrm); err != nil {
return nil, fmt.Errorf("could not put object to BLOB storage: %w", err) return nil, fmt.Errorf("could not put object to BLOB storage: %w", err)
} }