4027 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnston	f6d1183fc5	Merge branch 'markjh/pusher_performance_master' of github.com:matrix-org/synapse into hotfixes-v0.9.0-r5	2015-05-21 17:02:54 +01:00
Mark Haines	2043527b9b	Don't try to use a txn when not in one, remove spurious debug logging	2015-05-21 16:53:03 +01:00
Mark Haines	53447e9cd3	Add caches for things requested by the pushers	2015-05-21 16:41:39 +01:00
Mark Haines	d61ce3f670	Add a cache for get_current_state with state_key	2015-05-21 16:41:39 +01:00
Erik Johnston	a910984b58	Actually return something from lambda	2015-05-21 15:58:41 +01:00
Erik Johnston	e309b1045d	Sort backfill events	2015-05-21 15:57:35 +01:00
Erik Johnston	0180bfe4aa	Remove dead code	2015-05-21 15:53:41 +01:00
Erik Johnston	1f3d1d85a9	Only get non-state	2015-05-21 15:52:29 +01:00
Erik Johnston	39a3340f73	Skip events we've already seen	2015-05-21 15:48:56 +01:00
Erik Johnston	ae3bff3491	Correctly prepopulate queue	2015-05-21 15:46:07 +01:00
Erik Johnston	dc085ddf8c	Don't prepopulate event_results	2015-05-21 15:44:05 +01:00
Erik Johnston	73d23c6ae8	Don't readd things that are already in event_results	2015-05-21 15:40:22 +01:00
Erik Johnston	6189d8e54d	PriorityQueue gives lowest first	2015-05-21 15:38:08 +01:00
Erik Johnston	115ef3ddac	Correctly capture Queue.Empty exception	2015-05-21 15:37:43 +01:00
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
Mark Haines	7ae8afb7ef	Removed unused 'is_visible' method	2015-05-20 14:48:11 +01:00
Erik Johnston	9118a92862	Split up _get_events into defer and txn versions	2015-05-20 13:27:16 +01:00
Mark Haines	8eca5bd50a	Fix the presence tests	2015-05-20 13:22:18 +01:00
Mark Haines	e01b825cc9	Clean up the presence_list checking logic a bit	2015-05-20 13:21:59 +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