Unverified 提交 986d569a 作者: Whyrusleeping 提交者: GitHub

Merge pull request #4714 from ipfs/fix/revert-cat-session

dont use bitswap session for cat just yet
...@@ -6,7 +6,6 @@ import ( ...@@ -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 ...@@ -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 {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论