From b80ac699d7a43d2b699c82f48686aeb9364fc8aa Mon Sep 17 00:00:00 2001 From: "Fabrizio (Misto) Milo" Date: Tue, 6 Aug 2013 20:00:50 -0700 Subject: [PATCH] remove pointer to map --- store/store.go | 2 +- store/watcher.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/store/store.go b/store/store.go index db159ab62..0f19eb946 100644 --- a/store/store.go +++ b/store/store.go @@ -429,7 +429,7 @@ func (s *Store) TestAndSet(key string, prevValue string, value string, expireTim // The watchHub will send response to the channel when any key under the prefix // changes [since the sinceIndex if given] func (s *Store) AddWatcher(prefix string, watcher *Watcher, sinceIndex uint64) error { - return s.watcher.addWatcher(prefix, watcher, sinceIndex, s.ResponseStartIndex, s.Index, &s.ResponseMap) + return s.watcher.addWatcher(prefix, watcher, sinceIndex, s.ResponseStartIndex, s.Index, s.ResponseMap) } // This function should be created as a go routine to delete the key-value pair diff --git a/store/watcher.go b/store/watcher.go index dfd91774a..57de318ba 100644 --- a/store/watcher.go +++ b/store/watcher.go @@ -36,14 +36,14 @@ func NewWatcher() *Watcher { // Add a watcher to the watcherHub func (w *WatcherHub) addWatcher(prefix string, watcher *Watcher, sinceIndex uint64, - responseStartIndex uint64, currentIndex uint64, resMap *map[string]*Response) error { + responseStartIndex uint64, currentIndex uint64, resMap map[string]*Response) error { prefix = path.Clean("/" + prefix) if sinceIndex != 0 && sinceIndex >= responseStartIndex { for i := sinceIndex; i <= currentIndex; i++ { if checkResponse(prefix, i, resMap) { - watcher.C <- (*resMap)[strconv.FormatUint(i, 10)] + watcher.C <- resMap[strconv.FormatUint(i, 10)] return nil } } @@ -65,9 +65,9 @@ func (w *WatcherHub) addWatcher(prefix string, watcher *Watcher, sinceIndex uint } // Check if the response has what we are watching -func checkResponse(prefix string, index uint64, resMap *map[string]*Response) bool { +func checkResponse(prefix string, index uint64, resMap map[string]*Response) bool { - resp, ok := (*resMap)[strconv.FormatUint(index, 10)] + resp, ok := resMap[strconv.FormatUint(index, 10)] if !ok { // not storage system command