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

Fetch edits for multiple events in a single query #11660

Merged
merged 16 commits into from
Feb 8, 2022
Merged

Fetch edits for multiple events in a single query #11660

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b16ce01
Remove unneeded room_id.
clokep Dec 21, 2021
4344f10
Fetch multiple edits at once.
clokep Dec 21, 2021
7e97e55
Fetch event edits in groups.
clokep Dec 21, 2021
d4a41c8
Newsfragment
clokep Dec 29, 2021
e9908c8
edit -> edits
clokep Jan 14, 2022
7ac2a9d
Rename cache.
clokep Jan 14, 2022
aacf47e
Use the previous cache size.
clokep Jan 14, 2022
e79d656
Merge remote-tracking branch 'origin/develop' into clokep/bundle-redu…
clokep Jan 18, 2022
8132180
Do not attempt to find edits for state/redacted events.
clokep Jan 19, 2022
e00cec0
Fix logic.
clokep Jan 19, 2022
05c38f9
Merge remote-tracking branch 'origin/develop' into clokep/bundle-redu…
clokep Jan 25, 2022
8400c20
Directly select latest edit.
clokep Jan 25, 2022
e2f905b
Merge remote-tracking branch 'origin/develop' into clokep/bundle-redu…
clokep Jan 26, 2022
ffad611
Use cachedList instead of homegrown solution.
clokep Jan 26, 2022
5ce3e07
Use less efficient, but correct query for SQLite.
clokep Jan 26, 2022
9a7cc1a
Lint
clokep Jan 26, 2022
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
4 changes: 1 addition & 3 deletions synapse/storage/databases/main/events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1783,9 +1783,7 @@ def _handle_event_relations(
)

if rel_type == RelationTypes.REPLACE:
txn.call_after(
self.store.get_applicable_edit.invalidate, (parent_id, event.room_id)
)
txn.call_after(self.store.get_applicable_edit.invalidate, (parent_id,))

if rel_type == RelationTypes.THREAD:
txn.call_after(
Expand Down
11 changes: 4 additions & 7 deletions synapse/storage/databases/main/relations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,17 +326,14 @@ def _get_aggregation_groups_for_event_txn(
)

@cached()
async def get_applicable_edit(
self, event_id: str, room_id: str
) -> Optional[EventBase]:
async def get_applicable_edit(self, event_id: str) -> Optional[EventBase]:
"""Get the most recent edit (if any) that has happened for the given
event.

Correctly handles checking whether edits were allowed to happen.

Args:
event_id: The original event ID
room_id: The original event's room ID

Returns:
The most recent edit, if any.
Expand All @@ -355,17 +352,17 @@ async def get_applicable_edit(
original.event_id = relates_to_id
AND edit.type = original.type
AND edit.sender = original.sender
AND edit.room_id = original.room_id
WHERE
relates_to_id = ?
AND relation_type = ?
AND edit.room_id = ?
AND edit.type = 'm.room.message'
ORDER by edit.origin_server_ts DESC, edit.event_id DESC
LIMIT 1
"""

def _get_applicable_edit_txn(txn: LoggingTransaction) -> Optional[str]:
txn.execute(sql, (event_id, RelationTypes.REPLACE, room_id))
txn.execute(sql, (event_id, RelationTypes.REPLACE))
row = txn.fetchone()
if row:
return row[0]
Expand Down Expand Up @@ -591,7 +588,7 @@ async def _get_bundled_aggregation_for_event(

edit = None
if event.type == EventTypes.Message:
edit = await self.get_applicable_edit(event_id, room_id)
edit = await self.get_applicable_edit(event_id)

if edit:
aggregations[RelationTypes.REPLACE] = edit
Expand Down