Split purge API into events vs state and add PurgeEventsStorage

changelog.d/6295.misc

@@ -0,0 +1 @@
+Split out state storage into separate data store.

synapse/handlers/pagination.py

@@ -69,6 +69,7 @@ def __init__(self, hs):
         self.hs = hs
         self.auth = hs.get_auth()
         self.store = hs.get_datastore()
+        self.storage = hs.get_storage()
         self.clock = hs.get_clock()
         self._server_name = hs.hostname
 
@@ -125,7 +126,9 @@ def _purge_history(self, purge_id, room_id, token, delete_local_events):
         self._purges_in_progress_by_room.add(room_id)
         try:
             with (yield self.pagination_lock.write(room_id)):
-                yield self.store.purge_history(room_id, token, delete_local_events)
+                yield self.storage.purge_events.purge_history(
+                    room_id, token, delete_local_events
+                )
             logger.info("[purge] complete")
             self._purges_by_id[purge_id].status = PurgeStatus.STATUS_COMPLETE
         except Exception:
@@ -168,7 +171,7 @@ async def purge_room(self, room_id):
             if joined:
                 raise SynapseError(400, "Users are still joined to this room")
 
-            await self.store.purge_room(room_id)
+            await self.storage.purge_events.purge_room(room_id)
 
     @defer.inlineCallbacks
     def get_messages(

synapse/storage/__init__.py

@@ -30,6 +30,7 @@
 from synapse.storage.data_stores import DataStores
 from synapse.storage.data_stores.main import DataStore
 from synapse.storage.persist_events import EventsPersistenceStorage
+from synapse.storage.purge_events import PurgeEventsStorage
 
 __all__ = ["DataStores", "DataStore"]
 
@@ -45,6 +46,7 @@ def __init__(self, hs, stores: DataStores):
         self.main = stores.main
 
         self.persistence = EventsPersistenceStorage(hs, stores)
+        self.purge_events = PurgeEventsStorage(hs, stores)
 
 
 def are_all_users_on_domain(txn, database_engine, domain):