Zulip server and web application. Open-source team chat that helps teams stay productive and focused.
message_send: Optimize get_recipients_for_user_creation_events.
bedo1338aa97fd5d
diff --git a/zerver/actions/message_send.py b/zerver/actions/message_send.pyindex 416b16a807a..5f488e1265a 100644--- a/zerver/actions/message_send.py+++ b/zerver/actions/message_send.py@@ -116,7 +116,11 @@ from zerver.models import ()from zerver.models.clients import get_clientfrom zerver.models.groups import SystemGroups, get_realm_system_groups_name_dict-from zerver.models.recipients import get_direct_message_group_user_ids+from zerver.models.recipients import (+ DirectMessageGroup,+ get_direct_message_group_hash,+ get_direct_message_group_user_ids,+)from zerver.models.scheduled_jobs import NotificationTriggersfrom zerver.models.streams import (StreamTopicsPolicyEnum,@@ -1682,14 +1686,14 @@ def get_recipients_for_user_creation_events() -> dict[UserProfile, set[int]]:"""This function returns a dictionary with data about which users would- receive stream creation events due to gaining access to a user.+ receive user creation events due to gaining access to a user.The key of the dictionary is a user object and the value is a set ofuser_ids that would gain access to that user."""recipients_for_user_creation_events: dict[UserProfile, set[int]] = defaultdict(set)- # If none of the users in the direct message conversation are- # guests, then there is no possible can_access_all_users_group+ # If none of the direct message recipients are guests,+ # then there is no possible can_access_all_users_group# policy that would mean sending this message changes any user's# user access to other users.guest_recipients = [user for user in user_profiles if user.is_guest]@@ -1704,6 +1708,20 @@ def get_recipients_for_user_creation_events(recipients_for_user_creation_events[sender].add(user_profiles[0].id)return recipients_for_user_creation_events+ # Here, we check if all participants have a common DirectMessageGroup+ # with at least one message, which would mean that every user+ # already has access to every other user, and no need to proceed.+ all_participant_ids = list({user.id for user in user_profiles} | {sender.id})+ if DirectMessageGroup.objects.filter(+ Exists(Message.objects.filter(realm=realm, recipient_id=OuterRef("recipient_id"))),+ huddle_hash=get_direct_message_group_hash(all_participant_ids),+ ).exists():+ return recipients_for_user_creation_events++ # TODO: The following 2 functions execute 4 queries.+ # While this is only for a new DirectMessageGroup,+ # it's still worth optimizing, also because these functions+ # are called in other code paths.users_involved_in_dms = get_users_involved_in_dms_with_target_users(guest_recipients, realm)subscribers_of_guest_recipient_subscriptions = get_subscribers_of_target_user_subscriptions(guest_recipientsdiff --git a/zerver/tests/test_message_send.py b/zerver/tests/test_message_send.pyindex c1ce4f17f00..fc614870037 100644--- a/zerver/tests/test_message_send.py+++ b/zerver/tests/test_message_send.py@@ -2866,12 +2866,12 @@ class PersonalMessageSendTest(ZulipTestCase):# A normal user sends the first message# to a new DirectMessageGroup.- with self.assert_database_query_count(29):+ with self.assert_database_query_count(30):self.send_group_direct_message(iago, recipients)# A normal user sends a message# to an existing DirectMessageGroup.- with self.assert_database_query_count(24):+ with self.assert_database_query_count(21):self.send_group_direct_message(iago, recipients)# Subscribe polonius to Verona to make the recipients@@ -2888,14 +2888,12 @@ class PersonalMessageSendTest(ZulipTestCase):# A guest with limited user access sends the first message# to a new DirectMessageGroup.- with self.assert_database_query_count(31):+ with self.assert_database_query_count(32):self.send_group_direct_message(polonius, recipients)# A guest with limited user access sends a message# to an existing DirectMessageGroup.- # TODO: Query count could be reduced by- # optimizing get_recipients_for_user_creation_events.- with self.assert_database_query_count(26):+ with self.assert_database_query_count(23):self.send_group_direct_message(polonius, recipients)def test_direct_message_initiator_group_setting(self) -> None: