Skip to content

Commit

Permalink
badgerdb: fix to work with latest badgerdb
Browse files Browse the repository at this point in the history
  • Loading branch information
loongy committed Jul 10, 2019
1 parent 33784b0 commit 5f4eb2a
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 10 deletions.
21 changes: 15 additions & 6 deletions badgerdb/badgerdb.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,17 @@ func (bdb *bdb) Insert(key string, value []byte) error {
}

// Get implements the `db.Iterable` interface
func (bdb *bdb) Get(key string) (value []byte, err error) {
func (bdb *bdb) Get(key string) (ret []byte, err error) {
err = bdb.db.View(func(txn *badger.Txn) error {
item, err := txn.Get([]byte(key))
if err != nil {
return err
}
value, err = item.Value()
return err
return item.Value(func(val []byte) error {
ret = make([]byte, len(val))
copy(ret, val)
return nil
})
})
if err == badger.ErrKeyNotFound {
err = db.ErrNotFound
Expand Down Expand Up @@ -116,9 +119,15 @@ func (iter *Iterator) Key() (string, error) {
}

// Value implements the `db.Iterator` interface.
func (iter *Iterator) Value() ([]byte, error) {
func (iter *Iterator) Value() (ret []byte, err error) {
if iter.isClosed || !iter.iter.Valid() {
return nil, db.ErrIndexOutOfRange
err = db.ErrIndexOutOfRange
return
}
return iter.iter.Item().Value()
err = iter.iter.Item().Value(func(val []byte) error {
ret = make([]byte, len(val))
copy(ret, val)
return nil
})
return
}
8 changes: 4 additions & 4 deletions badgerdb/badgerdb_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ import (
"os/exec"
"testing/quick"

"github.com/dgraph-io/badger"
"github.com/renproject/kv/db"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
. "github.com/renproject/kv/badgerdb"

"github.com/dgraph-io/badger"
"github.com/renproject/kv/db"
)

var _ = Describe("BadgerDB implementation of key-value Store", func() {

initDB := func() *badger.DB {
Expect(exec.Command("mkdir", "-p", ".badgerdb").Run()).NotTo(HaveOccurred())
opts := badger.DefaultOptions
opts := badger.DefaultOptions("./.badgerdb")
opts.Dir = "./.badgerdb"
opts.ValueDir = "./.badgerdb"
db, err := badger.Open(opts)
Expand Down

0 comments on commit 5f4eb2a

Please sign in to comment.