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

Merge pull request #1066 from matrix-org/markjh/direct_to_device_lowerbound 

Only return new device messages in /sync
This commit is contained in:
Mark Haines 2016-09-02 16:18:34 +01:00 committed by GitHub
parent c0238ecbed 65fa37ac5e
commit 81b94c5750
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/handlers/sync.py
View File

@ -576,7 +576,7 @@ class SyncHandler(object):
logger.debug("Getting messages up to %d", now_token.to_device_key) logger.debug("Getting messages up to %d", now_token.to_device_key)
messages, stream_id = yield self.store.get_new_messages_for_device( messages, stream_id = yield self.store.get_new_messages_for_device(
user_id, device_id, now_token.to_device_key user_id, device_id, since_stream_id, now_token.to_device_key
) )
logger.debug("Got messages up to %d: %r", stream_id, messages) logger.debug("Got messages up to %d: %r", stream_id, messages)
sync_result_builder.now_token = now_token.copy_and_replace( sync_result_builder.now_token = now_token.copy_and_replace(

8
synapse/storage/deviceinbox.py
View File

@ -85,7 +85,7 @@ class DeviceInboxStore(SQLBaseStore):
defer.returnValue(self._device_inbox_id_gen.get_current_token()) defer.returnValue(self._device_inbox_id_gen.get_current_token())
def get_new_messages_for_device( def get_new_messages_for_device(
self, user_id, device_id, current_stream_id, limit=100 self, user_id, device_id, last_stream_id, current_stream_id, limit=100
): ):
""" """
Args: Args:
@ -101,11 +101,13 @@ class DeviceInboxStore(SQLBaseStore):
sql = ( sql = (
"SELECT stream_id, message_json FROM device_inbox" "SELECT stream_id, message_json FROM device_inbox"
" WHERE user_id = ? AND device_id = ?" " WHERE user_id = ? AND device_id = ?"
" AND stream_id <= ?" " AND ? < stream_id AND stream_id <= ?"
" ORDER BY stream_id ASC" " ORDER BY stream_id ASC"
" LIMIT ?" " LIMIT ?"
) )
txn.execute(sql, (user_id, device_id, current_stream_id, limit)) txn.execute(sql, (
user_id, device_id, last_stream_id, current_stream_id, limit
))
messages = [] messages = []
for row in txn.fetchall(): for row in txn.fetchall():
stream_pos = row[0] stream_pos = row[0]