[gentoo-commits] proj/gentoo-packages:master commit in: gpackages/apps/packages/, gpackages/apps/packages/templatetags/, ...

[Slava Bacherikov]

commit:     43ce171f72aa969fd1d2d87449789867065ae8f1
Author:     Slava Bacherikov <slava <AT> bacher09 <DOT> org>
AuthorDate: Thu Jun 28 12:26:12 2012 +0000
Commit:     Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua>
CommitDate: Thu Jun 28 12:26:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=43ce171f

Add custom prefetch for keywords.

---
 gpackages/apps/packages/managers.py              |   51 +++++++++++++++++++++-
 gpackages/apps/packages/models.py                |   11 +++--
 gpackages/apps/packages/templatetags/packages.py |    2 +-
 gpackages/apps/packages/views.py                 |    8 ++-
 gpackages/templates/ebuilds.html                 |    2 +-
 gpackages/templates/packages.html                |    2 +-
 6 files changed, 65 insertions(+), 11 deletions(-)

diff --git a/gpackages/apps/packages/managers.py b/gpackages/apps/packages/managers.py
index 557cd48..012b40d 100644
--- a/gpackages/apps/packages/managers.py
+++ b/gpackages/apps/packages/managers.py
@@ -3,6 +3,7 @@ from package_info.abstract import AbstarctPackage, AbstractEbuild, \
                                   AbstractKeywords 
 import packages.models
 from package_info.generic import get_from_kwargs_and_del
+from collections import defaultdict
 
 def _gen_query_and_manager(MixinClass, QueryClassName, ManagerClassName):
     QueryClass = type(QueryClassName, (MixinClass, models.query.QuerySet), {})
@@ -68,7 +69,7 @@ class KeywordMixin(object):#{{{
 
 
 class EbuildMixin(object):#{{{
-    
+
     def get(self, ebuild=None, package = None, *args, **kwargs):
         if ebuild is not None and isinstance(ebuild, AbstractEbuild):
             if package is None:
@@ -84,6 +85,54 @@ class EbuildMixin(object):#{{{
     def all_by_numbers(self):
         return super(EbuildMixin, self).order_by('version', 'revision')
 
+    def __init__(self, *args, **kwargs):
+        super(EbuildMixin, self).__init__(*args, **kwargs)
+        self._arches_set = None
+        self._cache_keywords = None
+    
+    # Maybe use https://github.com/ionelmc/django-prefetch ?
+    def prefetch_with_keywords(self, arch_list):
+        arch_set = set(arch_list)
+        arch_set.add('*')
+        self._arches_set = arch_set
+        return self
+
+    def __old_iter__(self):
+        return super(EbuildMixin, self).__iter__()
+
+    def _clone(self, *args, **kwargs):
+        c = super(EbuildMixin, self)._clone(*args, **kwargs)
+        c._arches_set = self._arches_set
+        return c
+
+    def _prefetch_keywords(self):
+        arch_set = self._arches_set
+        pk_keys = [ebuild.pk for ebuild in self.__old_iter__()]
+        query = packages.models.Keyword.objects.filter(ebuild__in = pk_keys,
+                                                       arch__name__in = arch_set).select_related('arch')
+
+        cache_query = defaultdict(list)
+        for keyword in query:
+            cache_query[keyword.ebuild_id].append(keyword)
+
+        self._cache_keywords = cache_query
+
+    def __iter__(self):
+        arch_set = self._arches_set
+        if arch_set is None:
+            for ebuild in self.__old_iter__():
+                yield ebuild
+        else:
+            if self._cache_keywords is None:
+                self._prefetch_keywords()
+
+            cache_query = self._cache_keywords
+                
+            for ebuild in self.__old_iter__():
+                ebuild._prefetched_keywords = cache_query[ebuild.pk]
+                yield ebuild
+
+            
 
 class HerdsMixin(object):#{{{
     def filter(self, *args, **kwargs):

diff --git a/gpackages/apps/packages/models.py b/gpackages/apps/packages/models.py
index 187088e..caa7156 100644
--- a/gpackages/apps/packages/models.py
+++ b/gpackages/apps/packages/models.py
@@ -312,7 +312,6 @@ class PackageModel(AbstractDateTimeModel):
             l.extend(ebuild.get_ebuilds_and_keywords(arch_list))
         return l
             
-
     class Meta:
         unique_together = ('virtual_package', 'repository')
         ordering = ('-updated_datetime',)
