diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-08-13 17:27:53 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-08-13 17:27:53 +0100 |
| commit | c5966b2a97090bf5b1e2ced83e3f424a3f4d4cad (patch) | |
| tree | 3cc3a75259e130906b963570e2c747f5ab0cba2d /synapse/storage/state.py | |
| parent | Add a few strategic new lines to break up the on_query_client_keys and on_cla... (diff) | |
| parent | Merge pull request #224 from matrix-org/erikj/reactor_metrics (diff) | |
| download | synapse-c5966b2a97090bf5b1e2ced83e3f424a3f4d4cad.tar.xz | |
Merge remote-tracking branch 'origin/develop' into markjh/end-to-end-key-federation
Diffstat (limited to 'synapse/storage/state.py')
| -rw-r--r-- | synapse/storage/state.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/synapse/storage/state.py b/synapse/storage/state.py index 47bec65497..7ce51b9bdc 100644 --- a/synapse/storage/state.py +++ b/synapse/storage/state.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from ._base import SQLBaseStore, cached +from ._base import SQLBaseStore, cachedInlineCallbacks from twisted.internet import defer @@ -91,7 +91,6 @@ class StateStore(SQLBaseStore): defer.returnValue(dict(state_list)) - @cached(num_args=1) def _fetch_events_for_group(self, key, events): return self._get_events( events, get_prev_content=False @@ -189,8 +188,7 @@ class StateStore(SQLBaseStore): events = yield self._get_events(event_ids, get_prev_content=False) defer.returnValue(events) - @cached(num_args=3) - @defer.inlineCallbacks + @cachedInlineCallbacks(num_args=3) def get_current_state_for_key(self, room_id, event_type, state_key): def f(txn): sql = ( |