Next batch of SQL persistence fixes (cadence-workflow#1176)

* All unit tests are passing now
* Switched shard locking to shared mode

common/mocks/ExecutionManager.go

@@ -27,6 +27,20 @@ type ExecutionManager struct {
 	mock.Mock
 }
 
+// GetName provides a mock function with given fields:
+func (_m *ExecutionManager) GetName() string {
+	ret := _m.Called()
+
+	var r0 string
+	if rf, ok := ret.Get(0).(func() string); ok {
+		r0 = rf()
+	} else {
+		r0 = ret.Get(0).(string)
+	}
+
+	return r0
+}
+
 // CreateWorkflowExecution provides a mock function with given fields: request
 func (_m *ExecutionManager) CreateWorkflowExecution(request *persistence.CreateWorkflowExecutionRequest) (*persistence.CreateWorkflowExecutionResponse, error) {
 	ret := _m.Called(request)

common/mocks/HistoryManager.go

@@ -27,6 +27,20 @@ type HistoryManager struct {
 	mock.Mock
 }
 
+// GetName provides a mock function with given fields:
+func (_m *HistoryManager) GetName() string {
+	ret := _m.Called()
+
+	var r0 string
+	if rf, ok := ret.Get(0).(func() string); ok {
+		r0 = rf()
+	} else {
+		r0 = ret.Get(0).(string)
+	}
+
+	return r0
+}
+
 // AppendHistoryEvents provides a mock function with given fields: request
 func (_m *HistoryManager) AppendHistoryEvents(request *persistence.AppendHistoryEventsRequest) (*persistence.AppendHistoryEventsResponse, error) {
 	ret := _m.Called(request)

common/mocks/MetadataManager.go

@@ -28,6 +28,20 @@ type MetadataManager struct {
 	mock.Mock
 }
 
+// GetName provides a mock function with given fields:
+func (_m *MetadataManager) GetName() string {
+	ret := _m.Called()
+
+	var r0 string
+	if rf, ok := ret.Get(0).(func() string); ok {
+		r0 = rf()
+	} else {
+		r0 = ret.Get(0).(string)
+	}
+
+	return r0
+}
+
 // Close provides a mock function with given fields:
 func (_m *MetadataManager) Close() {
 	_m.Called()

common/mocks/ShardManager.go

@@ -28,6 +28,20 @@ type ShardManager struct {
 	mock.Mock
 }
 
+// GetName provides a mock function with given fields:
+func (_m *ShardManager) GetName() string {
+	ret := _m.Called()
+
+	var r0 string
+	if rf, ok := ret.Get(0).(func() string); ok {
+		r0 = rf()
+	} else {
+		r0 = ret.Get(0).(string)
+	}
+
+	return r0
+}
+
 // Close provides a mock function with given fields:
 func (_m *ShardManager) Close() {
 	_m.Called()

common/mocks/TaskManager.go

@@ -28,6 +28,20 @@ type TaskManager struct {
 	mock.Mock
 }
 
+// GetName provides a mock function with given fields:
+func (_m *TaskManager) GetName() string {
+	ret := _m.Called()
+
+	var r0 string
+	if rf, ok := ret.Get(0).(func() string); ok {
+		r0 = rf()
+	} else {
+		r0 = ret.Get(0).(string)
+	}
+
+	return r0
+}
+
 // Close provides a mock function with given fields:
 func (_m *TaskManager) Close() {
 	_m.Called()

common/mocks/VisibilityManager.go

@@ -28,6 +28,20 @@ type VisibilityManager struct {
 	mock.Mock
 }
 
+// GetName provides a mock function with given fields:
+func (_m *VisibilityManager) GetName() string {
+	ret := _m.Called()
+
+	var r0 string
+	if rf, ok := ret.Get(0).(func() string); ok {
+		r0 = rf()
+	} else {
+		r0 = ret.Get(0).(string)
+	}
+
+	return r0
+}
+
 // Close provides a mock function with given fields:
 func (_m *VisibilityManager) Close() {
 	_m.Called()

common/persistence/cassandra/cassandraHelpers.go

@@ -22,17 +22,18 @@ package cassandra
 
 import (
 	"fmt"
+	"github.com/uber/cadence/tools/cassandra"
 	"io/ioutil"
 	"os"
 	"strings"
 
-	"github.com/uber/cadence/common/logging"
-	"github.com/uber/cadence/tools/cassandra"
-
 	"github.com/gocql/gocql"
 	log "github.com/sirupsen/logrus"
+	"github.com/uber/cadence/common/logging"
 )
 
+const cassandraPersistenceName = "cassandra"
+
 // NewCassandraCluster creates a cassandra cluster given comma separated list of clusterHosts
 func NewCassandraCluster(clusterHosts string, port int, user, password, dc string) *gocql.ClusterConfig {
 	var hosts []string

common/persistence/cassandra/cassandraHistoryPersistence.go

@@ -56,8 +56,7 @@ const (
 
 type (
 	cassandraHistoryPersistence struct {
-		session *gocql.Session
-		logger  bark.Logger
+		cassandraStore
 	}
 )
 
@@ -78,7 +77,7 @@ func newHistoryPersistence(cfg config.Cassandra, logger bark.Logger) (p.HistoryS
 		return nil, err
 	}
 
-	return &cassandraHistoryPersistence{session: session, logger: logger}, nil
+	return &cassandraHistoryPersistence{cassandraStore: cassandraStore{session: session, logger: logger}}, nil
 }
 
 // Close gracefully releases the resources held by this object

common/persistence/cassandra/cassandraMetadataPersistence.go

@@ -91,9 +91,8 @@ const (
 
 type (
 	cassandraMetadataPersistence struct {
-		session            *gocql.Session
+		cassandraStore
 		currentClusterName string
-		logger             bark.Logger
 	}
 )
 
@@ -113,9 +112,8 @@ func newMetadataPersistence(cfg config.Cassandra, clusterName string, logger bar
 	}
 
 	return &cassandraMetadataPersistence{
-		session:            session,
+		cassandraStore:     cassandraStore{session: session, logger: logger},
 		currentClusterName: clusterName,
-		logger:             logger,
 	}, nil
 }
 

common/persistence/cassandra/cassandraMetadataPersistenceProxy.go

@@ -53,6 +53,10 @@ func newMetadataManagerProxy(cfg config.Cassandra,
 	return &metadataManagerProxy{metadataMgr: metadataMgr, metadataMgrV2: metadataMgrV2, logger: logger}, nil
 }
 
+func (m *metadataManagerProxy) GetName() string {
+	return cassandraPersistenceName
+}
+
 func (m *metadataManagerProxy) GetDomain(request *p.GetDomainRequest) (*p.GetDomainResponse, error) {
 	// the reason this function does not call the v2 get domain is domain cache will
 	// use the list domain function to get all domain in the v2 table

common/persistence/cassandra/cassandraMetadataPersistenceV2.go

@@ -91,9 +91,8 @@ const (
 
 type (
 	cassandraMetadataPersistenceV2 struct {
-		session            *gocql.Session
+		cassandraStore
 		currentClusterName string
-		logger             bark.Logger
 	}
 )
 
@@ -112,9 +111,8 @@ func newMetadataPersistenceV2(cfg config.Cassandra, currentClusterName string, l
 	}
 
 	return &cassandraMetadataPersistenceV2{
-		session:            session,
+		cassandraStore:     cassandraStore{session: session, logger: logger},
 		currentClusterName: currentClusterName,
-		logger:             logger,
 	}, nil
 }