Merge pull request #6539 from ipfs/fix/writable-gateway

fix and improve the writable gateway
ipfs · Jul 27, 2019 · 641d9f6 · 641d9f6
2 parents 1fdff60 + 50a1113
commit 641d9f6
Show file tree

Hide file tree

Showing 11 changed files with 176 additions and 181 deletions.
diff --git a/core/commands/dht.go b/core/commands/dht.go
@@ -326,7 +326,7 @@ func provideKeysRec(ctx context.Context, r routing.Routing, dserv ipld.DAGServic
 	for _, c := range cids {
 		kset := cid.NewSet()
 
-		err := dag.WalkParallel(ctx, dag.GetLinksDirect(dserv), c, kset.Visit)
+		err := dag.Walk(ctx, dag.GetLinksDirect(dserv), c, kset.Visit)
 		if err != nil {
 			return err
 		}

diff --git a/core/commands/pin.go b/core/commands/pin.go
@@ -503,11 +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.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
-				}
+			err := dag.Walk(req.Context, dag.GetLinksWithDAG(n.DAG), k, func(c cid.Cid) bool {
 				r := keys.Visit(c)
 				if r {
 					err := emit(&PinLsOutputWrapper{
@@ -521,7 +517,7 @@ func pinLsAll(req *cmds.Request, typeStr string, n *core.IpfsNode, emit func(val
 					}
 				}
 				return r
-			})
+			}, dag.SkipRoot(), dag.Concurrent())
 
 			if visitErr != nil {
 				return visitErr

diff --git a/core/coreapi/dht.go b/core/coreapi/dht.go
@@ -114,7 +114,7 @@ func provideKeysRec(ctx context.Context, r routing.Routing, bs blockstore.Blocks
 	go func() {
 		dserv := dag.NewDAGService(blockservice.New(bs, offline.Exchange(bs)))
 		for _, c := range cids {
-			err := dag.WalkParallel(ctx, dag.GetLinksDirect(dserv), c, provided.Visitor(ctx))
+			err := dag.Walk(ctx, dag.GetLinksDirect(dserv), c, provided.Visitor(ctx))
 			if err != nil {
 				errCh <- err
 			}

diff --git a/core/coreapi/pin.go b/core/coreapi/pin.go
@@ -209,12 +209,10 @@ 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.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.
-					return depth == 0 || set.Visit(c)
-				},
+			err := merkledag.Walk(
+				ctx, merkledag.GetLinksWithDAG(api.dag), k,
+				set.Visit,
+				merkledag.SkipRoot(), merkledag.Concurrent(),
 			)
 			if err != nil {
 				return nil, err

diff --git a/core/corehttp/gateway.go b/core/corehttp/gateway.go
@@ -87,7 +87,7 @@ func GatewayOption(writable bool, paths ...string) ServeOption {
 				"X-Stream-Output",
 			}, headers[ACEHeadersName]...))
 
-		gateway := newGatewayHandler(n, GatewayConfig{
+		gateway := newGatewayHandler(GatewayConfig{
 			Headers:      headers,
 			Writable:     writable,
 			PathPrefixes: cfg.Gateway.PathPrefixes,