Merge pull request #5809 from ipfs/kevina/coreapi-pin-cid-map

coreapi/pin: Use CID's directly in maps instead of converting to string
This commit is contained in:
Steven Allen 2018-11-29 15:57:17 -08:00 committed by GitHub
commit f505e06af7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -116,7 +116,7 @@ func (n *badNode) Err() error {
}
func (api *PinAPI) Verify(ctx context.Context) (<-chan coreiface.PinStatus, error) {
visited := make(map[string]*pinStatus)
visited := make(map[cid.Cid]*pinStatus)
bs := api.node.Blocks.Blockstore()
DAG := merkledag.NewDAGService(bserv.New(bs, offline.Exchange(bs)))
getLinks := merkledag.GetLinksWithDAG(DAG)
@ -124,8 +124,7 @@ func (api *PinAPI) Verify(ctx context.Context) (<-chan coreiface.PinStatus, erro
var checkPin func(root cid.Cid) *pinStatus
checkPin = func(root cid.Cid) *pinStatus {
key := root.String()
if status, ok := visited[key]; ok {
if status, ok := visited[root]; ok {
return status
}
@ -133,7 +132,7 @@ func (api *PinAPI) Verify(ctx context.Context) (<-chan coreiface.PinStatus, erro
if err != nil {
status := &pinStatus{ok: false, cid: root}
status.badNodes = []coreiface.BadPinNode{&badNode{path: coreiface.IpldPath(root), err: err}}
visited[key] = status
visited[root] = status
return status
}
@ -146,7 +145,7 @@ func (api *PinAPI) Verify(ctx context.Context) (<-chan coreiface.PinStatus, erro
}
}
visited[key] = status
visited[root] = status
return status
}
@ -176,11 +175,11 @@ func (p *pinInfo) Type() string {
func (api *PinAPI) pinLsAll(typeStr string, ctx context.Context) ([]coreiface.Pin, error) {
keys := make(map[string]*pinInfo)
keys := make(map[cid.Cid]*pinInfo)
AddToResultKeys := func(keyList []cid.Cid, typeStr string) {
for _, c := range keyList {
keys[c.String()] = &pinInfo{
keys[c] = &pinInfo{
pinType: typeStr,
path: coreiface.IpldPath(c),
}