kaslo/synapse
1
0
Fork 0
Code Wiki Activity

Compare old and new

Browse Source
This commit is contained in:
Eric Eastwood
2022-11-21 21:28:12 -06:00
parent 92a1aaf80c
commit 0459a9c42f
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
synapse/storage/databases/state/store.py
View File

@@ -119,9 +119,6 @@ class StateGroupDataStore(StateBackgroundUpdateStore, SQLBaseStore):
"*stateGroupMembersCache*",
500000,
)
# TODO: Remove cache invalidation
self._state_group_cache.invalidate_all()
self._state_group_members_cache.invalidate_all()
def get_max_state_group_txn(txn: Cursor) -> int:
txn.execute("SELECT COALESCE(max(id), 0) FROM state_groups")

18
synapse/visibility.py
View File

@@ -106,22 +106,32 @@ async def filter_events_for_client(
[event.event_id for event in events],
)
non_outlier_event_ids = event_ids = frozenset(
e.event_id for e in events if not e.internal_metadata.outlier
)
# TODO: Remove: We do this just to remove await_full_state from the comparison
await storage.state.get_state_group_for_events(
non_outlier_event_ids, await_full_state=True
)
# Grab the history visibility and membership for each of the events. That's all we
# need to know in order to filter them.
event_id_to_state = await storage.state._get_state_for_client_filtering_for_events(
# we exclude outliers at this point, and then handle them separately later
event_ids=frozenset(
e.event_id for e in events if not e.internal_metadata.outlier
),
event_ids=non_outlier_event_ids,
user_id_viewing_events=user_id,
)
# TODO: Remove comparison
# TODO: Remove cache invalidation
storage.state.stores.state._state_group_cache.invalidate_all()
storage.state.stores.state._state_group_members_cache.invalidate_all()
# logger.info("----------------------------------------------------")
# logger.info("----------------------------------------------------")
types = (_HISTORY_VIS_KEY, (EventTypes.Member, user_id))
event_id_to_state_orig = await storage.state.get_state_for_events(
frozenset(e.event_id for e in events if not e.internal_metadata.outlier),
non_outlier_event_ids,
state_filter=StateFilter.from_types(types),
)