mcmurphy/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#1621] pilorama: Remove Timestamp field from nodeInfo

Browse source 
It is already present in `Meta`.

Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
Signed-off-by: Evgenii Stratonikov <evgeniy@morphbits.ru>
This commit is contained in:
Evgenii Stratonikov 2022-07-22 13:02:28 +03:00 committed by Anton Nikiforov
parent 1044adbe94
commit e1c3bdbfa6
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/local_object_storage/pilorama/forest_test.go
View file

@ -859,7 +859,7 @@ func testTreeGetByPath(t *testing.T, s Forest) {
single := mf.treeMap[cid.String()+"/"+treeID] single := mf.treeMap[cid.String()+"/"+treeID]
t.Run("test meta", func(t *testing.T) { t.Run("test meta", func(t *testing.T) {
for i := 0; i < 6; i++ { for i := 0; i < 6; i++ {
require.Equal(t, uint64(i), single.infoMap[Node(i+1)].Timestamp) require.Equal(t, uint64(i), single.infoMap[Node(i+1)].Meta.Time)
} }
}) })
} }

9
pkg/local_object_storage/pilorama/inmemory.go
View file

@ -2,9 +2,8 @@ package pilorama
// nodeInfo couples parent and metadata. // nodeInfo couples parent and metadata.
type nodeInfo struct { type nodeInfo struct {
Parent Node Parent Node
Meta Meta Meta Meta
Timestamp Timestamp
} }
// state represents state being replicated. // state represents state being replicated.
@ -98,7 +97,7 @@ func (s *state) do(op *Move) LogMove {
} }
if !ok { if !ok {
p.Timestamp = op.Time p.Meta.Time = op.Time
} else { } else {
s.removeChild(op.Child, p.Parent) s.removeChild(op.Child, p.Parent)
} }
@ -206,7 +205,7 @@ func (t tree) get(attr string, path []string, latest bool) []Node {
fileName := string(info.Meta.GetAttr(attr)) fileName := string(info.Meta.GetAttr(attr))
if fileName == path[len(path)-1] { if fileName == path[len(path)-1] {
if latest { if latest {
if info.Timestamp >= lastTs { if info.Meta.Time >= lastTs {
nodes = append(nodes[:0], children[i]) nodes = append(nodes[:0], children[i])
} }
} else { } else {