dstepanov-yadro/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#58] object/search: Refactor RelationSearcher implementation

Browse source 
Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2020-10-01 11:52:21 +03:00 committed by Alex Vanin
parent 4bcfed37ca
commit 624e8cd3cb
2 changed files with 64 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
pkg/services/object/search/relation.go Normal file
View file

@ -0,0 +1,64 @@
package searchsvc
import (
"context"
"io"
"github.com/nspcc-dev/neofs-api-go/pkg/object"
"github.com/nspcc-dev/neofs-node/pkg/services/object/search/query"
queryV1 "github.com/nspcc-dev/neofs-node/pkg/services/object/search/query/v1"
"github.com/pkg/errors"
)
type RelationSearcher struct {
svc *Service
queryGenerator func(*object.Address) query.Query
}
func (s *RelationSearcher) SearchRelation(ctx context.Context, addr *object.Address) (*object.ID, error) {
streamer, err := s.svc.Search(ctx, new(Prm).
WithContainerID(addr.GetContainerID()).
WithSearchQuery(s.queryGenerator(addr)),
)
if err != nil {
return nil, errors.Wrapf(err, "(%T) could not create search streamer", s)
}
res, err := readFullStream(streamer, 1)
if err != nil {
return nil, errors.Wrapf(err, "(%T) could not read full search stream", s)
} else if ln := len(res); ln != 1 {
return nil, errors.Errorf("(%T) unexpected amount of found objects %d", s, ln)
}
return res[0], nil
}
func readFullStream(s *Streamer, cap int) ([]*object.ID, error) {
res := make([]*object.ID, 0, cap)
for {
r, err := s.Recv()
if err != nil {
if errors.Is(errors.Cause(err), io.EOF) {
break
}
return nil, errors.Wrapf(err, "(%s) could not receive search result", "readFullStream")
}
res = append(res, r.IDList()...)
}
return res, nil
}
func NewRightChildSearcher(svc *Service) *RelationSearcher {
return &RelationSearcher{
svc: svc,
queryGenerator: func(addr *object.Address) query.Query {
return queryV1.NewRightChildQuery(addr.GetObjectID())
},
}
}

43
pkg/services/object/search/service.go
View file

@ -2,7 +2,6 @@ package searchsvc
import (
"context"
"io"
"sync"
"github.com/nspcc-dev/neofs-api-go/pkg/object"
@ -10,10 +9,8 @@ import (
"github.com/nspcc-dev/neofs-node/pkg/core/netmap"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/localstore"
"github.com/nspcc-dev/neofs-node/pkg/network"
"github.com/nspcc-dev/neofs-node/pkg/services/object/search/query/v1"
objutil "github.com/nspcc-dev/neofs-node/pkg/services/object/util"
"github.com/nspcc-dev/neofs-node/pkg/util"
"github.com/pkg/errors"
)
type Service struct {
@ -64,46 +61,6 @@ func (p *Service) Search(ctx context.Context, prm *Prm) (*Streamer, error) {
}, nil
}
func (p *Service) SearchRightChild(ctx context.Context, addr *object.Address) (*object.ID, error) {
streamer, err := p.Search(ctx, new(Prm).
WithContainerID(addr.GetContainerID()).
WithSearchQuery(
query.NewRightChildQuery(addr.GetObjectID()),
),
)
if err != nil {
return nil, errors.Wrapf(err, "(%T) could not create search streamer", p)
}
res, err := readFullStream(streamer, 1)
if err != nil {
return nil, errors.Wrapf(err, "(%T) could not read full search stream", p)
} else if ln := len(res); ln != 1 {
return nil, errors.Errorf("(%T) unexpected amount of found objects %d", p, ln)
}
return res[0], nil
}
func readFullStream(s *Streamer, cap int) ([]*object.ID, error) {
res := make([]*object.ID, 0, cap)
for {
r, err := s.Recv()
if err != nil {
if errors.Is(errors.Cause(err), io.EOF) {
break
}
return nil, errors.Wrapf(err, "(%s) could not receive search result", "readFullStream")
}
res = append(res, r.IDList()...)
}
return res, nil
}
func WithKeyStorage(v *objutil.KeyStorage) Option {
return func(c *cfg) {
c.keyStorage = v