Merge pull request #6148 from matrix-org/erikj/find_next_generated

1 files changed, 3 insertions, 1 deletions

diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py

index 508c4b043b..2a2b48f404 100644
--- a/synapse/storage/registration.py
+++ b/synapse/storage/registration.py
@@ -515,7 +515,9 @@ class RegistrationWorkerStore(SQLBaseStore):
         """
 
         def _find_next_generated_user_id(txn):
-            txn.execute("SELECT name FROM users")
+            # We bound between '@1' and '@a' to avoid pulling the entire table
+            # out.
+            txn.execute("SELECT name FROM users WHERE '@1' <= name AND name < '@a'")
 
             regex = re.compile(r"^@(\d+):")