Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Populate rooms.creator field for easy lookup #10697

Merged
merged 12 commits into from
Sep 1, 2021
Merged

Populate rooms.creator field for easy lookup #10697

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2b177b7
Populate rooms.creator field for easy lookup
MadLittleMods Aug 25, 2021
ee406df
Add changelog
MadLittleMods Aug 25, 2021
9f8e22b
Fix usage
MadLittleMods Aug 25, 2021
3c9b5a6
Don't worry about setting creator for invite
MadLittleMods Aug 25, 2021
9a600ff
Only iterate over rows missing the creator
MadLittleMods Aug 31, 2021
79b4991
Use constant to fetch room creator field
MadLittleMods Aug 31, 2021
25db289
More protection from other random types
MadLittleMods Aug 31, 2021
41e72c2
Move new background update to end of list
MadLittleMods Aug 31, 2021
9a3c015
Fix query casing
MadLittleMods Aug 31, 2021
9a887a4
Fix ambiguity iterating over cursor instead of list
MadLittleMods Aug 31, 2021
ad29e96
Add ordering to rooms creator background update
MadLittleMods Sep 1, 2021
462ab25
Add comment to better document constant
MadLittleMods Sep 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion synapse/storage/databases/main/room.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1370,9 +1370,10 @@ def _background_populate_rooms_creator_column_txn(txn: LoggingTransaction):
"""

txn.execute(sql, (last_room_id, batch_size))
room_id_to_create_event_results = txn.fetchall()

new_last_room_id = ""
for room_id, event_json in txn:
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe I was also running into something similar to #10734

We were originally iterating over txn, which can work, but as txn was being used to run a
simple_delete operation inside the loop, it was actually being redefined mid-loop.

#10734

And in this case, we're iterating over txn and doing a simple_update_txn 🤔

for room_id, event_json in room_id_to_create_event_results:
event_dict = db_to_json(event_json)

creator = event_dict.get("content").get(EventContentFields.ROOM_CREATOR)
Expand Down