From fa4b54aca57bebc94e2b763abdae79343a08f969 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 3 Jun 2019 17:06:54 +0100
Subject: [PATCH 1/3] Ignore room state with null bytes in for room stats

---
 synapse/storage/stats.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/synapse/storage/stats.py b/synapse/storage/stats.py
index 1c0b183a56..1f39ef211a 100644
--- a/synapse/storage/stats.py
+++ b/synapse/storage/stats.py
@@ -328,6 +328,21 @@ class StatsStore(StateDeltasStore):
             room_id (str)
             fields (dict[str:Any])
         """
+
+        # For whatever reason some of the fields may contain null bytes, which
+        # postgres isn't a fan of, so we replace those fields with null.
+        for col in (
+            "join_rules",
+            "history_visibility",
+            "encryption",
+            "name",
+            "topic",
+            "avatar",
+            "canonical_alias"
+        ):
+            if "\0" in fields.get(col, ""):
+                fields[col] = None
+
         return self._simple_upsert(
             table="room_state",
             keyvalues={"room_id": room_id},

From 0d67a8cd9de9564fcdaa1206c18b411b4c43b74a Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 3 Jun 2019 17:17:57 +0100
Subject: [PATCH 2/3] Newsfile

---
 changelog.d/5324.feature | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/5324.feature

diff --git a/changelog.d/5324.feature b/changelog.d/5324.feature
new file mode 100644
index 0000000000..01285e965c
--- /dev/null
+++ b/changelog.d/5324.feature
@@ -0,0 +1 @@
+Synapse now more efficiently collates room statistics.

From 0a56966f7d4879f9d517c96a3c714accdce4e17f Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 3 Jun 2019 17:42:52 +0100
Subject: [PATCH 3/3] Fix

---
 synapse/storage/stats.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/synapse/storage/stats.py b/synapse/storage/stats.py
index 1f39ef211a..ff266b09b0 100644
--- a/synapse/storage/stats.py
+++ b/synapse/storage/stats.py
@@ -340,7 +340,8 @@ class StatsStore(StateDeltasStore):
             "avatar",
             "canonical_alias"
         ):
-            if "\0" in fields.get(col, ""):
+            field = fields.get(col)
+            if field and "\0" in field:
                 fields[col] = None
 
         return self._simple_upsert(