Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add more types to synapse.storage.database. (#8127)

This commit is contained in:
Patrick Cloke 2020-08-20 09:00:59 -04:00 committed by GitHub
parent 731dfff347
commit 5eac0b7e76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 367 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/8127.misc Normal file
View File

@ -0,0 +1 @@
Add type hints to `synapse.storage.database`.

577
synapse/storage/database.py
View File

File diff suppressed because it is too large Load Diff

11
synapse/storage/databases/main/ui_auth.py
View File

@ -19,6 +19,7 @@ from canonicaljson import json
from synapse.api.errors import StoreError from synapse.api.errors import StoreError
from synapse.storage._base import SQLBaseStore, db_to_json from synapse.storage._base import SQLBaseStore, db_to_json
from synapse.storage.database import LoggingTransaction
from synapse.types import JsonDict from synapse.types import JsonDict
from synapse.util import stringutils as stringutils from synapse.util import stringutils as stringutils
@ -214,14 +215,16 @@ class UIAuthWorkerStore(SQLBaseStore):
value, value,
) )
def _set_ui_auth_session_data_txn(self, txn, session_id: str, key: str, value: Any): def _set_ui_auth_session_data_txn(
self, txn: LoggingTransaction, session_id: str, key: str, value: Any
):
# Get the current value. # Get the current value.
result = self.db_pool.simple_select_one_txn( result = self.db_pool.simple_select_one_txn(
txn, txn,
table="ui_auth_sessions", table="ui_auth_sessions",
keyvalues={"session_id": session_id}, keyvalues={"session_id": session_id},
retcols=("serverdict",), retcols=("serverdict",),
) ) # type: Dict[str, Any] # type: ignore
# Update it and add it back to the database. # Update it and add it back to the database.
serverdict = db_to_json(result["serverdict"]) serverdict = db_to_json(result["serverdict"])
@ -275,7 +278,9 @@ class UIAuthStore(UIAuthWorkerStore):
expiration_time, expiration_time,
) )
def _delete_old_ui_auth_sessions_txn(self, txn, expiration_time: int): def _delete_old_ui_auth_sessions_txn(
self, txn: LoggingTransaction, expiration_time: int
):
# Get the expired sessions. # Get the expired sessions.
sql = "SELECT session_id FROM ui_auth_sessions WHERE creation_time <= ?" sql = "SELECT session_id FROM ui_auth_sessions WHERE creation_time <= ?"
txn.execute(sql, [expiration_time]) txn.execute(sql, [expiration_time])