Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cache non-existent attributes too to avoid querying for them more than

Browse source 
once.
This commit is contained in:
Simon Vermeersch 2017-02-09 20:21:27 +01:00 • committed by Griatch
parent 9103532498
commit af7475c6b9
1 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

25
evennia/typeclasses/attributes.py
View file

@ -250,13 +250,23 @@ class AttributeHandler(object):
category = category.strip().lower() if category else None category = category.strip().lower() if category else None
if key: if key:
cachekey = "%s-%s" % (key, category) cachekey = "%s-%s" % (key, category)
attr = _TYPECLASS_AGGRESSIVE_CACHE and self._cache.get(cachekey, None) cachefound = False
try:
attr = _TYPECLASS_AGGRESSIVE_CACHE and self._cache[cachekey]
cachefound = True
except KeyError:
attr = None
if attr and (not hasattr(attr, "pk") and attr.pk is None): if attr and (not hasattr(attr, "pk") and attr.pk is None):
# clear out Attributes deleted from elsewhere. We must search this anew. # clear out Attributes deleted from elsewhere. We must search this anew.
attr = None attr = None
cachefound = False
del self._cache[cachekey] del self._cache[cachekey]
if cachefound:
if attr: if attr:
return [attr] # return cached entity return [attr] # return cached entity
else:
return [] # no such attribute: return an empty list
else: else:
query = {"%s__id" % self._model : self._objid, query = {"%s__id" % self._model : self._objid,
"attribute__db_model" : self._model, "attribute__db_model" : self._model,
@ -268,6 +278,12 @@ class AttributeHandler(object):
attr = conn[0].attribute attr = conn[0].attribute
self._cache[cachekey] = attr self._cache[cachekey] = attr
return [attr] if attr.pk else [] return [attr] if attr.pk else []
else:
# There is no such attribute. We will explicitly save that
# in our cache to avoid firing another query if we try to
# retrieve that (non-existent) attribute again.
self._cache[cachekey] = None
return []
else: else:
# only category given (even if it's None) - we can't # only category given (even if it's None) - we can't
# assume the cache to be complete unless we have queried # assume the cache to be complete unless we have queried
@ -618,9 +634,9 @@ class AttributeHandler(object):
""" """
if accessing_obj: if accessing_obj:
[attr.delete() for attr in self._cache.values() [attr.delete() for attr in self._cache.values()
if attr.access(accessing_obj, self._attredit, default=default_access)] if attr and attr.access(accessing_obj, self._attredit, default=default_access)]
else: else:
[attr.delete() for attr in self._cache.values() if attr.pk] [attr.delete() for attr in self._cache.values() if attr and attr.pk]
self._cache = {} self._cache = {}
self._catcache = {} self._catcache = {}
self._cache_complete = False self._cache_complete = False
@ -644,7 +660,8 @@ class AttributeHandler(object):
""" """
if not self._cache_complete: if not self._cache_complete:
self._fullcache() self._fullcache()
attrs = sorted(self._cache.values(), key=lambda o: o.id) attrs = sorted([attr for attr in self._cache.values() if attr],
key=lambda o: o.id)
if accessing_obj: if accessing_obj:
return [attr for attr in attrs return [attr for attr in attrs
if attr.access(accessing_obj, self._attredit, default=default_access)] if attr.access(accessing_obj, self._attredit, default=default_access)]