Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-10-01 08:25:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Split a storage function in two so that we don't have to do extra work.

Browse Source
This commit is contained in:
Erik Johnston 2015-05-01 10:17:19 +01:00
parent 8be5284e91
commit 23c639ff32
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/federation/federation_server.py
View File

@ -417,13 +417,13 @@ class FederationServer(FederationBase):
pdu.internal_metadata.outlier = True pdu.internal_metadata.outlier = True
elif min_depth and pdu.depth > min_depth: elif min_depth and pdu.depth > min_depth:
if get_missing and prevs - seen: if get_missing and prevs - seen:
latest_tuples = yield self.store.get_latest_events_in_room( latest = yield self.store.get_latest_event_ids_in_room(
pdu.room_id pdu.room_id
) )
# We add the prev events that we have seen to the latest # We add the prev events that we have seen to the latest
# list to ensure the remote server doesn't give them to us # list to ensure the remote server doesn't give them to us
latest = set(e_id for e_id, _, _ in latest_tuples) latest = set(latest)
latest |= seen latest |= seen
missing_events = yield self.get_missing_events( missing_events = yield self.get_missing_events(

7
synapse/state.py
View File

@ -86,12 +86,7 @@ class StateHandler(object):
If `event_type` is specified, then the method returns only the one If `event_type` is specified, then the method returns only the one
event (or None) with that `event_type` and `state_key`. event (or None) with that `event_type` and `state_key`.
""" """
events = yield self.store.get_latest_events_in_room(room_id) event_ids = yield self.store.get_latest_event_ids_in_room(room_id)
event_ids = [
e_id
for e_id, _, _ in events
]
cache = None cache = None
if self._state_cache is not None: if self._state_cache is not None:

11
synapse/storage/event_federation.py
View File

@ -96,11 +96,22 @@ class EventFederationStore(SQLBaseStore):
room_id, room_id,
) )
def get_latest_event_ids_in_room(self, room_id):
return self._simple_select_onecol(
table="event_forward_extremities",
keyvalues={
"room_id": room_id,
},
retcol="event_id",
desc="get_latest_events_in_room",
)
def _get_latest_events_in_room(self, txn, room_id): def _get_latest_events_in_room(self, txn, room_id):
sql = ( sql = (
"SELECT e.event_id, e.depth FROM events as e " "SELECT e.event_id, e.depth FROM events as e "
"INNER JOIN event_forward_extremities as f " "INNER JOIN event_forward_extremities as f "
"ON e.event_id = f.event_id " "ON e.event_id = f.event_id "
"AND e.room_id = f.room_id "
"WHERE f.room_id = ?" "WHERE f.room_id = ?"
) )