1f349/dendrite
4
0
Fork 0
mirror of https://github.com/1f349/dendrite.git synced 2024-11-22 19:51:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix account data position

Browse Source
This commit is contained in:
Neil Alexander 2022-04-26 16:07:13 +01:00
parent 6892e0f0e0
commit f6d07768a8
No known key found for this signature in database
GPG Key ID: A02A2019A2BB0944
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,6 +105,7 @@ func (s *accountDataStatements) SelectAccountDataInRange(
accountDataEventFilter *gomatrixserverlib.EventFilter, accountDataEventFilter *gomatrixserverlib.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 := s.selectAccountDataInRangeStmt.QueryContext(ctx, userID, r.Low(), r.High(), rows, err := s.selectAccountDataInRangeStmt.QueryContext(ctx, userID, r.Low(), r.High(),
pq.StringArray(filterConvertTypeWildcardToSQL(accountDataEventFilter.Types)), pq.StringArray(filterConvertTypeWildcardToSQL(accountDataEventFilter.Types)),
@ -118,7 +119,7 @@ func (s *accountDataStatements) SelectAccountDataInRange(
var dataType string var dataType string
var roomID string var roomID string
id := r.From var id 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 {

3
syncapi/storage/sqlite3/account_data_table.go
View File

@ -96,6 +96,7 @@ func (s *accountDataStatements) SelectAccountDataInRange(
r types.Range, r types.Range,
filter *gomatrixserverlib.EventFilter, filter *gomatrixserverlib.EventFilter,
) (data map[string][]string, pos types.StreamPosition, err error) { ) (data map[string][]string, pos types.StreamPosition, err error) {
pos = r.Low()
data = make(map[string][]string) data = make(map[string][]string)
stmt, params, err := prepareWithFilters( stmt, params, err := prepareWithFilters(
s.db, nil, selectAccountDataInRangeSQL, s.db, nil, selectAccountDataInRangeSQL,
@ -114,7 +115,7 @@ func (s *accountDataStatements) SelectAccountDataInRange(
var dataType string var dataType string
var roomID string var roomID string
id := r.From var id 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 {