achuprov/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#1243] node/object: Hide engine behind interface

Browse source 
Do not use engine as explicit dependency in the put service. This allows
wrapping storage engine.

Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
This commit is contained in:
Pavel Karpy 2022-03-15 22:40:31 +03:00 committed by Alex Vanin
parent a4a29f3442
commit 16543a1904
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkg/services/object/put/local.go
View file

@ -3,13 +3,20 @@ package putsvc
import ( import (
"fmt" "fmt"
"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/nspcc-dev/neofs-sdk-go/object" "github.com/nspcc-dev/neofs-sdk-go/object"
objectSDK "github.com/nspcc-dev/neofs-sdk-go/object"
) )
// ObjectStorage is an object storage interface.
type ObjectStorage interface {
// Put must save passed object
// and return any appeared error.
Put(o *objectSDK.Object) error
}
type localTarget struct { type localTarget struct {
storage *engine.StorageEngine storage ObjectStorage
obj *object.Object obj *object.Object
@ -31,7 +38,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 := engine.Put(t.storage, t.obj); err != nil { if err := t.storage.Put(t.obj); err != nil {
return nil, fmt.Errorf("(%T) could not put object to local storage: %w", t, err) return nil, fmt.Errorf("(%T) could not put object to local storage: %w", t, err)
} }

5
pkg/services/object/put/service.go
View file

@ -7,7 +7,6 @@ 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/engine"
objutil "github.com/nspcc-dev/neofs-node/pkg/services/object/util" objutil "github.com/nspcc-dev/neofs-node/pkg/services/object/util"
"github.com/nspcc-dev/neofs-node/pkg/util" "github.com/nspcc-dev/neofs-node/pkg/util"
"github.com/nspcc-dev/neofs-node/pkg/util/logger" "github.com/nspcc-dev/neofs-node/pkg/util/logger"
@ -37,7 +36,7 @@ type cfg struct {
maxSizeSrc MaxSizeSource maxSizeSrc MaxSizeSource
localStore *engine.StorageEngine localStore ObjectStorage
cnrSrc container.Source cnrSrc container.Source
@ -99,7 +98,7 @@ func WithMaxSizeSource(v MaxSizeSource) Option {
} }
} }
func WithLocalStorage(v *engine.StorageEngine) Option { func WithObjectStorage(v ObjectStorage) Option {
return func(c *cfg) { return func(c *cfg) {
c.localStore = v c.localStore = v
} }