MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-14 03:13:47 +01:00
Code Issues Projects Releases Wiki Activity

Stop trying to fetch events with event_id=None. (#5753)

Browse source 
`None` is not a valid event id, so queuing up a database fetch for it seems
like a silly thing to do.

I considered making `get_event` return `None` if `event_id is None`, but then
its interaction with `allow_none` seemed uninituitive, and strong typing ftw.
This commit is contained in:
Richard van der Hoff 2019-07-24 13:16:18 +01:00 committed by GitHub
parent 418635e68a
commit f30a71a67b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/5753.misc Normal file
View file

@ -0,0 +1 @@
Stop trying to fetch events with event_id=None.

8
synapse/handlers/message.py
View file

@ -378,7 +378,11 @@ class EventCreationHandler(object):
# tolerate them in event_auth.check(). # tolerate them in event_auth.check().
prev_state_ids = yield context.get_prev_state_ids(self.store) prev_state_ids = yield context.get_prev_state_ids(self.store)
prev_event_id = prev_state_ids.get((EventTypes.Member, event.sender)) prev_event_id = prev_state_ids.get((EventTypes.Member, event.sender))
prev_event = yield self.store.get_event(prev_event_id, allow_none=True) prev_event = (
yield self.store.get_event(prev_event_id, allow_none=True)
if prev_event_id
else None
)
if not prev_event or prev_event.membership != Membership.JOIN: if not prev_event or prev_event.membership != Membership.JOIN:
logger.warning( logger.warning(
( (
@ -521,6 +525,8 @@ class EventCreationHandler(object):
""" """
prev_state_ids = yield context.get_prev_state_ids(self.store) prev_state_ids = yield context.get_prev_state_ids(self.store)
prev_event_id = prev_state_ids.get((event.type, event.state_key)) prev_event_id = prev_state_ids.get((event.type, event.state_key))
if not prev_event_id:
return
prev_event = yield self.store.get_event(prev_event_id, allow_none=True) prev_event = yield self.store.get_event(prev_event_id, allow_none=True)
if not prev_event: if not prev_event:
return return

5
synapse/storage/events_worker.py
View file

@ -139,8 +139,11 @@ class EventsWorkerStore(SQLBaseStore):
If there is a mismatch, behave as per allow_none. If there is a mismatch, behave as per allow_none.
Returns: Returns:
Deferred : A FrozenEvent. Deferred[EventBase|None]
""" """
if not isinstance(event_id, str):
raise TypeError("Invalid event event_id %r" % (event_id,))
events = yield self.get_events_as_list( events = yield self.get_events_as_list(
[event_id], [event_id],
check_redacted=check_redacted, check_redacted=check_redacted,

6
synapse/storage/stats.py
View file

@ -211,8 +211,7 @@ class StatsStore(StateDeltasStore):
avatar_id = current_state_ids.get((EventTypes.RoomAvatar, "")) avatar_id = current_state_ids.get((EventTypes.RoomAvatar, ""))
canonical_alias_id = current_state_ids.get((EventTypes.CanonicalAlias, "")) canonical_alias_id = current_state_ids.get((EventTypes.CanonicalAlias, ""))
state_events = yield self.get_events( event_ids = [
[
join_rules_id, join_rules_id,
history_visibility_id, history_visibility_id,
encryption_id, encryption_id,
@ -221,6 +220,9 @@ class StatsStore(StateDeltasStore):
avatar_id, avatar_id,
canonical_alias_id, canonical_alias_id,
] ]
state_events = yield self.get_events(
[ev for ev in event_ids if ev is not None]
) )
def _get_or_none(event_id, arg): def _get_or_none(event_id, arg):