CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Optimize number of SQL queries (now constant)

Browse Source
This commit is contained in:
Raphael Michel
2014-09-29 18:57:18 +02:00
parent 6e826bb7c5
commit ffd3e52584
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tixlbase/models.py
View File

@@ -484,7 +484,7 @@ class Item(models.Model):
for var in all_variations: for var in all_variations:
key = [] key = []
for v in var.values.all(): for v in var.values.all():
key.append((v.prop.pk, v.pk)) key.append((v.prop_id, v.pk))
key = hash(tuple(sorted(key))) key = hash(tuple(sorted(key)))
variations_cache[key] = var variations_cache[key] = var

14
src/tixlcontrol/views/item.py
View File

@@ -161,6 +161,10 @@ class ItemVariations(TemplateView, SingleObjectMixin):
# prop2 is the property on the grid's x-axis # prop2 is the property on the grid's x-axis
prop2 = self.properties[1] prop2 = self.properties[1]
# Given a list of variations, this will sort them by their position
# on the x-axis
sort = lambda v: v[prop2.pk].pk
for val1 in prop1.values.all().order_by("id"): for val1 in prop1.values.all().order_by("id"):
formrow = [] formrow = []
# We are now inside a grid row. We iterate over all variations # We are now inside a grid row. We iterate over all variations
@@ -168,7 +172,6 @@ class ItemVariations(TemplateView, SingleObjectMixin):
# to achieve this, we select all variation dictionaries which # to achieve this, we select all variation dictionaries which
# have the same value for prop1 as our row does and sort them # have the same value for prop1 as our row does and sort them
# by their value for prop2. # by their value for prop2.
sort = lambda v: v[prop2.pk].pk
filtered = [v for v in variations if v[prop1.pk].pk == val1.pk] filtered = [v for v in variations if v[prop1.pk].pk == val1.pk]
for variation in sorted(filtered, key=sort): for variation in sorted(filtered, key=sort):
form = self.get_form(variation, data) form = self.get_form(variation, data)
@@ -205,6 +208,10 @@ class ItemVariations(TemplateView, SingleObjectMixin):
) )
] ]
# Given a list of variations, this will sort them by their position
# on the x-axis
sort = lambda v: v[prop2.pk].pk
# We now iterate over the cartesian product of all the other # We now iterate over the cartesian product of all the other
# properties which are NOT on the axes of the grid because we # properties which are NOT on the axes of the grid because we
# create one grid for any combination of them. # create one grid for any combination of them.
@@ -223,7 +230,6 @@ class ItemVariations(TemplateView, SingleObjectMixin):
# We now iterate over all variations who generate the same # We now iterate over all variations who generate the same
# selector as 'selection'. # selector as 'selection'.
filtered = [v for v in variations if selector(values(v)) == selection] filtered = [v for v in variations if selector(values(v)) == selection]
sort = lambda v: v[prop2.pk].pk
for variation in sorted(filtered, key=sort): for variation in sorted(filtered, key=sort):
form = self.get_form(variation, data) form = self.get_form(variation, data)
formrow.append(form) formrow.append(form)
@@ -237,8 +243,8 @@ class ItemVariations(TemplateView, SingleObjectMixin):
def main(self, request, *args, **kwargs): def main(self, request, *args, **kwargs):
self.object = self.get_object() self.object = self.get_object()
self.properties = self.object.properties.all() self.properties = list(self.object.properties.all().prefetch_related("values"))
self.dimension = self.properties.count() self.dimension = len(self.properties)
self.forms, self.forms_flat = self.get_forms() self.forms, self.forms_flat = self.get_forms()
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):