remove nonNilBytes()

cleveldb_batch.go

@@ -28,7 +28,7 @@ func (b *cLevelDBBatch) Set(key, value []byte) error {
 	if b.batch == nil {
 		return errBatchClosed
 	}
-	b.batch.Put(nonNilBytes(key), nonNilBytes(value))
+	b.batch.Put(key, value)
 	return nil
 }
 
@@ -40,7 +40,7 @@ func (b *cLevelDBBatch) Delete(key []byte) error {
 	if b.batch == nil {
 		return errBatchClosed
 	}
-	b.batch.Delete(nonNilBytes(key))
+	b.batch.Delete(key)
 	return nil
 }
 

goleveldb.go

@@ -43,7 +43,6 @@ func (db *GoLevelDB) Get(key []byte) ([]byte, error) {
 	if len(key) == 0 {
 		return nil, errKeyEmpty
 	}
-	key = nonNilBytes(key)
 	res, err := db.db.Get(key, nil)
 	if err != nil {
 		if err == errors.ErrNotFound {

memdb.go

@@ -34,12 +34,12 @@ func (i *item) Less(other btree.Item) bool {
 
 // newKey creates a new key item.
 func newKey(key []byte) *item {
-	return &item{key: nonNilBytes(key)}
+	return &item{key: key}
 }
 
 // newPair creates a new pair item.
 func newPair(key, value []byte) *item {
-	return &item{key: nonNilBytes(key), value: nonNilBytes(value)}
+	return &item{key: key, value: value}
 }
 
 // MemDB is an in-memory database backend using a B-tree for storage.

util.go

@@ -5,15 +5,6 @@ import (
 	"os"
 )
 
-// We defensively turn nil keys or values into []byte{} for
-// most operations.
-func nonNilBytes(bz []byte) []byte {
-	if bz == nil {
-		return []byte{}
-	}
-	return bz
-}
-
 func cp(bz []byte) (ret []byte) {
 	ret = make([]byte, len(bz))
 	copy(ret, bz)