Merge branch 'develop'

bootstrap.sh

@@ -6,5 +6,5 @@ go get github.com/siddontang/go-log/log
 go get github.com/siddontang/go-snappy/snappy
 go get github.com/siddontang/copier
 
-go get github.com/syndtr/goleveldb/leveldb
+go get github.com/siddontang/goleveldb/leveldb
 go get github.com/influxdb/gomdb

store/goleveldb/batch.go

@@ -1,7 +1,7 @@
 package goleveldb
 
 import (
-	"github.com/syndtr/goleveldb/leveldb"
+	"github.com/siddontang/goleveldb/leveldb"
 )
 
 type WriteBatch struct {

store/goleveldb/db.go

@@ -1,11 +1,11 @@
 package goleveldb
 
 import (
+	"github.com/siddontang/goleveldb/leveldb"
+	"github.com/siddontang/goleveldb/leveldb/cache"
+	"github.com/siddontang/goleveldb/leveldb/filter"
+	"github.com/siddontang/goleveldb/leveldb/opt"
 	"github.com/siddontang/ledisdb/store/driver"
-	"github.com/syndtr/goleveldb/leveldb"
-	"github.com/syndtr/goleveldb/leveldb/cache"
-	"github.com/syndtr/goleveldb/leveldb/filter"
-	"github.com/syndtr/goleveldb/leveldb/opt"
 	"os"
 )
 

store/goleveldb/iterator.go

@@ -1,7 +1,7 @@
 package goleveldb
 
 import (
-	"github.com/syndtr/goleveldb/leveldb/iterator"
+	"github.com/siddontang/goleveldb/leveldb/iterator"
 )
 
 type Iterator struct {

store/mdb/batch.go

@@ -15,6 +15,9 @@ func (w *WriteBatch) Close() error {
 }
 
 func (w *WriteBatch) Put(key, value []byte) {
+	if value == nil {
+		value = []byte{}
+	}
 	w.wb = append(w.wb, Write{key, value})
 }
 

store/store_test.go

@@ -37,6 +37,16 @@ func testSimple(db *DB, t *testing.T) {
 	} else if v != nil {
 		t.Fatal("must nil")
 	}
+
+	if err := db.Put(key, nil); err != nil {
+		t.Fatal(err)
+	}
+
+	if v, err := db.Get(key); err != nil {
+		t.Fatal(err)
+	} else if !bytes.Equal(v, []byte{}) {
+		t.Fatal("must empty")
+	}
 }
 
 func testBatch(db *DB, t *testing.T) {
@@ -80,7 +90,27 @@ func testBatch(db *DB, t *testing.T) {
 		t.Fatal(string(v))
 	}
 
+	wb.Put(key1, nil)
+	wb.Put(key2, []byte{})
+
+	if err := wb.Commit(); err != nil {
+		t.Fatal(err)
+	}
+
+	if v, err := db.Get(key1); err != nil {
+		t.Fatal(err)
+	} else if !bytes.Equal(v, []byte{}) {
+		t.Fatal("must empty")
+	}
+
+	if v, err := db.Get(key2); err != nil {
+		t.Fatal(err)
+	} else if !bytes.Equal(v, []byte{}) {
+		t.Fatal("must empty")
+	}
+
 	db.Delete(key1)
+	db.Delete(key2)
 }
 
 func checkIterator(it *RangeLimitIterator, cv ...int) error {