mutex add string keys

collections.go

@@ -27,7 +27,7 @@ func newMiniCollection(filename string) *MiniCollections {
 
 // Collections creates a new key with an array / slice value.
 func (db *MiniDB) Collections(key string) *MiniCollections {
-	d := db.getOrCreateMutex(key)
+	d := db.getOrCreateMutex("cols_" + key)
 	d.Lock()
 	defer d.Unlock()
 

keys.go

@@ -35,7 +35,7 @@ func newMiniDB(dir, filename string) *MiniDB {
 
 // Key creates a new key in the json.
 func (db *MiniDB) Key(key string) *MiniDB {
-	d := db.getOrCreateMutex(key)
+	d := db.getOrCreateMutex("keys_" + key)
 	d.Lock()
 	defer d.Unlock()
 

values-query.go

@@ -4,21 +4,27 @@ import "errors"
 
 // Update updates the key's value. It returns nil if updated.
 func (db *MiniStore) Update(key string, v interface{}) error {
-	defer db.writeToDB()
+	d := db.getOrCreateMutex("store_update_" + key)
+	d.Lock()
+	defer d.Unlock()
 
 	if _, ok := db.store[key]; !ok {
 		return errors.New("unknown key")
 	}
 
 	db.store[key] = v
 
+	db.writeToDB()
+
 	return nil
 }
 
 // Remove attemps to remove the key from the db if it exists.
 // It returns nil if it is removed
 func (db *MiniStore) Remove(key string) error {
-	defer db.writeToDB()
+	d := db.getOrCreateMutex("store_remove_" + key)
+	d.Lock()
+	defer d.Unlock()
 
 	if _, ok := db.store[key]; !ok {
 		return errors.New("key does not exists")
@@ -27,6 +33,8 @@ func (db *MiniStore) Remove(key string) error {
 	// remove
 	delete(db.store, key)
 
+	db.writeToDB()
+
 	return nil
 }
 

values.go

@@ -3,7 +3,6 @@ package minidb
 import (
 	"encoding/json"
 	"errors"
-	"fmt"
 	"log"
 	"path"
 	"sync"
@@ -29,7 +28,7 @@ func newMiniStore(filename string) *MiniStore {
 
 // Store creates a new key with a given value in the json.
 func (db *MiniDB) Store(key string) *MiniStore {
-	d := db.getOrCreateMutex(key)
+	d := db.getOrCreateMutex("store_" + key)
 	d.Lock()
 	defer d.Unlock()
 
@@ -94,9 +93,7 @@ func (db *MiniStore) Write(v interface{}) error {
 		return err
 	}
 
-	fmt.Println(string(d))
-
-	defer json.Unmarshal(d, &db.store)
+	json.Unmarshal(d, &db.store)
 
 	return write(db.db, d)
 }