Zulip server and web application. Open-source team chat that helps teams stay productive and focused.
users: Optimize bulk_get_subscribers_of_target_user_subscriptions.
Bedo Khaled49ed929428a8
diff --git a/zerver/actions/message_send.py b/zerver/actions/message_send.pyindex ab07c66379e..dcf926dec2d 100644--- a/zerver/actions/message_send.py+++ b/zerver/actions/message_send.py@@ -1795,10 +1795,6 @@ def get_recipients_for_user_creation_events().exists():return recipients_for_user_creation_events- # TODO: bulk_get_subscribers_of_target_user_subscriptions- # executes 2 queries. While this is only for a new DirectMessageGroup,- # it's still worth optimizing, also because it's called- # in other code paths.subscribers_of_guest_recipient_subscriptions = (bulk_get_subscribers_of_target_user_subscriptions(guest_recipients))diff --git a/zerver/lib/users.py b/zerver/lib/users.pyindex 724395d8b1d..24b591b9ecf 100644--- a/zerver/lib/users.py+++ b/zerver/lib/users.py@@ -4,7 +4,7 @@ import unicodedatafrom collections import defaultdictfrom collections.abc import Iterable, Mapping, Sequencefrom email.headerregistry import Address-from operator import itemgetter+from operator import attrgetterfrom typing import Any, TypedDictfrom django.conf import settings@@ -858,16 +858,17 @@ def bulk_get_subscribers_of_target_user_subscriptions(recipient__type__in=[Recipient.STREAM, Recipient.DIRECT_MESSAGE_GROUP],).order_by("user_profile_id")- .values("user_profile_id", "recipient_id")+ .values_list("user_profile_id", "recipient_id", named=True))target_users_subbed_recipient_ids = set()target_user_subscriptions_dict: dict[int, set[int]] = defaultdict(set)- for user_profile_id, sub_rows in itertools.groupby(- target_user_subscriptions, itemgetter("user_profile_id")+ for user_profile_id, target_sub_rows in itertools.groupby(+ target_user_subscriptions,+ attrgetter("user_profile_id"),):- recipient_ids = {row["recipient_id"] for row in sub_rows}+ recipient_ids = {row.recipient_id for row in target_sub_rows}target_user_subscriptions_dict[user_profile_id] = recipient_idstarget_users_subbed_recipient_ids |= recipient_ids@@ -885,26 +886,24 @@ def bulk_get_subscribers_of_target_user_subscriptions()else:subs_in_target_user_subscriptions_query = subs_in_target_user_subscriptions_query.filter(- recipient__type__in=[Recipient.STREAM, Recipient.DIRECT_MESSAGE_GROUP],is_user_active=True,)subs_in_target_user_subscriptions = subs_in_target_user_subscriptions_query.order_by("recipient_id"- ).values("user_profile_id", "recipient_id")+ ).values_list("user_profile_id", "recipient_id", named=True)subscribers_dict_by_recipient_ids: dict[int, set[int]] = defaultdict(set)for recipient_id, sub_rows in itertools.groupby(- subs_in_target_user_subscriptions, itemgetter("recipient_id")+ subs_in_target_user_subscriptions, attrgetter("recipient_id")):- user_ids = {row["user_profile_id"] for row in sub_rows}+ user_ids = {row.user_profile_id for row in sub_rows}subscribers_dict_by_recipient_ids[recipient_id] = user_idsusers_subbed_to_target_user_subscriptions_dict: dict[int, set[int]] = defaultdict(set)- for user_id in target_user_ids:- target_user_subbed_recipients = target_user_subscriptions_dict[user_id]+ for target_user_id, target_user_subbed_recipients in target_user_subscriptions_dict.items():for recipient_id in target_user_subbed_recipients:- users_subbed_to_target_user_subscriptions_dict[user_id] |= (+ users_subbed_to_target_user_subscriptions_dict[target_user_id] |= (subscribers_dict_by_recipient_ids[recipient_id])