engine: drop package-level wrappers over StorageEngine

The only reason they existed is because StorageEngine interfaces were unusable. Now they're not and these wrappers are trivial and do nothing in most of the cases. Signed-off-by: Roman Khimov <[email protected]>
nspcc-dev · Nov 11, 2024 · e482dbf · e482dbf
1 parent 8d91f82
commit e482dbf
Show file tree

Hide file tree

Showing 17 changed files with 36 additions and 84 deletions.
diff --git a/cmd/neofs-lens/internal/storage/get.go b/cmd/neofs-lens/internal/storage/get.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	common "github.com/nspcc-dev/neofs-node/cmd/neofs-lens/internal"
-	"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/engine"
 	oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
 	"github.com/spf13/cobra"
 )
@@ -38,7 +37,7 @@ func getFunc(cmd *cobra.Command, _ []string) error {
 	}
 	defer storage.Close()
 
-	obj, err := engine.Get(storage, addr)
+	obj, err := storage.Get(addr)
 	if err != nil {
 		return fmt.Errorf("could not fetch object: %w", err)
 	}

diff --git a/cmd/neofs-node/container.go b/cmd/neofs-node/container.go
@@ -431,13 +431,13 @@ type localStorageLoad struct {
 }
 
 func (d *localStorageLoad) Iterate(f loadcontroller.UsedSpaceFilter, h loadcontroller.UsedSpaceHandler) error {
-	idList, err := engine.ListContainers(d.engine)
+	idList, err := d.engine.ListContainers()
 	if err != nil {
 		return fmt.Errorf("list containers on engine failure: %w", err)
 	}
 
 	for i := range idList {
-		sz, err := engine.ContainerSize(d.engine, idList[i])
+		sz, err := d.engine.ContainerSize(idList[i])
 		if err != nil {
 			d.log.Debug("failed to calculate container size in storage engine",
 				zap.Stringer("cid", idList[i]),

diff --git a/pkg/local_object_storage/engine/container.go b/pkg/local_object_storage/engine/container.go
@@ -32,11 +32,6 @@ func (e *StorageEngine) ContainerSize(cnr cid.ID) (uint64, error) {
 	return size, err
 }
 
-// ContainerSize calls ContainerSize method on engine to calculate sum of estimation container sizes among all shards.
-func ContainerSize(e *StorageEngine, id cid.ID) (uint64, error) {
-	return e.ContainerSize(id)
-}
-
 func (e *StorageEngine) containerSize(cnr cid.ID) (uint64, error) {
 	var size uint64
 
@@ -79,11 +74,6 @@ func (e *StorageEngine) ListContainers() ([]cid.ID, error) {
 	return res, err
 }
 
-// ListContainers calls ListContainers method on engine to get a unique container IDs presented in the engine objects.
-func ListContainers(e *StorageEngine) ([]cid.ID, error) {
-	return e.ListContainers()
-}
-
 func (e *StorageEngine) listContainers() ([]cid.ID, error) {
 	uniqueIDs := make(map[cid.ID]struct{})
 

diff --git a/pkg/local_object_storage/engine/control_test.go b/pkg/local_object_storage/engine/control_test.go
@@ -154,28 +154,28 @@ func TestExecBlocks(t *testing.T) {
 
 	addr := object.AddressOf(obj)
 
-	require.NoError(t, Put(e, obj))
+	require.NoError(t, e.Put(obj, nil, 0))
 
 	// block executions
 	errBlock := errors.New("block exec err")
 
 	require.NoError(t, e.BlockExecution(errBlock))
 
 	// try to exec some op
-	_, err := Head(e, addr)
+	_, err := e.Head(addr, false)
 	require.ErrorIs(t, err, errBlock)
 
 	// resume executions
 	require.NoError(t, e.ResumeExecution())
 
-	_, err = Head(e, addr) // can be any data-related op
+	_, err = e.Head(addr, false) // can be any data-related op
 	require.NoError(t, err)
 
 	// close
 	require.NoError(t, e.Close())
 
 	// try exec after close
-	_, err = Head(e, addr)
+	_, err = e.Head(addr, false)
 	require.Error(t, err)
 
 	// try to resume

diff --git a/pkg/local_object_storage/engine/delete_test.go b/pkg/local_object_storage/engine/delete_test.go
@@ -56,9 +56,9 @@ func TestDeleteBigObject(t *testing.T) {
 	defer e.Close()
 
 	for i := range children {
-		require.NoError(t, Put(e, children[i]))
+		require.NoError(t, e.Put(children[i], nil, 0))
 	}
-	require.NoError(t, Put(e, link))
+	require.NoError(t, e.Put(link, nil, 0))
 
 	var splitErr *objectSDK.SplitInfoError
 

diff --git a/pkg/local_object_storage/engine/engine_test.go b/pkg/local_object_storage/engine/engine_test.go
@@ -64,7 +64,7 @@ func benchmarkExists(b *testing.B, shardNum int) {
 	addr := oidtest.Address()
 	for range 100 {
 		obj := generateObjectWithCID(cidtest.ID())
-		err := Put(e, obj)
+		err := e.Put(obj, nil, 0)
 		if err != nil {
 			b.Fatal(err)
 		}

diff --git a/pkg/local_object_storage/engine/gc_test.go b/pkg/local_object_storage/engine/gc_test.go
@@ -93,10 +93,10 @@ func TestChildrenExpiration(t *testing.T) {
 		link.SetChildren(child1ID, child2ID, child3ID)
 		link.SetSplitID(splitID)
 
-		require.NoError(t, Put(e, child1))
-		require.NoError(t, Put(e, child2))
-		require.NoError(t, Put(e, child3))
-		require.NoError(t, Put(e, link))
+		require.NoError(t, e.Put(child1, nil, 0))
+		require.NoError(t, e.Put(child2, nil, 0))
+		require.NoError(t, e.Put(child3, nil, 0))
+		require.NoError(t, e.Put(link, nil, 0))
 
 		e.HandleNewEpoch(currEpoch + 1)
 
@@ -144,10 +144,10 @@ func TestChildrenExpiration(t *testing.T) {
 		linkObj.CalculateAndSetPayloadChecksum()
 		require.NoError(t, linkObj.CalculateAndSetID())
 
-		require.NoError(t, Put(e, child1))
-		require.NoError(t, Put(e, child2))
-		require.NoError(t, Put(e, child3))
-		require.NoError(t, Put(e, &linkObj))
+		require.NoError(t, e.Put(child1, nil, 0))
+		require.NoError(t, e.Put(child2, nil, 0))
+		require.NoError(t, e.Put(child3, nil, 0))
+		require.NoError(t, e.Put(&linkObj, nil, 0))
 
 		e.HandleNewEpoch(currEpoch + 1)
 
@@ -163,7 +163,7 @@ func checkObjectsAsyncRemoval(t *testing.T, e *StorageEngine, cnr cid.ID, objs .
 		for _, obj := range objs {
 			addr.SetObject(obj)
 
-			_, err := Get(e, addr)
+			_, err := e.Get(addr)
 			if !errors.As(err, new(statusSDK.ObjectNotFound)) {
 				return false
 			}

diff --git a/pkg/local_object_storage/engine/get.go b/pkg/local_object_storage/engine/get.go
@@ -145,11 +145,6 @@ func (e *StorageEngine) get(addr oid.Address, shardFunc func(s *shard.Shard, ign
 	return nil
 }
 
-// Get reads object from local storage by provided address.
-func Get(storage *StorageEngine, addr oid.Address) (*objectSDK.Object, error) {
-	return storage.Get(addr)
-}
-
 // GetBytes reads object from the StorageEngine by address into memory buffer in
 // a canonical NeoFS binary format. Returns [apistatus.ObjectNotFound] if object
 // is missing.

diff --git a/pkg/local_object_storage/engine/get_test.go b/pkg/local_object_storage/engine/get_test.go
@@ -15,7 +15,7 @@ func TestStorageEngine_GetBytes(t *testing.T) {
 
 	objBin := obj.Marshal()
 
-	err := Put(e, obj)
+	err := e.Put(obj, nil, 0)
 	require.NoError(t, err)
 
 	b, err := e.GetBytes(addr)

diff --git a/pkg/local_object_storage/engine/head.go b/pkg/local_object_storage/engine/head.go
@@ -102,14 +102,3 @@ func (e *StorageEngine) head(addr oid.Address, raw bool) (*objectSDK.Object, err
 
 	return head, nil
 }
-
-// Head reads object header from local storage by provided address.
-func Head(storage *StorageEngine, addr oid.Address) (*objectSDK.Object, error) {
-	return storage.Head(addr, false)
-}
-
-// HeadRaw reads object header from local storage by provided address and raw
-// flag.
-func HeadRaw(storage *StorageEngine, addr oid.Address, raw bool) (*objectSDK.Object, error) {
-	return storage.Head(addr, true)
-}
diff --git a/pkg/local_object_storage/engine/inhume_test.go b/pkg/local_object_storage/engine/inhume_test.go
@@ -43,13 +43,13 @@ func TestStorageEngine_Inhume(t *testing.T) {
 		e := testNewEngineWithShardNum(t, 1)
 		defer e.Close()
 
-		err := Put(e, parent)
+		err := e.Put(parent, nil, 0)
 		require.NoError(t, err)
 
 		err = e.Inhume(tombstoneID, 0, object.AddressOf(parent))
 		require.NoError(t, err)
 
-		addrs, err := Select(e, cnr, fs)
+		addrs, err := e.Select(cnr, fs)
 		require.NoError(t, err)
 		require.Empty(t, addrs)
 	})
@@ -75,13 +75,13 @@ func TestStorageEngine_Inhume(t *testing.T) {
 		require.NoError(t, err)
 
 		t.Run("empty search should fail", func(t *testing.T) {
-			addrs, err := Select(e, cnr, objectSDK.SearchFilters{})
+			addrs, err := e.Select(cnr, objectSDK.SearchFilters{})
 			require.NoError(t, err)
 			require.Empty(t, addrs)
 		})
 
 		t.Run("root search should fail", func(t *testing.T) {
-			addrs, err := Select(e, cnr, fs)
+			addrs, err := e.Select(cnr, fs)
 			require.NoError(t, err)
 			require.Empty(t, addrs)
 		})
@@ -91,18 +91,18 @@ func TestStorageEngine_Inhume(t *testing.T) {
 			addr.SetContainer(cnr)
 			addr.SetObject(idChild)
 
-			_, err = Get(e, addr)
+			_, err = e.Get(addr)
 			require.ErrorAs(t, err, new(apistatus.ObjectAlreadyRemoved))
 
 			linkID := link.GetID()
 			addr.SetObject(linkID)
 
-			_, err = Get(e, addr)
+			_, err = e.Get(addr)
 			require.ErrorAs(t, err, new(apistatus.ObjectAlreadyRemoved))
 		})
 
 		t.Run("parent get should claim deletion", func(t *testing.T) {
-			_, err = Get(e, object.AddressOf(parent))
+			_, err = e.Get(object.AddressOf(parent))
 			require.ErrorAs(t, err, new(apistatus.ObjectAlreadyRemoved))
 		})
 	})

diff --git a/pkg/local_object_storage/engine/lock_test.go b/pkg/local_object_storage/engine/lock_test.go
@@ -81,15 +81,15 @@ func TestLockUserScenario(t *testing.T) {
 	id := obj.GetID()
 	objAddr.SetObject(id)
 
-	err = Put(e, obj)
+	err = e.Put(obj, nil, 0)
 	require.NoError(t, err)
 
 	// 2.
 	var locker object.Lock
 	locker.WriteMembers([]oid.ID{id})
 	lockerObj.WriteLock(locker)
 
-	err = Put(e, lockerObj)
+	err = e.Put(lockerObj, nil, 0)
 	require.NoError(t, err)
 
 	err = e.Lock(cnr, lockerID, []oid.ID{id})
@@ -104,7 +104,7 @@ func TestLockUserScenario(t *testing.T) {
 	tombObj.SetID(tombForLockID)
 	tombObj.SetAttributes(a)
 
-	err = Put(e, tombObj)
+	err = e.Put(tombObj, nil, 0)
 	require.NoError(t, err)
 
 	err = e.Inhume(tombForLockAddr, 0, lockerAddr)
@@ -149,7 +149,7 @@ func TestLockExpiration(t *testing.T) {
 	// 1.
 	obj := generateObjectWithCID(cnr)
 
-	err = Put(e, obj)
+	err = e.Put(obj, nil, 0)
 	require.NoError(t, err)
 
 	// 2.
@@ -161,7 +161,7 @@ func TestLockExpiration(t *testing.T) {
 	lock.SetType(object.TypeLock)
 	lock.SetAttributes(a)
 
-	err = Put(e, lock)
+	err = e.Put(lock, nil, 0)
 	require.NoError(t, err)
 
 	id := obj.GetID()
@@ -215,14 +215,14 @@ func TestLockForceRemoval(t *testing.T) {
 	// 1.
 	obj := generateObjectWithCID(cnr)
 
-	err = Put(e, obj)
+	err = e.Put(obj, nil, 0)
 	require.NoError(t, err)
 
 	// 2.
 	lock := generateObjectWithCID(cnr)
 	lock.SetType(object.TypeLock)
 
-	err = Put(e, lock)
+	err = e.Put(lock, nil, 0)
 	require.NoError(t, err)
 
 	id := obj.GetID()

diff --git a/pkg/local_object_storage/engine/put.go b/pkg/local_object_storage/engine/put.go
@@ -150,8 +150,3 @@ func (e *StorageEngine) putToShard(sh hashedShard, ind int, pool util.WorkerPool
 
 	return putSuccess, alreadyExists
 }
-
-// Put writes provided object to local storage.
-func Put(storage *StorageEngine, obj *objectSDK.Object) error {
-	return storage.Put(obj, nil, 0)
-}
diff --git a/pkg/local_object_storage/engine/range.go b/pkg/local_object_storage/engine/range.go
@@ -155,8 +155,3 @@ func (e *StorageEngine) getRange(addr oid.Address, offset uint64, length uint64)
 
 	return out, nil
 }
-
-// GetRange reads object payload range from local storage by provided address.
-func GetRange(storage *StorageEngine, addr oid.Address, rng *objectSDK.Range) ([]byte, error) {
-	return storage.GetRange(addr, rng.GetOffset(), rng.GetLength())
-}
diff --git a/pkg/local_object_storage/engine/select.go b/pkg/local_object_storage/engine/select.go
@@ -118,14 +118,3 @@ func (e *StorageEngine) list(limit uint64) ([]oid.Address, error) {
 
 	return addrList, nil
 }
-
-// Select selects objects from local storage using provided filters.
-func Select(storage *StorageEngine, cnr cid.ID, fs object.SearchFilters) ([]oid.Address, error) {
-	return storage.Select(cnr, fs)
-}
-
-// List returns `limit` available physically storage object addresses in
-// engine. If limit is zero, then returns all available object addresses.
-func List(storage *StorageEngine, limit uint64) ([]oid.Address, error) {
-	return storage.List(limit)
-}
diff --git a/pkg/local_object_storage/engine/tree_test.go b/pkg/local_object_storage/engine/tree_test.go
@@ -30,7 +30,7 @@ func benchmarkTreeVsSearch(b *testing.B, objCount int) {
 	for i := range objCount {
 		obj := generateObjectWithCID(cid)
 		addAttribute(obj, pilorama.AttributeFilename, strconv.Itoa(i))
-		err := Put(e, obj)
+		err := e.Put(obj, nil, 0)
 		if err != nil {
 			b.Fatal(err)
 		}

diff --git a/pkg/services/object/acl/eacl/v2/localstore.go b/pkg/services/object/acl/eacl/v2/localstore.go
@@ -17,5 +17,5 @@ func (s *localStorage) Head(addr oid.Address) (*objectSDK.Object, error) {
 		return nil, io.ErrUnexpectedEOF
 	}
 
-	return engine.Head(s.ls, addr)
+	return s.ls.Head(addr, false)
 }