TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 96 Pull requests 4 Projects Releases 1 Activity Actions

[#241] object/search: Set container ID parameter of storage engine call

Browse source 
Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2020-12-10 17:38:45 +03:00 committed by Alex Vanin
parent 611a29f682
commit 627012e4fe
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/services/object/search/exec.go
View file

@ -39,10 +39,6 @@ func (exec *execCtx) prepare() {
if _, ok := exec.prm.writer.(*uniqueIDWriter); !ok { if _, ok := exec.prm.writer.(*uniqueIDWriter); !ok {
exec.prm.writer = newUniqueAddressWriter(exec.prm.writer) exec.prm.writer = newUniqueAddressWriter(exec.prm.writer)
} }
fs := exec.prm.SearchFilters()
fs.AddObjectContainerIDFilter(objectSDK.MatchStringEqual, exec.containerID())
exec.prm.WithSearchFilters(fs)
} }
func (exec *execCtx) setLogger(l *logger.Logger) { func (exec *execCtx) setLogger(l *logger.Logger) {

3
pkg/services/object/search/util.go
View file

@ -82,7 +82,8 @@ func (c *clientWrapper) searchObjects(exec *execCtx) ([]*objectSDK.ID, error) {
func (e *storageEngineWrapper) search(exec *execCtx) ([]*objectSDK.ID, error) { func (e *storageEngineWrapper) search(exec *execCtx) ([]*objectSDK.ID, error) {
r, err := (*engine.StorageEngine)(e).Select(new(engine.SelectPrm). r, err := (*engine.StorageEngine)(e).Select(new(engine.SelectPrm).
WithFilters(exec.searchFilters()), WithFilters(exec.searchFilters()).
WithContainerID(exec.containerID()),
) )
if err != nil { if err != nil {
return nil, err return nil, err