diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index 5a95c36a8b..28fdba5fb2 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -2270,7 +2270,7 @@ class EventsStore(
"room_aliases",
"room_depth",
"room_memberships",
- "room_state",
+ "room_stats_state",
"room_stats",
"room_stats_earliest_token",
"rooms",
diff --git a/synapse/storage/schema/delta/56/stats_separated1.sql b/synapse/storage/schema/delta/56/stats_separated1.sql
index 045b5ca013..52fb09c0e6 100644
--- a/synapse/storage/schema/delta/56/stats_separated1.sql
+++ b/synapse/storage/schema/delta/56/stats_separated1.sql
@@ -137,3 +137,6 @@ CREATE INDEX IF NOT EXISTS user_stats_historical_end_ts ON user_stats_historical
-- We don't need an index on (user_id, end_ts) because PRIMARY KEY sorts that
-- out for us. (We would want it to review stats for a particular user.)
+
+-- Also rename room_state to room_stats_state to make its ownership clear.
+ALTER TABLE room_state RENAME TO room_stats_state;
diff --git a/synapse/storage/stats.py b/synapse/storage/stats.py
index 824e57bad7..fce0fb5a56 100644
--- a/synapse/storage/stats.py
+++ b/synapse/storage/stats.py
@@ -92,7 +92,7 @@ class StatsStore(StateDeltasStore):
fields[col] = None
return self._simple_upsert(
- table="room_state",
+ table="room_stats_state",
keyvalues={"room_id": room_id},
values=fields,
desc="update_room_state",
|
