Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert get_auth_chain changes

This commit is contained in:
Erik Johnston 2015-02-23 14:35:23 +00:00
parent db215b7e00
commit 42b972bccd
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
synapse/storage/event_federation.py
View File

@ -32,15 +32,15 @@ class EventFederationStore(SQLBaseStore):
and backfilling from another server respectively. and backfilling from another server respectively.
""" """
def get_auth_chain(self, event_ids, have_ids=set()): def get_auth_chain(self, event_ids):
return self.runInteraction( return self.runInteraction(
"get_auth_chain", "get_auth_chain",
self._get_auth_chain_txn, self._get_auth_chain_txn,
event_ids, have_ids event_ids
) )
def _get_auth_chain_txn(self, txn, event_ids, have_ids): def _get_auth_chain_txn(self, txn, event_ids):
results = self._get_auth_chain_ids_txn(txn, event_ids, have_ids) results = self._get_auth_chain_ids_txn(txn, event_ids)
return self._get_events_txn(txn, results) return self._get_events_txn(txn, results)
@ -51,9 +51,8 @@ class EventFederationStore(SQLBaseStore):
event_ids event_ids
) )
def _get_auth_chain_ids_txn(self, txn, event_ids, have_ids): def _get_auth_chain_ids_txn(self, txn, event_ids):
results = set() results = set()
have_ids = set(have_ids)
base_sql = ( base_sql = (
"SELECT auth_id FROM event_auth WHERE event_id = ?" "SELECT auth_id FROM event_auth WHERE event_id = ?"
@ -67,7 +66,6 @@ class EventFederationStore(SQLBaseStore):
new_front.update([r[0] for r in txn.fetchall()]) new_front.update([r[0] for r in txn.fetchall()])
new_front -= results new_front -= results
new_front -= have_ids
front = new_front front = new_front
results.update(front) results.update(front)