paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-23 04:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

groups: Use realm_for_sharding for limiting NamedUserGroup queries.

Browse Source 
For get and filter queries of NamedUserGroup, realm_for_sharding
field is used instead of realm field, as directly using
realm_for_sharding field on NamedUserGroup makes the query faster
than using realm present on the base UserGroup table.
This commit is contained in:
Sahil Batra
2025-09-10 12:54:33 +05:30
committed by Tim Abbott
parent d4d7a8fe2a
commit 764f4aa2e0
42 changed files with 573 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
zproject/backends.py
View File

@@ -1827,10 +1827,14 @@ def sync_groups_for_prereg_user(
]
groups_to_ensure_member = list(
NamedUserGroup.objects.filter(realm=realm, name__in=group_names_to_ensure_member)
NamedUserGroup.objects.filter(
realm_for_sharding=realm, name__in=group_names_to_ensure_member
)
)
groups_to_ensure_not_member = list(
NamedUserGroup.objects.filter(realm=realm, name__in=group_names_to_ensure_not_member)
NamedUserGroup.objects.filter(
realm_for_sharding=realm, name__in=group_names_to_ensure_not_member
)
)
prereg_user.groups.add(*groups_to_ensure_member)
@@ -1890,12 +1894,14 @@ def sync_groups(
if to_add:
logger.debug("Adding user %s to groups %s", user_id, to_add)
add_groups = list(NamedUserGroup.objects.filter(name__in=to_add, realm=realm))
add_groups = list(NamedUserGroup.objects.filter(name__in=to_add, realm_for_sharding=realm))
bulk_add_members_to_user_groups(add_groups, [user_id], acting_user=None)
if to_remove:
logger.debug("Removing user %s from groups %s", user_id, to_remove)
remove_groups = list(NamedUserGroup.objects.filter(name__in=to_remove, realm=realm))
remove_groups = list(
NamedUserGroup.objects.filter(name__in=to_remove, realm_for_sharding=realm)
)
bulk_remove_members_from_user_groups(remove_groups, [user_id], acting_user=None)
logger.debug("Finished group sync for user %s", user_id)