change monthly_active_users table to be a single column

2 files changed, 4 insertions, 10 deletions

diff --git a/synapse/storage/monthly_active_users.py b/synapse/storage/monthly_active_users.py
index 03eeea792e..7b3f13aedf 100644
--- a/synapse/storage/monthly_active_users.py
+++ b/synapse/storage/monthly_active_users.py
@@ -38,22 +38,18 @@ class MonthlyActiveUsersStore(SQLBaseStore):
             return count
         return self.runInteraction("count_users", _count_users)
 
-    def upsert_monthly_active_user(self, user_id):
+    def insert_monthly_active_user(self, user_id):
         """
             Updates or inserts monthly active user member
             Arguments:
                 user_id (str): user to add/update
         """
-        return self._simple_upsert(
+        return self._simple_insert(
             desc="upsert_monthly_active_user",
             table="monthly_active_users",
-            keyvalues={
-                "user_id": user_id,
-            },
             values={
-                "timestamp": int(self._clock.time_msec()),
+                "user_id": user_id,
             },
-            lock=False,
         )
 
     @defer.inlineCallbacks
diff --git a/synapse/storage/schema/delta/51/monthly_active_users.sql b/synapse/storage/schema/delta/51/monthly_active_users.sql
index f2b6d3e31e..590b1abab2 100644
--- a/synapse/storage/schema/delta/51/monthly_active_users.sql
+++ b/synapse/storage/schema/delta/51/monthly_active_users.sql
@@ -15,9 +15,7 @@
 
 -- a table of monthly active users, for use where blocking based on mau limits
 CREATE TABLE monthly_active_users (
-    user_id TEXT NOT NULL,
-    timestamp BIGINT NOT NULL
+    user_id TEXT NOT NULL
 );
 
 CREATE UNIQUE INDEX monthly_active_users_users ON monthly_active_users(user_id);
-CREATE INDEX monthly_active_users_time_stamp ON monthly_active_users(timestamp);