move cross DC domain replication config from 0.4 to 0.5 (#542)

cadence-workflow · Feb 1, 2018 · d429f53 · d429f53
1 parent 952e86d
commit d429f53
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/common/cluster/metadata.go b/common/cluster/metadata.go
@@ -30,7 +30,7 @@ type (
 		GetAllClusterNames() map[string]bool
 	}
 
-	MetadataImpl struct {
+	metadataImpl struct {
 		// initialFailoverVersion is the initial failover version
 		initialFailoverVersion int64
 		// failoverVersionIncrement is the increment of each cluster failover version
@@ -67,7 +67,7 @@ func NewMetadata(initialFailoverVersion int64, failoverVersionIncrement int64,
 		panic("Current cluster is not specified in all cluster names")
 	}
 
-	return &MetadataImpl{
+	return &metadataImpl{
 		initialFailoverVersion:   initialFailoverVersion,
 		failoverVersionIncrement: failoverVersionIncrement,
 		currentClusterName:       currentClusterName,
@@ -76,7 +76,7 @@ func NewMetadata(initialFailoverVersion int64, failoverVersionIncrement int64,
 }
 
 // GetNextFailoverVersion return the next failover version based on input
-func (metadata *MetadataImpl) GetNextFailoverVersion(currentFailoverVersion int64) int64 {
+func (metadata *metadataImpl) GetNextFailoverVersion(currentFailoverVersion int64) int64 {
 	failoverVersion := currentFailoverVersion/metadata.failoverVersionIncrement + metadata.initialFailoverVersion
 	if failoverVersion < currentFailoverVersion {
 		return failoverVersion + metadata.failoverVersionIncrement
@@ -85,11 +85,11 @@ func (metadata *MetadataImpl) GetNextFailoverVersion(currentFailoverVersion int6
 }
 
 // GetCurrentClusterName return the current cluster name
-func (metadata *MetadataImpl) GetCurrentClusterName() string {
+func (metadata *metadataImpl) GetCurrentClusterName() string {
 	return metadata.currentClusterName
 }
 
 // GetAllClusterNames return the all cluster names
-func (metadata *MetadataImpl) GetAllClusterNames() map[string]bool {
+func (metadata *metadataImpl) GetAllClusterNames() map[string]bool {
 	return metadata.clusterNames
 }
diff --git a/schema/cadence/versioned/v0.4/manifest.json b/schema/cadence/versioned/v0.4/manifest.json
@@ -4,7 +4,6 @@
   "Description": "add signal_decision to mutable state, add kind to taskList",
   "SchemaUpdateCqlFiles": [
     "add_signal_decision.cql",
-    "add_tasklist_kind.cql",
-    "add_replication_config.cql"
+    "add_tasklist_kind.cql"
   ]
 }
diff --git a/...versioned/v0.4/add_replication_config.cql → ...versioned/v0.5/add_replication_config.cql b/...versioned/v0.4/add_replication_config.cql → ...versioned/v0.5/add_replication_config.cql
diff --git a/schema/cadence/versioned/v0.5/manifest.json b/schema/cadence/versioned/v0.5/manifest.json
@@ -0,0 +1,8 @@
+{
+  "CurrVersion": "0.5",
+  "MinCompatibleVersion": "0.5",
+  "Description": "add cross DC domain replication config",
+  "SchemaUpdateCqlFiles": [
+    "add_replication_config.cql"
+  ]
+}
diff --git a/tools/cassandra/updateTask_test.go b/tools/cassandra/updateTask_test.go
@@ -130,7 +130,7 @@ func (s *UpdateSchemaTestSuite) TestDryrun() {
 	s.Nil(err)
 	// update the version to the latest
 	s.log.Infof("Ver: %v", ver)
-	s.Equal(0, cmpVersion(ver, "0.4"))
+	s.Equal(0, cmpVersion(ver, "0.5"))
 
 	dropAllTablesTypes(client)
 }