paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-11 01:16:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

s/items_for_memcached/items_for_remote_cache/g

Browse Source
This commit is contained in:
Ryan Moore
2016-03-30 18:21:05 -07:00
committed by Tim Abbott
parent 93b3feda43
commit 9f29b80f8a
3 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
zerver/lib/cache_helpers.py
View File

@@ -32,29 +32,29 @@ def message_fetch_objects():
return Message.objects.select_related().filter(~Q(sender__email='tabbott/extra@mit.edu'),
id__gt=max_id - MESSAGE_CACHE_SIZE)
def message_cache_items(items_for_memcached, message):
items_for_memcached[message_cache_key(message.id)] = (message,)
def message_cache_items(items_for_remote_cache, message):
items_for_remote_cache[message_cache_key(message.id)] = (message,)
def user_cache_items(items_for_memcached, user_profile):
items_for_memcached[user_profile_by_email_cache_key(user_profile.email)] = (user_profile,)
items_for_memcached[user_profile_by_id_cache_key(user_profile.id)] = (user_profile,)
def user_cache_items(items_for_remote_cache, user_profile):
items_for_remote_cache[user_profile_by_email_cache_key(user_profile.email)] = (user_profile,)
items_for_remote_cache[user_profile_by_id_cache_key(user_profile.id)] = (user_profile,)
def stream_cache_items(items_for_memcached, stream):
items_for_memcached[get_stream_cache_key(stream.name, stream.realm_id)] = (stream,)
def stream_cache_items(items_for_remote_cache, stream):
items_for_remote_cache[get_stream_cache_key(stream.name, stream.realm_id)] = (stream,)
def client_cache_items(items_for_memcached, client):
items_for_memcached[get_client_cache_key(client.name)] = (client,)
def client_cache_items(items_for_remote_cache, client):
items_for_remote_cache[get_client_cache_key(client.name)] = (client,)
def huddle_cache_items(items_for_memcached, huddle):
items_for_memcached[huddle_hash_cache_key(huddle.huddle_hash)] = (huddle,)
def huddle_cache_items(items_for_remote_cache, huddle):
items_for_remote_cache[huddle_hash_cache_key(huddle.huddle_hash)] = (huddle,)
def recipient_cache_items(items_for_memcached, recipient):
items_for_memcached[get_recipient_cache_key(recipient.type, recipient.type_id)] = (recipient,)
def recipient_cache_items(items_for_remote_cache, recipient):
items_for_remote_cache[get_recipient_cache_key(recipient.type, recipient.type_id)] = (recipient,)
session_engine = import_module(settings.SESSION_ENGINE)
def session_cache_items(items_for_memcached, session):
def session_cache_items(items_for_remote_cache, session):
store = session_engine.SessionStore(session_key=session.session_key)
items_for_memcached[store.cache_key] = store.decode(session.session_data)
items_for_remote_cache[store.cache_key] = store.decode(session.session_data)
# Format is (objects query, items filler function, timeout, batch size)
#
@@ -75,16 +75,16 @@ cache_fillers = {
def fill_memcached_cache(cache):
memcached_time_start = get_memcached_time()
memcached_requests_start = get_memcached_requests()
items_for_memcached = {}
items_for_remote_cache = {}
(objects, items_filler, timeout, batch_size) = cache_fillers[cache]
count = 0
for obj in objects():
items_filler(items_for_memcached, obj)
items_filler(items_for_remote_cache, obj)
count += 1
if (count % batch_size == 0):
cache_set_many(items_for_memcached, timeout=3600*24)
items_for_memcached = {}
cache_set_many(items_for_memcached, timeout=3600*24*7)
cache_set_many(items_for_remote_cache, timeout=3600*24)
items_for_remote_cache = {}
cache_set_many(items_for_remote_cache, timeout=3600*24*7)
logging.info("Succesfully populated %s cache! Consumed %s memcached queries (%s time)" % \
(cache, get_memcached_requests() - memcached_requests_start,
round(get_memcached_time() - memcached_time_start, 2)))