Erik Johnston
|
4fb858d90a
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/backfill_fixes
|
2015-05-21 15:25:54 +01:00 |
|
Mark Haines
|
88f1ea36ce
|
Oops, get_rooms_for_user returns a namedtuple, not a room_id
|
2015-05-21 15:23:58 +01:00 |
|
Erik Johnston
|
c2633907c5
|
Merge branch 'erikj/join_perf' of github.com:matrix-org/synapse into erikj/backfill_fixes
|
2015-05-21 14:58:47 +01:00 |
|
Erik Johnston
|
ebfdd2eb5b
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf
|
2015-05-21 14:54:52 +01:00 |
|
Erik Johnston
|
a551c5dad7
|
Merge pull request #155 from matrix-org/erikj/perf
Bulk and batch retrieval of events.
|
2015-05-21 14:54:40 +01:00 |
|
Erik Johnston
|
27e4b45c06
|
s/for events/for requests for events/
|
2015-05-21 14:52:23 +01:00 |
|
Erik Johnston
|
ac5f2bf9db
|
s/for events/for requests for events/
|
2015-05-21 14:50:57 +01:00 |
|
Erik Johnston
|
80a167b1f0
|
Add comments
|
2015-05-21 11:19:04 +01:00 |
|
Erik Johnston
|
9118a92862
|
Split up _get_events into defer and txn versions
|
2015-05-20 13:27:16 +01:00 |
|
Erik Johnston
|
ab45e12d31
|
Make not return a deferred _get_event_from_row_txn
|
2015-05-20 13:07:19 +01:00 |
|
Erik Johnston
|
f407cbd2f1
|
PEP8
|
2015-05-20 13:02:01 +01:00 |
|
Erik Johnston
|
227f8ef031
|
Split out _get_event_from_row back into defer and _txn version
|
2015-05-20 13:00:57 +01:00 |
|
Erik Johnston
|
2bc60c55af
|
Fix _get_backfill_events to return events in the correct order
|
2015-05-20 12:57:00 +01:00 |
|
Erik Johnston
|
20814fabdd
|
Actually fetch state for new backwards extremeties when backfilling.
|
2015-05-20 11:59:02 +01:00 |
|
Erik Johnston
|
9084cdd70f
|
Ensure event_results is a set
|
2015-05-19 16:34:31 +01:00 |
|
Erik Johnston
|
5b731178b2
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf
|
2015-05-19 16:08:00 +01:00 |
|
Erik Johnston
|
3a653515ec
|
Add None check
|
2015-05-19 15:27:09 +01:00 |
|
Erik Johnston
|
aa729349dd
|
Fix event_backwards_extrem insertion to ignore outliers
|
2015-05-19 15:27:00 +01:00 |
|
Erik Johnston
|
5b1631a4a9
|
Add a timeout param to get_event
|
2015-05-19 14:53:32 +01:00 |
|
Erik Johnston
|
291cba284b
|
Handle the case when things return empty but non none things
|
2015-05-19 14:42:46 +01:00 |
|
Erik Johnston
|
253f76a0a5
|
Don't always hit get_server_verify_key_v1_direct
|
2015-05-19 14:42:38 +01:00 |
|
Erik Johnston
|
6837c5edab
|
Handle the case when things return empty but non none things
|
2015-05-19 14:27:11 +01:00 |
|
Erik Johnston
|
7223129916
|
Don't apply new room join hack if depth > 5
|
2015-05-19 14:16:08 +01:00 |
|
Erik Johnston
|
5ae4a84211
|
Don't always hit get_server_verify_key_v1_direct
|
2015-05-19 13:43:34 +01:00 |
|
Erik Johnston
|
118a760719
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf
|
2015-05-19 13:20:29 +01:00 |
|
David Baker
|
19505e0392
|
Disable GZip encoding on static file resources as per comment
|
2015-05-19 13:20:25 +01:00 |
|
Erik Johnston
|
df431b127b
|
Add forgotten .items()
|
2015-05-19 13:14:21 +01:00 |
|
Erik Johnston
|
882ac83d8d
|
Fix scripts-dev/convert_server_keys.py to have correct format
|
2015-05-19 13:12:55 +01:00 |
|
Erik Johnston
|
d3e09f12d0
|
SYN-383: Actually, we expect this value to be a dict
|
2015-05-19 13:12:41 +01:00 |
|
Erik Johnston
|
677be13ffc
|
Revert accidental commit
|
2015-05-19 13:12:28 +01:00 |
|
Erik Johnston
|
350b88656a
|
SYN-383: Actually, we expect this value to be a dict
|
2015-05-19 13:01:57 +01:00 |
|
Erik Johnston
|
9de94d5a4d
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf
|
2015-05-19 12:50:17 +01:00 |
|
Erik Johnston
|
2b7120e233
|
SYN-383: Handle the fact the server might not have signed things
|
2015-05-19 12:49:38 +01:00 |
|
Erik Johnston
|
8b256a7296
|
Don't reuse var names
|
2015-05-19 11:58:22 +01:00 |
|
Erik Johnston
|
62ccc6d95f
|
Don't reuse var names
|
2015-05-19 11:58:04 +01:00 |
|
Erik Johnston
|
01858bcbf2
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf
|
2015-05-19 11:56:35 +01:00 |
|
Erik Johnston
|
2aeee2a905
|
SYN-383: Fix parsing of verify_keys and catching of _DefGen_Return
|
2015-05-19 11:56:18 +01:00 |
|
Erik Johnston
|
5e7883ec19
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf
|
2015-05-19 10:50:43 +01:00 |
|
Mark Haines
|
c6a03c46e6
|
SYN-383: Extract the response list from 'server_keys' in the response JSON as it might work better than iterating over the top level dict
|
2015-05-19 10:23:02 +01:00 |
|
Mark Haines
|
99914ec9f8
|
Merge pull request #152 from matrix-org/notifier_performance
Notifier performance
|
2015-05-18 17:49:59 +01:00 |
|
Erik Johnston
|
ef910a0358
|
Do work in parellel when joining a room
|
2015-05-18 17:17:04 +01:00 |
|
Erik Johnston
|
165eb2dbe6
|
Comments and shuffle of functions
|
2015-05-18 15:18:41 +01:00 |
|
Mark Haines
|
9396723995
|
Merge pull request #154 from matrix-org/erikj/events_move
Move get_events functions to storage.events
|
2015-05-18 14:24:35 +01:00 |
|
Erik Johnston
|
65878a2319
|
Remove unused metric
|
2015-05-18 14:06:30 +01:00 |
|
Mark Haines
|
ad31fa3040
|
Don't bother sorting by the room_stream_ids, it shouldn't matter which order they are notified in
|
2015-05-18 14:04:58 +01:00 |
|
Erik Johnston
|
4d1b6f4ad1
|
Remove rejected events if we don't want rejected events
|
2015-05-18 14:03:46 +01:00 |
|
Mark Haines
|
0b0033c40b
|
Merge branch 'develop' into notifier_performance
|
2015-05-18 13:50:01 +01:00 |
|
Mark Haines
|
1e90715a3d
|
Make sure the notifier stream token goes forward when it is updated. Sort the pending events by the correct room_stream_id
|
2015-05-18 13:17:36 +01:00 |
|
Erik Johnston
|
131bdf9bb1
|
Merge branch 'erikj/events_move' of github.com:matrix-org/synapse into erikj/perf
|
2015-05-18 10:23:37 +01:00 |
|
Erik Johnston
|
10f1bdb9a2
|
Move get_events functions to storage.events
|
2015-05-18 10:21:40 +01:00 |