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

Move _add_messages_to_device_inbox_txn into a separate method

This commit is contained in:
Mark Haines 2016-09-06 11:26:37 +01:00
parent 940d4fad24
commit f4164edb70
1 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
synapse/storage/deviceinbox.py
View File

@ -37,9 +37,21 @@ class DeviceInboxStore(SQLBaseStore):
inserted.
"""
def select_devices_txn(txn, user_id, devices):
if not devices:
return []
with self._device_inbox_id_gen.get_next() as stream_id:
yield self.runInteraction(
"add_messages_to_device_inbox",
self._add_messages_to_device_inbox_txn,
stream_id,
messages_by_user_then_device,
)
defer.returnValue(self._device_inbox_id_gen.get_current_token())
def _add_messages_to_device_inbox_txn(self, txn, stream_id,
messages_by_user_then_device):
local_users_and_devices = set()
for user_id, messages_by_device in messages_by_user_then_device.items():
devices = messages_by_device.keys()
sql = (
"SELECT user_id, device_id FROM devices"
" WHERE user_id = ? AND device_id IN ("
@ -48,16 +60,8 @@ class DeviceInboxStore(SQLBaseStore):
)
# TODO: Maybe this needs to be done in batches if there are
# too many local devices for a given user.
args = [user_id] + devices
txn.execute(sql, args)
return [tuple(row) for row in txn.fetchall()]
def add_messages_to_device_inbox_txn(txn, stream_id):
local_users_and_devices = set()
for user_id, messages_by_device in messages_by_user_then_device.items():
local_users_and_devices.update(
select_devices_txn(txn, user_id, messages_by_device.keys())
)
txn.execute(sql, [user_id] + devices)
local_users_and_devices.update(map(tuple, txn.fetchall()))
sql = (
"INSERT INTO device_inbox"
@ -75,15 +79,6 @@ class DeviceInboxStore(SQLBaseStore):
txn.executemany(sql, rows)
with self._device_inbox_id_gen.get_next() as stream_id:
yield self.runInteraction(
"add_messages_to_device_inbox",
add_messages_to_device_inbox_txn,
stream_id
)
defer.returnValue(self._device_inbox_id_gen.get_current_token())
def get_new_messages_for_device(
self, user_id, device_id, last_stream_id, current_stream_id, limit=100
):