From 3e98fb7a0a7dce1a0d8bf99ac1ed890ae128ed40 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 4 Dec 2020 15:01:57 +0000
Subject: [PATCH] More fixups

---
 synapse/storage/databases/main/events.py | 2 +-
 synapse/storage/persist_events.py        | 5 -----
 synapse/util/iterutils.py                | 5 +++++
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/synapse/storage/databases/main/events.py b/synapse/storage/databases/main/events.py
index b49d003f735e..40257163c66b 100644
--- a/synapse/storage/databases/main/events.py
+++ b/synapse/storage/databases/main/events.py
@@ -444,7 +444,7 @@ def _persist_event_auth_chain_txn(
             txn,
             table="rooms",
             column="room_id",
-            iterable={event.room_id for event in events},
+            iterable={event.room_id for event in events if event.is_state()},
             keyvalues={},
             retcols=("room_id", "has_auth_chain_index"),
         )
diff --git a/synapse/storage/persist_events.py b/synapse/storage/persist_events.py
index 00d1468dab1f..70e636b0bac0 100644
--- a/synapse/storage/persist_events.py
+++ b/synapse/storage/persist_events.py
@@ -388,8 +388,6 @@ async def _persist_events(
                             (event, context)
                         )
 
-                        logger.info("Persisting event: %s", event)
-
                     for room_id, ev_ctx_rm in events_by_room.items():
                         latest_event_ids = await self.main_store.get_latest_event_ids_in_room(
                             room_id
@@ -403,9 +401,6 @@ async def _persist_events(
                             # No change in extremities, so no change in state
                             continue
 
-                        logger.info("Old extrem: %s", latest_event_ids)
-                        logger.info("New extrem: %s", new_latest_event_ids)
-
                         # there should always be at least one forward extremity.
                         # (except during the initial persistence of the send_join
                         # results, in which case there will be no existing
diff --git a/synapse/util/iterutils.py b/synapse/util/iterutils.py
index e2428016be61..0b21aa56c09f 100644
--- a/synapse/util/iterutils.py
+++ b/synapse/util/iterutils.py
@@ -53,6 +53,11 @@ def chunk_seq(iseq: ISeq, maxlen: int) -> Iterable[ISeq]:
 def sorted_topologically(
     nodes: Iterable[T], graph: Dict[T, Collection[T]],
 ) -> Generator[T, None, None]:
+    """Given a set of nodes and a graph, yield the nodes in toplogical order.
+
+    For example `sorted_topologically([1, 2], {1: [2]})` will yield `2, 1`.
+    """
+
     degree_map = {node: 0 for node in nodes}
     reverse_graph = {}  # type: Dict[T, Set[T]]