Speed up e2e device keys queries for bot accounts (#16841)

This helps with bot accounts with lots of non-e2e devices.

The change is basically to change the order of the join for the case of
using `INNER JOIN`

changelog.d/16841.misc

@@ -0,0 +1 @@
+Speed up e2e device keys queries for bot accounts.

synapse/storage/databases/main/end_to_end_keys.py

@@ -408,17 +408,24 @@ class EndToEndKeyWorkerStore(EndToEndKeyBackgroundStore, CacheInvalidationWorker
         def get_e2e_device_keys_txn(
             txn: LoggingTransaction, query_clause: str, query_params: list
         ) -> None:
-            sql = (
+            if include_all_devices:
-                "SELECT user_id, device_id, "
+                sql = f"""
-                "    d.display_name, "
+                    SELECT user_id, device_id, d.display_name, k.key_json
-                "    k.key_json"
+                    FROM devices d
-                " FROM devices d"
+                    LEFT JOIN e2e_device_keys_json k USING (user_id, device_id)
-                "    %s JOIN e2e_device_keys_json k USING (user_id, device_id)"
+                    WHERE {query_clause} AND NOT d.hidden
-                " WHERE %s AND NOT d.hidden"
+                """
-            ) % (
+            else:
-                "LEFT" if include_all_devices else "INNER",
+                # We swap around `e2e_device_keys_json` and `devices`, as we
-                query_clause,
+                # want Postgres to query `e2e_device_keys_json` first as it will
-            )
+                # have fewer rows in it. This helps *a lot* with accounts with
+                # lots of non-e2e devices (such as bots).
+                sql = f"""
+                    SELECT user_id, device_id, d.display_name, k.key_json
+                    FROM e2e_device_keys_json k
+                    INNER JOIN devices d USING (user_id, device_id)
+                    WHERE {query_clause} AND NOT d.hidden
+                """
 
             txn.execute(sql, query_params)