maxmustermann/synapse
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Refactor to rewrite the SQL instead

Browse source
This commit is contained in:
Erik Johnston 2019-01-22 16:31:05 +00:00
parent 1c9704f8ab
commit 7f503f83b9
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
synapse/storage/client_ips.py
View file

@ -140,16 +140,8 @@ class ClientIpStore(background_updates.BackgroundUpdateStore):
"user_ips_dups_get_last_seen", get_last_seen "user_ips_dups_get_last_seen", get_last_seen
) )
if end_last_seen is None: # If it returns None, then we're processing the last batch
# If we get a None then we're reaching the end and just need to last = end_last_seen is None
# delete the last batch.
last = True
# We fake not having an upper bound by using a future date, by
# just multiplying the current time by two....
last_seen = int(self.clock.time_msec()) * 2
else:
last = False
def remove(txn): def remove(txn):
# This works by looking at all entries in the given time span, and # This works by looking at all entries in the given time span, and
@ -160,6 +152,16 @@ class ClientIpStore(background_updates.BackgroundUpdateStore):
# all other duplicates. # all other duplicates.
# It is efficient due to the existence of (user_id, access_token, # It is efficient due to the existence of (user_id, access_token,
# ip) and (last_seen) indices. # ip) and (last_seen) indices.
# Define the search space, which requires handling the last batch in
# a different way
if last:
clause = "? <= last_seen"
args = (begin_last_seen,)
else:
clause = "? <= last_seen AND last_seen < ?"
args = (begin_last_seen, end_last_seen)
txn.execute( txn.execute(
""" """
SELECT user_id, access_token, ip, SELECT user_id, access_token, ip,
@ -167,13 +169,14 @@ class ClientIpStore(background_updates.BackgroundUpdateStore):
FROM ( FROM (
SELECT user_id, access_token, ip SELECT user_id, access_token, ip
FROM user_ips FROM user_ips
WHERE ? <= last_seen AND last_seen < ? WHERE {}
ORDER BY last_seen ORDER BY last_seen
) c ) c
INNER JOIN user_ips USING (user_id, access_token, ip) INNER JOIN user_ips USING (user_id, access_token, ip)
GROUP BY user_id, access_token, ip GROUP BY user_id, access_token, ip
HAVING count(*) > 1""", HAVING count(*) > 1
(begin_last_seen, end_last_seen) """.format(clause),
args
) )
res = txn.fetchall() res = txn.fetchall()