From 2ad8016d7546647d2193749b82c0899dd3eed16c Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Mon, 28 Mar 2022 16:15:15 +0300 Subject: [PATCH] [#1239] innerring: Use pointer-less slices for object IDs Signed-off-by: Evgenii Stratonikov --- pkg/innerring/internal/client/client.go | 9 ++++----- pkg/innerring/processors/audit/process.go | 4 ++-- pkg/innerring/processors/audit/processor.go | 4 ++-- pkg/services/audit/auditor/por.go | 2 +- pkg/services/audit/task.go | 6 +++--- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/pkg/innerring/internal/client/client.go b/pkg/innerring/internal/client/client.go index 4fa4742b1..f10342a47 100644 --- a/pkg/innerring/internal/client/client.go +++ b/pkg/innerring/internal/client/client.go @@ -48,11 +48,11 @@ func (x *SearchSGPrm) SetContainerID(id *cid.ID) { // SearchSGRes groups resulting values of SearchSG operation. type SearchSGRes struct { - cliRes []*oid.ID + cliRes []oid.ID } // IDList returns list of IDs of storage groups in container. -func (x SearchSGRes) IDList() []*oid.ID { +func (x SearchSGRes) IDList() []oid.ID { return x.cliRes } @@ -75,15 +75,14 @@ func (x Client) SearchSG(prm SearchSGPrm) (*SearchSGRes, error) { rdr.UseKey(*x.key) buf := make([]oid.ID, 10) - var list []*oid.ID + var list []oid.ID var n int var ok bool for { n, ok = rdr.Read(buf) for i := 0; i < n; i++ { - v := buf[i] - list = append(list, &v) + list = append(list, buf[i]) } if !ok { break diff --git a/pkg/innerring/processors/audit/process.go b/pkg/innerring/processors/audit/process.go index d37c77a45..c0dd5dccc 100644 --- a/pkg/innerring/processors/audit/process.go +++ b/pkg/innerring/processors/audit/process.go @@ -107,8 +107,8 @@ func (ap *Processor) processStartAudit(epoch uint64) { } } -func (ap *Processor) findStorageGroups(cid *cid.ID, shuffled netmap.Nodes) []*oidSDK.ID { - var sg []*oidSDK.ID +func (ap *Processor) findStorageGroups(cid *cid.ID, shuffled netmap.Nodes) []oidSDK.ID { + var sg []oidSDK.ID ln := len(shuffled) diff --git a/pkg/innerring/processors/audit/processor.go b/pkg/innerring/processors/audit/processor.go index 917d15a0a..2a5bba454 100644 --- a/pkg/innerring/processors/audit/processor.go +++ b/pkg/innerring/processors/audit/processor.go @@ -89,11 +89,11 @@ func (x SearchSGPrm) NodeInfo() client.NodeInfo { // SearchSGDst groups target values which Processor expects from SG searching to process. type SearchSGDst struct { - ids []*oidSDK.ID + ids []oidSDK.ID } // WriteIDList writes list of identifiers of storage group objects stored in the container. -func (x *SearchSGDst) WriteIDList(ids []*oidSDK.ID) { +func (x *SearchSGDst) WriteIDList(ids []oidSDK.ID) { x.ids = ids } diff --git a/pkg/services/audit/auditor/por.go b/pkg/services/audit/auditor/por.go index ce306f1ee..61f4ef9bd 100644 --- a/pkg/services/audit/auditor/por.go +++ b/pkg/services/audit/auditor/por.go @@ -22,7 +22,7 @@ func (c *Context) executePoR() { sg := sgs[i] if err := c.porWorkerPool.Submit(func() { - c.checkStorageGroupPoR(i, sg) + c.checkStorageGroupPoR(i, &sg) wg.Done() }); err != nil { wg.Done() diff --git a/pkg/services/audit/task.go b/pkg/services/audit/task.go index 22e90f46f..7274e927d 100644 --- a/pkg/services/audit/task.go +++ b/pkg/services/audit/task.go @@ -23,7 +23,7 @@ type Task struct { cnrNodes netmap.ContainerNodes - sgList []*oidSDK.ID + sgList []oidSDK.ID } // WithReporter sets audit report writer. @@ -111,7 +111,7 @@ func (t *Task) ContainerNodes() netmap.ContainerNodes { } // WithStorageGroupList sets list of storage groups from container under audit. -func (t *Task) WithStorageGroupList(sgList []*oidSDK.ID) *Task { +func (t *Task) WithStorageGroupList(sgList []oidSDK.ID) *Task { if t != nil { t.sgList = sgList } @@ -120,6 +120,6 @@ func (t *Task) WithStorageGroupList(sgList []*oidSDK.ID) *Task { } // StorageGroupList returns list of storage groups from container under audit. -func (t *Task) StorageGroupList() []*oidSDK.ID { +func (t *Task) StorageGroupList() []oidSDK.ID { return t.sgList }