Merge pull request #6505 from ipfs/fix/slightly-faster-gc

fix: slightly faster gc
ipfs · Jul 25, 2019 · 8417818 · 8417818
2 parents 876d5ba + 41f301a
commit 8417818
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/core/commands/pin.go b/core/commands/pin.go
@@ -503,7 +503,7 @@ func pinLsAll(req *cmds.Request, typeStr string, n *core.IpfsNode, emit func(val
 	if typeStr == "indirect" || typeStr == "all" {
 		for _, k := range n.Pinning.RecursiveKeys() {
 			var visitErr error
-			err := dag.WalkDepth(req.Context, dag.GetLinksWithDAG(n.DAG), k, 0, func(c cid.Cid, depth int) bool {
+			err := dag.WalkParallelDepth(req.Context, dag.GetLinksWithDAG(n.DAG), k, 0, func(c cid.Cid, depth int) bool {
 				if depth == 0 {
 					// skip it without visiting it.
 					return true

diff --git a/core/coreapi/pin.go b/core/coreapi/pin.go
@@ -209,7 +209,7 @@ func (api *PinAPI) pinLsAll(typeStr string, ctx context.Context) ([]coreiface.Pi
 	if typeStr == "indirect" || typeStr == "all" {
 		set := cid.NewSet()
 		for _, k := range api.pinning.RecursiveKeys() {
-			err := merkledag.WalkDepth(
+			err := merkledag.WalkParallelDepth(
 				ctx, merkledag.GetLinksWithDAG(api.dag), k, 0,
 				func(c cid.Cid, depth int) bool {
 					// don't visit the root node, that doesn't count.

diff --git a/pin/gc/gc.go b/pin/gc/gc.go
@@ -171,7 +171,7 @@ func Descendants(ctx context.Context, getLinks dag.GetLinks, set *cid.Set, roots
 
 	for _, c := range roots {
 		// Walk recursively walks the dag and adds the keys to the given set
-		err := dag.Walk(ctx, verifyGetLinks, c, set.Visit)
+		err := dag.WalkParallel(ctx, verifyGetLinks, c, set.Visit)
 
 		if err != nil {
 			err = verboseCidError(err)