OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix buglet and remove thread_id stuff

pull/4396/head
Richard van der Hoff 2018-11-30 12:09:33 +00:00
parent 9accd63a38
commit 080025e533
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
synapse/rest/client/v1/room.py
View File

@ -838,10 +838,9 @@ class TimestampLookupRestServlet(ClientV1RestServlet):
yield self.auth.check_joined_room(room_id, requester.user.to_string()) yield self.auth.check_joined_room(room_id, requester.user.to_string())
timestamp = parse_integer(request, "ts") timestamp = parse_integer(request, "ts")
thread_id = parse_integer(request, "thread_id", 0)
event_id = yield self.store.get_event_for_timestamp( event_id = yield self.store.get_event_for_timestamp(
room_id, thread_id, timestamp, room_id, timestamp,
) )
defer.returnValue((200, { defer.returnValue((200, {

9
synapse/storage/events_worker.py
View File

@ -527,33 +527,32 @@ class EventsWorkerStore(SQLBaseStore):
return self.runInteraction("get_rejection_reasons", f) return self.runInteraction("get_rejection_reasons", f)
def get_event_for_timestamp(self, room_id, thread_id, timestamp): def get_event_for_timestamp(self, room_id, timestamp):
sql_template = """ sql_template = """
SELECT event_id, origin_server_ts FROM events SELECT event_id, origin_server_ts FROM events
WHERE WHERE
origin_server_ts %s ? origin_server_ts %s ?
AND room_id = ? AND room_id = ?
AND thread_id = ?
ORDER BY origin_server_ts ORDER BY origin_server_ts
LIMIT 1; LIMIT 1;
""" """
def f(txn): def f(txn):
txn.execute(sql_template % ("<=",), (timestamp, room_id, thread_id)) txn.execute(sql_template % ("<=",), (timestamp, room_id))
row = txn.fetchone() row = txn.fetchone()
if row: if row:
event_id_before, ts_before = row event_id_before, ts_before = row
else: else:
event_id_before, ts_before = None, None event_id_before, ts_before = None, None
txn.execute(sql_template % (">=",), (timestamp, room_id, thread_id)) txn.execute(sql_template % (">=",), (timestamp, room_id))
row = txn.fetchone() row = txn.fetchone()
if row: if row:
event_id_after, ts_after = row event_id_after, ts_after = row
else: else:
event_id_after, ts_after = None, None event_id_after, ts_after = None, None
if event_id_before and event_id_before: if event_id_before and event_id_after:
# Return the closest one # Return the closest one
if (timestamp - ts_before) < (ts_after - timestamp): if (timestamp - ts_before) < (ts_after - timestamp):
return event_id_before return event_id_before