Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-01-27 13:17:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

rename get_prev_events_for_room to get_prev_events_and_hashes_for_room

Browse Source 
... to make way for a new method which just returns the event ids
This commit is contained in:
Richard van der Hoff 2020-01-03 15:31:09 +00:00
parent 01c3c6c929
commit 5a04781643
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/handlers/message.py
View File

@ -740,7 +740,7 @@ class EventCreationHandler(object):
% (len(prev_events_and_hashes),) % (len(prev_events_and_hashes),)
) )
else: else:
prev_events_and_hashes = yield self.store.get_prev_events_for_room( prev_events_and_hashes = yield self.store.get_prev_events_and_hashes_for_room(
builder.room_id builder.room_id
) )
@ -1042,7 +1042,9 @@ class EventCreationHandler(object):
# For each room we need to find a joined member we can use to send # For each room we need to find a joined member we can use to send
# the dummy event with. # the dummy event with.
prev_events_and_hashes = yield self.store.get_prev_events_for_room(room_id) prev_events_and_hashes = yield self.store.get_prev_events_and_hashes_for_room(
room_id
)
latest_event_ids = (event_id for (event_id, _, _) in prev_events_and_hashes) latest_event_ids = (event_id for (event_id, _, _) in prev_events_and_hashes)

4
synapse/handlers/room_member.py
View File

@ -370,7 +370,9 @@ class RoomMemberHandler(object):
if block_invite: if block_invite:
raise SynapseError(403, "Invites have been disabled on this server") raise SynapseError(403, "Invites have been disabled on this server")
prev_events_and_hashes = yield self.store.get_prev_events_for_room(room_id) prev_events_and_hashes = yield self.store.get_prev_events_and_hashes_for_room(
room_id
)
latest_event_ids = (event_id for (event_id, _, _) in prev_events_and_hashes) latest_event_ids = (event_id for (event_id, _, _) in prev_events_and_hashes)
current_state_ids = yield self.state_handler.get_current_state_ids( current_state_ids = yield self.state_handler.get_current_state_ids(

5
synapse/storage/data_stores/main/event_federation.py
View File

@ -149,9 +149,10 @@ class EventFederationWorkerStore(EventsWorkerStore, SignatureWorkerStore, SQLBas
) )
@defer.inlineCallbacks @defer.inlineCallbacks
def get_prev_events_for_room(self, room_id): def get_prev_events_and_hashes_for_room(self, room_id):
""" """
Gets a subset of the current forward extremities in the given room. Gets a subset of the current forward extremities in the given room,
along with their depths and hashes.
Limits the result to 10 extremities, so that we can avoid creating Limits the result to 10 extremities, so that we can avoid creating
events which refer to hundreds of prev_events. events which refer to hundreds of prev_events.

4
tests/storage/test_event_federation.py
View File

@ -26,7 +26,7 @@ class EventFederationWorkerStoreTestCase(tests.unittest.TestCase):
self.store = hs.get_datastore() self.store = hs.get_datastore()
@defer.inlineCallbacks @defer.inlineCallbacks
def test_get_prev_events_for_room(self): def test_get_prev_events_and_hashes_for_room(self):
room_id = "@ROOM:local" room_id = "@ROOM:local"
# add a bunch of events and hashes to act as forward extremities # add a bunch of events and hashes to act as forward extremities
@ -64,7 +64,7 @@ class EventFederationWorkerStoreTestCase(tests.unittest.TestCase):
yield self.store.db.runInteraction("insert", insert_event, i) yield self.store.db.runInteraction("insert", insert_event, i)
# this should get the last five and five others # this should get the last five and five others
r = yield self.store.get_prev_events_for_room(room_id) r = yield self.store.get_prev_events_and_hashes_for_room(room_id)
self.assertEqual(10, len(r)) self.assertEqual(10, len(r))
for i in range(0, 5): for i in range(0, 5):
el = r[i] el = r[i]