Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use attr instead of a dict

This commit is contained in:
Brendan Abolivier 2020-06-12 15:02:15 +01:00
parent 7e80c84902
commit cf92fbb8aa
No known key found for this signature in database
GPG Key ID: 1E015C145F1916CD
1 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
synapse/storage/data_stores/main/event_push_actions.py
View File

@ -15,6 +15,7 @@
import logging import logging
import attr
from six import iteritems from six import iteritems
from canonicaljson import json from canonicaljson import json
@ -37,6 +38,17 @@ DEFAULT_HIGHLIGHT_ACTION = [
] ]
@attr.s
class EventPushSummary(object):
"""Summary of pending event push actions for a given user in a given room."""
user_id = attr.ib()
room_id = attr.ib()
unread_count = attr.ib()
stream_ordering = attr.ib()
old_user_id = attr.ib()
notif_count = attr.ib()
def _serialize_action(actions, is_highlight): def _serialize_action(actions, is_highlight):
"""Custom serializer for actions. This allows us to "compress" common actions. """Custom serializer for actions. This allows us to "compress" common actions.
@ -879,17 +891,15 @@ class EventPushActionsStore(EventPushActionsWorkerStore):
# user ID and room ID to make it easier to populate. # user ID and room ID to make it easier to populate.
summaries = {} summaries = {}
for row in unread_rows: for row in unread_rows:
summaries[(row[0], row[1])] = { summaries[(row[0], row[1])] = EventPushSummary(
"unread_count": row[2], user_id=row[0], room_id=row[1], unread_count=row[2],
"stream_ordering": row[3], stream_ordering=row[3], old_user_id=row[4], notif_count=0,
"old_user_id": row[4], )
"notif_count": 0,
}
# notif_rows is populated based on a subset of the query used to populate # notif_rows is populated based on a subset of the query used to populate
# unread_rows, so we can be sure that there will be no KeyError here. # unread_rows, so we can be sure that there will be no KeyError here.
for row in notif_rows: for row in notif_rows:
summaries[(row[0], row[1])]["notif_count"] = row[2] summaries[(row[0], row[1])].notif_count = row[2]
logger.info("Rotating notifications, handling %d rows", len(summaries)) logger.info("Rotating notifications, handling %d rows", len(summaries))
@ -901,14 +911,14 @@ class EventPushActionsStore(EventPushActionsWorkerStore):
table="event_push_summary", table="event_push_summary",
values=[ values=[
{ {
"user_id": key[0], "user_id": summary.user_id,
"room_id": key[1], "room_id": summary.room_id,
"notif_count": summary["notif_count"], "notif_count": summary.notif_count,
"unread_count": summary["unread_count"], "unread_count": summary.unread_count,
"stream_ordering": summary["stream_ordering"], "stream_ordering": summary.stream_ordering,
} }
for key, summary in summaries.items() for summary in summaries.values()
if summary["old_user_id"] is None if summary.old_user_id is None
], ],
) )
@ -920,14 +930,14 @@ class EventPushActionsStore(EventPushActionsWorkerStore):
""", """,
( (
( (
summary["notif_count"], summary.notif_count,
summary["unread_count"], summary.unread_count,
summary["stream_ordering"], summary.stream_ordering,
key[0], summary.user_id,
key[1], summary.room_id,
) )
for key, summary in summaries.items() for summary in summaries.values()
if summary["old_user_id"] is not None if summary.old_user_id is not None
), ),
) )