CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-10 16:04:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix 5-second quota caching

Browse Source
This commit is contained in:
Raphael Michel
2020-12-13 15:50:02 +01:00
parent a5e41aae50
commit 5308099d84
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/pretix/base/services/quotas.py
View File

@@ -113,10 +113,11 @@ class QuotaAvailability:
raise e raise e
def _write_cache(self, quotas, now_dt): def _write_cache(self, quotas, now_dt):
events = {q.event for q in quotas} # We used to also delete item_quota_cache:* from the event cache here, but as the cache
# gets more complex, this does not seem worth it. The cache is only present for up to
# 5 seconds to prevent high peaks, and a 5-second delay in availability is usually
# tolerable
update = [] update = []
for e in events:
e.cache.delete('item_quota_cache')
for q in quotas: for q in quotas:
rewrite_cache = self._count_waitinglist and ( rewrite_cache = self._count_waitinglist and (
not q.cache_is_hot(now_dt) or self.results[q][0] > q.cached_availability_state not q.cache_is_hot(now_dt) or self.results[q][0] > q.cached_availability_state

14
src/pretix/presale/views/event.py
View File

@@ -63,6 +63,7 @@ def item_group_by_category(items):
def get_grouped_items(event, subevent=None, voucher=None, channel='web', require_seat=0, base_qs=None, allow_addons=False, def get_grouped_items(event, subevent=None, voucher=None, channel='web', require_seat=0, base_qs=None, allow_addons=False,
quota_cache=None, filter_items=None, filter_categories=None): quota_cache=None, filter_items=None, filter_categories=None):
base_qs_set = base_qs is not None
base_qs = base_qs if base_qs is not None else event.items base_qs = base_qs if base_qs is not None else event.items
requires_seat = Exists( requires_seat = Exists(
@@ -139,8 +140,9 @@ def get_grouped_items(event, subevent=None, voucher=None, channel='web', require
items = items.filter(category_id__in=[a for a in filter_categories if a.isdigit()]) items = items.filter(category_id__in=[a for a in filter_categories if a.isdigit()])
display_add_to_cart = False display_add_to_cart = False
external_quota_cache = quota_cache or event.cache.get('item_quota_cache') quota_cache_key = f'item_quota_cache:{subevent.id if subevent else 0}:{channel}:{bool(require_seat)}'
quota_cache = external_quota_cache or {} quota_cache = quota_cache or event.cache.get(quota_cache_key) or {}
quota_cache_existed = bool(quota_cache)
if subevent: if subevent:
item_price_override = subevent.item_price_overrides item_price_override = subevent.item_price_overrides
@@ -159,11 +161,11 @@ def get_grouped_items(event, subevent=None, voucher=None, channel='web', require
if item.has_variations: if item.has_variations:
for v in item.available_variations: for v in item.available_variations:
for q in v._subevent_quotas: for q in v._subevent_quotas:
if q not in quota_cache: if q.pk not in quota_cache:
quotas_to_compute.append(q) quotas_to_compute.append(q)
else: else:
for q in item._subevent_quotas: for q in item._subevent_quotas:
if q not in quota_cache: if q.pk not in quota_cache:
quotas_to_compute.append(q) quotas_to_compute.append(q)
if quotas_to_compute: if quotas_to_compute:
@@ -306,8 +308,8 @@ def get_grouped_items(event, subevent=None, voucher=None, channel='web', require
item._remove = not bool(item.available_variations) item._remove = not bool(item.available_variations)
if not external_quota_cache and not voucher and not allow_addons: if not quota_cache_existed and not voucher and not allow_addons and not base_qs_set and not filter_items and not filter_categories:
event.cache.set('item_quota_cache', quota_cache, 5) event.cache.set(quota_cache_key, quota_cache, 5)
items = [item for item in items items = [item for item in items
if (len(item.available_variations) > 0 or not item.has_variations) and not item._remove] if (len(item.available_variations) > 0 or not item.has_variations) and not item._remove]
return items, display_add_to_cart return items, display_add_to_cart