mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/element-hq/dendrite.git synced 2025-09-13 21:02:25 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Backport 1d409dede6

Browse source
This commit is contained in:
Till Faelligen 2025-05-17 19:23:52 +02:00
parent f0578a506d
commit 4ee2ef0c6d
No known key found for this signature in database
GPG key ID: 3DF82D8AB9211D4E
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -92,6 +92,7 @@ func (s *accountDataStatements) SelectAccountDataInRange(
accountDataEventFilter *synctypes.EventFilter, accountDataEventFilter *synctypes.EventFilter,
) (data map[string][]string, pos types.StreamPosition, err error) { ) (data map[string][]string, pos types.StreamPosition, err error) {
data = make(map[string][]string) data = make(map[string][]string)
pos = r.Low()
rows, err := sqlutil.TxStmt(txn, s.selectAccountDataInRangeStmt).QueryContext( rows, err := sqlutil.TxStmt(txn, s.selectAccountDataInRangeStmt).QueryContext(
ctx, userID, r.Low(), r.High(), ctx, userID, r.Low(), r.High(),
@ -122,7 +123,7 @@ func (s *accountDataStatements) SelectAccountDataInRange(
pos = id pos = id
} }
} }
if pos == 0 { if len(data) == 0 {
pos = r.High() pos = r.High()
} }
return data, pos, rows.Err() return data, pos, rows.Err()

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

@ -84,6 +84,8 @@ func (s *accountDataStatements) SelectAccountDataInRange(
filter *synctypes.EventFilter, filter *synctypes.EventFilter,
) (data map[string][]string, pos types.StreamPosition, err error) { ) (data map[string][]string, pos types.StreamPosition, err error) {
data = make(map[string][]string) data = make(map[string][]string)
pos = r.Low()
stmt, params, err := prepareWithFilters( stmt, params, err := prepareWithFilters(
s.db, txn, selectAccountDataInRangeSQL, s.db, txn, selectAccountDataInRangeSQL,
[]interface{}{ []interface{}{
@ -119,7 +121,7 @@ func (s *accountDataStatements) SelectAccountDataInRange(
pos = id pos = id
} }
} }
if pos == 0 { if len(data) == 0 {
pos = r.High() pos = r.High()
} }
return data, pos, rows.Err() return data, pos, rows.Err()