Remove code to pre-fetch presence objects.

(imported from commit 546e98bedd809e66f506581434402caad5a984de)
This commit is contained in:
Steve Howell
2013-09-16 11:15:15 -04:00
parent e881fdd2ff
commit 0d2c6f756f

View File

@@ -6,7 +6,7 @@ from __future__ import absolute_import
from django.conf import settings
from zerver.models import Message, UserProfile, Stream, get_stream_cache_key, \
Recipient, get_recipient_cache_key, Client, get_client_cache_key, \
Huddle, huddle_hash_cache_key, Realm, get_status_dict_by_realm
Huddle, huddle_hash_cache_key
from zerver.lib.cache import cache_with_key, cache_set, message_cache_key, \
user_profile_by_email_cache_key, user_profile_by_id_cache_key, \
get_memcached_time, get_memcached_requests, cache_set_many, \
@@ -49,9 +49,6 @@ def huddle_cache_items(items_for_memcached, huddle):
def recipient_cache_items(items_for_memcached, recipient):
items_for_memcached[get_recipient_cache_key(recipient.type, recipient.type_id)] = (recipient,)
def presence_fetch_objects():
return [(realm.id, get_status_dict_by_realm(realm.id)) for realm in Realm.objects.all()]
def presence_cache_items(items_for_memcached, status_dict):
items_for_memcached[status_dict_cache_key_for_realm_id(status_dict[0])] = (status_dict[1],)
@@ -74,7 +71,6 @@ cache_fillers = {
'message': (message_fetch_objects, message_cache_items, 3600 * 24, 1000),
'huddle': (lambda: Huddle.objects.select_related().all(), huddle_cache_items, 3600*24*7, 10000),
'session': (lambda: Session.objects.all(), session_cache_items, 3600*24*7, 10000),
'presence': (presence_fetch_objects, presence_cache_items, 3600*24*7, 10000),
}
def fill_memcached_cache(cache):