Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correctly order results

This commit is contained in:
Brendan Abolivier 2019-11-01 12:03:04 +00:00
parent 49008e674f
commit 824bba2f78
No known key found for this signature in database
GPG Key ID: 1E015C145F1916CD
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
synapse/storage/data_stores/main/events_bg_updates.py
View File

@ -21,7 +21,7 @@ from canonicaljson import json
from twisted.internet import defer from twisted.internet import defer
from synapse.api.constants import LabelsField from synapse.api.constants import EventContentFields
from synapse.storage._base import make_in_list_sql_clause from synapse.storage._base import make_in_list_sql_clause
from synapse.storage.background_updates import BackgroundUpdateStore from synapse.storage.background_updates import BackgroundUpdateStore
@ -520,7 +520,7 @@ class EventsBackgroundUpdatesStore(BackgroundUpdateStore):
SELECT event_id, json FROM event_json SELECT event_id, json FROM event_json
LEFT JOIN event_labels USING (event_id) LEFT JOIN event_labels USING (event_id)
WHERE event_id > ? AND label IS NULL WHERE event_id > ? AND label IS NULL
LIMIT ? ORDER BY event_id LIMIT ?
""", """,
(last_event_id, batch_size), (last_event_id, batch_size),
) )
@ -538,7 +538,9 @@ class EventsBackgroundUpdatesStore(BackgroundUpdateStore):
table="event_labels", table="event_labels",
values=[ values=[
{"event_id": event_id, "label": label} {"event_id": event_id, "label": label}
for label in event_json["content"].get(LabelsField, []) for label in event_json["content"].get(
EventContentFields.Labels, []
)
], ],
) )
@ -548,8 +550,6 @@ class EventsBackgroundUpdatesStore(BackgroundUpdateStore):
# We want to return true (to end the background update) only when # We want to return true (to end the background update) only when
# the query returned with less rows than we asked for. # the query returned with less rows than we asked for.
# TODO: this currently doesn't work, i.e. it only runs once whereas
# its opposite does the whole thing, investigate.
return len(rows) != batch_size return len(rows) != batch_size
end = yield self.runInteraction( end = yield self.runInteraction(