From ca057911ea1d8053c7fc8045b3a81b322ee73714 Mon Sep 17 00:00:00 2001
From: Ole Laursen <olau@iola.dk>
Date: Tue, 25 Aug 2020 14:56:40 +0000
Subject: [PATCH] Compute session order from available data instead of going
through the database again (saves ~2800 queries on the IETF 106 agenda page)
- Legacy-Id: 18414
---
ietf/meeting/helpers.py | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/ietf/meeting/helpers.py b/ietf/meeting/helpers.py
index 28a8b7670..04a3db3da 100644
--- a/ietf/meeting/helpers.py
+++ b/ietf/meeting/helpers.py
@@ -2,6 +2,7 @@
# -*- coding: utf-8 -*-
+from collections import defaultdict
import datetime
import io
import os
@@ -197,6 +198,11 @@ def preprocess_assignments_for_agenda(assignments_queryset, meeting, extra_prefe
if a.session.group and a.session.group not in groups:
groups.append(a.session.group)
+ sessions_for_groups = defaultdict(list)
+ for a in assignments:
+ if a.session and a.session.group:
+ sessions_for_groups[(a.session.group, a.session.type_id)].append(a)
+
group_replacements = find_history_replacements_active_at(groups, meeting_time)
parent_id_set = set()
@@ -210,7 +216,8 @@ def preprocess_assignments_for_agenda(assignments_queryset, meeting, extra_prefe
if a.session.historic_group.parent_id:
parent_id_set.add(a.session.historic_group.parent_id)
- a.session.order_number = a.session.order_in_meeting()
+ l = sessions_for_groups.get((a.session.group, a.session.type_id), [])
+ a.session.order_number = l.index(a) + 1 if a in l else 0
parents = Group.objects.filter(pk__in=parent_id_set)
parent_replacements = find_history_replacements_active_at(parents, meeting_time)