mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-05-02 19:34:52 -04:00
Fix to-device being dropped in limited sync in SQLite. (#11966)
If ther are more than 100 to-device messages pending for a device `/sync` will only return the first 100, however the next batch token was incorrectly calculated and so all other pending messages would be dropped. This is due to `txn.rowcount` only returning the number of rows that *changed*, rather than the number *selected* in SQLite.
This commit is contained in:
parent
4ef39f3353
commit
79fb64e417
3 changed files with 45 additions and 1 deletions
|
@ -362,7 +362,10 @@ class DeviceInboxWorkerStore(SQLBaseStore):
|
|||
# intended for each device.
|
||||
last_processed_stream_pos = to_stream_id
|
||||
recipient_device_to_messages: Dict[Tuple[str, str], List[JsonDict]] = {}
|
||||
rowcount = 0
|
||||
for row in txn:
|
||||
rowcount += 1
|
||||
|
||||
last_processed_stream_pos = row[0]
|
||||
recipient_user_id = row[1]
|
||||
recipient_device_id = row[2]
|
||||
|
@ -373,7 +376,7 @@ class DeviceInboxWorkerStore(SQLBaseStore):
|
|||
(recipient_user_id, recipient_device_id), []
|
||||
).append(message_dict)
|
||||
|
||||
if limit is not None and txn.rowcount == limit:
|
||||
if limit is not None and rowcount == limit:
|
||||
# We ended up bumping up against the message limit. There may be more messages
|
||||
# to retrieve. Return what we have, as well as the last stream position that
|
||||
# was processed.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue