opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-10-25 02:16:56 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1797 from rht/fix/cat

Browse Source 
Add context to coreunix.Cat argument
This commit is contained in:
Juan Benet
2015-10-08 02:59:52 -07:00
parent bb8e231be1 6ae0973e1f
commit b415e0618b
8 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/commands/cat.go
View File

@ -67,7 +67,7 @@ func cat(ctx context.Context, node *core.IpfsNode, paths []string) ([]io.Reader,
readers := make([]io.Reader, 0, len(paths))
length := uint64(0)
for _, fpath := range paths {
read, err := coreunix.Cat(node, fpath)
read, err := coreunix.Cat(ctx, node, fpath)
if err != nil {
return nil, 0, err
}

7
core/coreunix/cat.go
View File

@ -1,16 +1,17 @@
package coreunix
import (
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
core "github.com/ipfs/go-ipfs/core"
path "github.com/ipfs/go-ipfs/path"
uio "github.com/ipfs/go-ipfs/unixfs/io"
)
func Cat(n *core.IpfsNode, pstr string) (*uio.DagReader, error) {
func Cat(ctx context.Context, n *core.IpfsNode, pstr string) (*uio.DagReader, error) {
p := path.FromString(pstr)
dagNode, err := n.Resolver.ResolvePath(n.Context(), p)
dagNode, err := n.Resolver.ResolvePath(ctx, p)
if err != nil {
return nil, err
}
return uio.NewDagReader(n.Context(), dagNode, n.DAG)
return uio.NewDagReader(ctx, dagNode, n.DAG)
}

2
fuse/readonly/ipfs_test.go
View File

@ -168,7 +168,7 @@ func TestIpfsStressRead(t *testing.T) {
t.Fatal(err)
}
read, err := coreunix.Cat(nd, item)
read, err := coreunix.Cat(nd.Context(), nd, item)
if err != nil {
t.Fatal(err)
}

2
test/integration/addcat_test.go
View File

@ -138,7 +138,7 @@ func DirectAddCat(data []byte, conf testutil.LatencyConfig) error {
return err
}
readerCatted, err := coreunix.Cat(catter, added)
readerCatted, err := coreunix.Cat(ctx, catter, added)
if err != nil {
return err
}

2
test/integration/bench_cat_test.go
View File

@ -84,7 +84,7 @@ func benchCat(b *testing.B, data []byte, conf testutil.LatencyConfig) error {
}
b.StartTimer()
readerCatted, err := coreunix.Cat(catter, added)
readerCatted, err := coreunix.Cat(ctx, catter, added)
if err != nil {
return err
}

2
test/integration/grandcentral_test.go
View File

@ -62,7 +62,7 @@ func RunSupernodeBootstrappedAddCat(data []byte, conf testutil.LatencyConfig) er
return err
}
readerCatted, err := coreunix.Cat(catter, keyAdded)
readerCatted, err := coreunix.Cat(ctx, catter, keyAdded)
if err != nil {
return err
}

2
test/integration/three_legged_cat_test.go
View File

@ -117,7 +117,7 @@ func RunThreeLeggedCat(data []byte, conf testutil.LatencyConfig) error {
return err
}
readerCatted, err := coreunix.Cat(catter, added)
readerCatted, err := coreunix.Cat(ctx, catter, added)
if err != nil {
return err
}

2
test/supernode_client/main.go
View File

@ -199,7 +199,7 @@ func runFileCattingWorker(ctx context.Context, n *core.IpfsNode) error {
"localPeer": n.Identity,
}
}))
if r, err := coreunix.Cat(n, k); err != nil {
if r, err := coreunix.Cat(ctx, n, k); err != nil {
e.Done()
log.Printf("failed to cat file. seed: %d #%d key: %s err: %s", *seed, i, k, err)
} else {