Back to using cursor_to_dict

This commit is contained in:
Brendan Abolivier 2019-11-07 16:46:41 +00:00
parent ec2cb9f298
commit 1186612d6c
No known key found for this signature in database
GPG Key ID: 1E015C145F1916CD

View File

@ -525,10 +525,13 @@ class EventsBackgroundUpdatesStore(BackgroundUpdateStore):
(last_event_id, batch_size),
)
nbrows = 0
last_row_event_id = ""
for (event_id, event_json_raw) in txn:
event_json = json.loads(event_json_raw)
rows = self.cursor_to_dict(txn)
if not len(rows):
return 0
for row in rows:
event_id = row["event_id"]
event_json = json.loads(row["event_json"])
self._simple_insert_many_txn(
txn=txn,
@ -547,14 +550,11 @@ class EventsBackgroundUpdatesStore(BackgroundUpdateStore):
],
)
nbrows += 1
last_row_event_id = event_id
self._background_update_progress_txn(
txn, "event_store_labels", {"last_event_id": last_row_event_id}
txn, "event_store_labels", {"last_event_id": event_id}
)
return nbrows
return len(rows)
num_rows = yield self.runInteraction(
desc="event_store_labels", func=_event_store_labels_txn