MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-09-18 23:58:59 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3200 from matrix-org/erikj/remove_membership_change

Browse source 
Remove unused code path from member change DB func
This commit is contained in:
Erik Johnston 2018-05-09 16:02:13 +01:00 committed by GitHub
commit a5c98dda48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
synapse/storage/stream.py
View file

@ -304,10 +304,7 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
@defer.inlineCallbacks @defer.inlineCallbacks
def get_membership_changes_for_user(self, user_id, from_key, to_key): def get_membership_changes_for_user(self, user_id, from_key, to_key):
if from_key is not None: from_id = RoomStreamToken.parse_stream_token(from_key).stream
from_id = RoomStreamToken.parse_stream_token(from_key).stream
else:
from_id = None
to_id = RoomStreamToken.parse_stream_token(to_key).stream to_id = RoomStreamToken.parse_stream_token(to_key).stream
if from_key == to_key: if from_key == to_key:
@ -321,26 +318,15 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
defer.returnValue([]) defer.returnValue([])
def f(txn): def f(txn):
if from_id is not None: sql = (
sql = ( "SELECT m.event_id, stream_ordering FROM events AS e,"
"SELECT m.event_id, stream_ordering FROM events AS e," " room_memberships AS m"
" room_memberships AS m" " WHERE e.event_id = m.event_id"
" WHERE e.event_id = m.event_id" " AND m.user_id = ?"
" AND m.user_id = ?" " AND e.stream_ordering > ? AND e.stream_ordering <= ?"
" AND e.stream_ordering > ? AND e.stream_ordering <= ?" " ORDER BY e.stream_ordering ASC"
" ORDER BY e.stream_ordering ASC" )
) txn.execute(sql, (user_id, from_id, to_id,))
txn.execute(sql, (user_id, from_id, to_id,))
else:
sql = (
"SELECT m.event_id, stream_ordering FROM events AS e,"
" room_memberships AS m"
" WHERE e.event_id = m.event_id"
" AND m.user_id = ?"
" AND stream_ordering <= ?"
" ORDER BY stream_ordering ASC"
)
txn.execute(sql, (user_id, to_id,))
rows = [_EventDictReturn(row[0], None, row[1]) for row in txn] rows = [_EventDictReturn(row[0], None, row[1]) for row in txn]