Track device list updates per room.

synapse/storage/databases/main/devices.py

@@ -1531,7 +1531,6 @@ async def add_device_change_to_streams(
 
         num_stream_ids = max(
             len(device_ids),
-            len(room_ids) * len(device_ids),
             len(hosts) * len(device_ids),
         )
 
@@ -1670,29 +1669,27 @@ def _add_device_outbound_room_poke_txn(
         stream_ids: List[str],
         context: Dict[str, str],
     ) -> None:
-        next_stream_id = iter(stream_ids)
-
         self.db_pool.simple_insert_many_txn(
             txn,
             table="device_lists_changes_in_room",
             keys=(
-                "stream_id",
-                "room_id",
                 "user_id",
                 "device_id",
+                "room_id",
+                "stream_id",
                 "converted_to_destinations",
                 "opentracing_context",
             ),
             values=[
                 (
-                    next(next_stream_id),
-                    room_id,
                     user_id,
                     device_id,
+                    room_id,
+                    stream_id,
                     True,  # As we're updating `device_lists_outbound_pokes` at the same time.
                     json_encoder.encode(context),
                 )
                 for room_id in room_ids
-                for device_id in device_ids
+                for device_id, stream_id in zip(device_ids, stream_ids)
             ],
         )

synapse/storage/schema/main/delta/69/01device_list_oubound_by_room.sql

@@ -14,15 +14,15 @@
  */
 
 CREATE TABLE device_lists_changes_in_room (
-    stream_id BIGINT NOT NULL,
-    room_id TEXT NOT NULL,
     user_id TEXT NOT NULL,
     device_id TEXT NOT NULL,
+    room_id TEXT NOT NULL,
+    stream_id BIGINT NOT NULL,  -- This matches `device_lists_stream.stream_id`
     -- We track if we've calculated the hosts in the room and updated
     -- `device_lists_outbound_pokes`.
     converted_to_destinations BOOLEAN NOT NULL,
     opentracing_context TEXT
 );
 
-CREATE UNIQUE INDEX device_lists_changes_in_stream_id ON device_lists_changes_in_room(stream_id);
+CREATE INDEX device_lists_changes_in_stream_id ON device_lists_changes_in_room(stream_id);
 CREATE INDEX device_lists_changes_in_stream_id_converted ON device_lists_changes_in_room(stream_id) WHERE NOT converted_to_destinations;