Fix time fields of rows from GetClusterMembers

temporalio · Jan 25, 2023 · 0da79ec · 0da79ec
1 parent 7e54876
commit 0da79ec
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/common/persistence/sql/sqlplugin/mysql/cluster_metadata.go b/common/persistence/sql/sqlplugin/mysql/cluster_metadata.go
@@ -251,6 +251,11 @@ func (mdb *db) GetClusterMembers(
 	); err != nil {
 		return nil, err
 	}
+	for i := range rows {
+		rows[i].SessionStart = mdb.converter.FromMySQLDateTime(rows[i].SessionStart)
+		rows[i].LastHeartbeat = mdb.converter.FromMySQLDateTime(rows[i].LastHeartbeat)
+		rows[i].RecordExpiry = mdb.converter.FromMySQLDateTime(rows[i].RecordExpiry)
+	}
 	return rows, nil
 }
 

diff --git a/common/persistence/sql/sqlplugin/postgresql/cluster_metadata.go b/common/persistence/sql/sqlplugin/postgresql/cluster_metadata.go
@@ -260,17 +260,15 @@ func (pdb *db) GetClusterMembers(
 	err := pdb.conn.SelectContext(ctx, &rows,
 		compiledQryString,
 		operands...)
-
 	if err != nil {
 		return nil, err
 	}
-
-	convertedRows := make([]sqlplugin.ClusterMembershipRow, 0, len(rows))
-	for _, r := range rows {
-		r.SessionStart = r.SessionStart.UTC()
-		convertedRows = append(convertedRows, r)
+	for i := range rows {
+		rows[i].SessionStart = pdb.converter.FromPostgreSQLDateTime(rows[i].SessionStart)
+		rows[i].LastHeartbeat = pdb.converter.FromPostgreSQLDateTime(rows[i].LastHeartbeat)
+		rows[i].RecordExpiry = pdb.converter.FromPostgreSQLDateTime(rows[i].RecordExpiry)
 	}
-	return convertedRows, err
+	return rows, nil
 }
 
 func (pdb *db) PruneClusterMembership(

diff --git a/common/persistence/sql/sqlplugin/sqlite/cluster_metadata.go b/common/persistence/sql/sqlplugin/sqlite/cluster_metadata.go
@@ -251,6 +251,11 @@ func (mdb *db) GetClusterMembers(
 	); err != nil {
 		return nil, err
 	}
+	for i := range rows {
+		rows[i].SessionStart = mdb.converter.FromSQLiteDateTime(rows[i].SessionStart)
+		rows[i].LastHeartbeat = mdb.converter.FromSQLiteDateTime(rows[i].LastHeartbeat)
+		rows[i].RecordExpiry = mdb.converter.FromSQLiteDateTime(rows[i].RecordExpiry)
+	}
 	return rows, nil
 }