Skip to content

Commit 5652dc4

Browse files
authored
Fix time fields of rows from GetClusterMembers (#3840)
1 parent 1543bd4 commit 5652dc4

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

common/persistence/sql/sqlplugin/mysql/cluster_metadata.go

+5
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,11 @@ func (mdb *db) GetClusterMembers(
251251
); err != nil {
252252
return nil, err
253253
}
254+
for i := range rows {
255+
rows[i].SessionStart = mdb.converter.FromMySQLDateTime(rows[i].SessionStart)
256+
rows[i].LastHeartbeat = mdb.converter.FromMySQLDateTime(rows[i].LastHeartbeat)
257+
rows[i].RecordExpiry = mdb.converter.FromMySQLDateTime(rows[i].RecordExpiry)
258+
}
254259
return rows, nil
255260
}
256261

common/persistence/sql/sqlplugin/postgresql/cluster_metadata.go

+5-7
Original file line numberDiff line numberDiff line change
@@ -260,17 +260,15 @@ func (pdb *db) GetClusterMembers(
260260
err := pdb.conn.SelectContext(ctx, &rows,
261261
compiledQryString,
262262
operands...)
263-
264263
if err != nil {
265264
return nil, err
266265
}
267-
268-
convertedRows := make([]sqlplugin.ClusterMembershipRow, 0, len(rows))
269-
for _, r := range rows {
270-
r.SessionStart = r.SessionStart.UTC()
271-
convertedRows = append(convertedRows, r)
266+
for i := range rows {
267+
rows[i].SessionStart = pdb.converter.FromPostgreSQLDateTime(rows[i].SessionStart)
268+
rows[i].LastHeartbeat = pdb.converter.FromPostgreSQLDateTime(rows[i].LastHeartbeat)
269+
rows[i].RecordExpiry = pdb.converter.FromPostgreSQLDateTime(rows[i].RecordExpiry)
272270
}
273-
return convertedRows, err
271+
return rows, nil
274272
}
275273

276274
func (pdb *db) PruneClusterMembership(

common/persistence/sql/sqlplugin/sqlite/cluster_metadata.go

+5
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,11 @@ func (mdb *db) GetClusterMembers(
251251
); err != nil {
252252
return nil, err
253253
}
254+
for i := range rows {
255+
rows[i].SessionStart = mdb.converter.FromSQLiteDateTime(rows[i].SessionStart)
256+
rows[i].LastHeartbeat = mdb.converter.FromSQLiteDateTime(rows[i].LastHeartbeat)
257+
rows[i].RecordExpiry = mdb.converter.FromSQLiteDateTime(rows[i].RecordExpiry)
258+
}
254259
return rows, nil
255260
}
256261

0 commit comments

Comments
 (0)