services/object: use SearchV2 for search objects

Closes #3143.

Signed-off-by: Andrey Butusov <[email protected]>

Author: End-rey

pkg/services/object/internal/client/client.go

@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"slices"
 
 	coreclient "github.com/nspcc-dev/neofs-node/pkg/core/client"
 	"github.com/nspcc-dev/neofs-sdk-go/bearer"
@@ -415,8 +416,8 @@ func PutObject(prm PutObjectPrm) (*PutObjectRes, error) {
 type SearchObjectsPrm struct {
 	readPrmCommon
 
-	cid    cid.ID
-	cliPrm client.PrmObjectSearch
+	cid cid.ID
+	fs  object.SearchFilters
 }
 
 // SetContainerID sets identifier of the container to search the objects.
@@ -428,53 +429,43 @@ func (x *SearchObjectsPrm) SetContainerID(id cid.ID) {
 
 // SetFilters sets search filters.
 func (x *SearchObjectsPrm) SetFilters(fs object.SearchFilters) {
-	x.cliPrm.SetFilters(fs)
-}
-
-// SearchObjectsRes groups the resulting values of SearchObjects operation.
-type SearchObjectsRes struct {
-	ids []oid.ID
-}
-
-// IDList returns identifiers of the matched objects.
-func (x SearchObjectsRes) IDList() []oid.ID {
-	return x.ids
+	x.fs = fs
 }
 
 // SearchObjects selects objects from container which match the filters.
 //
 // Returns any error which prevented the operation from completing correctly in error return.
-func SearchObjects(prm SearchObjectsPrm) (*SearchObjectsRes, error) {
+func SearchObjects(prm SearchObjectsPrm) ([]oid.ID, error) {
+	var opts client.SearchObjectsOptions
 	if prm.local {
-		prm.cliPrm.MarkLocal()
+		opts.DisableForwarding()
 	}
 
 	if prm.tokenSession != nil {
-		prm.cliPrm.WithinSession(*prm.tokenSession)
+		opts.WithSessionToken(*prm.tokenSession)
 	}
 
 	if prm.tokenBearer != nil {
-		prm.cliPrm.WithBearerToken(*prm.tokenBearer)
-	}
-
-	prm.cliPrm.WithXHeaders(prm.xHeaders...)
-
-	rdr, err := prm.cli.ObjectSearchInit(prm.ctx, prm.cid, prm.signer, prm.cliPrm)
-	if err != nil {
-		return nil, fmt.Errorf("init object searching in client: %w", err)
+		opts.WithBearerToken(*prm.tokenBearer)
 	}
 
-	var ids []oid.ID
-
-	err = rdr.Iterate(func(id oid.ID) bool {
-		ids = append(ids, id)
-		return false
-	})
-	if err != nil {
-		return nil, fmt.Errorf("search objects using NeoFS API: %w", err)
+	opts.WithXHeaders(prm.xHeaders...)
+
+	var cursor string
+	var next []client.SearchResultItem
+	var res []oid.ID
+	var err error
+	for {
+		next, cursor, err = prm.cli.SearchObjects(prm.ctx, prm.cid, prm.fs, nil, cursor, prm.signer, opts)
+		if err != nil {
+			return nil, fmt.Errorf("search objects RPC: %w", err)
+		}
+		res = slices.Grow(res, len(res)+len(next))
+		for i := range next {
+			res = append(res, next[i].ID)
+		}
+		if cursor == "" {
+			return res, nil
+		}
 	}
-
-	return &SearchObjectsRes{
-		ids: ids,
-	}, nil
 }

pkg/services/object/search/util.go

@@ -105,7 +105,7 @@ func (c *clientWrapper) searchObjects(ctx context.Context, exec *execCtx, info c
 		return nil, err
 	}
 
-	return res.IDList(), nil
+	return res, nil
 }
 
 func (e *storageEngineWrapper) search(exec *execCtx) ([]oid.ID, error) {