Ticket #17: instance-caching-4.patch

File instance-caching-4.patch, 12.7 KB (added by (removed), 8 years ago)

split against 5737; preserving test updates (thus tests pass), and xrange updates (as said, modifying 4 lines away).

  • django/core/serializers/python.py

    === modified file 'django/core/serializers/python.py'
     
    8888            # Handle all other fields
    8989            else:
    9090                data[field.name] = field.to_python(field_value)
    91 
     91        data["disable_inst_caching"] = True
    9292        yield base.DeserializedObject(Model(**data), m2m_data)
    9393
    9494def _get_model(model_identifier):
  • django/core/serializers/xml_serializer.py

    === modified file 'django/core/serializers/xml_serializer.py'
     
    176176                else:
    177177                    value = field.to_python(getInnerText(field_node).strip())
    178178                data[field.name] = value
    179 
     179        data["disable_inst_caching"] = True
    180180        # Return a DeserializedObject so that the m2m data has a place to live.
    181181        return base.DeserializedObject(Model(**data), m2m_data)
    182182
     
    234234        else:
    235235           pass
    236236    return u"".join(inner_text)
    237 
  • django/db/models/base.py

    === modified file 'django/db/models/base.py'
     
    1515from django.utils.encoding import smart_str, force_unicode
    1616from django.conf import settings
    1717from itertools import izip
     18from weakref import WeakValueDictionary
    1819import types
    1920import sys
    2021import os
     
    7778        # registered version.
    7879        return get_model(new_class._meta.app_label, name, False)
    7980
     81    def __call__(cls, *args, **kwargs):
     82        if not kwargs.pop("disable_inst_caching", False) and cls._meta.has_auto_field:
     83            key = cls._get_cache_key(args, kwargs)
     84            if key is not None:
     85                obj = cls.__instance_cache__.get(key)
     86                if obj is None:
     87                    obj = super(ModelBase, cls).__call__(*args, **kwargs)
     88                    cls.__instance_cache__[key] = obj
     89            else:
     90                obj = super(ModelBase, cls).__call__(*args, **kwargs)
     91        else:
     92            obj = super(ModelBase, cls).__call__(*args, **kwargs)
     93        return obj
     94
     95
    8096class Model(object):
    8197    __metaclass__ = ModelBase
    8298
     
    97113    def __ne__(self, other):
    98114        return not self.__eq__(other)
    99115
     116    def _get_cache_key(cls, args, kwargs):
     117        # this should be calculated *once*, but isn't atm
     118        pk_position = cls._meta.fields.index(cls._meta.pk)
     119        if len(args) > pk_position:
     120            return args[pk_position]
     121        pk = cls._meta.pk
     122        if pk.name in kwargs:
     123            return kwargs[pk.name]
     124        elif pk.attname in kwargs:
     125            return kwargs[pk.attname]
     126        return None
     127    _get_cache_key = classmethod(_get_cache_key)
     128
     129    def get_cached_instance(cls, id):
     130        return cls.__instance_cache__.get(id)
     131    get_cached_instance = classmethod(get_cached_instance)
     132
    100133    def __init__(self, *args, **kwargs):
    101134        dispatcher.send(signal=signals.pre_init, sender=self.__class__, args=args, kwargs=kwargs)
    102135
     
    197230        if hasattr(cls, 'get_absolute_url'):
    198231            cls.get_absolute_url = curry(get_absolute_url, opts, cls.get_absolute_url)
    199232
     233        cls.__instance_cache__ = WeakValueDictionary()
     234
    200235        dispatcher.send(signal=signals.class_prepared, sender=cls)
    201236
    202237    _prepare = classmethod(_prepare)
     
    255290                setattr(self, self._meta.pk.attname, backend.get_last_insert_id(cursor, self._meta.db_table, self._meta.pk.column))
    256291        transaction.commit_unless_managed()
    257292
     293        # if we're a new instance that hasn't been written in; save ourself.
     294        if self._meta.has_auto_field:
     295            self.__instance_cache__[self._get_pk_val()] = self
     296
    258297        # Run any post-save hooks.
    259298        dispatcher.send(signal=signals.post_save, sender=self.__class__, instance=self)
    260299
     
    315354        self._collect_sub_objects(seen_objs)
    316355
    317356        # Actually delete the objects
     357        if self._meta.has_auto_field:
     358            pk = self._get_pk_val()
     359            if pk is not None:
     360                self.__instance_cache__.pop(pk, None)
    318361        delete_objects(seen_objs)
    319362
    320363    delete.alters_data = True
  • django/db/models/fields/related.py

    === modified file 'django/db/models/fields/related.py'
     
    165165                if self.field.null:
    166166                    return None
    167167                raise self.field.rel.to.DoesNotExist
    168             other_field = self.field.rel.get_related_field()
    169             if other_field.rel:
    170                 params = {'%s__pk' % self.field.rel.field_name: val}
    171             else:
    172                 params = {'%s__exact' % self.field.rel.field_name: val}
    173             rel_obj = self.field.rel.to._default_manager.get(**params)
     168            rel_obj = self.field.rel.to.get_cached_instance(val)
     169            if rel_obj is None:
     170                other_field = self.field.rel.get_related_field()
     171                if other_field.rel:
     172                    params = {'%s__pk' % self.field.rel.field_name: val}
     173                else:
     174                    params = {'%s__exact' % self.field.rel.field_name: val}
     175                rel_obj = self.field.rel.to._default_manager.get(**params)
    174176            setattr(instance, cache_name, rel_obj)
    175177            return rel_obj
    176178
  • django/db/models/query.py

    === modified file 'django/db/models/query.py'
     
    11091109    for cls in ordered_classes:
    11101110        seen_objs[cls] = seen_objs[cls].items()
    11111111        seen_objs[cls].sort()
     1112        clean_inst_cache = cls.__instance_cache__.pop
    11121113
    11131114        # Pre notify all instances to be deleted
    11141115        for pk_val, instance in seen_objs[cls]:
    11151116            dispatcher.send(signal=signals.pre_delete, sender=cls, instance=instance)
    11161117
    11171118        pk_list = [pk for pk,instance in seen_objs[cls]]
     1119        # we wipe the cache now; it's *possible* some form of a __get__ lookup may reintroduce an item after
     1120        # the fact with the same pk (extremely unlikely)
     1121        for x in pk_list:
     1122            clean_inst_cache(x, None)
     1123
    11181124        for related in cls._meta.get_all_related_many_to_many_objects():
    11191125            if not isinstance(related.field, generic.GenericRelation):
    1120                 for offset in range(0, len(pk_list), GET_ITERATOR_CHUNK_SIZE):
     1126                for offset in xrange(0, len(pk_list), GET_ITERATOR_CHUNK_SIZE):
    11211127                    cursor.execute("DELETE FROM %s WHERE %s IN (%s)" % \
    11221128                        (qn(related.field.m2m_db_table()),
    11231129                            qn(related.field.m2m_reverse_name()),
    1124                             ','.join(['%s' for pk in pk_list[offset:offset+GET_ITERATOR_CHUNK_SIZE]])),
    1125                         pk_list[offset:offset+GET_ITERATOR_CHUNK_SIZE])
     1130                            ','.join(['%s' for pk in pk_list[offset:offset+GET_ITERATOR_CHUNK_SIZE]])),
     1131                            pk_list[offset:offset+GET_ITERATOR_CHUNK_SIZE])
     1132
    11261133        for f in cls._meta.many_to_many:
    11271134            if isinstance(f, generic.GenericRelation):
    11281135                from django.contrib.contenttypes.models import ContentType
     
    11311138            else:
    11321139                query_extra = ''
    11331140                args_extra = []
    1134             for offset in range(0, len(pk_list), GET_ITERATOR_CHUNK_SIZE):
     1141            for offset in xrange(0, len(pk_list), GET_ITERATOR_CHUNK_SIZE):
    11351142                cursor.execute(("DELETE FROM %s WHERE %s IN (%s)" % \
    11361143                    (qn(f.m2m_db_table()), qn(f.m2m_column_name()),
    11371144                    ','.join(['%s' for pk in pk_list[offset:offset+GET_ITERATOR_CHUNK_SIZE]]))) + query_extra,
    11381145                    pk_list[offset:offset+GET_ITERATOR_CHUNK_SIZE] + args_extra)
     1146
    11391147        for field in cls._meta.fields:
    11401148            if field.rel and field.null and field.rel.to in seen_objs:
    1141                 for offset in range(0, len(pk_list), GET_ITERATOR_CHUNK_SIZE):
     1149                for offset in xrange(0, len(pk_list), GET_ITERATOR_CHUNK_SIZE):
    11421150                    cursor.execute("UPDATE %s SET %s=NULL WHERE %s IN (%s)" % \
    11431151                        (qn(cls._meta.db_table), qn(field.column), qn(cls._meta.pk.column),
    11441152                            ','.join(['%s' for pk in pk_list[offset:offset+GET_ITERATOR_CHUNK_SIZE]])),
     
    11481156    for cls in ordered_classes:
    11491157        seen_objs[cls].reverse()
    11501158        pk_list = [pk for pk,instance in seen_objs[cls]]
    1151         for offset in range(0, len(pk_list), GET_ITERATOR_CHUNK_SIZE):
     1159        clean_inst_cache = cls.__instance_cache__.pop
     1160        for x in pk_list:
     1161            clean_inst_cache(x, None)
     1162        for offset in xrange(0, len(pk_list), GET_ITERATOR_CHUNK_SIZE):
    11521163            cursor.execute("DELETE FROM %s WHERE %s IN (%s)" % \
    11531164                (qn(cls._meta.db_table), qn(cls._meta.pk.column),
    11541165                ','.join(['%s' for pk in pk_list[offset:offset+GET_ITERATOR_CHUNK_SIZE]])),
  • tests/modeltests/basic/models.py

    === modified file 'tests/modeltests/basic/models.py'
     
    348348__test__['API_TESTS'] += """
    349349
    350350# You can manually specify the primary key when creating a new object.
    351 >>> a101 = Article(id=101, headline='Article 101', pub_date=datetime(2005, 7, 31, 12, 30, 45))
     351>>> a101 = Article(id=101, headline=u'Article 101', pub_date=datetime(2005, 7, 31, 12, 30, 45))
    352352>>> a101.save()
    353353>>> a101 = Article.objects.get(pk=101)
    354354>>> a101.headline
  • tests/modeltests/custom_columns/models.py

    === modified file 'tests/modeltests/custom_columns/models.py'
     
    4040
    4141__test__ = {'API_TESTS':"""
    4242# Create a Author.
    43 >>> a = Author(first_name='John', last_name='Smith')
     43>>> a = Author(first_name=u'John', last_name=u'Smith')
    4444>>> a.save()
    4545
    4646>>> a.id
  • tests/modeltests/generic_relations/models.py

    === modified file 'tests/modeltests/generic_relations/models.py'
     
    8787
    8888# Recall that the Mineral class doesn't have an explicit GenericRelation
    8989# defined. That's OK, because you can create TaggedItems explicitly.
    90 >>> tag1 = TaggedItem(content_object=quartz, tag="shiny")
    91 >>> tag2 = TaggedItem(content_object=quartz, tag="clearish")
     90>>> tag1 = TaggedItem(content_object=quartz, tag=u"shiny")
     91>>> tag2 = TaggedItem(content_object=quartz, tag=u"clearish")
    9292>>> tag1.save()
    9393>>> tag2.save()
    9494
  • tests/modeltests/many_to_one/models.py

    === modified file 'tests/modeltests/many_to_one/models.py'
     
    2727
    2828__test__ = {'API_TESTS':"""
    2929# Create a few Reporters.
    30 >>> r = Reporter(first_name='John', last_name='Smith', email='john@example.com')
     30>>> r = Reporter(first_name=u'John', last_name=u'Smith', email='john@example.com')
    3131>>> r.save()
    3232
    33 >>> r2 = Reporter(first_name='Paul', last_name='Jones', email='paul@example.com')
     33>>> r2 = Reporter(first_name=u'Paul', last_name=u'Jones', email='paul@example.com')
    3434>>> r2.save()
    3535
    3636# Create an Article.
  • tests/modeltests/select_related/models.py

    === modified file 'tests/modeltests/select_related/models.py'
     
    1071071
    108108
    109109# select_related() also of course applies to entire lists, not just items.
    110 # Without select_related()
     110# Without select_related() (note instance caching still reduces this from 9 to 5)
    111111>>> db.reset_queries()
    112112>>> world = Species.objects.all()
    113113>>> [o.genus.family for o in world]
    114114[<Family: Drosophilidae>, <Family: Hominidae>, <Family: Fabaceae>, <Family: Amanitacae>]
    115115>>> len(db.connection.queries)
    116 9
     1165
    117117
    118118# With select_related():
    119119>>> db.reset_queries()
     
    129129>>> pea.genus.family.order.klass.phylum.kingdom.domain
    130130<Domain: Eukaryota>
    131131
    132 # Notice: one few query than above because of depth=1
     132# notice: instance caching saves the day; would be 7 without.
    133133>>> len(db.connection.queries)
    134 7
     1341
    135135
    136136>>> db.reset_queries()
    137137>>> pea = Species.objects.select_related(depth=5).get(name="sativum")
    138138>>> pea.genus.family.order.klass.phylum.kingdom.domain
    139139<Domain: Eukaryota>
    140140>>> len(db.connection.queries)
    141 3
     1411
    142142
    143143>>> db.reset_queries()
    144144>>> world = Species.objects.all().select_related(depth=2)
    145145>>> [o.genus.family.order for o in world]
    146146[<Order: Diptera>, <Order: Primates>, <Order: Fabales>, <Order: Agaricales>]
    147147>>> len(db.connection.queries)
    148 5
     1481
    149149
    150150# Reset DEBUG to where we found it.
    151151>>> settings.DEBUG = False
Back to Top