Add index to device_lists_stream

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",
+            "device_lists_stream_idx",
-            index_name="device_inbox_stream_id_user_id",
+            index_name="device_lists_stream_user_id",
-            table="device_inbox",
+            table="device_lists_stream",
-            columns=["stream_id", "user_id"],
+            columns=["user_id", "device_id"],
         )
 
         self.register_background_update_handler(

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):

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', '{}');