mirror of
https://mau.dev/maunium/synapse.git
synced 2024-08-24 19:25:57 +00:00
Merge pull request #1101 from matrix-org/erikj/state_types_idx
Change state fetch query for postgres to be faster
This commit is contained in:
commit
45dc260060
@ -306,13 +306,6 @@ class StateStore(SQLBaseStore):
|
|||||||
defer.returnValue(results)
|
defer.returnValue(results)
|
||||||
|
|
||||||
def _get_state_groups_from_groups_txn(self, txn, groups, types=None):
|
def _get_state_groups_from_groups_txn(self, txn, groups, types=None):
|
||||||
if types is not None:
|
|
||||||
where_clause = "AND (%s)" % (
|
|
||||||
" OR ".join(["(type = ? AND state_key = ?)"] * len(types)),
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
where_clause = ""
|
|
||||||
|
|
||||||
results = {group: {} for group in groups}
|
results = {group: {} for group in groups}
|
||||||
if isinstance(self.database_engine, PostgresEngine):
|
if isinstance(self.database_engine, PostgresEngine):
|
||||||
# Temporarily disable sequential scans in this transaction. This is
|
# Temporarily disable sequential scans in this transaction. This is
|
||||||
@ -342,20 +335,43 @@ class StateStore(SQLBaseStore):
|
|||||||
WHERE state_group IN (
|
WHERE state_group IN (
|
||||||
SELECT state_group FROM state
|
SELECT state_group FROM state
|
||||||
)
|
)
|
||||||
%s;
|
%s
|
||||||
""") % (where_clause,)
|
""")
|
||||||
|
|
||||||
for group in groups:
|
# Turns out that postgres doesn't like doing a list of OR's and
|
||||||
args = [group]
|
# is about 1000x slower, so we just issue a query for each specific
|
||||||
if types is not None:
|
# type seperately.
|
||||||
args.extend([i for typ in types for i in typ])
|
if types:
|
||||||
|
clause_to_args = [
|
||||||
|
(
|
||||||
|
"AND type = ? AND state_key = ?",
|
||||||
|
(etype, state_key)
|
||||||
|
)
|
||||||
|
for etype, state_key in types
|
||||||
|
]
|
||||||
|
else:
|
||||||
|
# If types is None we fetch all the state, and so just use an
|
||||||
|
# empty where clause with no extra args.
|
||||||
|
clause_to_args = [("", [])]
|
||||||
|
|
||||||
txn.execute(sql, args)
|
for where_clause, where_args in clause_to_args:
|
||||||
rows = self.cursor_to_dict(txn)
|
for group in groups:
|
||||||
for row in rows:
|
args = [group]
|
||||||
key = (row["type"], row["state_key"])
|
args.extend(where_args)
|
||||||
results[group][key] = row["event_id"]
|
|
||||||
|
txn.execute(sql % (where_clause,), args)
|
||||||
|
rows = self.cursor_to_dict(txn)
|
||||||
|
for row in rows:
|
||||||
|
key = (row["type"], row["state_key"])
|
||||||
|
results[group][key] = row["event_id"]
|
||||||
else:
|
else:
|
||||||
|
if types is not None:
|
||||||
|
where_clause = "AND (%s)" % (
|
||||||
|
" OR ".join(["(type = ? AND state_key = ?)"] * len(types)),
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
where_clause = ""
|
||||||
|
|
||||||
# We don't use WITH RECURSIVE on sqlite3 as there are distributions
|
# We don't use WITH RECURSIVE on sqlite3 as there are distributions
|
||||||
# that ship with an sqlite3 version that doesn't support it (e.g. wheezy)
|
# that ship with an sqlite3 version that doesn't support it (e.g. wheezy)
|
||||||
for group in groups:
|
for group in groups:
|
||||||
|
Loading…
Reference in New Issue
Block a user