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

[#840] shard: Return only physically stored objects from List

Browse source 
`List` method of `Shard` must return only physically stored objects.

Use `AddPhyFilter` to select only phy objects.

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2021-09-24 18:04:00 +03:00 committed by Alex Vanin
parent b97cdbea9e
commit 02e6df683a
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/local_object_storage/shard/list.go
View file

@ -19,6 +19,7 @@ func (r *ListContainersRes) Containers() []*cid.ID {
return r.containers return r.containers
} }
// List returns all objects physically stored in the Shard.
func (s *Shard) List() (*SelectRes, error) { func (s *Shard) List() (*SelectRes, error) {
lst, err := s.metaBase.Containers() lst, err := s.metaBase.Containers()
if err != nil { if err != nil {
@ -27,6 +28,7 @@ func (s *Shard) List() (*SelectRes, error) {
res := new(SelectRes) res := new(SelectRes)
filters := object.NewSearchFilters() filters := object.NewSearchFilters()
filters.AddPhyFilter()
for i := range lst { for i := range lst {
ids, err := meta.Select(s.metaBase, lst[i], filters) // consider making List in metabase ids, err := meta.Select(s.metaBase, lst[i], filters) // consider making List in metabase

6
pkg/local_object_storage/shard/list_test.go
View file

@ -40,6 +40,11 @@ func testShardList(t *testing.T, sh *shard.Shard) {
obj := generateRawObjectWithCID(t, cid) obj := generateRawObjectWithCID(t, cid)
addPayload(obj, 1<<2) addPayload(obj, 1<<2)
// add parent as virtual object, it must be ignored in List()
parent := generateRawObjectWithCID(t, cid)
obj.SetParentID(parent.Object().ID())
obj.SetParent(parent.Object().SDK())
objs[obj.Object().Address().String()] = 0 objs[obj.Object().Address().String()] = 0
putPrm.WithObject(obj.Object()) putPrm.WithObject(obj.Object())
@ -53,7 +58,6 @@ func testShardList(t *testing.T, sh *shard.Shard) {
require.NoError(t, err) require.NoError(t, err)
for _, objID := range res.AddressList() { for _, objID := range res.AddressList() {
i, ok := objs[objID.String()] i, ok := objs[objID.String()]
require.True(t, ok) require.True(t, ok)
require.Equal(t, 0, i) require.Equal(t, 0, i)