Skip to content

Commit

Permalink
Move get_time_of_last_push_action_before to the `EventPushActionsWo…
Browse files Browse the repository at this point in the history
…rkerStore`

Fixes matrix-org#7054

I also had a look at the rest of the functions in
`EventPushActionsStore` and in the push notifications send code and it
looks to me like there shouldn't be any other method with this issue in
this part of the codebase.
  • Loading branch information
babolivier authored and phil-flex committed Mar 27, 2020
1 parent 2535de0 commit 94f50d6
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions synapse/storage/data_stores/main/event_push_actions.py
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,23 @@ def _find_first_stream_ordering_after_ts_txn(txn, ts):

return range_end

@defer.inlineCallbacks
def get_time_of_last_push_action_before(self, stream_ordering):
def f(txn):
sql = (
"SELECT e.received_ts"
" FROM event_push_actions AS ep"
" JOIN events e ON ep.room_id = e.room_id AND ep.event_id = e.event_id"
" WHERE ep.stream_ordering > ?"
" ORDER BY ep.stream_ordering ASC"
" LIMIT 1"
)
txn.execute(sql, (stream_ordering,))
return txn.fetchone()

result = yield self.db.runInteraction("get_time_of_last_push_action_before", f)
return result[0] if result else None


class EventPushActionsStore(EventPushActionsWorkerStore):
EPA_HIGHLIGHT_INDEX = "epa_highlight_index"
Expand Down Expand Up @@ -735,23 +752,6 @@ def f(txn):
pa["actions"] = _deserialize_action(pa["actions"], pa["highlight"])
return push_actions

@defer.inlineCallbacks
def get_time_of_last_push_action_before(self, stream_ordering):
def f(txn):
sql = (
"SELECT e.received_ts"
" FROM event_push_actions AS ep"
" JOIN events e ON ep.room_id = e.room_id AND ep.event_id = e.event_id"
" WHERE ep.stream_ordering > ?"
" ORDER BY ep.stream_ordering ASC"
" LIMIT 1"
)
txn.execute(sql, (stream_ordering,))
return txn.fetchone()

result = yield self.db.runInteraction("get_time_of_last_push_action_before", f)
return result[0] if result else None

@defer.inlineCallbacks
def get_latest_push_action_stream_ordering(self):
def f(txn):
Expand Down

0 comments on commit 94f50d6

Please sign in to comment.