Fix missing reassign of dirty ID

Author: vitalif

internal/buffer_list.go

@@ -441,6 +441,7 @@ func (l *BufferList) insertOrAppend(offset uint64, data []byte, state BufferStat
 		l.at.Delete(prev.offset + prev.length)
 		allocated += prev.Append(data)
 		prev.onDisk = false
+		prev.dirtyID = dirtyID
 		l.at.Set(prev.offset+prev.length, prev)
 		l.queue(prev)
 		return
@@ -645,7 +646,7 @@ func (l *BufferList) DebugCheckHoles(s string) {
 	if len(h) > 0 {
 		fmt.Printf("Debug: holes detected%s: %#v\n", s, h)
 		l.at.Ascend(0, func(end uint64, b *FileBuffer) bool {
-			fmt.Printf("%x-%x s%v z%v\n", b.offset, b.offset+b.length, b.state, b.zero)
+			fmt.Printf("%x-%x s%v z%v d%v\n", b.offset, b.offset+b.length, b.state, b.zero, b.dirtyID)
 			return true
 		})
 		panic("holes detected")

internal/buffer_list_test.go

@@ -36,13 +36,32 @@ func (s *BufferListTest) TestAppend(t *C) {
 	t.Assert(l.Add(0, filledBuf(1024, 1), BUF_DIRTY, true), Equals, int64(1024))
 	t.Assert(l.Add(1024, filledBuf(1024, 2), BUF_DIRTY, true), Equals, int64(1024))
 	t.Assert(l.Add(1536, filledBuf(1024, 3), BUF_DIRTY, true), Equals, int64(1024))
-	data, _, err := l.GetData(0, 2048, true)
+	data, ids, err := l.GetData(0, 2048, true)
 	t.Assert(err, IsNil)
+	t.Assert(len(ids), Equals, 1)
+	var oldId uint64
+	for id := range ids {
+		oldId = id
+	}
 	t.Assert(len(data), Equals, 1)
 	t.Assert(len(data[0]), Equals, 2048)
 	t.Assert(data[0][0:1024], DeepEquals, filledBuf(1024, 1))
 	t.Assert(data[0][1024:1536], DeepEquals, filledBuf(512, 2))
 	t.Assert(data[0][1536:], DeepEquals, filledBuf(512, 3))
+	// Then modify one of the buffers again and recheck that dirty ID is reassigned
+	t.Assert(l.Add(1536, filledBuf(1024, 4), BUF_DIRTY, true), Equals, int64(0))
+	l.SetState(0, 2048, ids, BUF_CLEAN)
+	data, ids, err = l.GetData(0, 2048, true)
+	t.Assert(len(ids), Equals, 1)
+	for id := range ids {
+		t.Assert(id, Not(Equals), oldId)
+	}
+	t.Assert(err, IsNil)
+	t.Assert(len(data), Equals, 1)
+	t.Assert(len(data[0]), Equals, 2048)
+	t.Assert(data[0][0:1024], DeepEquals, filledBuf(1024, 1))
+	t.Assert(data[0][1024:1536], DeepEquals, filledBuf(512, 2))
+	t.Assert(data[0][1536:], DeepEquals, filledBuf(512, 4))
 }
 
 func (s *BufferListTest) TestGetHoles(t *C) {