summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Incorporate reviewBrendan Abolivier2020-08-064-21/+12
|
* Fix PUT /pushrules to use the right rule IDsBrendan Abolivier2020-08-031-2/+9
|
* Back out the database hack and replace it with a temporary config settingBrendan Abolivier2020-08-034-48/+20
|
* Fix cache nameBrendan Abolivier2020-07-311-1/+1
|
* Fix cache invalidation callsBrendan Abolivier2020-07-312-2/+2
|
* LintBrendan Abolivier2020-07-301-19/+32
|
* Merge branch 'develop' of github.com:matrix-org/synapse into ↵Brendan Abolivier2020-07-3096-1714/+2102
|\ | | | | | | babolivier/new_push_rules
| * Fix invite rejection when we have no forward-extremeties (#7980)Richard van der Hoff2020-07-301-8/+21
| | | | | | | | | | | | | | | | | | | | Thanks to some slightly overzealous cleanup in the `delete_old_current_state_events`, it's possible to end up with no `event_forward_extremities` in a room where we have outstanding local invites. The user would then get a "no create event in auth events" when trying to reject the invite. We can hack around it by using the dangling invite as the prev event.
| * Merge branch 'master' into developOlivier Wilkinson (reivilibre)2020-07-3011-23/+81
| |\
| | * 1.18.0Olivier Wilkinson (reivilibre)2020-07-301-1/+1
| | |
| | * Update worker docs with recent enhancements (#7969)Erik Johnston2020-07-2910-22/+80
| | |
| * | Convert federation client to async/await. (#7975)Patrick Cloke2020-07-306-162/+128
| | |
| * | Convert appservice to async. (#7973)Patrick Cloke2020-07-304-65/+46
| | |
| * | Convert some of the data store to async. (#7976)Patrick Cloke2020-07-306-188/+160
| | |
| * | Ensure that remove_pusher is always async (#7981)Patrick Cloke2020-07-301-1/+1
| | |
| * | Ensure the msg property of HttpResponseException is a string. (#7979)Patrick Cloke2020-07-292-7/+16
| | |
| * | Remove from the event_relations table when purging historical events. (#7978)Patrick Cloke2020-07-291-0/+2
| | |
| * | Add additional logging for SAML sessions. (#7971)Patrick Cloke2020-07-291-0/+3
| | |
| * | Re-implement unread counts (#7736)Brendan Abolivier2020-07-297-15/+162
| | |
| * | Various improvements to the docs (#7899)Aaron Raimist2020-07-291-18/+0
| | |
| * | Convert storage layer to async/await. (#7963)Patrick Cloke2020-07-283-140/+145
| | |
| * | Add an option to disable purge in delete room admin API (#7964)Dirk Klimpel2020-07-281-1/+10
| | | | | | | | | | | | | | | | | | Add option ```purge``` to ```POST /_synapse/admin/v1/rooms/<room_id>/delete``` Fixes: #3761 Signed-off-by: Dirk Klimpel dirk@klimpel.org
| * | Move some log lines from default logger to sql/transaction loggers (#7952)Andrew Morgan2020-07-281-8/+10
| | | | | | | | | Idea from matrix-org/synapse-dinsic#49
| * | Use the JSON module from the std library instead of simplejson. (#7936)Patrick Cloke2020-07-282-1/+13
| | |
| * | Option to allow server admins to join complex rooms (#7902)lugino-emeritus2020-07-282-2/+13
| | | | | | | | | | | | | | | Fixes #7901. Signed-off-by: Niklas Tittjung <nik_t.01@web.de>
| * | Merge tag 'v1.18.0rc2' into developRichard van der Hoff2020-07-285-88/+113
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.18.0rc2 (2020-07-28) ============================== Bugfixes -------- - Fix an `AssertionError` exception introduced in v1.18.0rc1. ([\#7876](https://github.com/matrix-org/synapse/issues/7876)) - Fix experimental support for moving typing off master when worker is restarted, which is broken in v1.18.0rc1. ([\#7967](https://github.com/matrix-org/synapse/issues/7967)) Internal Changes ---------------- - Further optimise queueing of inbound replication commands. ([\#7876](https://github.com/matrix-org/synapse/issues/7876))
| | * 1.18.0rc2 v1.18.0rc2Richard van der Hoff2020-07-281-1/+1
| | |
| | * Typing worker needs to handle stream update requests (#7967)Erik Johnston2020-07-281-1/+1
| | | | | | | | | | | | | | | IIRC this doesn't break tests because its only hit on reconnection, or something. Basically, when a process needs to fetch missing updates for the `typing` stream it needs to query the writer instance via HTTP (as we don't write typing notifications to the DB), the problem was that the endpoint (`streams`) was only registered on master and specifically not on the typing writer worker.
| | * Handle replication commands synchronously where possible (#7876)Richard van der Hoff2020-07-273-86/+111
| | | | | | | | | Most of the stuff we do for replication commands can be done synchronously. There's no point spinning up background processes if we're not going to need them.
| * | Convert the remaining media repo code to async / await. (#7947)Patrick Cloke2020-07-275-107/+130
| | |
| * | Convert a synapse.events to async/await. (#7949)Patrick Cloke2020-07-278-72/+73
| | |
| * | Convert groups and visibility code to async / await. (#7951)Patrick Cloke2020-07-272-31/+24
| | |
| * | Convert push to async/await. (#7948)Patrick Cloke2020-07-277-141/+97
| |/
| * 1.18.0rc1Richard van der Hoff2020-07-271-1/+1
| |
| * Fix error reporting when using `opentracing.trace` (#7961)Erik Johnston2020-07-272-12/+3
| |
| * Fix typing replication not being handled on master (#7959)Erik Johnston2020-07-273-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handling of incoming typing stream updates from replication was not hooked up on master, effecting set ups where typing was handled on a different worker. This is really only a problem if the master process is also handling sync requests, which is unlikely for those that are at the stage of moving typing off. The other observable effect is that if a worker restarts or a replication connect drops then the typing worker will issue a `POSITION typing`, triggering master process to try and stream *all* typing updates from position 0. Fixes #7907
| * Remove hacky error handling for inlineDeferreds. (#7950)Patrick Cloke2020-07-272-21/+12
| |
| * Support oEmbed for media previews. (#7920)Patrick Cloke2020-07-271-45/+220
| | | | | | Fixes previews of Twitter URLs by using their oEmbed endpoint to grab content.
| * Convert state resolution to async/await (#7942)Patrick Cloke2020-07-2412-134/+124
| |
| * Fix up types and comments that refer to Deferreds. (#7945)Patrick Cloke2020-07-247-157/+172
| |
| * Do not convert async functions to Deferreds in the interactive_auth_handler ↵Patrick Cloke2020-07-241-26/+21
| | | | | | | | (#7944)
| * Convert more of the media code to async/await (#7873)Patrick Cloke2020-07-242-33/+42
| |
| * Return an empty body for OPTIONS requests. (#7886)Patrick Cloke2020-07-241-19/+5
| |
| * Downgrade warning on client disconnect to INFO (#7928)Richard van der Hoff2020-07-241-3/+1
| | | | | | | | Clients disconnecting before we finish processing the request happens from time to time. We don't need to yell about it
| * Convert presence handler helpers to async/await. (#7939)Patrick Cloke2020-07-232-24/+23
| |
| * Update the auth providers to be async. (#7935)Patrick Cloke2020-07-232-19/+23
| |
| * Put a cache on `/state_ids` (#7931)Richard van der Hoff2020-07-231-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we send out an event which refers to `prev_events` which other servers in the federation are missing, then (after a round or two of backfill attempts), they will end up asking us for `/state_ids` at a particular point in the DAG. As per https://github.com/matrix-org/synapse/issues/7893, this is quite expensive, and we tend to see lots of very similar requests around the same time. We can therefore handle this much more efficiently by using a cache, which (a) ensures that if we see the same request from multiple servers (or even the same server, multiple times), then they share the result, and (b) any other servers that miss the initial excitement can also benefit from the work. [It's interesting to note that `/state` has a cache for exactly this reason. `/state` is now essentially unused and replaced with `/state_ids`, but evidently when we replaced it we forgot to add a cache to the new endpoint.]
| * Abort federation requests if the client disconnects early (#7930)Richard van der Hoff2020-07-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For inbound federation requests, if a given remote server makes too many requests at once, we start stacking them up rather than processing them immediatedly. However, that means that there is a fair chance that the requesting server will disconnect before we start processing the request. In that case, if it was a read-only request (ie, a GET request), there is absolutely no point in building a response (and some requests are quite expensive to handle). Even in the case of a POST request, one of two things will happen: * Most likely, the requesting server will retry the request and we'll get the information anyway. * Even if it doesn't, the requesting server has to assume that we didn't get the memo, and act accordingly. In short, we're better off aborting the request at this point rather than ploughing on with what might be a quite expensive request.
| * Convert the federation agent and related code to async/await. (#7874)Patrick Cloke2020-07-232-16/+10
| |
| * Follow-up to admin API to re-activate accounts (#7908)Patrick Cloke2020-07-222-6/+42
| |
| * Convert the message handler to async/await. (#7884)Patrick Cloke2020-07-221-136/+152
| |
* | Implement new experimental push rules with a database hack to enable themBrendan Abolivier2020-07-283-14/+259
|/
* Skip serializing /sync response if client has disconnected (#7927)Richard van der Hoff2020-07-221-0/+6
| | | ... it's a load of work which may be entirely redundant.
* Add debugging to sync response generation (#7929)Richard van der Hoff2020-07-222-2/+18
|
* Remove an unused prometheus metric (#7878)Richard van der Hoff2020-07-221-3/+1
|
* Track command processing as a background process (#7879)Richard van der Hoff2020-07-222-3/+38
| | | | I'm going to be doing more stuff synchronously, and I don't want to lose the CPU metrics down the sofa.
* Clean up PreserveLoggingContext (#7877)Richard van der Hoff2020-07-221-16/+13
| | | This had some dead code and some just plain wrong docstrings.
* fix an incorrect commentRichard van der Hoff2020-07-221-2/+2
|
* Convert room list handler to async/await. (#7912)Patrick Cloke2020-07-212-41/+31
|
* Element CSS and logo in email templates (#7919)Jason Robinson2020-07-213-0/+11
| | | | | Use Element CSS and logo in notification emails when app name is Element. Signed-off-by: Jason Robinson <jasonr@matrix.org>
* Remove unused code from synapse.logging.utils. (#7897)Karthikeyan Singaravelan2020-07-201-126/+0
|
* Fix a typo in the sample config. (#7890)Adrian2020-07-201-1/+1
|
* Fix deprecation warning: import ABC from collections.abc (#7892)Karthikeyan Singaravelan2020-07-204-6/+6
|
* Change sample config's postgres user to synapse_user (#7889)Andrew Morgan2020-07-201-1/+1
| | | | | | | The [postgres setup docs](https://github.com/matrix-org/synapse/blob/develop/docs/postgres.md#set-up-database) recommend setting up your database with user `synapse_user`. However, uncommenting the postgres defaults in the sample config leave you with user `synapse`. This PR switches the sample config to recommend `synapse_user`. Took a me a second to figure this out, so assume this will beneficial to others.
* Fix the trace function for async functions. (#7872)Patrick Cloke2020-07-171-23/+40
| | | Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
* Stop using 'device_max_stream_id' (#7882)Erik Johnston2020-07-173-5/+2
| | | | | It serves no purpose and updating everytime we write to the device inbox stream means all such transactions will conflict, causing lots of transaction failures and retries.
* Fix TypeError in synapse.notifier (#7880)Erik Johnston2020-07-171-0/+8
| | | Fixes #7774
* Add a default limit (of 100) to get/sync operations. (#7858)Patrick Cloke2020-07-172-3/+14
|
* Change "unknown room ver" logging to warning. (#7881)Erik Johnston2020-07-171-1/+1
| | | | It's somewhat expected for us to have unknown room versions in the database due to room version experiments.
* Convert device handler to async/await (#7871)Patrick Cloke2020-07-172-138/+131
|
* Convert synapse.app to async/await. (#7868)Patrick Cloke2020-07-173-41/+36
|
* Convert _base, profile, and _receipts handlers to async/await (#7860)Patrick Cloke2020-07-174-53/+41
|
* Add admin endpoint to get members in a room. (#7842)Michael Albert2020-07-162-0/+27
|
* Consistently use `db_to_json` to convert from database values to JSON ↵Patrick Cloke2020-07-1621-82/+79
| | | | objects. (#7849)
* Optimise queueing of inbound replication commands (#7861)Richard van der Hoff2020-07-161-116/+215
| | | | | | | | | | | When we get behind on replication, we tend to stack up background processes behind a linearizer. Bg processes are heavy (particularly with respect to prometheus metrics) and linearizers aren't terribly efficient once the queue gets long either. A better approach is to maintain a queue of requests to be processed, and nominate a single process to work its way through the queue. Fixes: #7444
* Reject attempts to join empty rooms over federation (#7859)Richard van der Hoff2020-07-161-2/+13
| | | | | | We shouldn't allow others to make_join through us if we've left the room; reject such attempts with a 404. Fixes #7835. Fixes #6958.
* Allow moving typing off master (#7869)Erik Johnston2020-07-169-178/+283
|
* Add ability to run multiple pusher instances (#7855)Erik Johnston2020-07-167-82/+99
| | | This reuses the same scheme as federation sender sharding
* Merge pull request #7866 from matrix-org/rav/fix_guest_user_idRichard van der Hoff2020-07-169-80/+184
|\ | | | | Fix guest user registration with lots of client readers
| * Use a postgres sequence to generate guest user IDsRichard van der Hoff2020-07-163-50/+71
| |
| * Use SequenceGenerator for state group ID allocationRichard van der Hoff2020-07-164-26/+11
| |
| * Use `PostgresSequenceGenerator` from `MultiWriterIdGenerator`Richard van der Hoff2020-07-161-4/+4
| | | | | | | | partly just to show it works, but alwo to remove a bit of code duplication.
| * Add some helper classes for generating ID sequencesRichard van der Hoff2020-07-161-0/+98
| |
* | Add some tiny type annotations (#7870)Richard van der Hoff2020-07-162-8/+6
| | | | | | I found these made pycharm have more of a clue as to what was going on in other places.
* | Remove obsolete comment.Olivier Wilkinson (reivilibre)2020-07-161-2/+0
| | | | | | | | | | | | | | | | It was correct at the time of our friend Jorik writing it (checking git blame), but the world has moved now and it is no longer a generator. Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
* | Ensure that calls to `json.dumps` are compatible with the standard library ↵Patrick Cloke2020-07-157-13/+21
| | | | | | | | json. (#7836)
* | Avoid brand new rooms in `delete_old_current_state_events` (#7854)Richard van der Hoff2020-07-151-10/+55
| | | | | | | | | | | | | | | | When considering rooms to clean up in `delete_old_current_state_events`, skip rooms which we are creating, which otherwise look a bit like rooms we have left. Fixes #7834.
* | Merge branch 'erikj/faster_typing' of github.com:matrix-org/synapse into developErik Johnston2020-07-151-2/+2
|\ \ | |/ |/|
| * Fix typoErik Johnston2020-07-151-1/+1
| |
| * Use get_users_in_room rather than state handler in typing for speedErik Johnston2020-07-151-2/+2
| |
* | Allow accounts to be re-activated from the admin APIs. (#7847)Patrick Cloke2020-07-152-21/+37
| |
* | Fix client reader sharding tests (#7853)Erik Johnston2020-07-152-1/+28
|/ | | | | | | | | | | | | | | * Fix client reader sharding tests * Newsfile * Fix typing * Update changelog.d/7853.misc Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com> * Move mocking of http_client to tests Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com>
* Convert E2E key and room key handlers to async/await. (#7851)Patrick Cloke2020-07-152-124/+98
|
* Return the proper 403 Forbidden error during errors with JWT logins. (#7844)Patrick Cloke2020-07-151-5/+3
|
* remove `retry_on_integrity_error` wrapper for persist_events (#7848)Richard van der Hoff2020-07-151-67/+0
| | | | | | | | | As far as I can tell from the sentry logs, the only time this has actually done anything in the last two years is when we had two master workers running at once, and even then, it made a bit of a mess of it (see https://github.com/matrix-org/synapse/issues/7845#issuecomment-658238739). Generally I feel like this code is doing more harm than good.
* Fix bug in per-room message retention policies. (#7850)Patrick Cloke2020-07-141-1/+1
|
* Allow email subjects to be customised through Synapse's configuration (#7846)Brendan Abolivier2020-07-142-37/+132
|
* Add delete room admin endpoint (#7613)Dirk Klimpel2020-07-146-113/+273
| | | | | | | | | | | | | | | | | | The Delete Room admin API allows server admins to remove rooms from server and block these rooms. `DELETE /_synapse/admin/v1/rooms/<room_id>` It is a combination and improvement of "[Shutdown room](https://github.com/matrix-org/synapse/blob/develop/docs/admin_api/shutdown_room.md)" and "[Purge room](https://github.com/matrix-org/synapse/blob/develop/docs/admin_api/purge_room.md)" API. Fixes: #6425 It also fixes a bug in [synapse/storage/data_stores/main/room.py](synapse/storage/data_stores/main/room.py) in ` get_room_with_stats`. It should return `None` if the room is unknown. But it returns an `IndexError`. https://github.com/matrix-org/synapse/blob/901b1fa561e3cc661d78aa96d59802cf2078cb0d/synapse/storage/data_stores/main/room.py#L99-L105 Related to: - #5575 - https://github.com/Awesome-Technologies/synapse-admin/issues/17 Signed-off-by: Dirk Klimpel dirk@klimpel.org
* Add the option to validate the `iss` and `aud` claims for JWT logins. (#7827)Patrick Cloke2020-07-142-6/+47
|
* Improve the type hints of synapse.api.errors. (#7820)Patrick Cloke2020-07-141-55/+73
|
* Correctly pass app_name to all email templates. (#7829)Erik Johnston2020-07-141-2/+8
| | | We didn't do this for e.g. registration emails.
* Support handling registration requests across multiple client readers. (#7830)Patrick Cloke2020-07-131-1/+2
|
* Fix handling of "off" in encryption_enabled_by_default_for_room_type (#7822)Brendan Abolivier2020-07-131-1/+6
| | | | | | | | | | | | | | | | | Fixes https://github.com/matrix-org/synapse/issues/7821, introduced in https://github.com/matrix-org/synapse/pull/7639 Turns out PyYAML translates `off` into a `False` boolean if it's unquoted (see https://stackoverflow.com/questions/36463531/pyyaml-automatically-converting-certain-keys-to-boolean-values), which seems to be a liberal interpretation of this bit of the YAML spec: https://yaml.org/spec/1.1/current.html#id864510 An alternative fix would be to implement the solution mentioned in the SO post linked above, but I'm aware it might break existing setups (which might use these values in the configuration file) so it's probably better just to add an extra check for this one. We should be aware that this is a thing for the next times we do that though. I didn't find any other occurrence of this bug elsewhere in the codebase.
* Merge branch 'master' into developRichard van der Hoff2020-07-131-1/+1
|\
| * 1.17.0 v1.17.0 github/release-v1.17.0 release-v1.17.0Richard van der Hoff2020-07-131-1/+1
| |
* | Do not use canonicaljson to magically handle decoding bytes from JSON. (#7802)Patrick Cloke2020-07-105-27/+15
| |
* | Add types to the server code and remove unused parameter (#7813)Patrick Cloke2020-07-101-30/+41
| |
* | Include room states on invite events sent to ASes (#6455)Sorunome2020-07-101-4/+16
| |
* | Merge branch 'release-v1.17.0' into developRichard van der Hoff2020-07-101-0/+22
|\|
| * Merge branch 'master' into release-v1.17.0Richard van der Hoff2020-07-101-0/+22
| |\
| | * fix migration, againRichard van der Hoff2020-07-101-1/+1
| | |
| | * 1.16.1Richard van der Hoff2020-07-101-1/+1
| | |
| | * Drop incorrectly-added table `local_rejections_stream`. (#7816)Richard van der Hoff2020-07-101-0/+22
| | |
* | | Add ability to shard the federation sender (#7798)Erik Johnston2020-07-1011-125/+349
| | |
* | | Fix resync remote devices on receive PDU in worker mode. (#7815)Erik Johnston2020-07-101-8/+19
| | | | | | | | | | | | | | | | | | The replication client requires that arguments are given as keyword arguments, which was not done in this case. We also pull out the logic so that we can catch and handle any exceptions raised, rather than leaving them unhandled.
* | | Fix recursion error when fetching auth chain over federation (#7817)Erik Johnston2020-07-102-16/+43
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | When fetching the state of a room over federation we receive the event IDs of the state and auth chain. We then fetch those events that we don't already have. However, we used a function that recursively fetched any missing auth events for the fetched events, which can lead to a lot of recursion if the server is missing most of the auth chain. This work is entirely pointless because would have queued up the missing events in the auth chain to be fetched already. Let's just diable the recursion, since it only gets called from one place anyway.
* | 1.17.0rc1 v1.17.0rc1Richard van der Hoff2020-07-091-1/+1
| |
* | Fix some spelling mistakes / typos. (#7811)Patrick Cloke2020-07-0924-33/+33
| |
* | `update_membership` declaration: now always returns an event id. (#7809)Richard van der Hoff2020-07-093-9/+7
| |
* | Improve stacktraces from exceptions in background processes (#7808)Richard van der Hoff2020-07-091-1/+9
| | | | | | use `Failure()` to fish out the real exception.
* | Fix `can only concatenate list (not "tuple") to list` exception (#7810)Richard van der Hoff2020-07-091-1/+1
| | | | | | It seems auth_events can be either a list or a tuple, depending on Things.
* | Pass original request headers from workers to the main process. (#7797)Patrick Cloke2020-07-091-5/+25
| |
* | Generate real events when we reject invites (#7804)Richard van der Hoff2020-07-096-169/+183
| | | | | | | | | | | | | | | | Fixes #2181. The basic premise is that, when we fail to reject an invite via the remote server, we can generate our own out-of-band leave event and persist it as an outlier, so that we have something to send to the client.
* | Add `HomeServer.signing_key` property (#7805)Richard van der Hoff2020-07-088-7/+9
| | | | | | ... instead of duplicating `config.signing_key[0]` everywhere
* | Do not use simplejson in Synapse. (#7800)Patrick Cloke2020-07-085-25/+10
| |
* | Stop passing bytes when dumping JSON (#7799)Patrick Cloke2020-07-083-6/+10
| |
* | Merge branch 'master' into developRichard van der Hoff2020-07-081-1/+1
|\|
| * 1.16.0Richard van der Hoff2020-07-081-1/+1
| |
* | Stop populating unused table `local_invites`. (#7793)Richard van der Hoff2020-07-073-80/+24
| | | | | | | | | | This table is no longer used, so we may as well stop populating it. Removing it would prevent people rolling back to older releases of Synapse, so that can happen in a future release.
* | Refactor getting replication updates from database v2. (#7740)Erik Johnston2020-07-0710-195/+335
| |
* | Add documentation for JWT login type and improve sample config. (#7776)Patrick Cloke2020-07-062-25/+58
| |
* | Convert the appservice handler to async/await. (#7775)Patrick Cloke2020-07-062-43/+32
| |
* | Don't ignore `set_tweak` actions with no explicit `value`. (#7766)reivilibre2020-07-061-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix spec compliance; tweaks without values are valid (default to True, which is only concretely specified for `highlight`, but it seems only reasonable to generalise) * Changelog for 7766. * Add documentation to `tweaks_for_actions` May as well tidy up when I'm here. * Add a test for `tweaks_for_actions`
* | Allow to use higher versions of prometheus_client (#7780)Oliver Kurz2020-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/matrix-org/synapse/issues/7641 The package was pinned to <0.8.0 without an obvious reasoning with 7ad1d7635 in https://github.com/matrix-org/synapse/pull/5636 while the version selection looks to just try to exclude an arbitrary next minor version number that might introduce API breaking changes. Selecting the next minor number might be a good conservative selection. Downstream distributions already reported success patching out the version requirements. This also fixes the integration of upgraded packages into openSUSE packages, e.g. for openSUSE Tumbleweed which already ships prometheus_client >= 0.8 . Signed-off-by: Oliver Kurz <okurz@suse.de> Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
* | isort 5 compatibility (#7786)Will Hunt2020-07-0515-25/+15
| | | | | | The CI appears to use the latest version of isort, which is a problem when isort gets a major version bump. Rather than try to pin the version, I've done the necessary to make isort5 happy with synapse.
* | Merge different Resource implementation classes (#7732)Erik Johnston2020-07-0315-309/+256
| |
* | Fix inconsistent handling of upper and lower cases of email addresses. (#7021)Dirk Klimpel2020-07-035-18/+84
| | | | | | fixes #7016
* | Merge tag 'v1.16.0rc2' into developPatrick Cloke2020-07-023-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.16.0rc2 (2020-07-02) ============================== Synapse 1.16.0rc2 includes the security fixes released with Synapse 1.15.2. Please see [below](https://github.com/matrix-org/synapse/blob/master/CHANGES.md#synapse-1152-2020-07-02) for more details. Improved Documentation ---------------------- - Update postgres image in example `docker-compose.yaml` to tag `12-alpine`. ([\#7696](https://github.com/matrix-org/synapse/issues/7696)) Internal Changes ---------------- - Add some metrics for inbound and outbound federation latencies: `synapse_federation_server_pdu_process_time` and `synapse_event_processing_lag_by_event`. ([\#7771](https://github.com/matrix-org/synapse/issues/7771))
| * 1.16.0rc2Patrick Cloke2020-07-021-1/+1
| |
| * Merge branch 'master' into release-v1.16.0Patrick Cloke2020-07-0211-97/+106
| |\
| * | Fix new metric where we used ms instead of seconds (#7771)Erik Johnston2020-07-012-2/+2
| | | | | | | | | | | | Introduced in #7755, not yet released.
* | | Merge branch 'master' into developPatrick Cloke2020-07-0211-97/+106
|\ \ \ | | |/ | |/|
| * | 1.15.2Patrick Cloke2020-07-021-1/+1
| | |
| * | Correctly handle outliers as prev events over federationErik Johnston2020-07-021-3/+3
| | |
| * | Ensure that HTML pages served from Synapse include headers to avoid embedding.Patrick Cloke2020-07-0210-94/+103
| | |
* | | Hack to add push priority to push notifications (#7765)reivilibre2020-07-011-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove obsolete comment about ancient temporary code Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> * Implement hack to set push priority based on whether the tweaks indicate the event might cause effects. * Changelog for 7765 Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> * Antilint * Add tests for push priority Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> * Update synapse/push/httppusher.py Co-authored-by: Brendan Abolivier <babolivier@matrix.org> * Antilint * Remove needless invites from tests. Co-authored-by: Brendan Abolivier <babolivier@matrix.org>
* | | Add early returns to `_check_for_soft_fail` (#7769)Richard van der Hoff2020-07-011-64/+55
| | | | | | | | | | | | my editor was complaining about unset variables, so let's add some early returns to fix that and reduce indentation/cognitive load.
* | | Use symbolic names for replication stream names (#7768)Richard van der Hoff2020-07-0110-22/+26
| | | | | | | | | This makes it much easier to find where streams are referenced.
* | | Type checking for `FederationHandler` (#7770)Richard van der Hoff2020-07-011-17/+30
| | | | | | | | | fix a few things to make this pass mypy.
* | | Fix incorrect error message when database CTYPE was set incorrectly. (#7760)Richard van der Hoff2020-07-011-1/+1
| |/ |/|
* | 1.16.0rc1Andrew Morgan2020-07-011-1/+1
| |
* | Back out MSC2625 implementation (#7761)Brendan Abolivier2020-07-016-142/+33
| |
* | Additional configuration options for auto-join rooms (#7763)Patrick Cloke2020-06-303-67/+273
| |
* | Add some metrics for inbound and outbound federation processing times (#7755)Erik Johnston2020-06-304-17/+42
| |
* | Explain the purpose of the "tests" conditional dependency requirement (#7751)Andrew Morgan2020-06-301-0/+4
| |
* | Add another yield point to state res v2 (#7746)Erik Johnston2020-06-261-2/+10
| |
* | Yield during large v2 state res. (#7735)Erik Johnston2020-06-243-11/+52
| | | | | | | | | | | | | | | | | | | | | | State res v2 across large data sets can be very CPU intensive, and if all the relevant events are in the cache the algorithm will run from start to finish within a single reactor tick. This can result in blocking the reactor tick for several seconds, which can have major repercussions on other requests. To fix this we simply add the occaisonal `sleep(0)` during iterations to yield execution until the next reactor tick. The aim is to only do this for large data sets so that we don't impact otherwise quick resolutions.=
* | add org.matrix.login.jwt so that m.login.jwt can be deprecated (#7675)Sorunome2020-06-241-1/+4
| |
* | Set Content-Length for Metrics requests (#7730)Christian Svensson2020-06-231-1/+4
| | | | | | | | | | | | HTTP requires the response to contain a Content-Length header unless chunked encoding is being used. Prometheus metrics endpoint did not set this, causing software such as prometheus-proxy to not be able to scrape synapse for metrics. Signed-off-by: Christian Svensson <blue@cmd.nu>
* | Allow local media to be marked as safe from being quarantined. (#7718)Patrick Cloke2020-06-224-35/+52
| |
* | Convert directory handler to async/await (#7727)Patrick Cloke2020-06-222-40/+32
| |
* | Speed up state res v2 across large state differences. (#7725)Erik Johnston2020-06-191-1/+2
| |
* | add a commentRichard van der Hoff2020-06-181-0/+2
| |
* | Merge pull request #7716 from matrix-org/babolivier/unread_fixBrendan Abolivier2020-06-172-2/+2
|\ \ | | | | | | Fix unread counts in sync
| * | Fix unread counts in syncBrendan Abolivier2020-06-172-2/+2
| | | | | | | | | | | | | | | * Always return an unread_count in get_unread_event_push_actions_by_room_for_user * Don't always expect unread_count to be there so we don't take out sync entirely if something goes wrong
* | | Convert the typing handler to async/await. (#7679)Patrick Cloke2020-06-171-18/+11
| | |
* | | Require parameterized package version to be at least 0.7.0. (#7680)Oleg Girko2020-06-171-1/+2
|/ / | | | | | | | | Older versions of `parameterized` package have no `parameterized_class` decorator. This decorator is used in tests. Signed-off-by: Oleg Girko <ol@infoserver.lv>
* | Add support for using rust-python-jaeger-reporter (#7697)Erik Johnston2020-06-171-3/+36
| |
* | Support running multiple media repos. (#7706)Erik Johnston2020-06-172-3/+21
| | | | | | | | | | This requires a new config option to specify which media repo should be responsible for running background jobs to e.g. clear out expired URL preview caches.
* | Fetch from the r0 media path instead of the unspecced v1. (#7714)Patrick Cloke2020-06-171-4/+4
| |
* | Implement unread counter (MSC2625) (#7673)Brendan Abolivier2020-06-176-32/+141
|\ \ | | | | | | Implementation of https://github.com/matrix-org/matrix-doc/pull/2625
| * \ Merge branch 'develop' into babolivier/mark_unreadBrendan Abolivier2020-06-1551-271/+218
| |\ \
| * \ \ Merge branch 'develop' into babolivier/mark_unreadBrendan Abolivier2020-06-1513-103/+295
| |\ \ \
| * | | | Incorporate reviewBrendan Abolivier2020-06-151-15/+11
| | | | |
| * | | | LintBrendan Abolivier2020-06-121-3/+8
| | | | |
| * | | | Incorporate review bitsBrendan Abolivier2020-06-122-21/+19
| | | | |
| * | | | Pre-populate the unread_count columnBrendan Abolivier2020-06-121-0/+5
| | | | |
| * | | | Don't update the schema versionBrendan Abolivier2020-06-122-1/+1
| | | | |
| * | | | Use attr instead of a dictBrendan Abolivier2020-06-121-21/+31
| | | | |
| * | | | Fix summary rotationBrendan Abolivier2020-06-121-12/+35
| | | | |
| * | | | Log for invalid values of notifBrendan Abolivier2020-06-111-0/+6
| | | | |
| * | | | Fix SQLBrendan Abolivier2020-06-111-3/+3
| | | | |
| * | | | Fix schema updateBrendan Abolivier2020-06-111-1/+1
| | | | |
| * | | | LintBrendan Abolivier2020-06-111-1/+2
| | | | |
| * | | | Save the count of unread messages to event_push_summaryBrendan Abolivier2020-06-113-20/+53
| | | | |
| * | | | Actually act on mark_unreadBrendan Abolivier2020-06-111-3/+7
| | | | |
| * | | | Appease mypyBrendan Abolivier2020-06-101-1/+1
| | | | |
| * | | | LintBrendan Abolivier2020-06-101-3/+3
| | | | |
| * | | | Use temporary prefixes as per the MSCBrendan Abolivier2020-06-103-3/+5
| | | | |
| * | | | Use a more efficient way of calculating countersBrendan Abolivier2020-06-101-23/+20
| | | | |
| * | | | Add a new unread_counter to sync responsesBrendan Abolivier2020-06-103-3/+28
| | | | |
| * | | | Rename dont_push into mark_unreadBrendan Abolivier2020-06-102-5/+4
| | | | |
| * | | | Merge branch 'develop' into babolivier/mark_unreadBrendan Abolivier2020-06-10616-26200/+42607
| |\ \ \ \
| * | | | | Add experimental "dont_push" push action to suppress push for notificationsMatthew Hodgson2019-09-191-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a potential solution to https://github.com/vector-im/riot-web/issues/3374 and https://github.com/vector-im/riot-web/issues/5953 as raised by Mozilla at https://github.com/vector-im/riot-web/issues/10868. This lets you define a push rule action which increases the badge count (unread notification) count on a given room, but doesn't actually send a push for that notification via email or HTTP. We might want to define this as the default behaviour for group chats in future to solve https://github.com/vector-im/riot-web/issues/3268 at last. This is implemented as a string action rather than a tweak because: * Other pushers don't care about the tweak, given they won't ever get pushed * The DB can store the tweak more efficiently using the existing `notify` table. * It avoids breaking the default_notif/highlight_action optimisations. Clients which generate their own notifs (e.g. desktop notifs from Riot/Web would need to be aware of the new push action) to uphold it. An alternative way to do this would be to maintain a `msg_count` alongside `highlight_count` and `notification_count` in `unread_notifications` in sync responses. However, doing this by counting the rows in `events` since the `stream_position` of the user's last read receipt turns out to be painfully slow (~200ms), perhaps due to the size of the events table. So instead, we use the highly optimised existing event_push_actions (and event_push_actions_staging) table to maintain the counts - using the code paths which already exist for tracking unread notification counts efficiently. These queries are typically ~3ms or so. The biggest issues I see here are: * We're slightly repurposing the `notif` field on `event_push_actions` to track whether a given action actually sent a `push` or not. This doesn't seem unreasonable, but it's slightly naughty given that previously the field explicitly tracked whether `notify` was true for the action (and as a result, it was uselessly always set to 1 in the DB). * We're going to put more load on the `event_push_actions` table for all the random group chats which people had previously muted. In practice i don't think there are many of these though. * There isn't an MSC for this yet (although this comment could become one).
* | | | | | fix broken link in sample config (#7712)Richard van der Hoff2020-06-161-1/+1
| | | | | |
* | | | | | Refactor getting replication updates from database. (#7636)Erik Johnston2020-06-168-72/+250
| | | | | | | | | | | | | | | | | | The aim here is to make it easier to reason about when streams are limited and when they're not, by moving the logic into the database functions themselves. This should mean we can kill of `db_query_to_update_function` function.
* | | | | | Fix "argument of type 'ObservableDeferred' is not iterable" error (#7708)Patrick Cloke2020-06-162-5/+6
| | | | | |
* | | | | | Include a user agent in federation requests. (#7677)Patrick Cloke2020-06-163-4/+32
| | | | | |
* | | | | | Replace all remaining six usage with native Python 3 equivalents (#7704)Dagfinn Ilmari Mannsåker2020-06-1657-201/+90
| | | | | |
* | | | | | Convert the device message and pagination handlers to async/await. (#7678)Patrick Cloke2020-06-162-31/+18
| | | | | |
* | | | | | Create a ListenerConfig object (#7681)Richard van der Hoff2020-06-167-148/+216
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ended up being a bit more invasive than I'd hoped for (not helped by generic_worker duplicating some of the code from homeserver), but hopefully it's an improvement. The idea is that, rather than storing unstructured `dict`s in the config for the listener configurations, we instead parse it into a structured `ListenerConfig` object.
* | | | | | Merge branch 'master' into developBrendan Abolivier2020-06-163-9/+11
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | 1.15.1Brendan Abolivier2020-06-161-1/+1
| | | | | |
| * | | | | Wrap register_device coroutine in an ensureDeferred (#7684)Andrew Morgan2020-06-161-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/matrix-org/synapse/issues/7683 Broke in: #7649 We had a `yield` acting on a coroutine. To be fair this one is a bit difficult to notice as there's a function in the middle that just passes the coroutine along.
| * | | | | Enable 3PID add/bind/unbind endpoints on r0 routesBrendan Abolivier2020-06-151-3/+3
| | | | | |
* | | | | | Ensure the body is a string before comparing push rules. (#7701)Patrick Cloke2020-06-151-2/+2
| | | | | |
* | | | | | Ensure etag is a string for GET room_keys/version response (#7691)Hubert Chathi2020-06-151-0/+1
| | | | | |
* | | | | | Update m.id.phone to use 'phone' instead of 'number' (#7687)Andrew Morgan2020-06-151-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The spec [states](https://matrix.org/docs/spec/client_server/r0.6.1#phone-number) that `m.id.phone` requires the field `country` and `phone`. In Synapse, we've been enforcing `country` and `number`. I am not currently sure whether this affects any client implementations. This issue was introduced in #1994.
* | | | | | Fix "There was no active span when trying to log." error (#7698)Erik Johnston2020-06-151-0/+1
| |_|_|_|/ |/| | | |
* | | | | Discard RDATA from already seen positions. (#7648)Patrick Cloke2020-06-153-6/+33
| | | | |
* | | | | Replace iteritems/itervalues/iterkeys with native versions. (#7692)Patrick Cloke2020-06-1546-263/+183
| | | | |
* | | | | Fix warnings about losing log context during UI auth. (#7688)Patrick Cloke2020-06-121-1/+1
| | | | |
* | | | | Fix a typo when comparing the URI & method during UI Auth. (#7689)Patrick Cloke2020-06-121-1/+1
| |_|_|/ |/| | |
* | | | Remove "user_id" from GET /presence. (#7606)Will Hunt2020-06-111-1/+3
| | | |
* | | | Merge branch 'master' into developBrendan Abolivier2020-06-111-1/+1
|\| | |
| * | | 1.15.0 v1.15.0 github/release-v1.15.0 release-v1.15.0Brendan Abolivier2020-06-111-1/+1
| | |/ | |/|
* | | Increase the default SAML session expirary time to 15 minutes. (#7664)Patrick Cloke2020-06-111-2/+2
| | |
* | | fix typo in sample_config.yaml (#7652)wondratsch2020-06-111-1/+1
| | | | | | | | | | | | | | | Just a simple typo fix. Signed-off-by: wondratsch 28294257+wondratsch@users.noreply.github.com
* | | Take out a lock before modifying _CACHES (#7663)Richard van der Hoff2020-06-101-5/+15
| | | | | | | | | | | | This should fix #7610.
* | | Add option to enable encryption by default for new rooms (#7639)Andrew Morgan2020-06-105-29/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/matrix-org/synapse/issues/2431 Adds config option `encryption_enabled_by_default_for_room_type`, which determines whether encryption should be enabled with the default encryption algorithm in private or public rooms upon creation. Whether the room is private or public is decided based upon the room creation preset that is used. Part of this PR is also pulling out all of the individual instances of `m.megolm.v1.aes-sha2` into a constant variable to eliminate typos ala https://github.com/matrix-org/synapse/pull/7637 Based on #7637
* | | Clean-up the fallback login code. (#7657)Patrick Cloke2020-06-103-64/+129
|/ /
* | 1.15.0rc1 v1.15.0rc1Brendan Abolivier2020-06-091-1/+1
| |
* | Revert "1.15.0rc1"Brendan Abolivier2020-06-091-1/+1
| | | | | | | | This reverts commit 8587b0426fa4e65992aaa47158e991fa1797d3fb.
* | 1.15.0rc1Brendan Abolivier2020-06-091-1/+1
| |
* | Fix bug in account data replication stream. (#7656)Erik Johnston2020-06-095-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Ensure account data stream IDs are unique. The account data stream is shared between three tables, and the maximum allocated ID was tracked in a dedicated table. Updating the max ID happened outside the transaction that allocated the ID, leading to a race where if the server was restarted then the same ID could be allocated but the max ID failed to be updated, leading it to be reused. The ID generators have support for tracking across multiple tables, so we may as well use that instead of a dedicated table. * Fix bug in account data replication stream. If the same stream ID was used in both global and room account data then the getting updates for the replication stream would fail due to `heapq.merge(..)` trying to compare a `str` with a `None`. (This is because you'd have two rows like `(534, '!room')` and `(534, None)` from the room and global account data tables). Fix is just to order by stream ID, since we don't rely on the ordering beyond that. The bug where stream IDs can be reused should be fixed now, so this case shouldn't happen going forward. Fixes #7617
* | Convert the registration handler to async/await. (#7649)Patrick Cloke2020-06-082-68/+47
| |
* | Accept device information at the login fallback endpoint. (#7629)Patrick Cloke2020-06-081-35/+120
| |
* | Convert user directory handler and related classes to async/await. (#7640)Patrick Cloke2020-06-054-107/+73
| |
* | Add an option to disable autojoin for guest accounts (#6637)Travis Ralston2020-06-052-1/+15
| | | | | | | | Fixes https://github.com/matrix-org/synapse/issues/3177
* | Update to the stable SSO prefix for UI Auth. (#7630)Patrick Cloke2020-06-051-1/+1
| |
* | Fix type information on `assert_*_is_admin` methods (#7645)Richard van der Hoff2020-06-052-23/+18
| | | | | | These things don't return Deferreds.
* | Remove some unused constants. (#7644)Richard van der Hoff2020-06-051-4/+0
| |
* | Typo fixes.Patrick Cloke2020-06-052-2/+2
| |
* | Allow new users to be registered via the admin API even if the monthly ↵Dirk Klimpel2020-06-052-1/+8
| | | | | | | | active user limit has been reached (#7263)
* | Add device management to admin API (#7481)Dirk Klimpel2020-06-052-0/+169
| | | | | | | | | | | | | | | | | | | | - Admin is able to - change displaynames - delete devices - list devices - get device informations Fixes #7330
* | Attempt to fix PhoneHomeStatsTestCase.test_performance_100 being flaky. (#7634)Patrick Cloke2020-06-051-19/+23
| |
* | Support CS API v0.6.0 (#6585)Andrew Morgan2020-06-051-15/+1
| |
* | Add support for webp thumbnailing (#7586)WGH2020-06-051-0/+1
| | | | | | | | | | Closes #4382 Signed-off-by: Maxim Plotnikov <wgh@torlan.ru>
* | Performance improvements and refactor of Ratelimiter (#7595)Andrew Morgan2020-06-0510-162/+193
| | | | | | | | | | | | | | | | | | | | While working on https://github.com/matrix-org/synapse/issues/5665 I found myself digging into the `Ratelimiter` class and seeing that it was both: * Rather undocumented, and * causing a *lot* of config checks This PR attempts to refactor and comment the `Ratelimiter` class, as well as encourage config file accesses to only be done at instantiation. Best to be reviewed commit-by-commit.
* | Fix encryption algorithm typos in tests/comments (#7637)Andrew Morgan2020-06-041-4/+4
| | | | | | | | | | | | | | | | @uhoreg has confirmed these were both typos. They are only in comments and tests though, rather than anything critical. Introduced in: * https://github.com/matrix-org/synapse/pull/7157 * https://github.com/matrix-org/synapse/pull/5726
* | Advertise the token login type when OpenID Connect is enabled. (#7631)Patrick Cloke2020-06-041-8/+3
| |
* | Cleanups to the OpenID Connect integration (#7628)Richard van der Hoff2020-06-034-83/+125
| | | | | | | | docs, default configs, comments. Nothing very significant.
* | async/await get_user_id_by_threepid (#7620)Andrew Morgan2020-06-033-28/+28
| | | | | | | | | | Based on #7619 async's `get_user_id_by_threepid` and its call stack.
* | Check if the localpart is reserved for guests earlier in the registration ↵Brendan Abolivier2020-06-031-9/+9
| | | | | | | | | | flow (#7625) This is so the user is warned about the username not being valid as soon as possible, rather than only once they've finished UIA.
* | Fix exceptions when fetching events from a down host. (#7622)Erik Johnston2020-06-031-1/+1
| | | | | | We already caught some exceptions, but not all.
* | Clean up exception handling in SAML2ResponseResource (#7614)Richard van der Hoff2020-06-034-60/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | * Expose `return_html_error`, and allow it to take a Jinja2 template instead of a raw string * Clean up exception handling in SAML2ResponseResource * use the existing code in `return_html_error` instead of re-implementing it (giving it a jinja2 template rather than inventing a new form of template) * do the exception-catching in the REST layer rather than in the handler layer, to make sure we catch all exceptions.
* | Fix a bug in automatic user creation with m.login.jwt. (#7585)Olof Johansson2020-06-011-7/+8
| |
* | Process cross-signing keys when resyncing device lists (#7594)Brendan Abolivier2020-06-012-18/+62
| | | | | | It looks like `user_device_resync` was ignoring cross-signing keys from the results received from the remote server. This patch fixes this, by processing these keys using the same process `_handle_signing_key_updates` does (and effectively factor that part out of that function).
* | Email notifications for new users when creating via the Admin API. (#7267)Dirk Klimpel2020-06-011-0/+16
| |
* | Improve performance of _get_state_groups_from_groups_txn (#7567)Dagfinn Ilmari Mannsåker2020-06-011-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The query keeps showing up in my slow query log. This changes the plan under the top-level Sort node from ``` WindowAgg (cost=280335.88..292963.15 rows=561212 width=80) (actual time=138.651..160.562 rows=27112 loops=1) -> Sort (cost=280335.88..281738.91 rows=561212 width=84) (actual time=138.597..140.622 rows=27112 loops=1) Sort Key: state_groups_state.type, state_groups_state.state_key, state_groups_state.state_group Sort Method: quicksort Memory: 4581kB -> Nested Loop (cost=2.83..226745.22 rows=561212 width=84) (actual time=21.548..47.657 rows=27112 loops=1) -> HashAggregate (cost=2.27..3.28 rows=101 width=8) (actual time=21.526..21.535 rows=20 loops=1) Group Key: state.state_group -> CTE Scan on state (cost=0.00..2.02 rows=101 width=8) (actual time=21.280..21.493 rows=20 loops=1) -> Index Scan using state_groups_state_type_idx on state_groups_state (cost=0.56..2189.40 rows=5557 width=84) (actual time=0.005..0.991 rows=1356 loops=20) Index Cond: (state_group = state.state_group) ``` to ``` Nested Loop (cost=2.83..226745.22 rows=561212 width=84) (actual time=24.194..52.834 rows=27112 loops=1) -> HashAggregate (cost=2.27..3.28 rows=101 width=8) (actual time=24.130..24.138 rows=20 loops=1) Group Key: state.state_group -> CTE Scan on state (cost=0.00..2.02 rows=101 width=8) (actual time=23.887..24.113 rows=20 loops=1) -> Index Scan using state_groups_state_type_idx on state_groups_state (cost=0.56..2189.40 rows=5557 width=84) (actual time=0.016..1.159 rows=1356 loops=20) Index Cond: (state_group = state.state_group) ``` This cuts the execution time from ~190ms to ~130ms, i.e. a reduction of ~30%. The full plans are visualised at https://explain.depesz.com/s/WpbT and https://explain.depesz.com/s/KlEk Signed-off-by: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>