forked from TrueCloudLab/frostfs-node
[#1460] engine: Do not use pointers as the results
Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
This commit is contained in:
parent
7b6363f4c6
commit
08bf8a68f1
9 changed files with 47 additions and 49 deletions
|
@ -31,7 +31,7 @@ func (p *DeletePrm) WithAddresses(addr ...oid.Address) {
|
|||
//
|
||||
// Returns apistatus.ObjectLocked if at least one object is locked.
|
||||
// In this case no object from the list is marked to be deleted.
|
||||
func (e *StorageEngine) Delete(prm DeletePrm) (res *DeleteRes, err error) {
|
||||
func (e *StorageEngine) Delete(prm DeletePrm) (res DeleteRes, err error) {
|
||||
err = e.execIfNotBlocked(func() error {
|
||||
res, err = e.delete(prm)
|
||||
return err
|
||||
|
@ -40,7 +40,7 @@ func (e *StorageEngine) Delete(prm DeletePrm) (res *DeleteRes, err error) {
|
|||
return
|
||||
}
|
||||
|
||||
func (e *StorageEngine) delete(prm DeletePrm) (*DeleteRes, error) {
|
||||
func (e *StorageEngine) delete(prm DeletePrm) (DeleteRes, error) {
|
||||
if e.metrics != nil {
|
||||
defer elapsed(e.metrics.AddDeleteDuration)()
|
||||
}
|
||||
|
@ -80,8 +80,8 @@ func (e *StorageEngine) delete(prm DeletePrm) (*DeleteRes, error) {
|
|||
}
|
||||
|
||||
if locked.is {
|
||||
return nil, locked.err
|
||||
return DeleteRes{}, locked.err
|
||||
}
|
||||
|
||||
return nil, nil
|
||||
return DeleteRes{}, nil
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue