summary refs log tree commit diff
diff options
context:
space:
mode:
authorOlivier Wilkinson (reivilibre) <olivier@librepush.net>2019-08-14 10:39:38 +0100
committerOlivier Wilkinson (reivilibre) <olivier@librepush.net>2019-08-14 10:39:38 +0100
commitc9646770d1c70102f8e2ed4e9796f2d3d3869ffc (patch)
tree48e465b87ffea355efe2046a7b2b805f1b1223d6
parentMerge branch 'develop' into rei/room_stats_separated (diff)
downloadsynapse-github/rei/room_stats_separated.tar.xz
Remove non-ASCII-representable characters to fix py35-old tests. github/rei/room_stats_separated rei/room_stats_separated
-rw-r--r--synapse/storage/schema/delta/56/stats_separated1.sql4
-rw-r--r--synapse/storage/schema/delta/56/stats_separated2.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/synapse/storage/schema/delta/56/stats_separated1.sql b/synapse/storage/schema/delta/56/stats_separated1.sql

index d987479363..eb85e1591d 100644 --- a/synapse/storage/schema/delta/56/stats_separated1.sql +++ b/synapse/storage/schema/delta/56/stats_separated1.sql
@@ -67,7 +67,7 @@ INSERT INTO stats_incremental_position ( CREATE TABLE IF NOT EXISTS room_stats_current ( room_id TEXT NOT NULL PRIMARY KEY, - -- These starts cover the time from start_ts…end_ts (in seconds). + -- These starts cover the time from start_ts...end_ts (in seconds). -- Note that end_ts is quantised, and start_ts usually so. start_ts BIGINT, end_ts BIGINT, @@ -91,7 +91,7 @@ CREATE TABLE IF NOT EXISTS room_stats_current ( -- represents HISTORICAL room statistics for a room CREATE TABLE IF NOT EXISTS room_stats_historical ( room_id TEXT NOT NULL, - -- These starts cover the time from (end_ts - bucket_size)…end_ts (in seconds). + -- These stats cover the time from (end_ts - bucket_size)...end_ts (in seconds). -- Note that end_ts is quantised, and start_ts usually so. end_ts BIGINT NOT NULL, bucket_size INT NOT NULL, diff --git a/synapse/storage/schema/delta/56/stats_separated2.py b/synapse/storage/schema/delta/56/stats_separated2.py
index c5e3208adb..049867fa3e 100644 --- a/synapse/storage/schema/delta/56/stats_separated2.py +++ b/synapse/storage/schema/delta/56/stats_separated2.py
@@ -22,7 +22,7 @@ def _run_create_generic(stats_type, cursor, database_engine): """ Creates the pertinent (partial, if supported) indices for one kind of stats. Args: - stats_type: "room" or "user" – the type of stats + stats_type: "room" or "user" - the type of stats cursor: Database Cursor database_engine: Database Engine """ @@ -72,7 +72,7 @@ def _run_create_generic(stats_type, cursor, database_engine): def run_create(cursor, database_engine): """ This function is called as part of the schema delta. - It will create indices – partial, if supported – for the new 'separated' + It will create indices - partial, if supported - for the new 'separated' room & user statistics. """ _run_create_generic("room", cursor, database_engine)