paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-06 15:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optimize get_recipient_info() with get_ids_for().

Browse Source 
The get_ids_for() function produces a 2x speedup for
1000 users.
This commit is contained in:
Steve Howell
2017-09-15 13:31:09 -07:00
committed by Tim Abbott
parent 32af99cd4d
commit c4b17f2f80
1 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
zerver/lib/actions.py
View File

@@ -60,7 +60,7 @@ from zerver.models import Realm, RealmEmoji, Stream, UserProfile, UserActivity,
Reaction, EmailChangeStatus, CustomProfileField, \ Reaction, EmailChangeStatus, CustomProfileField, \
custom_profile_fields_for_realm, \ custom_profile_fields_for_realm, \
CustomProfileFieldValue, validate_attachment_request, get_system_bot, \ CustomProfileFieldValue, validate_attachment_request, get_system_bot, \
get_display_recipient_by_id get_display_recipient_by_id, query_for_ids
from zerver.lib.alert_words import alert_words_in_realm from zerver.lib.alert_words import alert_words_in_realm
from zerver.lib.avatar import avatar_url from zerver.lib.avatar import avatar_url
@@ -790,18 +790,34 @@ def get_recipient_info(recipient, sender_id):
else: else:
raise ValueError('Bad recipient type') raise ValueError('Bad recipient type')
query = UserProfile.objects.filter( if user_ids:
id__in=user_ids, query = UserProfile.objects.filter(
is_active=True, is_active=True,
).values( ).values(
'id', 'id',
'enable_online_push_notifications', 'enable_online_push_notifications',
'is_active', 'is_active',
'is_bot', 'is_bot',
'bot_type', 'bot_type',
'long_term_idle', 'long_term_idle',
) )
rows = list(query)
# query_for_ids is fast highly optimized for large queries, and we
# need this codepath to be fast (it's part of sending messages)
query = query_for_ids(
query=query,
user_ids=user_ids,
field='id'
)
rows = list(query)
else:
# TODO: We should always have at least one user_id as a recipient
# of any message we send. Right now the exception to this
# rule is `notify_new_user`, which, at least in a possibly
# contrived test scenario, can attempt to send messages
# to an inactive bot. When we plug that hole, we can avoid
# this `else` clause and just `assert(user_ids)`.
rows = []
active_user_ids = { active_user_ids = {
row['id'] row['id']