Change max_age to BIGINT milliseconds

Author: tulir

mautrix/crypto/store/asyncpg/store.py

@@ -289,9 +289,7 @@ async def has_group_session(self, room_id: RoomID, session_id: SessionID) -> boo
 
     async def add_outbound_group_session(self, session: OutboundGroupSession) -> None:
         pickle = session.pickle(self.pickle_key)
-        max_age = session.max_age
-        if self.db.scheme == Scheme.SQLITE:
-            max_age = max_age.total_seconds()
+        max_age = int(session.max_age.total_seconds() * 1000)
         q = """
         INSERT INTO crypto_megolm_outbound_session (
             room_id, session_id, session, shared, max_messages, message_count,
@@ -341,17 +339,14 @@ async def get_outbound_group_session(self, room_id: RoomID) -> OutboundGroupSess
         row = await self.db.fetchrow(q, room_id, self.account_id)
         if row is None:
             return None
-        max_age = row["max_age"]
-        if self.db.scheme == Scheme.SQLITE:
-            max_age = timedelta(seconds=max_age)
         return OutboundGroupSession.from_pickle(
             row["session"],
             passphrase=self.pickle_key,
             room_id=row["room_id"],
             shared=row["shared"],
             max_messages=row["max_messages"],
             message_count=row["message_count"],
-            max_age=max_age,
+            max_age=timedelta(milliseconds=row["max_age"]),
             use_time=row["last_used"],
             creation_time=row["created_at"],
         )

mautrix/crypto/store/asyncpg/upgrade.py

@@ -80,7 +80,6 @@ async def upgrade_blank_to_latest(conn: Connection) -> None:
             PRIMARY KEY (account_id, session_id)
         )"""
     )
-    # TODO chnge max_age to BIGINT
     await conn.execute(
         """CREATE TABLE IF NOT EXISTS crypto_megolm_outbound_session (
             account_id    TEXT,
@@ -90,7 +89,7 @@ async def upgrade_blank_to_latest(conn: Connection) -> None:
             shared        BOOLEAN   NOT NULL,
             max_messages  INTEGER   NOT NULL,
             message_count INTEGER   NOT NULL,
-            max_age       INTERVAL  NOT NULL,
+            max_age       BIGINT    NOT NULL,
             created_at    timestamp NOT NULL,
             last_used     timestamp NOT NULL,
             PRIMARY KEY (account_id, room_id)
@@ -167,7 +166,7 @@ async def upgrade_v2(conn: Connection, scheme: Scheme) -> None:
                 shared        BOOLEAN      NOT NULL,
                 max_messages  INTEGER      NOT NULL,
                 message_count INTEGER      NOT NULL,
-                max_age       INTERVAL     NOT NULL,
+                max_age       BIGINT       NOT NULL,
                 created_at    timestamp    NOT NULL,
                 last_used     timestamp    NOT NULL,
                 PRIMARY KEY (account_id, room_id)
@@ -298,6 +297,11 @@ async def upgrade_v8_postgres(conn: Connection) -> None:
         "ALTER TABLE crypto_cross_signing_signatures ALTER COLUMN signature SET NOT NULL"
     )
 
+    await conn.execute(
+        "ALTER TABLE crypto_megolm_outbound_session ALTER COLUMN max_age TYPE BIGINT "
+        "USING (EXTRACT(EPOCH from max_age)*1000)::int"
+    )
+
 
 async def upgrade_v8_sqlite(conn: Connection) -> None:
     await conn.execute("PRAGMA foreign_keys = OFF")
@@ -351,6 +355,8 @@ async def upgrade_v8_sqlite(conn: Connection) -> None:
             "ALTER TABLE new_crypto_megolm_inbound_session RENAME TO crypto_megolm_inbound_session"
         )
 
+        await conn.execute("UPDATE crypto_megolm_outbound_session SET max_age=max_age*1000")
+
         await conn.execute(
             """CREATE TABLE new_crypto_cross_signing_keys (
                 user_id TEXT,