summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-02-28 15:15:16 +0000
committerGitHub <noreply@github.com>2017-02-28 15:15:16 +0000
commitd638a7484b35f251b2089c5e602fc3d686d07a2c (patch)
treed1d96244d63f91251b876ab26c909aa8ca816cf4
parentMerge pull request #1957 from matrix-org/device_poke_index (diff)
parentIntern table column names once (diff)
downloadsynapse-d638a7484b35f251b2089c5e602fc3d686d07a2c.tar.xz
Merge pull request #1959 from matrix-org/erikj/intern_once
Intern table column names once
-rw-r--r--synapse/storage/_base.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index 557701d0c4..4410cd9e62 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -18,7 +18,6 @@ from synapse.api.errors import StoreError
 from synapse.util.logcontext import LoggingContext, PreserveLoggingContext
 from synapse.util.caches.dictionary_cache import DictionaryCache
 from synapse.util.caches.descriptors import Cache
-from synapse.util.caches import intern_dict
 from synapse.storage.engines import PostgresEngine
 import synapse.metrics
 
@@ -356,9 +355,9 @@ class SQLBaseStore(object):
         Returns:
             A list of dicts where the key is the column header.
         """
-        col_headers = list(column[0] for column in cursor.description)
+        col_headers = list(intern(column[0]) for column in cursor.description)
         results = list(
-            intern_dict(dict(zip(col_headers, row))) for row in cursor.fetchall()
+            dict(zip(col_headers, row)) for row in cursor.fetchall()
         )
         return results