Matrix/synapse
Matrix/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse synced 2024-07-04 08:43:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Slight clean-up

Browse source
This commit is contained in:
Eric Eastwood 2024-06-27 11:33:41 -05:00
parent 830e09d2de
commit 15fcead2a5
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
synapse/storage/databases/main/stream.py
View file

@ -846,7 +846,7 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
min_from_id = from_key.stream min_from_id = from_key.stream
max_to_id = to_key.get_max_stream_pos() max_to_id = to_key.get_max_stream_pos()
args: List[Any] = [min_from_id, max_to_id, user_id, EventTypes.Member] args: List[Any] = [min_from_id, max_to_id, EventTypes.Member, user_id]
# TODO: It would be good to assert that the `from_token`/`to_token` is >= # TODO: It would be good to assert that the `from_token`/`to_token` is >=
# the first row in `current_state_delta_stream` for the rooms we're # the first row in `current_state_delta_stream` for the rooms we're
@ -874,7 +874,7 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
e.event_id, e.event_id,
s.prev_event_id, s.prev_event_id,
s.room_id, s.room_id,
COALESCE(e.instance_name, s.instance_name), s.instance_name,
COALESCE(e.stream_ordering, s.stream_id), COALESCE(e.stream_ordering, s.stream_id),
m.membership, m.membership,
e.sender, e.sender,
@ -884,8 +884,8 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
LEFT JOIN room_memberships AS m ON m.event_id = s.event_id LEFT JOIN room_memberships AS m ON m.event_id = s.event_id
LEFT JOIN room_memberships AS m_prev ON s.prev_event_id = m_prev.event_id LEFT JOIN room_memberships AS m_prev ON s.prev_event_id = m_prev.event_id
WHERE s.stream_id > ? AND s.stream_id <= ? WHERE s.stream_id > ? AND s.stream_id <= ?
AND s.state_key = ?
AND s.type = ? AND s.type = ?
AND s.state_key = ?
ORDER BY s.stream_id ASC ORDER BY s.stream_id ASC
""" """
@ -916,10 +916,8 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
# `event_id = null` for all current state. This means we might # `event_id = null` for all current state. This means we might
# already have a row for the leave event and then another for the # already have a row for the leave event and then another for the
# same leave where the `event_id=null` but the `prev_event_id` is # same leave where the `event_id=null` but the `prev_event_id` is
# pointing back at the earlier leave event. Since we're assuming the # pointing back at the earlier leave event. We don't want to report
# `event_id = null` row is a `leave` and we don't want duplicate # the leave, if we already have a leave event.
# membership changes in our results, let's get rid of those
# (deduplicate) (see `test_server_left_after_us_room`).
if event_id is None and prev_membership == Membership.LEAVE: if event_id is None and prev_membership == Membership.LEAVE:
continue continue

6
tests/storage/test_stream.py
View file

@ -785,9 +785,9 @@ class GetCurrentStateDeltaMembershipChangesForUserTestCase(HomeserverTestCase):
def test_we_cause_server_left_room(self) -> None: def test_we_cause_server_left_room(self) -> None:
""" """
Test that when probing over part of the DAG where we leave the room causing the Test that when probing over part of the DAG where the user leaves the room
server to leave the room (because we were the last local user in the room), we causing the server to leave the room (because we were the last local user in the
still see the join and leave changes. room), we still see the join and leave changes.
This is to make sure we play nicely with this behavior: When the server leaves a This is to make sure we play nicely with this behavior: When the server leaves a
room, it will insert new rows with `event_id = null` into the room, it will insert new rows with `event_id = null` into the