Merge pull request #442 from MichaelMure/cache-lock

Michael Muré created 5 years ago

Cache lock

Change summary

cache/bug_cache.go | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)

Detailed changes

cache/bug_cache.go

@@ -2,6 +2,7 @@ package cache
 
 import (
 	"fmt"
+	"sync"
 	"time"
 
 	"github.com/MichaelMure/git-bug/bug"
@@ -15,8 +16,10 @@ var ErrNoMatchingOp = fmt.Errorf("no matching operation found")
 //
 // 1. Provide a higher level API to use than the raw API from Bug.
 // 2. Maintain an up to date Snapshot available.
+// 3. Deal with concurrency.
 type BugCache struct {
 	repoCache *RepoCache
+	mu        sync.RWMutex
 	bug       *bug.WithSnapshot
 }
 
@@ -28,10 +31,14 @@ func NewBugCache(repoCache *RepoCache, b *bug.Bug) *BugCache {
 }
 
 func (c *BugCache) Snapshot() *bug.Snapshot {
+	c.mu.RLock()
+	defer c.mu.RUnlock()
 	return c.bug.Snapshot()
 }
 
 func (c *BugCache) Id() entity.Id {
+	c.mu.RLock()
+	defer c.mu.RUnlock()
 	return c.bug.Id()
 }
 
@@ -41,6 +48,8 @@ func (c *BugCache) notifyUpdated() error {
 
 // ResolveOperationWithMetadata will find an operation that has the matching metadata
 func (c *BugCache) ResolveOperationWithMetadata(key string, value string) (entity.Id, error) {
+	c.mu.RLock()
+	defer c.mu.RUnlock()
 	// preallocate but empty
 	matching := make([]entity.Id, 0, 5)
 
@@ -78,8 +87,10 @@ func (c *BugCache) AddCommentWithFiles(message string, files []repository.Hash)
 }
 
 func (c *BugCache) AddCommentRaw(author *IdentityCache, unixTime int64, message string, files []repository.Hash, metadata map[string]string) (*bug.AddCommentOperation, error) {
+	c.mu.Lock()
 	op, err := bug.AddCommentWithFiles(c.bug, author.Identity, unixTime, message, files)
 	if err != nil {
+		c.mu.Unlock()
 		return nil, err
 	}
 
@@ -87,6 +98,8 @@ func (c *BugCache) AddCommentRaw(author *IdentityCache, unixTime int64, message
 		op.SetMetadata(key, value)
 	}
 
+	c.mu.Unlock()
+
 	return op, c.notifyUpdated()
 }
 
@@ -100,8 +113,10 @@ func (c *BugCache) ChangeLabels(added []string, removed []string) ([]bug.LabelCh
 }
 
 func (c *BugCache) ChangeLabelsRaw(author *IdentityCache, unixTime int64, added []string, removed []string, metadata map[string]string) ([]bug.LabelChangeResult, *bug.LabelChangeOperation, error) {
+	c.mu.Lock()
 	changes, op, err := bug.ChangeLabels(c.bug, author.Identity, unixTime, added, removed)
 	if err != nil {
+		c.mu.Unlock()
 		return changes, nil, err
 	}
 
@@ -109,6 +124,8 @@ func (c *BugCache) ChangeLabelsRaw(author *IdentityCache, unixTime int64, added
 		op.SetMetadata(key, value)
 	}
 
+	c.mu.Unlock()
+
 	err = c.notifyUpdated()
 	if err != nil {
 		return nil, nil, err
@@ -127,8 +144,10 @@ func (c *BugCache) ForceChangeLabels(added []string, removed []string) (*bug.Lab
 }
 
 func (c *BugCache) ForceChangeLabelsRaw(author *IdentityCache, unixTime int64, added []string, removed []string, metadata map[string]string) (*bug.LabelChangeOperation, error) {
+	c.mu.Lock()
 	op, err := bug.ForceChangeLabels(c.bug, author.Identity, unixTime, added, removed)
 	if err != nil {
+		c.mu.Unlock()
 		return nil, err
 	}
 
@@ -136,6 +155,7 @@ func (c *BugCache) ForceChangeLabelsRaw(author *IdentityCache, unixTime int64, a
 		op.SetMetadata(key, value)
 	}
 
+	c.mu.Unlock()
 	err = c.notifyUpdated()
 	if err != nil {
 		return nil, err
@@ -154,8 +174,10 @@ func (c *BugCache) Open() (*bug.SetStatusOperation, error) {
 }
 
 func (c *BugCache) OpenRaw(author *IdentityCache, unixTime int64, metadata map[string]string) (*bug.SetStatusOperation, error) {
+	c.mu.Lock()
 	op, err := bug.Open(c.bug, author.Identity, unixTime)
 	if err != nil {
+		c.mu.Unlock()
 		return nil, err
 	}
 
@@ -163,6 +185,7 @@ func (c *BugCache) OpenRaw(author *IdentityCache, unixTime int64, metadata map[s
 		op.SetMetadata(key, value)
 	}
 
+	c.mu.Unlock()
 	return op, c.notifyUpdated()
 }
 
@@ -176,8 +199,10 @@ func (c *BugCache) Close() (*bug.SetStatusOperation, error) {
 }
 
 func (c *BugCache) CloseRaw(author *IdentityCache, unixTime int64, metadata map[string]string) (*bug.SetStatusOperation, error) {
+	c.mu.Lock()
 	op, err := bug.Close(c.bug, author.Identity, unixTime)
 	if err != nil {
+		c.mu.Unlock()
 		return nil, err
 	}
 
@@ -185,6 +210,7 @@ func (c *BugCache) CloseRaw(author *IdentityCache, unixTime int64, metadata map[
 		op.SetMetadata(key, value)
 	}
 
+	c.mu.Unlock()
 	return op, c.notifyUpdated()
 }
 
@@ -198,8 +224,10 @@ func (c *BugCache) SetTitle(title string) (*bug.SetTitleOperation, error) {
 }
 
 func (c *BugCache) SetTitleRaw(author *IdentityCache, unixTime int64, title string, metadata map[string]string) (*bug.SetTitleOperation, error) {
+	c.mu.Lock()
 	op, err := bug.SetTitle(c.bug, author.Identity, unixTime, title)
 	if err != nil {
+		c.mu.Unlock()
 		return nil, err
 	}
 
@@ -207,6 +235,7 @@ func (c *BugCache) SetTitleRaw(author *IdentityCache, unixTime int64, title stri
 		op.SetMetadata(key, value)
 	}
 
+	c.mu.Unlock()
 	return op, c.notifyUpdated()
 }
 
@@ -220,8 +249,10 @@ func (c *BugCache) EditCreateComment(body string) (*bug.EditCommentOperation, er
 }
 
 func (c *BugCache) EditCreateCommentRaw(author *IdentityCache, unixTime int64, body string, metadata map[string]string) (*bug.EditCommentOperation, error) {
+	c.mu.Lock()
 	op, err := bug.EditCreateComment(c.bug, author.Identity, unixTime, body)
 	if err != nil {
+		c.mu.Unlock()
 		return nil, err
 	}
 
@@ -229,6 +260,7 @@ func (c *BugCache) EditCreateCommentRaw(author *IdentityCache, unixTime int64, b
 		op.SetMetadata(key, value)
 	}
 
+	c.mu.Unlock()
 	return op, c.notifyUpdated()
 }
 
@@ -242,8 +274,10 @@ func (c *BugCache) EditComment(target entity.Id, message string) (*bug.EditComme
 }
 
 func (c *BugCache) EditCommentRaw(author *IdentityCache, unixTime int64, target entity.Id, message string, metadata map[string]string) (*bug.EditCommentOperation, error) {
+	c.mu.Lock()
 	op, err := bug.EditComment(c.bug, author.Identity, unixTime, target, message)
 	if err != nil {
+		c.mu.Unlock()
 		return nil, err
 	}
 
@@ -251,6 +285,7 @@ func (c *BugCache) EditCommentRaw(author *IdentityCache, unixTime int64, target
 		op.SetMetadata(key, value)
 	}
 
+	c.mu.Unlock()
 	return op, c.notifyUpdated()
 }
 
@@ -264,30 +299,41 @@ func (c *BugCache) SetMetadata(target entity.Id, newMetadata map[string]string)
 }
 
 func (c *BugCache) SetMetadataRaw(author *IdentityCache, unixTime int64, target entity.Id, newMetadata map[string]string) (*bug.SetMetadataOperation, error) {
+	c.mu.Lock()
 	op, err := bug.SetMetadata(c.bug, author.Identity, unixTime, target, newMetadata)
 	if err != nil {
+		c.mu.Unlock()
 		return nil, err
 	}
 
+	c.mu.Unlock()
 	return op, c.notifyUpdated()
 }
 
 func (c *BugCache) Commit() error {
+	c.mu.Lock()
 	err := c.bug.Commit(c.repoCache.repo)
 	if err != nil {
+		c.mu.Unlock()
 		return err
 	}
+	c.mu.Unlock()
 	return c.notifyUpdated()
 }
 
 func (c *BugCache) CommitAsNeeded() error {
+	c.mu.Lock()
 	err := c.bug.CommitAsNeeded(c.repoCache.repo)
 	if err != nil {
+		c.mu.Unlock()
 		return err
 	}
+	c.mu.Unlock()
 	return c.notifyUpdated()
 }
 
 func (c *BugCache) NeedCommit() bool {
+	c.mu.RLock()
+	defer c.mu.RUnlock()
 	return c.bug.NeedCommit()
 }