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

Reduce the number of "untyped defs" #12716

Merged
merged 14 commits into from
May 12, 2022
Merged

Reduce the number of "untyped defs" #12716

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7cf850e
Brief annotation in s.storage.types
May 11, 2022
965ca4c
Annotation in s.http.request_metrics
May 11, 2022
8e11e43
type annotations in s.http.matrixfederationclient
May 11, 2022
f16a82e
Extra annotations in s.http.federation
May 11, 2022
aac36ff
Extra annotation in s.groups
May 11, 2022
77d29f7
Annotate `_make_scheduler`
May 11, 2022
192ecf9
Additional annotations in s.http.client
May 11, 2022
6979a84
Annotations in `s.storage.persist_events`
May 11, 2022
d464f66
Annotations in s.storage.state
May 11, 2022
a225fda
Annotations in s.storage.databases.main.stream
May 11, 2022
cb1f07f
Annotation in s.storage.prepare_database
May 11, 2022
ed24f87
Easy annotations in s.storage.database
May 11, 2022
a5133c2
Changelog
May 11, 2022
ebc5686
Use `auto_attribs` for WellKnownLookupResult
May 12, 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
3 changes: 3 additions & 0 deletions mypy.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,9 @@ disallow_untyped_defs = True
[mypy-synapse.storage.databases.main.user_erasure_store]
disallow_untyped_defs = True

[mypy-synapse.storage.persist_events]
disallow_untyped_defs = True

[mypy-synapse.storage.types]
disallow_untyped_defs = True

Expand Down
21 changes: 13 additions & 8 deletions synapse/storage/persist_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
Collection,
Deque,
Dict,
Generator,
Generic,
Iterable,
List,
Expand Down Expand Up @@ -207,7 +208,7 @@ async def add_to_queue(

return res

def _handle_queue(self, room_id):
def _handle_queue(self, room_id: str) -> None:
"""Attempts to handle the queue for a room if not already being handled.

The queue's callback will be invoked with for each item in the queue,
Expand All @@ -227,7 +228,7 @@ def _handle_queue(self, room_id):

self._currently_persisting_rooms.add(room_id)

async def handle_queue_loop():
async def handle_queue_loop() -> None:
try:
queue = self._get_drainining_queue(room_id)
for item in queue:
Expand All @@ -250,15 +251,17 @@ async def handle_queue_loop():
with PreserveLoggingContext():
item.deferred.callback(ret)
finally:
queue = self._event_persist_queues.pop(room_id, None)
if queue:
self._event_persist_queues[room_id] = queue
remaining_queue = self._event_persist_queues.pop(room_id, None)
Copy link
Contributor Author

@DMRobertson DMRobertson May 11, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wasn't sure of the best name here. Mypy doesn't like it because it has a different type to the queue on line 233

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably fine, other options: to_persist_queue?

if remaining_queue:
self._event_persist_queues[room_id] = remaining_queue
self._currently_persisting_rooms.discard(room_id)

# set handle_queue_loop off in the background
run_as_background_process("persist_events", handle_queue_loop)

def _get_drainining_queue(self, room_id):
def _get_drainining_queue(
self, room_id: str
) -> Generator[_EventPersistQueueItem, None, None]:
queue = self._event_persist_queues.setdefault(room_id, deque())

try:
Expand Down Expand Up @@ -317,7 +320,9 @@ async def persist_events(
for event, ctx in events_and_contexts:
partitioned.setdefault(event.room_id, []).append((event, ctx))

async def enqueue(item):
async def enqueue(
item: Tuple[str, List[Tuple[EventBase, EventContext]]]
) -> Dict[str, str]:
room_id, evs_ctxs = item
return await self._event_persist_queue.add_to_queue(
room_id, evs_ctxs, backfilled=backfilled
Expand Down Expand Up @@ -1102,7 +1107,7 @@ async def _is_server_still_joined(

return False

async def _handle_potentially_left_users(self, user_ids: Set[str]):
async def _handle_potentially_left_users(self, user_ids: Set[str]) -> None:
"""Given a set of remote users check if the server still shares a room with
them. If not then mark those users' device cache as stale.
"""
Expand Down