@@ -381,6 +380,7 @@ class EbuildModel(AbstractDateTimeModel):
         super(EbuildModel, self).__init__(*args, **kwargs)
         if isinstance(ebuild, AbstractEbuild):
             self.init_by_ebuild(ebuild)
+        self._prefetched_keywords = None
     
     def __unicode__(self):
         return self.cpv
@@ -470,9 +470,12 @@ class EbuildModel(AbstractDateTimeModel):
 
         return keywords_dict
 
-    def load_keywords(self, arch_set):
-        arch_set.add('*')
-        return self.keyword_set.filter(arch__name__in = arch_set).select_related('arch')
+    def load_keywords(self, arch_set, flush_cache = False):
+        if self._prefetched_keywords is None or flush_cache:
+            arch_set.add('*')
+            self._prefetched_keywords = self.keyword_set. \
+                filter(arch__name__in = arch_set).select_related('arch')
+        return self._prefetched_keywords
 
     def get_ebuilds_and_keywords(self, arch_list):
         # Maybe copy object ? !!

diff --git a/gpackages/apps/packages/templatetags/packages.py b/gpackages/apps/packages/templatetags/packages.py
index 45c756d..e381cb0 100644
--- a/gpackages/apps/packages/templatetags/packages.py
+++ b/gpackages/apps/packages/templatetags/packages.py
@@ -11,7 +11,7 @@ def last_updated():
     return {'last_updated': l.updated_datetime}
 
 @register.inclusion_tag('keywords_table.html')
-def render_keywords_table(obj, *arch_list):
+def render_keywords_table(obj, arch_list):
     ebuilds = obj.get_ebuilds_and_keywords(arch_list)
     return {'arches': arch_list, 'ebuilds' : ebuilds}
 

diff --git a/gpackages/apps/packages/views.py b/gpackages/apps/packages/views.py
index 6f73fdd..16c74e2 100644
--- a/gpackages/apps/packages/views.py
+++ b/gpackages/apps/packages/views.py
@@ -35,18 +35,20 @@ class LicenseGroupsView(ContextListView):
     context_object_name = 'license_groups'
 
 class EbuildsListView(ContextListView):
+    arches = ['alpha', 'amd64', 'arm', 'hppa', 'ia64', 'ppc', 'ppc64', 'sparc', 'x86']
     paginate_by = 40
-    extra_context = {'page_name': 'Ebuilds',}
+    extra_context = {'page_name': 'Ebuilds', 'arches' : arches}
     template_name = 'ebuilds.html'
     context_object_name = 'ebuilds'
     queryset = EbuildModel.objects.all(). \
         select_related('package',
                        'package__virtual_package',
-                       'package__virtual_package__category')
+                       'package__virtual_package__category').prefetch_with_keywords(arches)
 
 class PackagesListsView(ContextListView):
+    arches = ['alpha', 'amd64', 'arm', 'hppa', 'ia64', 'ppc', 'ppc64', 'sparc', 'x86']
     paginate_by = 40
-    extra_context = {'page_name': 'Packages',}
+    extra_context = {'page_name': 'Packages', 'arches': arches}
     template_name = 'packages.html'
     context_object_name = 'packages'
     queryset = PackageModel.objects.all(). \

diff --git a/gpackages/templates/ebuilds.html b/gpackages/templates/ebuilds.html
index ef51a43..94e1ecd 100644
--- a/gpackages/templates/ebuilds.html
+++ b/gpackages/templates/ebuilds.html
@@ -9,7 +9,7 @@
             <span class="package_update_datetime">{{ ebuild.updated_datetime }}</span>
         </div>
         <div style="padding-bottom: 10px; margin 10px;">{{ ebuild.description }}</div>
-        {% render_keywords_table ebuild 'alpha' 'amd64' 'arm' 'hppa' 'ia64' 'ppc' 'ppc64' 'sparc' 'x86' %}
+        {% render_keywords_table ebuild arches %}
     </div>
 {% endfor %}
 {% include 'paginator.html' %}

diff --git a/gpackages/templates/packages.html b/gpackages/templates/packages.html
index b6600dc..ec6d22a 100644
--- a/gpackages/templates/packages.html
+++ b/gpackages/templates/packages.html
@@ -11,7 +11,7 @@
         {% if package.description %}
         <div style="padding-bottom: 10px; margin 10px;">{{ package.description }}</div>
         {% endif %}
-        {% render_keywords_table package 'alpha' 'amd64' 'arm' 'hppa' 'ia64' 'ppc' 'ppc64' 'sparc' 'x86' %}
+        {% render_keywords_table package arches %}
     </div>
 {% endfor %}
 {% include 'paginator.html' %}