diff options
| author | Erik Johnston <erikj@jki.re> | 2017-03-21 13:11:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-21 13:11:15 +0000 |
| commit | 37a187bfabdd6d39630a04739e822d0d1fa7daea (patch) | |
| tree | 7372b8cb70c6ae240e4465363607338df3d76c96 /synapse/storage | |
| parent | Merge pull request #2035 from matrix-org/rav/debug_federation (diff) | |
| parent | Fix unit test (diff) | |
| download | synapse-37a187bfabdd6d39630a04739e822d0d1fa7daea.tar.xz | |
Merge pull request #2033 from matrix-org/erikj/repl_speed
Don't send the full event json over replication
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/events.py | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py index 4d3cfc336f..3c8393bfe8 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py @@ -1773,14 +1773,13 @@ class EventsStore(SQLBaseStore): def get_all_new_events_txn(txn): sql = ( - "SELECT e.stream_ordering, ej.internal_metadata, ej.json, eg.state_group" - " FROM events as e" - " JOIN event_json as ej" - " ON e.event_id = ej.event_id AND e.room_id = ej.room_id" - " LEFT JOIN event_to_state_groups as eg" - " ON e.event_id = eg.event_id" - " WHERE ? < e.stream_ordering AND e.stream_ordering <= ?" - " ORDER BY e.stream_ordering ASC" + "SELECT e.stream_ordering, e.event_id, e.room_id, e.type," + " state_key, redacts" + " FROM events AS e" + " LEFT JOIN redactions USING (event_id)" + " LEFT JOIN state_events USING (event_id)" + " WHERE ? < stream_ordering AND stream_ordering <= ?" + " ORDER BY stream_ordering ASC" " LIMIT ?" ) if have_forward_events: @@ -1806,15 +1805,13 @@ class EventsStore(SQLBaseStore): forward_ex_outliers = [] sql = ( - "SELECT -e.stream_ordering, ej.internal_metadata, ej.json," - " eg.state_group" - " FROM events as e" - " JOIN event_json as ej" - " ON e.event_id = ej.event_id AND e.room_id = ej.room_id" - " LEFT JOIN event_to_state_groups as eg" - " ON e.event_id = eg.event_id" - " WHERE ? > e.stream_ordering AND e.stream_ordering >= ?" - " ORDER BY e.stream_ordering DESC" + "SELECT -e.stream_ordering, e.event_id, e.room_id, e.type," + " state_key, redacts" + " FROM events AS e" + " LEFT JOIN redactions USING (event_id)" + " LEFT JOIN state_events USING (event_id)" + " WHERE ? > stream_ordering AND stream_ordering >= ?" + " ORDER BY stream_ordering DESC" " LIMIT ?" ) if have_backfill_events: |