0001-journal-permit-custom-prefetching-51808.patch

Benjamin Dauvergne, 21 mai 2021 12:01

Voir les différences: en ligne côte à côte

Subject: [PATCH 1/3] journal: permit custom prefetching (#51808)

 src/authentic2/apps/journal/forms.py  |  5 +++-
 src/authentic2/apps/journal/models.py | 22 +++++++++++++++-
 tests/test_journal.py                 | 38 ++++++++++++++++++++++++++-
 3 files changed, 62 insertions(+), 3 deletions(-)

                 first = len(page) <= limit
                 last = True
                 page = page[-limit:]
             models.prefetch_events_references(page)
             models.prefetch_events_references(page, prefetcher=self.prefetcher)
             if page:
                 self.data = self.data.copy()
                 self.cleaned_data['after_cursor'] = self.data['after_cursor'] = page[0].cursor.minus_one()
                 self.cleaned_data['before_cursor'] = ''
             return Page(self, page, first, last)
         def prefetcher(self, model, pks):
             return []
         @cached_property
         def date_hierarchy(self):
             self.is_valid()

     from contextlib import contextmanager
     from datetime import datetime, timedelta
     import django
     from django.conf import settings
     from django.contrib.auth import get_user_model
     from django.contrib.contenttypes.models import ContentType
-...
             return EventCursor('%s %s' % (self.timestamp.timestamp(), self.event_id - 1))
     def prefetch_events_references(events):
     def prefetch_events_references(events, prefetcher=None):
         '''Prefetch references on an iterable of events, prevent N+1 queries problem.'''
         grouped_references = defaultdict(set)
         references = {}
-...
             content_type = ContentType.objects.get_for_id(content_type_id)
             for instance in content_type.get_all_objects_for_this_type(pk__in=instance_pks):
                 references[(content_type_id, instance.pk)] = instance
             if prefetcher:
                 deleted_pks = [pk for pk in instance_pks if (content_type_id, pk) not in references]
                 if deleted_pks:
                     for found_pk, instance in prefetcher(content_type.model_class(), deleted_pks):
                         references[(content_type_id, found_pk)] = instance
         # prefetch the user column if absent
         if prefetcher:
             user_to_events = {}
             for event in events:
                 if event.user is None and event.user_id:
                     user_to_events.setdefault(event.user_id, []).append(event)
             for found_pk, instance in prefetcher(User, user_to_events.keys()):
                 for event in user_to_events[found_pk]:
                     # prevent TypeError in user's field descriptor __set__ method
                     if django.VERSION < (2,):
                         event._user_cache = instance
                     else:
                         event._state.fields_cache['user'] = instance
         # assign references to events
         for event in events:

     from authentic2.a2_rbac.utils import get_default_ou
     from authentic2.apps.journal.forms import JournalForm
     from authentic2.apps.journal.journal import Journal
     from authentic2.apps.journal.models import Event, EventType, EventTypeDefinition, clean_registry
     from authentic2.apps.journal.models import (
         Event,
         EventType,
         EventTypeDefinition,
         clean_registry,
         prefetch_events_references,
+    )
     from authentic2.models import Service
     User = get_user_model()
-...
         assert list(event.get_typed_references(User, None)) == [None, None]
         event = Event.objects.get()
         assert list(event.get_typed_references(Service, User)) == [None, None]
         assert event.user is None
     def test_event_types(clean_event_types_definition_registry):
-...
         ou_with_no_service = OU.objects.create(name='Second OU')
         stats = event_type_definition.get_method_statistics('month', services_ou=ou_with_no_service)
         assert stats == {'x_labels': [], 'series': []}
     def test_prefetcher(db):
         event_type = EventType.objects.get_for_name('user.login')
         for i in range(10):
             user = User.objects.create()
             Event.objects.create(type=event_type, user=user, references=[user])
             Event.objects.create(type=event_type, user=user, references=[user])
         User.objects.all().delete()
         events = list(Event.objects.all())
         prefetch_events_references(events)
         for event in events:
             assert event.user is None
             assert list(event.get_typed_references(User)) == [None]
         def prefetcher(model, pks):
             if not issubclass(model, User):
                 return
             for pk in pks:
                 yield pk, 'deleted %s' % pk
         events = list(Event.objects.all())
         prefetch_events_references(events, prefetcher=prefetcher)
         for event in events:
             s = 'deleted %s' % event.user_id
             assert event.user == s
             assert list(event.get_typed_references((str, User))) == [s]
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0001-journal-permit-custom-prefetching-51808.patch