diff options
| author | Richard van der Hoff <richard@matrix.org> | 2021-04-08 18:30:38 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2021-04-08 18:30:38 +0100 |
| commit | 9e167d9c53af8be7386ba7e2bd14ce385471df87 (patch) | |
| tree | e5578a06584477e553b8e0eea11c3aa1f40dc2b5 /synapse/state | |
| parent | remove unused param on `make_tuple_comparison_clause` (diff) | |
| parent | Merge pull request #9769 from matrix-org/rav/fix_bionic (diff) | |
| download | synapse-9e167d9c53af8be7386ba7e2bd14ce385471df87.tar.xz | |
Merge remote-tracking branch 'origin/develop' into rav/drop_py35
Diffstat (limited to 'synapse/state')
| -rw-r--r-- | synapse/state/__init__.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/state/__init__.py b/synapse/state/__init__.py index c3d6e80c49..c0f79ffdc8 100644 --- a/synapse/state/__init__.py +++ b/synapse/state/__init__.py @@ -22,6 +22,7 @@ from typing import ( Callable, DefaultDict, Dict, + FrozenSet, Iterable, List, Optional, @@ -515,7 +516,7 @@ class StateResolutionHandler: expiry_ms=EVICTION_TIMEOUT_SECONDS * 1000, iterable=True, reset_expiry_on_get=True, - ) + ) # type: ExpiringCache[FrozenSet[int], _StateCacheEntry] # # stuff for tracking time spent on state-res by room @@ -536,7 +537,7 @@ class StateResolutionHandler: state_groups_ids: Dict[int, StateMap[str]], event_map: Optional[Dict[str, EventBase]], state_res_store: "StateResolutionStore", - ): + ) -> _StateCacheEntry: """Resolves conflicts between a set of state groups Always generates a new state group (unless we hit the cache), so should |