summary refs log tree commit diff
diff options
context:
space:
mode:
authorOlivier Wilkinson (reivilibre) <olivier@librepush.net>2019-08-30 14:26:02 +0100
committerOlivier Wilkinson (reivilibre) <olivier@librepush.net>2019-08-30 14:26:02 +0100
commit757205d7186132ae6d1ae189249e6218dd11e32d (patch)
tree2a6f7c7b1a34acf873b12bc22c066c286153d832
parentMerge branch 'rei/rss_target' into rei/rss_inc6 (diff)
downloadsynapse-rei/rss_inc6.tar.xz
Convert `chain` to `list` as `chain` is only once iterable. github/rei/rss_inc6 rei/rss_inc6
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
-rw-r--r--synapse/storage/stats.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/stats.py b/synapse/storage/stats.py
index 63c8c2840a..20ce3664a0 100644
--- a/synapse/storage/stats.py
+++ b/synapse/storage/stats.py
@@ -381,7 +381,7 @@ class StatsStore(StateDeltasStore):
             txn.execute(sql, qargs)
         else:
             self.database_engine.lock_table(txn, table)
-            retcols = chain(absolutes.keys(), additive_relatives.keys())
+            retcols = list(chain(absolutes.keys(), additive_relatives.keys()))
             current_row = self._simple_select_one_txn(
                 txn, table, keyvalues, retcols, allow_none=True
             )
@@ -486,7 +486,7 @@ class StatsStore(StateDeltasStore):
                 txn,
                 into_table,
                 keyvalues,
-                chain(additive_relatives.keys(), copy_columns),
+                retcols=list(chain(additive_relatives.keys(), copy_columns)),
                 allow_none=True,
             )