tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

style and further contraining query

Browse source
This commit is contained in:
Neil Johnson 2018-05-16 09:46:43 +01:00
parent c92a8aa578
commit 31c2502ca8
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
synapse/storage/__init__.py
View file

@ -368,6 +368,7 @@ class DataStore(RoomMemberStore, RoomStore,
logger.info("Calling _generate_user_daily_visits") logger.info("Calling _generate_user_daily_visits")
today_start = self._get_start_of_day() today_start = self._get_start_of_day()
a_day_in_milliseconds = 24 * 60 * 60 * 1000 a_day_in_milliseconds = 24 * 60 * 60 * 1000
now = self.clock.time_msec()
sql = """ sql = """
INSERT INTO user_daily_visits (user_id, device_id, timestamp) INSERT INTO user_daily_visits (user_id, device_id, timestamp)
@ -386,23 +387,26 @@ class DataStore(RoomMemberStore, RoomStore,
# where if the user logs in at 23:59 and overwrites their # where if the user logs in at 23:59 and overwrites their
# last_seen at 00:01 then they will not be counted in the # last_seen at 00:01 then they will not be counted in the
# previous day's stats - it is important that the query is run # previous day's stats - it is important that the query is run
# to minimise this case. # often to minimise this case.
if today_start > self._last_user_visit_update: if today_start > self._last_user_visit_update:
yesterday_start = today_start - a_day_in_milliseconds yesterday_start = today_start - a_day_in_milliseconds
txn.execute(sql, (yesterday_start, yesterday_start, txn.execute(sql, (
self._last_user_visit_update, today_start)) yesterday_start, yesterday_start,
self._last_user_visit_update, today_start
))
self._last_user_visit_update = today_start self._last_user_visit_update = today_start
txn.execute(sql, (today_start, today_start, txn.execute(sql, (
self._last_user_visit_update, today_start, today_start,
today_start + a_day_in_milliseconds)) self._last_user_visit_update,
now
))
# Update _last_user_visit_update to now. The reason to do this # Update _last_user_visit_update to now. The reason to do this
# rather just clamping to the beginning of the day is to limit # rather just clamping to the beginning of the day is to limit
# the size of the join - meaning that the query can be run more # the size of the join - meaning that the query can be run more
# frequently # frequently
now = datetime.datetime.utcnow() self._last_user_visit_update = now
self._last_user_visit_update = int(time.mktime(now.timetuple())) * 1000
return self.runInteraction("generate_user_daily_visits", return self.runInteraction("generate_user_daily_visits",
_generate_user_daily_visits) _generate_user_daily_visits)