0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-15 05:23:51 +01:00

Revert "Back to using cursor_to_dict"

This reverts commit 1186612d6c.
This commit is contained in:
Brendan Abolivier 2019-11-07 16:47:15 +00:00
parent 1186612d6c
commit cd31201267

View file

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