Merge pull request #159 from vmarkovtsev/master

Fix the corrupted merge bug in hibernation mode

Author: vmarkovtsev

internal/core/forks.go

@@ -743,7 +743,6 @@ func insertHibernateBoot(plan []runAction, hibernationDistance int) []runAction
 				Items:  hibernates,
 			})
 		}
-
 	}
 	return newPlan
 }

internal/core/pipeline.go

@@ -679,6 +679,38 @@ func (pipeline *Pipeline) Run(commits []*object.Commit) (map[LeafPipelineItem]in
 	var newestTime int64
 	runTimePerItem := map[string]float64{}
 
+	isMerge := func(index int, commit plumbing.Hash) bool {
+		match := false
+		// look for the same hash backward
+		for i := index - 1; i > 0; i-- {
+			switch plan[i].Action {
+			case runActionHibernate, runActionBoot:
+				continue
+			case runActionCommit:
+				match = plan[i].Commit.Hash == commit
+				fallthrough
+			default:
+				i = 0
+			}
+		}
+		if match {
+			return true
+		}
+		// look for the same hash forward
+		for i := index + 1; i < len(plan); i++ {
+			switch plan[i].Action {
+			case runActionHibernate, runActionBoot:
+				continue
+			case runActionCommit:
+				match = plan[i].Commit.Hash == commit
+				fallthrough
+			default:
+				i = len(plan)
+			}
+		}
+		return match
+	}
+
 	commitIndex := 0
 	for index, step := range plan {
 		onProgress(index+1, progressSteps)
@@ -692,14 +724,9 @@ func (pipeline *Pipeline) Run(commits []*object.Commit) (map[LeafPipelineItem]in
 		switch step.Action {
 		case runActionCommit:
 			state := map[string]interface{}{
-				DependencyCommit: step.Commit,
-				DependencyIndex:  commitIndex,
-				DependencyIsMerge: (index > 0 &&
-					plan[index-1].Action == runActionCommit &&
-					plan[index-1].Commit.Hash == step.Commit.Hash) ||
-					(index < (len(plan)-1) &&
-						plan[index+1].Action == runActionCommit &&
-						plan[index+1].Commit.Hash == step.Commit.Hash),
+				DependencyCommit:  step.Commit,
+				DependencyIndex:   commitIndex,
+				DependencyIsMerge: isMerge(index, step.Commit.Hash),
 			}
 			for _, item := range branches[firstItem] {
 				startTime := time.Now()

internal/rbtree/rbtree.go

@@ -53,13 +53,14 @@ func (allocator Allocator) Used() int {
 }
 
 // Clone copies an existing RBTree allocator.
-func (allocator *Allocator) Clone() *Allocator {
+func (allocator Allocator) Clone() *Allocator {
 	if allocator.storage == nil {
 		panic("cannot clone a hibernated allocator")
 	}
 	newAllocator := &Allocator{
-		storage: make([]node, len(allocator.storage), cap(allocator.storage)),
-		gaps:    map[uint32]bool{},
+		HibernationThreshold: allocator.HibernationThreshold,
+		storage:              make([]node, len(allocator.storage), cap(allocator.storage)),
+		gaps:                 map[uint32]bool{},
 	}
 	copy(newAllocator.storage, allocator.storage)
 	for key, val := range allocator.gaps {

internal/rbtree/rbtree_test.go

@@ -443,6 +443,7 @@ func TestAllocatorHibernateBootThreshold(t *testing.T) {
 	alloc := NewAllocator()
 	alloc.malloc()
 	alloc.HibernationThreshold = 3
+	assert.Equal(t, 3, alloc.Clone().HibernationThreshold)
 	alloc.Hibernate()
 	assert.Equal(t, alloc.hibernatedStorageLen, 0)
 	alloc.Boot()

leaves/burndown.go

@@ -447,17 +447,28 @@ func (analyser *BurndownAnalysis) Hibernate() error {
 			return err
 		}
 		analyser.hibernatedFileName = file.Name()
-		file.Close()
-		analyser.fileAllocator.Serialize(analyser.hibernatedFileName)
+		err = file.Close()
+		if err != nil {
+			analyser.hibernatedFileName = ""
+			return err
+		}
+		err = analyser.fileAllocator.Serialize(analyser.hibernatedFileName)
+		if err != nil {
+			analyser.hibernatedFileName = ""
+			return err
+		}
 	}
 	return nil
 }
 
 // Boot decompresses the bound RBTree memory with the files.
 func (analyser *BurndownAnalysis) Boot() error {
 	if analyser.hibernatedFileName != "" {
-		analyser.fileAllocator.Deserialize(analyser.hibernatedFileName)
-		err := os.Remove(analyser.hibernatedFileName)
+		err := analyser.fileAllocator.Deserialize(analyser.hibernatedFileName)
+		if err != nil {
+			return err
+		}
+		err = os.Remove(analyser.hibernatedFileName)
 		if err != nil {
 			return err
 		}