diff options
| author | Sean Quah <8349537+squahtx@users.noreply.github.com> | 2021-12-14 12:34:30 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-14 12:34:30 +0000 |
| commit | a4dce5b53dd460e7c6757648ff4a348b490c6213 (patch) | |
| tree | 92e9f608c727a246002fffb2ff81b7cc410d6a55 /synapse/storage/databases/main/event_federation.py | |
| parent | Add missing type hints to synapse.http. (#11571) (diff) | |
| download | synapse-a4dce5b53dd460e7c6757648ff4a348b490c6213.tar.xz | |
Remove redundant `COALESCE()`s around `COUNT()`s in database queries (#11570)
`COUNT()` never returns `NULL`. A `COUNT(*)` over 0 rows is 0 and a `COUNT(NULL)` is also 0.
Diffstat (limited to 'synapse/storage/databases/main/event_federation.py')
| -rw-r--r-- | synapse/storage/databases/main/event_federation.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/synapse/storage/databases/main/event_federation.py b/synapse/storage/databases/main/event_federation.py index 2287f1cc68..bc5ff25d08 100644 --- a/synapse/storage/databases/main/event_federation.py +++ b/synapse/storage/databases/main/event_federation.py @@ -1393,7 +1393,7 @@ class EventFederationWorkerStore(EventsWorkerStore, SignatureWorkerStore, SQLBas count = await self.db_pool.simple_select_one_onecol( table="federation_inbound_events_staging", keyvalues={"room_id": room_id}, - retcol="COALESCE(COUNT(*), 0)", + retcol="COUNT(*)", desc="prune_staged_events_in_room_count", ) @@ -1485,9 +1485,7 @@ class EventFederationWorkerStore(EventsWorkerStore, SignatureWorkerStore, SQLBas """Update the prometheus metrics for the inbound federation staging area.""" def _get_stats_for_federation_staging_txn(txn): - txn.execute( - "SELECT coalesce(count(*), 0) FROM federation_inbound_events_staging" - ) + txn.execute("SELECT count(*) FROM federation_inbound_events_staging") (count,) = txn.fetchone() txn.execute( |