opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-23 05:35:58 +08:00
Code Issues Projects Releases Wiki Activity

blockstore.ErrNotFound, and proper wantlist sorting

Browse Source
This commit is contained in:
Jeromy
2014-12-10 23:01:56 +00:00
committed by Juan Batiz-Benet
parent e7bba82dcb
commit 50aa37fec4
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
blocks/blockstore/blockstore.go
View File

@ -6,14 +6,16 @@ import (
"errors" "errors"
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash" mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
blocks "github.com/jbenet/go-ipfs/blocks" blocks "github.com/jbenet/go-ipfs/blocks"
u "github.com/jbenet/go-ipfs/util" u "github.com/jbenet/go-ipfs/util"
) )
var ValueTypeMismatch = errors.New("The retrieved value is not a Block") var ValueTypeMismatch = errors.New("The retrieved value is not a Block")
var ErrNotFound = errors.New("blockstore: block not found")
// Blockstore wraps a ThreadSafeDatastore // Blockstore wraps a ThreadSafeDatastore
type Blockstore interface { type Blockstore interface {
DeleteBlock(u.Key) error DeleteBlock(u.Key) error
@ -34,6 +36,9 @@ type blockstore struct {
func (bs *blockstore) Get(k u.Key) (*blocks.Block, error) { func (bs *blockstore) Get(k u.Key) (*blocks.Block, error) {
maybeData, err := bs.datastore.Get(k.DsKey()) maybeData, err := bs.datastore.Get(k.DsKey())
if err == ds.ErrNotFound {
return nil, ErrNotFound
}
if err != nil { if err != nil {
return nil, err return nil, err
} }

4
blockservice/blockservice.go
View File

@ -8,8 +8,6 @@ import (
"fmt" "fmt"
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
blocks "github.com/jbenet/go-ipfs/blocks" blocks "github.com/jbenet/go-ipfs/blocks"
"github.com/jbenet/go-ipfs/blocks/blockstore" "github.com/jbenet/go-ipfs/blocks/blockstore"
exchange "github.com/jbenet/go-ipfs/exchange" exchange "github.com/jbenet/go-ipfs/exchange"
@ -67,7 +65,7 @@ func (s *BlockService) GetBlock(ctx context.Context, k u.Key) (*blocks.Block, er
return block, nil return block, nil
// TODO be careful checking ErrNotFound. If the underlying // TODO be careful checking ErrNotFound. If the underlying
// implementation changes, this will break. // implementation changes, this will break.
} else if err == ds.ErrNotFound && s.Exchange != nil { } else if err == blockstore.ErrNotFound && s.Exchange != nil {
log.Debug("Blockservice: Searching bitswap.") log.Debug("Blockservice: Searching bitswap.")
blk, err := s.Exchange.GetBlock(ctx, k) blk, err := s.Exchange.GetBlock(ctx, k)
if err != nil { if err != nil {

2
exchange/bitswap/strategy/strategy.go
View File

@ -68,7 +68,7 @@ func (s *strategist) getSendableBlocks(wantlist *wl.Wantlist, bs bstore.Blocksto
var outblocks []*blocks.Block var outblocks []*blocks.Block
for _, e := range wantlist.Entries() { for _, e := range wantlist.Entries() {
block, err := bs.Get(e.Value) block, err := bs.Get(e.Value)
if err == u.ErrNotFound { if err == bstore.ErrNotFound {
continue continue
} }
if err != nil { if err != nil {

2
exchange/bitswap/wantlist/wantlist.go
View File

@ -43,7 +43,7 @@ type entrySlice []*Entry
func (es entrySlice) Len() int { return len(es) } func (es entrySlice) Len() int { return len(es) }
func (es entrySlice) Swap(i, j int) { es[i], es[j] = es[j], es[i] } func (es entrySlice) Swap(i, j int) { es[i], es[j] = es[j], es[i] }
func (es entrySlice) Less(i, j int) bool { return es[i].Priority < es[j].Priority } func (es entrySlice) Less(i, j int) bool { return es[i].Priority > es[j].Priority }
func (w *Wantlist) Entries() []*Entry { func (w *Wantlist) Entries() []*Entry {
var es entrySlice var es entrySlice