opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-09-10 05:52:20 +08:00
Code Issues Projects Releases Wiki Activity

provide simple wrapper methods for AllKeysRange

Browse Source 
@jbenet @whyrusleeping

was the 1<<16 intentional? replaced the raw methods with wrappers.
This commit is contained in:
Brian Tiger Chow
2015-01-23 22:03:05 -08:00
parent bb49b0191a
commit be41444a9e
6 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
blocks/blockstore/blockstore.go
View File

@ -32,8 +32,11 @@ type Blockstore interface {
Get(u.Key) (*blocks.Block, error)
Put(*blocks.Block) error
AllKeys(ctx context.Context, offset int, limit int) ([]u.Key, error)
AllKeysChan(ctx context.Context, offset int, limit int) (<-chan u.Key, error)
AllKeys(ctx context.Context) ([]u.Key, error)
AllKeysChan(ctx context.Context) (<-chan u.Key, error)
AllKeysRange(ctx context.Context, offset int, limit int) ([]u.Key, error)
AllKeysRangeChan(ctx context.Context, offset int, limit int) (<-chan u.Key, error)
}
func NewBlockstore(d ds.ThreadSafeDatastore) Blockstore {
@ -83,14 +86,22 @@ func (s *blockstore) DeleteBlock(k u.Key) error {
return s.datastore.Delete(k.DsKey())
}
// AllKeys runs a query for keys from the blockstore.
func (bs *blockstore) AllKeys(ctx context.Context) ([]u.Key, error) {
return bs.AllKeysRange(ctx, 0, 0)
}
func (bs *blockstore) AllKeysChan(ctx context.Context) (<-chan u.Key, error) {
return bs.AllKeysRangeChan(ctx, 0, 0)
}
// AllKeysRange runs a query for keys from the blockstore.
// this is very simplistic, in the future, take dsq.Query as a param?
// if offset and limit are 0, they are ignored.
//
// AllKeys respects context
func (bs *blockstore) AllKeys(ctx context.Context, offset int, limit int) ([]u.Key, error) {
// AllKeysRange respects context
func (bs *blockstore) AllKeysRange(ctx context.Context, offset int, limit int) ([]u.Key, error) {
ch, err := bs.AllKeysChan(ctx, offset, limit)
ch, err := bs.AllKeysRangeChan(ctx, offset, limit)
if err != nil {
return nil, err
}
@ -102,12 +113,12 @@ func (bs *blockstore) AllKeys(ctx context.Context, offset int, limit int) ([]u.K
return keys, nil
}
// AllKeys runs a query for keys from the blockstore.
// AllKeysRangeChan runs a query for keys from the blockstore.
// this is very simplistic, in the future, take dsq.Query as a param?
// if offset and limit are 0, they are ignored.
//
// AllKeys respects context
func (bs *blockstore) AllKeysChan(ctx context.Context, offset int, limit int) (<-chan u.Key, error) {
// AllKeysRangeChan respects context
func (bs *blockstore) AllKeysRangeChan(ctx context.Context, offset int, limit int) (<-chan u.Key, error) {
// KeysOnly, because that would be _a lot_ of data.
q := dsq.Query{KeysOnly: true, Offset: offset, Limit: limit}

6
blocks/blockstore/blockstore_test.go
View File

@ -67,7 +67,7 @@ func TestAllKeysSimple(t *testing.T) {
bs, keys := newBlockStoreWithKeys(t, nil, 100)
ctx := context.Background()
keys2, err := bs.AllKeys(ctx, 0, 0)
keys2, err := bs.AllKeys(ctx)
if err != nil {
t.Fatal(err)
}
@ -83,7 +83,7 @@ func TestAllKeysOffsetAndLimit(t *testing.T) {
bs, _ := newBlockStoreWithKeys(t, nil, N)
ctx := context.Background()
keys3, err := bs.AllKeys(ctx, N/3, N/3)
keys3, err := bs.AllKeysRange(ctx, N/3, N/3)
if err != nil {
t.Fatal(err)
}
@ -107,7 +107,7 @@ func TestAllKeysRespectsContext(t *testing.T) {
getKeys := func(ctx context.Context) {
started <- struct{}{}
_, err := bs.AllKeys(ctx, 0, 0) // once without cancelling
_, err := bs.AllKeys(ctx) // once without cancelling
if err != nil {
errors <- err
}

16
blocks/blockstore/write_cache.go
View File

@ -46,10 +46,18 @@ func (w *writecache) Put(b *blocks.Block) error {
return w.blockstore.Put(b)
}
func (w *writecache) AllKeys(ctx context.Context, offset int, limit int) ([]u.Key, error) {
return w.blockstore.AllKeys(ctx, offset, limit)
func (w *writecache) AllKeys(ctx context.Context) ([]u.Key, error) {
return w.blockstore.AllKeysRange(ctx, 0, 0)
}
func (w *writecache) AllKeysChan(ctx context.Context, offset int, limit int) (<-chan u.Key, error) {
return w.blockstore.AllKeysChan(ctx, offset, limit)
func (w *writecache) AllKeysChan(ctx context.Context) (<-chan u.Key, error) {
return w.blockstore.AllKeysRangeChan(ctx, 0, 0)
}
func (w *writecache) AllKeysRange(ctx context.Context, offset int, limit int) ([]u.Key, error) {
return w.blockstore.AllKeysRange(ctx, offset, limit)
}
func (w *writecache) AllKeysRangeChan(ctx context.Context, offset int, limit int) (<-chan u.Key, error) {
return w.blockstore.AllKeysRangeChan(ctx, offset, limit)
}