Use RWMutex for ConcurrentStringStringMap and improve test performance.

Author: fancycode

concurrentmap.go

@@ -26,40 +26,40 @@ import (
 )
 
 type ConcurrentStringStringMap struct {
-	sync.Mutex
-	d map[string]string
+	mu sync.RWMutex
+	d  map[string]string
 }
 
 func (m *ConcurrentStringStringMap) Set(key, value string) {
-	m.Lock()
-	defer m.Unlock()
+	m.mu.Lock()
+	defer m.mu.Unlock()
 	if m.d == nil {
 		m.d = make(map[string]string)
 	}
 	m.d[key] = value
 }
 
 func (m *ConcurrentStringStringMap) Get(key string) (string, bool) {
-	m.Lock()
-	defer m.Unlock()
+	m.mu.RLock()
+	defer m.mu.RUnlock()
 	s, found := m.d[key]
 	return s, found
 }
 
 func (m *ConcurrentStringStringMap) Del(key string) {
-	m.Lock()
-	defer m.Unlock()
+	m.mu.Lock()
+	defer m.mu.Unlock()
 	delete(m.d, key)
 }
 
 func (m *ConcurrentStringStringMap) Len() int {
-	m.Lock()
-	defer m.Unlock()
+	m.mu.RLock()
+	defer m.mu.RUnlock()
 	return len(m.d)
 }
 
 func (m *ConcurrentStringStringMap) Clear() {
-	m.Lock()
-	defer m.Unlock()
+	m.mu.Lock()
+	defer m.mu.Unlock()
 	m.d = nil
 }

concurrentmap_test.go

@@ -86,8 +86,11 @@ func TestConcurrentStringStringMap(t *testing.T) {
 			for y := 0; y < count; y = y + 1 {
 				value := rnd + "-" + strconv.Itoa(y)
 				m.Set(key, value)
-				if v, found := m.Get(key); !assert.True(found, "Expected entry for key %s", key) ||
-					!assert.Equal(value, v, "Unexpected value for key %s", key) {
+				if v, found := m.Get(key); !found {
+					assert.True(found, "Expected entry for key %s", key)
+					return
+				} else if v != value {
+					assert.Equal(value, v, "Unexpected value for key %s", key)
 					return
 				}
 			}