diff options
author | Erik Johnston <erik@matrix.org> | 2014-10-14 16:59:51 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-10-14 16:59:51 +0100 |
commit | 5fefc12d1e2da56895d5652e3d7516ac59ab8824 (patch) | |
tree | f5e6b9a146faf0e3cd8bf7940d6e60ba89d5adc1 /synapse/storage/__init__.py | |
parent | Merge pull request #8 from matrix-org/server2server_signing (diff) | |
download | synapse-5fefc12d1e2da56895d5652e3d7516ac59ab8824.tar.xz |
Begin implementing state groups.
Diffstat (limited to 'synapse/storage/__init__.py')
-rw-r--r-- | synapse/storage/__init__.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index 6dadeb8cce..10456688ef 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -40,6 +40,7 @@ from .stream import StreamStore from .pdu import StatePduStore, PduStore, PdusTable from .transactions import TransactionStore from .keys import KeyStore +from .state import StateStore import json import logging @@ -59,6 +60,7 @@ SCHEMAS = [ "room_aliases", "keys", "redactions", + "state", ] @@ -76,7 +78,7 @@ class _RollbackButIsFineException(Exception): class DataStore(RoomMemberStore, RoomStore, RegistrationStore, StreamStore, ProfileStore, FeedbackStore, PresenceStore, PduStore, StatePduStore, TransactionStore, - DirectoryStore, KeyStore): + DirectoryStore, KeyStore, StateStore): def __init__(self, hs): super(DataStore, self).__init__(hs) @@ -222,6 +224,8 @@ class DataStore(RoomMemberStore, RoomStore, ) raise _RollbackButIsFineException("_persist_event") + self._store_state_groups_txn(txn, event) + is_state = hasattr(event, "state_key") and event.state_key is not None if is_new_state and is_state: vals = { |