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

Remove thread_id

Browse source
This commit is contained in:
Eric Eastwood 2021-07-26 19:15:07 -05:00
parent 96c48ba96c
commit 668aa4e710
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
synapse/rest/client/v1/room.py
View file

@ -1404,11 +1404,9 @@ class TimestampLookupRestServlet(RestServlet):
await self._auth.check_joined_room(room_id, requester.to_string())
timestamp = parse_integer(request, "ts")
thread_id = parse_integer(request, "thread_id", 0)
event_id = await self._store.get_event_for_timestamp(
room_id,
thread_id,
timestamp,
)

9
synapse/storage/databases/main/events_worker.py
View file

@ -1512,26 +1512,25 @@ class EventsWorkerStore(SQLBaseStore):
_cleanup_old_transaction_ids_txn,
)
def get_event_for_timestamp(self, room_id, thread_id, timestamp):
def get_event_for_timestamp(self, room_id, timestamp):
sql_template = """
SELECT event_id, origin_server_ts FROM
SELECT event_id, origin_server_ts FROM events
WHERE
origin_server_ts %s ?
AND room_id = ?
AND thread_id = ?
ORDER BY origin_server_ts
LIMIT 1;
"""
def f(txn):
txn.execute(sql_template % ("<=",), (timestamp, room_id, thread_id))
txn.execute(sql_template % ("<=",), (timestamp, room_id))
row = txn.fetchone()
if row:
event_id_before, ts_before = row
else:
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()
if row:
event_id_after, ts_after = row