storage/metabase: Drop unused IterateCoveredByTombstones method

Signed-off-by: Leonard Lyubich <[email protected]>

Author: cthulhu-rider

pkg/local_object_storage/metabase/iterators.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/binary"
 	"errors"
-	"fmt"
 	"math"
 
 	islices "github.com/nspcc-dev/neofs-node/internal/slices"
@@ -177,68 +176,6 @@ func (db *DB) iterateExpired(tx *bbolt.Tx, curEpoch uint64, h ExpiredObjectHandl
 	return err
 }
 
-// IterateCoveredByTombstones iterates over all objects in DB which are covered
-// by tombstone with string address from tss. Locked objects are not included
-// (do not confuse with objects of type LOCK).
-//
-// If h returns ErrInterruptIterator, nil returns immediately.
-// Returns other errors of h directly.
-//
-// Does not modify tss.
-func (db *DB) IterateCoveredByTombstones(tss map[string]oid.Address, h func(oid.Address) error) error {
-	db.modeMtx.RLock()
-	defer db.modeMtx.RUnlock()
-
-	if db.mode.NoMetabase() {
-		return ErrDegradedMode
-	}
-
-	currEpoch := db.epochState.CurrentEpoch()
-
-	return db.boltDB.View(func(tx *bbolt.Tx) error {
-		return db.iterateCoveredByTombstones(tx, currEpoch, tss, h)
-	})
-}
-
-func (db *DB) iterateCoveredByTombstones(tx *bbolt.Tx, currEpoch uint64, tss map[string]oid.Address, h func(oid.Address) error) error {
-	bktGraveyard := tx.Bucket(graveyardBucketName)
-
-	err := bktGraveyard.ForEach(func(k, v []byte) error {
-		var addr oid.Address
-		if err := decodeAddressFromKey(&addr, v[:addressKeySize]); err != nil {
-			return err
-		}
-		if _, ok := tss[addr.EncodeToString()]; ok {
-			var addr oid.Address
-
-			err := decodeAddressFromKey(&addr, k)
-			if err != nil {
-				return fmt.Errorf("could not parse address of the object under tombstone: %w", err)
-			}
-
-			metaBucket := tx.Bucket(metaBucketKey(addr.Container()))
-			var metaCursor *bbolt.Cursor
-			if metaBucket != nil {
-				metaCursor = metaBucket.Cursor()
-			}
-
-			if objectLocked(tx, currEpoch, metaCursor, addr.Container(), addr.Object()) {
-				return nil
-			}
-
-			return h(addr)
-		}
-
-		return nil
-	})
-
-	if errors.Is(err, ErrInterruptIterator) {
-		err = nil
-	}
-
-	return err
-}
-
 func mkFilterPhysicalPrefix() []byte {
 	var prefix = make([]byte, 1+len(object.FilterPhysical)+1+len(binPropMarker)+1)
 

pkg/local_object_storage/metabase/iterators_test.go

@@ -62,38 +62,3 @@ func putWithExpiration(t *testing.T, db *meta.DB, typ object.Type, expiresAt uin
 
 	return object2.AddressOf(obj)
 }
-
-func TestDB_IterateCoveredByTombstones(t *testing.T) {
-	db := newDB(t)
-
-	ts := oidtest.Address()
-	protected1 := oidtest.Address()
-	protected2 := oidtest.Address()
-	protectedLocked := oidtest.Address()
-	garbage := oidtest.Address()
-
-	var err error
-
-	_, _, err = db.Inhume(ts, 0, false, protected1, protected2, protectedLocked)
-	require.NoError(t, err)
-
-	_, _, err = db.MarkGarbage(false, false, garbage)
-	require.NoError(t, err)
-
-	var handled []oid.Address
-
-	tss := map[string]oid.Address{
-		ts.EncodeToString(): ts,
-	}
-
-	err = db.IterateCoveredByTombstones(tss, func(addr oid.Address) error {
-		handled = append(handled, addr)
-		return nil
-	})
-	require.NoError(t, err)
-
-	require.Len(t, handled, 3)
-	require.Contains(t, handled, protected1)
-	require.Contains(t, handled, protected2)
-	require.Contains(t, handled, protectedLocked)
-}