Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-12-26 23:29:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove need for sqlite specific query

Browse Source
This commit is contained in:
Neil Johnson 2018-03-29 16:45:34 +01:00
parent dc7c020b33
commit 9ee44a372d
1 changed files with 56 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
synapse/storage/__init__.py
View File

@ -269,50 +269,77 @@ class DataStore(RoomMemberStore, RoomStore,
* Users who have created their accounts more than 30 days * Users who have created their accounts more than 30 days
* Where last seen at most 30 days ago * Where last seen at most 30 days ago
* Where account creation and last_seen are > 30 days * Where account creation and last_seen are > 30 days
Returns counts globaly for a given user as well as breaking
by platform
""" """
def _count_r30_users(txn): def _count_r30_users(txn):
thirty_days_in_secs = 86400 * 30 thirty_days_in_secs = 86400 * 30
now = int(self._clock.time_msec()) now = int(self._clock.time_msec())
thirty_days_ago_in_secs = now - thirty_days_in_secs thirty_days_ago_in_secs = now - thirty_days_in_secs
# Are these filters sufficiently robust? sql = """
filters = { SELECT platform, COALESCE(count(*), 0) FROM (
"ALL": "", SELECT users.name, platform, users.creation_ts * 1000, MAX(uip.last_seen)
"IOS": "^(Vector|Riot|Riot\.im)\/.* iOS", FROM users
"ANDROID": "^(Dalvik|Riot|Riot\.im)\/.* Android", INNER JOIN (
"ELECTRON": "Electron", SELECT
"WEB": "(Gecko|Mozilla)", user_id,
} last_seen,
CASE
WHEN user_agent LIKE '%Android%' THEN 'android'
WHEN user_agent LIKE '%iOS%' THEN 'ios'
WHEN user_agent LIKE '%Electron%' THEN 'electron'
WHEN user_agent LIKE '%Mozilla%' THEN 'web'
WHEN user_agent LIKE '%Gecko%' THEN 'web'
ELSE 'unknown'
END
AS platform
FROM user_ips
) uip
ON users.name = uip.user_id
AND users.appservice_id is NULL
AND users.creation_ts < ?
AND uip.last_seen/1000 > ?
AND (uip.last_seen/1000) - users.creation_ts > 86400 * 30
GROUP BY users.name, platform, users.creation_ts
) u GROUP BY platform
"""
results = {}
txn.execute(sql, (thirty_days_ago_in_secs,
thirty_days_ago_in_secs))
rows = txn.fetchall()
for row in rows:
if row[0] is 'unknown':
pass
results[row[0]] = row[1]
sql = """ sql = """
SELECT COALESCE(count(*), 0) FROM ( SELECT COALESCE(count(*), 0) FROM (
SELECT users.name, users.creation_ts * 1000, MAX(user_ips.last_seen) SELECT users.name, users.creation_ts * 1000, MAX(uip.last_seen)
FROM users, user_ips FROM users
WHERE users.name = user_ips.user_id INNER JOIN (
SELECT
user_id,
last_seen
FROM user_ips
) uip
ON users.name = uip.user_id
AND appservice_id is NULL AND appservice_id is NULL
AND users.creation_ts < ? AND users.creation_ts < ?
AND user_ips.last_seen/1000 > ? AND uip.last_seen/1000 > ?
AND (user_ips.last_seen/1000) - users.creation_ts > ? AND (uip.last_seen/1000) - users.creation_ts > 86400 * 30
GROUP BY users.name, users.creation_ts
) u
""" """
if isinstance(self.database_engine, PostgresEngine):
sql = sql + "AND user_ips.user_agent ~ ? "
sql = sql + "GROUP BY users.name, users.creation_ts ) u"
results = {}
if isinstance(self.database_engine, PostgresEngine):
for filter_name, user_agent_filter in filters.items():
txn.execute(sql, (thirty_days_ago_in_secs, txn.execute(sql, (thirty_days_ago_in_secs,
thirty_days_ago_in_secs, thirty_days_ago_in_secs))
thirty_days_in_secs,
user_agent_filter)) count, = txn.fetchone()
results[filter_name], = txn.fetchone() results['all'] = count
else:
txn.execute(sql, (thirty_days_ago_in_secs,
thirty_days_ago_in_secs,
thirty_days_in_secs))
results["ALL"], = txn.fetchone()
return results return results
return self.runInteraction("count_r30_users", _count_r30_users) return self.runInteraction("count_r30_users", _count_r30_users)