OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:matrix-org/synapse into develop

pull/70/head
Erik Johnston 2015-02-12 15:24:06 +00:00
parent 1ed836cc2b a268c31737
commit 92d850fc87
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/__init__.py
View File

@ -16,4 +16,4 @@
""" This is a reference implementation of a Matrix home server. """ This is a reference implementation of a Matrix home server.
""" """
__version__ = "0.7.0" __version__ = "0.7.0a"

13
synapse/storage/event_federation.py
View File

@ -55,17 +55,16 @@ class EventFederationStore(SQLBaseStore):
results = set() results = set()
base_sql = ( base_sql = (
"SELECT auth_id FROM event_auth WHERE %s" "SELECT auth_id FROM event_auth WHERE event_id = ?"
) )
front = set(event_ids) front = set(event_ids)
while front: while front:
sql = base_sql % ( new_front = set()
" OR ".join(["event_id=?"] * len(front)), for f in front:
) txn.execute(base_sql, (f,))
new_front.update([r[0] for r in txn.fetchall()])
txn.execute(sql, list(front)) front = new_front
front = [r[0] for r in txn.fetchall()]
results.update(front) results.update(front)
return list(results) return list(results)