opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-29 01:12:24 +08:00
Code Issues Projects Releases Wiki Activity

dont use bitswap session for cat just yet

Browse Source 
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
This commit is contained in:
Jeromy
2018-02-15 16:44:18 -08:00
parent 53af4530ed
commit d01bb650b3
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/coreapi/unixfs.go
View File

@ -6,7 +6,6 @@ import (
coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface" coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
coreunix "github.com/ipfs/go-ipfs/core/coreunix" coreunix "github.com/ipfs/go-ipfs/core/coreunix"
dag "github.com/ipfs/go-ipfs/merkledag"
uio "github.com/ipfs/go-ipfs/unixfs/io" uio "github.com/ipfs/go-ipfs/unixfs/io"
cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid" cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
@ -31,14 +30,14 @@ func (api *UnixfsAPI) Add(ctx context.Context, r io.Reader) (coreiface.Path, err
// Cat returns the data contained by an IPFS or IPNS object(s) at path `p`. // Cat returns the data contained by an IPFS or IPNS object(s) at path `p`.
func (api *UnixfsAPI) Cat(ctx context.Context, p coreiface.Path) (coreiface.Reader, error) { func (api *UnixfsAPI) Cat(ctx context.Context, p coreiface.Path) (coreiface.Reader, error) {
ses := dag.NewSession(ctx, api.node.DAG) dget := api.node.DAG // TODO: use a session here once routing perf issues are resolved
dagnode, err := resolveNode(ctx, ses, api.node.Namesys, p) dagnode, err := resolveNode(ctx, dget, api.node.Namesys, p)
if err != nil { if err != nil {
return nil, err return nil, err
} }
r, err := uio.NewDagReader(ctx, dagnode, ses) r, err := uio.NewDagReader(ctx, dagnode, dget)
if err == uio.ErrIsDir { if err == uio.ErrIsDir {
return nil, coreiface.ErrIsDir return nil, coreiface.ErrIsDir
} else if err != nil { } else if err != nil {