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

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

pull/12360/merge
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)) txn.execute(sql, (event_id, room_id))
deleted_count = txn.rowcount
logger.info( logger.info(
"Deleted %s extra forward extremities for room %s", "Deleted %s extra forward extremities for room %s",
txn.rowcount, deleted_count,
room_id, room_id,
) )
if txn.rowcount > 0: if deleted_count > 0:
# Invalidate the cache # Invalidate the cache
self._invalidate_cache_and_stream( self._invalidate_cache_and_stream(
txn, txn,
@ -80,7 +82,7 @@ class EventForwardExtremitiesStore(
(room_id,), (room_id,),
) )
return txn.rowcount return deleted_count
return await self.db_pool.runInteraction( return await self.db_pool.runInteraction(
"delete_forward_extremities_for_room", "delete_forward_extremities_for_room",