diff options
| author | Richard van der Hoff <richard@matrix.org> | 2021-07-07 11:09:49 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2021-07-07 11:09:49 +0100 |
| commit | 4358f51bb6b525f4700afdb4254f3f0ac1853807 (patch) | |
| tree | 0ae0a34adf0b9fc3902dac25c20a751023fa2678 /synapse | |
| parent | Ignore EDUs for rooms we're not in (#10317) (diff) | |
| parent | Merge branch 'master' into release-v1.38 (diff) | |
| download | synapse-4358f51bb6b525f4700afdb4254f3f0ac1853807.tar.xz | |
Merge branch 'release-v1.38' into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/storage/databases/main/events_bg_updates.py | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 1bd03462ac..aa9a3269c0 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -47,7 +47,7 @@ try: except ImportError: pass -__version__ = "1.37.1" +__version__ = "1.38.0rc1" if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)): # We import here so that we don't have to install a bunch of deps when diff --git a/synapse/storage/databases/main/events_bg_updates.py b/synapse/storage/databases/main/events_bg_updates.py index 1c95c66648..29f33bac55 100644 --- a/synapse/storage/databases/main/events_bg_updates.py +++ b/synapse/storage/databases/main/events_bg_updates.py @@ -1146,6 +1146,16 @@ class EventsBackgroundUpdatesStore(SQLBaseStore): logger.info("completing stream_ordering migration: %s", sql) txn.execute(sql) + # ANALYZE the new column to build stats on it, to encourage PostgreSQL to use the + # indexes on it. + # We need to pass execute a dummy function to handle the txn's result otherwise + # it tries to call fetchall() on it and fails because there's no result to fetch. + await self.db_pool.execute( + "background_analyze_new_stream_ordering_column", + lambda txn: None, + "ANALYZE events(stream_ordering2)", + ) + await self.db_pool.runInteraction( "_background_replace_stream_ordering_column", process ) |