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

Minor perf fixes to get_auth_chain_ids #6954

Closed
wants to merge 5 commits into from
Closed

Minor perf fixes to get_auth_chain_ids #6954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
008aaca
Minor perf fixes to `get_auth_chain_ids`
erikjohnston Feb 19, 2020
7cadb47
Newsfile
erikjohnston Feb 19, 2020
cb8fdfd
Mark make_in_list_sql_clause as returning a list
erikjohnston Feb 19, 2020
59f1458
Use batch_iter and drop conversion to list
erikjohnston Feb 19, 2020
1da0457
pep
erikjohnston Feb 19, 2020
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
1 change: 1 addition & 0 deletions changelog.d/6954.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Minor perf fixes to `get_auth_chain_ids`.
10 changes: 4 additions & 6 deletions synapse/storage/data_stores/main/event_federation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import itertools
import logging

from six.moves import range
from six.moves.queue import Empty, PriorityQueue

from twisted.internet import defer
Expand All @@ -27,6 +26,7 @@
from synapse.storage.data_stores.main.signatures import SignatureWorkerStore
from synapse.storage.database import Database
from synapse.util.caches.descriptors import cached
from synapse.util.iterutils import batch_iter

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -71,14 +71,12 @@ def _get_auth_chain_ids_txn(self, txn, event_ids, include_given):
front = set(event_ids)
while front:
new_front = set()
front_list = list(front)
chunks = [front_list[x : x + 100] for x in range(0, len(front), 100)]
for chunk in chunks:
for chunk in batch_iter(front, 100):
clause, args = make_in_list_sql_clause(
txn.database_engine, "event_id", chunk
)
txn.execute(base_sql + clause, list(args))
new_front.update([r[0] for r in txn])
txn.execute(base_sql + clause, args)
Copy link
Member

Choose a reason for hiding this comment

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

if we're relying on make_in_list_sql_clause returning a list, we should probably update its type annotation to say that's what it does?

new_front.update(r[0] for r in txn)
Copy link
Member

Choose a reason for hiding this comment

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

In the past I've used flake8-comprehensions to find unnecessary comprehensions like this.


new_front -= results

Expand Down
2 changes: 1 addition & 1 deletion synapse/storage/database.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1504,7 +1504,7 @@ def simple_search_list_txn(cls, txn, table, term, col, retcols):

def make_in_list_sql_clause(
database_engine, column: str, iterable: Iterable
) -> Tuple[str, Iterable]:
) -> Tuple[str, list]:
"""Returns an SQL clause that checks the given column is in the iterable.

On SQLite this expands to `column IN (?, ?, ...)`, whereas on Postgres
Expand Down