Merge pull request #788 from OpenBazaar/lock

Revert back to using a regular mutex in the database
OpenBazaar · Dec 11, 2017 · d195a6f · d195a6f
2 parents 9e60aa0 + 23673eb
commit d195a6f
Show file tree

Hide file tree

Showing 39 changed files with 173 additions and 135 deletions.
diff --git a/repo/db/cases.go b/repo/db/cases.go
@@ -13,7 +13,7 @@ import (
 
 type CasesDB struct {
 	db   *sql.DB
-	lock sync.RWMutex
+	lock *sync.Mutex
 }
 
 func (c *CasesDB) Put(caseID string, state pb.OrderState, buyerOpened bool, claim string) error {
@@ -184,8 +184,8 @@ func (c *CasesDB) Delete(orderID string) error {
 }
 
 func (c *CasesDB) GetAll(stateFilter []pb.OrderState, searchTerm string, sortByAscending bool, sortByRead bool, limit int, exclude []string) ([]repo.Case, int, error) {
-	c.lock.RLock()
-	defer c.lock.RUnlock()
+	c.lock.Lock()
+	defer c.lock.Unlock()
 
 	q := query{
 		table:           "cases",
@@ -287,8 +287,8 @@ func (c *CasesDB) GetAll(stateFilter []pb.OrderState, searchTerm string, sortByA
 }
 
 func (c *CasesDB) GetCaseMetadata(caseID string) (buyerContract, vendorContract *pb.RicardianContract, buyerValidationErrors, vendorValidationErrors []string, state pb.OrderState, read bool, timestamp time.Time, buyerOpened bool, claim string, resolution *pb.DisputeResolution, err error) {
-	c.lock.RLock()
-	defer c.lock.RUnlock()
+	c.lock.Lock()
+	defer c.lock.Unlock()
 	stmt, err := c.db.Prepare("select buyerContract, vendorContract, buyerValidationErrors, vendorValidationErrors, state, read, timestamp, buyerOpened, claim, disputeResolution from cases where caseID=?")
 	defer stmt.Close()
 	var buyerCon []byte
@@ -360,8 +360,8 @@ func (c *CasesDB) GetCaseMetadata(caseID string) (buyerContract, vendorContract
 }
 
 func (c *CasesDB) GetPayoutDetails(caseID string) (buyerContract, vendorContract *pb.RicardianContract, buyerPayoutAddress, vendorPayoutAddress string, buyerOutpoints, vendorOutpoints []*pb.Outpoint, state pb.OrderState, err error) {
-	c.lock.RLock()
-	defer c.lock.RUnlock()
+	c.lock.Lock()
+	defer c.lock.Unlock()
 	stmt, err := c.db.Prepare("select buyerContract, vendorContract, buyerPayoutAddress, vendorPayoutAddress, buyerOutpoints, vendorOutpoints, state from cases where caseID=?")
 	var buyerCon []byte
 	var vendorCon []byte
@@ -424,8 +424,8 @@ func (c *CasesDB) GetPayoutDetails(caseID string) (buyerContract, vendorContract
 }
 
 func (c *CasesDB) Count() int {
-	c.lock.RLock()
-	defer c.lock.RUnlock()
+	c.lock.Lock()
+	defer c.lock.Unlock()
 	row := c.db.QueryRow("select Count(*) from cases")
 	var count int
 	row.Scan(&count)

diff --git a/repo/db/cases_test.go b/repo/db/cases_test.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/OpenBazaar/openbazaar-go/pb"
 	"github.com/golang/protobuf/ptypes"
+	"sync"
 )
 
 var casesdb CasesDB
@@ -21,7 +22,8 @@ func init() {
 	conn, _ := sql.Open("sqlite3", ":memory:")
 	initDatabaseTables(conn, "")
 	casesdb = CasesDB{
-		db: conn,
+		db:   conn,
+		lock: new(sync.Mutex),
 	}
 	contract = new(pb.RicardianContract)
 	listing := new(pb.Listing)

diff --git a/repo/db/chat.go b/repo/db/chat.go
@@ -10,7 +10,7 @@ import (
 
 type ChatDB struct {
 	db   *sql.DB
-	lock sync.RWMutex
+	lock *sync.Mutex
 }
 
 func (c *ChatDB) Put(messageId string, peerId string, subject string, message string, timestamp time.Time, read bool, outgoing bool) error {
@@ -55,8 +55,8 @@ func (c *ChatDB) Put(messageId string, peerId string, subject string, message st
 }
 
 func (c *ChatDB) GetConversations() []repo.ChatConversation {
-	c.lock.RLock()
-	defer c.lock.RUnlock()
+	c.lock.Lock()
+	defer c.lock.Unlock()
 	var ret []repo.ChatConversation
 
 	stm := "select distinct peerID from chat where subject='' order by timestamp desc;"
@@ -103,8 +103,8 @@ func (c *ChatDB) GetConversations() []repo.ChatConversation {
 }
 
 func (c *ChatDB) GetMessages(peerID string, subject string, offsetId string, limit int) []repo.ChatMessage {
-	c.lock.RLock()
-	defer c.lock.RUnlock()
+	c.lock.Lock()
+	defer c.lock.Unlock()
 	var ret []repo.ChatMessage
 
 	var peerStm string

diff --git a/repo/db/chat_test.go b/repo/db/chat_test.go
@@ -2,6 +2,7 @@ package db
 
 import (
 	"database/sql"
+	"sync"
 	"testing"
 	"time"
 )
@@ -16,7 +17,8 @@ func setupDB() {
 	conn, _ := sql.Open("sqlite3", ":memory:")
 	initDatabaseTables(conn, "")
 	chdb = ChatDB{
-		db: conn,
+		db:   conn,
+		lock: new(sync.Mutex),
 	}
 }
 

diff --git a/repo/db/coupons.go b/repo/db/coupons.go
@@ -9,7 +9,7 @@ import (
 
 type CouponDB struct {
 	db   *sql.DB
-	lock sync.RWMutex
+	lock *sync.Mutex
 }
 
 func (c *CouponDB) Put(coupons []repo.Coupon) error {
@@ -30,8 +30,8 @@ func (c *CouponDB) Put(coupons []repo.Coupon) error {
 }
 
 func (c *CouponDB) Get(slug string) ([]repo.Coupon, error) {
-	c.lock.RLock()
-	defer c.lock.RUnlock()
+	c.lock.Lock()
+	defer c.lock.Unlock()
 	var stm string
 	stm = "select slug, code, hash from coupons where slug='" + slug + "';"
 	rows, err := c.db.Query(stm)

diff --git a/repo/db/coupons_test.go b/repo/db/coupons_test.go
@@ -3,6 +3,7 @@ package db
 import (
 	"database/sql"
 	"github.com/OpenBazaar/openbazaar-go/repo"
+	"sync"
 	"testing"
 )
 
@@ -12,7 +13,8 @@ func init() {
 	conn, _ := sql.Open("sqlite3", ":memory:")
 	initDatabaseTables(conn, "")
 	coup = CouponDB{
-		db: conn,
+		db:   conn,
+		lock: new(sync.Mutex),
 	}
 }
 

diff --git a/repo/db/db.go b/repo/db/db.go
@@ -36,7 +36,7 @@ type SQLiteDatastore struct {
 	txMetadata      repo.TxMetadata
 	moderatedStores repo.ModeratedStores
 	db              *sql.DB
-	lock            sync.RWMutex
+	lock            *sync.Mutex
 }
 
 func Create(repoPath, password string, testnet bool) (*SQLiteDatastore, error) {
@@ -54,7 +54,7 @@ func Create(repoPath, password string, testnet bool) (*SQLiteDatastore, error) {
 		p := "pragma key='" + password + "';"
 		conn.Exec(p)
 	}
-	var l sync.RWMutex
+	l := new(sync.Mutex)
 	sqliteDB := &SQLiteDatastore{
 		config: &ConfigDB{
 			db:   conn,
@@ -317,7 +317,7 @@ func initDatabaseTables(db *sql.DB, password string) error {
 
 type ConfigDB struct {
 	db   *sql.DB
-	lock sync.RWMutex
+	lock *sync.Mutex
 	path string
 }
 
@@ -356,8 +356,8 @@ func (c *ConfigDB) Init(mnemonic string, identityKey []byte, password string, cr
 }
 
 func (c *ConfigDB) GetMnemonic() (string, error) {
-	c.lock.RLock()
-	defer c.lock.RUnlock()
+	c.lock.Lock()
+	defer c.lock.Unlock()
 	stmt, err := c.db.Prepare("select value from config where key=?")
 	defer stmt.Close()
 	var mnemonic string
@@ -369,8 +369,8 @@ func (c *ConfigDB) GetMnemonic() (string, error) {
 }
 
 func (c *ConfigDB) GetIdentityKey() ([]byte, error) {
-	c.lock.RLock()
-	defer c.lock.RUnlock()
+	c.lock.Lock()
+	defer c.lock.Unlock()
 	stmt, err := c.db.Prepare("select value from config where key=?")
 	if err != nil {
 		return nil, err
@@ -385,8 +385,8 @@ func (c *ConfigDB) GetIdentityKey() ([]byte, error) {
 }
 
 func (c *ConfigDB) GetCreationDate() (time.Time, error) {
-	c.lock.RLock()
-	defer c.lock.RUnlock()
+	c.lock.Lock()
+	defer c.lock.Unlock()
 	var t time.Time
 	stmt, err := c.db.Prepare("select value from config where key=?")
 	if err != nil {
@@ -402,8 +402,8 @@ func (c *ConfigDB) GetCreationDate() (time.Time, error) {
 }
 
 func (c *ConfigDB) IsEncrypted() bool {
-	c.lock.RLock()
-	defer c.lock.RUnlock()
+	c.lock.Lock()
+	defer c.lock.Unlock()
 	pwdCheck := "select count(*) from sqlite_master;"
 	_, err := c.db.Exec(pwdCheck) // Fails if wrong password is entered
 	if err != nil {

diff --git a/repo/db/followers.go b/repo/db/followers.go
@@ -9,7 +9,7 @@ import (
 
 type FollowerDB struct {
 	db   *sql.DB
-	lock sync.RWMutex
+	lock *sync.Mutex
 }
 
 func (f *FollowerDB) Put(follower string, proof []byte) error {
@@ -29,8 +29,8 @@ func (f *FollowerDB) Put(follower string, proof []byte) error {
 }
 
 func (f *FollowerDB) Get(offsetId string, limit int) ([]repo.Follower, error) {
-	f.lock.RLock()
-	defer f.lock.RUnlock()
+	f.lock.Lock()
+	defer f.lock.Unlock()
 	var stm string
 	if offsetId != "" {
 		stm = "select peerID, proof from followers order by rowid desc limit " + strconv.Itoa(limit) + " offset ((select coalesce(max(rowid)+1, 0) from followers)-(select rowid from followers where peerID='" + offsetId + "'))"
@@ -61,17 +61,17 @@ func (f *FollowerDB) Delete(follower string) error {
 }
 
 func (f *FollowerDB) Count() int {
-	f.lock.RLock()
-	defer f.lock.RUnlock()
+	f.lock.Lock()
+	defer f.lock.Unlock()
 	row := f.db.QueryRow("select Count(*) from followers")
 	var count int
 	row.Scan(&count)
 	return count
 }
 
 func (f *FollowerDB) FollowsMe(peerId string) bool {
-	f.lock.RLock()
-	defer f.lock.RUnlock()
+	f.lock.Lock()
+	defer f.lock.Unlock()
 	stmt, err := f.db.Prepare("select peerID from followers where peerID=?")
 	defer stmt.Close()
 	var follower string

diff --git a/repo/db/followers_test.go b/repo/db/followers_test.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"database/sql"
 	"strconv"
+	"sync"
 	"testing"
 )
 
@@ -13,7 +14,8 @@ func init() {
 	conn, _ := sql.Open("sqlite3", ":memory:")
 	initDatabaseTables(conn, "")
 	fdb = FollowerDB{
-		db: conn,
+		db:   conn,
+		lock: new(sync.Mutex),
 	}
 }
 

diff --git a/repo/db/following.go b/repo/db/following.go
@@ -8,7 +8,7 @@ import (
 
 type FollowingDB struct {
 	db   *sql.DB
-	lock sync.RWMutex
+	lock *sync.Mutex
 }
 
 func (f *FollowingDB) Put(follower string) error {
@@ -27,8 +27,8 @@ func (f *FollowingDB) Put(follower string) error {
 }
 
 func (f *FollowingDB) Get(offsetId string, limit int) ([]string, error) {
-	f.lock.RLock()
-	defer f.lock.RUnlock()
+	f.lock.Lock()
+	defer f.lock.Unlock()
 	var stm string
 	if offsetId != "" {
 		stm = "select peerID from following order by rowid desc limit " + strconv.Itoa(limit) + " offset ((select coalesce(max(rowid)+1, 0) from following)-(select rowid from following where peerID='" + offsetId + "'))"
@@ -57,17 +57,17 @@ func (f *FollowingDB) Delete(follower string) error {
 }
 
 func (f *FollowingDB) Count() int {
-	f.lock.RLock()
-	defer f.lock.RUnlock()
+	f.lock.Lock()
+	defer f.lock.Unlock()
 	row := f.db.QueryRow("select Count(*) from following")
 	var count int
 	row.Scan(&count)
 	return count
 }
 
 func (f *FollowingDB) IsFollowing(peerId string) bool {
-	f.lock.RLock()
-	defer f.lock.RUnlock()
+	f.lock.Lock()
+	defer f.lock.Unlock()
 	stmt, err := f.db.Prepare("select peerID from following where peerID=?")
 	defer stmt.Close()
 	var follower string

diff --git a/repo/db/following_test.go b/repo/db/following_test.go
@@ -3,6 +3,7 @@ package db
 import (
 	"database/sql"
 	"strconv"
+	"sync"
 	"testing"
 )
 
@@ -12,7 +13,8 @@ func init() {
 	conn, _ := sql.Open("sqlite3", ":memory:")
 	initDatabaseTables(conn, "")
 	fldb = FollowingDB{
-		db: conn,
+		db:   conn,
+		lock: new(sync.Mutex),
 	}
 }
 

diff --git a/repo/db/inventory.go b/repo/db/inventory.go
@@ -10,7 +10,7 @@ import (
 
 type InventoryDB struct {
 	db   *sql.DB
-	lock sync.RWMutex
+	lock *sync.Mutex
 }
 
 func (i *InventoryDB) Put(slug string, variantIndex int, count int) error {
@@ -35,8 +35,8 @@ func (i *InventoryDB) Put(slug string, variantIndex int, count int) error {
 }
 
 func (i *InventoryDB) GetSpecific(slug string, variantIndex int) (int, error) {
-	i.lock.RLock()
-	defer i.lock.RUnlock()
+	i.lock.Lock()
+	defer i.lock.Unlock()
 	stmt, err := i.db.Prepare("select count from inventory where slug=? and variantIndex=?")
 	if err != nil {
 		return 0, err
@@ -51,8 +51,8 @@ func (i *InventoryDB) GetSpecific(slug string, variantIndex int) (int, error) {
 }
 
 func (i *InventoryDB) Get(slug string) (map[int]int, error) {
-	i.lock.RLock()
-	defer i.lock.RUnlock()
+	i.lock.Lock()
+	defer i.lock.Unlock()
 	ret := make(map[int]int)
 	stmt, err := i.db.Prepare("select slug, variantIndex, count from inventory where slug=?")
 	if err != nil {
@@ -75,8 +75,8 @@ func (i *InventoryDB) Get(slug string) (map[int]int, error) {
 }
 
 func (i *InventoryDB) GetAll() (map[string]map[int]int, error) {
-	i.lock.RLock()
-	defer i.lock.RUnlock()
+	i.lock.Lock()
+	defer i.lock.Unlock()
 
 	ret := make(map[string]map[int]int)
 	stm := "select slug, variantIndex, count from inventory"