diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-08-13 17:23:39 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-08-13 17:23:39 +0100 |
| commit | b16cd18a86a530d955d38bbdbc03daa0d70a2f9b (patch) | |
| tree | 8a2e6eb451ec5121affe2afc13ce95ab6fcc4bfd /synapse/storage/state.py | |
| parent | Doc-string for config ultility function (diff) | |
| parent | Merge pull request #224 from matrix-org/erikj/reactor_metrics (diff) | |
| download | synapse-b16cd18a86a530d955d38bbdbc03daa0d70a2f9b.tar.xz | |
Merge remote-tracking branch 'origin/develop' into erikj/generate_presice_thumbnails
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 = ( |