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

Use batch_iter and correct docstring

Browse Source
This commit is contained in:
Erik Johnston 2019-06-26 19:10:38 +01:00
parent 806a06daf2
commit f335e77d53
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
synapse/storage/devices.py
View File

@ -24,6 +24,7 @@ from synapse.api.errors import StoreError
from synapse.metrics.background_process_metrics import run_as_background_process from synapse.metrics.background_process_metrics import run_as_background_process
from synapse.storage._base import Cache, SQLBaseStore, db_to_json from synapse.storage._base import Cache, SQLBaseStore, db_to_json
from synapse.storage.background_updates import BackgroundUpdateStore from synapse.storage.background_updates import BackgroundUpdateStore
from synapse.util import batch_iter
from synapse.util.caches.descriptors import cached, cachedInlineCallbacks, cachedList from synapse.util.caches.descriptors import cached, cachedInlineCallbacks, cachedList
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -396,8 +397,8 @@ class DeviceWorkerStore(SQLBaseStore):
are in the given list of user_ids. are in the given list of user_ids.
Args: Args:
from_key (str): The device lists stream token
user_ids (Iterable[str]) user_ids (Iterable[str])
from_key: The device lists stream token
Returns: Returns:
Deferred[set[str]]: The set of user_ids whose devices have changed Deferred[set[str]]: The set of user_ids whose devices have changed
@ -414,11 +415,8 @@ class DeviceWorkerStore(SQLBaseStore):
if not to_check: if not to_check:
return defer.succeed(set()) return defer.succeed(set())
# We now check the database for all users in `to_check`, in batches. def _get_users_whose_devices_changed_txn(txn):
batch_size = 100 changes = set()
chunks = [
to_check[i : i + batch_size] for i in range(0, len(to_check), batch_size)
]
sql = """ sql = """
SELECT DISTINCT user_id FROM device_lists_stream SELECT DISTINCT user_id FROM device_lists_stream
@ -426,11 +424,10 @@ class DeviceWorkerStore(SQLBaseStore):
AND user_id IN (%s) AND user_id IN (%s)
""" """
def _get_users_whose_devices_changed_txn(txn): for chunk in batch_iter(to_check, 100):
changes = set() txn.execute(
sql % (",".join("?" for _ in chunk),), [from_key] + list(chunk)
for chunk in chunks: )
txn.execute(sql % (",".join("?" for _ in chunk),), [from_key] + chunk)
changes.update(user_id for user_id, in txn) changes.update(user_id for user_id, in txn)
return changes return changes