Merge pull request #59 from tendermint/develop

Develop

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.3.2 (October 2, 2017)
+
+BUG FIXES:
+
+- [autofile] fix AutoFile.Sync() to open file if it's been closed
+- [db] fix MemDb.Close() to not empty the database (ie. its just a noop)
+
+
 ## 0.3.1 (September 22, 2017)
 
 BUG FIXES:

autofile/autofile.go

@@ -103,6 +103,11 @@ func (af *AutoFile) Sync() error {
 	af.mtx.Lock()
 	defer af.mtx.Unlock()
 
+	if af.file == nil {
+		if err := af.openFile(); err != nil {
+			return err
+		}
+	}
 	return af.file.Sync()
 }
 

db/mem_db.go

@@ -52,9 +52,11 @@ func (db *MemDB) DeleteSync(key []byte) {
 }
 
 func (db *MemDB) Close() {
-	db.mtx.Lock()
-	defer db.mtx.Unlock()
-	db = nil
+	// Close is a noop since for an in-memory
+	// database, we don't have a destination
+	// to flush contents to nor do we want
+	// any data loss on invoking Close()
+	// See the discussion in https://github.com/tendermint/tmlibs/pull/56
 }
 
 func (db *MemDB) Print() {

db/mem_db_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestMemDbIterator(t *testing.T) {
@@ -26,3 +27,22 @@ func TestMemDbIterator(t *testing.T) {
 	}
 	assert.Equal(t, i, len(db.db), "iterator didnt cover whole db")
 }
+
+func TestMemDBClose(t *testing.T) {
+	db := NewMemDB()
+	copyDB := func(orig map[string][]byte) map[string][]byte {
+		copy := make(map[string][]byte)
+		for k, v := range orig {
+			copy[k] = v
+		}
+		return copy
+	}
+	k, v := []byte("foo"), []byte("bar")
+	db.Set(k, v)
+	require.Equal(t, db.Get(k), v, "expecting a successful get")
+	copyBefore := copyDB(db.db)
+	db.Close()
+	require.Equal(t, db.Get(k), v, "Close is a noop, expecting a successful get")
+	copyAfter := copyDB(db.db)
+	require.Equal(t, copyBefore, copyAfter, "Close is a noop and shouldn't modify any internal data")
+}

version/version.go

@@ -1,3 +1,3 @@
 package version
 
-const Version = "0.3.1"
+const Version = "0.3.2"