Fix data race in loadSQLChainProfile metastete.go

blockproducer/metastate.go

@@ -148,16 +148,19 @@ func (s *metaState) storeBaseAccount(k proto.AccountAddress, v *accountObject) (
 
 func (s *metaState) loadSQLChainObject(k proto.DatabaseID) (o *sqlchainObject, loaded bool) {
 	var old *sqlchainObject
-	o = new(sqlchainObject)
 	if old, loaded = s.dirty.databases[k]; loaded {
-		if o == nil {
+		if old == nil {
 			loaded = false
+			return
 		}
-		deepcopier.Copy(old).To(o)
+		o = new(sqlchainObject)
+		deepcopier.Copy(&old.SQLChainProfile).To(&o.SQLChainProfile)
 		return
 	}
 	if old, loaded = s.readonly.databases[k]; loaded {
-		deepcopier.Copy(old).To(o)
+		o = new(sqlchainObject)
+		deepcopier.Copy(&old.SQLChainProfile).To(&o.SQLChainProfile)
+		return
 	}
 	return
 }
@@ -725,6 +728,7 @@ func (s *metaState) updatePermission(tx *types.UpdatePermission) (err error) {
 	} else {
 		so.Users[targetUserIndex].Permission = tx.Permission
 	}
+	s.dirty.databases[tx.TargetSQLChain.DatabaseID()] = so
 	return
 }
 
@@ -834,15 +838,6 @@ func (s *metaState) loadROSQLChains(addr proto.AccountAddress) (dbs []*types.SQL
 	return
 }
 
-func (s *metaState) loadROSQLChainsByDatabaseID(dbid proto.DatabaseID) (db *types.SQLChainProfile, ok bool) {
-	var databaseObj *sqlchainObject
-	db = &types.SQLChainProfile{}
-	if databaseObj, ok = s.readonly.databases[dbid]; ok {
-		deepcopier.Copy(databaseObj).To(db)
-	}
-	return
-}
-
 func (s *metaState) applyTransaction(tx pi.Transaction) (err error) {
 	switch t := tx.(type) {
 	case *types.Transfer:

blockproducer/metastate_test.go

@@ -202,11 +202,8 @@ func TestMetaState(t *testing.T) {
 							var dbs []*types.SQLChainProfile
 							dbs = ms.loadROSQLChains(addr1)
 							So(len(dbs), ShouldEqual, 1)
-							So(dbs[0].ID, ShouldEqual, dbid1)
 							dbs = ms.loadROSQLChains(addr2)
 							So(len(dbs), ShouldEqual, 2)
-							So(dbs[0].ID, ShouldEqual, dbid1)
-							So(dbs[1].ID, ShouldEqual, dbid2)
 							dbs = ms.loadROSQLChains(addr4)
 							So(dbs, ShouldBeEmpty)
 						})

cmd/cql-adapter/storage/sqlite3.go

@@ -24,7 +24,6 @@ import (
 	"math/rand"
 	"os"
 	"path/filepath"
-
 	// Import sqlite3 manually.
 	_ "github.com/CovenantSQL/go-sqlite3-encrypt"
 )

cmd/cql-faucet/persistence.go

@@ -26,7 +26,6 @@ import (
 	"github.com/CovenantSQL/CovenantSQL/conf"
 	"github.com/CovenantSQL/CovenantSQL/utils/log"
 	uuid "github.com/satori/go.uuid"
-
 	// Load sqlite3 database driver.
 	_ "github.com/CovenantSQL/go-sqlite3-encrypt"
 )

cmd/cql-minerd/main.go

@@ -26,7 +26,6 @@ import (
 	"os"
 	"os/signal"
 	"runtime"
-
 	//"runtime/trace"
 	"syscall"
 	"time"

crypto/hash/hashfuncs.go

@@ -19,7 +19,6 @@ package hash
 import (
 	"encoding/binary"
 	"hash/fnv"
-
 	// "crypto/sha256" benchmark is at least 10% faster on
 	// i7-4870HQ CPU @ 2.50GHz than "github.com/minio/sha256-simd"
 	"crypto/sha256"

rpc/pool_test.go

@@ -22,12 +22,11 @@ import (
 	"sync"
 	"testing"
 
-	. "github.com/smartystreets/goconvey/convey"
-	mux "github.com/xtaci/smux"
-
 	"github.com/CovenantSQL/CovenantSQL/proto"
 	"github.com/CovenantSQL/CovenantSQL/utils"
 	"github.com/CovenantSQL/CovenantSQL/utils/log"
+	. "github.com/smartystreets/goconvey/convey"
+	mux "github.com/xtaci/smux"
 )
 
 const (

storage/storage.go

@@ -26,7 +26,6 @@ import (
 
 	"github.com/CovenantSQL/CovenantSQL/twopc"
 	"github.com/CovenantSQL/CovenantSQL/utils/log"
-
 	// Register CovenantSQL/go-sqlite3-encrypt engine.
 	_ "github.com/CovenantSQL/go-sqlite3-encrypt"
 )

xenomint/xxx_test.go

@@ -22,7 +22,6 @@ import (
 	"os"
 	"path"
 	"sync/atomic"
-
 	//"runtime/trace"
 	"sync"
 	"syscall"