From 511b5f782acfe51312198ba0f16ef7dd3e23f9fe Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Thu, 10 Dec 2020 16:24:27 +0300 Subject: [PATCH] [#242] engine: Support ContainerID argument in shard selects Signed-off-by: Alex Vanin --- pkg/local_object_storage/engine/select.go | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkg/local_object_storage/engine/select.go b/pkg/local_object_storage/engine/select.go index 3801ff055..c76f8bdbc 100644 --- a/pkg/local_object_storage/engine/select.go +++ b/pkg/local_object_storage/engine/select.go @@ -1,6 +1,7 @@ package engine import ( + "github.com/nspcc-dev/neofs-api-go/pkg/container" "github.com/nspcc-dev/neofs-api-go/pkg/object" "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" "go.uber.org/zap" @@ -8,6 +9,7 @@ import ( // SelectPrm groups the parameters of Select operation. type SelectPrm struct { + cid *container.ID filters object.SearchFilters } @@ -16,6 +18,15 @@ type SelectRes struct { addrList []*object.Address } +// WithContainerID is a Select option to set the container id to search in. +func (p *SelectPrm) WithContainerID(cid *container.ID) *SelectPrm { + if p != nil { + p.cid = cid + } + + return p +} + // WithFilters is a Select option to set the object filters. func (p *SelectPrm) WithFilters(fs object.SearchFilters) *SelectPrm { if p != nil { @@ -38,6 +49,7 @@ func (e *StorageEngine) Select(prm *SelectPrm) (*SelectRes, error) { uniqueMap := make(map[string]struct{}) shPrm := new(shard.SelectPrm). + WithContainerID(prm.cid). WithFilters(prm.filters) e.iterateOverUnsortedShards(func(sh *shard.Shard) (stop bool) { @@ -104,8 +116,9 @@ func (e *StorageEngine) List(limit uint64) (*SelectRes, error) { } // Select selects objects from local storage using provided filters. -func Select(storage *StorageEngine, fs object.SearchFilters) ([]*object.Address, error) { +func Select(storage *StorageEngine, cid *container.ID, fs object.SearchFilters) ([]*object.Address, error) { res, err := storage.Select(new(SelectPrm). + WithContainerID(cid). WithFilters(fs), ) if err != nil {