Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8f8798bc0d 
								
							
								 
							
						 
						
							
							
								
								Add ReadWriteLock for pagination and history prune  
							
							 
							
							
							
						 
						
							2016-07-05 15:30:25 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								dd2ccee27d 
								
							
								 
							
						 
						
							
							
								
								Fix typo  
							
							 
							
							
							
						 
						
							2016-07-05 14:06:07 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								b6b0132ac7 
								
							
								 
							
						 
						
							
							
								
								Make get_events_around more efficient on sqlite3  
							
							 
							
							
							
						 
						
							2016-07-05 13:55:18 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								d44d11d864 
								
							
								 
							
						 
						
							
							
								
								Use true/false for boolean parameter inclusive to avoid potential for sqli, and possibly make the code clearer  
							
							 
							
							
							
						 
						
							2016-07-05 10:39:13 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								0fb76c71ac 
								
							
								 
							
						 
						
							
							
								
								Use different SQL for postgres and sqlite3 for when using multicolumn indexes  
							
							 
							
							
							
						 
						
							2016-07-04 19:44:55 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								f18d7546c6 
								
							
								 
							
						 
						
							
							
								
								Use a query that postgresql optimises better for get_events_around  
							
							 
							
							
							
						 
						
							2016-07-04 15:48:25 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								05e01f21d7 
								
							
								 
							
						 
						
							
							
								
								Remove event fetching from DB threads  
							
							 
							
							
							
						 
						
							2016-06-03 17:22:13 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								7e2f971c08 
								
							
								 
							
						 
						
							
							
								
								Remove some unused functions ( #711 )  
							
							 
							
							... 
							
							
							
							* Remove some unused functions
* get_room_events_stream is only used in tests
* is_exclusive_room might actually be something we want 
							
						 
						
							2016-04-08 14:01:56 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								e36bfbab38 
								
							
								 
							
						 
						
							
							
								
								Use a stream id generator for backfilled ids  
							
							 
							
							
							
						 
						
							2016-04-01 13:29:05 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d87a846ebc 
								
							
								 
							
						 
						
							
							
								
								Don't cache events in get_recent_events_for_room  
							
							 
							
							
							
						 
						
							2016-03-23 11:42:50 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8a88684736 
								
							
								 
							
						 
						
							
							
								
								Add comment  
							
							 
							
							
							
						 
						
							2016-03-09 16:51:22 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								af2fe6110c 
								
							
								 
							
						 
						
							
							
								
								Return the correct token form  
							
							 
							
							
							
						 
						
							2016-03-09 16:11:53 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3ecaabc7fd 
								
							
								 
							
						 
						
							
							
								
								Use topological orders for initial sync timeline  
							
							 
							
							
							
						 
						
							2016-03-09 15:45:34 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								42109a62a4 
								
							
								 
							
						 
						
							
							
								
								Remove unused param from get_max_token  
							
							 
							
							
							
						 
						
							2016-02-18 16:37:28 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ce14c7a995 
								
							
								 
							
						 
						
							
							
								
								Fix SYN-627, events are in incorrect room in /sync  
							
							 
							
							
							
						 
						
							2016-02-11 15:02:56 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0eff740523 
								
							
								 
							
						 
						
							
							
								
								Return events in correct order for /events  
							
							 
							
							
							
						 
						
							2016-02-11 10:07:27 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2c1fbea531 
								
							
								 
							
						 
						
							
							
								
								Fix up logcontexts  
							
							 
							
							
							
						 
						
							2016-02-08 14:26:45 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b84d59c5f0 
								
							
								 
							
						 
						
							
							
								
								Add descriptions  
							
							 
							
							
							
						 
						
							2016-02-03 16:22:35 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								d83d004ccd 
								
							
								 
							
						 
						
							
							
								
								Fix flake8 warnings for new flake8  
							
							 
							
							
							
						 
						
							2016-02-02 17:18:50 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8a391e33ae 
								
							
								 
							
						 
						
							
							
								
								s/get_room_changes_for_user/get_membership_changes_for_user/  
							
							 
							
							
							
						 
						
							2016-02-02 16:12:10 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								477b1ed6cf 
								
							
								 
							
						 
						
							
							
								
								Fetch events in a separate transaction.  
							
							 
							
							... 
							
							
							
							This has a couple of benefits:
- It reduces the time of transactions, allowing other database requests
  to run.
- Fetching events is given a dedicated database thread, and so can't
  starve other database requests. 
							
						 
						
							2016-02-02 15:58:14 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								89b40b225c 
								
							
								 
							
						 
						
							
							
								
								Order things correctly  
							
							 
							
							
							
						 
						
							2016-02-01 16:32:46 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4bf448be25 
								
							
								 
							
						 
						
							
							
								
								Switch over /events to use per room caches  
							
							 
							
							
							
						 
						
							2016-02-01 16:26:51 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2d3837bec7 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #543  from matrix-org/erikj/sync  
							
							 
							
							... 
							
							
							
							Cache get_room_changes_for_user 
							
						 
						
							2016-02-01 15:05:06 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ceb6b8680a 
								
							
								 
							
						 
						
							
							
								
								Only use room_ids if in get_room_events_stream if is_guest  
							
							 
							
							
							
						 
						
							2016-02-01 10:33:52 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								25c311eaf6 
								
							
								 
							
						 
						
							
							
								
								Cache get_room_changes_for_user  
							
							 
							
							
							
						 
						
							2016-01-29 16:52:48 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								18579534ea 
								
							
								 
							
						 
						
							
							
								
								Prefill stream change caches  
							
							 
							
							
							
						 
						
							2016-01-29 14:37:59 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								45cf827c8f 
								
							
								 
							
						 
						
							
							
								
								Change name and doc has_entity_changed  
							
							 
							
							
							
						 
						
							2016-01-28 16:39:18 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								00cb3eb24b 
								
							
								 
							
						 
						
							
							
								
								Cache tags and account data  
							
							 
							
							
							
						 
						
							2016-01-28 16:37:41 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c23a8c7833 
								
							
								 
							
						 
						
							
							
								
								Ensure keys to RoomStreamChangeCache are ints  
							
							 
							
							
							
						 
						
							2016-01-28 15:55:26 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e1941442d4 
								
							
								 
							
						 
						
							
							
								
								Invalidate caches properly. Remove unused arg  
							
							 
							
							
							
						 
						
							2016-01-28 15:02:41 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4e7948b47a 
								
							
								 
							
						 
						
							
							
								
								Allow paginating backwards from stream token  
							
							 
							
							
							
						 
						
							2016-01-28 11:52:34 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ba8931829b 
								
							
								 
							
						 
						
							
							
								
								Return correct type of token  
							
							 
							
							
							
						 
						
							2016-01-28 11:34:17 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e7febf4fbb 
								
							
								 
							
						 
						
							
							
								
								PEP8  
							
							 
							
							
							
						 
						
							2016-01-27 17:33:27 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								aca3193efb 
								
							
								 
							
						 
						
							
							
								
								Use the same path for incremental with gap or without gap  
							
							 
							
							
							
						 
						
							2016-01-27 17:33:27 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b97f6626b6 
								
							
								 
							
						 
						
							
							
								
								Add cache to room stream  
							
							 
							
							
							
						 
						
							2016-01-27 17:33:26 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								87f9477b10 
								
							
								 
							
						 
						
							
							
								
								Add a Homeserver.setup method.  
							
							 
							
							... 
							
							
							
							This is for setting up dependencies that require work on startup. This
is useful for the DataStore that wants to read a bunch from the database
before initiliazing. 
							
						 
						
							2016-01-26 15:51:06 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								6c28ac260c 
								
							
								 
							
						 
						
							
							
								
								copyrights  
							
							 
							
							
							
						 
						
							2016-01-07 04:26:29 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								ca2f90742d 
								
							
								 
							
						 
						
							
							
								
								Open up /events to anonymous users for room events only  
							
							 
							
							... 
							
							
							
							Squash-merge of PR #345  from daniel/anonymousevents 
							
						 
						
							2015-11-05 14:32:26 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								771ca56c88 
								
							
								 
							
						 
						
							
							
								
								Remove more unused parameters  
							
							 
							
							
							
						 
						
							2015-11-02 15:31:57 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								56dbcd1524 
								
							
								 
							
						 
						
							
							
								
								Docs  
							
							 
							
							
							
						 
						
							2015-10-28 14:05:50 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5cb298c934 
								
							
								 
							
						 
						
							
							
								
								Add room context api  
							
							 
							
							
							
						 
						
							2015-10-28 13:45:56 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								09cb5c7d33 
								
							
								 
							
						 
						
							
							
								
								Allow users that have left a room to get the messages that happend in the room before they left  
							
							 
							
							
							
						 
						
							2015-09-09 17:31:09 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								3c166a24c5 
								
							
								 
							
						 
						
							
							
								
								Remove undocumented and unimplemented 'feedback' parameter from the Client-Server API  
							
							 
							
							
							
						 
						
							2015-09-09 16:05:09 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								89ae0166de 
								
							
								 
							
						 
						
							
							
								
								Allow room initialSync for users that have left the room, returning a snapshot of how the room was when they left it  
							
							 
							
							
							
						 
						
							2015-09-09 13:25:22 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2df8dd9b37 
								
							
								 
							
						 
						
							
							
								
								Move all the caches into their own package, synapse.util.caches  
							
							 
							
							
							
						 
						
							2015-08-11 18:00:59 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b2c7bd4b09 
								
							
								 
							
						 
						
							
							
								
								Cache get_recent_events_for_room  
							
							 
							
							
							
						 
						
							2015-08-07 14:42:34 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								07507643cb 
								
							
								 
							
						 
						
							
							
								
								Use dictionary cache to do group -> state fetching  
							
							 
							
							
							
						 
						
							2015-08-05 15:11:42 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a2c4f3f150 
								
							
								 
							
						 
						
							
							
								
								Fix daedlock  
							
							 
							
							
							
						 
						
							2015-05-15 10:54:04 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								f6f902d459 
								
							
								 
							
						 
						
							
							
								
								Move fetching of events into their own transactions  
							
							 
							
							
							
						 
						
							2015-05-14 13:45:48 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4071f29653 
								
							
								 
							
						 
						
							
							
								
								Fetch events from events_id in their own transactions  
							
							 
							
							
							
						 
						
							2015-05-13 16:59:41 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4df11b5039 
								
							
								 
							
						 
						
							
							
								
								Make get_current_token accept a direction parameter, which tells whether the source whether we want a token for going 'forwards' or 'backwards'  
							
							 
							
							
							
						 
						
							2015-05-12 10:28:10 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								17653a5dfe 
								
							
								 
							
						 
						
							
							
								
								Move storage.stream._StreamToken to types.RoomStreamToken  
							
							 
							
							
							
						 
						
							2015-05-11 18:01:01 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6ead27ddda 
								
							
								 
							
						 
						
							
							
								
								Add more conditions on JOINs to make postgres go a little faster.  
							
							 
							
							
							
						 
						
							2015-04-30 18:32:03 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								58d8339966 
								
							
								 
							
						 
						
							
							
								
								Add support for postgres instead of mysql. Change sql accourdingly. blob + varbinary -> bytea. No support for UNSIGNED or CREATE INDEX IF NOT EXISTS.  
							
							 
							
							
							
						 
						
							2015-04-14 13:53:20 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2ded344620 
								
							
								 
							
						 
						
							
							
								
								Remove unused import  
							
							 
							
							
							
						 
						
							2015-04-09 13:46:06 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								8ad0f4912e 
								
									
								
							
								 
							
						 
						
							
							
								
								Stream ordering and out of order insertions.  
							
							 
							
							... 
							
							
							
							Handle the fact that events can be persisted out of order, and so to get
the "current max" stream token becomes non trivial - as we need to make
sure that *all* stream tokens less than the current max have also
successfully been persisted. 
							
						 
						
							2015-04-09 11:41:36 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9236136f3a 
								
							
								 
							
						 
						
							
							
								
								Make work in both Maria and SQLite. Fix tests  
							
							 
							
							
							
						 
						
							2015-04-01 14:12:33 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								f6583796fe 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into mysql  
							
							 
							
							
							
						 
						
							2015-03-20 16:31:48 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9517f4da4d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into store_rearrangement  
							
							 
							
							
							
						 
						
							2015-03-20 16:02:47 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								ceb61daa70 
								
							
								 
							
						 
						
							
							
								
								Add the tiniest of tiny one-element caches to get_room_events_max_id() as it's read every time someone hits eventstream  
							
							 
							
							
							
						 
						
							2015-03-20 15:44:06 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								87db64b839 
								
							
								 
							
						 
						
							
							
								
								Rearrange storage modules  
							
							 
							
							
							
						 
						
							2015-03-20 14:11:38 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								cb8162d3d1 
								
							
								 
							
						 
						
							
							
								
								Rearrange storage modules  
							
							 
							
							
							
						 
						
							2015-03-20 13:52:56 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d7a0496f3e 
								
							
								 
							
						 
						
							
							
								
								Convert storage layer to be mysql compatible  
							
							 
							
							
							
						 
						
							2015-03-19 15:59:48 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								377ae369c1 
								
							
								 
							
						 
						
							
							
								
								Wrap all of get_app_service_rooms in a txn.  
							
							 
							
							
							
						 
						
							2015-03-02 11:20:51 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								b216b36892 
								
							
								 
							
						 
						
							
							
								
								JOIN state_events rather than parsing unrecognized_keys to pull out member state_keys  
							
							 
							
							
							
						 
						
							2015-03-02 10:41:35 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								ebc4830666 
								
							
								 
							
						 
						
							
							
								
								PR tweaks: set earlier on and use 'as json' for compat  
							
							 
							
							
							
						 
						
							2015-03-02 09:53:00 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								806a6c886a 
								
							
								 
							
						 
						
							
							
								
								PEP8  
							
							 
							
							
							
						 
						
							2015-02-27 09:48:57 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								f0995436e7 
								
							
								 
							
						 
						
							
							
								
								Check for membership invite events correctly.  
							
							 
							
							
							
						 
						
							2015-02-26 17:21:17 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								dcec7175dc 
								
							
								 
							
						 
						
							
							
								
								Finish impl to get new events for AS. ASes should now be able to poll /events  
							
							 
							
							
							
						 
						
							2015-02-26 16:23:01 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								978ce87c86 
								
							
								 
							
						 
						
							
							
								
								Comment unused variables.  
							
							 
							
							
							
						 
						
							2015-02-25 17:37:48 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								2d20466f9a 
								
							
								 
							
						 
						
							
							
								
								Add stub functions and work out execution flow to implement AS event stream polling.  
							
							 
							
							
							
						 
						
							2015-02-25 15:00:59 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								8498d348d8 
								
							
								 
							
						 
						
							
							
								
								Fix token formatting  
							
							 
							
							
							
						 
						
							2015-01-30 11:42:09 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								22dd1cde2d 
								
							
								 
							
						 
						
							
							
								
								Filter the recent events before applying the limit when doing an incremental sync with a gap  
							
							 
							
							
							
						 
						
							2015-01-30 11:32:35 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								396a67a09a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'client_v2_filter' into client_v2_sync  
							
							 
							
							... 
							
							
							
							Conflicts:
	synapse/rest/client/v2_alpha/__init__.py 
							
						 
						
							2015-01-29 14:58:00 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								e016f4043b 
								
							
								 
							
						 
						
							
							
								
								Use get_room_events_stream to get changes to the rooms if the number of changes is small  
							
							 
							
							
							
						 
						
							2015-01-29 14:40:28 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								b0b80074e0 
								
							
								 
							
						 
						
							
							
								
								SYN-252: Supply the stream and topological parts in the correct order to the constructor  
							
							 
							
							
							
						 
						
							2015-01-29 01:48:48 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								e020574d65 
								
							
								 
							
						 
						
							
							
								
								Fix Formatting  
							
							 
							
							
							
						 
						
							2015-01-27 20:19:36 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								a56008842b 
								
							
								 
							
						 
						
							
							
								
								Start implementing incremental initial sync  
							
							 
							
							
							
						 
						
							2015-01-27 16:24:22 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								fda63064fc 
								
							
								 
							
						 
						
							
							
								
								get_room_events isn't called anywhere  
							
							 
							
							
							
						 
						
							2015-01-13 14:43:26 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								895fcb377e 
								
							
								 
							
						 
						
							
							
								
								Fix stream token ordering  
							
							 
							
							
							
						 
						
							2015-01-13 14:38:53 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								c43d898119 
								
							
								 
							
						 
						
							
							
								
								SYN-178: Fix off by one.  
							
							 
							
							
							
						 
						
							2015-01-12 17:38:40 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								fd9a8db7ea 
								
							
								 
							
						 
						
							
							
								
								Only fetch the columns we need.  
							
							 
							
							
							
						 
						
							2015-01-06 15:59:31 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								5e23a19204 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #28  from matrix-org/erikj-perf  
							
							 
							
							... 
							
							
							
							Database performance improvements. 
							
						 
						
							2015-01-06 13:33:40 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								adb04b1e57 
								
							
								 
							
						 
						
							
							
								
								Update copyright notices  
							
							 
							
							
							
						 
						
							2015-01-06 13:21:39 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								af1c7c7808 
								
							
								 
							
						 
						
							
							
								
								PEP8  
							
							 
							
							
							
						 
						
							2015-01-06 13:13:17 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								98933e3db6 
								
							
								 
							
						 
						
							
							
								
								Only fetch prev_content when a client is streaming/paginating. Use transactions for event streams.  
							
							 
							
							
							
						 
						
							2015-01-06 13:03:23 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								1505055334 
								
							
								 
							
						 
						
							
							
								
								Don't return outliers when we get recent events for rooms.  
							
							 
							
							
							
						 
						
							2014-11-27 16:38:50 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								db9ce032a4 
								
							
								 
							
						 
						
							
							
								
								Fix pep8 codestyle warnings  
							
							 
							
							
							
						 
						
							2014-11-20 17:26:36 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								1731af3f29 
								
							
								 
							
						 
						
							
							
								
								SYN-104: When going backwards the end token should be before the last event  
							
							 
							
							
							
						 
						
							2014-11-18 16:45:06 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								65f846ade0 
								
							
								 
							
						 
						
							
							
								
								Notify users about invites.  
							
							 
							
							
							
						 
						
							2014-11-10 11:15:02 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								da1dda3e1d 
								
							
								 
							
						 
						
							
							
								
								Add transaction level logging and timing information. Add a _simple_delete method  
							
							 
							
							
							
						 
						
							2014-10-28 11:18:04 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c818aa13eb 
								
							
								 
							
						 
						
							
							
								
								Add LIMIT to scalar subquery  
							
							 
							
							
							
						 
						
							2014-09-25 15:51:21 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								70899d3ab2 
								
							
								 
							
						 
						
							
							
								
								Rename deletions to redactions  
							
							 
							
							
							
						 
						
							2014-09-24 15:27:59 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								78af6bbb98 
								
							
								 
							
						 
						
							
							
								
								Add m.room.deletion. If an event is deleted it will be returned to clients 'pruned', i.e. all client specified keys will be removed.  
							
							 
							
							
							
						 
						
							2014-09-23 15:28:32 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								28bcd01e8d 
								
							
								 
							
						 
						
							
							
								
								SYN-47: Fix bug where we still returned events for rooms we had left.  
							
							 
							
							... 
							
							
							
							SYN-47 #resolve 
							
						 
						
							2014-09-19 14:45:21 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								e53d77b501 
								
							
								 
							
						 
						
							
							
								
								Add a .runInteraction() method on SQLBaseStore itself to wrap the .db_pool  
							
							 
							
							
							
						 
						
							2014-09-12 14:28:07 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								781ff713ba 
								
							
								 
							
						 
						
							
							
								
								When getting a state event also include the previous content  
							
							 
							
							
							
						 
						
							2014-09-06 02:23:36 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								8a7c1d6a00 
								
							
								 
							
						 
						
							
							
								
								fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.  
							
							 
							
							
							
						 
						
							2014-09-03 17:31:57 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ee06023573 
								
							
								 
							
						 
						
							
							
								
								Get the equalities right.  
							
							 
							
							
							
						 
						
							2014-08-29 13:28:06 +01:00