From 9cd8441dd5083a5a0bd02f47218cb8c323a2849b Mon Sep 17 00:00:00 2001
From: Evgenii Stratonikov <evgeniy@morphbits.ru>
Date: Fri, 4 Nov 2022 17:50:44 +0300
Subject: [PATCH] [#1732] pilorama: Fill parent mark correctly

Signed-off-by: Evgenii Stratonikov <evgeniy@morphbits.ru>
---
 pkg/local_object_storage/pilorama/boltdb.go   |  2 +-
 .../pilorama/forest_test.go                   | 61 +++++++++++++++++++
 2 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/pkg/local_object_storage/pilorama/boltdb.go b/pkg/local_object_storage/pilorama/boltdb.go
index 6a7edd330..8faf05bfd 100644
--- a/pkg/local_object_storage/pilorama/boltdb.go
+++ b/pkg/local_object_storage/pilorama/boltdb.go
@@ -351,8 +351,8 @@ func (t *boltForest) do(lb *bbolt.Bucket, b *bbolt.Bucket, key []byte, op *LogMo
 	shouldPut := !t.isAncestor(b, key, op.Child, op.Parent)
 
 	currParent := b.Get(parentKey(key, op.Child))
+	op.HasOld = currParent != nil
 	if currParent != nil { // node is already in tree
-		op.HasOld = true
 		op.Old.Parent = binary.LittleEndian.Uint64(currParent)
 		if err := op.Old.Meta.FromBytes(b.Get(metaKey(key, op.Child))); err != nil {
 			return err
diff --git a/pkg/local_object_storage/pilorama/forest_test.go b/pkg/local_object_storage/pilorama/forest_test.go
index 90a3c11e9..4144a5f48 100644
--- a/pkg/local_object_storage/pilorama/forest_test.go
+++ b/pkg/local_object_storage/pilorama/forest_test.go
@@ -551,6 +551,67 @@ func TestApplyTricky1(t *testing.T) {
 	}
 }
 
+func TestApplyTricky2(t *testing.T) {
+	// Apply operations in the reverse order and then insert an operation in the middle
+	// so that previous "old" parent becomes invalid.
+	ops := []Move{
+		{
+			Parent: 10000,
+			Meta:   Meta{Time: 100},
+			Child:  5,
+		},
+		{
+			Parent: 3,
+			Meta:   Meta{Time: 80},
+			Child:  5,
+		},
+		{
+			Parent: 5,
+			Meta:   Meta{Time: 40},
+			Child:  3,
+		},
+		{
+			Parent: 5,
+			Meta:   Meta{Time: 60},
+			Child:  1,
+		},
+		{
+			Parent: 1,
+			Meta:   Meta{Time: 90},
+			Child:  2,
+		},
+		{
+			Parent: 0,
+			Meta:   Meta{Time: 10},
+			Child:  5,
+		},
+	}
+
+	expected := []struct{ child, parent Node }{
+		{5, 10_000},
+		{3, 5},
+		{2, 1},
+		{1, 5},
+	}
+
+	treeID := "version"
+	d := CIDDescriptor{CID: cidtest.ID(), Position: 0, Size: 1}
+	for i := range providers {
+		t.Run(providers[i].name, func(t *testing.T) {
+			s := providers[i].construct(t)
+			for i := range ops {
+				require.NoError(t, s.TreeApply(d, treeID, &ops[i]))
+			}
+
+			for i := range expected {
+				_, parent, err := s.TreeGetMeta(d.CID, treeID, expected[i].child)
+				require.NoError(t, err)
+				require.Equal(t, expected[i].parent, parent)
+			}
+		})
+	}
+}
+
 func TestForest_ApplyRandom(t *testing.T) {
 	for i := range providers {
 		t.Run(providers[i].name, func(t *testing.T) {