mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-03 12:13:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Correct account data position mapping

Browse source
This commit is contained in:
Neil Alexander 2022-04-27 15:30:52 +01:00
parent e4dc90e368
commit 127bbceee1
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
syncapi/storage/postgres/account_data_table.go
View file

@ -119,6 +119,7 @@ func (s *accountDataStatements) SelectAccountDataInRange(
var dataType string var dataType string
var roomID string var roomID string
var id types.StreamPosition var id types.StreamPosition
var highest types.StreamPosition
for rows.Next() { for rows.Next() {
if err = rows.Scan(&id, &roomID, &dataType); err != nil { if err = rows.Scan(&id, &roomID, &dataType); err != nil {
@ -130,8 +131,8 @@ func (s *accountDataStatements) SelectAccountDataInRange(
} else { } else {
data[roomID] = []string{dataType} data[roomID] = []string{dataType}
} }
if id > pos { if id > highest {
pos = id highest = id
} }
} }
if pos == 0 { if pos == 0 {

5
syncapi/storage/sqlite3/account_data_table.go
View file

@ -115,6 +115,7 @@ func (s *accountDataStatements) SelectAccountDataInRange(
var dataType string var dataType string
var roomID string var roomID string
var id types.StreamPosition var id types.StreamPosition
var highest types.StreamPosition
for rows.Next() { for rows.Next() {
if err = rows.Scan(&id, &roomID, &dataType); err != nil { if err = rows.Scan(&id, &roomID, &dataType); err != nil {
@ -126,8 +127,8 @@ func (s *accountDataStatements) SelectAccountDataInRange(
} else { } else {
data[roomID] = []string{dataType} data[roomID] = []string{dataType}
} }
if id > pos { if id > highest {
pos = id highest = id
} }
} }
if pos == 0 { if pos == 0 {