fix: skip traversal of links with the same cid (filecoin-project#76)

birdychang · web-flow · commit ecc426107fac · 2023-05-10T19:49:27.000-07:00
* fix: skip traversal of links with the same cid

* fix non-parallel version
diff --git a/diff.go b/diff.go
@@ -263,6 +263,9 @@ func diffNode(ctx context.Context, prevCtx, curCtx *nodeContext, prev, cur *node
 		}
 
 		// Both previous and current have links to diff
+		if prev.links[i].cid == cur.links[i].cid {
+			continue
+		}
 
 		prevSubCtx := &nodeContext{
 			bs:       prevCtx.bs,
diff --git a/diff_parallel.go b/diff_parallel.go
@@ -414,6 +414,9 @@ func (s *diffScheduler) work(ctx context.Context, todo *task, results chan *Chan
 		}
 
 		// Both previous and current have links to diff
+		if prev.links[i].cid == cur.links[i].cid {
+			continue
+		}
 
 		prevSubCtx := &nodeContext{
 			bs:       prevCtx.bs,

Original file line number	Diff line number	Diff line change
`@@ -263,6 +263,9 @@ func diffNode(ctx context.Context, prevCtx, curCtx nodeContext, prev, cur node`
`263`	`263`	`}`
`264`	`264`
`265`	`265`	`// Both previous and current have links to diff`
	`266`	`+ if prev.links[i].cid == cur.links[i].cid {`
	`267`	`+ continue`
	`268`	`+ }`
`266`	`269`
`267`	`270`	`prevSubCtx := &nodeContext{`
`268`	`271`	`bs: prevCtx.bs,`
Original file line number	Diff line number	Diff line change
`@@ -414,6 +414,9 @@ func (s diffScheduler) work(ctx context.Context, todo task, results chan *Chan`
`414`	`414`	`}`
`415`	`415`
`416`	`416`	`// Both previous and current have links to diff`
	`417`	`+ if prev.links[i].cid == cur.links[i].cid {`
	`418`	`+ continue`
	`419`	`+ }`
`417`	`420`
`418`	`421`	`prevSubCtx := &nodeContext{`
`419`	`422`	`bs: prevCtx.bs,`