Fix get_metadata_for_events (#12904)

richvdh · web-flow · commit 248046187940 · 2022-05-30T10:51:09.000+01:00
This method was introduced in #12852. It is using the `state_key` column from the `events` table, which is not (yet) reliable (see #11496).
diff --git a/changelog.d/12904.misc b/changelog.d/12904.misc
@@ -0,0 +1 @@
+Pull out less state when handling gaps in room DAG.
diff --git a/synapse/storage/databases/main/state.py b/synapse/storage/databases/main/state.py
@@ -167,8 +167,8 @@ def get_metadata_for_events_txn(
             )
 
             sql = f"""
-                SELECT e.event_id, e.room_id, e.type, e.state_key FROM events AS e
-                LEFT JOIN state_events USING (event_id)
+                SELECT e.event_id, e.room_id, e.type, se.state_key FROM events AS e
+                LEFT JOIN state_events se USING (event_id)
                 WHERE {clause}
             """
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Pull out less state when handling gaps in room DAG.`
Original file line number	Diff line number	Diff line change
`@@ -167,8 +167,8 @@ def get_metadata_for_events_txn(`
`167`	`167`	`)`
`168`	`168`
`169`	`169`	`sql = f"""`
`170`		`- SELECT e.event_id, e.room_id, e.type, e.state_key FROM events AS e`
`171`		`- LEFT JOIN state_events USING (event_id)`
	`170`	`+ SELECT e.event_id, e.room_id, e.type, se.state_key FROM events AS e`
	`171`	`+ LEFT JOIN state_events se USING (event_id)`
`172`	`172`	`WHERE {clause}`
`173`	`173`	`"""`
`174`	`174`