TrueCloudLab
/
frostfs-node
18
1
Fork 20
Code Issues 88 Pull Requests 8 Actions Releases Activity

[#647] objsvc/search: Remove TraverserGenerator wrapper 

Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
pull/647/head
Evgenii Stratonikov 2023-08-24 20:57:53 +03:00
parent ba58144de1
commit 56f841b022
4 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/object/search/exec.go
View File

@ -93,7 +93,7 @@ func (exec *execCtx) initEpoch() bool {
}
func (exec *execCtx) generateTraverser(cnr cid.ID) (*placement.Traverser, bool) {
t, err := exec.svc.traverserGenerator.generateTraverser(cnr, exec.curProcEpoch)
t, err := exec.svc.traverserGenerator.GenerateTraverser(cnr, nil, exec.curProcEpoch)
switch {
default:

2
pkg/services/object/search/search_test.go
View File

@ -71,7 +71,7 @@ func newTestStorage() *testStorage {
}
}
func (g *testTraverserGenerator) generateTraverser(_ cid.ID, epoch uint64) (*placement.Traverser, error) {
func (g *testTraverserGenerator) GenerateTraverser(_ cid.ID, _ *oid.ID, epoch uint64) (*placement.Traverser, error) {
return placement.NewTraverser(
placement.ForContainer(g.c),
placement.UseBuilder(g.b[epoch]),

4
pkg/services/object/search/service.go
View File

@ -45,7 +45,7 @@ type cfg struct {
}
traverserGenerator interface {
generateTraverser(cid.ID, uint64) (*placement.Traverser, error)
GenerateTraverser(cid.ID, *oid.ID, uint64) (*placement.Traverser, error)
}
currentEpochReceiver interface {
@ -71,7 +71,7 @@ func New(e *engine.StorageEngine,
localStorage: &storageEngineWrapper{
storage: e,
},
traverserGenerator: (*traverseGeneratorWrapper)(tg),
traverserGenerator: tg,
currentEpochReceiver: ns,
keyStore: ks,
}

8
pkg/services/object/search/util.go
View File

@ -8,8 +8,6 @@ import (
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine"
internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/internal/client"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement"
cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
)
@ -33,8 +31,6 @@ type storageEngineWrapper struct {
storage *engine.StorageEngine
}
type traverseGeneratorWrapper util.TraverserGenerator
func newUniqueAddressWriter(w IDListWriter) IDListWriter {
return &uniqueIDWriter{
written: make(map[oid.ID]struct{}),
@ -134,7 +130,3 @@ func idsFromAddresses(addrs []oid.Address) []oid.ID {
return ids
}
func (e *traverseGeneratorWrapper) generateTraverser(cnr cid.ID, epoch uint64) (*placement.Traverser, error) {
return (*util.TraverserGenerator)(e).GenerateTraverser(cnr, nil, epoch)
}