TrueCloudLab
/
frostfs-node
18
1
Fork 21
Code Issues 89 Pull Requests 7 Actions Releases Activity

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

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
remotes/KirillovDenis/release/v0.21.1
Leonard Lyubich 2020-11-19 11:29:38 +03:00 committed by Alex Vanin
parent 14442a0801
commit 2be8f154a0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/services/object/put/local.go
View File

@ -2,13 +2,13 @@ package putsvc
import ( import (
"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/nspcc-dev/neofs-node/pkg/services/object_manager/transformer" "github.com/nspcc-dev/neofs-node/pkg/services/object_manager/transformer"
"github.com/pkg/errors" "github.com/pkg/errors"
) )
type localTarget struct { type localTarget struct {
storage *localstore.Storage storage *engine.StorageEngine
obj *object.RawObject obj *object.RawObject
@ -30,7 +30,7 @@ func (t *localTarget) Write(p []byte) (n int, err error) {
} }
func (t *localTarget) Close() (*transformer.AccessIdentifiers, error) { func (t *localTarget) Close() (*transformer.AccessIdentifiers, error) {
if err := t.storage.Put(t.obj.Object()); err != nil { if err := engine.Put(t.storage, t.obj.Object()); err != nil {
return nil, errors.Wrapf(err, "(%T) could not put object to local storage", t) return nil, errors.Wrapf(err, "(%T) could not put object to local storage", t)
} }

6
pkg/services/object/put/service.go
View File

@ -7,7 +7,7 @@ import (
"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/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/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"
@ -35,7 +35,7 @@ type cfg struct {
maxSizeSrc MaxSizeSource maxSizeSrc MaxSizeSource
localStore *localstore.Storage localStore *engine.StorageEngine
cnrSrc container.Source cnrSrc container.Source
@ -98,7 +98,7 @@ func WithMaxSizeSource(v MaxSizeSource) Option {
} }
} }
func WithLocalStorage(v *localstore.Storage) Option { func WithLocalStorage(v *engine.StorageEngine) Option {
return func(c *cfg) { return func(c *cfg) {
c.localStore = v c.localStore = v
} }