From 54bbe71867fb3de2e3984e2b3eb909845c2448b3 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 26 Oct 2018 22:51:34 +0100
Subject: [PATCH] optimise state copying
---
synapse/handlers/room.py | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 145b5b19ee..8e48c1ca6a 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -21,7 +21,7 @@ import math
import string
from collections import OrderedDict
-from six import string_types
+from six import iteritems, string_types
from twisted.internet import defer
@@ -237,12 +237,10 @@ class RoomCreationHandler(BaseHandler):
# map from event_id to BaseEvent
old_room_state_events = yield self.store.get_events(old_room_state_ids.values())
- for k in types_to_copy:
- old_event_id = old_room_state_ids.get(k)
- if old_event_id:
- old_event = old_room_state_events.get(old_event_id)
- if old_event:
- initial_state[k] = old_event.content
+ for k, old_event_id in iteritems(old_room_state_ids):
+ old_event = old_room_state_events.get(old_event_id)
+ if old_event:
+ initial_state[k] = old_event.content
yield self._send_events_for_new_room(
requester,
--
GitLab