kaslo/synapse
1
0
Fork 0
Code Wiki Activity

Merge branch 'rei/rss_inc7' into rei/rss_inc8

Browse Source
This commit is contained in:
Olivier Wilkinson (reivilibre)
2019-08-30 15:13:44 +01:00
parent bf6d45f456 b379a11dc2
commit 425d44521d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
synapse/storage/stats.py
+6 -5
View File
@@ -52,8 +52,8 @@ PER_SLICE_FIELDS = {"room": (), "user": ()}
TYPE_TO_TABLE = {"room": ("room_stats", "room_id"), "user": ("user_stats", "user_id")}
# these are the tables which contain our actual subjects
TYPE_TO_ORIGIN_TABLE = {"room": "rooms", "user": "users"}
# these are the tables (& ID columns) which contain our actual subjects
TYPE_TO_ORIGIN_TABLE = {"room": ("rooms", "room_id"), "user": ("users", "name")}
class StatsStore(StateDeltasStore):
@@ -173,18 +173,18 @@ class StatsStore(StateDeltasStore):
sql = """
INSERT OR IGNORE INTO %(table)s_current
(%(id_col)s, completed_delta_stream_id, %(zero_cols)s)
SELECT %(id_col)s, NULL, %(zeroes)s FROM %(origin_table)s
SELECT %(origin_id_col)s, NULL, %(zeroes)s FROM %(origin_table)s
"""
else:
sql = """
INSERT INTO %(table)s_current
(%(id_col)s, completed_delta_stream_id, %(zero_cols)s)
SELECT %(id_col)s, NULL, %(zeroes)s FROM %(origin_table)s
SELECT %(origin_id_col)s, NULL, %(zeroes)s FROM %(origin_table)s
ON CONFLICT DO NOTHING
"""
table, id_col = TYPE_TO_TABLE[stats_type]
origin_table = TYPE_TO_ORIGIN_TABLE[stats_type]
origin_table, origin_id_col = TYPE_TO_ORIGIN_TABLE[stats_type]
zero_cols = list(
chain(ABSOLUTE_STATS_FIELDS[stats_type], PER_SLICE_FIELDS[stats_type])
)
@@ -194,6 +194,7 @@ class StatsStore(StateDeltasStore):
% {
"table": table,
"id_col": id_col,
"origin_id_col": origin_id_col,
"origin_table": origin_table,
"zero_cols": ", ".join(zero_cols),
"zeroes": ", ".join(["0"] * len(zero_cols)),