Merge branch 'develop' of github.com:matrix-org/synapse into erikj/make_database_class

This commit is contained in:
Erik Johnston 2019-12-06 11:28:44 +00:00
commit 2ace775d88
56 changed files with 767 additions and 824 deletions

View file

@ -260,11 +260,11 @@ class StatsStore(StateDeltasStore):
slice_list = self.db.simple_select_list_paginate_txn(
txn,
table + "_historical",
{id_col: stats_id},
"end_ts",
start,
size,
retcols=selected_columns + ["bucket_size", "end_ts"],
keyvalues={id_col: stats_id},
order_direction="DESC",
)