carpawell/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#222] Update Select method in storage engine

Browse source 
Signed-off-by: Alex Vanin <alexey@nspcc.ru>
This commit is contained in:
Alex Vanin 2020-12-01 13:54:29 +03:00
parent 25486194b9
commit f470022594
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkg/local_object_storage/engine/select.go
View file

@ -35,11 +35,12 @@ func (r *SelectRes) AddressList() []*object.Address {
// Returns any error encountered that did not allow to completely select the objects. // Returns any error encountered that did not allow to completely select the objects.
func (e *StorageEngine) Select(prm *SelectPrm) (*SelectRes, error) { func (e *StorageEngine) Select(prm *SelectPrm) (*SelectRes, error) {
addrList := make([]*object.Address, 0) addrList := make([]*object.Address, 0)
uniqueMap := make(map[string]struct{})
shPrm := new(shard.SelectPrm). shPrm := new(shard.SelectPrm).
WithFilters(prm.filters) WithFilters(prm.filters)
e.iterateOverSortedShards(nil, func(_ int, sh *shard.Shard) (stop bool) { e.iterateOverUnsortedShards(func(sh *shard.Shard) (stop bool) {
res, err := sh.Select(shPrm) res, err := sh.Select(shPrm)
if err != nil { if err != nil {
// TODO: smth wrong with shard, need to be processed // TODO: smth wrong with shard, need to be processed
@ -48,7 +49,12 @@ func (e *StorageEngine) Select(prm *SelectPrm) (*SelectRes, error) {
zap.String("error", err.Error()), zap.String("error", err.Error()),
) )
} else { } else {
addrList = append(addrList, res.AddressList()...) for _, addr := range res.AddressList() { // save only unique values
if _, ok := uniqueMap[addr.String()]; !ok {
uniqueMap[addr.String()] = struct{}{}
addrList = append(addrList, addr)
}
}
} }
return false return false