MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-05-18 03:23:45 +02:00
Code Issues Projects Releases Wiki Activity

Fix returned count of delete extremities admin API (#12496)

Browse source
This commit is contained in:
Erik Johnston 2022-04-19 16:49:45 +01:00 committed by GitHub
parent b80bb7e452
commit c1482a352a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/12496.bugfix Normal file
View file

@ -0,0 +1 @@
Fix bug where the admin API for [deleting forward extremities](https://github.com/matrix-org/synapse/blob/erikj/fix_delete_event_response_count/docs/admin_api/rooms.md#deleting-forward-extremities) would always return a count of 1 no matter how many extremities were deleted. Broke in v1.27.0.

8
synapse/storage/databases/main/events_forward_extremities.py
View file

@ -66,13 +66,15 @@ class EventForwardExtremitiesStore(
"""
txn.execute(sql, (event_id, room_id))
deleted_count = txn.rowcount
logger.info(
"Deleted %s extra forward extremities for room %s",
txn.rowcount,
deleted_count,
room_id,
)
if txn.rowcount > 0:
if deleted_count > 0:
# Invalidate the cache
self._invalidate_cache_and_stream(
txn,
@ -80,7 +82,7 @@ class EventForwardExtremitiesStore(
(room_id,),
)
return txn.rowcount
return deleted_count
return await self.db_pool.runInteraction(
"delete_forward_extremities_for_room",