From 9fbcc0e43cac2d62486698399c231a9996cbb23f Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Fri, 30 Dec 2022 14:06:47 +0300 Subject: [PATCH] [#6] services/object: Remove `nmSrc` wrapper It calls a single method from source without any processing. Signed-off-by: Evgenii Stratonikov --- pkg/services/object/get/exec.go | 2 +- pkg/services/object/get/get_test.go | 6 +++--- pkg/services/object/get/service.go | 12 ++++++------ pkg/services/object/get/util.go | 9 --------- pkg/services/object/search/exec.go | 2 +- pkg/services/object/search/search_test.go | 6 +++--- pkg/services/object/search/service.go | 12 ++++++------ pkg/services/object/search/util.go | 9 --------- 8 files changed, 20 insertions(+), 38 deletions(-) diff --git a/pkg/services/object/get/exec.go b/pkg/services/object/get/exec.go index 2f4d98aca7..d8347e8120 100644 --- a/pkg/services/object/get/exec.go +++ b/pkg/services/object/get/exec.go @@ -108,7 +108,7 @@ func (exec *execCtx) initEpoch() bool { return true } - e, err := exec.svc.currentEpochReceiver.currentEpoch() + e, err := exec.svc.epochSource.Epoch() switch { default: diff --git a/pkg/services/object/get/get_test.go b/pkg/services/object/get/get_test.go index b860491d81..f6645bbd58 100644 --- a/pkg/services/object/get/get_test.go +++ b/pkg/services/object/get/get_test.go @@ -56,7 +56,7 @@ type testClient struct { type testEpochReceiver uint64 -func (e testEpochReceiver) currentEpoch() (uint64, error) { +func (e testEpochReceiver) Epoch() (uint64, error) { return uint64(e), nil } @@ -519,7 +519,7 @@ func TestGetRemoteSmall(t *testing.T) { }, } svc.clientCache = c - svc.currentEpochReceiver = testEpochReceiver(curEpoch) + svc.epochSource = testEpochReceiver(curEpoch) return svc } @@ -1670,7 +1670,7 @@ func TestGetFromPastEpoch(t *testing.T) { }, } - svc.currentEpochReceiver = testEpochReceiver(curEpoch) + svc.epochSource = testEpochReceiver(curEpoch) w := NewSimpleObjectWriter() diff --git a/pkg/services/object/get/service.go b/pkg/services/object/get/service.go index e69ab4f0f6..fe4ba4c239 100644 --- a/pkg/services/object/get/service.go +++ b/pkg/services/object/get/service.go @@ -40,13 +40,15 @@ type cfg struct { GenerateTraverser(cid.ID, *oid.ID, uint64) (*placement.Traverser, error) } - currentEpochReceiver interface { - currentEpoch() (uint64, error) - } + epochSource epochSource keyStore *util.KeyStorage } +type epochSource interface { + Epoch() (uint64, error) +} + func defaultCfg() *cfg { return &cfg{ log: &logger.Logger{Logger: zap.L()}, @@ -107,9 +109,7 @@ func WithTraverserGenerator(t *util.TraverserGenerator) Option { // map storage to receive current network state. func WithNetMapSource(nmSrc netmap.Source) Option { return func(c *cfg) { - c.currentEpochReceiver = &nmSrcWrapper{ - nmSrc: nmSrc, - } + c.epochSource = nmSrc } } diff --git a/pkg/services/object/get/util.go b/pkg/services/object/get/util.go index 7dfc6e6621..c51fc678f6 100644 --- a/pkg/services/object/get/util.go +++ b/pkg/services/object/get/util.go @@ -7,7 +7,6 @@ import ( "io" coreclient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" - "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" internal "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/internal/client" internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/internal/client" @@ -45,10 +44,6 @@ type hasherWrapper struct { hash io.Writer } -type nmSrcWrapper struct { - nmSrc netmap.Source -} - func NewSimpleObjectWriter() *SimpleObjectWriter { return &SimpleObjectWriter{ obj: object.New(), @@ -252,7 +247,3 @@ func (h *hasherWrapper) WriteChunk(_ context.Context, p []byte) error { _, err := h.hash.Write(p) return err } - -func (n *nmSrcWrapper) currentEpoch() (uint64, error) { - return n.nmSrc.Epoch() -} diff --git a/pkg/services/object/search/exec.go b/pkg/services/object/search/exec.go index 22d049e79a..dd18b8f3e3 100644 --- a/pkg/services/object/search/exec.go +++ b/pkg/services/object/search/exec.go @@ -57,7 +57,7 @@ func (exec *execCtx) initEpoch() bool { return true } - e, err := exec.svc.currentEpochReceiver.currentEpoch() + e, err := exec.svc.epochSource.Epoch() switch { default: diff --git a/pkg/services/object/search/search_test.go b/pkg/services/object/search/search_test.go index a9c6d219d1..25e5838c53 100644 --- a/pkg/services/object/search/search_test.go +++ b/pkg/services/object/search/search_test.go @@ -51,7 +51,7 @@ type simpleIDWriter struct { type testEpochReceiver uint64 -func (e testEpochReceiver) currentEpoch() (uint64, error) { +func (e testEpochReceiver) Epoch() (uint64, error) { return uint64(e), nil } @@ -261,7 +261,7 @@ func TestGetRemoteSmall(t *testing.T) { }, } svc.clientConstructor = c - svc.currentEpochReceiver = testEpochReceiver(curEpoch) + svc.epochSource = testEpochReceiver(curEpoch) return svc } @@ -388,7 +388,7 @@ func TestGetFromPastEpoch(t *testing.T) { }, } - svc.currentEpochReceiver = testEpochReceiver(curEpoch) + svc.epochSource = testEpochReceiver(curEpoch) w := new(simpleIDWriter) diff --git a/pkg/services/object/search/service.go b/pkg/services/object/search/service.go index aebcfca0fd..09b277b27e 100644 --- a/pkg/services/object/search/service.go +++ b/pkg/services/object/search/service.go @@ -46,13 +46,15 @@ type cfg struct { generateTraverser(cid.ID, uint64) (*placement.Traverser, error) } - currentEpochReceiver interface { - currentEpoch() (uint64, error) - } + epochSource epochSource keyStore *util.KeyStorage } +type epochSource interface { + Epoch() (uint64, error) +} + func defaultCfg() *cfg { return &cfg{ log: &logger.Logger{Logger: zap.L()}, @@ -110,9 +112,7 @@ func WithTraverserGenerator(t *util.TraverserGenerator) Option { // map storage to receive current network state. func WithNetMapSource(nmSrc netmap.Source) Option { return func(c *cfg) { - c.currentEpochReceiver = &nmSrcWrapper{ - nmSrc: nmSrc, - } + c.epochSource = nmSrc } } diff --git a/pkg/services/object/search/util.go b/pkg/services/object/search/util.go index 9477cb4285..ffaf007931 100644 --- a/pkg/services/object/search/util.go +++ b/pkg/services/object/search/util.go @@ -4,7 +4,6 @@ import ( "sync" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" - "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" "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" @@ -35,10 +34,6 @@ type storageEngineWrapper struct { type traverseGeneratorWrapper util.TraverserGenerator -type nmSrcWrapper struct { - nmSrc netmap.Source -} - func newUniqueAddressWriter(w IDListWriter) IDListWriter { return &uniqueIDWriter{ written: make(map[oid.ID]struct{}), @@ -143,7 +138,3 @@ func idsFromAddresses(addrs []oid.Address) []oid.ID { func (e *traverseGeneratorWrapper) generateTraverser(cnr cid.ID, epoch uint64) (*placement.Traverser, error) { return (*util.TraverserGenerator)(e).GenerateTraverser(cnr, nil, epoch) } - -func (n *nmSrcWrapper) currentEpoch() (uint64, error) { - return n.nmSrc.Epoch() -}