Fix the bug with 1.1 startup on Mysql after the upgrade (temporalio#879)

vitarb · alexshtin · commit 7bf6bea7c6b5 · 2020-10-20T12:18:32.000-07:00
diff --git a/common/persistence/cassandra/cassandraClusterMetadata.go b/common/persistence/cassandra/cassandraClusterMetadata.go
@@ -159,7 +159,7 @@ func (m *cassandraClusterMetadata) GetClusterMetadata() (*p.InternalGetClusterMe
 		return nil, convertCommonErrors("GetClusterMetadata", err)
 	}
 	// TODO(vitarb): immutable metadata is needed for backward compatibility only, remove after 1.1 release.
-	if clusterMetadata == nil {
+	if len(clusterMetadata) == 0 {
 		clusterMetadata = immutableMetadata
 		encoding = immutableMetadataEncoding
 		// Version can only be 0 for legacy records that have NULL version in the DB.
diff --git a/common/persistence/sql/sqlClusterMetadataManager.go b/common/persistence/sql/sqlClusterMetadataManager.go
@@ -51,7 +51,7 @@ func (s *sqlClusterMetadataManager) GetClusterMetadata() (*p.InternalGetClusterM
 	}
 
 	// TODO(vitarb): immutable metadata is needed for backward compatibility only, remove after 1.1 release.
-	if row.Data == nil {
+	if len(row.Data) == 0 {
 		row.Data = row.ImmutableData
 		row.DataEncoding = row.ImmutableDataEncoding
 	}

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ func (m cassandraClusterMetadata) GetClusterMetadata() (p.InternalGetClusterMe`
`159`	`159`	`return nil, convertCommonErrors("GetClusterMetadata", err)`
`160`	`160`	`}`
`161`	`161`	`// TODO(vitarb): immutable metadata is needed for backward compatibility only, remove after 1.1 release.`
`162`		`- if clusterMetadata == nil {`
	`162`	`+ if len(clusterMetadata) == 0 {`
`163`	`163`	`clusterMetadata = immutableMetadata`
`164`	`164`	`encoding = immutableMetadataEncoding`
`165`	`165`	`// Version can only be 0 for legacy records that have NULL version in the DB.`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ func (s sqlClusterMetadataManager) GetClusterMetadata() (p.InternalGetClusterM`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`// TODO(vitarb): immutable metadata is needed for backward compatibility only, remove after 1.1 release.`
`54`		`- if row.Data == nil {`
	`54`	`+ if len(row.Data) == 0 {`
`55`	`55`	`row.Data = row.ImmutableData`
`56`	`56`	`row.DataEncoding = row.ImmutableDataEncoding`
`57`	`57`	`}`