42bc56dad3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into use-simplejson  
							
							
							
						 
						
							2015-02-11 17:01:38 +00:00  
				
					
						
							
							
								 
						
							
							
								aff892ce79 
								
							
								 
							
						 
						
							
							
								
								Fix formatting  
							
							
							
						 
						
							2015-02-11 15:02:35 +00:00  
				
					
						
							
							
								 
						
							
							
								f5a70e0d2e 
								
							
								 
							
						 
						
							
							
								
								Add a cache for get_event  
							
							
							
						 
						
							2015-02-11 15:01:15 +00:00  
				
					
						
							
							
								 
						
							
							
								4ebbaf0d43 
								
							
								 
							
						 
						
							
							
								
								Blunty replace json with simplejson  
							
							
							
						 
						
							2015-02-11 14:23:10 +00:00  
				
					
						
							
							
								 
						
							
							
								b085fac735 
								
							
								 
							
						 
						
							
							
								
								Code-style fixes  
							
							
							
						 
						
							2015-02-10 16:30:48 +00:00  
				
					
						
							
							
								 
						
							
							
								fda4422bc9 
								
							
								 
							
						 
						
							
							
								
								Fix pyflakes  
							
							
							
						 
						
							2015-02-10 14:54:07 +00:00  
				
					
						
							
							
								 
						
							
							
								d7c7efb691 
								
							
								 
							
						 
						
							
							
								
								Add performance counters for different stages of loading events  
							
							
							
						 
						
							2015-02-10 14:50:53 +00:00  
				
					
						
							
							
								 
						
							
							
								0c4536da8f 
								
							
								 
							
						 
						
							
							
								
								Use the transaction 'desc' rather than 'name', increment the txn_ids in  
							
							... 
							
							
							
							txn names 
							
						 
						
							2015-02-09 18:06:31 +00:00  
				
					
						
							
							
								 
						
							
							
								347b497db0 
								
							
								 
							
						 
						
							
							
								
								Formatting  
							
							
							
						 
						
							2015-02-09 17:57:09 +00:00  
				
					
						
							
							
								 
						
							
							
								3a5ad7dbd5 
								
							
								 
							
						 
						
							
							
								
								Performance counters for database transaction names  
							
							
							
						 
						
							2015-02-09 17:55:56 +00:00  
				
					
						
							
							
								 
						
							
							
								c4ee4ce93e 
								
							
								 
							
						 
						
							
							
								
								Fix typo  
							
							
							
						 
						
							2015-02-09 15:00:37 +00:00  
				
					
						
							
							
								 
						
							
							
								66fde49f07 
								
							
								 
							
						 
						
							
							
								
								Log database time every 10s and log as percentage  
							
							
							
						 
						
							2015-02-09 14:45:15 +00:00  
				
					
						
							
							
								 
						
							
							
								75656712e3 
								
							
								 
							
						 
						
							
							
								
								Time how long we're spending on the database thread  
							
							
							
						 
						
							2015-02-09 14:22:52 +00:00  
				
					
						
							
							
								 
						
							
							
								2f4cb04f45 
								
							
								 
							
						 
						
							
							
								
								Be more specific in naming columns in selects.  
							
							
							
						 
						
							2015-01-30 14:48:11 +00:00  
				
					
						
							
							
								 
						
							
							
								e0b7c521cb 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage  
							
							... 
							
							
							
							Conflicts:
	synapse/storage/__init__.py
	synapse/storage/schema/delta/v12.sql 
							
						 
						
							2015-01-30 14:08:28 +00:00  
				
					
						
							
							
								 
						
							
							
								6d485dd1c7 
								
							
								 
							
						 
						
							
							
								
								unnecessary newlines  
							
							
							
						 
						
							2015-01-28 14:48:42 +00:00  
				
					
						
							
							
								 
						
							
							
								fb0928097a 
								
							
								 
							
						 
						
							
							
								
								More magic commas (including the place I copied it from...)  
							
							
							
						 
						
							2015-01-28 14:48:07 +00:00  
				
					
						
							
							
								 
						
							
							
								0cbb6b0f52 
								
							
								 
							
						 
						
							
							
								
								Google doc style  
							
							
							
						 
						
							2015-01-28 14:44:41 +00:00  
				
					
						
							
							
								 
						
							
							
								b1b85753d7 
								
							
								 
							
						 
						
							
							
								
								Add support for storing rejected events in EventContext and data stores  
							
							
							
						 
						
							2015-01-22 15:50:17 +00:00  
				
					
						
							
							
								 
						
							
							
								c06a9063e1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into pushers  
							
							
							
						 
						
							2015-01-13 13:15:51 +00:00  
				
					
						
							
							
								 
						
							
							
								36a2a877e2 
								
							
								 
							
						 
						
							
							
								
								Use time.time() instead of time.clock()  
							
							
							
						 
						
							2015-01-06 16:34:41 +00:00  
				
					
						
							
							
								 
						
							
							
								52b2c6c9c7 
								
							
								 
							
						 
						
							
							
								
								Don't include None's in _get_events_txn  
							
							
							
						 
						
							2015-01-06 14:56:57 +00:00  
				
					
						
							
							
								 
						
							
							
								5e23a19204 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #28  from matrix-org/erikj-perf  
							
							... 
							
							
							
							Database performance improvements. 
							
						 
						
							2015-01-06 13:33:40 +00:00  
				
					
						
							
							
								 
						
							
							
								adb04b1e57 
								
							
								 
							
						 
						
							
							
								
								Update copyright notices  
							
							
							
						 
						
							2015-01-06 13:21:39 +00:00  
				
					
						
							
							
								 
						
							
							
								af1c7c7808 
								
							
								 
							
						 
						
							
							
								
								PEP8  
							
							
							
						 
						
							2015-01-06 13:13:17 +00:00  
				
					
						
							
							
								 
						
							
							
								52d8519008 
								
							
								 
							
						 
						
							
							
								
								Don't do batching when getting events.  
							
							
							
						 
						
							2015-01-06 13:10:27 +00:00  
				
					
						
							
							
								 
						
							
							
								98933e3db6 
								
							
								 
							
						 
						
							
							
								
								Only fetch prev_content when a client is streaming/paginating. Use transactions for event streams.  
							
							
							
						 
						
							2015-01-06 13:03:23 +00:00  
				
					
						
							
							
								 
						
							
							
								3e26720e05 
								
							
								 
							
						 
						
							
							
								
								Temporarily turn off 'redacted_because' and 'prev_content' keys  
							
							
							
						 
						
							2015-01-06 11:26:58 +00:00  
				
					
						
							
							
								 
						
							
							
								f4ea78e9e2 
								
							
								 
							
						 
						
							
							
								
								More debug logging  
							
							
							
						 
						
							2015-01-06 11:24:18 +00:00  
				
					
						
							
							
								 
						
							
							
								d7e8ea67b3 
								
							
								 
							
						 
						
							
							
								
								Reformat  
							
							
							
						 
						
							2015-01-06 11:18:02 +00:00  
				
					
						
							
							
								 
						
							
							
								b56730bb6e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into pushers  
							
							... 
							
							
							
							Conflicts:
	synapse/api/errors.py
	synapse/server.py
	synapse/storage/__init__.py 
							
						 
						
							2014-12-18 15:15:22 +00:00  
				
					
						
							
							
								 
						
							
							
								9728c305a3 
								
							
								 
							
						 
						
							
							
								
								after a few rethinks, a working implementation of pushers.  
							
							
							
						 
						
							2014-12-18 14:49:22 +00:00  
				
					
						
							
							
								 
						
							
							
								f3788e3c78 
								
							
								 
							
						 
						
							
							
								
								Test some ideas that might help performance a bit  
							
							
							
						 
						
							2014-12-17 23:37:08 +00:00  
				
					
						
							
							
								 
						
							
							
								5b39cfff69 
								
							
								 
							
						 
						
							
							
								
								Don't assume an event exists  
							
							
							
						 
						
							2014-12-16 18:25:24 +00:00  
				
					
						
							
							
								 
						
							
							
								882dc8dcab 
								
							
								 
							
						 
						
							
							
								
								Persist internal_metadata  
							
							
							
						 
						
							2014-12-16 13:17:09 +00:00  
				
					
						
							
							
								 
						
							
							
								c8dd3314d6 
								
							
								 
							
						 
						
							
							
								
								Fix bug where we ignored event_edge_hashes table  
							
							
							
						 
						
							2014-12-15 13:55:22 +00:00  
				
					
						
							
							
								 
						
							
							
								75085bb4d1 
								
							
								 
							
						 
						
							
							
								
								Pyflakes  
							
							
							
						 
						
							2014-12-12 14:34:34 +00:00  
				
					
						
							
							
								 
						
							
							
								0b04369238 
								
							
								 
							
						 
						
							
							
								
								Fix public room joining by making sure replaces_state never points to itself.  
							
							
							
						 
						
							2014-12-11 15:56:06 +00:00  
				
					
						
							
							
								 
						
							
							
								9191292b0f 
								
							
								 
							
						 
						
							
							
								
								Fix prev_content  
							
							
							
						 
						
							2014-12-11 15:16:55 +00:00  
				
					
						
							
							
								 
						
							
							
								8cdebce470 
								
							
								 
							
						 
						
							
							
								
								Fix redactions. Fix 'age' key  
							
							
							
						 
						
							2014-12-11 13:25:19 +00:00  
				
					
						
							
							
								 
						
							
							
								02e4c18171 
								
							
								 
							
						 
						
							
							
								
								Remove dead code  
							
							
							
						 
						
							2014-12-10 18:00:36 +00:00  
				
					
						
							
							
								 
						
							
							
								aae8a37e63 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor  
							
							
							
						 
						
							2014-12-10 13:18:40 +00:00  
				
					
						
							
							
								 
						
							
							
								aa3f66cf7f 
								
							
								 
							
						 
						
							
							
								
								Change the way we implement get_events to be less sucky  
							
							
							
						 
						
							2014-12-09 13:35:26 +00:00  
				
					
						
							
							
								 
						
							
							
								ba3d1e2fc0 
								
							
								 
							
						 
						
							
							
								
								Remove unused import  
							
							
							
						 
						
							2014-12-08 12:01:25 +00:00  
				
					
						
							
							
								 
						
							
							
								aed62a3583 
								
							
								 
							
						 
						
							
							
								
								track replication destination health, and perform exponential back-off when sending transactions. does *not* yet retry transactions, but drops them on the floor if waiting for a server to recover.  
							
							
							
						 
						
							2014-12-07 02:26:07 +00:00  
				
					
						
							
							
								 
						
							
							
								6630e1b579 
								
							
								 
							
						 
						
							
							
								
								Start making more things use EventContext rather than event.*  
							
							
							
						 
						
							2014-12-05 16:20:48 +00:00  
				
					
						
							
							
								 
						
							
							
								ec2b5d8c28 
								
							
								 
							
						 
						
							
							
								
								Store full JSON of events in db  
							
							
							
						 
						
							2014-12-01 16:22:07 +00:00  
				
					
						
							
							
								 
						
							
							
								a46e5ef621 
								
							
								 
							
						 
						
							
							
								
								SYN-163: Add an order by rowid to selects.  
							
							... 
							
							
							
							This should fix the bug where the edges of the graph get returned in a
different order than they were inserted in, and so no get_event no
longer returned the exact same JSON as was inserted. This meant that
signature checks failed. 
							
						 
						
							2014-11-24 10:56:36 +00:00  
				
					
						
							
							
								 
						
							
							
								db9ce032a4 
								
							
								 
							
						 
						
							
							
								
								Fix pep8 codestyle warnings  
							
							
							
						 
						
							2014-11-20 17:26:36 +00:00  
				
					
						
							
							
								 
						
							
							
								dfdda2c871 
								
							
								 
							
						 
						
							
							
								
								Use module loggers rather than the root logger. Exceptions caused by bad clients shouldn't cause ERROR level logging. Fix sql logging to use 'repr' rather than 'str'  
							
							
							
						 
						
							2014-11-20 17:10:37 +00:00