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

do_send_messages(): Create UserMessage objects with user_id.

Browse Source 
This starts to phase out the need for UserProfile objects in
do_send_messages().  UserProfile objects are expensive to create
for large streams with lots of users.  The objects in the code
before this commit aren't even full UserProfile objects.

This change mostly sets up future performance improvements, but
we also get a minor speedup here when we run a test with 3000
stream subscribers.
This commit is contained in:
Steve Howell
2017-09-08 18:23:55 -07:00
committed by Tim Abbott
parent ba397b5109
commit a22a22966f
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
zerver/lib/actions.py
View File

@@ -807,6 +807,21 @@ def do_send_messages(messages_maybe_none):
if user_profile.is_active
}
# Service bots don't get UserMessage rows.
# is_service_bot is derived from is_bot and bot_type, and both of these fields
# should have been pre-fetched.
message['um_eligible_user_ids'] = {
user_profile.id
for user_profile in message['recipients']
if user_profile.is_active and (not user_profile.is_service_bot)
}
message['long_term_idle_user_ids'] = {
user_profile.id
for user_profile in message['recipients']
if user_profile.long_term_idle
}
links_for_embed = set() # type: Set[Text]
# Render our messages.
for message in messages:
@@ -832,11 +847,9 @@ def do_send_messages(messages_maybe_none):
# Service bots (outgoing webhook bots and embedded bots) don't store UserMessage rows;
# they will be processed later.
ums_to_create = []
for user_profile in message['active_recipients']:
# is_service_bot is derived from is_bot and bot_type, and both of these fields
# should have been pre-fetched.
if not user_profile.is_service_bot:
ums_to_create.append(UserMessage(user_profile=user_profile, message=message['message']))
for user_profile_id in message['um_eligible_user_ids']:
ums_to_create.append(UserMessage(user_profile_id=user_profile_id, message=message['message']))
# These properties on the Message are set via
# render_markdown by code in the bugdown inline patterns
@@ -845,7 +858,7 @@ def do_send_messages(messages_maybe_none):
ids_with_alert_words = message['message'].user_ids_with_alert_words
for um in ums_to_create:
if um.user_profile.id == message['message'].sender.id and \
if um.user_profile_id == message['message'].sender.id and \
message['message'].sent_by_human():
um.flags |= UserMessage.flags.read
if wildcard:
@@ -857,7 +870,7 @@ def do_send_messages(messages_maybe_none):
user_messages = []
for um in ums_to_create:
if (um.user_profile.long_term_idle and
if (um.user_profile_id in message['long_term_idle_user_ids'] and
um.message.recipient.type == Recipient.STREAM and
int(um.flags) == 0):
continue