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

Fix postgres compatibility bug

This commit is contained in:
Neil Johnson 2018-08-06 21:55:54 +01:00
parent 1911c037cb
commit e54794f5b6
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
synapse/storage/monthly_active_users.py
View File

@ -43,14 +43,25 @@ class MonthlyActiveUsersStore(SQLBaseStore):
thirty_days_ago = ( thirty_days_ago = (
int(self._clock.time_msec()) - (1000 * 60 * 60 * 24 * 30) int(self._clock.time_msec()) - (1000 * 60 * 60 * 24 * 30)
) )
# Purge stale users
sql = "DELETE FROM monthly_active_users WHERE timestamp < ?" sql = "DELETE FROM monthly_active_users WHERE timestamp < ?"
txn.execute(sql, (thirty_days_ago,)) txn.execute(sql, (thirty_days_ago,))
# If MAU user count still exceeds the MAU threshold, then delete on
# a least recently active basis.
# Note it is not possible to write this query using OFFSET due to
# incompatibilities in how sqlite an postgres support the feature.
# sqlite requires 'LIMIT -1 OFFSET ?', the LIMIT must be present
# While Postgres does not require 'LIMIT', but also does not support
# negative LIMIT values. So there is no way to write it that both can
# support
sql = """ sql = """
DELETE FROM monthly_active_users DELETE FROM monthly_active_users
ORDER BY timestamp desc WHERE user_id NOT IN (
LIMIT -1 OFFSET ? SELECT user_id FROM monthly_active_users
ORDER BY timestamp DESC
LIMIT ?
)
""" """
txn.execute(sql, (self.hs.config.max_mau_value,)) txn.execute(sql, (self.hs.config.max_mau_value,))