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

[#186] object/head: Use new storage engine for work

Browse source 
Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2020-11-19 11:36:58 +03:00 committed by Alex Vanin
parent 2be8f154a0
commit 046206f670
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/services/object/head/local.go
View file

@ -4,16 +4,16 @@ import (
"context" "context"
"github.com/nspcc-dev/neofs-node/pkg/core/object" "github.com/nspcc-dev/neofs-node/pkg/core/object"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/localstore" "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/engine"
"github.com/pkg/errors" "github.com/pkg/errors"
) )
type localHeader struct { type localHeader struct {
storage *localstore.Storage storage *engine.StorageEngine
} }
func (h *localHeader) head(ctx context.Context, prm *Prm, handler func(*object.Object)) error { func (h *localHeader) head(ctx context.Context, prm *Prm, handler func(*object.Object)) error {
head, err := h.storage.Head(prm.addr) head, err := engine.Head(h.storage, prm.addr)
if err != nil { if err != nil {
return errors.Wrapf(err, "(%T) could not get header from local storage", h) return errors.Wrapf(err, "(%T) could not get header from local storage", h)
} }

4
pkg/services/object/head/service.go
View file

@ -7,7 +7,7 @@ import (
objectSDK "github.com/nspcc-dev/neofs-api-go/pkg/object" objectSDK "github.com/nspcc-dev/neofs-api-go/pkg/object"
"github.com/nspcc-dev/neofs-node/pkg/core/container" "github.com/nspcc-dev/neofs-node/pkg/core/container"
"github.com/nspcc-dev/neofs-node/pkg/core/netmap" "github.com/nspcc-dev/neofs-node/pkg/core/netmap"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/localstore" "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/engine"
"github.com/nspcc-dev/neofs-node/pkg/network" "github.com/nspcc-dev/neofs-node/pkg/network"
"github.com/nspcc-dev/neofs-node/pkg/network/cache" "github.com/nspcc-dev/neofs-node/pkg/network/cache"
objutil "github.com/nspcc-dev/neofs-node/pkg/services/object/util" objutil "github.com/nspcc-dev/neofs-node/pkg/services/object/util"
@ -106,7 +106,7 @@ func WithKeyStorage(v *objutil.KeyStorage) Option {
} }
} }
func WithLocalStorage(v *localstore.Storage) Option { func WithLocalStorage(v *engine.StorageEngine) Option {
return func(c *cfg) { return func(c *cfg) {
c.localHeader.storage = v c.localHeader.storage = v
} }