From 3365117151217f0ea96291aabce222f8b58bd850 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 1 Mar 2017 10:21:30 +0000
Subject: [PATCH 1/3] Clobber old device list stream entries

---
 synapse/storage/devices.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/synapse/storage/devices.py b/synapse/storage/devices.py
index 7b5903bf8e..f9ed18d2aa 100644
--- a/synapse/storage/devices.py
+++ b/synapse/storage/devices.py
@@ -546,6 +546,16 @@ class DeviceStore(SQLBaseStore):
                 host, stream_id,
             )
 
+        # Delete older entries in the table, as we really only care about
+        # when the latest change happened.
+        txn.executemany(
+            """
+            DELETE FROM device_lists_stream
+            WHERE user_id = ? AND device_id = ? AND stream_id < ?
+            """,
+            [(user_id, device_id, stream_id) for device_id in device_ids]
+        )
+
         self._simple_insert_many_txn(
             txn,
             table="device_lists_stream",

From d766343668e63a7572dcfe571d38ea3e143f3c1c Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 1 Mar 2017 15:56:30 +0000
Subject: [PATCH 2/3] Add index to device_lists_stream

---
 synapse/storage/deviceinbox.py                  |  8 ++++----
 synapse/storage/devices.py                      |  7 +++++++
 .../schema/delta/41/device_list_stream_idx.sql  | 17 +++++++++++++++++
 3 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 synapse/storage/schema/delta/41/device_list_stream_idx.sql

diff --git a/synapse/storage/deviceinbox.py b/synapse/storage/deviceinbox.py
index bde3b5cbbc..1951de0ce1 100644
--- a/synapse/storage/deviceinbox.py
+++ b/synapse/storage/deviceinbox.py
@@ -31,10 +31,10 @@ class DeviceInboxStore(BackgroundUpdateStore):
         super(DeviceInboxStore, self).__init__(hs)
 
         self.register_background_index_update(
-            "device_inbox_stream_index",
-            index_name="device_inbox_stream_id_user_id",
-            table="device_inbox",
-            columns=["stream_id", "user_id"],
+            "device_lists_stream_idx",
+            index_name="device_lists_stream_user_id",
+            table="device_lists_stream",
+            columns=["user_id", "device_id"],
         )
 
         self.register_background_update_handler(
diff --git a/synapse/storage/devices.py b/synapse/storage/devices.py
index f9ed18d2aa..ed659b7001 100644
--- a/synapse/storage/devices.py
+++ b/synapse/storage/devices.py
@@ -33,6 +33,13 @@ class DeviceStore(SQLBaseStore):
             self._prune_old_outbound_device_pokes, 60 * 60 * 1000
         )
 
+        self.register_background_index_update(
+            "device_inbox_stream_index",
+            index_name="device_inbox_stream_id_user_id",
+            table="device_inbox",
+            columns=["stream_id", "user_id"],
+        )
+
     @defer.inlineCallbacks
     def store_device(self, user_id, device_id,
                      initial_device_display_name):
diff --git a/synapse/storage/schema/delta/41/device_list_stream_idx.sql b/synapse/storage/schema/delta/41/device_list_stream_idx.sql
new file mode 100644
index 0000000000..b7bee8b692
--- /dev/null
+++ b/synapse/storage/schema/delta/41/device_list_stream_idx.sql
@@ -0,0 +1,17 @@
+/* Copyright 2017 Vector Creations Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+INSERT into background_updates (update_name, progress_json)
+    VALUES ('device_lists_stream_idx', '{}');

From da52d3af317f03cd95c2f3158bf95290d828f2aa Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 3 Mar 2017 15:29:13 +0000
Subject: [PATCH 3/3] Fix up

---
 synapse/storage/deviceinbox.py | 8 ++++----
 synapse/storage/devices.py     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/synapse/storage/deviceinbox.py b/synapse/storage/deviceinbox.py
index 1951de0ce1..bde3b5cbbc 100644
--- a/synapse/storage/deviceinbox.py
+++ b/synapse/storage/deviceinbox.py
@@ -31,10 +31,10 @@ class DeviceInboxStore(BackgroundUpdateStore):
         super(DeviceInboxStore, self).__init__(hs)
 
         self.register_background_index_update(
-            "device_lists_stream_idx",
-            index_name="device_lists_stream_user_id",
-            table="device_lists_stream",
-            columns=["user_id", "device_id"],
+            "device_inbox_stream_index",
+            index_name="device_inbox_stream_id_user_id",
+            table="device_inbox",
+            columns=["stream_id", "user_id"],
         )
 
         self.register_background_update_handler(
diff --git a/synapse/storage/devices.py b/synapse/storage/devices.py
index ed659b7001..81c43d31f6 100644
--- a/synapse/storage/devices.py
+++ b/synapse/storage/devices.py
@@ -34,10 +34,10 @@ class DeviceStore(SQLBaseStore):
         )
 
         self.register_background_index_update(
-            "device_inbox_stream_index",
-            index_name="device_inbox_stream_id_user_id",
-            table="device_inbox",
-            columns=["stream_id", "user_id"],
+            "device_lists_stream_idx",
+            index_name="device_lists_stream_user_id",
+            table="device_lists_stream",
+            columns=["user_id", "device_id"],
         )
 
     @defer.inlineCallbacks