cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #4811 from filecoin-project/raulk/badger-ctx-tests

Browse Source 
badger blockstore: minor improvements
This commit is contained in:
Jakub Sztandera 2020-11-12 03:55:31 +01:00 committed by GitHub
commit a389622ac6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/blockstore/badger/blockstore.go
View File

@ -359,7 +359,11 @@ func (b *Blockstore) AllKeysChan(ctx context.Context) (<-chan cid.Cid, error) {
buf = make([]byte, reqlen) buf = make([]byte, reqlen)
} }
if n, err := base32.RawStdEncoding.Decode(buf, k); err == nil { if n, err := base32.RawStdEncoding.Decode(buf, k); err == nil {
ch <- cid.NewCidV1(cid.Raw, buf[:n]) select {
case ch <- cid.NewCidV1(cid.Raw, buf[:n]):
case <-ctx.Done():
return
}
} else { } else {
log.Warnf("failed to decode key %s in badger AllKeysChan; err: %s", k, err) log.Warnf("failed to decode key %s in badger AllKeysChan; err: %s", k, err)
} }

3
lib/blockstore/badger/blockstore_test_suite.go
View File

@ -219,6 +219,9 @@ func (s *Suite) TestReopenPutGet(t *testing.T) {
fetched, err := bs.Get(orig.Cid()) fetched, err := bs.Get(orig.Cid())
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, orig.RawData(), fetched.RawData()) require.Equal(t, orig.RawData(), fetched.RawData())
err = bs.(io.Closer).Close()
require.NoError(t, err)
} }
func (s *Suite) TestPutMany(t *testing.T) { func (s *Suite) TestPutMany(t *testing.T) {